Diff of the two buildlogs:

--
--- b1/build.log	2025-03-17 13:13:45.535340675 +0000
+++ b2/build.log	2025-03-17 13:41:05.821432890 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Sun Apr 19 07:10:22 -12 2026
-I: pbuilder-time-stamp: 1776625822
+I: Current time: Tue Mar 18 03:13:55 +14 2025
+I: pbuilder-time-stamp: 1742217235
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/experimental-reproducible-base.tgz]
 I: copying local configuration
@@ -24,52 +24,84 @@
 dpkg-source: info: applying 0001-record-version.diff
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/1671536/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink04-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Mar 17 13:14 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='experimental'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=experimental
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='74437d1036c744aeafeb6e47fcacc8e3'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='1671536'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=4f124d56c267496da651f6c49856000d
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=2877395
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.oYRhOYtI/pbuilderrc_nbuY --distribution experimental --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/experimental-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.oYRhOYtI/b1 --logfile b1/build.log git_2.49.0+next.20250314-1.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.oYRhOYtI/pbuilderrc_MEtO --distribution experimental --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/experimental-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.oYRhOYtI/b2 --logfile b2/build.log git_2.49.0+next.20250314-1.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink03-arm64 6.1.0-32-cloud-arm64 #1 SMP Debian 6.1.129-1 (2025-03-06) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-32-cloud-arm64 #1 SMP Debian 6.1.129-1 (2025-03-06) aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Mar  4  2025 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/1671536/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Mar  4 11:20 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -311,7 +343,7 @@
 Get: 154 http://deb.debian.org/debian unstable/main arm64 tcl arm64 8.6.16 [4096 B]
 Get: 155 http://deb.debian.org/debian unstable/main arm64 unzip arm64 6.0-29 [163 kB]
 Get: 156 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.28-3.1 [26.9 kB]
-Fetched 60.6 MB in 1s (112 MB/s)
+Fetched 60.6 MB in 0s (156 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package libpython3.13-minimal:arm64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19898 files and directories currently installed.)
@@ -823,8 +855,8 @@
 Setting up tzdata (2025a-2) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Sun Apr 19 19:11:20 UTC 2026.
-Universal Time is now:  Sun Apr 19 19:11:20 UTC 2026.
+Local time is now:      Mon Mar 17 13:14:18 UTC 2025.
+Universal Time is now:  Mon Mar 17 13:14:18 UTC 2025.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17030-1) ...
@@ -970,7 +1002,11 @@
 fakeroot is already the newest version (1.37.1-1).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/reproducible-path/git-2.49.0+next.20250314/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../git_2.49.0+next.20250314-1_source.changes
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for experimental
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-2.49.0+next.20250314/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../git_2.49.0+next.20250314-1_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.49.0+next.20250314-1
 dpkg-buildpackage: info: source distribution experimental
@@ -997,8 +1033,7 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/contrib/subtree'
 /usr/bin/make clean NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 PYTHON_PATH=/usr/bin/python3 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' HOST_CPU='aarch64' V=1 USE_LIBPCRE2=1
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f /build/reproducible-path/git-2.49.0+next.20250314/./*.gcda /build/reproducible-path/git-2.49.0+next.20250314/builtin/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/linux/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/simple-ipc/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/ewah/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/negotiator/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/oss-fuzz/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/refs/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/reftable/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/sha1dc/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/sha256/block/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/helper/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/clar/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/trace2/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/xdiff/*.gcda
-rm -f /build/reproducible-path/git-2.49.0+next.20250314/./*.gcno /build/reproducible-path/git-2.49.0+next.20250314/builtin/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/linux/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/ewah/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/negotiator/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/oss-fuzz/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/refs/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/reftable/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/sha1dc/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/sha256/block/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/helper/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/trace2/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/xdiff/*.gcno
+rm -f gitweb/gitweb.cgi gitweb/static/gitweb.js gitweb/static/gitweb.min.js gitweb/static/gitweb.min.css gitweb/GITWEB-BUILD-OPTIONS
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f GIT-SPATCH-DEFINES
@@ -1006,6 +1041,10 @@
 rm -f contrib/coccinelle/*.cocci.patch
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f /build/reproducible-path/git-2.49.0+next.20250314/./*.gcda /build/reproducible-path/git-2.49.0+next.20250314/builtin/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/linux/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/compat/simple-ipc/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/ewah/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/negotiator/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/oss-fuzz/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/refs/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/reftable/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/sha1dc/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/sha256/block/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/helper/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/clar/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/trace2/*.gcda /build/reproducible-path/git-2.49.0+next.20250314/xdiff/*.gcda
+rm -f /build/reproducible-path/git-2.49.0+next.20250314/./*.gcno /build/reproducible-path/git-2.49.0+next.20250314/builtin/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/linux/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/compat/simple-ipc/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/ewah/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/negotiator/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/oss-fuzz/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/refs/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/reftable/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/sha1dc/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/sha256/block/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/helper/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/t/unit-tests/clar/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/trace2/*.gcno /build/reproducible-path/git-2.49.0+next.20250314/xdiff/*.gcno
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f ./*.gcov builtin/*.gcov compat/*.gcov compat/linux/*.gcov compat/simple-ipc/*.gcov ewah/*.gcov negotiator/*.gcov oss-fuzz/*.gcov refs/*.gcov reftable/*.gcov sha1dc/*.gcov sha256/block/*.gcov t/helper/*.gcov t/unit-tests/*.gcov t/unit-tests/clar/*.gcov trace2/*.gcov xdiff/*.gcov
 rm -f ./*.gcda builtin/*.gcda compat/*.gcda compat/linux/*.gcda compat/simple-ipc/*.gcda ewah/*.gcda negotiator/*.gcda oss-fuzz/*.gcda refs/*.gcda reftable/*.gcda sha1dc/*.gcda sha256/block/*.gcda t/helper/*.gcda t/unit-tests/*.gcda t/unit-tests/clar/*.gcda trace2/*.gcda xdiff/*.gcda
 rm -f coverage-untested-functions
@@ -1014,9 +1053,6 @@
 rm -f coverage-test.made
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f gitweb/gitweb.cgi gitweb/static/gitweb.js gitweb/static/gitweb.min.js gitweb/static/gitweb.min.css gitweb/GITWEB-BUILD-OPTIONS
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f ./*.gcno builtin/*.gcno compat/*.gcno compat/linux/*.gcno compat/simple-ipc/*.gcno ewah/*.gcno negotiator/*.gcno oss-fuzz/*.gcno refs/*.gcno reftable/*.gcno sha1dc/*.gcno sha256/block/*.gcno t/helper/*.gcno t/unit-tests/*.gcno t/unit-tests/clar/*.gcno trace2/*.gcno xdiff/*.gcno
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -1132,211 +1168,178 @@
     * new prefix flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o common-main.o -c -MF ./.depend/common-main.o.d -MQ common-main.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.c
+gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blob.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o base85.o -c -MF ./.depend/base85.o.d -MQ base85.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  base85.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o alias.o -c -MF ./.depend/alias.o.d -MQ alias.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alias.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o alloc.o -c -MF ./.depend/alloc.o.d -MQ alloc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alloc.c
+gcc -o cbtree.o -c -MF ./.depend/cbtree.o.d -MQ cbtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cbtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o abspath.o -c -MF ./.depend/abspath.o.d -MQ abspath.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  abspath.c
+gcc -o chdir-notify.o -c -MF ./.depend/chdir-notify.o.d -MQ chdir-notify.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chdir-notify.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o advice.o -c -MF ./.depend/advice.o.d -MQ advice.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  advice.c
+gcc -o chunk-format.o -c -MF ./.depend/chunk-format.o.d -MQ chunk-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chunk-format.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blob.c
+gcc -o bloom.o -c -MF ./.depend/bloom.o.d -MQ bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bloom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o archive-tar.o -c -MF ./.depend/archive-tar.o.d -MQ archive-tar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-tar.c
+gcc -o checkout.o -c -MF ./.depend/checkout.o.d -MQ checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o bulk-checkin.o -c -MF ./.depend/bulk-checkin.o.d -MQ bulk-checkin.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bulk-checkin.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o archive-zip.o -c -MF ./.depend/archive-zip.o.d -MQ archive-zip.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-zip.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o bloom.o -c -MF ./.depend/bloom.o.d -MQ bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bloom.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o chdir-notify.o -c -MF ./.depend/chdir-notify.o.d -MQ chdir-notify.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chdir-notify.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o branch.o -c -MF ./.depend/branch.o.d -MQ branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o archive.o -c -MF ./.depend/archive.o.d -MQ archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive.c
+gcc -o column.o -c -MF ./.depend/column.o.d -MQ column.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  column.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o cbtree.o -c -MF ./.depend/cbtree.o.d -MQ cbtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cbtree.c
+gcc -o common-exit.o -c -MF ./.depend/common-exit.o.d -MQ common-exit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-exit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o checkout.o -c -MF ./.depend/checkout.o.d -MQ checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  checkout.c
+gcc -o color.o -c -MF ./.depend/color.o.d -MQ color.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  color.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o add-interactive.o -c -MF ./.depend/add-interactive.o.d -MQ add-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-interactive.c
+gcc -o cache-tree.o -c -MF ./.depend/cache-tree.o.d -MQ cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o bisect.o -c -MF ./.depend/bisect.o.d -MQ bisect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bisect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o bundle-uri.o -c -MF ./.depend/bundle-uri.o.d -MQ bundle-uri.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle-uri.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o bundle.o -c -MF ./.depend/bundle.o.d -MQ bundle.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o chunk-format.o -c -MF ./.depend/chunk-format.o.d -MQ chunk-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  chunk-format.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o column.o -c -MF ./.depend/column.o.d -MQ column.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  column.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o common-exit.o -c -MF ./.depend/common-exit.o.d -MQ common-exit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-exit.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o common-init.o -c -MF ./.depend/common-init.o.d -MQ common-init.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-init.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/nonblock.o -c -MF compat/.depend/nonblock.o.d -MQ compat/nonblock.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/nonblock.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o color.o -c -MF ./.depend/color.o.d -MQ color.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  color.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/obstack.o -c -MF compat/.depend/obstack.o.d -MQ compat/obstack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/obstack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o connected.o -c -MF ./.depend/connected.o.d -MQ connected.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connected.c
+gcc -o bundle.o -c -MF ./.depend/bundle.o.d -MQ bundle.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o cache-tree.o -c -MF ./.depend/cache-tree.o.d -MQ cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  cache-tree.c
+gcc -o bundle-uri.o -c -MF ./.depend/bundle-uri.o.d -MQ bundle-uri.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  bundle-uri.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/terminal.o -c -MF compat/.depend/terminal.o.d -MQ compat/terminal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/terminal.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o copy.o -c -MF ./.depend/copy.o.d -MQ copy.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  copy.c
+gcc -o connected.o -c -MF ./.depend/connected.o.d -MQ connected.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connected.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  csum-file.c
+gcc -o copy.o -c -MF ./.depend/copy.o.d -MQ copy.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  copy.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o blame.o -c -MF ./.depend/blame.o.d -MQ blame.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blame.c
+gcc -o ctype.o -c -MF ./.depend/ctype.o.d -MQ ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o commit-reach.o -c -MF ./.depend/commit-reach.o.d -MQ commit-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-reach.c
+gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  csum-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o credential.o -c -MF ./.depend/credential.o.d -MQ credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  credential.c
+gcc -o decorate.o -c -MF ./.depend/decorate.o.d -MQ decorate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  decorate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o add-patch.o -c -MF ./.depend/add-patch.o.d -MQ add-patch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-patch.c
+gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ctype.o -c -MF ./.depend/ctype.o.d -MQ ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ctype.c
+gcc -o commit.o -c -MF ./.depend/commit.o.d -MQ commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o decorate.o -c -MF ./.depend/decorate.o.d -MQ decorate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  decorate.c
+gcc -o combine-diff.o -c -MF ./.depend/combine-diff.o.d -MQ combine-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  combine-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connect.c
+gcc -o diagnose.o -c -MF ./.depend/diagnose.o.d -MQ diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diagnose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diagnose.o -c -MF ./.depend/diagnose.o.d -MQ diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diagnose.c
+gcc -o commit-reach.o -c -MF ./.depend/commit-reach.o.d -MQ commit-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-reach.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o combine-diff.o -c -MF ./.depend/combine-diff.o.d -MQ combine-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  combine-diff.c
+gcc -o credential.o -c -MF ./.depend/credential.o.d -MQ credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  credential.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diff-delta.o -c -MF ./.depend/diff-delta.o.d -MQ diff-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-delta.c
+gcc -o convert.o -c -MF ./.depend/convert.o.d -MQ convert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  convert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o diff-merges.o -c -MF ./.depend/diff-merges.o.d -MQ diff-merges.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-merges.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o commit.o -c -MF ./.depend/commit.o.d -MQ commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit.c
+gcc -o date.o -c -MF ./.depend/date.o.d -MQ date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diffcore-break.o -c -MF ./.depend/diffcore-break.o.d -MQ diffcore-break.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-break.c
+gcc -o diff-delta.o -c -MF ./.depend/diff-delta.o.d -MQ diff-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o convert.o -c -MF ./.depend/convert.o.d -MQ convert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  convert.c
+gcc -o diffcore-break.o -c -MF ./.depend/diffcore-break.o.d -MQ diffcore-break.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-break.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o diffcore-delta.o -c -MF ./.depend/diffcore-delta.o.d -MQ diffcore-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o delta-islands.o -c -MF ./.depend/delta-islands.o.d -MQ delta-islands.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  delta-islands.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o diffcore-order.o -c -MF ./.depend/diffcore-order.o.d -MQ diffcore-order.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-order.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diff-lib.o -c -MF ./.depend/diff-lib.o.d -MQ diff-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-lib.c
+gcc -o diffcore-pickaxe.o -c -MF ./.depend/diffcore-pickaxe.o.d -MQ diffcore-pickaxe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-pickaxe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diff-no-index.o -c -MF ./.depend/diff-no-index.o.d -MQ diff-no-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.c
+gcc -o blame.o -c -MF ./.depend/blame.o.d -MQ blame.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  blame.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o diffcore-rotate.o -c -MF ./.depend/diffcore-rotate.o.d -MQ diffcore-rotate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rotate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o date.o -c -MF ./.depend/date.o.d -MQ date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  date.c
+gcc -o dir-iterator.o -c -MF ./.depend/dir-iterator.o.d -MQ dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir-iterator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o delta-islands.o -c -MF ./.depend/delta-islands.o.d -MQ delta-islands.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  delta-islands.c
+gcc -o editor.o -c -MF ./.depend/editor.o.d -MQ editor.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  editor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diffcore-pickaxe.o -c -MF ./.depend/diffcore-pickaxe.o.d -MQ diffcore-pickaxe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-pickaxe.c
+gcc -o diff-no-index.o -c -MF ./.depend/diff-no-index.o.d -MQ diff-no-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-no-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o dir-iterator.o -c -MF ./.depend/dir-iterator.o.d -MQ dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir-iterator.c
+gcc -o commit-graph.o -c -MF ./.depend/commit-graph.o.d -MQ commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o environment.o -c -MF ./.depend/environment.o.d -MQ environment.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
+gcc -o ewah/ewah_rlw.o -c -MF ewah/.depend/ewah_rlw.o.d -MQ ewah/ewah_rlw.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_rlw.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o editor.o -c -MF ./.depend/editor.o.d -MQ editor.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  editor.c
+gcc -o ewah/bitmap.o -c -MF ewah/.depend/bitmap.o.d -MQ ewah/bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o entry.o -c -MF ./.depend/entry.o.d -MQ entry.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  entry.c
+gcc -o environment.o -c -MF ./.depend/environment.o.d -MQ environment.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  environment.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ewah/bitmap.o -c -MF ewah/.depend/bitmap.o.d -MQ ewah/bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/bitmap.c
+gcc -o diff-lib.o -c -MF ./.depend/diff-lib.o.d -MQ diff-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-lib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o ewah/ewah_io.o -c -MF ewah/.depend/ewah_io.o.d -MQ ewah/ewah_io.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_io.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ewah/ewah_rlw.o -c -MF ewah/.depend/ewah_rlw.o.d -MQ ewah/ewah_rlw.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_rlw.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o commit-graph.o -c -MF ./.depend/commit-graph.o.d -MQ commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  commit-graph.c
+gcc -o fetch-negotiator.o -c -MF ./.depend/fetch-negotiator.o.d -MQ fetch-negotiator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-negotiator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o fetch-negotiator.o -c -MF ./.depend/fetch-negotiator.o.d -MQ fetch-negotiator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-negotiator.c
+gcc -o ewah/ewah_bitmap.o -c -MF ewah/.depend/ewah_bitmap.o.d -MQ ewah/ewah_bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o exec-cmd.o -c -MF ./.depend/exec-cmd.o.d -MQ exec-cmd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_EXEC_PATH="/usr/lib/git-core"' '-DGIT_LOCALE_PATH="share/locale"' '-DBINDIR="bin"' '-DFALLBACK_RUNTIME_PREFIX="/usr"' exec-cmd.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ewah/ewah_bitmap.o -c -MF ewah/.depend/ewah_bitmap.o.d -MQ ewah/ewah_bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ewah/ewah_bitmap.c
+gcc -o entry.o -c -MF ./.depend/entry.o.d -MQ entry.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  entry.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o fsmonitor-ipc.o -c -MF ./.depend/fsmonitor-ipc.o.d -MQ fsmonitor-ipc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-ipc.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o gettext.o -c -MF ./.depend/gettext.o.d -MQ gettext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o fsmonitor-settings.o -c -MF ./.depend/fsmonitor-settings.o.d -MQ fsmonitor-settings.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor-settings.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o config.o -c -MF ./.depend/config.o.d -MQ config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
+gcc -o gettext.o -c -MF ./.depend/gettext.o.d -MQ gettext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o fsmonitor.o -c -MF ./.depend/fsmonitor.o.d -MQ fsmonitor.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsmonitor.c
@@ -1345,10 +1348,10 @@
 gcc -o git-zlib.o -c -MF ./.depend/git-zlib.o.d -MQ git-zlib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  git-zlib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o hash-lookup.o -c -MF ./.depend/hash-lookup.o.d -MQ hash-lookup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash-lookup.c
+gcc -o diffcore-rename.o -c -MF ./.depend/diffcore-rename.o.d -MQ diffcore-rename.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rename.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diffcore-rename.o -c -MF ./.depend/diffcore-rename.o.d -MQ diffcore-rename.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-rename.c
+gcc -o hash-lookup.o -c -MF ./.depend/hash-lookup.o.d -MQ hash-lookup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hash-lookup.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh ./generate-cmdlist.sh \
@@ -1359,43 +1362,40 @@
 gcc -o fmt-merge-msg.o -c -MF ./.depend/fmt-merge-msg.o.d -MQ fmt-merge-msg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fmt-merge-msg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o hashmap.o -c -MF ./.depend/hashmap.o.d -MQ hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hashmap.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o hex-ll.o -c -MF ./.depend/hex-ll.o.d -MQ hex-ll.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex-ll.c
+gcc -o config.o -c -MF ./.depend/config.o.d -MQ config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o hex.o -c -MF ./.depend/hex.o.d -MQ hex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o hook.o -c -MF ./.depend/hook.o.d -MQ hook.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hook.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o gpg-interface.o -c -MF ./.depend/gpg-interface.o.d -MQ gpg-interface.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  gpg-interface.c
+gcc -o hashmap.o -c -MF ./.depend/hashmap.o.d -MQ hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o apply.o -c -MF ./.depend/apply.o.d -MQ apply.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  apply.c
+gcc -o hex-ll.o -c -MF ./.depend/hex-ll.o.d -MQ hex-ll.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hex-ll.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o fsck.o -c -MF ./.depend/fsck.o.d -MQ fsck.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsck.c
+gcc -o gpg-interface.o -c -MF ./.depend/gpg-interface.o.d -MQ gpg-interface.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  gpg-interface.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o levenshtein.o -c -MF ./.depend/levenshtein.o.d -MQ levenshtein.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  levenshtein.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o graph.o -c -MF ./.depend/graph.o.d -MQ graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
+gcc -o hook.o -c -MF ./.depend/hook.o.d -MQ hook.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  hook.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o json-writer.o -c -MF ./.depend/json-writer.o.d -MQ json-writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  json-writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ident.o -c -MF ./.depend/ident.o.d -MQ ident.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ident.c
+gcc -o linear-assignment.o -c -MF ./.depend/linear-assignment.o.d -MQ linear-assignment.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  linear-assignment.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o line-range.o -c -MF ./.depend/line-range.o.d -MQ line-range.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-range.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o linear-assignment.o -c -MF ./.depend/linear-assignment.o.d -MQ linear-assignment.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  linear-assignment.c
+gcc -o ident.o -c -MF ./.depend/ident.o.d -MQ ident.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ident.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o grep.o -c -MF ./.depend/grep.o.d -MQ grep.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  grep.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o list-objects-filter-options.o -c -MF ./.depend/list-objects-filter-options.o.d -MQ list-objects-filter-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter-options.c
@@ -1404,43 +1404,52 @@
 gcc -o list-objects.o -c -MF ./.depend/list-objects.o.d -MQ list-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o graph.o -c -MF ./.depend/graph.o.d -MQ graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o lockfile.o -c -MF ./.depend/lockfile.o.d -MQ lockfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  lockfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o kwset.o -c -MF ./.depend/kwset.o.d -MQ kwset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  kwset.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o list-objects-filter.o -c -MF ./.depend/list-objects-filter.o.d -MQ list-objects-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  list-objects-filter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o kwset.o -c -MF ./.depend/kwset.o.d -MQ kwset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  kwset.c
+gcc -o fsck.o -c -MF ./.depend/fsck.o.d -MQ fsck.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fsck.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ls-refs.o -c -MF ./.depend/ls-refs.o.d -MQ ls-refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ls-refs.c
+gcc -o line-log.o -c -MF ./.depend/line-log.o.d -MQ line-log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-log.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o grep.o -c -MF ./.depend/grep.o.d -MQ grep.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  grep.c
+gcc -o ls-refs.o -c -MF ./.depend/ls-refs.o.d -MQ ls-refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ls-refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o mailmap.o -c -MF ./.depend/mailmap.o.d -MQ mailmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o loose.o -c -MF ./.depend/loose.o.d -MQ loose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  loose.c
+gcc -o merge-blobs.o -c -MF ./.depend/merge-blobs.o.d -MQ merge-blobs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-blobs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o merge-blobs.o -c -MF ./.depend/merge-blobs.o.d -MQ merge-blobs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-blobs.c
+gcc -o match-trees.o -c -MF ./.depend/match-trees.o.d -MQ match-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  match-trees.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o fetch-pack.o -c -MF ./.depend/fetch-pack.o.d -MQ fetch-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o mem-pool.o -c -MF ./.depend/mem-pool.o.d -MQ mem-pool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mem-pool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o match-trees.o -c -MF ./.depend/match-trees.o.d -MQ match-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  match-trees.c
+gcc -o merge-ort-wrappers.o -c -MF ./.depend/merge-ort-wrappers.o.d -MQ merge-ort-wrappers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort-wrappers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o log-tree.o -c -MF ./.depend/log-tree.o.d -MQ log-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  log-tree.c
+gcc -o merge-ll.o -c -MF ./.depend/merge-ll.o.d -MQ merge-ll.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ll.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o line-log.o -c -MF ./.depend/line-log.o.d -MQ line-log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  line-log.c
+gcc -o loose.o -c -MF ./.depend/loose.o.d -MQ loose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  loose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o merge-ort-wrappers.o -c -MF ./.depend/merge-ort-wrappers.o.d -MQ merge-ort-wrappers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort-wrappers.c
+gcc -o log-tree.o -c -MF ./.depend/log-tree.o.d -MQ log-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  log-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o merge.o -c -MF ./.depend/merge.o.d -MQ merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge.c
@@ -1449,28 +1458,25 @@
 gcc -o dir.o -c -MF ./.depend/dir.o.d -MQ dir.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  dir.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o merge-ll.o -c -MF ./.depend/merge-ll.o.d -MQ merge-ll.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ll.c
+gcc -o negotiator/default.o -c -MF negotiator/.depend/default.o.d -MQ negotiator/default.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/default.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o negotiator/noop.o -c -MF negotiator/.depend/noop.o.d -MQ negotiator/noop.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/noop.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o negotiator/default.o -c -MF negotiator/.depend/default.o.d -MQ negotiator/default.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/default.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o negotiator/skipping.o -c -MF negotiator/.depend/skipping.o.d -MQ negotiator/skipping.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  negotiator/skipping.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o notes-cache.o -c -MF ./.depend/notes-cache.o.d -MQ notes-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-cache.c
+gcc -o mailinfo.o -c -MF ./.depend/mailinfo.o.d -MQ mailinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o fetch-pack.o -c -MF ./.depend/fetch-pack.o.d -MQ fetch-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fetch-pack.c
+gcc -o notes-cache.o -c -MF ./.depend/notes-cache.o.d -MQ notes-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o name-hash.o -c -MF ./.depend/name-hash.o.d -MQ name-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  name-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o mailinfo.o -c -MF ./.depend/mailinfo.o.d -MQ mailinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  mailinfo.c
+gcc -o midx.o -c -MF ./.depend/midx.o.d -MQ midx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o notes-utils.o -c -MF ./.depend/notes-utils.o.d -MQ notes-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-utils.c
@@ -1479,22 +1485,19 @@
 gcc -o object-file-convert.o -c -MF ./.depend/object-file-convert.o.d -MQ object-file-convert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file-convert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o midx.o -c -MF ./.depend/midx.o.d -MQ midx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx.c
+gcc -o oidmap.o -c -MF ./.depend/oidmap.o.d -MQ oidmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o oid-array.o -c -MF ./.depend/oid-array.o.d -MQ oid-array.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oid-array.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oidmap.o -c -MF ./.depend/oidmap.o.d -MQ oidmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidmap.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oidtree.o -c -MF ./.depend/oidtree.o.d -MQ oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidtree.c
+gcc -o notes-merge.o -c -MF ./.depend/notes-merge.o.d -MQ notes-merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o object.o -c -MF ./.depend/object.o.d -MQ object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o notes-merge.o -c -MF ./.depend/notes-merge.o.d -MQ notes-merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes-merge.c
+gcc -o oidtree.o -c -MF ./.depend/oidtree.o.d -MQ oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o oidset.o -c -MF ./.depend/oidset.o.d -MQ oidset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oidset.c
@@ -1503,58 +1506,55 @@
 gcc -o pack-check.o -c -MF ./.depend/pack-check.o.d -MQ pack-check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-check.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o notes.o -c -MF ./.depend/notes.o.d -MQ notes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o pack-mtimes.o -c -MF ./.depend/pack-mtimes.o.d -MQ pack-mtimes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-mtimes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o midx-write.o -c -MF ./.depend/midx-write.o.d -MQ midx-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx-write.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pack-objects.o -c -MF ./.depend/pack-objects.o.d -MQ pack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-objects.c
+gcc -o object-name.o -c -MF ./.depend/object-name.o.d -MQ object-name.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-name.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pager.o -c -MF ./.depend/pager.o.d -MQ pager.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c"' pager.c
+gcc -o pack-revindex.o -c -MF ./.depend/pack-revindex.o.d -MQ pack-revindex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-revindex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o object-name.o -c -MF ./.depend/object-name.o.d -MQ object-name.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-name.c
+gcc -o pack-objects.o -c -MF ./.depend/pack-objects.o.d -MQ pack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pack-revindex.o -c -MF ./.depend/pack-revindex.o.d -MQ pack-revindex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-revindex.c
+gcc -o notes.o -c -MF ./.depend/notes.o.d -MQ notes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  notes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o pack-write.o -c -MF ./.depend/pack-write.o.d -MQ pack-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o parse.o -c -MF ./.depend/parse.o.d -MQ parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse.c
+gcc -o pack-bitmap-write.o -c -MF ./.depend/pack-bitmap-write.o.d -MQ pack-bitmap-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o parallel-checkout.o -c -MF ./.depend/parallel-checkout.o.d -MQ parallel-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parallel-checkout.c
+gcc -o midx-write.o -c -MF ./.depend/midx-write.o.d -MQ midx-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  midx-write.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o parse-options-cb.o -c -MF ./.depend/parse-options-cb.o.d -MQ parse-options-cb.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options-cb.c
+gcc -o pager.o -c -MF ./.depend/pager.o.d -MQ pager.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c"' pager.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o patch-delta.o -c -MF ./.depend/patch-delta.o.d -MQ patch-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-delta.c
+gcc -o parse.o -c -MF ./.depend/parse.o.d -MQ parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pack-bitmap-write.o -c -MF ./.depend/pack-bitmap-write.o.d -MQ pack-bitmap-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap-write.c
+gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-recursive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o patch-ids.o -c -MF ./.depend/patch-ids.o.d -MQ patch-ids.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-ids.c
+gcc -o parallel-checkout.o -c -MF ./.depend/parallel-checkout.o.d -MQ parallel-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parallel-checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o preload-index.o -c -MF ./.depend/preload-index.o.d -MQ preload-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  preload-index.c
+gcc -o patch-delta.o -c -MF ./.depend/patch-delta.o.d -MQ patch-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o object-file.o -c -MF ./.depend/object-file.o.d -MQ object-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  object-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-recursive.c
+gcc -o parse-options-cb.o -c -MF ./.depend/parse-options-cb.o.d -MQ parse-options-cb.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options-cb.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o path-walk.o -c -MF ./.depend/path-walk.o.d -MQ path-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path-walk.c
+gcc -o patch-ids.o -c -MF ./.depend/patch-ids.o.d -MQ patch-ids.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  patch-ids.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o preload-index.o -c -MF ./.depend/preload-index.o.d -MQ preload-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  preload-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o prio-queue.o -c -MF ./.depend/prio-queue.o.d -MQ prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prio-queue.c
@@ -1563,16 +1563,16 @@
 gcc -o parse-options.o -c -MF ./.depend/parse-options.o.d -MQ parse-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o packfile.o -c -MF ./.depend/packfile.o.d -MQ packfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  packfile.c
+gcc -o diff.o -c -MF ./.depend/diff.o.d -MQ diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o progress.o -c -MF ./.depend/progress.o.d -MQ progress.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  progress.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pkt-line.o -c -MF ./.depend/pkt-line.o.d -MQ pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pkt-line.c
+gcc -o pathspec.o -c -MF ./.depend/pathspec.o.d -MQ pathspec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pathspec.o -c -MF ./.depend/pathspec.o.d -MQ pathspec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
+gcc -o path-walk.o -c -MF ./.depend/path-walk.o.d -MQ path-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o prompt.o -c -MF ./.depend/prompt.o.d -MQ prompt.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prompt.c
@@ -1581,97 +1581,103 @@
 gcc -o protocol.o -c -MF ./.depend/protocol.o.d -MQ protocol.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o pkt-line.o -c -MF ./.depend/pkt-line.o.d -MQ pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pkt-line.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o path.o -c -MF ./.depend/path.o.d -MQ path.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  path.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o protocol-caps.o -c -MF ./.depend/protocol-caps.o.d -MQ protocol-caps.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  protocol-caps.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o prune-packed.o -c -MF ./.depend/prune-packed.o.d -MQ prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prune-packed.c
+gcc -o pack-bitmap.o -c -MF ./.depend/pack-bitmap.o.d -MQ pack-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o promisor-remote.o -c -MF ./.depend/promisor-remote.o.d -MQ promisor-remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  promisor-remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o prune-packed.o -c -MF ./.depend/prune-packed.o.d -MQ prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  prune-packed.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o rebase-interactive.o -c -MF ./.depend/rebase-interactive.o.d -MQ rebase-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase-interactive.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o rebase.o -c -MF ./.depend/rebase.o.d -MQ rebase.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pack-bitmap.o -c -MF ./.depend/pack-bitmap.o.d -MQ pack-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pack-bitmap.c
+gcc -o packfile.o -c -MF ./.depend/packfile.o.d -MQ packfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  packfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reachable.o -c -MF ./.depend/reachable.o.d -MQ reachable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reachable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o rebase-interactive.o -c -MF ./.depend/rebase-interactive.o.d -MQ rebase-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rebase-interactive.c
+gcc -o merge-ort.o -c -MF ./.depend/merge-ort.o.d -MQ merge-ort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o quote.o -c -MF ./.depend/quote.o.d -MQ quote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  quote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o range-diff.o -c -MF ./.depend/range-diff.o.d -MQ range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  range-diff.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reflog-walk.o -c -MF ./.depend/reflog-walk.o.d -MQ reflog-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reflog.o -c -MF ./.depend/reflog.o.d -MQ reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reflog.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/debug.o -c -MF refs/.depend/debug.o.d -MQ refs/debug.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/debug.c
+gcc -o pseudo-merge.o -c -MF ./.depend/pseudo-merge.o.d -MQ pseudo-merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pseudo-merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o pseudo-merge.o -c -MF ./.depend/pseudo-merge.o.d -MQ pseudo-merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pseudo-merge.c
+gcc -o refs/debug.o -c -MF refs/.depend/debug.o.d -MQ refs/debug.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/debug.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o range-diff.o -c -MF ./.depend/range-diff.o.d -MQ range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  range-diff.c
+gcc -o refs/iterator.o -c -MF refs/.depend/iterator.o.d -MQ refs/iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/iterator.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o merge-ort.o -c -MF ./.depend/merge-ort.o.d -MQ merge-ort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  merge-ort.c
+gcc -o refs/ref-cache.o -c -MF refs/.depend/ref-cache.o.d -MQ refs/ref-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o diff.o -c -MF ./.depend/diff.o.d -MQ diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff.c
+gcc -o replace-object.o -c -MF ./.depend/replace-object.o.d -MQ replace-object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  replace-object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/iterator.o -c -MF refs/.depend/iterator.o.d -MQ refs/iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/iterator.c
+gcc -o repo-settings.o -c -MF ./.depend/repo-settings.o.d -MQ repo-settings.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repo-settings.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o replace-object.o -c -MF ./.depend/replace-object.o.d -MQ replace-object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  replace-object.c
+gcc -o reset.o -c -MF ./.depend/reset.o.d -MQ reset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o refspec.o -c -MF ./.depend/refspec.o.d -MQ refspec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refspec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/ref-cache.o -c -MF refs/.depend/ref-cache.o.d -MQ refs/ref-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.c
+gcc -o refs/packed-backend.o -c -MF refs/.depend/packed-backend.o.d -MQ refs/packed-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/packed-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o pretty.o -c -MF ./.depend/pretty.o.d -MQ pretty.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pretty.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o repo-settings.o -c -MF ./.depend/repo-settings.o.d -MQ repo-settings.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repo-settings.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o repository.o -c -MF ./.depend/repository.o.d -MQ repository.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  repository.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reset.o -c -MF ./.depend/reset.o.d -MQ reset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reset.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o resolve-undo.o -c -MF ./.depend/resolve-undo.o.d -MQ resolve-undo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  resolve-undo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/packed-backend.o -c -MF refs/.depend/packed-backend.o.d -MQ refs/packed-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/packed-backend.c
+gcc -o refs/reftable-backend.o -c -MF refs/.depend/reftable-backend.o.d -MQ refs/reftable-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/reftable-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  serve.c
+gcc -o rerere.o -c -MF ./.depend/rerere.o.d -MQ rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o rerere.o -c -MF ./.depend/rerere.o.d -MQ rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.c
+gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  serve.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/files-backend.o -c -MF refs/.depend/files-backend.o.d -MQ refs/files-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/files-backend.c
+gcc -o read-cache.o -c -MF ./.depend/read-cache.o.d -MQ read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  read-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs/reftable-backend.o -c -MF refs/.depend/reftable-backend.o.d -MQ refs/reftable-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/reftable-backend.c
+gcc -o ref-filter.o -c -MF ./.depend/ref-filter.o.d -MQ ref-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ref-filter.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o send-pack.o -c -MF ./.depend/send-pack.o.d -MQ send-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  send-pack.c
+gcc -o refs.o -c -MF ./.depend/refs.o.d -MQ refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o server-info.o -c -MF ./.depend/server-info.o.d -MQ server-info.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  server-info.c
@@ -1683,13 +1689,13 @@
 gcc -o sigchain.o -c -MF ./.depend/sigchain.o.d -MQ sigchain.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sigchain.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o read-cache.o -c -MF ./.depend/read-cache.o.d -MQ read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  read-cache.c
+gcc -o send-pack.o -c -MF ./.depend/send-pack.o.d -MQ send-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  send-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o refs.o -c -MF ./.depend/refs.o.d -MQ refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs.c
+gcc -o stable-qsort.o -c -MF ./.depend/stable-qsort.o.d -MQ stable-qsort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  stable-qsort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o sparse-index.o -c -MF ./.depend/sparse-index.o.d -MQ sparse-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sparse-index.c
+gcc -o run-command.o -c -MF ./.depend/run-command.o.d -MQ run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  run-command.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o split-index.o -c -MF ./.depend/split-index.o.d -MQ split-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  split-index.c
@@ -1698,244 +1704,235 @@
 gcc -o statinfo.o -c -MF ./.depend/statinfo.o.d -MQ statinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  statinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o stable-qsort.o -c -MF ./.depend/stable-qsort.o.d -MQ stable-qsort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  stable-qsort.c
+gcc -o refs/files-backend.o -c -MF refs/.depend/files-backend.o.d -MQ refs/files-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/files-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o strvec.o -c -MF ./.depend/strvec.o.d -MQ strvec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
+gcc -o streaming.o -c -MF ./.depend/streaming.o.d -MQ streaming.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  streaming.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ref-filter.o -c -MF ./.depend/ref-filter.o.d -MQ ref-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ref-filter.c
+gcc -o shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shallow.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o strmap.o -c -MF ./.depend/strmap.o.d -MQ strmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strmap.c
+gcc -o remote.o -c -MF ./.depend/remote.o.d -MQ remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o streaming.o -c -MF ./.depend/streaming.o.d -MQ streaming.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  streaming.c
+gcc -o string-list.o -c -MF ./.depend/string-list.o.d -MQ string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  string-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o run-command.o -c -MF ./.depend/run-command.o.d -MQ run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  run-command.c
+gcc -o sparse-index.o -c -MF ./.depend/sparse-index.o.d -MQ sparse-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sparse-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o string-list.o -c -MF ./.depend/string-list.o.d -MQ string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  string-list.c
+gcc -o strmap.o -c -MF ./.depend/strmap.o.d -MQ strmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strmap.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o strvec.o -c -MF ./.depend/strvec.o.d -MQ strvec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o sub-process.o -c -MF ./.depend/sub-process.o.d -MQ sub-process.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sub-process.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o thread-utils.o -c -MF ./.depend/thread-utils.o.d -MQ thread-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  thread-utils.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o symlinks.o -c -MF ./.depend/symlinks.o.d -MQ symlinks.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  symlinks.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o remote.o -c -MF ./.depend/remote.o.d -MQ remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote.c
+gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o tempfile.o -c -MF ./.depend/tempfile.o.d -MQ tempfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tempfile.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tag.c
+gcc -o tmp-objdir.o -c -MF ./.depend/tmp-objdir.o.d -MQ tmp-objdir.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tmp-objdir.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o thread-utils.o -c -MF ./.depend/thread-utils.o.d -MQ thread-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  thread-utils.c
+gcc -o trace2/tr2_cmd_name.o -c -MF trace2/.depend/tr2_cmd_name.o.d -MQ trace2/tr2_cmd_name.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cmd_name.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o shallow.o -c -MF ./.depend/shallow.o.d -MQ shallow.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shallow.c
+gcc -o trace2/tr2_cfg.o -c -MF trace2/.depend/tr2_cfg.o.d -MQ trace2/tr2_cfg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cfg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o tmp-objdir.o -c -MF ./.depend/tmp-objdir.o.d -MQ tmp-objdir.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tmp-objdir.c
+gcc -o submodule-config.o -c -MF ./.depend/submodule-config.o.d -MQ submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace.o -c -MF ./.depend/trace.o.d -MQ trace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
+gcc -o trace2/tr2_ctr.o -c -MF trace2/.depend/tr2_ctr.o.d -MQ trace2/tr2_ctr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_ctr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_cmd_name.o -c -MF trace2/.depend/tr2_cmd_name.o.d -MQ trace2/tr2_cmd_name.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cmd_name.c
+gcc -o trace.o -c -MF ./.depend/trace.o.d -MQ trace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_ctr.o -c -MF trace2/.depend/tr2_ctr.o.d -MQ trace2/tr2_ctr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_ctr.c
+gcc -o trace2/tr2_sid.o -c -MF trace2/.depend/tr2_sid.o.d -MQ trace2/tr2_sid.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2.o -c -MF ./.depend/trace2.o.d -MQ trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.c
+gcc -o trace2/tr2_sysenv.o -c -MF trace2/.depend/tr2_sysenv.o.d -MQ trace2/tr2_sysenv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o setup.o -c -MF ./.depend/setup.o.d -MQ setup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' setup.c
+gcc -o trace2/tr2_tbuf.o -c -MF trace2/.depend/tr2_tbuf.o.d -MQ trace2/tr2_tbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o strbuf.o -c -MF ./.depend/strbuf.o.d -MQ strbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  strbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_cfg.o -c -MF trace2/.depend/tr2_cfg.o.d -MQ trace2/tr2_cfg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_cfg.c
+gcc -o trace2/tr2_dst.o -c -MF trace2/.depend/tr2_dst.o.d -MQ trace2/tr2_dst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_dst.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_sid.o -c -MF trace2/.depend/tr2_sid.o.d -MQ trace2/tr2_sid.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sid.c
+gcc -o setup.o -c -MF ./.depend/setup.o.d -MQ setup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DDEFAULT_GIT_TEMPLATE_DIR='"share/git-core/templates"' setup.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_tbuf.o -c -MF trace2/.depend/tr2_tbuf.o.d -MQ trace2/tr2_tbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.c
+gcc -o trace2.o -c -MF ./.depend/trace2.o.d -MQ trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_sysenv.o -c -MF trace2/.depend/tr2_sysenv.o.d -MQ trace2/tr2_sysenv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.c
+gcc -o trace2/tr2_tmr.o -c -MF trace2/.depend/tr2_tmr.o.d -MQ trace2/tr2_tmr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tmr.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o trace2/tr2_tgt_normal.o -c -MF trace2/.depend/tr2_tgt_normal.o.d -MQ trace2/tr2_tgt_normal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_normal.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o trace2/tr2_tls.o -c -MF trace2/.depend/tr2_tls.o.d -MQ trace2/tr2_tls.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tls.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o submodule-config.o -c -MF ./.depend/submodule-config.o.d -MQ submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule-config.c
+gcc -o submodule.o -c -MF ./.depend/submodule.o.d -MQ submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_tmr.o -c -MF trace2/.depend/tr2_tmr.o.d -MQ trace2/tr2_tmr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tmr.c
+gcc -o tree.o -c -MF ./.depend/tree.o.d -MQ tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_dst.o -c -MF trace2/.depend/tr2_dst.o.d -MQ trace2/tr2_dst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_dst.c
+gcc -o trace2/tr2_tgt_event.o -c -MF trace2/.depend/tr2_tgt_event.o.d -MQ trace2/tr2_tgt_event.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o tree.o -c -MF ./.depend/tree.o.d -MQ tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree.c
+gcc -o trace2/tr2_tgt_perf.o -c -MF trace2/.depend/tr2_tgt_perf.o.d -MQ trace2/tr2_tgt_perf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_perf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_tgt_event.o -c -MF trace2/.depend/tr2_tgt_event.o.d -MQ trace2/tr2_tgt_event.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
+gcc -o url.o -c -MF ./.depend/url.o.d -MQ url.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  url.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o tree-diff.o -c -MF ./.depend/tree-diff.o.d -MQ tree-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_tgt_normal.o -c -MF trace2/.depend/tr2_tgt_normal.o.d -MQ trace2/tr2_tgt_normal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_normal.c
+gcc -o userdiff.o -c -MF ./.depend/userdiff.o.d -MQ userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  userdiff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o url.o -c -MF ./.depend/url.o.d -MQ url.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  url.c
+gcc -o usage.o -c -MF ./.depend/usage.o.d -MQ usage.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  usage.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o trailer.o -c -MF ./.depend/trailer.o.d -MQ trailer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trailer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o trace2/tr2_tgt_perf.o -c -MF trace2/.depend/tr2_tgt_perf.o.d -MQ trace2/tr2_tgt_perf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_perf.c
+gcc -o tree-walk.o -c -MF ./.depend/tree-walk.o.d -MQ tree-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o tree-walk.o -c -MF ./.depend/tree-walk.o.d -MQ tree-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  tree-walk.c
+gcc -o revision.o -c -MF ./.depend/revision.o.d -MQ revision.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  revision.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o usage.o -c -MF ./.depend/usage.o.d -MQ usage.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  usage.c
+gcc -o varint.o -c -MF ./.depend/varint.o.d -MQ varint.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  varint.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o transport-helper.o -c -MF ./.depend/transport-helper.o.d -MQ transport-helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport-helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o urlmatch.o -c -MF ./.depend/urlmatch.o.d -MQ urlmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  urlmatch.c
+gcc -o versioncmp.o -c -MF ./.depend/versioncmp.o.d -MQ versioncmp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  versioncmp.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o userdiff.o -c -MF ./.depend/userdiff.o.d -MQ userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  userdiff.c
+gcc -o urlmatch.o -c -MF ./.depend/urlmatch.o.d -MQ urlmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  urlmatch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o varint.o -c -MF ./.depend/varint.o.d -MQ varint.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  varint.c
+gcc -o transport.o -c -MF ./.depend/transport.o.d -MQ transport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o versioncmp.o -c -MF ./.depend/versioncmp.o.d -MQ versioncmp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  versioncmp.c
+gcc -o walker.o -c -MF ./.depend/walker.o.d -MQ walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  walker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o utf8.o -c -MF ./.depend/utf8.o.d -MQ utf8.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  utf8.c
+gcc -o write-or-die.o -c -MF ./.depend/write-or-die.o.d -MQ write-or-die.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  write-or-die.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o wildmatch.o -c -MF ./.depend/wildmatch.o.d -MQ wildmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wildmatch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o write-or-die.o -c -MF ./.depend/write-or-die.o.d -MQ write-or-die.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  write-or-die.c
+gcc -o utf8.o -c -MF ./.depend/utf8.o.d -MQ utf8.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  utf8.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o wrapper.o -c -MF ./.depend/wrapper.o.d -MQ wrapper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wrapper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o submodule.o -c -MF ./.depend/submodule.o.d -MQ submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  submodule.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o walker.o -c -MF ./.depend/walker.o.d -MQ walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  walker.c
+gcc -o unix-stream-server.o -c -MF ./.depend/unix-stream-server.o.d -MQ unix-stream-server.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-stream-server.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o upload-pack.o -c -MF ./.depend/upload-pack.o.d -MQ upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  upload-pack.c
+gcc -o unix-socket.o -c -MF ./.depend/unix-socket.o.d -MQ unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-socket.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o unix-socket.o -c -MF ./.depend/unix-socket.o.d -MQ unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-socket.c
+gcc -o compat/simple-ipc/ipc-shared.o -c -MF compat/simple-ipc/.depend/ipc-shared.o.d -MQ compat/simple-ipc/ipc-shared.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-shared.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o unix-stream-server.o -c -MF ./.depend/unix-stream-server.o.d -MQ unix-stream-server.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unix-stream-server.c
+gcc -o ws.o -c -MF ./.depend/ws.o.d -MQ ws.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ws.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o sha1dc_git.o -c -MF ./.depend/sha1dc_git.o.d -MQ sha1dc_git.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc_git.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o compat/simple-ipc/ipc-shared.o -c -MF compat/simple-ipc/.depend/ipc-shared.o.d -MQ compat/simple-ipc/ipc-shared.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-shared.c
+gcc -o upload-pack.o -c -MF ./.depend/upload-pack.o.d -MQ upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  upload-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o transport.o -c -MF ./.depend/transport.o.d -MQ transport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  transport.c
+gcc -o xdiff-interface.o -c -MF ./.depend/xdiff-interface.o.d -MQ xdiff-interface.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff-interface.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o xdiff-interface.o -c -MF ./.depend/xdiff-interface.o.d -MQ xdiff-interface.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff-interface.c
+gcc -o compat/linux/procinfo.o -c -MF compat/linux/.depend/procinfo.o.d -MQ compat/linux/procinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/linux/procinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/fopen.o -c -MF compat/.depend/fopen.o.d -MQ compat/fopen.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/fopen.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o ws.o -c -MF ./.depend/ws.o.d -MQ ws.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  ws.c
+gcc -o compat/simple-ipc/ipc-unix-socket.o -c -MF compat/simple-ipc/.depend/ipc-unix-socket.o.d -MQ compat/simple-ipc/ipc-unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/strlcpy.o -c -MF compat/.depend/strlcpy.o.d -MQ compat/strlcpy.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/strlcpy.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o compat/linux/procinfo.o -c -MF compat/linux/.depend/procinfo.o.d -MQ compat/linux/procinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/linux/procinfo.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o sha1dc/ubc_check.o -c -MF sha1dc/.depend/ubc_check.o.d -MQ sha1dc/ubc_check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/ubc_check.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o compat/qsort_s.o -c -MF compat/.depend/qsort_s.o.d -MQ compat/qsort_s.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/qsort_s.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o compat/simple-ipc/ipc-unix-socket.o -c -MF compat/simple-ipc/.depend/ipc-unix-socket.o.d -MQ compat/simple-ipc/ipc-unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/simple-ipc/ipc-unix-socket.c
+gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  worktree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o xdiff/xemit.o -c -MF xdiff/.depend/xemit.o.d -MQ xdiff/xemit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xemit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  worktree.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o xdiff/xhistogram.o -c -MF xdiff/.depend/xhistogram.o.d -MQ xdiff/xhistogram.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xhistogram.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o xdiff/xpatience.o -c -MF xdiff/.depend/xpatience.o.d -MQ xdiff/xpatience.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xpatience.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o revision.o -c -MF ./.depend/revision.o.d -MQ revision.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  revision.c
+gcc -o sha1dc/ubc_check.o -c -MF sha1dc/.depend/ubc_check.o.d -MQ sha1dc/ubc_check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/ubc_check.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o xdiff/xprepare.o -c -MF xdiff/.depend/xprepare.o.d -MQ xdiff/xprepare.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xprepare.c
+gcc -o sha256/block/sha256.o -c -MF sha256/block/.depend/sha256.o.d -MQ sha256/block/sha256.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/error.o -c -MF reftable/.depend/error.o.d -MQ reftable/error.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/error.c
+gcc -o xdiff/xdiffi.o -c -MF xdiff/.depend/xdiffi.o.d -MQ xdiff/xdiffi.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reftable/basics.o -c -MF reftable/.depend/basics.o.d -MQ reftable/basics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/basics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o sha256/block/sha256.o -c -MF sha256/block/.depend/sha256.o.d -MQ sha256/block/sha256.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha256/block/sha256.c
+gcc -o unpack-trees.o -c -MF ./.depend/unpack-trees.o.d -MQ unpack-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unpack-trees.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o unpack-trees.o -c -MF ./.depend/unpack-trees.o.d -MQ unpack-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  unpack-trees.c
+gcc -o xdiff/xpatience.o -c -MF xdiff/.depend/xpatience.o.d -MQ xdiff/xpatience.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xpatience.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o xdiff/xutils.o -c -MF xdiff/.depend/xutils.o.d -MQ xdiff/xutils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xutils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o xdiff/xdiffi.o -c -MF xdiff/.depend/xdiffi.o.d -MQ xdiff/xdiffi.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xdiffi.c
+gcc -o reftable/error.o -c -MF reftable/.depend/error.o.d -MQ reftable/error.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/error.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reftable/blocksource.o -c -MF reftable/.depend/blocksource.o.d -MQ reftable/blocksource.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/blocksource.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o xdiff/xmerge.o -c -MF xdiff/.depend/xmerge.o.d -MQ xdiff/xmerge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xmerge.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/system.o -c -MF reftable/.depend/system.o.d -MQ reftable/system.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/system.c
+gcc -o xdiff/xprepare.o -c -MF xdiff/.depend/xprepare.o.d -MQ xdiff/xprepare.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xprepare.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/tree.o -c -MF reftable/.depend/tree.o.d -MQ reftable/tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/tree.c
+gcc -o reftable/block.o -c -MF reftable/.depend/block.o.d -MQ reftable/block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/block.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/iter.o -c -MF reftable/.depend/iter.o.d -MQ reftable/iter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/iter.c
+gcc -o xdiff/xmerge.o -c -MF xdiff/.depend/xmerge.o.d -MQ xdiff/xmerge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  xdiff/xmerge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o reftable/pq.o -c -MF reftable/.depend/pq.o.d -MQ reftable/pq.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/pq.c
@@ -1944,37 +1941,43 @@
 gcc -o reftable/merged.o -c -MF reftable/.depend/merged.o.d -MQ reftable/merged.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/merged.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/block.o -c -MF reftable/.depend/block.o.d -MQ reftable/block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/block.c
+gcc -o reftable/iter.o -c -MF reftable/.depend/iter.o.d -MQ reftable/iter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/iter.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o reftable/system.o -c -MF reftable/.depend/system.o.d -MQ reftable/system.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/system.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o reftable/tree.o -c -MF reftable/.depend/tree.o.d -MQ reftable/tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o sha1dc/sha1.o -c -MF sha1dc/.depend/sha1.o.d -MQ sha1dc/sha1.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sha1dc/sha1.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/reader.o -c -MF reftable/.depend/reader.o.d -MQ reftable/reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/reader.c
+gcc -o sh-i18n--envsubst.o -c -MF ./.depend/sh-i18n--envsubst.o.d -MQ sh-i18n--envsubst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sh-i18n--envsubst.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o shell.o -c -MF ./.depend/shell.o.d -MQ shell.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  shell.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o http-fetch.o -c -MF ./.depend/http-fetch.o.d -MQ http-fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-fetch.c
+gcc -o reftable/reader.o -c -MF reftable/.depend/reader.o.d -MQ reftable/reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/reader.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o sh-i18n--envsubst.o -c -MF ./.depend/sh-i18n--envsubst.o.d -MQ sh-i18n--envsubst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sh-i18n--envsubst.c
+gcc -o reftable/writer.o -c -MF reftable/.depend/writer.o.d -MQ reftable/writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
     * new script parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-    * new perl-specific parameters
+gcc -o http-fetch.o -c -MF ./.depend/http-fetch.o.d -MQ http-fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-fetch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/writer.o -c -MF reftable/.depend/writer.o.d -MQ reftable/writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/writer.c
+    * new perl-specific parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o http-walker.o -c -MF ./.depend/http-walker.o.d -MQ http-walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-walker.c
+gcc -o http-backend.o -c -MF ./.depend/http-backend.o.d -MQ http-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-backend.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
@@ -1982,16 +1985,10 @@
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o imap-send.o -c -MF ./.depend/imap-send.o.d -MQ imap-send.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  imap-send.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/stack.o -c -MF reftable/.depend/stack.o.d -MQ reftable/stack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/stack.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/add.o -c -MF builtin/.depend/add.o.d -MQ builtin/add.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/add.c
+gcc -o reftable/record.o -c -MF reftable/.depend/record.o.d -MQ reftable/record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o http-backend.o -c -MF ./.depend/http-backend.o.d -MQ http-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-backend.c
+gcc -o http-walker.o -c -MF ./.depend/http-walker.o.d -MQ http-walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-walker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/annotate.o -c -MF builtin/.depend/annotate.o.d -MQ builtin/annotate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/annotate.c
@@ -2000,94 +1997,103 @@
 gcc -o builtin/apply.o -c -MF builtin/.depend/apply.o.d -MQ builtin/apply.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/apply.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o reftable/record.o -c -MF reftable/.depend/record.o.d -MQ reftable/record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/record.c
+gcc -o imap-send.o -c -MF ./.depend/imap-send.o.d -MQ imap-send.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  imap-send.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/archive.o -c -MF builtin/.depend/archive.o.d -MQ builtin/archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/archive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh ./generate-hooklist.sh . hook-list.h
+gcc -o reftable/stack.o -c -MF reftable/.depend/stack.o.d -MQ reftable/stack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/stack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o wt-status.o -c -MF ./.depend/wt-status.o.d -MQ wt-status.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wt-status.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/backfill.o -c -MF builtin/.depend/backfill.o.d -MQ builtin/backfill.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/backfill.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o git.o -c -MF ./.depend/git.o.d -MQ git.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.c
+/bin/sh ./generate-hooklist.sh . hook-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o wt-status.o -c -MF ./.depend/wt-status.o.d -MQ wt-status.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  wt-status.c
+gcc -o builtin/add.o -c -MF builtin/.depend/add.o.d -MQ builtin/add.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/add.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o git.o -c -MF ./.depend/git.o.d -MQ git.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' git.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/bundle.o -c -MF builtin/.depend/bundle.o.d -MQ builtin/bundle.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bundle.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/check-ignore.o -c -MF builtin/.depend/check-ignore.o.d -MQ builtin/check-ignore.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ignore.c
+gcc -o remote-curl.o -c -MF ./.depend/remote-curl.o.d -MQ remote-curl.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote-curl.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/check-attr.o -c -MF builtin/.depend/check-attr.o.d -MQ builtin/check-attr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-attr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o http-push.o -c -MF ./.depend/http-push.o.d -MQ http-push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/check-mailmap.o -c -MF builtin/.depend/check-mailmap.o.d -MQ builtin/check-mailmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-mailmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/check-ref-format.o -c -MF builtin/.depend/check-ref-format.o.d -MQ builtin/check-ref-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ref-format.c
+gcc -o builtin/check-ignore.o -c -MF builtin/.depend/check-ignore.o.d -MQ builtin/check-ignore.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ignore.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/checkout--worker.o -c -MF builtin/.depend/checkout--worker.o.d -MQ builtin/checkout--worker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout--worker.c
+gcc -o builtin/check-ref-format.o -c -MF builtin/.depend/check-ref-format.o.d -MQ builtin/check-ref-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ref-format.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o remote-curl.o -c -MF ./.depend/remote-curl.o.d -MQ remote-curl.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  remote-curl.c
+gcc -o builtin/checkout--worker.o -c -MF builtin/.depend/checkout--worker.o.d -MQ builtin/checkout--worker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout--worker.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o http-push.o -c -MF ./.depend/http-push.o.d -MQ http-push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
+gcc -o builtin/bisect.o -c -MF builtin/.depend/bisect.o.d -MQ builtin/bisect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bisect.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/cat-file.o -c -MF builtin/.depend/cat-file.o.d -MQ builtin/cat-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
+gcc -o builtin/column.o -c -MF builtin/.depend/column.o.d -MQ builtin/column.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/column.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/checkout-index.o -c -MF builtin/.depend/checkout-index.o.d -MQ builtin/checkout-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.c
+gcc -o sequencer.o -c -MF ./.depend/sequencer.o.d -MQ sequencer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sequencer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/blame.o -c -MF builtin/.depend/blame.o.d -MQ builtin/blame.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/blame.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/column.o -c -MF builtin/.depend/column.o.d -MQ builtin/column.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/column.c
+gcc -o builtin/checkout-index.o -c -MF builtin/.depend/checkout-index.o.d -MQ builtin/checkout-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/bisect.o -c -MF builtin/.depend/bisect.o.d -MQ builtin/bisect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bisect.c
+gcc -o builtin/commit-tree.o -c -MF builtin/.depend/commit-tree.o.d -MQ builtin/commit-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/commit-tree.o -c -MF builtin/.depend/commit-tree.o.d -MQ builtin/commit-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-tree.c
+gcc -o builtin/cat-file.o -c -MF builtin/.depend/cat-file.o.d -MQ builtin/cat-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/commit-graph.o -c -MF builtin/.depend/commit-graph.o.d -MQ builtin/commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-graph.c
+gcc -o http.o -c -MF ./.depend/http.o.d -MQ http.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/count-objects.o -c -MF builtin/.depend/count-objects.o.d -MQ builtin/count-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/count-objects.c
+gcc -o builtin/clean.o -c -MF builtin/.depend/clean.o.d -MQ builtin/clean.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/branch.o -c -MF builtin/.depend/branch.o.d -MQ builtin/branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/clean.o -c -MF builtin/.depend/clean.o.d -MQ builtin/clean.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
+gcc -o builtin/commit-graph.o -c -MF builtin/.depend/commit-graph.o.d -MQ builtin/commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/credential-cache--daemon.o -c -MF builtin/.depend/credential-cache--daemon.o.d -MQ builtin/credential-cache--daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache--daemon.c
+gcc -o builtin/count-objects.o -c -MF builtin/.depend/count-objects.o.d -MQ builtin/count-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/count-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/am.o -c -MF builtin/.depend/am.o.d -MQ builtin/am.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.c
+gcc -o builtin/credential.o -c -MF builtin/.depend/credential.o.d -MQ builtin/credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/credential-cache.o -c -MF builtin/.depend/credential-cache.o.d -MQ builtin/credential-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/credential.o -c -MF builtin/.depend/credential.o.d -MQ builtin/credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential.c
+gcc -o builtin/diagnose.o -c -MF builtin/.depend/diagnose.o.d -MQ builtin/diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diagnose.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/credential-store.o -c -MF builtin/.depend/credential-store.o.d -MQ builtin/credential-store.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-store.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/diagnose.o -c -MF builtin/.depend/diagnose.o.d -MQ builtin/diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diagnose.c
+gcc -o builtin/credential-cache--daemon.o -c -MF builtin/.depend/credential-cache--daemon.o.d -MQ builtin/credential-cache--daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/credential-cache--daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/diff-files.o -c -MF builtin/.depend/diff-files.o.d -MQ builtin/diff-files.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-files.c
@@ -2096,118 +2102,115 @@
 gcc -o builtin/diff-index.o -c -MF builtin/.depend/diff-index.o.d -MQ builtin/diff-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/diff-pairs.o -c -MF builtin/.depend/diff-pairs.o.d -MQ builtin/diff-pairs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-pairs.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/diff-tree.o -c -MF builtin/.depend/diff-tree.o.d -MQ builtin/diff-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o http.o -c -MF ./.depend/http.o.d -MQ http.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http.c
+gcc -o builtin/diff-pairs.o -c -MF builtin/.depend/diff-pairs.o.d -MQ builtin/diff-pairs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff-pairs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/describe.o -c -MF builtin/.depend/describe.o.d -MQ builtin/describe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
+gcc -o builtin/am.o -c -MF builtin/.depend/am.o.d -MQ builtin/am.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/diff.o -c -MF builtin/.depend/diff.o.d -MQ builtin/diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/checkout.o -c -MF builtin/.depend/checkout.o.d -MQ builtin/checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout.c
+gcc -o builtin/describe.o -c -MF builtin/.depend/describe.o.d -MQ builtin/describe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/fetch-pack.o -c -MF builtin/.depend/fetch-pack.o.d -MQ builtin/fetch-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
+gcc -o builtin/for-each-repo.o -c -MF builtin/.depend/for-each-repo.o.d -MQ builtin/for-each-repo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-repo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/fmt-merge-msg.o -c -MF builtin/.depend/fmt-merge-msg.o.d -MQ builtin/fmt-merge-msg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fmt-merge-msg.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/clone.o -c -MF builtin/.depend/clone.o.d -MQ builtin/clone.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clone.c
+gcc -o builtin/fetch-pack.o -c -MF builtin/.depend/fetch-pack.o.d -MQ builtin/fetch-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o sequencer.o -c -MF ./.depend/sequencer.o.d -MQ sequencer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  sequencer.c
+gcc -o builtin/clone.o -c -MF builtin/.depend/clone.o.d -MQ builtin/clone.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clone.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/for-each-ref.o -c -MF builtin/.depend/for-each-ref.o.d -MQ builtin/for-each-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/config.o -c -MF builtin/.depend/config.o.d -MQ builtin/config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/difftool.o -c -MF builtin/.depend/difftool.o.d -MQ builtin/difftool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/difftool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/for-each-repo.o -c -MF builtin/.depend/for-each-repo.o.d -MQ builtin/for-each-repo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-repo.c
+gcc -o builtin/fsmonitor--daemon.o -c -MF builtin/.depend/fsmonitor--daemon.o.d -MQ builtin/fsmonitor--daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsmonitor--daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/fsmonitor--daemon.o -c -MF builtin/.depend/fsmonitor--daemon.o.d -MQ builtin/fsmonitor--daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsmonitor--daemon.c
+/bin/sh ./generate-configlist.sh . config-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/get-tar-commit-id.o -c -MF builtin/.depend/get-tar-commit-id.o.d -MQ builtin/get-tar-commit-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/get-tar-commit-id.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh ./generate-configlist.sh . config-list.h
+gcc -o builtin/checkout.o -c -MF builtin/.depend/checkout.o.d -MQ builtin/checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/commit.o -c -MF builtin/.depend/commit.o.d -MQ builtin/commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/fast-export.o -c -MF builtin/.depend/fast-export.o.d -MQ builtin/fast-export.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-export.c
+gcc -o builtin/hook.o -c -MF builtin/.depend/hook.o.d -MQ builtin/hook.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hook.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/hook.o -c -MF builtin/.depend/hook.o.d -MQ builtin/hook.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hook.c
+gcc -o builtin/config.o -c -MF builtin/.depend/config.o.d -MQ builtin/config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/hash-object.o -c -MF builtin/.depend/hash-object.o.d -MQ builtin/hash-object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hash-object.c
+gcc -o builtin/fast-export.o -c -MF builtin/.depend/fast-export.o.d -MQ builtin/fast-export.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-export.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/interpret-trailers.o -c -MF builtin/.depend/interpret-trailers.o.d -MQ builtin/interpret-trailers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
+gcc -o builtin/hash-object.o -c -MF builtin/.depend/hash-object.o.d -MQ builtin/hash-object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hash-object.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/init-db.o -c -MF builtin/.depend/init-db.o.d -MQ builtin/init-db.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/init-db.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/ls-remote.o -c -MF builtin/.depend/ls-remote.o.d -MQ builtin/ls-remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-remote.c
+gcc -o builtin/interpret-trailers.o -c -MF builtin/.depend/interpret-trailers.o.d -MQ builtin/interpret-trailers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/mailinfo.o -c -MF builtin/.depend/mailinfo.o.d -MQ builtin/mailinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailinfo.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/ls-tree.o -c -MF builtin/.depend/ls-tree.o.d -MQ builtin/ls-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
+gcc -o builtin/ls-remote.o -c -MF builtin/.depend/ls-remote.o.d -MQ builtin/ls-remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/fsck.o -c -MF builtin/.depend/fsck.o.d -MQ builtin/fsck.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fsck.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/mailsplit.o -c -MF builtin/.depend/mailsplit.o.d -MQ builtin/mailsplit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailsplit.c
+gcc -o builtin/ls-tree.o -c -MF builtin/.depend/ls-tree.o.d -MQ builtin/ls-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/merge-base.o -c -MF builtin/.depend/merge-base.o.d -MQ builtin/merge-base.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.c
+gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/merge-file.o -c -MF builtin/.depend/merge-file.o.d -MQ builtin/merge-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-file.c
+gcc -o builtin/merge-base.o -c -MF builtin/.depend/merge-base.o.d -MQ builtin/merge-base.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/merge-ours.o -c -MF builtin/.depend/merge-ours.o.d -MQ builtin/merge-ours.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-ours.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
+gcc -o builtin/mailsplit.o -c -MF builtin/.depend/mailsplit.o.d -MQ builtin/mailsplit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mailsplit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/merge-recursive.o -c -MF builtin/.depend/merge-recursive.o.d -MQ builtin/merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-recursive.c
+gcc -o builtin/merge-file.o -c -MF builtin/.depend/merge-file.o.d -MQ builtin/merge-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/ls-files.o -c -MF builtin/.depend/ls-files.o.d -MQ builtin/ls-files.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-files.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/merge-recursive.o -c -MF builtin/.depend/merge-recursive.o.d -MQ builtin/merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-recursive.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/mktag.o -c -MF builtin/.depend/mktag.o.d -MQ builtin/mktag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/mktree.o -c -MF builtin/.depend/mktree.o.d -MQ builtin/mktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mktree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/multi-pack-index.o -c -MF builtin/.depend/multi-pack-index.o.d -MQ builtin/multi-pack-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
+gcc -o builtin/grep.o -c -MF builtin/.depend/grep.o.d -MQ builtin/grep.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/grep.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/grep.o -c -MF builtin/.depend/grep.o.d -MQ builtin/grep.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/grep.c
+gcc -o builtin/multi-pack-index.o -c -MF builtin/.depend/multi-pack-index.o.d -MQ builtin/multi-pack-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/merge-tree.o -c -MF builtin/.depend/merge-tree.o.d -MQ builtin/merge-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-tree.c
@@ -2216,97 +2219,94 @@
 gcc -o builtin/gc.o -c -MF builtin/.depend/gc.o.d -MQ builtin/gc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/gc.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/pack-refs.o -c -MF builtin/.depend/pack-refs.o.d -MQ builtin/pack-refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-refs.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/mv.o -c -MF builtin/.depend/mv.o.d -MQ builtin/mv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/mv.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/name-rev.o -c -MF builtin/.depend/name-rev.o.d -MQ builtin/name-rev.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/name-rev.c
+gcc -o builtin/pack-refs.o -c -MF builtin/.depend/pack-refs.o.d -MQ builtin/pack-refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/patch-id.o -c -MF builtin/.depend/patch-id.o.d -MQ builtin/patch-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.c
+gcc -o builtin/fetch.o -c -MF builtin/.depend/fetch.o.d -MQ builtin/fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/prune-packed.o -c -MF builtin/.depend/prune-packed.o.d -MQ builtin/prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune-packed.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/range-diff.o -c -MF builtin/.depend/range-diff.o.d -MQ builtin/range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/range-diff.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/prune.o -c -MF builtin/.depend/prune.o.d -MQ builtin/prune.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
+gcc -o builtin/patch-id.o -c -MF builtin/.depend/patch-id.o.d -MQ builtin/patch-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/log.o -c -MF builtin/.depend/log.o.d -MQ builtin/log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/log.c
+gcc -o builtin/name-rev.o -c -MF builtin/.depend/name-rev.o.d -MQ builtin/name-rev.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/name-rev.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/notes.o -c -MF builtin/.depend/notes.o.d -MQ builtin/notes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/notes.c
+gcc -o builtin/prune.o -c -MF builtin/.depend/prune.o.d -MQ builtin/prune.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/index-pack.o -c -MF builtin/.depend/index-pack.o.d -MQ builtin/index-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/index-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/fetch.o -c -MF builtin/.depend/fetch.o.d -MQ builtin/fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch.c
+gcc -o builtin/notes.o -c -MF builtin/.depend/notes.o.d -MQ builtin/notes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/notes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/pack-redundant.o -c -MF builtin/.depend/pack-redundant.o.d -MQ builtin/pack-redundant.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
+gcc -o builtin/range-diff.o -c -MF builtin/.depend/range-diff.o.d -MQ builtin/range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/range-diff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/read-tree.o -c -MF builtin/.depend/read-tree.o.d -MQ builtin/read-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/read-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/merge.o -c -MF builtin/.depend/merge.o.d -MQ builtin/merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge.c
+gcc -o builtin/push.o -c -MF builtin/.depend/push.o.d -MQ builtin/push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/push.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/log.o -c -MF builtin/.depend/log.o.d -MQ builtin/log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/log.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/refs.o -c -MF builtin/.depend/refs.o.d -MQ builtin/refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/refs.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/remote-fd.o -c -MF builtin/.depend/remote-fd.o.d -MQ builtin/remote-fd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-fd.c
+gcc -o builtin/merge.o -c -MF builtin/.depend/merge.o.d -MQ builtin/merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/fast-import.o -c -MF builtin/.depend/fast-import.o.d -MQ builtin/fast-import.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
+gcc -o builtin/remote-ext.o -c -MF builtin/.depend/remote-ext.o.d -MQ builtin/remote-ext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-ext.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/push.o -c -MF builtin/.depend/push.o.d -MQ builtin/push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/push.c
+gcc -o builtin/pack-redundant.o -c -MF builtin/.depend/pack-redundant.o.d -MQ builtin/pack-redundant.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/remote-ext.o -c -MF builtin/.depend/remote-ext.o.d -MQ builtin/remote-ext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-ext.c
+gcc -o builtin/remote-fd.o -c -MF builtin/.depend/remote-fd.o.d -MQ builtin/remote-fd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote-fd.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/reflog.o -c -MF builtin/.depend/reflog.o.d -MQ builtin/reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
+gcc -o builtin/fast-import.o -c -MF builtin/.depend/fast-import.o.d -MQ builtin/fast-import.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/pull.o -c -MF builtin/.depend/pull.o.d -MQ builtin/pull.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pull.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/reflog.o -c -MF builtin/.depend/reflog.o.d -MQ builtin/reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reflog.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/rerere.o -c -MF builtin/.depend/rerere.o.d -MQ builtin/rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rerere.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/reset.o -c -MF builtin/.depend/reset.o.d -MQ builtin/reset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/reset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/replace.o -c -MF builtin/.depend/replace.o.d -MQ builtin/replace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/revert.o -c -MF builtin/.depend/revert.o.d -MQ builtin/revert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/revert.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/replay.o -c -MF builtin/.depend/replay.o.d -MQ builtin/replay.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replay.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/replace.o -c -MF builtin/.depend/replace.o.d -MQ builtin/replace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
+gcc -o builtin/rm.o -c -MF builtin/.depend/rm.o.d -MQ builtin/rm.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rm.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/rev-list.o -c -MF builtin/.depend/rev-list.o.d -MQ builtin/rev-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/show-index.o -c -MF builtin/.depend/show-index.o.d -MQ builtin/show-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-index.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/rm.o -c -MF builtin/.depend/rm.o.d -MQ builtin/rm.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rm.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/send-pack.o -c -MF builtin/.depend/send-pack.o.d -MQ builtin/send-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/send-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/stripspace.o -c -MF builtin/.depend/stripspace.o.d -MQ builtin/stripspace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stripspace.c
+gcc -o builtin/show-index.o -c -MF builtin/.depend/show-index.o.d -MQ builtin/show-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/shortlog.o -c -MF builtin/.depend/shortlog.o.d -MQ builtin/shortlog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/shortlog.c
@@ -2315,19 +2315,22 @@
 gcc -o builtin/show-ref.o -c -MF builtin/.depend/show-ref.o.d -MQ builtin/show-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/remote.o -c -MF builtin/.depend/remote.o.d -MQ builtin/remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote.c
+gcc -o builtin/stripspace.o -c -MF builtin/.depend/stripspace.o.d -MQ builtin/stripspace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stripspace.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/symbolic-ref.o -c -MF builtin/.depend/symbolic-ref.o.d -MQ builtin/symbolic-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/symbolic-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/rev-parse.o -c -MF builtin/.depend/rev-parse.o.d -MQ builtin/rev-parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-parse.c
+gcc -o builtin/receive-pack.o -c -MF builtin/.depend/receive-pack.o.d -MQ builtin/receive-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/receive-pack.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/show-branch.o -c -MF builtin/.depend/show-branch.o.d -MQ builtin/show-branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-branch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/unpack-file.o -c -MF builtin/.depend/unpack-file.o.d -MQ builtin/unpack-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/repack.o -c -MF builtin/.depend/repack.o.d -MQ builtin/repack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/repack.c
+gcc -o builtin/remote.o -c -MF builtin/.depend/remote.o.d -MQ builtin/remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/remote.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/sparse-checkout.o -c -MF builtin/.depend/sparse-checkout.o.d -MQ builtin/sparse-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/sparse-checkout.c
@@ -2336,86 +2339,122 @@
 gcc -o builtin/update-server-info.o -c -MF builtin/.depend/update-server-info.o.d -MQ builtin/update-server-info.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-server-info.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/show-branch.o -c -MF builtin/.depend/show-branch.o.d -MQ builtin/show-branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/show-branch.c
+gcc -o builtin/repack.o -c -MF builtin/.depend/repack.o.d -MQ builtin/repack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/repack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/upload-archive.o -c -MF builtin/.depend/upload-archive.o.d -MQ builtin/upload-archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-archive.c
+gcc -o builtin/unpack-objects.o -c -MF builtin/.depend/unpack-objects.o.d -MQ builtin/unpack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-objects.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/rebase.o -c -MF builtin/.depend/rebase.o.d -MQ builtin/rebase.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rebase.c
+gcc -o builtin/upload-archive.o -c -MF builtin/.depend/upload-archive.o.d -MQ builtin/upload-archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-archive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/upload-pack.o -c -MF builtin/.depend/upload-pack.o.d -MQ builtin/upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-pack.c
+gcc -o builtin/rev-parse.o -c -MF builtin/.depend/rev-parse.o.d -MQ builtin/rev-parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-parse.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/verify-commit.o -c -MF builtin/.depend/verify-commit.o.d -MQ builtin/verify-commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-commit.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/var.o -c -MF builtin/.depend/var.o.d -MQ builtin/var.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/var.c
+gcc -o builtin/verify-pack.o -c -MF builtin/.depend/verify-pack.o.d -MQ builtin/verify-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/receive-pack.o -c -MF builtin/.depend/receive-pack.o.d -MQ builtin/receive-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/receive-pack.c
+gcc -o builtin/upload-pack.o -c -MF builtin/.depend/upload-pack.o.d -MQ builtin/upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/upload-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/update-ref.o -c -MF builtin/.depend/update-ref.o.d -MQ builtin/update-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-ref.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/verify-pack.o -c -MF builtin/.depend/verify-pack.o.d -MQ builtin/verify-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-pack.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
 mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/unpack-objects.o -c -MF builtin/.depend/unpack-objects.o.d -MQ builtin/unpack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/unpack-objects.c
+gcc -o builtin/write-tree.o -c -MF builtin/.depend/write-tree.o.d -MQ builtin/write-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/write-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-i18n+ git-sh-i18n
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/var.o -c -MF builtin/.depend/var.o.d -MQ builtin/var.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/var.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/tag.o -c -MF builtin/.depend/tag.o.d -MQ builtin/tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o builtin/verify-tag.o -c -MF builtin/.depend/verify-tag.o.d -MQ builtin/verify-tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/verify-tag.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/write-tree.o -c -MF builtin/.depend/write-tree.o.d -MQ builtin/write-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/write-tree.c
+gcc -o common-main.o -c -MF ./.depend/common-main.o.d -MQ common-main.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  common-main.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f xdiff/lib.a && ar rcs xdiff/lib.a xdiff/xdiffi.o xdiff/xemit.o xdiff/xhistogram.o xdiff/xmerge.o xdiff/xpatience.o xdiff/xprepare.o xdiff/xutils.o
+gcc -o builtin/rebase.o -c -MF builtin/.depend/rebase.o.d -MQ builtin/rebase.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rebase.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f reftable/libreftable.a && ar rcs reftable/libreftable.a reftable/basics.o reftable/error.o reftable/block.o reftable/blocksource.o reftable/iter.o reftable/merged.o reftable/pq.o reftable/reader.o reftable/record.o reftable/stack.o reftable/system.o reftable/tree.o reftable/writer.o
+gcc -o abspath.o -c -MF ./.depend/abspath.o.d -MQ abspath.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  abspath.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/tag.o -c -MF builtin/.depend/tag.o.d -MQ builtin/tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
+gcc -o builtin/stash.o -c -MF builtin/.depend/stash.o.d -MQ builtin/stash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stash.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/update-index.o -c -MF builtin/.depend/update-index.o.d -MQ builtin/update-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-index.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o alias.o -c -MF ./.depend/alias.o.d -MQ alias.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alias.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o advice.o -c -MF ./.depend/advice.o.d -MQ advice.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  advice.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o alloc.o -c -MF ./.depend/alloc.o.d -MQ alloc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  alloc.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o builtin/pack-objects.o -c -MF builtin/.depend/pack-objects.o.d -MQ builtin/pack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o scalar.o -c -MF ./.depend/scalar.o.d -MQ scalar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o archive-tar.o -c -MF ./.depend/archive-tar.o.d -MQ archive-tar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-tar.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f xdiff/lib.a && ar rcs xdiff/lib.a xdiff/xdiffi.o xdiff/xemit.o xdiff/xhistogram.o xdiff/xmerge.o xdiff/xpatience.o xdiff/xprepare.o xdiff/xutils.o
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="git/2.49.0.395.g12beb8f557c" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.49.0+next.20250314"/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.49.0+next.20250314"" "version-def.h.in" "version-def.h"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f reftable/libreftable.a && ar rcs reftable/libreftable.a reftable/basics.o reftable/error.o reftable/block.o reftable/blocksource.o reftable/iter.o reftable/merged.o reftable/pq.o reftable/reader.o reftable/record.o reftable/stack.o reftable/system.o reftable/tree.o reftable/writer.o
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-difftool--helper.sh" "git-difftool--helper+" ./GIT-BUILD-OPTIONS && \
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
-mv git-filter-branch+ git-filter-branch
+gcc -o add-interactive.o -c -MF ./.depend/add-interactive.o.d -MQ add-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-interactive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-merge-octopus.sh" "git-merge-octopus+" ./GIT-BUILD-OPTIONS && \
-mv git-merge-octopus+ git-merge-octopus
+./generate-script.sh "git-filter-branch.sh" "git-filter-branch+" ./GIT-BUILD-OPTIONS && \
+mv git-filter-branch+ git-filter-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-merge-one-file.sh" "git-merge-one-file+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-merge-octopus.sh" "git-merge-octopus+" ./GIT-BUILD-OPTIONS && \
+mv git-merge-octopus+ git-merge-octopus
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o archive.o -c -MF ./.depend/archive.o.d -MQ archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
 mv git-mergetool+ git-mergetool
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -2428,13 +2467,6 @@
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/stash.o -c -MF builtin/.depend/stash.o.d -MQ builtin/stash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/stash.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 \
 INSTLIBDIR='/usr/share/perl5' && \
 INSTLIBDIR_EXTRA='' && \
@@ -2448,6 +2480,10 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
+mv git-submodule+ git-submodule
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
 mv git-web--browse+ git-web--browse
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -2456,6 +2492,9 @@
 mv git-archimport+ git-archimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o archive-zip.o -c -MF ./.depend/archive-zip.o.d -MQ archive-zip.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  archive-zip.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-cvsexportcommit.perl" "git-cvsexportcommit+" && \
 mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -2472,23 +2511,20 @@
 mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  version.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "git-svn.perl" "git-svn+" && \
 mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/bugreport.o -c -MF builtin/.depend/bugreport.o.d -MQ builtin/bugreport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bugreport.c
+gcc -o daemon.o -c -MF ./.depend/daemon.o.d -MQ daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  daemon.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/pack-objects.o -c -MF builtin/.depend/pack-objects.o.d -MQ builtin/pack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-objects.c
+gcc -o builtin/worktree.o -c -MF builtin/.depend/worktree.o.d -MQ builtin/worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/worktree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/update-index.o -c -MF builtin/.depend/update-index.o.d -MQ builtin/update-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-index.c
+gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  version.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/help.o -c -MF builtin/.depend/help.o.d -MQ builtin/help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.c
+gcc -o builtin/bugreport.o -c -MF builtin/.depend/bugreport.o.d -MQ builtin/bugreport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/bugreport.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o help.o -c -MF ./.depend/help.o.d -MQ help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  help.c
@@ -2497,23 +2533,22 @@
 gcc -o attr.o -c -MF ./.depend/attr.o.d -MQ attr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITATTRIBUTES='"/etc/gitattributes"' attr.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o scalar.o -c -MF ./.depend/scalar.o.d -MQ scalar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  scalar.c
+gcc -o builtin/help.o -c -MF builtin/.depend/help.o.d -MQ builtin/help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_HTML_PATH="share/doc/git/html"' '-DGIT_MAN_PATH="share/man"' '-DGIT_INFO_PATH="share/info"' builtin/help.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/worktree.o -c -MF builtin/.depend/worktree.o.d -MQ builtin/worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/worktree.c
+gcc -o builtin/submodule--helper.o -c -MF builtin/.depend/submodule--helper.o.d -MQ builtin/submodule--helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/submodule--helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f libgit.a && ar rcs libgit.a abspath.o add-interactive.o add-patch.o advice.o alias.o alloc.o apply.o archive-tar.o archive-zip.o archive.o attr.o base85.o bisect.o blame.o blob.o bloom.o branch.o bulk-checkin.o bundle-uri.o bundle.o cache-tree.o cbtree.o chdir-notify.o checkout.o chunk-format.o color.o column.o combine-diff.o commit-graph.o commit-reach.o commit.o common-exit.o common-init.o compat/nonblock.o compat/obstack.o compat/terminal.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o path-walk.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o promisor-remote.o prompt.o protocol.o protocol-caps.o prune-packed.o pseudo-merge.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o rebase.o ref-filter.o reflog-walk.o reflog.o refs.o refs/debug.o refs/files-backend.o refs/reftable-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o remote.o replace-object.o repo-settings.o repository.o rerere.o reset.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o shallow.o sideband.o sigchain.o sparse-index.o split-index.o stable-qsort.o statinfo.o strbuf.o streaming.o string-list.o strmap.o strvec.o sub-process.o submodule-config.o submodule.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trace2.o trace2/tr2_cfg.o trace2/tr2_cmd_name.o trace2/tr2_ctr.o trace2/tr2_dst.o trace2/tr2_sid.o trace2/tr2_sysenv.o trace2/tr2_tbuf.o trace2/tr2_tgt_event.o trace2/tr2_tgt_normal.o trace2/tr2_tgt_perf.o trace2/tr2_tls.o trace2/tr2_tmr.o trailer.o transport-helper.o transport.o tree-diff.o tree-walk.o tree.o unpack-trees.o upload-pack.o url.o urlmatch.o usage.o userdiff.o utf8.o varint.o version.o versioncmp.o walker.o wildmatch.o worktree.o wrapper.o write-or-die.o ws.o wt-status.o xdiff-interface.o unix-socket.o unix-stream-server.o compat/simple-ipc/ipc-shared.o compat/simple-ipc/ipc-unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o sha256/block/sha256.o compat/linux/procinfo.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
+gcc -o add-patch.o -c -MF ./.depend/add-patch.o.d -MQ add-patch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  add-patch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o daemon.o -c -MF ./.depend/daemon.o.d -MQ daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  daemon.c
+gcc -o apply.o -c -MF ./.depend/apply.o.d -MQ apply.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  apply.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o scalar -Wl,-z,relro   \
-	scalar.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+rm -f libgit.a && ar rcs libgit.a abspath.o add-interactive.o add-patch.o advice.o alias.o alloc.o apply.o archive-tar.o archive-zip.o archive.o attr.o base85.o bisect.o blame.o blob.o bloom.o branch.o bulk-checkin.o bundle-uri.o bundle.o cache-tree.o cbtree.o chdir-notify.o checkout.o chunk-format.o color.o column.o combine-diff.o commit-graph.o commit-reach.o commit.o common-exit.o common-init.o compat/nonblock.o compat/obstack.o compat/terminal.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o path-walk.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o promisor-remote.o prompt.o protocol.o protocol-caps.o prune-packed.o pseudo-merge.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o rebase.o ref-filter.o reflog-walk.o reflog.o refs.o refs/debug.o refs/files-backend.o refs/reftable-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o remote.o replace-object.o repo-settings.o repository.o rerere.o reset.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o shallow.o sideband.o sigchain.o sparse-index.o split-index.o stable-qsort.o statinfo.o strbuf.o streaming.o string-list.o strmap.o strvec.o sub-process.o submodule-config.o submodule.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trace2.o trace2/tr2_cfg.o trace2/tr2_cmd_name.o trace2/tr2_ctr.o trace2/tr2_dst.o trace2/tr2_sid.o trace2/tr2_sysenv.o trace2/tr2_tbuf.o trace2/tr2_tgt_event.o trace2/tr2_tgt_normal.o trace2/tr2_tgt_perf.o trace2/tr2_tls.o trace2/tr2_tmr.o trailer.o transport-helper.o transport.o tree-diff.o tree-walk.o tree.o unpack-trees.o upload-pack.o url.o urlmatch.o usage.o userdiff.o utf8.o varint.o version.o versioncmp.o walker.o wildmatch.o worktree.o wrapper.o write-or-die.o ws.o wt-status.o xdiff-interface.o unix-socket.o unix-stream-server.o compat/simple-ipc/ipc-shared.o compat/simple-ipc/ipc-unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o sha256/block/sha256.o compat/linux/procinfo.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-backend -Wl,-z,relro   http-backend.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-daemon -Wl,-z,relro   daemon.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-sh-i18n--envsubst -Wl,-z,relro   sh-i18n--envsubst.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
@@ -2522,15 +2557,15 @@
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-shell -Wl,-z,relro   shell.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-daemon -Wl,-z,relro   daemon.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o scalar -Wl,-z,relro   \
+	scalar.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-fetch -Wl,-z,relro   http.o http-walker.o http-fetch.o common-main.o \
-	-lcurl libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-backend -Wl,-z,relro   http-backend.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-push -Wl,-z,relro   http.o http-push.o common-main.o \
-	-lcurl -lexpat libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-fetch -Wl,-z,relro   http.o http-walker.o http-fetch.o common-main.o \
+	-lcurl libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-imap-send -Wl,-z,relro   imap-send.o http.o common-main.o \
@@ -2553,15 +2588,16 @@
 cp git-remote-http git-remote-ftp
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-push -Wl,-z,relro   http.o http-push.o common-main.o \
+	-lcurl -lexpat libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-remote-ftps && \
 ln git-remote-http git-remote-ftps 2>/dev/null || \
 ln -s git-remote-http git-remote-ftps 2>/dev/null || \
 cp git-remote-http git-remote-ftps
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o builtin/submodule--helper.o -c -MF builtin/.depend/submodule--helper.o.d -MQ builtin/submodule--helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/submodule--helper.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git -Wl,-z,relro   \
 	git.o builtin/add.o builtin/am.o builtin/annotate.o builtin/apply.o builtin/archive.o builtin/backfill.o builtin/bisect.o builtin/blame.o builtin/branch.o builtin/bugreport.o builtin/bundle.o builtin/cat-file.o builtin/check-attr.o builtin/check-ignore.o builtin/check-mailmap.o builtin/check-ref-format.o builtin/checkout--worker.o builtin/checkout-index.o builtin/checkout.o builtin/clean.o builtin/clone.o builtin/column.o builtin/commit-graph.o builtin/commit-tree.o builtin/commit.o builtin/config.o builtin/count-objects.o builtin/credential-cache--daemon.o builtin/credential-cache.o builtin/credential-store.o builtin/credential.o builtin/describe.o builtin/diagnose.o builtin/diff-files.o builtin/diff-index.o builtin/diff-pairs.o builtin/diff-tree.o builtin/diff.o builtin/difftool.o builtin/fast-export.o builtin/fast-import.o builtin/fetch-pack.o builtin/fetch.o builtin/fmt-merge-msg.o builtin/for-each-ref.o builtin/for-each-repo.o builtin/fsck.o builtin/fsmonitor--daemon.o builtin/gc.o builtin/get-tar-commit-id.o builtin/grep.o builtin/hash-object.o builtin/help.o builtin/hook.o builtin/index-pack.o builtin/init-db.o builtin/interpret-trailers.o builtin/log.o builtin/ls-files.o builtin/ls-remote.o builtin/ls-tree.o builtin/mailinfo.o builtin/mailsplit.o builtin/merge-base.o builtin/merge-file.o builtin/merge-index.o builtin/merge-ours.o builtin/merge-recursive.o builtin/merge-tree.o builtin/merge.o builtin/mktag.o builtin/mktree.o builtin/multi-pack-index.o builtin/mv.o builtin/name-rev.o builtin/notes.o builtin/pack-objects.o builtin/pack-redundant.o builtin/pack-refs.o builtin/patch-id.o builtin/prune-packed.o builtin/prune.o builtin/pull.o builtin/push.o builtin/range-diff.o builtin/read-tree.o builtin/rebase.o builtin/receive-pack.o builtin/reflog.o builtin/refs.o builtin/remote-ext.o builtin/remote-fd.o builtin/remote.o builtin/repack.o builtin/replace.o builtin/replay.o builtin/rerere.o builtin/reset.o builtin/rev-list.o builtin/rev-parse.o builtin/revert.o builtin/rm.o builtin/send-pack.o builtin/shortlog.o builtin/show-branch.o builtin/show-index.o builtin/show-ref.o builtin/sparse-checkout.o builtin/stash.o builtin/stripspace.o builtin/submodule--helper.o builtin/symbolic-ref.o builtin/tag.o builtin/unpack-file.o builtin/unpack-objects.o builtin/update-index.o builtin/update-ref.o builtin/update-server-info.o builtin/upload-archive.o builtin/upload-pack.o builtin/var.o builtin/verify-commit.o builtin/verify-pack.o builtin/verify-tag.o builtin/worktree.o builtin/write-tree.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -2578,10 +2614,10 @@
 cp git git-am
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-annotate && \
-ln git git-annotate 2>/dev/null || \
-ln -s git git-annotate 2>/dev/null || \
-cp git git-annotate
+rm -f git-archive && \
+ln git git-archive 2>/dev/null || \
+ln -s git git-archive 2>/dev/null || \
+cp git git-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-apply && \
@@ -2590,10 +2626,10 @@
 cp git git-apply
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-archive && \
-ln git git-archive 2>/dev/null || \
-ln -s git git-archive 2>/dev/null || \
-cp git git-archive
+rm -f git-annotate && \
+ln git git-annotate 2>/dev/null || \
+ln -s git git-annotate 2>/dev/null || \
+cp git git-annotate
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-backfill && \
@@ -2752,18 +2788,18 @@
 cp git git-credential
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-describe && \
-ln git git-describe 2>/dev/null || \
-ln -s git git-describe 2>/dev/null || \
-cp git git-describe
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-diagnose && \
 ln git git-diagnose 2>/dev/null || \
 ln -s git git-diagnose 2>/dev/null || \
 cp git git-diagnose
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-describe && \
+ln git git-describe 2>/dev/null || \
+ln -s git git-describe 2>/dev/null || \
+cp git git-describe
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-diff-files && \
 ln git git-diff-files 2>/dev/null || \
 ln -s git git-diff-files 2>/dev/null || \
@@ -2812,18 +2848,18 @@
 cp git git-fast-import
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-fetch && \
-ln git git-fetch 2>/dev/null || \
-ln -s git git-fetch 2>/dev/null || \
-cp git git-fetch
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-fetch-pack && \
 ln git git-fetch-pack 2>/dev/null || \
 ln -s git git-fetch-pack 2>/dev/null || \
 cp git git-fetch-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-fetch && \
+ln git git-fetch 2>/dev/null || \
+ln -s git git-fetch 2>/dev/null || \
+cp git git-fetch
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-fmt-merge-msg && \
 ln git git-fmt-merge-msg 2>/dev/null || \
 ln -s git git-fmt-merge-msg 2>/dev/null || \
@@ -2926,12 +2962,6 @@
 cp git git-ls-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-mailsplit && \
-ln git git-mailsplit 2>/dev/null || \
-ln -s git git-mailsplit 2>/dev/null || \
-cp git git-mailsplit
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-ls-tree && \
 ln git git-ls-tree 2>/dev/null || \
 ln -s git git-ls-tree 2>/dev/null || \
@@ -2944,6 +2974,12 @@
 cp git git-mailinfo
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-mailsplit && \
+ln git git-mailsplit 2>/dev/null || \
+ln -s git git-mailsplit 2>/dev/null || \
+cp git git-mailsplit
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-merge-base && \
 ln git git-merge-base 2>/dev/null || \
 ln -s git git-merge-base 2>/dev/null || \
@@ -3010,18 +3046,18 @@
 cp git git-mv
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-notes && \
-ln git git-notes 2>/dev/null || \
-ln -s git git-notes 2>/dev/null || \
-cp git git-notes
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-name-rev && \
 ln git git-name-rev 2>/dev/null || \
 ln -s git git-name-rev 2>/dev/null || \
 cp git git-name-rev
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-notes && \
+ln git git-notes 2>/dev/null || \
+ln -s git git-notes 2>/dev/null || \
+cp git git-notes
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-pack-objects && \
 ln git git-pack-objects 2>/dev/null || \
 ln -s git git-pack-objects 2>/dev/null || \
@@ -3040,30 +3076,30 @@
 cp git git-pack-refs
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-patch-id && \
-ln git git-patch-id 2>/dev/null || \
-ln -s git git-patch-id 2>/dev/null || \
-cp git git-patch-id
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-pull && \
-ln git git-pull 2>/dev/null || \
-ln -s git git-pull 2>/dev/null || \
-cp git git-pull
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-prune-packed && \
 ln git git-prune-packed 2>/dev/null || \
 ln -s git git-prune-packed 2>/dev/null || \
 cp git git-prune-packed
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-patch-id && \
+ln git git-patch-id 2>/dev/null || \
+ln -s git git-patch-id 2>/dev/null || \
+cp git git-patch-id
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-prune && \
 ln git git-prune 2>/dev/null || \
 ln -s git git-prune 2>/dev/null || \
 cp git git-prune
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-pull && \
+ln git git-pull 2>/dev/null || \
+ln -s git git-pull 2>/dev/null || \
+cp git git-pull
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-push && \
 ln git git-push 2>/dev/null || \
 ln -s git git-push 2>/dev/null || \
@@ -3094,16 +3130,22 @@
 cp git git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-refs && \
+ln git git-refs 2>/dev/null || \
+ln -s git git-refs 2>/dev/null || \
+cp git git-refs
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-reflog && \
 ln git git-reflog 2>/dev/null || \
 ln -s git git-reflog 2>/dev/null || \
 cp git git-reflog
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-refs && \
-ln git git-refs 2>/dev/null || \
-ln -s git git-refs 2>/dev/null || \
-cp git git-refs
+rm -f git-remote-ext && \
+ln git git-remote-ext 2>/dev/null || \
+ln -s git git-remote-ext 2>/dev/null || \
+cp git git-remote-ext
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-remote-fd && \
@@ -3118,12 +3160,6 @@
 cp git git-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-remote-ext && \
-ln git git-remote-ext 2>/dev/null || \
-ln -s git git-remote-ext 2>/dev/null || \
-cp git git-remote-ext
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-repack && \
 ln git git-repack 2>/dev/null || \
 ln -s git git-repack 2>/dev/null || \
@@ -3226,18 +3262,18 @@
 cp git git-stripspace
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-symbolic-ref && \
-ln git git-symbolic-ref 2>/dev/null || \
-ln -s git git-symbolic-ref 2>/dev/null || \
-cp git git-symbolic-ref
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-submodule--helper && \
 ln git git-submodule--helper 2>/dev/null || \
 ln -s git git-submodule--helper 2>/dev/null || \
 cp git git-submodule--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-symbolic-ref && \
+ln git git-symbolic-ref 2>/dev/null || \
+ln -s git git-symbolic-ref 2>/dev/null || \
+cp git git-symbolic-ref
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-tag && \
 ln git git-tag 2>/dev/null || \
 ln -s git git-tag 2>/dev/null || \
@@ -3262,12 +3298,6 @@
 cp git git-update-index
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-rm -f git-update-server-info && \
-ln git git-update-server-info 2>/dev/null || \
-ln -s git git-update-server-info 2>/dev/null || \
-cp git git-update-server-info
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-update-ref && \
 ln git git-update-ref 2>/dev/null || \
 ln -s git git-update-ref 2>/dev/null || \
@@ -3280,6 +3310,12 @@
 cp git git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+rm -f git-update-server-info && \
+ln git git-update-server-info 2>/dev/null || \
+ln -s git git-update-server-info 2>/dev/null || \
+cp git git-update-server-info
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 rm -f git-upload-pack && \
 ln git git-upload-pack 2>/dev/null || \
 ln -s git git-upload-pack 2>/dev/null || \
@@ -3592,41 +3628,31 @@
 date >boilerplates.made
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-parse-attr-line.o -c -MF oss-fuzz/.depend/fuzz-parse-attr-line.o.d -MQ oss-fuzz/fuzz-parse-attr-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-parse-attr-line.c
+gcc -o oss-fuzz/dummy-cmd-main.o -c -MF oss-fuzz/.depend/dummy-cmd-main.o.d -MQ oss-fuzz/dummy-cmd-main.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/dummy-cmd-main.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o oss-fuzz/fuzz-config.o -c -MF oss-fuzz/.depend/fuzz-config.o.d -MQ oss-fuzz/fuzz-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-commit-graph.o -c -MF oss-fuzz/.depend/fuzz-commit-graph.o.d -MQ oss-fuzz/fuzz-commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/dummy-cmd-main.o -c -MF oss-fuzz/.depend/dummy-cmd-main.o.d -MQ oss-fuzz/dummy-cmd-main.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/dummy-cmd-main.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-date.o -c -MF oss-fuzz/.depend/fuzz-date.o.d -MQ oss-fuzz/fuzz-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-date.c
+gcc -o oss-fuzz/fuzz-credential-from-url-gently.o -c -MF oss-fuzz/.depend/fuzz-credential-from-url-gently.o.d -MQ oss-fuzz/fuzz-credential-from-url-gently.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-credential-from-url-gently.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-credential-from-url-gently.o -c -MF oss-fuzz/.depend/fuzz-credential-from-url-gently.o.d -MQ oss-fuzz/fuzz-credential-from-url-gently.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-credential-from-url-gently.c
+gcc -o oss-fuzz/fuzz-parse-attr-line.o -c -MF oss-fuzz/.depend/fuzz-parse-attr-line.o.d -MQ oss-fuzz/fuzz-parse-attr-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-parse-attr-line.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-pack-idx.o -c -MF oss-fuzz/.depend/fuzz-pack-idx.o.d -MQ oss-fuzz/fuzz-pack-idx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-idx.c
+gcc -o oss-fuzz/fuzz-commit-graph.o -c -MF oss-fuzz/.depend/fuzz-commit-graph.o.d -MQ oss-fuzz/fuzz-commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o oss-fuzz/fuzz-url-decode-mem.o -c -MF oss-fuzz/.depend/fuzz-url-decode-mem.o.d -MQ oss-fuzz/fuzz-url-decode-mem.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-url-decode-mem.c
+gcc -o oss-fuzz/fuzz-date.o -c -MF oss-fuzz/.depend/fuzz-date.o.d -MQ oss-fuzz/fuzz-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o oss-fuzz/fuzz-pack-headers.o -c -MF oss-fuzz/.depend/fuzz-pack-headers.o.d -MQ oss-fuzz/fuzz-pack-headers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-headers.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-config -Wl,-z,relro   \
-	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-config.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+gcc -o oss-fuzz/fuzz-url-decode-mem.o -c -MF oss-fuzz/.depend/fuzz-url-decode-mem.o.d -MQ oss-fuzz/fuzz-url-decode-mem.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-url-decode-mem.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-credential-from-url-gently -Wl,-z,relro   \
-	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-credential-from-url-gently.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+gcc -o oss-fuzz/fuzz-pack-idx.o -c -MF oss-fuzz/.depend/fuzz-pack-idx.o.d -MQ oss-fuzz/fuzz-pack-idx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-idx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-commit-graph -Wl,-z,relro   \
@@ -3639,19 +3665,19 @@
 	oss-fuzz/fuzz-pack-headers.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-date -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-config -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-date.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	oss-fuzz/fuzz-config.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-idx -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-url-decode-mem -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-pack-idx.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	oss-fuzz/fuzz-url-decode-mem.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-url-decode-mem -Wl,-z,relro   \
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-pack-idx -Wl,-z,relro   \
 	-Wl,--allow-multiple-definition \
-	oss-fuzz/fuzz-url-decode-mem.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
+	oss-fuzz/fuzz-pack-idx.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-parse-attr-line -Wl,-z,relro   \
@@ -3659,57 +3685,67 @@
 	oss-fuzz/fuzz-parse-attr-line.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-credential-from-url-gently -Wl,-z,relro   \
+	-Wl,--allow-multiple-definition \
+	oss-fuzz/fuzz-credential-from-url-gently.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o oss-fuzz/fuzz-date -Wl,-z,relro   \
+	-Wl,--allow-multiple-definition \
+	oss-fuzz/fuzz-date.o oss-fuzz/dummy-cmd-main.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt 
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
+msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
+msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
+msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
+msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
+msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
+msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
+msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
+msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
+msgfmt --check -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-msgfmt --check -o po/build/locale/zh_CN/LC_MESSAGES/git.mo po/zh_CN.po
+msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+msgfmt --check -o po/build/locale/zh_CN/LC_MESSAGES/git.mo po/zh_CN.po
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -3725,10 +3761,10 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/IndexInfo.pm" "perl/build/lib/Git/IndexInfo.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/Packet.pm" "perl/build/lib/Git/Packet.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN.pm" "perl/build/lib/Git/LoadCPAN.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN.pm" "perl/build/lib/Git/LoadCPAN.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/Packet.pm" "perl/build/lib/Git/Packet.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN.pm" "perl/build/lib/Git/SVN.pm"
@@ -3767,40 +3803,46 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Memoize/YAML.pm" "perl/build/lib/Git/SVN/Memoize/YAML.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-bitmap.o -c -MF t/helper/.depend/test-bitmap.o.d -MQ t/helper/test-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bitmap.c
+gcc -o t/helper/test-fake-ssh.o -c -MF t/helper/.depend/test-fake-ssh.o.d -MQ t/helper/test-fake-ssh.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fake-ssh.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-advise.o -c -MF t/helper/.depend/test-advise.o.d -MQ t/helper/test-advise.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-advise.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-fake-ssh.o -c -MF t/helper/.depend/test-fake-ssh.o.d -MQ t/helper/test-fake-ssh.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fake-ssh.c
+gcc -o t/helper/test-tool.o -c -MF t/helper/.depend/test-tool.o.d -MQ t/helper/test-tool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-tool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-tool.o -c -MF t/helper/.depend/test-tool.o.d -MQ t/helper/test-tool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-tool.c
+gcc -o t/helper/test-bitmap.o -c -MF t/helper/.depend/test-bitmap.o.d -MQ t/helper/test-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bitmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-crontab.o -c -MF t/helper/.depend/test-crontab.o.d -MQ t/helper/test-crontab.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-crontab.c
+gcc -o t/helper/test-chmtime.o -c -MF t/helper/.depend/test-chmtime.o.d -MQ t/helper/test-chmtime.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-chmtime.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-csprng.o -c -MF t/helper/.depend/test-csprng.o.d -MQ t/helper/test-csprng.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-csprng.c
+gcc -o t/helper/test-bloom.o -c -MF t/helper/.depend/test-bloom.o.d -MQ t/helper/test-bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bloom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-cache-tree.o -c -MF t/helper/.depend/test-cache-tree.o.d -MQ t/helper/test-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-cache-tree.c
+gcc -o t/helper/test-crontab.o -c -MF t/helper/.depend/test-crontab.o.d -MQ t/helper/test-crontab.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-crontab.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-bloom.o -c -MF t/helper/.depend/test-bloom.o.d -MQ t/helper/test-bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bloom.c
+gcc -o t/helper/test-date.o -c -MF t/helper/.depend/test-date.o.d -MQ t/helper/test-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-date.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-chmtime.o -c -MF t/helper/.depend/test-chmtime.o.d -MQ t/helper/test-chmtime.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-chmtime.c
+gcc -o t/helper/test-csprng.o -c -MF t/helper/.depend/test-csprng.o.d -MQ t/helper/test-csprng.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-csprng.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-cache-tree.o -c -MF t/helper/.depend/test-cache-tree.o.d -MQ t/helper/test-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-bundle-uri.o -c -MF t/helper/.depend/test-bundle-uri.o.d -MQ t/helper/test-bundle-uri.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bundle-uri.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-dir-iterator.o -c -MF t/helper/.depend/test-dir-iterator.o.d -MQ t/helper/test-dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dir-iterator.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-drop-caches.o -c -MF t/helper/.depend/test-drop-caches.o.d -MQ t/helper/test-drop-caches.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-drop-caches.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-date.o -c -MF t/helper/.depend/test-date.o.d -MQ t/helper/test-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-date.c
+gcc -o t/helper/test-delete-gpgsig.o -c -MF t/helper/.depend/test-delete-gpgsig.o.d -MQ t/helper/test-delete-gpgsig.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delete-gpgsig.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-config.o -c -MF t/helper/.depend/test-config.o.d -MQ t/helper/test-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-config.c
@@ -3809,40 +3851,34 @@
 gcc -o t/helper/test-delta.o -c -MF t/helper/.depend/test-delta.o.d -MQ t/helper/test-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delta.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-delete-gpgsig.o -c -MF t/helper/.depend/test-delete-gpgsig.o.d -MQ t/helper/test-delete-gpgsig.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-delete-gpgsig.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-dir-iterator.o -c -MF t/helper/.depend/test-dir-iterator.o.d -MQ t/helper/test-dir-iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dir-iterator.c
+gcc -o t/helper/test-env-helper.o -c -MF t/helper/.depend/test-env-helper.o.d -MQ t/helper/test-env-helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-env-helper.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-dump-fsmonitor.o -c -MF t/helper/.depend/test-dump-fsmonitor.o.d -MQ t/helper/test-dump-fsmonitor.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-fsmonitor.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-dump-cache-tree.o -c -MF t/helper/.depend/test-dump-cache-tree.o.d -MQ t/helper/test-dump-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-dump-untracked-cache.o -c -MF t/helper/.depend/test-dump-untracked-cache.o.d -MQ t/helper/test-dump-untracked-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-untracked-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-dump-split-index.o -c -MF t/helper/.depend/test-dump-split-index.o.d -MQ t/helper/test-dump-split-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-env-helper.o -c -MF t/helper/.depend/test-env-helper.o.d -MQ t/helper/test-env-helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-env-helper.c
+gcc -o t/helper/test-dump-cache-tree.o -c -MF t/helper/.depend/test-dump-cache-tree.o.d -MQ t/helper/test-dump-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-fsmonitor-client.o -c -MF t/helper/.depend/test-fsmonitor-client.o.d -MQ t/helper/test-fsmonitor-client.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fsmonitor-client.c
+gcc -o t/helper/test-find-pack.o -c -MF t/helper/.depend/test-find-pack.o.d -MQ t/helper/test-find-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-find-pack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-genrandom.o -c -MF t/helper/.depend/test-genrandom.o.d -MQ t/helper/test-genrandom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genrandom.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-getcwd.o -c -MF t/helper/.depend/test-getcwd.o.d -MQ t/helper/test-getcwd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-getcwd.c
+gcc -o t/helper/test-fsmonitor-client.o -c -MF t/helper/.depend/test-fsmonitor-client.o.d -MQ t/helper/test-fsmonitor-client.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-fsmonitor-client.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-find-pack.o -c -MF t/helper/.depend/test-find-pack.o.d -MQ t/helper/test-find-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-find-pack.c
+gcc -o t/helper/test-genzeros.o -c -MF t/helper/.depend/test-genzeros.o.d -MQ t/helper/test-genzeros.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genzeros.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-genzeros.o -c -MF t/helper/.depend/test-genzeros.o.d -MQ t/helper/test-genzeros.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-genzeros.c
+gcc -o t/helper/test-getcwd.o -c -MF t/helper/.depend/test-getcwd.o.d -MQ t/helper/test-getcwd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-getcwd.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-example-tap.o -c -MF t/helper/.depend/test-example-tap.o.d -MQ t/helper/test-example-tap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-example-tap.c
@@ -3851,12 +3887,18 @@
 gcc -o t/helper/test-hash-speed.o -c -MF t/helper/.depend/test-hash-speed.o.d -MQ t/helper/test-hash-speed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash-speed.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-mktemp.o -c -MF t/helper/.depend/test-mktemp.o.d -MQ t/helper/test-mktemp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-hash.o -c -MF t/helper/.depend/test-hash.o.d -MQ t/helper/test-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-hexdump.o -c -MF t/helper/.depend/test-hexdump.o.d -MQ t/helper/test-hexdump.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hexdump.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-online-cpus.o -c -MF t/helper/.depend/test-online-cpus.o.d -MQ t/helper/test-online-cpus.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-online-cpus.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-match-trees.o -c -MF t/helper/.depend/test-match-trees.o.d -MQ t/helper/test-match-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-match-trees.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -3866,18 +3908,12 @@
 gcc -o t/helper/test-name-hash.o -c -MF t/helper/.depend/test-name-hash.o.d -MQ t/helper/test-name-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-name-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-mktemp.o -c -MF t/helper/.depend/test-mktemp.o.d -MQ t/helper/test-mktemp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-online-cpus.o -c -MF t/helper/.depend/test-online-cpus.o.d -MQ t/helper/test-online-cpus.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-online-cpus.c
+gcc -o t/helper/test-parse-pathspec-file.o -c -MF t/helper/.depend/test-parse-pathspec-file.o.d -MQ t/helper/test-parse-pathspec-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-pathspec-file.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-pack-mtimes.o -c -MF t/helper/.depend/test-pack-mtimes.o.d -MQ t/helper/test-pack-mtimes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pack-mtimes.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-parse-pathspec-file.o -c -MF t/helper/.depend/test-parse-pathspec-file.o.d -MQ t/helper/test-parse-pathspec-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-pathspec-file.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-lazy-init-name-hash.o -c -MF t/helper/.depend/test-lazy-init-name-hash.o.d -MQ t/helper/test-lazy-init-name-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-lazy-init-name-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -3887,64 +3923,55 @@
 gcc -o t/helper/test-pcre2-config.o -c -MF t/helper/.depend/test-pcre2-config.o.d -MQ t/helper/test-pcre2-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pcre2-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-path-walk.o -c -MF t/helper/.depend/test-path-walk.o.d -MQ t/helper/test-path-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-walk.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-pkt-line.o -c -MF t/helper/.depend/test-pkt-line.o.d -MQ t/helper/test-pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pkt-line.c
+gcc -o t/helper/test-read-cache.o -c -MF t/helper/.depend/test-read-cache.o.d -MQ t/helper/test-read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-cache.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-json-writer.o -c -MF t/helper/.depend/test-json-writer.o.d -MQ t/helper/test-json-writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-json-writer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-read-cache.o -c -MF t/helper/.depend/test-read-cache.o.d -MQ t/helper/test-read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-cache.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-parse-options.o -c -MF t/helper/.depend/test-parse-options.o.d -MQ t/helper/test-parse-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-options.c
+gcc -o t/helper/test-path-walk.o -c -MF t/helper/.depend/test-path-walk.o.d -MQ t/helper/test-path-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-walk.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-progress.o -c -MF t/helper/.depend/test-progress.o.d -MQ t/helper/test-progress.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-progress.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-proc-receive.o -c -MF t/helper/.depend/test-proc-receive.o.d -MQ t/helper/test-proc-receive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-proc-receive.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-read-graph.o -c -MF t/helper/.depend/test-read-graph.o.d -MQ t/helper/test-read-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-graph.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-read-midx.o -c -MF t/helper/.depend/test-read-midx.o.d -MQ t/helper/test-read-midx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-midx.c
+gcc -o t/helper/test-pkt-line.o -c -MF t/helper/.depend/test-pkt-line.o.d -MQ t/helper/test-pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-pkt-line.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-mergesort.o -c -MF t/helper/.depend/test-mergesort.o.d -MQ t/helper/test-mergesort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mergesort.c
+gcc -o t/helper/test-proc-receive.o -c -MF t/helper/.depend/test-proc-receive.o.d -MQ t/helper/test-proc-receive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-proc-receive.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-regex.o -c -MF t/helper/.depend/test-regex.o.d -MQ t/helper/test-regex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-regex.c
+gcc -o t/helper/test-parse-options.o -c -MF t/helper/.depend/test-parse-options.o.d -MQ t/helper/test-parse-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-parse-options.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-reach.o -c -MF t/helper/.depend/test-reach.o.d -MQ t/helper/test-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reach.c
+gcc -o t/helper/test-mergesort.o -c -MF t/helper/.depend/test-mergesort.o.d -MQ t/helper/test-mergesort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mergesort.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-path-utils.o -c -MF t/helper/.depend/test-path-utils.o.d -MQ t/helper/test-path-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-utils.c
+gcc -o t/helper/test-read-midx.o -c -MF t/helper/.depend/test-read-midx.o.d -MQ t/helper/test-read-midx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-read-midx.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-reftable.o -c -MF t/helper/.depend/test-reftable.o.d -MQ t/helper/test-reftable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reftable.c
+gcc -o t/helper/test-regex.o -c -MF t/helper/.depend/test-regex.o.d -MQ t/helper/test-regex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-regex.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-revision-walking.o -c -MF t/helper/.depend/test-revision-walking.o.d -MQ t/helper/test-revision-walking.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-revision-walking.c
+gcc -o t/helper/test-reftable.o -c -MF t/helper/.depend/test-reftable.o.d -MQ t/helper/test-reftable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reftable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-scrap-cache-tree.o -c -MF t/helper/.depend/test-scrap-cache-tree.o.d -MQ t/helper/test-scrap-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-scrap-cache-tree.c
+gcc -o t/helper/test-reach.o -c -MF t/helper/.depend/test-reach.o.d -MQ t/helper/test-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-reach.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-repository.o -c -MF t/helper/.depend/test-repository.o.d -MQ t/helper/test-repository.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-repository.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-sha1.o -c -MF t/helper/.depend/test-sha1.o.d -MQ t/helper/test-sha1.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha1.c
+gcc -o t/helper/test-scrap-cache-tree.o -c -MF t/helper/.depend/test-scrap-cache-tree.o.d -MQ t/helper/test-scrap-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-scrap-cache-tree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-sha256.o -c -MF t/helper/.depend/test-sha256.o.d -MQ t/helper/test-sha256.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha256.c
+gcc -o t/helper/test-path-utils.o -c -MF t/helper/.depend/test-path-utils.o.d -MQ t/helper/test-path-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-path-utils.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-sigchain.o -c -MF t/helper/.depend/test-sigchain.o.d -MQ t/helper/test-sigchain.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sigchain.c
+gcc -o t/helper/test-revision-walking.o -c -MF t/helper/.depend/test-revision-walking.o.d -MQ t/helper/test-revision-walking.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-revision-walking.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-ref-store.o -c -MF t/helper/.depend/test-ref-store.o.d -MQ t/helper/test-ref-store.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-ref-store.c
@@ -3953,13 +3980,13 @@
 gcc -o t/helper/test-serve-v2.o -c -MF t/helper/.depend/test-serve-v2.o.d -MQ t/helper/test-serve-v2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-serve-v2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-wildmatch.o -c -MF t/helper/.depend/test-wildmatch.o.d -MQ t/helper/test-wildmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
+gcc -o t/helper/test-sha256.o -c -MF t/helper/.depend/test-sha256.o.d -MQ t/helper/test-sha256.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha256.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-rot13-filter.o -c -MF t/helper/.depend/test-rot13-filter.o.d -MQ t/helper/test-rot13-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-rot13-filter.c
+gcc -o t/helper/test-sigchain.o -c -MF t/helper/.depend/test-sigchain.o.d -MQ t/helper/test-sigchain.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sigchain.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-string-list.o -c -MF t/helper/.depend/test-string-list.o.d -MQ t/helper/test-string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-string-list.c
+gcc -o t/helper/test-sha1.o -c -MF t/helper/.depend/test-sha1.o.d -MQ t/helper/test-sha1.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-sha1.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-submodule-nested-repo-config.o -c -MF t/helper/.depend/test-submodule-nested-repo-config.o.d -MQ t/helper/test-submodule-nested-repo-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-nested-repo-config.c
@@ -3968,16 +3995,22 @@
 gcc -o t/helper/test-submodule-config.o -c -MF t/helper/.depend/test-submodule-config.o.d -MQ t/helper/test-submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule-config.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-rot13-filter.o -c -MF t/helper/.depend/test-rot13-filter.o.d -MQ t/helper/test-rot13-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-rot13-filter.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-subprocess.o -c -MF t/helper/.depend/test-subprocess.o.d -MQ t/helper/test-subprocess.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-subprocess.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/helper/test-truncate.o -c -MF t/helper/.depend/test-truncate.o.d -MQ t/helper/test-truncate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-truncate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-userdiff.o -c -MF t/helper/.depend/test-userdiff.o.d -MQ t/helper/test-userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-userdiff.c
+gcc -o t/helper/test-string-list.o -c -MF t/helper/.depend/test-string-list.o.d -MQ t/helper/test-string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-string-list.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-submodule.o -c -MF t/helper/.depend/test-submodule.o.d -MQ t/helper/test-submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule.c
+gcc -o t/helper/test-run-command.o -c -MF t/helper/.depend/test-run-command.o.d -MQ t/helper/test-run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-userdiff.o -c -MF t/helper/.depend/test-userdiff.o.d -MQ t/helper/test-userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-userdiff.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -3990,10 +4023,7 @@
 chmod +x bin-wrappers/git
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-run-command.o -c -MF t/helper/.depend/test-run-command.o.d -MQ t/helper/test-run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-simple-ipc.o -c -MF t/helper/.depend/test-simple-ipc.o.d -MQ t/helper/test-simple-ipc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-simple-ipc.c
+gcc -o t/helper/test-wildmatch.o -c -MF t/helper/.depend/test-wildmatch.o.d -MQ t/helper/test-wildmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4009,7 +4039,10 @@
 gcc -o t/helper/test-windows-named-pipe.o -c -MF t/helper/.depend/test-windows-named-pipe.o.d -MQ t/helper/test-windows-named-pipe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-windows-named-pipe.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-xml-encode.o -c -MF t/helper/.depend/test-xml-encode.o.d -MQ t/helper/test-xml-encode.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-xml-encode.c
+gcc -o t/helper/test-submodule.o -c -MF t/helper/.depend/test-submodule.o.d -MQ t/helper/test-submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-trace2.o -c -MF t/helper/.depend/test-trace2.o.d -MQ t/helper/test-trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-trace2.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4035,7 +4068,10 @@
 chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/helper/test-trace2.o -c -MF t/helper/.depend/test-trace2.o.d -MQ t/helper/test-trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-trace2.c
+gcc -o t/helper/test-xml-encode.o -c -MF t/helper/.depend/test-xml-encode.o.d -MQ t/helper/test-xml-encode.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-xml-encode.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/unit-tests/test-lib.o -c -MF t/unit-tests/.depend/test-lib.o.d -MQ t/unit-tests/test-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/test-lib.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4048,6 +4084,9 @@
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc -o t/helper/test-simple-ipc.o -c -MF t/helper/.depend/test-simple-ipc.o.d -MQ t/helper/test-simple-ipc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-simple-ipc.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.49.0+next.20250314|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.49.0+next.20250314/po/build/locale|' \
@@ -4078,9 +4117,6 @@
 chmod +x bin-wrappers/test-fake-ssh
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/test-lib.o -c -MF t/unit-tests/.depend/test-lib.o.d -MQ t/unit-tests/test-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/test-lib.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@BUILD_DIR@|/build/reproducible-path/git-2.49.0+next.20250314|' \
      -e 's|@GIT_TEXTDOMAINDIR@|/build/reproducible-path/git-2.49.0+next.20250314/po/build/locale|' \
@@ -4094,13 +4130,13 @@
     * new test suites
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-reftable-reader.o -c -MF t/unit-tests/.depend/t-reftable-reader.o.d -MQ t/unit-tests/t-reftable-reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-reader.c
+gcc -o t/unit-tests/lib-reftable.o -c -MF t/unit-tests/.depend/lib-reftable.o.d -MQ t/unit-tests/lib-reftable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-reftable.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-trailer.o -c -MF t/unit-tests/.depend/t-trailer.o.d -MQ t/unit-tests/t-trailer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-trailer.c
+gcc -o t/unit-tests/t-reftable-reader.o -c -MF t/unit-tests/.depend/t-reftable-reader.o.d -MQ t/unit-tests/t-reftable-reader.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-reader.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/lib-reftable.o -c -MF t/unit-tests/.depend/lib-reftable.o.d -MQ t/unit-tests/lib-reftable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/lib-reftable.c
+gcc -o t/unit-tests/t-trailer.o -c -MF t/unit-tests/.depend/t-trailer.o.d -MQ t/unit-tests/t-trailer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-trailer.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/t-reftable-pq.o -c -MF t/unit-tests/.depend/t-reftable-pq.o.d -MQ t/unit-tests/t-reftable-pq.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-pq.c
@@ -4109,36 +4145,36 @@
 gcc -o t/unit-tests/t-reftable-basics.o -c -MF t/unit-tests/.depend/t-reftable-basics.o.d -MQ t/unit-tests/t-reftable-basics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-basics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-fake-ssh -Wl,-z,relro   t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-urlmatch-normalization.o -c -MF t/unit-tests/.depend/t-urlmatch-normalization.o.d -MQ t/unit-tests/t-urlmatch-normalization.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-urlmatch-normalization.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-reftable-block.o -c -MF t/unit-tests/.depend/t-reftable-block.o.d -MQ t/unit-tests/t-reftable-block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-block.c
+gcc -o t/unit-tests/t-reftable-merged.o -c -MF t/unit-tests/.depend/t-reftable-merged.o.d -MQ t/unit-tests/t-reftable-merged.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-merged.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-urlmatch-normalization.o -c -MF t/unit-tests/.depend/t-urlmatch-normalization.o.d -MQ t/unit-tests/t-urlmatch-normalization.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-urlmatch-normalization.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-fake-ssh -Wl,-z,relro   t/helper/test-fake-ssh.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-reftable-merged.o -c -MF t/unit-tests/.depend/t-reftable-merged.o.d -MQ t/unit-tests/t-reftable-merged.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-merged.c
+gcc -o t/unit-tests/t-reftable-block.o -c -MF t/unit-tests/.depend/t-reftable-block.o.d -MQ t/unit-tests/t-reftable-block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-block.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-reftable-record.o -c -MF t/unit-tests/.depend/t-reftable-record.o.d -MQ t/unit-tests/t-reftable-record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-record.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-trailer -Wl,-z,relro   \
+	t/unit-tests/t-trailer.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-reader -Wl,-z,relro   \
 	t/unit-tests/t-reftable-reader.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh t/unit-tests/generate-clar-decls.sh "t/unit-tests/clar-decls.h" t/unit-tests/u-ctype.c t/unit-tests/u-example-decorate.c t/unit-tests/u-hash.c t/unit-tests/u-hashmap.c t/unit-tests/u-mem-pool.c t/unit-tests/u-oid-array.c t/unit-tests/u-oidmap.c t/unit-tests/u-oidtree.c t/unit-tests/u-prio-queue.c t/unit-tests/u-reftable-tree.c t/unit-tests/u-strbuf.c t/unit-tests/u-strcmp-offset.c t/unit-tests/u-strvec.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-tool -Wl,-z,relro   t/helper/test-tool.o common-main.o t/helper/test-advise.o t/helper/test-bitmap.o t/helper/test-bloom.o t/helper/test-bundle-uri.o t/helper/test-cache-tree.o t/helper/test-chmtime.o t/helper/test-config.o t/helper/test-crontab.o t/helper/test-csprng.o t/helper/test-date.o t/helper/test-delete-gpgsig.o t/helper/test-delta.o t/helper/test-dir-iterator.o t/helper/test-drop-caches.o t/helper/test-dump-cache-tree.o t/helper/test-dump-fsmonitor.o t/helper/test-dump-split-index.o t/helper/test-dump-untracked-cache.o t/helper/test-env-helper.o t/helper/test-example-tap.o t/helper/test-find-pack.o t/helper/test-fsmonitor-client.o t/helper/test-genrandom.o t/helper/test-genzeros.o t/helper/test-getcwd.o t/helper/test-hash-speed.o t/helper/test-hash.o t/helper/test-hashmap.o t/helper/test-hexdump.o t/helper/test-json-writer.o t/helper/test-lazy-init-name-hash.o t/helper/test-match-trees.o t/helper/test-mergesort.o t/helper/test-mktemp.o t/helper/test-name-hash.o t/helper/test-online-cpus.o t/helper/test-pack-mtimes.o t/helper/test-parse-options.o t/helper/test-parse-pathspec-file.o t/helper/test-partial-clone.o t/helper/test-path-utils.o t/helper/test-path-walk.o t/helper/test-pcre2-config.o t/helper/test-pkt-line.o t/helper/test-proc-receive.o t/helper/test-progress.o t/helper/test-reach.o t/helper/test-read-cache.o t/helper/test-read-graph.o t/helper/test-read-midx.o t/helper/test-ref-store.o t/helper/test-reftable.o t/helper/test-regex.o t/helper/test-rot13-filter.o t/helper/test-repository.o t/helper/test-revision-walking.o t/helper/test-run-command.o t/helper/test-scrap-cache-tree.o t/helper/test-serve-v2.o t/helper/test-sha1.o t/helper/test-sha256.o t/helper/test-sigchain.o t/helper/test-simple-ipc.o t/helper/test-string-list.o t/helper/test-submodule-config.o t/helper/test-submodule-nested-repo-config.o t/helper/test-submodule.o t/helper/test-subprocess.o t/helper/test-trace2.o t/helper/test-truncate.o t/helper/test-userdiff.o t/helper/test-wildmatch.o t/helper/test-windows-named-pipe.o t/helper/test-write-cache.o t/helper/test-xml-encode.o t/unit-tests/test-lib.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh t/unit-tests/generate-clar-suites.sh t/unit-tests/clar-decls.h t/unit-tests/clar.suite
+/bin/sh t/unit-tests/generate-clar-decls.sh "t/unit-tests/clar-decls.h" t/unit-tests/u-ctype.c t/unit-tests/u-example-decorate.c t/unit-tests/u-hash.c t/unit-tests/u-hashmap.c t/unit-tests/u-mem-pool.c t/unit-tests/u-oid-array.c t/unit-tests/u-oidmap.c t/unit-tests/u-oidtree.c t/unit-tests/u-prio-queue.c t/unit-tests/u-reftable-tree.c t/unit-tests/u-strbuf.c t/unit-tests/u-strcmp-offset.c t/unit-tests/u-strvec.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-trailer -Wl,-z,relro   \
-	t/unit-tests/t-trailer.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-reftable-record.o -c -MF t/unit-tests/.depend/t-reftable-record.o.d -MQ t/unit-tests/t-reftable-record.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-record.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/helper/test-tool -Wl,-z,relro   t/helper/test-tool.o common-main.o t/helper/test-advise.o t/helper/test-bitmap.o t/helper/test-bloom.o t/helper/test-bundle-uri.o t/helper/test-cache-tree.o t/helper/test-chmtime.o t/helper/test-config.o t/helper/test-crontab.o t/helper/test-csprng.o t/helper/test-date.o t/helper/test-delete-gpgsig.o t/helper/test-delta.o t/helper/test-dir-iterator.o t/helper/test-drop-caches.o t/helper/test-dump-cache-tree.o t/helper/test-dump-fsmonitor.o t/helper/test-dump-split-index.o t/helper/test-dump-untracked-cache.o t/helper/test-env-helper.o t/helper/test-example-tap.o t/helper/test-find-pack.o t/helper/test-fsmonitor-client.o t/helper/test-genrandom.o t/helper/test-genzeros.o t/helper/test-getcwd.o t/helper/test-hash-speed.o t/helper/test-hash.o t/helper/test-hashmap.o t/helper/test-hexdump.o t/helper/test-json-writer.o t/helper/test-lazy-init-name-hash.o t/helper/test-match-trees.o t/helper/test-mergesort.o t/helper/test-mktemp.o t/helper/test-name-hash.o t/helper/test-online-cpus.o t/helper/test-pack-mtimes.o t/helper/test-parse-options.o t/helper/test-parse-pathspec-file.o t/helper/test-partial-clone.o t/helper/test-path-utils.o t/helper/test-path-walk.o t/helper/test-pcre2-config.o t/helper/test-pkt-line.o t/helper/test-proc-receive.o t/helper/test-progress.o t/helper/test-reach.o t/helper/test-read-cache.o t/helper/test-read-graph.o t/helper/test-read-midx.o t/helper/test-ref-store.o t/helper/test-reftable.o t/helper/test-regex.o t/helper/test-rot13-filter.o t/helper/test-repository.o t/helper/test-revision-walking.o t/helper/test-run-command.o t/helper/test-scrap-cache-tree.o t/helper/test-serve-v2.o t/helper/test-sha1.o t/helper/test-sha256.o t/helper/test-sigchain.o t/helper/test-simple-ipc.o t/helper/test-string-list.o t/helper/test-submodule-config.o t/helper/test-submodule-nested-repo-config.o t/helper/test-submodule.o t/helper/test-subprocess.o t/helper/test-trace2.o t/helper/test-truncate.o t/helper/test-userdiff.o t/helper/test-wildmatch.o t/helper/test-windows-named-pipe.o t/helper/test-write-cache.o t/helper/test-xml-encode.o t/unit-tests/test-lib.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+/bin/sh t/unit-tests/generate-clar-suites.sh t/unit-tests/clar-decls.h t/unit-tests/clar.suite
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-pq -Wl,-z,relro   \
@@ -4149,35 +4185,31 @@
 	t/unit-tests/t-reftable-basics.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/u-example-decorate.o -c -MF t/unit-tests/.depend/u-example-decorate.o.d -MQ t/unit-tests/u-example-decorate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-example-decorate.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-block -Wl,-z,relro   \
-	t/unit-tests/t-reftable-block.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-urlmatch-normalization -Wl,-z,relro   \
+	t/unit-tests/t-urlmatch-normalization.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/u-mem-pool.o -c -MF t/unit-tests/.depend/u-mem-pool.o.d -MQ t/unit-tests/u-mem-pool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-mem-pool.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/t-reftable-readwrite.o -c -MF t/unit-tests/.depend/t-reftable-readwrite.o.d -MQ t/unit-tests/t-reftable-readwrite.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-readwrite.c
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-merged -Wl,-z,relro   \
+	t/unit-tests/t-reftable-merged.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/u-hash.o -c -MF t/unit-tests/.depend/u-hash.o.d -MQ t/unit-tests/u-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-urlmatch-normalization -Wl,-z,relro   \
-	t/unit-tests/t-urlmatch-normalization.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/u-example-decorate.o -c -MF t/unit-tests/.depend/u-example-decorate.o.d -MQ t/unit-tests/u-example-decorate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-example-decorate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-merged -Wl,-z,relro   \
-	t/unit-tests/t-reftable-merged.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc -o t/unit-tests/t-reftable-readwrite.o -c -MF t/unit-tests/.depend/t-reftable-readwrite.o.d -MQ t/unit-tests/t-reftable-readwrite.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-readwrite.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-record -Wl,-z,relro   \
-	t/unit-tests/t-reftable-record.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-block -Wl,-z,relro   \
+	t/unit-tests/t-reftable-block.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/u-ctype.o -c -MF t/unit-tests/.depend/u-ctype.o.d -MQ t/unit-tests/u-ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-ctype.c
+gcc -o t/unit-tests/u-prio-queue.o -c -MF t/unit-tests/.depend/u-prio-queue.o.d -MQ t/unit-tests/u-prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-prio-queue.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/u-oid-array.o -c -MF t/unit-tests/.depend/u-oid-array.o.d -MQ t/unit-tests/u-oid-array.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oid-array.c
@@ -4186,7 +4218,7 @@
 gcc -o t/unit-tests/u-oidtree.o -c -MF t/unit-tests/.depend/u-oidtree.o.d -MQ t/unit-tests/u-oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oidtree.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/u-prio-queue.o -c -MF t/unit-tests/.depend/u-prio-queue.o.d -MQ t/unit-tests/u-prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-prio-queue.c
+gcc -o t/unit-tests/u-ctype.o -c -MF t/unit-tests/.depend/u-ctype.o.d -MQ t/unit-tests/u-ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/u-oidmap.o -c -MF t/unit-tests/.depend/u-oidmap.o.d -MQ t/unit-tests/u-oidmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-oidmap.c
@@ -4204,16 +4236,20 @@
 gcc -o t/unit-tests/lib-oid.o -c -MF t/unit-tests/.depend/lib-oid.o.d -MQ t/unit-tests/lib-oid.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/lib-oid.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/u-hashmap.o -c -MF t/unit-tests/.depend/u-hashmap.o.d -MQ t/unit-tests/u-hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-hashmap.c
+gcc -o t/unit-tests/unit-test.o -c -MF t/unit-tests/.depend/unit-test.o.d -MQ t/unit-tests/unit-test.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/unit-test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-gcc -o t/unit-tests/unit-test.o -c -MF t/unit-tests/.depend/unit-test.o.d -MQ t/unit-tests/unit-test.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/unit-test.c
+gcc -o t/unit-tests/u-hashmap.o -c -MF t/unit-tests/.depend/u-hashmap.o.d -MQ t/unit-tests/u-hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -It/unit-tests t/unit-tests/u-hashmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-readwrite -Wl,-z,relro   \
 	t/unit-tests/t-reftable-readwrite.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o t/unit-tests/bin/t-reftable-record -Wl,-z,relro   \
+	t/unit-tests/t-reftable-record.o t/unit-tests/test-lib.o t/unit-tests/lib-reftable.o common-main.o libgit.a xdiff/lib.a reftable/libreftable.a libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 gcc -o t/unit-tests/t-reftable-stack.o -c -MF t/unit-tests/.depend/t-reftable-stack.o.d -MQ t/unit-tests/t-reftable-stack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2  -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"aarch64\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-reftable-stack.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -4284,91 +4320,94 @@
 '/bin/sh' technical/api-index.sh ./technical ./technical/api-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-backfill.xml git-backfill.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 '/bin/sh' ./howto/howto-index.sh howto/coordinate-embargoed-releases.adoc howto/keep-canonical-history-correct.adoc howto/maintain-git.adoc howto/new-command.adoc howto/rebase-from-internal-branch.adoc howto/rebuild-from-update-hook.adoc howto/recover-corrupted-blob-object.adoc howto/recover-corrupted-object-harder.adoc howto/revert-a-faulty-merge.adoc howto/revert-branch-rebase.adoc howto/separating-topic-branches.adoc howto/setup-git-server-over-http.adoc howto/update-hook-example.adoc howto/use-git-daemon.adoc howto/using-merge-subtree.adoc howto/using-signed-tag-in-pull-request.adoc >howto-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-checkout.xml git-checkout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.adoc
@@ -4377,28 +4416,25 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.adoc
@@ -4407,28 +4443,28 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-pairs.xml git-diff-pairs.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.adoc
@@ -4437,73 +4473,73 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-pairs.xml git-diff-pairs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.adoc
@@ -4512,34 +4548,28 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-index.xml git-merge-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.adoc
@@ -4548,7 +4578,13 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.adoc
@@ -4557,106 +4593,115 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.adoc
@@ -4668,55 +4713,46 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.adoc
@@ -4725,123 +4761,123 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -4857,46 +4893,49 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o git.xml git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-annotate.html git-annotate.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-backfill.html git-backfill.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-add.html git-add.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archimport.html git-archimport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-am.html git-am.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archimport.html git-archimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-annotate.html git-annotate.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-am.html git-am.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-backfill.html git-backfill.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-apply.html git-apply.adoc
@@ -4905,37 +4944,31 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-archive.html git-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-add.html git-add.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bisect.html git-bisect.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-blame.html git-blame.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-blame.html git-blame.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-bundle.html git-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cat-file.html git-cat-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-branch.html git-branch.adoc
@@ -4947,73 +4980,73 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout.html git-checkout.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cherry.html git-cherry.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clean.html git-clean.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cat-file.html git-cat-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-column.html git-column.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clean.html git-clean.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-checkout.html git-checkout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-column.html git-column.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clone.html git-clone.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential.html git-credential.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-credential.html git-credential.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-clone.html git-clone.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-describe.html git-describe.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-daemon.html git-daemon.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit.html git-commit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-commit.html git-commit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-daemon.html git-daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-difftool.html git-difftool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.adoc
@@ -5022,88 +5055,82 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-repo.html git-for-each-repo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch.html git-fetch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-pairs.html git-diff-pairs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-pairs.html git-diff-pairs.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fetch.html git-fetch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fast-import.html git-fast-import.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff.html git-diff.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gui.html git-gui.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-grep.html git-grep.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-hook.html git-hook.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gc.html git-gc.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-help.html git-help.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-help.html git-help.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gc.html git-gc.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-gui.html git-gui.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-grep.html git-grep.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-fsck.html git-fsck.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-push.html git-http-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init-db.html git-init-db.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init-db.html git-init-db.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-init.html git-init.adoc
@@ -5112,85 +5139,91 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-tree.html git-merge-tree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool--lib.html git-mergetool--lib.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mv.html git-mv.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool--lib.html git-mergetool--lib.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktag.html git-mktag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mv.html git-mv.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mktree.html git-mktree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-name-rev.html git-name-rev.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge-tree.html git-merge-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-name-rev.html git-name-rev.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge.html git-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune.html git-prune.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-notes.html git-notes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-range-diff.html git-range-diff.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-merge.html git-merge.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-notes.html git-notes.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-prune.html git-prune.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reflog.html git-reflog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-p4.html git-p4.adoc
@@ -5199,43 +5232,46 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-refs.html git-refs.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-range-diff.html git-range-diff.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pull.html git-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote.html git-remote.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replace.html git-replace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-pull.html git-pull.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-request-pull.html git-request-pull.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote-fd.html git-remote-fd.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reflog.html git-reflog.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-request-pull.html git-request-pull.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rerere.html git-rerere.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-push.html git-push.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-repack.html git-repack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-remote.html git-remote.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-restore.html git-restore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reset.html git-reset.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-repack.html git-repack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-log.html git-log.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rerere.html git-rerere.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-revert.html git-revert.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-reset.html git-reset.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.adoc
@@ -5244,43 +5280,43 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rebase.html git-rebase.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replace.html git-replace.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-revert.html git-revert.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-push.html git-push.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rm.html git-rm.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-log.html git-log.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rm.html git-rm.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replay.html git-replay.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shell.html git-shell.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-email.html git-send-email.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-index.html git-show-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shell.html git-shell.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-send-email.html git-send-email.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-index.html git-show-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-replay.html git-replay.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stage.html git-stage.adoc
@@ -5289,7 +5325,7 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-switch.html git-switch.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stash.html git-stash.adoc
@@ -5298,55 +5334,64 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-tag.html git-tag.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-svn.html git-svn.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-status.html git-status.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-submodule.html git-submodule.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-tag.html git-tag.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-submodule.html git-submodule.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-status.html git-status.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-switch.html git-switch.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-config.html git-config.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-version.html git-version.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-var.html git-var.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show.html git-show.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-index.html git-update-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-version.html git-version.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-web--browse.html git-web--browse.adoc
@@ -5355,16 +5400,16 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-svn.html git-svn.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-worktree.html git-worktree.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-show.html git-show.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-worktree.html git-worktree.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitk.html gitk.adoc
@@ -5373,13 +5418,7 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o scalar.html scalar.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-update-index.html git-update-index.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git-config.html git-config.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.adoc
@@ -5388,100 +5427,97 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.html gitweb.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitignore.html gitignore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitmodules.html gitmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitignore.html gitignore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcli.html gitcli.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o githooks.html githooks.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o giteveryday.html giteveryday.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitattributes.html gitattributes.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitnamespaces.html gitnamespaces.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o git.html git.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitfaq.html gitfaq.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitpacking.html gitpacking.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 howto-index.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 git-tools.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 howto-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 git-tools.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitglossary.html gitglossary.adoc
@@ -5490,22 +5526,22 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gittutorial.html gittutorial.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.adoc
+\
+sed -e '1,/^$/d' howto/new-command.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-\
-sed -e '1,/^$/d' howto/revert-branch-rebase.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-branch-rebase.html
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/using-merge-subtree.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-merge-subtree.html
+sed -e '1,/^$/d' howto/update-hook-example.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/update-hook-example.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/new-command.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/new-command.html
+sed -e '1,/^$/d' howto/revert-branch-rebase.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
@@ -5519,8 +5555,8 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/update-hook-example.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/update-hook-example.html
+sed -e '1,/^$/d' howto/using-merge-subtree.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
@@ -5529,36 +5565,31 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-blob-object.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-blob-object.html
+sed -e '1,/^$/d' howto/setup-git-server-over-http.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/recover-corrupted-object-harder.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-object-harder.html
+sed -e '1,/^$/d' howto/revert-a-faulty-merge.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-\
-sed -e '1,/^$/d' howto/rebuild-from-update-hook.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebuild-from-update-hook.html
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/revert-a-faulty-merge.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/revert-a-faulty-merge.html
+sed -e '1,/^$/d' howto/recover-corrupted-blob-object.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/setup-git-server-over-http.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/setup-git-server-over-http.html
+sed -e '1,/^$/d' howto/recover-corrupted-object-harder.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/rebase-from-internal-branch.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebase-from-internal-branch.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 git-bisect-lk2009.adoc
+sed -e '1,/^$/d' howto/rebuild-from-update-hook.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
@@ -5566,6 +5597,11 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+\
+sed -e '1,/^$/d' howto/coordinate-embargoed-releases.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/coordinate-embargoed-releases.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-error-handling.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -5573,8 +5609,8 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 \
-sed -e '1,/^$/d' howto/coordinate-embargoed-releases.adoc | \
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/coordinate-embargoed-releases.html
+sed -e '1,/^$/d' howto/rebase-from-internal-branch.adoc | \
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 - >howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-simple-ipc.adoc
@@ -5588,58 +5624,55 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-path-walk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 ToolsForGit.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 DecisionMaking.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.adoc
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-parse-options.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/long-running-process-protocol.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 ReviewingGuidelines.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bitmap-format.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 ToolsForGit.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/build-systems.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 MyFirstObjectWalk.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 SubmittingPatches.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bitmap-format.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/bundle-uri.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/pack-heuristics.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/build-systems.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/platform-support.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-trace2.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-trace2.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/long-running-process-protocol.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/send-pack-pipeline.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 SubmittingPatches.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/multi-pack-index.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 MyFirstObjectWalk.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 MyFirstContribution.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/pack-heuristics.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/parallel-checkout.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/racy-git.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/hash-function-transition.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/send-pack-pipeline.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/scalar.adoc
@@ -5648,16 +5681,16 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/shallow.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/partial-clone.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/platform-support.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/hash-function-transition.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/racy-git.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/unit-tests.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/trivial-merge.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/trivial-merge.adoc
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/partial-clone.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/api-index.adoc
@@ -5669,45 +5702,51 @@
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b xhtml11 -o git-remote-helpers.html git-remote-helpers.adoco
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/unit-tests.adoc
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a git-relative-html-prefix=../ -f asciidoc.conf -b xhtml11 technical/reftable.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d book -o user-manual.xml user-manual.adoc
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-am.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-backfill.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-backfill.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-am.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-apply.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-add.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bisect.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
+TZ=UTC asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -f asciidoc.conf -b docbook -d book -o user-manual.xml user-manual.adoc
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bisect.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-add.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bundle.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -5717,58 +5756,55 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-attr.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cat-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-column.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache--daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clone.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit.xml
@@ -5780,10 +5816,10 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-describe.xml
@@ -5792,6 +5828,9 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsserver.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-difftool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -5801,130 +5840,127 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-pairs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-import.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-import.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-format-patch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-get-tar-commit-id.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-get-tar-commit-id.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-format-patch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-help.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gui.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hook.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-help.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hook.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-imap-send.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-instaweb.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-config.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-config.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-tree.xml
@@ -5933,58 +5969,55 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mv.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-name-rev.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-name-rev.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mv.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-patch-id.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-range-diff.xml
@@ -5993,58 +6026,64 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pull.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-ext.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-fd.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-fd.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rerere.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replay.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rerere.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replay.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-restore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-revert.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-revert.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-parse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n--envsubst.xml
@@ -6059,21 +6098,18 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-setup.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-parse.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shell.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -6098,10 +6134,10 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-objects.xml
@@ -6110,10 +6146,10 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-svn.xml
@@ -6122,9 +6158,6 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-server-info.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -6134,19 +6167,25 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-var.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-var.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-web--browse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-web--browse.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-pack.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-version.xml
@@ -6158,100 +6197,91 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man scalar.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-worktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man scalar.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man githooks.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-common.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrepository-layout.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitdiffcore.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrepository-layout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcredentials.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitdiffcore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man giteveryday.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitnamespaces.xml
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitnamespaces.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitpacking.xml
@@ -6260,21 +6290,27 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitglossary.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xsltproc --xinclude --stringparam html.stylesheet docbook-xsl.css --param generate.consistent.ids 1 -o user-manual.html docbook.xsl user-manual.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrevisions.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitworkflows.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[1]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -6284,13 +6320,13 @@
 /usr/bin/make -C ../.. SCRIPT_PERL="contrib/mw-to-git//git-remote-mediawiki.perl contrib/mw-to-git//git-mw.perl" \
                 build-perl-script
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-remote-mediawiki.perl" "contrib/mw-to-git//git-remote-mediawiki+" && \
-mv contrib/mw-to-git//git-remote-mediawiki+ contrib/mw-to-git//git-remote-mediawiki
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-mw.perl" "contrib/mw-to-git//git-mw+" && \
 mv contrib/mw-to-git//git-mw+ contrib/mw-to-git//git-mw
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "contrib/mw-to-git//git-remote-mediawiki.perl" "contrib/mw-to-git//git-remote-mediawiki+" && \
+mv contrib/mw-to-git//git-remote-mediawiki+ contrib/mw-to-git//git-remote-mediawiki
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
    debian/rules override_dh_auto_test-arch
 test -z 'test' || \
   GIT_SKIP_TESTS="t9128 t9167" \
@@ -6312,10 +6348,6 @@
 mv git-merge-one-file+ git-merge-one-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool+ git-mergetool
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-merge-resolve.sh" "git-merge-resolve+" ./GIT-BUILD-OPTIONS && \
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -6324,14 +6356,18 @@
 mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
-mv git-submodule+ git-submodule
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-request-pull.sh" "git-request-pull+" ./GIT-BUILD-OPTIONS && \
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool+ git-mergetool
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-submodule.sh" "git-submodule+" ./GIT-BUILD-OPTIONS && \
+mv git-submodule+ git-submodule
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-web--browse.sh" "git-web--browse+" ./GIT-BUILD-OPTIONS && \
 mv git-web--browse+ git-web--browse
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -6363,22 +6399,22 @@
 /bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool--lib+ git-mergetool--lib
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-i18n+ git-sh-i18n
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
 chmod +x git-instaweb+ && \
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool--lib+ git-mergetool--lib
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-i18n+ git-sh-i18n
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 /usr/bin/make -C gitk-git  all
 /usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
@@ -6867,176 +6903,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0017-env-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0017-env-helper/.git/
-expecting success of 0017.1 'test-tool env-helper usage': 
-	test_must_fail test-tool env-helper &&
-	test_must_fail test-tool env-helper --type=bool &&
-	test_must_fail test-tool env-helper --type=ulong &&
-	test_must_fail test-tool env-helper --type=bool &&
-	test_must_fail test-tool env-helper --type=bool --default &&
-	test_must_fail test-tool env-helper --type=bool --default= &&
-	test_must_fail test-tool env-helper --defaultxyz
-
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-error: option `default' requires a value
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-ok 1 - test-tool env-helper usage
-
-expecting success of 0017.2 'test-tool env-helper bad default values': 
-	test_must_fail test-tool env-helper --type=bool --default=1xyz MISSING &&
-	test_must_fail test-tool env-helper --type=ulong --default=1xyz MISSING
-
-error: option `--default' expects a boolean value with `--type=bool`, not `1xyz`
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-error: option `--default' expects an unsigned long value with `--type=ulong`, not `1xyz`
-usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
-
-    --type <type>         value is given this type
-    --[no-]default <value>
-                          default for git_env_*(...) to fall back on
-    --[no-]exit-code      be quiet only use git_env_*() value as exit code
-
-ok 2 - test-tool env-helper bad default values
-
-expecting success of 0017.3 'test-tool env-helper --type=bool': 
-	# Test various --default bool values
-	echo true >expected &&
-	test-tool env-helper --type=bool --default=1 MISSING >actual &&
-	test_cmp expected actual &&
-	test-tool env-helper --type=bool --default=yes MISSING >actual &&
-	test_cmp expected actual &&
-	test-tool env-helper --type=bool --default=true MISSING >actual &&
-	test_cmp expected actual &&
-	echo false >expected &&
-	test_must_fail test-tool env-helper --type=bool --default=0 MISSING >actual &&
-	test_cmp expected actual &&
-	test_must_fail test-tool env-helper --type=bool --default=no MISSING >actual &&
-	test_cmp expected actual &&
-	test_must_fail test-tool env-helper --type=bool --default=false MISSING >actual &&
-	test_cmp expected actual &&
-
-	# No output with --exit-code
-	test-tool env-helper --type=bool --default=true --exit-code MISSING >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err &&
-	test_must_fail test-tool env-helper --type=bool --default=false --exit-code MISSING >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err &&
-
-	# Existing variable
-	EXISTS=true test-tool env-helper --type=bool --default=false --exit-code EXISTS >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err &&
-	test_must_fail \
-		env EXISTS=false \
-		test-tool env-helper --type=bool --default=true --exit-code EXISTS >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err
-
-ok 3 - test-tool env-helper --type=bool
-
-expecting success of 0017.4 'test-tool env-helper --type=ulong': 
-	echo 1234567890 >expected &&
-	test-tool env-helper --type=ulong --default=1234567890 MISSING >actual.out 2>actual.err &&
-	test_cmp expected actual.out &&
-	test_must_be_empty actual.err &&
-
-	echo 0 >expected &&
-	test_must_fail test-tool env-helper --type=ulong --default=0 MISSING >actual &&
-	test_cmp expected actual &&
-
-	test-tool env-helper --type=ulong --default=1234567890 --exit-code MISSING >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err &&
-
-	EXISTS=1234567890 test-tool env-helper --type=ulong --default=0 EXISTS --exit-code >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_must_be_empty actual.err &&
-
-	echo 1234567890 >expected &&
-	EXISTS=1234567890 test-tool env-helper --type=ulong --default=0 EXISTS >actual.out 2>actual.err &&
-	test_cmp expected actual.out &&
-	test_must_be_empty actual.err
-
-ok 4 - test-tool env-helper --type=ulong
-
-expecting success of 0017.5 'test-tool env-helper reads config thanks to trace2': 
-	mkdir home &&
-	git config -f home/.gitconfig include.path cycle &&
-	git config -f home/cycle include.path .gitconfig &&
-
-	test_must_fail \
-		env HOME="$(pwd)/home" \
-		git config -l 2>err &&
-	grep "exceeded maximum include depth" err &&
-
-	# This validates that the assumption that we attempt to
-	# read the configuration and fail very early in the start-up
-	# sequence (due to trace2 subsystem), even before we notice
-	# that the directory named with "test-tool -C" does not exist
-	# and die.  It is a dubious thing to test, though.
-	test_must_fail \
-		env HOME="$(pwd)/home" GIT_TEST_ENV_HELPER=true \
-		test-tool -C no-such-directory \
-		env-helper --type=bool --default=0 \
-		--exit-code GIT_TEST_ENV_HELPER 2>err &&
-	grep "exceeded maximum include depth" err
-
-fatal: exceeded maximum include depth (10) while including
-fatal: exceeded maximum include depth (10) while including
-ok 5 - test-tool env-helper reads config thanks to trace2
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0007-git-var.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0007-git-var/.git/
 expecting success of 0007.1 'get GIT_AUTHOR_IDENT': 
@@ -7074,41 +6940,9 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-expecting success of 0007.3 'requested identities are strict': 
-	(
-		sane_unset GIT_COMMITTER_NAME &&
-		sane_unset GIT_COMMITTER_EMAIL &&
-		test_must_fail git var GIT_COMMITTER_IDENT
-	)
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-ok 3 - requested identities are strict
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912053 -0700
+prerequisite AUTOIDENT ok
+ok 3 # skip requested identities are strict (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
 
 expecting success of 0007.4 'get GIT_DEFAULT_BRANCH without configuration': 
 	(
@@ -7393,6 +7227,176 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0017-env-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0017-env-helper/.git/
+expecting success of 0017.1 'test-tool env-helper usage': 
+	test_must_fail test-tool env-helper &&
+	test_must_fail test-tool env-helper --type=bool &&
+	test_must_fail test-tool env-helper --type=ulong &&
+	test_must_fail test-tool env-helper --type=bool &&
+	test_must_fail test-tool env-helper --type=bool --default &&
+	test_must_fail test-tool env-helper --type=bool --default= &&
+	test_must_fail test-tool env-helper --defaultxyz
+
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+error: option `default' requires a value
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+ok 1 - test-tool env-helper usage
+
+expecting success of 0017.2 'test-tool env-helper bad default values': 
+	test_must_fail test-tool env-helper --type=bool --default=1xyz MISSING &&
+	test_must_fail test-tool env-helper --type=ulong --default=1xyz MISSING
+
+error: option `--default' expects a boolean value with `--type=bool`, not `1xyz`
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+error: option `--default' expects an unsigned long value with `--type=ulong`, not `1xyz`
+usage: test-tool env-helper --type=[bool|ulong] <options> <env-var>
+
+    --type <type>         value is given this type
+    --[no-]default <value>
+                          default for git_env_*(...) to fall back on
+    --[no-]exit-code      be quiet only use git_env_*() value as exit code
+
+ok 2 - test-tool env-helper bad default values
+
+expecting success of 0017.3 'test-tool env-helper --type=bool': 
+	# Test various --default bool values
+	echo true >expected &&
+	test-tool env-helper --type=bool --default=1 MISSING >actual &&
+	test_cmp expected actual &&
+	test-tool env-helper --type=bool --default=yes MISSING >actual &&
+	test_cmp expected actual &&
+	test-tool env-helper --type=bool --default=true MISSING >actual &&
+	test_cmp expected actual &&
+	echo false >expected &&
+	test_must_fail test-tool env-helper --type=bool --default=0 MISSING >actual &&
+	test_cmp expected actual &&
+	test_must_fail test-tool env-helper --type=bool --default=no MISSING >actual &&
+	test_cmp expected actual &&
+	test_must_fail test-tool env-helper --type=bool --default=false MISSING >actual &&
+	test_cmp expected actual &&
+
+	# No output with --exit-code
+	test-tool env-helper --type=bool --default=true --exit-code MISSING >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err &&
+	test_must_fail test-tool env-helper --type=bool --default=false --exit-code MISSING >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err &&
+
+	# Existing variable
+	EXISTS=true test-tool env-helper --type=bool --default=false --exit-code EXISTS >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err &&
+	test_must_fail \
+		env EXISTS=false \
+		test-tool env-helper --type=bool --default=true --exit-code EXISTS >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err
+
+ok 3 - test-tool env-helper --type=bool
+
+expecting success of 0017.4 'test-tool env-helper --type=ulong': 
+	echo 1234567890 >expected &&
+	test-tool env-helper --type=ulong --default=1234567890 MISSING >actual.out 2>actual.err &&
+	test_cmp expected actual.out &&
+	test_must_be_empty actual.err &&
+
+	echo 0 >expected &&
+	test_must_fail test-tool env-helper --type=ulong --default=0 MISSING >actual &&
+	test_cmp expected actual &&
+
+	test-tool env-helper --type=ulong --default=1234567890 --exit-code MISSING >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err &&
+
+	EXISTS=1234567890 test-tool env-helper --type=ulong --default=0 EXISTS --exit-code >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_must_be_empty actual.err &&
+
+	echo 1234567890 >expected &&
+	EXISTS=1234567890 test-tool env-helper --type=ulong --default=0 EXISTS >actual.out 2>actual.err &&
+	test_cmp expected actual.out &&
+	test_must_be_empty actual.err
+
+ok 4 - test-tool env-helper --type=ulong
+
+expecting success of 0017.5 'test-tool env-helper reads config thanks to trace2': 
+	mkdir home &&
+	git config -f home/.gitconfig include.path cycle &&
+	git config -f home/cycle include.path .gitconfig &&
+
+	test_must_fail \
+		env HOME="$(pwd)/home" \
+		git config -l 2>err &&
+	grep "exceeded maximum include depth" err &&
+
+	# This validates that the assumption that we attempt to
+	# read the configuration and fail very early in the start-up
+	# sequence (due to trace2 subsystem), even before we notice
+	# that the directory named with "test-tool -C" does not exist
+	# and die.  It is a dubious thing to test, though.
+	test_must_fail \
+		env HOME="$(pwd)/home" GIT_TEST_ENV_HELPER=true \
+		test-tool -C no-such-directory \
+		env-helper --type=bool --default=0 \
+		--exit-code GIT_TEST_ENV_HELPER 2>err &&
+	grep "exceeded maximum include depth" err
+
+fatal: exceeded maximum include depth (10) while including
+fatal: exceeded maximum include depth (10) while including
+ok 5 - test-tool env-helper reads config thanks to trace2
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0018-advice.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0018-advice/.git/
 expecting success of 0018.1 'advice should be printed when config variable is unset': 
@@ -8027,98 +8031,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0026-eol-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0026-eol-config/.git/
-expecting success of 0026.1 'setup': 
-
-	git config core.autocrlf false &&
-
-	echo "one text" > .gitattributes &&
-
-	test_write_lines Hello world how are you >one &&
-	test_write_lines I am very very fine thank you >two &&
-	git add . &&
-
-	git commit -m initial &&
-
-	one=$(git rev-parse HEAD:one) &&
-	two=$(git rev-parse HEAD:two) &&
-
-	echo happy.
-
-[master (root-commit) f7a09ee] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 13 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 one
- create mode 100644 two
-happy.
-ok 1 - setup
-
-expecting success of 0026.2 'eol=lf puts LFs in normalized file': 
-
-	rm -f .gitattributes tmp one two &&
-	git config core.eol lf &&
-	git read-tree --reset -u HEAD &&
-
-	! has_cr one &&
-	! has_cr two &&
-	onediff=$(git diff one) &&
-	twodiff=$(git diff two) &&
-	test -z "$onediff" && test -z "$twodiff"
-
-ok 2 - eol=lf puts LFs in normalized file
-
-expecting success of 0026.3 'eol=crlf puts CRLFs in normalized file': 
-
-	rm -f .gitattributes tmp one two &&
-	git config core.eol crlf &&
-	git read-tree --reset -u HEAD &&
-
-	has_cr one &&
-	! has_cr two &&
-	onediff=$(git diff one) &&
-	twodiff=$(git diff two) &&
-	test -z "$onediff" && test -z "$twodiff"
-
-ok 3 - eol=crlf puts CRLFs in normalized file
-
-expecting success of 0026.4 'autocrlf=true overrides eol=lf': 
-
-	rm -f .gitattributes tmp one two &&
-	git config core.eol lf &&
-	git config core.autocrlf true &&
-	git read-tree --reset -u HEAD &&
-
-	has_cr one &&
-	has_cr two &&
-	onediff=$(git diff one) &&
-	twodiff=$(git diff two) &&
-	test -z "$onediff" && test -z "$twodiff"
-
-ok 4 - autocrlf=true overrides eol=lf
-
-expecting success of 0026.5 'autocrlf=true overrides unset eol': 
-
-	rm -f .gitattributes tmp one two &&
-	git config --unset-all core.eol &&
-	git config core.autocrlf true &&
-	git read-tree --reset -u HEAD &&
-
-	has_cr one &&
-	has_cr two &&
-	onediff=$(git diff one) &&
-	twodiff=$(git diff two) &&
-	test -z "$onediff" && test -z "$twodiff"
-
-ok 5 - autocrlf=true overrides unset eol
-
-ok 6 # skip eol native is crlf (missing NATIVE_CRLF)
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0010-racy-git.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0010-racy-git/.git/
 expecting success of 0010.1 'Racy git trial #0 part A': 
@@ -8225,6 +8137,98 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0026-eol-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0026-eol-config/.git/
+expecting success of 0026.1 'setup': 
+
+	git config core.autocrlf false &&
+
+	echo "one text" > .gitattributes &&
+
+	test_write_lines Hello world how are you >one &&
+	test_write_lines I am very very fine thank you >two &&
+	git add . &&
+
+	git commit -m initial &&
+
+	one=$(git rev-parse HEAD:one) &&
+	two=$(git rev-parse HEAD:two) &&
+
+	echo happy.
+
+[master (root-commit) f7a09ee] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 13 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 one
+ create mode 100644 two
+happy.
+ok 1 - setup
+
+expecting success of 0026.2 'eol=lf puts LFs in normalized file': 
+
+	rm -f .gitattributes tmp one two &&
+	git config core.eol lf &&
+	git read-tree --reset -u HEAD &&
+
+	! has_cr one &&
+	! has_cr two &&
+	onediff=$(git diff one) &&
+	twodiff=$(git diff two) &&
+	test -z "$onediff" && test -z "$twodiff"
+
+ok 2 - eol=lf puts LFs in normalized file
+
+expecting success of 0026.3 'eol=crlf puts CRLFs in normalized file': 
+
+	rm -f .gitattributes tmp one two &&
+	git config core.eol crlf &&
+	git read-tree --reset -u HEAD &&
+
+	has_cr one &&
+	! has_cr two &&
+	onediff=$(git diff one) &&
+	twodiff=$(git diff two) &&
+	test -z "$onediff" && test -z "$twodiff"
+
+ok 3 - eol=crlf puts CRLFs in normalized file
+
+expecting success of 0026.4 'autocrlf=true overrides eol=lf': 
+
+	rm -f .gitattributes tmp one two &&
+	git config core.eol lf &&
+	git config core.autocrlf true &&
+	git read-tree --reset -u HEAD &&
+
+	has_cr one &&
+	has_cr two &&
+	onediff=$(git diff one) &&
+	twodiff=$(git diff two) &&
+	test -z "$onediff" && test -z "$twodiff"
+
+ok 4 - autocrlf=true overrides eol=lf
+
+expecting success of 0026.5 'autocrlf=true overrides unset eol': 
+
+	rm -f .gitattributes tmp one two &&
+	git config --unset-all core.eol &&
+	git config core.autocrlf true &&
+	git read-tree --reset -u HEAD &&
+
+	has_cr one &&
+	has_cr two &&
+	onediff=$(git diff one) &&
+	twodiff=$(git diff two) &&
+	test -z "$onediff" && test -z "$twodiff"
+
+ok 5 - autocrlf=true overrides unset eol
+
+ok 6 # skip eol native is crlf (missing NATIVE_CRLF)
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0006-date.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0006-date/.git/
 checking prerequisite: TIME_IS_64BIT
@@ -10424,7 +10428,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-19:14:52.961923 setup.c:1548                 | d0 | main                     | data         |     |  0.000731 |  0.000731 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:16:59.311591 setup.c:1548                 | d0 | main                     | data         |     |  0.000659 |  0.000659 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 2 - safe.bareRepository unset
 
 expecting success of 0035.3 'safe.bareRepository=all': 
@@ -10432,7 +10436,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-19:14:53.056787 setup.c:1548                 | d0 | main                     | data         |     |  0.000636 |  0.000636 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:16:59.432172 setup.c:1548                 | d0 | main                     | data         |     |  0.000640 |  0.000640 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 3 - safe.bareRepository=all
 
 expecting success of 0035.4 'safe.bareRepository=explicit': 
@@ -10440,7 +10444,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-19:14:53.146288 setup.c:1548                 | d0 | main                     | data         |     |  0.000686 |  0.000686 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:16:59.635990 setup.c:1548                 | d0 | main                     | data         |     |  0.000636 |  0.000636 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 4 - safe.bareRepository=explicit
 
 expecting success of 0035.5 'safe.bareRepository in the repository': 
@@ -10452,7 +10456,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-19:14:53.313048 setup.c:1548                 | d0 | main                     | data         |     |  0.000641 |  0.000641 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:16:59.811744 setup.c:1548                 | d0 | main                     | data         |     |  0.000641 |  0.000641 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 5 - safe.bareRepository in the repository
 
 expecting success of 0035.6 'safe.bareRepository on the command line': 
@@ -10461,7 +10465,7 @@
 		-c safe.bareRepository=all
 
 .
-19:14:53.480201 setup.c:1548                 | d0 | main                     | data         |     |  0.000704 |  0.000704 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:17:00.008199 setup.c:1548                 | d0 | main                     | data         |     |  0.000622 |  0.000622 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 6 - safe.bareRepository on the command line
 
 expecting success of 0035.7 'safe.bareRepository in included file': 
@@ -10473,7 +10477,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-19:14:53.616854 setup.c:1548                 | d0 | main                     | data         |     |  0.000671 |  0.000671 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+13:17:00.212238 setup.c:1548                 | d0 | main                     | data         |     |  0.000653 |  0.000653 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 7 - safe.bareRepository in included file
 
 expecting success of 0035.8 'no trace when GIT_DIR is explicitly provided': 
@@ -10486,34 +10490,599 @@
 	expect_accepted_implicit -C outer-repo/.git
 
 .
-19:14:53.744722 setup.c:1548                 | d0 | main                     | data         |     |  0.000616 |  0.000616 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+13:17:00.384126 setup.c:1548                 | d0 | main                     | data         |     |  0.000609 |  0.000609 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
 ok 9 - no trace when "bare repository" is .git
 
 expecting success of 0035.10 'no trace when "bare repository" is a subdir of .git': 
 	expect_accepted_implicit -C outer-repo/.git/objects
 
 /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
-19:14:53.796863 setup.c:1548                 | d0 | main                     | data         |     |  0.000671 |  0.000671 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+13:17:00.450573 setup.c:1548                 | d0 | main                     | data         |     |  0.000602 |  0.000602 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
 ok 10 - no trace when "bare repository" is a subdir of .git
 
 expecting success of 0035.11 'no trace in $GIT_DIR of secondary worktree': 
 	expect_accepted_implicit -C outer-repo/.git/worktrees/outer-secondary
 
 .
-19:14:53.865459 setup.c:1548                 | d0 | main                     | data         |     |  0.000664 |  0.000664 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
+13:17:00.532023 setup.c:1548                 | d0 | main                     | data         |     |  0.000627 |  0.000627 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
 ok 11 - no trace in $GIT_DIR of secondary worktree
 
 expecting success of 0035.12 'no trace in $GIT_DIR of a submodule': 
 	expect_accepted_implicit -C outer-repo/.git/modules/subn
 
 .
-19:14:53.909690 setup.c:1548                 | d0 | main                     | data         |     |  0.000679 |  0.000679 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
+13:17:00.604317 setup.c:1548                 | d0 | main                     | data         |     |  0.000625 |  0.000625 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
 ok 12 - no trace in $GIT_DIR of a submodule
 
 # passed all 12 test(s)
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0033-safe-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/.git/
+expecting success of 0033.1 'safe.directory is not set': 
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 1 - safe.directory is not set
+
+expecting success of 0033.2 'safe.directory on the command line': 
+	git -c safe.directory="$(pwd)" status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 2 - safe.directory on the command line
+
+expecting success of 0033.3 'safe.directory in the environment': 
+	env GIT_CONFIG_COUNT=1 \
+	    GIT_CONFIG_KEY_0="safe.directory" \
+	    GIT_CONFIG_VALUE_0="$(pwd)" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 3 - safe.directory in the environment
+
+expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
+	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
+
+expecting success of 0033.5 'ignoring safe.directory in repo config': 
+	(
+		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config safe.directory "$(pwd)"
+	) &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 5 - ignoring safe.directory in repo config
+
+expecting success of 0033.6 'safe.directory does not match': 
+	git config --global safe.directory bogus &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 6 - safe.directory does not match
+
+expecting success of 0033.7 'path exist as different key': 
+	git config --global foo.bar "$(pwd)" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 7 - path exist as different key
+
+expecting success of 0033.8 'safe.directory matches': 
+	git config --global --add safe.directory "$(pwd)" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 8 - safe.directory matches
+
+expecting success of 0033.9 'safe.directory matches, but is reset': 
+	git config --global --add safe.directory "" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 9 - safe.directory matches, but is reset
+
+expecting success of 0033.10 'safe.directory=*': 
+	git config --global --add safe.directory "*" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 10 - safe.directory=*
+
+expecting success of 0033.11 'safe.directory=*, but is reset': 
+	git config --global --add safe.directory "" &&
+	expect_rejected_dir
+
+warning: safe.directory 'bogus' not absolute
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 11 - safe.directory=*, but is reset
+
+expecting success of 0033.12 'safe.directory with matching glob': 
+	git config --global --unset-all safe.directory &&
+	p=$(pwd) &&
+	git config --global safe.directory "${p%/*}/*" &&
+	git status
+
+warning: safe.directory 'bogus' not absolute
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 12 - safe.directory with matching glob
+
+expecting success of 0033.13 'safe.directory with unmatching glob': 
+	git config --global --unset-all safe.directory &&
+	p=$(pwd) &&
+	git config --global safe.directory "${p%/*}no/*" &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
+ok 13 - safe.directory with unmatching glob
+
+expecting success of 0033.14 'safe.directory in included file': 
+	git config --global --unset-all safe.directory &&
+	cat >gitconfig-include <<-EOF &&
+	[safe]
+		directory = "$(pwd)"
+	EOF
+	git config --global --add include.path "$(pwd)/gitconfig-include" &&
+	git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	err
+	gitconfig-include
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - safe.directory in included file
+
+expecting success of 0033.15 'local clone of unowned repo refused in unsafe directory': 
+	test_when_finished "rm -rf source" &&
+	git init source &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit -C source initial
+	) &&
+	test_must_fail git clone --local source target &&
+	test_path_is_missing target
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
+ok 15 - local clone of unowned repo refused in unsafe directory
+
+expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
+	test_when_finished "rm -rf source" &&
+	git init source &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit -C source initial
+	) &&
+	test_must_fail git clone --local source target &&
+	git config --global --add safe.directory "$(pwd)/source/.git" &&
+	git clone --local source target &&
+	test_path_is_dir target
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
+Cloning into 'target'...
+done.
+ok 16 - local clone of unowned repo accepted in safe directory
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0033.17 'checked paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	git init repository &&
+	ln -s repository repo &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repository"
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repo for-each-ref &&
+	git -C repo/ for-each-ref &&
+	test_must_fail git -C repository/.git for-each-ref &&
+	test_must_fail git -C repository/.git/ for-each-ref &&
+	test_must_fail git -C repo/.git for-each-ref &&
+	test_must_fail git -C repo/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+ok 17 - checked paths are normalized
+
+expecting success of 0033.18 'checked leading paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository &&
+	git init repository/s &&
+	ln -s repository repo &&
+	(
+		cd repository/s &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repository/*"
+	) &&
+	git -C repository/s for-each-ref &&
+	git -C repository/s/ for-each-ref &&
+	git -C repo/s for-each-ref &&
+	git -C repo/s/ for-each-ref &&
+	git -C repository/s/.git for-each-ref &&
+	git -C repository/s/.git/ for-each-ref &&
+	git -C repo/s/.git for-each-ref &&
+	git -C repo/s/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/s/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 18 - checked leading paths are normalized
+
+expecting success of 0033.19 'configured paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	git init repository &&
+	ln -s repository repo &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repo"
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repo for-each-ref &&
+	git -C repo/ for-each-ref &&
+	test_must_fail git -C repository/.git for-each-ref &&
+	test_must_fail git -C repository/.git/ for-each-ref &&
+	test_must_fail git -C repo/.git for-each-ref &&
+	test_must_fail git -C repo/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+ok 19 - configured paths are normalized
+
+expecting success of 0033.20 'configured leading paths are normalized': 
+	test_when_finished "rm -rf repository; rm -f repo" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository &&
+	git init repository/s &&
+	ln -s repository repo &&
+	(
+		cd repository/s &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "$(pwd)/repo/*"
+	) &&
+	git -C repository/s for-each-ref &&
+	git -C repository/s/ for-each-ref &&
+	git -C repository/s/.git for-each-ref &&
+	git -C repository/s/.git/ for-each-ref &&
+	git -C repo/s for-each-ref &&
+	git -C repo/s/ for-each-ref &&
+	git -C repo/s/.git for-each-ref &&
+	git -C repo/s/.git/ for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/s/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 20 - configured leading paths are normalized
+
+expecting success of 0033.21 'safe.directory set to a dot': 
+	test_when_finished "rm -rf repository" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository/subdir &&
+	git init repository &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "."
+	) &&
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repository/.git for-each-ref &&
+	git -C repository/.git/ for-each-ref &&
+
+	# What is allowed is repository/subdir but the repository
+	# path is repository.
+	test_must_fail git -C repository/subdir for-each-ref &&
+
+	# Likewise, repository .git/refs is allowed with "." but
+	# repository/.git that is accessed is not allowed.
+	test_must_fail git -C repository/.git/refs for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository'
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
+ok 21 - safe.directory set to a dot
+
+expecting success of 0033.22 'safe.directory set to asterisk': 
+	test_when_finished "rm -rf repository" &&
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global --unset-all safe.directory
+	) &&
+	mkdir -p repository/subdir &&
+	git init repository &&
+	(
+		cd repository &&
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		test_commit sample
+	) &&
+
+	(
+		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config --global safe.directory "*"
+	) &&
+	# these are trivial
+	git -C repository for-each-ref &&
+	git -C repository/ for-each-ref &&
+	git -C repository/.git for-each-ref &&
+	git -C repository/.git/ for-each-ref &&
+
+	# With "*", everything is allowed, and the repository is
+	# discovered, which is different behaviour from "." above.
+	git -C repository/subdir for-each-ref &&
+
+	# Likewise.
+	git -C repository/.git/refs for-each-ref
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
+[master (root-commit) 58cf5cb] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sample.t
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
+58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
+ok 22 - safe.directory set to asterisk
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0028-working-tree-encoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0028-working-tree-encoding/.git/
 expecting success of 0028.1 'setup test files': 
@@ -10953,70 +11522,6 @@
 hint: The file 'nobom.utf16' is missing a byte order mark (BOM). Please use UTF-16BE or UTF-16LE (depending on the byte order) as working-tree-encoding.
 fatal: BOM is required in 'nobom.utf16' if encoded as utf-16
 hint: The file 'nobom.utf16' is missing a byte order mark (BOM). Please use UTF-16BE or UTF-16LE (depending on the byte order) as working-tree-encoding.
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
 HEAD is now at dfb2bb8 initial
 ok 7 - check required UTF-16 BOM
 
@@ -11219,6 +11724,22 @@
 | 16:  a  
 
 warning: in the working copy of 'eol.utf32', CRLF will be replaced by LF the next time Git touches it
+source (eol.utf32, considered utf-32):
+|  0: ff   |  1: fe   |  2:  0   |  3:  0   |  4: 6f o |  5:  0   |  6:  0   |  7:  0  
+|  8: 6e n |  9:  0   | 10:  0   | 11:  0   | 12: 65 e | 13:  0   | 14:  0   | 15:  0  
+| 16:  d   | 17:  0   | 18:  0   | 19:  0   | 20:  a   | 21:  0   | 22:  0   | 23:  0  
+| 24: 74 t | 25:  0   | 26:  0   | 27:  0   | 28: 77 w | 29:  0   | 30:  0   | 31:  0  
+| 32: 6f o | 33:  0   | 34:  0   | 35:  0   | 36:  d   | 37:  0   | 38:  0   | 39:  0  
+| 40:  a   | 41:  0   | 42:  0   | 43:  0   | 44: 74 t | 45:  0   | 46:  0   | 47:  0  
+| 48: 68 h | 49:  0   | 50:  0   | 51:  0   | 52: 72 r | 53:  0   | 54:  0   | 55:  0  
+| 56: 65 e | 57:  0   | 58:  0   | 59:  0   | 60: 65 e | 61:  0   | 62:  0   | 63:  0  
+| 64:  d   | 65:  0   | 66:  0   | 67:  0   | 68:  a   | 69:  0   | 70:  0   | 71:  0  
+
+destination (eol.utf32, considered UTF-8):
+|  0: 6f o |  1: 6e n |  2: 65 e |  3:  d   |  4:  a   |  5: 74 t |  6: 77 w |  7: 6f o
+|  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
+| 16:  a  
+
 [main 674dc3f] eol
  Author: A U Thor <author@example.com>
  1 file changed, 3 insertions(+)
@@ -12891,576 +13412,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0033-safe-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/.git/
-expecting success of 0033.1 'safe.directory is not set': 
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 1 - safe.directory is not set
-
-expecting success of 0033.2 'safe.directory on the command line': 
-	git -c safe.directory="$(pwd)" status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 2 - safe.directory on the command line
-
-expecting success of 0033.3 'safe.directory in the environment': 
-	env GIT_CONFIG_COUNT=1 \
-	    GIT_CONFIG_KEY_0="safe.directory" \
-	    GIT_CONFIG_VALUE_0="$(pwd)" \
-	    git status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 3 - safe.directory in the environment
-
-expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
-	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
-	    git status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
-
-expecting success of 0033.5 'ignoring safe.directory in repo config': 
-	(
-		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config safe.directory "$(pwd)"
-	) &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 5 - ignoring safe.directory in repo config
-
-expecting success of 0033.6 'safe.directory does not match': 
-	git config --global safe.directory bogus &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 6 - safe.directory does not match
-
-expecting success of 0033.7 'path exist as different key': 
-	git config --global foo.bar "$(pwd)" &&
-	expect_rejected_dir
-
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 7 - path exist as different key
-
-expecting success of 0033.8 'safe.directory matches': 
-	git config --global --add safe.directory "$(pwd)" &&
-	git status
-
-warning: safe.directory 'bogus' not absolute
-warning: safe.directory 'bogus' not absolute
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 8 - safe.directory matches
-
-expecting success of 0033.9 'safe.directory matches, but is reset': 
-	git config --global --add safe.directory "" &&
-	expect_rejected_dir
-
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 9 - safe.directory matches, but is reset
-
-expecting success of 0033.10 'safe.directory=*': 
-	git config --global --add safe.directory "*" &&
-	git status
-
-warning: safe.directory 'bogus' not absolute
-warning: safe.directory 'bogus' not absolute
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 10 - safe.directory=*
-
-expecting success of 0033.11 'safe.directory=*, but is reset': 
-	git config --global --add safe.directory "" &&
-	expect_rejected_dir
-
-warning: safe.directory 'bogus' not absolute
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 11 - safe.directory=*, but is reset
-
-expecting success of 0033.12 'safe.directory with matching glob': 
-	git config --global --unset-all safe.directory &&
-	p=$(pwd) &&
-	git config --global safe.directory "${p%/*}/*" &&
-	git status
-
-warning: safe.directory 'bogus' not absolute
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 12 - safe.directory with matching glob
-
-expecting success of 0033.13 'safe.directory with unmatching glob': 
-	git config --global --unset-all safe.directory &&
-	p=$(pwd) &&
-	git config --global safe.directory "${p%/*}no/*" &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory'
-ok 13 - safe.directory with unmatching glob
-
-expecting success of 0033.14 'safe.directory in included file': 
-	git config --global --unset-all safe.directory &&
-	cat >gitconfig-include <<-EOF &&
-	[safe]
-		directory = "$(pwd)"
-	EOF
-	git config --global --add include.path "$(pwd)/gitconfig-include" &&
-	git status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	err
-	gitconfig-include
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - safe.directory in included file
-
-expecting success of 0033.15 'local clone of unowned repo refused in unsafe directory': 
-	test_when_finished "rm -rf source" &&
-	git init source &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit -C source initial
-	) &&
-	test_must_fail git clone --local source target &&
-	test_path_is_missing target
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
-ok 15 - local clone of unowned repo refused in unsafe directory
-
-expecting success of 0033.16 'local clone of unowned repo accepted in safe directory': 
-	test_when_finished "rm -rf source" &&
-	git init source &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit -C source initial
-	) &&
-	test_must_fail git clone --local source target &&
-	git config --global --add safe.directory "$(pwd)/source/.git" &&
-	git clone --local source target &&
-	test_path_is_dir target
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/source/.git'
-Cloning into 'target'...
-done.
-ok 16 - local clone of unowned repo accepted in safe directory
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0033.17 'checked paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	git init repository &&
-	ln -s repository repo &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repository"
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repo for-each-ref &&
-	git -C repo/ for-each-ref &&
-	test_must_fail git -C repository/.git for-each-ref &&
-	test_must_fail git -C repository/.git/ for-each-ref &&
-	test_must_fail git -C repo/.git for-each-ref &&
-	test_must_fail git -C repo/.git/ for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-ok 17 - checked paths are normalized
-
-expecting success of 0033.18 'checked leading paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository &&
-	git init repository/s &&
-	ln -s repository repo &&
-	(
-		cd repository/s &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repository/*"
-	) &&
-	git -C repository/s for-each-ref &&
-	git -C repository/s/ for-each-ref &&
-	git -C repo/s for-each-ref &&
-	git -C repo/s/ for-each-ref &&
-	git -C repository/s/.git for-each-ref &&
-	git -C repository/s/.git/ for-each-ref &&
-	git -C repo/s/.git for-each-ref &&
-	git -C repo/s/.git/ for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/s/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 18 - checked leading paths are normalized
-
-expecting success of 0033.19 'configured paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	git init repository &&
-	ln -s repository repo &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repo"
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repo for-each-ref &&
-	git -C repo/ for-each-ref &&
-	test_must_fail git -C repository/.git for-each-ref &&
-	test_must_fail git -C repository/.git/ for-each-ref &&
-	test_must_fail git -C repo/.git for-each-ref &&
-	test_must_fail git -C repo/.git/ for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-ok 19 - configured paths are normalized
-
-expecting success of 0033.20 'configured leading paths are normalized': 
-	test_when_finished "rm -rf repository; rm -f repo" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository &&
-	git init repository/s &&
-	ln -s repository repo &&
-	(
-		cd repository/s &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "$(pwd)/repo/*"
-	) &&
-	git -C repository/s for-each-ref &&
-	git -C repository/s/ for-each-ref &&
-	git -C repository/s/.git for-each-ref &&
-	git -C repository/s/.git/ for-each-ref &&
-	git -C repo/s for-each-ref &&
-	git -C repo/s/ for-each-ref &&
-	git -C repo/s/.git for-each-ref &&
-	git -C repo/s/.git/ for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/s/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 20 - configured leading paths are normalized
-
-expecting success of 0033.21 'safe.directory set to a dot': 
-	test_when_finished "rm -rf repository" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository/subdir &&
-	git init repository &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "."
-	) &&
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repository/.git for-each-ref &&
-	git -C repository/.git/ for-each-ref &&
-
-	# What is allowed is repository/subdir but the repository
-	# path is repository.
-	test_must_fail git -C repository/subdir for-each-ref &&
-
-	# Likewise, repository .git/refs is allowed with "." but
-	# repository/.git that is accessed is not allowed.
-	test_must_fail git -C repository/.git/refs for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository'
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git'
-ok 21 - safe.directory set to a dot
-
-expecting success of 0033.22 'safe.directory set to asterisk': 
-	test_when_finished "rm -rf repository" &&
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global --unset-all safe.directory
-	) &&
-	mkdir -p repository/subdir &&
-	git init repository &&
-	(
-		cd repository &&
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		test_commit sample
-	) &&
-
-	(
-		sane_unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config --global safe.directory "*"
-	) &&
-	# these are trivial
-	git -C repository for-each-ref &&
-	git -C repository/ for-each-ref &&
-	git -C repository/.git for-each-ref &&
-	git -C repository/.git/ for-each-ref &&
-
-	# With "*", everything is allowed, and the repository is
-	# discovered, which is different behaviour from "." above.
-	git -C repository/subdir for-each-ref &&
-
-	# Likewise.
-	git -C repository/.git/refs for-each-ref
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0033-safe-directory/repository/.git/
-[master (root-commit) 58cf5cb] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sample.t
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/heads/master
-58cf5cb96ebee462802b7967997ad5d53ea6bc68 commit	refs/tags/sample
-ok 22 - safe.directory set to asterisk
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0051-windows-named-pipe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0051-windows-named-pipe/.git/
-1..0 # SKIP skipping Windows-specific tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0030-stripspace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0030-stripspace/.git/
 expecting success of 0030.1 'long lines without spaces should be unchanged': 
@@ -13945,6 +13896,11 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0051-windows-named-pipe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0051-windows-named-pipe/.git/
+1..0 # SKIP skipping Windows-specific tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0055-beyond-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0055-beyond-symlinks/.git/
 checking prerequisite: SYMLINKS
@@ -14273,117 +14229,918 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0062-revision-walking.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0062-revision-walking/.git/
-expecting success of 0062.1 'setup': 
-	echo a > a &&
-	git add a &&
-	git commit -m "add a" &&
-	echo b > b &&
-	git add b &&
-	git commit -m "add b"
+*** t0040-parse-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0040-parse-options/.git/
+expecting success of 0040.1 'test help': 
+	test_must_fail test-tool parse-options -h >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
 
-[master (root-commit) 925677c] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 4505e02] add b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-ok 1 - setup
+ok 1 - test help
 
-expecting success of 0062.2 'revision walking can be done twice': 
-	test-tool revision-walking run-twice >run_twice_actual &&
-	test_cmp run_twice_expected run_twice_actual
+expecting success of 0040.2 'OPT_BOOL() #1': check boolean: 1 --yes
+ok 2 - OPT_BOOL() #1
 
-ok 2 - revision walking can be done twice
+expecting success of 0040.3 'OPT_BOOL() #2': check boolean: 1 --no-doubt
+ok 3 - OPT_BOOL() #2
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0012-help.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0012-help/.git/
-expecting success of 0012.1 'setup': 
-	# Just write out which page gets requested
-	write_script test-browser <<-\EOF
-	echo "$*" >test-browser.log
-	EOF
+expecting success of 0040.4 'OPT_BOOL() #3': check boolean: 1 -D
+ok 4 - OPT_BOOL() #3
 
-ok 1 - setup
+expecting success of 0040.5 'OPT_BOOL() #4': check boolean: 1 --no-fear
+ok 5 - OPT_BOOL() #4
 
-expecting success of 0012.2 'basic help commands': 
-	git help >/dev/null &&
-	git help -a --no-verbose >/dev/null &&
-	git help -g >/dev/null &&
-	git help -a >/dev/null
+expecting success of 0040.6 'OPT_BOOL() #5': check boolean: 1 -B
+ok 6 - OPT_BOOL() #5
 
-ok 2 - basic help commands
+expecting success of 0040.7 'OPT_BOOL() is idempotent #1': check boolean: 1 --yes --yes
+ok 7 - OPT_BOOL() is idempotent #1
 
-expecting success of 0012.3 'invalid usage': 
-	test_expect_code 129 git help -a add &&
-	test_expect_code 129 git help --all add &&
+expecting success of 0040.8 'OPT_BOOL() is idempotent #2': check boolean: 1 -DB
+ok 8 - OPT_BOOL() is idempotent #2
 
-	test_expect_code 129 git help -g add &&
-	test_expect_code 129 git help -a -c &&
+expecting success of 0040.9 'OPT_BOOL() negation #1': check boolean: 0 -D --no-yes
+ok 9 - OPT_BOOL() negation #1
 
-	test_expect_code 129 git help -g add &&
-	test_expect_code 129 git help -a -g &&
+expecting success of 0040.10 'OPT_BOOL() negation #2': check boolean: 0 -D --no-no-doubt
+ok 10 - OPT_BOOL() negation #2
 
-	test_expect_code 129 git help --user-interfaces add &&
+expecting success of 0040.11 'OPT_BOOL() no negation #1': check_unknown_i18n --fear
+ok 11 - OPT_BOOL() no negation #1
 
-	test_expect_code 129 git help -g -c &&
-	test_expect_code 129 git help --config-for-completion add &&
-	test_expect_code 129 git help --config-sections-for-completion add
+expecting success of 0040.12 'OPT_BOOL() no negation #2': check_unknown_i18n --no-no-fear
+ok 12 - OPT_BOOL() no negation #2
 
-fatal: the '--all' option doesn't take any non-option arguments
+expecting success of 0040.13 'OPT_BOOL() positivation': check boolean: 0 -D --doubt
+ok 13 - OPT_BOOL() positivation
 
-usage: git help [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
-   or: git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]
-   or: git help [-g|--guides]
-   or: git help [-c|--config]
-   or: git help [--user-interfaces]
-   or: git help [--developer-interfaces]
+expecting success of 0040.14 'OPT_INT() negative': check integer: -2345 -i -2345
+ok 14 - OPT_INT() negative
 
-    -a, --all             print all available commands
-    --[no-]external-commands
-                          show external commands in --all
-    --[no-]aliases        show aliases in --all
-    -m, --[no-]man        show man page
-    -w, --[no-]web        show manual in web browser
-    -i, --[no-]info       show info page
-    -v, --[no-]verbose    print command description
-    -g, --guides          print list of useful guides
-    --user-interfaces     print list of user-facing repository, command and file interfaces
-    --developer-interfaces
-                          print list of file formats, protocols and other developer interfaces
-    -c, --config          print all configuration variable names
+expecting success of 0040.15 'OPT_MAGNITUDE() simple': 
+	check magnitude: 2345678 -m 2345678
 
-fatal: the '--all' option doesn't take any non-option arguments
+ok 15 - OPT_MAGNITUDE() simple
 
-usage: git help [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
-   or: git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]
-   or: git help [-g|--guides]
-   or: git help [-c|--config]
-   or: git help [--user-interfaces]
-   or: git help [--developer-interfaces]
+expecting success of 0040.16 'OPT_MAGNITUDE() kilo': 
+	check magnitude: 239616 -m 234k
 
-    -a, --all             print all available commands
-    --[no-]external-commands
-                          show external commands in --all
-    --[no-]aliases        show aliases in --all
-    -m, --[no-]man        show man page
-    -w, --[no-]web        show manual in web browser
-    -i, --[no-]info       show info page
-    -v, --[no-]verbose    print command description
-    -g, --guides          print list of useful guides
-    --user-interfaces     print list of user-facing repository, command and file interfaces
-    --developer-interfaces
-                          print list of file formats, protocols and other developer interfaces
-    -c, --config          print all configuration variable names
+ok 16 - OPT_MAGNITUDE() kilo
 
-fatal: the '--guides' option doesn't take any non-option arguments
+expecting success of 0040.17 'OPT_MAGNITUDE() mega': 
+	check magnitude: 104857600 -m 100m
+
+ok 17 - OPT_MAGNITUDE() mega
+
+expecting success of 0040.18 'OPT_MAGNITUDE() giga': 
+	check magnitude: 1073741824 -m 1g
+
+ok 18 - OPT_MAGNITUDE() giga
+
+expecting success of 0040.19 'OPT_MAGNITUDE() 3giga': 
+	check magnitude: 3221225472 -m 3g
+
+ok 19 - OPT_MAGNITUDE() 3giga
+
+expecting success of 0040.20 'short options': 
+	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
+	>output 2>output.err &&
+	test_cmp expect output &&
+	test_must_be_empty output.err
+
+ok 20 - short options
+
+expecting success of 0040.21 'long options': 
+	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
+		--boolean --string2=321 --verbose --verbose --no-dry-run \
+		--abbrev=10 --file fi.le --obsolete \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 21 - long options
+
+expecting success of 0040.22 'abbreviate to something longer than SHA1 length': 
+	cat >expect <<-EOF &&
+	boolean: 0
+	integer: 0
+	magnitude: 0
+	timestamp: 0
+	string: (not set)
+	abbrev: 100
+	verbose: -1
+	quiet: 0
+	dry run: no
+	file: (not set)
+	EOF
+	test-tool parse-options --abbrev=100 >output &&
+	test_cmp expect output
+
+ok 22 - abbreviate to something longer than SHA1 length
+
+expecting success of 0040.23 'missing required value': 
+	cat >expect <<-\EOF &&
+	error: switch `s' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options -s 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `string' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --string 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `file' requires a value
+	EOF
+	test_expect_code 129 test-tool parse-options --file 2>actual &&
+	test_cmp expect actual
+
+ok 23 - missing required value
+
+expecting success of 0040.24 'superfluous value provided: boolean': 
+	cat >expect <<-\EOF &&
+	error: option `yes' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `no-yes' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
+	test_cmp expect actual
+
+ok 24 - superfluous value provided: boolean
+
+expecting success of 0040.25 'superfluous value provided: boolean, abbreviated': 
+	cat >expect <<-\EOF &&
+	error: option `yes' takes no value
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --ye=hi 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	error: option `no-yes' takes no value
+	EOF
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --no-ye=hi 2>actual &&
+	test_cmp expect actual
+
+ok 25 - superfluous value provided: boolean, abbreviated
+
+expecting success of 0040.26 'superfluous value provided: cmdmode': 
+	cat >expect <<-\EOF &&
+	error: option `mode1' takes no value
+	EOF
+	test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
+	test_cmp expect actual
+
+ok 26 - superfluous value provided: cmdmode
+
+expecting success of 0040.27 'intermingled arguments': 
+	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
+		>output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 27 - intermingled arguments
+
+expecting success of 0040.28 'unambiguously abbreviated option': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 28 - unambiguously abbreviated option
+
+expecting success of 0040.29 'unambiguously abbreviated option with "="': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --expect="integer: 2" --int=2
+
+ok 29 - unambiguously abbreviated option with "="
+
+expecting success of 0040.30 'ambiguously abbreviated option': 
+	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --strin 123
+
+error: ambiguous option: strin (could be --string or --string2)
+usage: test-tool parse-options <options>
+
+    A helper function for the parse-options API.
+
+    --[no-]yes            get a boolean
+    -D, --no-doubt        begins with 'no-'
+    --doubt               opposite of --no-doubt
+    -B, --no-fear         be brave
+    -b, --[no-]boolean    increment by one
+    -4, --[no-]or4        bitwise-or boolean with ...0100
+    --[no-]neg-or4        same as --no-or4
+
+    -i, --[no-]integer <n>
+                          get a integer
+    -j <n>                get a integer, too
+    -m, --magnitude <n>   get a magnitude
+    --[no-]set23          set integer to 23
+    --mode1               set integer to 1 (cmdmode option)
+    --mode2               set integer to 2 (cmdmode option)
+    --[no-]mode34 (3|4)   set integer to 3 or 4 (cmdmode option)
+    -L, --[no-]length <str>
+                          get length of <str>
+    -F, --[no-]file <file>
+                          set file to <file>
+
+String options
+    -s, --[no-]string <string>
+                          get a string
+    --[no-]string2 <str>  get another string
+    --[no-]st <st>        get another string (pervert ordering)
+    -o <str>              get another string
+    --longhelp            help text of this entry
+                          spans multiple lines
+    --[no-]list <str>     add str to list
+
+Magic arguments
+    -NUM                  set integer to NUM
+    +                     same as -b
+    --ambiguous           positive ambiguity
+    --no-ambiguous        negative ambiguity
+
+Standard options
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+    -v, --[no-]verbose    be verbose
+    -n, --[no-]dry-run    dry run
+    -q, --[no-]quiet      be quiet
+    --[no-]expect <string>
+                          expected output in the variable dump
+
+Alias
+    -A, --[no-]alias-source <string>
+                          get a string
+    -Z, --[no-]alias-target <string>
+                          alias of --alias-source
+
+ok 30 - ambiguously abbreviated option
+
+expecting success of 0040.31 'non ambiguous option (after two options it abbreviates)': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --expect="string: 123" --st 123
+
+ok 31 - non ambiguous option (after two options it abbreviates)
+
+expecting success of 0040.32 'Alias options do not contribute to abbreviation': 
+	test-tool parse-options --alias-source 123 >output &&
+	grep "^string: 123" output &&
+	test-tool parse-options --alias-target 123 >output &&
+	grep "^string: 123" output &&
+	test_must_fail test-tool parse-options --alias &&
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --alias 123 >output &&
+	grep "^string: 123" output
+
+string: 123
+string: 123
+fatal: disallowed abbreviated or ambiguous option 'alias'
+string: 123
+ok 32 - Alias options do not contribute to abbreviation
+
+expecting success of 0040.33 'detect possible typos': 
+	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
+
+ok 33 - detect possible typos
+
+expecting success of 0040.34 'detect possible typos': 
+	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
+	test_must_be_empty output &&
+	test_cmp typo.err output.err
+
+ok 34 - detect possible typos
+
+expecting success of 0040.35 'OPT_CALLBACK() and OPT_BIT() work': 
+	test-tool parse-options --length=four -b -4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 35 - OPT_CALLBACK() and OPT_BIT() work
+
+expecting success of 0040.36 'OPT_CALLBACK() and callback errors work': 
+	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
+	test_must_be_empty output &&
+	test_must_be_empty output.err
+
+ok 36 - OPT_CALLBACK() and callback errors work
+
+expecting success of 0040.37 'OPT_BIT() and OPT_SET_INT() work': 
+	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 37 - OPT_BIT() and OPT_SET_INT() work
+
+expecting success of 0040.38 'OPT_NEGBIT() and OPT_SET_INT() work': 
+	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 38 - OPT_NEGBIT() and OPT_SET_INT() work
+
+expecting success of 0040.39 'OPT_BIT() works': 
+	test-tool parse-options --expect="boolean: 6" -bb --or4
+
+ok 39 - OPT_BIT() works
+
+expecting success of 0040.40 'OPT_NEGBIT() works': 
+	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
+
+ok 40 - OPT_NEGBIT() works
+
+expecting success of 0040.41 'OPT_CMDMODE() works': 
+	test-tool parse-options --expect="integer: 1" --mode1 &&
+	test-tool parse-options --expect="integer: 3" --mode34=3
+
+ok 41 - OPT_CMDMODE() works
+
+expecting success of 0040.42 'OPT_CMDMODE() detects incompatibility (1)': 
+	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode1" output.err &&
+	test_grep "mode2" output.err &&
+	test_grep "cannot be used together" output.err
+
+error: options '--mode2' and '--mode1' cannot be used together
+error: options '--mode2' and '--mode1' cannot be used together
+error: options '--mode2' and '--mode1' cannot be used together
+ok 42 - OPT_CMDMODE() detects incompatibility (1)
+
+expecting success of 0040.43 'OPT_CMDMODE() detects incompatibility (2)': 
+	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "set23" output.err &&
+	test_grep "cannot be used together" output.err
+
+error: options '--mode2' and '--set23' cannot be used together
+error: options '--mode2' and '--set23' cannot be used together
+error: options '--mode2' and '--set23' cannot be used together
+ok 43 - OPT_CMDMODE() detects incompatibility (2)
+
+expecting success of 0040.44 'OPT_CMDMODE() detects incompatibility (3)': 
+	test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "set23" output.err &&
+	test_grep "cannot be used together" output.err
+
+error: options '--set23' and '--mode2' cannot be used together
+error: options '--set23' and '--mode2' cannot be used together
+error: options '--set23' and '--mode2' cannot be used together
+ok 44 - OPT_CMDMODE() detects incompatibility (3)
+
+expecting success of 0040.45 'OPT_CMDMODE() detects incompatibility (4)': 
+	test_must_fail test-tool parse-options --mode2 --mode34=3 \
+		>output 2>output.err &&
+	test_must_be_empty output &&
+	test_grep "mode2" output.err &&
+	test_grep "mode34.3" output.err &&
+	test_grep "cannot be used together" output.err
+
+error: options '--mode34=3' and '--mode2' cannot be used together
+error: options '--mode34=3' and '--mode2' cannot be used together
+error: options '--mode34=3' and '--mode2' cannot be used together
+ok 45 - OPT_CMDMODE() detects incompatibility (4)
+
+expecting success of 0040.46 'OPT_COUNTUP() with PARSE_OPT_NODASH works': 
+	test-tool parse-options --expect="boolean: 6" + + + + + +
+
+ok 46 - OPT_COUNTUP() with PARSE_OPT_NODASH works
+
+expecting success of 0040.47 'OPT_NUMBER_CALLBACK() works': 
+	test-tool parse-options --expect="integer: 12345" -12345
+
+ok 47 - OPT_NUMBER_CALLBACK() works
+
+expecting success of 0040.48 'negation of OPT_NONEG flags is not ambiguous': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+	test-tool parse-options --no-ambig >output 2>output.err &&
+	test_must_be_empty output.err &&
+	test_cmp expect output
+
+ok 48 - negation of OPT_NONEG flags is not ambiguous
+
+expecting success of 0040.49 '--list keeps list of strings': 
+	test-tool parse-options --list foo --list=bar --list=baz >output &&
+	test_cmp expect output
+
+ok 49 - --list keeps list of strings
+
+expecting success of 0040.50 '--no-list resets list': 
+	test-tool parse-options --list=other --list=irrelevant --list=options \
+		--no-list --list=foo --list=bar --list=baz >output &&
+	test_cmp expect output
+
+ok 50 - --no-list resets list
+
+expecting success of 0040.51 'multiple quiet levels': 
+	test-tool parse-options --expect="quiet: 3" -q -q -q
+
+ok 51 - multiple quiet levels
+
+expecting success of 0040.52 'multiple verbose levels': 
+	test-tool parse-options --expect="verbose: 3" -v -v -v
+
+ok 52 - multiple verbose levels
+
+expecting success of 0040.53 '--no-quiet sets --quiet to 0': 
+	test-tool parse-options --expect="quiet: 0" --no-quiet
+
+ok 53 - --no-quiet sets --quiet to 0
+
+expecting success of 0040.54 '--no-quiet resets multiple -q to 0': 
+	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
+
+ok 54 - --no-quiet resets multiple -q to 0
+
+expecting success of 0040.55 '--no-verbose sets verbose to 0': 
+	test-tool parse-options --expect="verbose: 0" --no-verbose
+
+ok 55 - --no-verbose sets verbose to 0
+
+expecting success of 0040.56 '--no-verbose resets multiple verbose to 0': 
+	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
+
+ok 56 - --no-verbose resets multiple verbose to 0
+
+expecting success of 0040.57 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works': 
+	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
+		test-tool parse-options --ye &&
+	test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
+		test-tool parse-options --ye
+
+boolean: 1
+integer: 0
+magnitude: 0
+timestamp: 0
+string: (not set)
+abbrev: 7
+verbose: -1
+quiet: 0
+dry run: no
+file: (not set)
+fatal: disallowed abbreviated or ambiguous option 'ye'
+ok 57 - GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works
+
+expecting success of 0040.58 '--end-of-options treats remainder as args': 
+	test-tool parse-options \
+	    --expect="verbose: -1" \
+	    --expect="arg 00: --verbose" \
+	    --end-of-options --verbose
+
+ok 58 - --end-of-options treats remainder as args
+
+expecting success of 0040.59 'KEEP_DASHDASH works': 
+	test-tool parse-options-flags --keep-dashdash cmd --opt=1 -- --opt=2 --unknown >actual &&
+	cat >expect <<-\EOF &&
+	opt: 1
+	arg 00: --
+	arg 01: --opt=2
+	arg 02: --unknown
+	EOF
+	test_cmp expect actual
+
+ok 59 - KEEP_DASHDASH works
+
+expecting success of 0040.60 'KEEP_ARGV0 works': 
+	test-tool parse-options-flags --keep-argv0 cmd arg0 --opt=3 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 3
+	arg 00: cmd
+	arg 01: arg0
+	EOF
+	test_cmp expect actual
+
+ok 60 - KEEP_ARGV0 works
+
+expecting success of 0040.61 'STOP_AT_NON_OPTION works': 
+	test-tool parse-options-flags --stop-at-non-option cmd --opt=4 arg0 --opt=5 --unknown >actual &&
+	cat >expect <<-\EOF &&
+	opt: 4
+	arg 00: arg0
+	arg 01: --opt=5
+	arg 02: --unknown
+	EOF
+	test_cmp expect actual
+
+ok 61 - STOP_AT_NON_OPTION works
+
+expecting success of 0040.62 'KEEP_UNKNOWN_OPT works': 
+	test-tool parse-options-flags --keep-unknown-opt cmd --unknown=1 --opt=6 -u2 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 6
+	arg 00: --unknown=1
+	arg 01: -u2
+	EOF
+	test_cmp expect actual
+
+ok 62 - KEEP_UNKNOWN_OPT works
+
+expecting success of 0040.63 'NO_INTERNAL_HELP works for -h': 
+	test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd -h 2>err &&
+	grep "^error: unknown switch \`h$SQ" err &&
+	grep "^usage: " err
+
+error: unknown switch `h'
+usage: <...> cmd [options]
+ok 63 - NO_INTERNAL_HELP works for -h
+
+expecting success of 0040.64 'NO_INTERNAL_HELP works for --help': 
+		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help 2>err &&
+		grep '^error: unknown option `'help\' err &&
+		grep '^usage: ' err
+	
+error: unknown option `help'
+usage: <...> cmd [options]
+ok 64 - NO_INTERNAL_HELP works for --help
+
+expecting success of 0040.65 'NO_INTERNAL_HELP works for --help-all': 
+		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help-all 2>err &&
+		grep '^error: unknown option `'help-all\' err &&
+		grep '^usage: ' err
+	
+error: unknown option `help-all'
+usage: <...> cmd [options]
+ok 65 - NO_INTERNAL_HELP works for --help-all
+
+expecting success of 0040.66 'KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works': 
+	test-tool parse-options-flags --keep-unknown-opt --no-internal-help cmd -h --help --help-all >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	arg 00: -h
+	arg 01: --help
+	arg 02: --help-all
+	EOF
+	test_cmp expect actual
+
+ok 66 - KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works
+
+expecting success of 0040.67 'subcommand - no subcommand shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
+
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 67 - subcommand - no subcommand shows error and usage
+
+expecting success of 0040.68 'subcommand - subcommand after -- shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd -- subcmd-one 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
+
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 68 - subcommand - subcommand after -- shows error and usage
+
+expecting success of 0040.69 'subcommand - subcommand after --end-of-options shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd --end-of-options subcmd-one 2>err &&
+	grep "^error: need a subcommand" err &&
+	grep ^usage: err
+
+error: need a subcommand
+usage: <...> cmd subcmd-one
+ok 69 - subcommand - subcommand after --end-of-options shows error and usage
+
+expecting success of 0040.70 'subcommand - unknown subcommand shows error and usage': 
+	test_expect_code 129 test-tool parse-subcommand cmd nope 2>err &&
+	grep "^error: unknown subcommand: \`nope$SQ" err &&
+	grep ^usage: err
+
+error: unknown subcommand: `nope'
+usage: <...> cmd subcmd-one
+ok 70 - subcommand - unknown subcommand shows error and usage
+
+expecting success of 0040.71 'subcommand - subcommands cannot be abbreviated': 
+	test_expect_code 129 test-tool parse-subcommand cmd subcmd-o 2>err &&
+	grep "^error: unknown subcommand: \`subcmd-o$SQ$" err &&
+	grep ^usage: err
+
+error: unknown subcommand: `subcmd-o'
+usage: <...> cmd subcmd-one
+ok 71 - subcommand - subcommands cannot be abbreviated
+
+expecting success of 0040.72 'subcommand - no negated subcommands': 
+	test_expect_code 129 test-tool parse-subcommand cmd no-subcmd-one 2>err &&
+	grep "^error: unknown subcommand: \`no-subcmd-one$SQ" err &&
+	grep ^usage: err
+
+error: unknown subcommand: `no-subcmd-one'
+usage: <...> cmd subcmd-one
+ok 72 - subcommand - no negated subcommands
+
+expecting success of 0040.73 'subcommand - simple': 
+	test-tool parse-subcommand cmd subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: subcmd-two
+	EOF
+	test_cmp expect actual
+
+ok 73 - subcommand - simple
+
+expecting success of 0040.74 'subcommand - stop parsing at the first subcommand': 
+	test-tool parse-subcommand cmd --opt=1 subcmd-two subcmd-one --opt=2 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 1
+	fn: subcmd_two
+	arg 00: subcmd-two
+	arg 01: subcmd-one
+	arg 02: --opt=2
+	EOF
+	test_cmp expect actual
+
+ok 74 - subcommand - stop parsing at the first subcommand
+
+expecting success of 0040.75 'subcommand - KEEP_ARGV0': 
+	test-tool parse-subcommand --keep-argv0 cmd subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: cmd
+	arg 01: subcmd-two
+	EOF
+	test_cmp expect actual
+
+ok 75 - subcommand - KEEP_ARGV0
+
+expecting success of 0040.76 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given': 
+	test-tool parse-subcommand --subcommand-optional cmd >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	EOF
+	test_cmp expect actual
+
+ok 76 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given
+
+expecting success of 0040.77 'subcommand - SUBCOMMAND_OPTIONAL + given subcommand': 
+	test-tool parse-subcommand --subcommand-optional cmd subcmd-two branch file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_two
+	arg 00: subcmd-two
+	arg 01: branch
+	arg 02: file
+	EOF
+	test_cmp expect actual
+
+ok 77 - subcommand - SUBCOMMAND_OPTIONAL + given subcommand
+
+expecting success of 0040.78 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args': 
+	test-tool parse-subcommand --subcommand-optional cmd branch file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: branch
+	arg 01: file
+	EOF
+	test_cmp expect actual
+
+ok 78 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args
+
+expecting success of 0040.79 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option': 
+	test_expect_code 129 test-tool parse-subcommand --subcommand-optional cmd --subcommand-opt 2>err &&
+	grep "^error: unknown option" err &&
+	grep ^usage: err
+
+error: unknown option `subcommand-opt'
+usage: <...> cmd subcmd-one
+ok 79 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option
+
+expecting success of 0040.80 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	EOF
+	test_cmp expect actual
+
+ok 80 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option
+
+expecting success of 0040.81 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt subcmd-two >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	arg 01: subcmd-two
+	EOF
+	test_cmp expect actual
+
+ok 81 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option
+
+expecting success of 0040.82 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt branch --opt=1 >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --subcommand-opt
+	arg 01: branch
+	arg 02: --opt=1
+	EOF
+	test_cmp expect actual
+
+ok 82 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed
+
+expecting success of 0040.83 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-argv0 cmd --subcommand-opt branch >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: cmd
+	arg 01: --subcommand-opt
+	arg 02: branch
+	EOF
+	test_cmp expect actual
+
+ok 83 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0
+
+expecting success of 0040.84 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH': 
+	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-dashdash cmd -- --subcommand-opt file >actual &&
+	cat >expect <<-\EOF &&
+	opt: 0
+	fn: subcmd_one
+	arg 00: --
+	arg 01: --subcommand-opt
+	arg 02: file
+	EOF
+	test_cmp expect actual
+
+ok 84 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH
+
+expecting success of 0040.85 'subcommand - completion helper': 
+	test-tool parse-subcommand cmd --git-completion-helper >actual &&
+	echo "subcmd-one subcmd-two --opt= --no-opt" >expect &&
+	test_cmp expect actual
+
+ok 85 - subcommand - completion helper
+
+expecting success of 0040.86 'subcommands are incompatible with STOP_AT_NON_OPTION': 
+	test_must_fail test-tool parse-subcommand --stop-at-non-option cmd subcmd-one 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:610: subcommands are incompatible with PARSE_OPT_STOP_AT_NON_OPTION
+ok 86 - subcommands are incompatible with STOP_AT_NON_OPTION
+
+expecting success of 0040.87 'subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL': 
+	test_must_fail test-tool parse-subcommand --keep-unknown-opt cmd subcmd-two 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:613: subcommands are incompatible with PARSE_OPT_KEEP_UNKNOWN_OPT unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
+ok 87 - subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL
+
+expecting success of 0040.88 'subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL': 
+	test_must_fail test-tool parse-subcommand --keep-dashdash cmd subcmd-two 2>err &&
+	grep ^BUG err
+
+BUG: parse-options.c:615: subcommands are incompatible with PARSE_OPT_KEEP_DASHDASH unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
+ok 88 - subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL
+
+expecting success of 0040.89 'negative magnitude': 
+	test_must_fail test-tool parse-options --magnitude -1 >out 2>err &&
+	grep "non-negative integer" err &&
+	test_must_be_empty out
+
+error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
+ok 89 - negative magnitude
+
+expecting success of 0040.90 'magnitude with units but no numbers': 
+	test_must_fail test-tool parse-options --magnitude m >out 2>err &&
+	grep "non-negative integer" err &&
+	test_must_be_empty out
+
+error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
+ok 90 - magnitude with units but no numbers
+
+# passed all 90 test(s)
+1..90
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0062-revision-walking.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0062-revision-walking/.git/
+expecting success of 0062.1 'setup': 
+	echo a > a &&
+	git add a &&
+	git commit -m "add a" &&
+	echo b > b &&
+	git add b &&
+	git commit -m "add b"
+
+[master (root-commit) 925677c] add a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 4505e02] add b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+ok 1 - setup
+
+expecting success of 0062.2 'revision walking can be done twice': 
+	test-tool revision-walking run-twice >run_twice_actual &&
+	test_cmp run_twice_expected run_twice_actual
+
+ok 2 - revision walking can be done twice
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0012-help.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0012-help/.git/
+expecting success of 0012.1 'setup': 
+	# Just write out which page gets requested
+	write_script test-browser <<-\EOF
+	echo "$*" >test-browser.log
+	EOF
+
+ok 1 - setup
+
+expecting success of 0012.2 'basic help commands': 
+	git help >/dev/null &&
+	git help -a --no-verbose >/dev/null &&
+	git help -g >/dev/null &&
+	git help -a >/dev/null
+
+ok 2 - basic help commands
+
+expecting success of 0012.3 'invalid usage': 
+	test_expect_code 129 git help -a add &&
+	test_expect_code 129 git help --all add &&
+
+	test_expect_code 129 git help -g add &&
+	test_expect_code 129 git help -a -c &&
+
+	test_expect_code 129 git help -g add &&
+	test_expect_code 129 git help -a -g &&
+
+	test_expect_code 129 git help --user-interfaces add &&
+
+	test_expect_code 129 git help -g -c &&
+	test_expect_code 129 git help --config-for-completion add &&
+	test_expect_code 129 git help --config-sections-for-completion add
+
+fatal: the '--all' option doesn't take any non-option arguments
+
+usage: git help [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
+   or: git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]
+   or: git help [-g|--guides]
+   or: git help [-c|--config]
+   or: git help [--user-interfaces]
+   or: git help [--developer-interfaces]
+
+    -a, --all             print all available commands
+    --[no-]external-commands
+                          show external commands in --all
+    --[no-]aliases        show aliases in --all
+    -m, --[no-]man        show man page
+    -w, --[no-]web        show manual in web browser
+    -i, --[no-]info       show info page
+    -v, --[no-]verbose    print command description
+    -g, --guides          print list of useful guides
+    --user-interfaces     print list of user-facing repository, command and file interfaces
+    --developer-interfaces
+                          print list of file formats, protocols and other developer interfaces
+    -c, --config          print all configuration variable names
+
+fatal: the '--all' option doesn't take any non-option arguments
+
+usage: git help [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
+   or: git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]
+   or: git help [-g|--guides]
+   or: git help [-c|--config]
+   or: git help [--user-interfaces]
+   or: git help [--developer-interfaces]
+
+    -a, --all             print all available commands
+    --[no-]external-commands
+                          show external commands in --all
+    --[no-]aliases        show aliases in --all
+    -m, --[no-]man        show man page
+    -w, --[no-]web        show manual in web browser
+    -i, --[no-]info       show info page
+    -v, --[no-]verbose    print command description
+    -g, --guides          print list of useful guides
+    --user-interfaces     print list of user-facing repository, command and file interfaces
+    --developer-interfaces
+                          print list of file formats, protocols and other developer interfaces
+    -c, --config          print all configuration variable names
+
+fatal: the '--guides' option doesn't take any non-option arguments
 
 usage: git help [-a|--all] [--[no-]verbose] [--[no-]external-commands] [--[no-]aliases]
    or: git help [[-i|--info] [-m|--man] [-w|--web]] [<command>|<doc>]
@@ -19077,807 +19834,6 @@
 1..176
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0040-parse-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0040-parse-options/.git/
-expecting success of 0040.1 'test help': 
-	test_must_fail test-tool parse-options -h >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 1 - test help
-
-expecting success of 0040.2 'OPT_BOOL() #1': check boolean: 1 --yes
-ok 2 - OPT_BOOL() #1
-
-expecting success of 0040.3 'OPT_BOOL() #2': check boolean: 1 --no-doubt
-ok 3 - OPT_BOOL() #2
-
-expecting success of 0040.4 'OPT_BOOL() #3': check boolean: 1 -D
-ok 4 - OPT_BOOL() #3
-
-expecting success of 0040.5 'OPT_BOOL() #4': check boolean: 1 --no-fear
-ok 5 - OPT_BOOL() #4
-
-expecting success of 0040.6 'OPT_BOOL() #5': check boolean: 1 -B
-ok 6 - OPT_BOOL() #5
-
-expecting success of 0040.7 'OPT_BOOL() is idempotent #1': check boolean: 1 --yes --yes
-ok 7 - OPT_BOOL() is idempotent #1
-
-expecting success of 0040.8 'OPT_BOOL() is idempotent #2': check boolean: 1 -DB
-ok 8 - OPT_BOOL() is idempotent #2
-
-expecting success of 0040.9 'OPT_BOOL() negation #1': check boolean: 0 -D --no-yes
-ok 9 - OPT_BOOL() negation #1
-
-expecting success of 0040.10 'OPT_BOOL() negation #2': check boolean: 0 -D --no-no-doubt
-ok 10 - OPT_BOOL() negation #2
-
-expecting success of 0040.11 'OPT_BOOL() no negation #1': check_unknown_i18n --fear
-ok 11 - OPT_BOOL() no negation #1
-
-expecting success of 0040.12 'OPT_BOOL() no negation #2': check_unknown_i18n --no-no-fear
-ok 12 - OPT_BOOL() no negation #2
-
-expecting success of 0040.13 'OPT_BOOL() positivation': check boolean: 0 -D --doubt
-ok 13 - OPT_BOOL() positivation
-
-expecting success of 0040.14 'OPT_INT() negative': check integer: -2345 -i -2345
-ok 14 - OPT_INT() negative
-
-expecting success of 0040.15 'OPT_MAGNITUDE() simple': 
-	check magnitude: 2345678 -m 2345678
-
-ok 15 - OPT_MAGNITUDE() simple
-
-expecting success of 0040.16 'OPT_MAGNITUDE() kilo': 
-	check magnitude: 239616 -m 234k
-
-ok 16 - OPT_MAGNITUDE() kilo
-
-expecting success of 0040.17 'OPT_MAGNITUDE() mega': 
-	check magnitude: 104857600 -m 100m
-
-ok 17 - OPT_MAGNITUDE() mega
-
-expecting success of 0040.18 'OPT_MAGNITUDE() giga': 
-	check magnitude: 1073741824 -m 1g
-
-ok 18 - OPT_MAGNITUDE() giga
-
-expecting success of 0040.19 'OPT_MAGNITUDE() 3giga': 
-	check magnitude: 3221225472 -m 3g
-
-ok 19 - OPT_MAGNITUDE() 3giga
-
-expecting success of 0040.20 'short options': 
-	test-tool parse-options -s123 -b -i 1729 -m 16k -b -vv -n -F my.file \
-	>output 2>output.err &&
-	test_cmp expect output &&
-	test_must_be_empty output.err
-
-ok 20 - short options
-
-expecting success of 0040.21 'long options': 
-	test-tool parse-options --boolean --integer 1729 --magnitude 16k \
-		--boolean --string2=321 --verbose --verbose --no-dry-run \
-		--abbrev=10 --file fi.le --obsolete \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 21 - long options
-
-expecting success of 0040.22 'abbreviate to something longer than SHA1 length': 
-	cat >expect <<-EOF &&
-	boolean: 0
-	integer: 0
-	magnitude: 0
-	timestamp: 0
-	string: (not set)
-	abbrev: 100
-	verbose: -1
-	quiet: 0
-	dry run: no
-	file: (not set)
-	EOF
-	test-tool parse-options --abbrev=100 >output &&
-	test_cmp expect output
-
-ok 22 - abbreviate to something longer than SHA1 length
-
-expecting success of 0040.23 'missing required value': 
-	cat >expect <<-\EOF &&
-	error: switch `s' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options -s 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `string' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options --string 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `file' requires a value
-	EOF
-	test_expect_code 129 test-tool parse-options --file 2>actual &&
-	test_cmp expect actual
-
-ok 23 - missing required value
-
-expecting success of 0040.24 'superfluous value provided: boolean': 
-	cat >expect <<-\EOF &&
-	error: option `yes' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --yes=hi 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `no-yes' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --no-yes=hi 2>actual &&
-	test_cmp expect actual
-
-ok 24 - superfluous value provided: boolean
-
-expecting success of 0040.25 'superfluous value provided: boolean, abbreviated': 
-	cat >expect <<-\EOF &&
-	error: option `yes' takes no value
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --ye=hi 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-\EOF &&
-	error: option `no-yes' takes no value
-	EOF
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --no-ye=hi 2>actual &&
-	test_cmp expect actual
-
-ok 25 - superfluous value provided: boolean, abbreviated
-
-expecting success of 0040.26 'superfluous value provided: cmdmode': 
-	cat >expect <<-\EOF &&
-	error: option `mode1' takes no value
-	EOF
-	test_expect_code 129 test-tool parse-options --mode1=hi 2>actual &&
-	test_cmp expect actual
-
-ok 26 - superfluous value provided: cmdmode
-
-expecting success of 0040.27 'intermingled arguments': 
-	test-tool parse-options a1 --string 123 b1 --boolean -j 13 -- --boolean \
-		>output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 27 - intermingled arguments
-
-expecting success of 0040.28 'unambiguously abbreviated option': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --int 2 --boolean --no-bo >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 28 - unambiguously abbreviated option
-
-expecting success of 0040.29 'unambiguously abbreviated option with "="': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --expect="integer: 2" --int=2
-
-ok 29 - unambiguously abbreviated option with "="
-
-expecting success of 0040.30 'ambiguously abbreviated option': 
-	test_expect_code 129 env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --strin 123
-
-error: ambiguous option: strin (could be --string or --string2)
-usage: test-tool parse-options <options>
-
-    A helper function for the parse-options API.
-
-    --[no-]yes            get a boolean
-    -D, --no-doubt        begins with 'no-'
-    --doubt               opposite of --no-doubt
-    -B, --no-fear         be brave
-    -b, --[no-]boolean    increment by one
-    -4, --[no-]or4        bitwise-or boolean with ...0100
-    --[no-]neg-or4        same as --no-or4
-
-    -i, --[no-]integer <n>
-                          get a integer
-    -j <n>                get a integer, too
-    -m, --magnitude <n>   get a magnitude
-    --[no-]set23          set integer to 23
-    --mode1               set integer to 1 (cmdmode option)
-    --mode2               set integer to 2 (cmdmode option)
-    --[no-]mode34 (3|4)   set integer to 3 or 4 (cmdmode option)
-    -L, --[no-]length <str>
-                          get length of <str>
-    -F, --[no-]file <file>
-                          set file to <file>
-
-String options
-    -s, --[no-]string <string>
-                          get a string
-    --[no-]string2 <str>  get another string
-    --[no-]st <st>        get another string (pervert ordering)
-    -o <str>              get another string
-    --longhelp            help text of this entry
-                          spans multiple lines
-    --[no-]list <str>     add str to list
-
-Magic arguments
-    -NUM                  set integer to NUM
-    +                     same as -b
-    --ambiguous           positive ambiguity
-    --no-ambiguous        negative ambiguity
-
-Standard options
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-    -v, --[no-]verbose    be verbose
-    -n, --[no-]dry-run    dry run
-    -q, --[no-]quiet      be quiet
-    --[no-]expect <string>
-                          expected output in the variable dump
-
-Alias
-    -A, --[no-]alias-source <string>
-                          get a string
-    -Z, --[no-]alias-target <string>
-                          alias of --alias-source
-
-ok 30 - ambiguously abbreviated option
-
-expecting success of 0040.31 'non ambiguous option (after two options it abbreviates)': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --expect="string: 123" --st 123
-
-ok 31 - non ambiguous option (after two options it abbreviates)
-
-expecting success of 0040.32 'Alias options do not contribute to abbreviation': 
-	test-tool parse-options --alias-source 123 >output &&
-	grep "^string: 123" output &&
-	test-tool parse-options --alias-target 123 >output &&
-	grep "^string: 123" output &&
-	test_must_fail test-tool parse-options --alias &&
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --alias 123 >output &&
-	grep "^string: 123" output
-
-string: 123
-string: 123
-fatal: disallowed abbreviated or ambiguous option 'alias'
-string: 123
-ok 32 - Alias options do not contribute to abbreviation
-
-expecting success of 0040.33 'detect possible typos': 
-	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 33 - detect possible typos
-
-expecting success of 0040.34 'detect possible typos': 
-	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
-	test_must_be_empty output &&
-	test_cmp typo.err output.err
-
-ok 34 - detect possible typos
-
-expecting success of 0040.35 'OPT_CALLBACK() and OPT_BIT() work': 
-	test-tool parse-options --length=four -b -4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 35 - OPT_CALLBACK() and OPT_BIT() work
-
-expecting success of 0040.36 'OPT_CALLBACK() and callback errors work': 
-	test_must_fail test-tool parse-options --no-length >output 2>output.err &&
-	test_must_be_empty output &&
-	test_must_be_empty output.err
-
-ok 36 - OPT_CALLBACK() and callback errors work
-
-expecting success of 0040.37 'OPT_BIT() and OPT_SET_INT() work': 
-	test-tool parse-options --set23 -bbbbb --no-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 37 - OPT_BIT() and OPT_SET_INT() work
-
-expecting success of 0040.38 'OPT_NEGBIT() and OPT_SET_INT() work': 
-	test-tool parse-options --set23 -bbbbb --neg-or4 >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 38 - OPT_NEGBIT() and OPT_SET_INT() work
-
-expecting success of 0040.39 'OPT_BIT() works': 
-	test-tool parse-options --expect="boolean: 6" -bb --or4
-
-ok 39 - OPT_BIT() works
-
-expecting success of 0040.40 'OPT_NEGBIT() works': 
-	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
-
-ok 40 - OPT_NEGBIT() works
-
-expecting success of 0040.41 'OPT_CMDMODE() works': 
-	test-tool parse-options --expect="integer: 1" --mode1 &&
-	test-tool parse-options --expect="integer: 3" --mode34=3
-
-ok 41 - OPT_CMDMODE() works
-
-expecting success of 0040.42 'OPT_CMDMODE() detects incompatibility (1)': 
-	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode1" output.err &&
-	test_grep "mode2" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode2' and '--mode1' cannot be used together
-error: options '--mode2' and '--mode1' cannot be used together
-error: options '--mode2' and '--mode1' cannot be used together
-ok 42 - OPT_CMDMODE() detects incompatibility (1)
-
-expecting success of 0040.43 'OPT_CMDMODE() detects incompatibility (2)': 
-	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "set23" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode2' and '--set23' cannot be used together
-error: options '--mode2' and '--set23' cannot be used together
-error: options '--mode2' and '--set23' cannot be used together
-ok 43 - OPT_CMDMODE() detects incompatibility (2)
-
-expecting success of 0040.44 'OPT_CMDMODE() detects incompatibility (3)': 
-	test_must_fail test-tool parse-options --mode2 --set23 >output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "set23" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--set23' and '--mode2' cannot be used together
-error: options '--set23' and '--mode2' cannot be used together
-error: options '--set23' and '--mode2' cannot be used together
-ok 44 - OPT_CMDMODE() detects incompatibility (3)
-
-expecting success of 0040.45 'OPT_CMDMODE() detects incompatibility (4)': 
-	test_must_fail test-tool parse-options --mode2 --mode34=3 \
-		>output 2>output.err &&
-	test_must_be_empty output &&
-	test_grep "mode2" output.err &&
-	test_grep "mode34.3" output.err &&
-	test_grep "cannot be used together" output.err
-
-error: options '--mode34=3' and '--mode2' cannot be used together
-error: options '--mode34=3' and '--mode2' cannot be used together
-error: options '--mode34=3' and '--mode2' cannot be used together
-ok 45 - OPT_CMDMODE() detects incompatibility (4)
-
-expecting success of 0040.46 'OPT_COUNTUP() with PARSE_OPT_NODASH works': 
-	test-tool parse-options --expect="boolean: 6" + + + + + +
-
-ok 46 - OPT_COUNTUP() with PARSE_OPT_NODASH works
-
-expecting success of 0040.47 'OPT_NUMBER_CALLBACK() works': 
-	test-tool parse-options --expect="integer: 12345" -12345
-
-ok 47 - OPT_NUMBER_CALLBACK() works
-
-expecting success of 0040.48 'negation of OPT_NONEG flags is not ambiguous': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-	test-tool parse-options --no-ambig >output 2>output.err &&
-	test_must_be_empty output.err &&
-	test_cmp expect output
-
-ok 48 - negation of OPT_NONEG flags is not ambiguous
-
-expecting success of 0040.49 '--list keeps list of strings': 
-	test-tool parse-options --list foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 49 - --list keeps list of strings
-
-expecting success of 0040.50 '--no-list resets list': 
-	test-tool parse-options --list=other --list=irrelevant --list=options \
-		--no-list --list=foo --list=bar --list=baz >output &&
-	test_cmp expect output
-
-ok 50 - --no-list resets list
-
-expecting success of 0040.51 'multiple quiet levels': 
-	test-tool parse-options --expect="quiet: 3" -q -q -q
-
-ok 51 - multiple quiet levels
-
-expecting success of 0040.52 'multiple verbose levels': 
-	test-tool parse-options --expect="verbose: 3" -v -v -v
-
-ok 52 - multiple verbose levels
-
-expecting success of 0040.53 '--no-quiet sets --quiet to 0': 
-	test-tool parse-options --expect="quiet: 0" --no-quiet
-
-ok 53 - --no-quiet sets --quiet to 0
-
-expecting success of 0040.54 '--no-quiet resets multiple -q to 0': 
-	test-tool parse-options --expect="quiet: 0" -q -q -q --no-quiet
-
-ok 54 - --no-quiet resets multiple -q to 0
-
-expecting success of 0040.55 '--no-verbose sets verbose to 0': 
-	test-tool parse-options --expect="verbose: 0" --no-verbose
-
-ok 55 - --no-verbose sets verbose to 0
-
-expecting success of 0040.56 '--no-verbose resets multiple verbose to 0': 
-	test-tool parse-options --expect="verbose: 0" -v -v -v --no-verbose
-
-ok 56 - --no-verbose resets multiple verbose to 0
-
-expecting success of 0040.57 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works': 
-	GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=false \
-		test-tool parse-options --ye &&
-	test_must_fail env GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=true \
-		test-tool parse-options --ye
-
-boolean: 1
-integer: 0
-magnitude: 0
-timestamp: 0
-string: (not set)
-abbrev: 7
-verbose: -1
-quiet: 0
-dry run: no
-file: (not set)
-fatal: disallowed abbreviated or ambiguous option 'ye'
-ok 57 - GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works
-
-expecting success of 0040.58 '--end-of-options treats remainder as args': 
-	test-tool parse-options \
-	    --expect="verbose: -1" \
-	    --expect="arg 00: --verbose" \
-	    --end-of-options --verbose
-
-ok 58 - --end-of-options treats remainder as args
-
-expecting success of 0040.59 'KEEP_DASHDASH works': 
-	test-tool parse-options-flags --keep-dashdash cmd --opt=1 -- --opt=2 --unknown >actual &&
-	cat >expect <<-\EOF &&
-	opt: 1
-	arg 00: --
-	arg 01: --opt=2
-	arg 02: --unknown
-	EOF
-	test_cmp expect actual
-
-ok 59 - KEEP_DASHDASH works
-
-expecting success of 0040.60 'KEEP_ARGV0 works': 
-	test-tool parse-options-flags --keep-argv0 cmd arg0 --opt=3 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 3
-	arg 00: cmd
-	arg 01: arg0
-	EOF
-	test_cmp expect actual
-
-ok 60 - KEEP_ARGV0 works
-
-expecting success of 0040.61 'STOP_AT_NON_OPTION works': 
-	test-tool parse-options-flags --stop-at-non-option cmd --opt=4 arg0 --opt=5 --unknown >actual &&
-	cat >expect <<-\EOF &&
-	opt: 4
-	arg 00: arg0
-	arg 01: --opt=5
-	arg 02: --unknown
-	EOF
-	test_cmp expect actual
-
-ok 61 - STOP_AT_NON_OPTION works
-
-expecting success of 0040.62 'KEEP_UNKNOWN_OPT works': 
-	test-tool parse-options-flags --keep-unknown-opt cmd --unknown=1 --opt=6 -u2 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 6
-	arg 00: --unknown=1
-	arg 01: -u2
-	EOF
-	test_cmp expect actual
-
-ok 62 - KEEP_UNKNOWN_OPT works
-
-expecting success of 0040.63 'NO_INTERNAL_HELP works for -h': 
-	test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd -h 2>err &&
-	grep "^error: unknown switch \`h$SQ" err &&
-	grep "^usage: " err
-
-error: unknown switch `h'
-usage: <...> cmd [options]
-ok 63 - NO_INTERNAL_HELP works for -h
-
-expecting success of 0040.64 'NO_INTERNAL_HELP works for --help': 
-		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help 2>err &&
-		grep '^error: unknown option `'help\' err &&
-		grep '^usage: ' err
-	
-error: unknown option `help'
-usage: <...> cmd [options]
-ok 64 - NO_INTERNAL_HELP works for --help
-
-expecting success of 0040.65 'NO_INTERNAL_HELP works for --help-all': 
-		test_expect_code 129 test-tool parse-options-flags --no-internal-help cmd --help-all 2>err &&
-		grep '^error: unknown option `'help-all\' err &&
-		grep '^usage: ' err
-	
-error: unknown option `help-all'
-usage: <...> cmd [options]
-ok 65 - NO_INTERNAL_HELP works for --help-all
-
-expecting success of 0040.66 'KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works': 
-	test-tool parse-options-flags --keep-unknown-opt --no-internal-help cmd -h --help --help-all >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	arg 00: -h
-	arg 01: --help
-	arg 02: --help-all
-	EOF
-	test_cmp expect actual
-
-ok 66 - KEEP_UNKNOWN_OPT | NO_INTERNAL_HELP works
-
-expecting success of 0040.67 'subcommand - no subcommand shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 67 - subcommand - no subcommand shows error and usage
-
-expecting success of 0040.68 'subcommand - subcommand after -- shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd -- subcmd-one 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 68 - subcommand - subcommand after -- shows error and usage
-
-expecting success of 0040.69 'subcommand - subcommand after --end-of-options shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd --end-of-options subcmd-one 2>err &&
-	grep "^error: need a subcommand" err &&
-	grep ^usage: err
-
-error: need a subcommand
-usage: <...> cmd subcmd-one
-ok 69 - subcommand - subcommand after --end-of-options shows error and usage
-
-expecting success of 0040.70 'subcommand - unknown subcommand shows error and usage': 
-	test_expect_code 129 test-tool parse-subcommand cmd nope 2>err &&
-	grep "^error: unknown subcommand: \`nope$SQ" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `nope'
-usage: <...> cmd subcmd-one
-ok 70 - subcommand - unknown subcommand shows error and usage
-
-expecting success of 0040.71 'subcommand - subcommands cannot be abbreviated': 
-	test_expect_code 129 test-tool parse-subcommand cmd subcmd-o 2>err &&
-	grep "^error: unknown subcommand: \`subcmd-o$SQ$" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `subcmd-o'
-usage: <...> cmd subcmd-one
-ok 71 - subcommand - subcommands cannot be abbreviated
-
-expecting success of 0040.72 'subcommand - no negated subcommands': 
-	test_expect_code 129 test-tool parse-subcommand cmd no-subcmd-one 2>err &&
-	grep "^error: unknown subcommand: \`no-subcmd-one$SQ" err &&
-	grep ^usage: err
-
-error: unknown subcommand: `no-subcmd-one'
-usage: <...> cmd subcmd-one
-ok 72 - subcommand - no negated subcommands
-
-expecting success of 0040.73 'subcommand - simple': 
-	test-tool parse-subcommand cmd subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 73 - subcommand - simple
-
-expecting success of 0040.74 'subcommand - stop parsing at the first subcommand': 
-	test-tool parse-subcommand cmd --opt=1 subcmd-two subcmd-one --opt=2 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 1
-	fn: subcmd_two
-	arg 00: subcmd-two
-	arg 01: subcmd-one
-	arg 02: --opt=2
-	EOF
-	test_cmp expect actual
-
-ok 74 - subcommand - stop parsing at the first subcommand
-
-expecting success of 0040.75 'subcommand - KEEP_ARGV0': 
-	test-tool parse-subcommand --keep-argv0 cmd subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: cmd
-	arg 01: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 75 - subcommand - KEEP_ARGV0
-
-expecting success of 0040.76 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given': 
-	test-tool parse-subcommand --subcommand-optional cmd >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	EOF
-	test_cmp expect actual
-
-ok 76 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given
-
-expecting success of 0040.77 'subcommand - SUBCOMMAND_OPTIONAL + given subcommand': 
-	test-tool parse-subcommand --subcommand-optional cmd subcmd-two branch file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_two
-	arg 00: subcmd-two
-	arg 01: branch
-	arg 02: file
-	EOF
-	test_cmp expect actual
-
-ok 77 - subcommand - SUBCOMMAND_OPTIONAL + given subcommand
-
-expecting success of 0040.78 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args': 
-	test-tool parse-subcommand --subcommand-optional cmd branch file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: branch
-	arg 01: file
-	EOF
-	test_cmp expect actual
-
-ok 78 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown dashless args
-
-expecting success of 0040.79 'subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option': 
-	test_expect_code 129 test-tool parse-subcommand --subcommand-optional cmd --subcommand-opt 2>err &&
-	grep "^error: unknown option" err &&
-	grep ^usage: err
-
-error: unknown option `subcommand-opt'
-usage: <...> cmd subcmd-one
-ok 79 - subcommand - SUBCOMMAND_OPTIONAL + subcommand not given + unknown option
-
-expecting success of 0040.80 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	EOF
-	test_cmp expect actual
-
-ok 80 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand not given + unknown option
-
-expecting success of 0040.81 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt subcmd-two >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	arg 01: subcmd-two
-	EOF
-	test_cmp expect actual
-
-ok 81 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + subcommand ignored after unknown option
-
-expecting success of 0040.82 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt cmd --subcommand-opt branch --opt=1 >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --subcommand-opt
-	arg 01: branch
-	arg 02: --opt=1
-	EOF
-	test_cmp expect actual
-
-ok 82 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT + command and subcommand options cannot be mixed
-
-expecting success of 0040.83 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-argv0 cmd --subcommand-opt branch >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: cmd
-	arg 01: --subcommand-opt
-	arg 02: branch
-	EOF
-	test_cmp expect actual
-
-ok 83 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_ARGV0
-
-expecting success of 0040.84 'subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH': 
-	test-tool parse-subcommand --subcommand-optional --keep-unknown-opt --keep-dashdash cmd -- --subcommand-opt file >actual &&
-	cat >expect <<-\EOF &&
-	opt: 0
-	fn: subcmd_one
-	arg 00: --
-	arg 01: --subcommand-opt
-	arg 02: file
-	EOF
-	test_cmp expect actual
-
-ok 84 - subcommand - SUBCOMMAND_OPTIONAL | KEEP_UNKNOWN_OPT | KEEP_DASHDASH
-
-expecting success of 0040.85 'subcommand - completion helper': 
-	test-tool parse-subcommand cmd --git-completion-helper >actual &&
-	echo "subcmd-one subcmd-two --opt= --no-opt" >expect &&
-	test_cmp expect actual
-
-ok 85 - subcommand - completion helper
-
-expecting success of 0040.86 'subcommands are incompatible with STOP_AT_NON_OPTION': 
-	test_must_fail test-tool parse-subcommand --stop-at-non-option cmd subcmd-one 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:610: subcommands are incompatible with PARSE_OPT_STOP_AT_NON_OPTION
-ok 86 - subcommands are incompatible with STOP_AT_NON_OPTION
-
-expecting success of 0040.87 'subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL': 
-	test_must_fail test-tool parse-subcommand --keep-unknown-opt cmd subcmd-two 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:613: subcommands are incompatible with PARSE_OPT_KEEP_UNKNOWN_OPT unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
-ok 87 - subcommands are incompatible with KEEP_UNKNOWN_OPT unless in combination with SUBCOMMAND_OPTIONAL
-
-expecting success of 0040.88 'subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL': 
-	test_must_fail test-tool parse-subcommand --keep-dashdash cmd subcmd-two 2>err &&
-	grep ^BUG err
-
-BUG: parse-options.c:615: subcommands are incompatible with PARSE_OPT_KEEP_DASHDASH unless in combination with PARSE_OPT_SUBCOMMAND_OPTIONAL
-ok 88 - subcommands are incompatible with KEEP_DASHDASH unless in combination with SUBCOMMAND_OPTIONAL
-
-expecting success of 0040.89 'negative magnitude': 
-	test_must_fail test-tool parse-options --magnitude -1 >out 2>err &&
-	grep "non-negative integer" err &&
-	test_must_be_empty out
-
-error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
-ok 89 - negative magnitude
-
-expecting success of 0040.90 'magnitude with units but no numbers': 
-	test_must_fail test-tool parse-options --magnitude m >out 2>err &&
-	grep "non-negative integer" err &&
-	test_must_be_empty out
-
-error: option `magnitude' expects a non-negative integer value with an optional k/m/g suffix
-ok 90 - magnitude with units but no numbers
-
-# passed all 90 test(s)
-1..90
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0067-parse_pathspec_file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0067-parse_pathspec_file/.git/
 expecting success of 0067.1 'one item from stdin': 
@@ -20436,7 +20392,7 @@
 	test_must_fail test-tool mktemp doesnotexist/testXXXXXX 2>err &&
 	grep "doesnotexist/test" err
 
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0070-fundamental/doesnotexist/test9gVKAH': No such file or directory
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0070-fundamental/doesnotexist/testJTELoN': No such file or directory
 ok 1 - mktemp to nonexistent directory prints filename
 
 checking prerequisite: SANITY
@@ -20472,7 +20428,7 @@
 	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
 	grep "cannotwrite/test" err
 
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0070-fundamental/cannotwrite/testF4PgD9': Permission denied
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0070-fundamental/cannotwrite/testarAQED': Permission denied
 ok 2 - mktemp to unwritable directory prints filename
 
 expecting success of 0070.3 'git_mkstemps_mode does not fail if fd 0 is not open': 
@@ -22709,18 +22665,18 @@
 
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
 .git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
-.git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-fatal: bad packfile count 2 instead of 1
 .git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
+fatal: bad packfile count 2 instead of 1
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.git/objects/pack/mypackname1-23655ebb0ec5ad51d3617053df8e98a5f2d6bd45.pack
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
 .git/objects/pack/mypackname2-6a90be6090948046b50cce024472f38fa6ecba47.pack
-.git/objects/pack/mypackname2-6a90be6090948046b50cce024472f38fa6ecba47.pack
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
-fatal: bad packfile count 2 instead of 0
 .git/objects/pack/mypackname2-6a90be6090948046b50cce024472f38fa6ecba47.pack
+fatal: bad packfile count 2 instead of 0
 .git/objects/pack/pack-80ec2c345120c7108a81ea74b1e5f148c97fbb02.pack
+.git/objects/pack/mypackname2-6a90be6090948046b50cce024472f38fa6ecba47.pack
 ok 3 - add more packfiles
 
 expecting success of 0081.4 'add more commits (as loose objects)': 
@@ -22815,7 +22771,7 @@
 
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
-Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0092-diagnose': 63.95 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0092-diagnose': 64.85 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 1 - creates diagnostics zip archive
@@ -22878,28 +22834,28 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Contents of .git/objects:
-        2  2026-04-19 19:15   .git/COMMIT_EDITMSG
-      137  2026-04-19 19:15   .git/index
-       23  2026-04-19 19:15   .git/HEAD
-       92  2026-04-19 19:15   .git/config
-       73  2026-04-19 19:15   .git/description
-      478  2026-04-19 19:15   .git/hooks/applypatch-msg.sample
-      896  2026-04-19 19:15   .git/hooks/commit-msg.sample
-     4726  2026-04-19 19:15   .git/hooks/fsmonitor-watchman.sample
-      189  2026-04-19 19:15   .git/hooks/post-update.sample
-      424  2026-04-19 19:15   .git/hooks/pre-applypatch.sample
-     1649  2026-04-19 19:15   .git/hooks/pre-commit.sample
-      416  2026-04-19 19:15   .git/hooks/pre-merge-commit.sample
-     1492  2026-04-19 19:15   .git/hooks/prepare-commit-msg.sample
-     1374  2026-04-19 19:15   .git/hooks/pre-push.sample
-     4898  2026-04-19 19:15   .git/hooks/pre-rebase.sample
-      544  2026-04-19 19:15   .git/hooks/pre-receive.sample
-     2783  2026-04-19 19:15   .git/hooks/push-to-checkout.sample
-     2308  2026-04-19 19:15   .git/hooks/sendemail-validate.sample
-     3650  2026-04-19 19:15   .git/hooks/update.sample
-      240  2026-04-19 19:15   .git/info/exclude
-      154  2026-04-19 19:15   .git/logs/refs/heads/master
-      154  2026-04-19 19:15   .git/logs/refs/heads/HEAD
+        2  2025-03-17 13:17   .git/COMMIT_EDITMSG
+      137  2025-03-17 13:17   .git/index
+       23  2025-03-17 13:17   .git/HEAD
+       92  2025-03-17 13:17   .git/config
+       73  2025-03-17 13:17   .git/description
+      478  2025-03-17 13:17   .git/hooks/applypatch-msg.sample
+      896  2025-03-17 13:17   .git/hooks/commit-msg.sample
+     4726  2025-03-17 13:17   .git/hooks/fsmonitor-watchman.sample
+      189  2025-03-17 13:17   .git/hooks/post-update.sample
+      424  2025-03-17 13:17   .git/hooks/pre-applypatch.sample
+     1649  2025-03-17 13:17   .git/hooks/pre-commit.sample
+      416  2025-03-17 13:17   .git/hooks/pre-merge-commit.sample
+     1492  2025-03-17 13:17   .git/hooks/prepare-commit-msg.sample
+     1374  2025-03-17 13:17   .git/hooks/pre-push.sample
+     4898  2025-03-17 13:17   .git/hooks/pre-rebase.sample
+      544  2025-03-17 13:17   .git/hooks/pre-receive.sample
+     2783  2025-03-17 13:17   .git/hooks/push-to-checkout.sample
+     2308  2025-03-17 13:17   .git/hooks/sendemail-validate.sample
+     3650  2025-03-17 13:17   .git/hooks/update.sample
+      240  2025-03-17 13:17   .git/info/exclude
+      154  2025-03-17 13:17   .git/logs/refs/heads/master
+      154  2025-03-17 13:17   .git/logs/refs/heads/HEAD
 ok 4 - --mode=all includes .git dir contents
 
 # passed all 4 test(s)
@@ -23121,7 +23077,7 @@
 	git bugreport -o foo/ &&
 	test_path_is_file foo/git-bugreport-*
 
-Created new report at 'foo/git-bugreport-2026-04-19-1915.txt'.
+Created new report at 'foo/git-bugreport-2025-03-17-1317.txt'.
 ok 5 - --output-directory puts the report in the provided dir
 
 expecting success of 0091.6 'incorrect arguments abort with usage': 
@@ -23146,14 +23102,14 @@
 	test_when_finished rm non-repo/git-bugreport-* &&
 	nongit git bugreport
 
-Created new report at 'git-bugreport-2026-04-19-1915.txt'.
+Created new report at 'git-bugreport-2025-03-17-1317.txt'.
 ok 8 - runs outside of a git dir
 
 expecting success of 0091.9 'can create leading directories outside of a git dir': 
 	test_when_finished rm -fr foo/bar/baz &&
 	nongit git bugreport -o foo/bar/baz
 
-Created new report at 'foo/bar/baz/git-bugreport-2026-04-19-1915.txt'.
+Created new report at 'foo/bar/baz/git-bugreport-2025-03-17-1317.txt'.
 ok 9 - can create leading directories outside of a git dir
 
 expecting success of 0091.10 'indicates populated hooks': 
@@ -23244,7 +23200,7 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Created new report at 'report/git-bugreport-test.txt'.
-Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0091-bugreport': 63.93 GiB (mount flags 0x1000)
+Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0091-bugreport': 64.85 GiB (mount flags 0x1000)
 Contents of .git/objects:
 Total: 0 loose objects
 ok 11 - --diagnose creates diagnostics zip archive
@@ -23284,24 +23240,24 @@
 Diagnostics complete.
 All of the gathered info is captured in 'report/git-diagnostics-test.zip'
 Created new report at 'report/git-bugreport-test.txt'.
-       23  2026-04-19 19:15   .git/HEAD
-       92  2026-04-19 19:15   .git/config
-       73  2026-04-19 19:15   .git/description
-      478  2026-04-19 19:15   .git/hooks/applypatch-msg.sample
-      896  2026-04-19 19:15   .git/hooks/commit-msg.sample
-     4726  2026-04-19 19:15   .git/hooks/fsmonitor-watchman.sample
-      189  2026-04-19 19:15   .git/hooks/post-update.sample
-      424  2026-04-19 19:15   .git/hooks/pre-applypatch.sample
-     1649  2026-04-19 19:15   .git/hooks/pre-commit.sample
-      416  2026-04-19 19:15   .git/hooks/pre-merge-commit.sample
-     1492  2026-04-19 19:15   .git/hooks/prepare-commit-msg.sample
-     1374  2026-04-19 19:15   .git/hooks/pre-push.sample
-     4898  2026-04-19 19:15   .git/hooks/pre-rebase.sample
-      544  2026-04-19 19:15   .git/hooks/pre-receive.sample
-     2783  2026-04-19 19:15   .git/hooks/push-to-checkout.sample
-     2308  2026-04-19 19:15   .git/hooks/sendemail-validate.sample
-     3650  2026-04-19 19:15   .git/hooks/update.sample
-      240  2026-04-19 19:15   .git/info/exclude
+       23  2025-03-17 13:17   .git/HEAD
+       92  2025-03-17 13:17   .git/config
+       73  2025-03-17 13:17   .git/description
+      478  2025-03-17 13:17   .git/hooks/applypatch-msg.sample
+      896  2025-03-17 13:17   .git/hooks/commit-msg.sample
+     4726  2025-03-17 13:17   .git/hooks/fsmonitor-watchman.sample
+      189  2025-03-17 13:17   .git/hooks/post-update.sample
+      424  2025-03-17 13:17   .git/hooks/pre-applypatch.sample
+     1649  2025-03-17 13:17   .git/hooks/pre-commit.sample
+      416  2025-03-17 13:17   .git/hooks/pre-merge-commit.sample
+     1492  2025-03-17 13:17   .git/hooks/prepare-commit-msg.sample
+     1374  2025-03-17 13:17   .git/hooks/pre-push.sample
+     4898  2025-03-17 13:17   .git/hooks/pre-rebase.sample
+      544  2025-03-17 13:17   .git/hooks/pre-receive.sample
+     2783  2025-03-17 13:17   .git/hooks/push-to-checkout.sample
+     2308  2025-03-17 13:17   .git/hooks/sendemail-validate.sample
+     3650  2025-03-17 13:17   .git/hooks/update.sample
+      240  2025-03-17 13:17   .git/info/exclude
 ok 13 - --diagnose=all includes .git dir contents
 
 # passed all 13 test(s)
@@ -23638,43 +23594,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0202-gettext-perl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0202-gettext-perl/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-checking prerequisite: PERL_TEST_MORE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-	perl -MTest::More -e 0
-
-)
-prerequisite PERL_TEST_MORE ok
-expecting success of 0202.1 'run t0202/test.pl to test Git::I18N.pm': 
-	"$PERL_PATH" "$TEST_DIRECTORY"/t0202/test.pl 2>stderr &&
-	test_must_be_empty stderr
-
-1..13
-ok 1 - Testing Git::I18N with NO Perl gettext library
-ok 2 - Git::I18N is located at /build/reproducible-path/git-2.49.0+next.20250314/perl/build/lib/Git/I18N.pm
-ok 3 - sanity: Git::I18N has 3 export(s)
-ok 4 - sanity: Git::I18N exports everything by default
-ok 5 - sanity: __ has a $ prototype
-ok 6 - sanity: N__ has a $ prototype
-ok 7 - sanity: __n has a $$$ prototype
-ok 8 - Passing a string through __() in the C locale works
-ok 9 - Get singular string through __n() in C locale
-ok 10 - Get plural string through __n() in C locale
-ok 11 - Passing a string through N__() in the C locale works
-ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
-ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
-ok 1 - run t0202/test.pl to test Git::I18N.pm
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0201-gettext-fallbacks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0201-gettext-fallbacks/.git/
 # lib-gettext: No is_IS UTF-8 locale available
@@ -23745,6 +23664,43 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0202-gettext-perl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0202-gettext-perl/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+checking prerequisite: PERL_TEST_MORE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+	perl -MTest::More -e 0
+
+)
+prerequisite PERL_TEST_MORE ok
+expecting success of 0202.1 'run t0202/test.pl to test Git::I18N.pm': 
+	"$PERL_PATH" "$TEST_DIRECTORY"/t0202/test.pl 2>stderr &&
+	test_must_be_empty stderr
+
+1..13
+ok 1 - Testing Git::I18N with NO Perl gettext library
+ok 2 - Git::I18N is located at /build/reproducible-path/git-2.49.0+next.20250314/perl/build/lib/Git/I18N.pm
+ok 3 - sanity: Git::I18N has 3 export(s)
+ok 4 - sanity: Git::I18N exports everything by default
+ok 5 - sanity: __ has a $ prototype
+ok 6 - sanity: N__ has a $ prototype
+ok 7 - sanity: __n has a $$$ prototype
+ok 8 - Passing a string through __() in the C locale works
+ok 9 - Get singular string through __n() in C locale
+ok 10 - Get plural string through __n() in C locale
+ok 11 - Passing a string through N__() in the C locale works
+ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+ok 1 - run t0202/test.pl to test Git::I18N.pm
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0203-gettext-setlocale-sanity.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0203-gettext-setlocale-sanity/.git/
 # lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
@@ -23831,600 +23787,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0212-trace2-event.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0212-trace2-event/.git/
-expecting success of 0212.1 'event stream, error event': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "003error",
-	|      "hello world",
-	|      "this is a test"
-	|    ],
-	|    "errors":[
-	|      "%s",
-	|      "%s"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 1 - event stream, error event
-
-expecting success of 0212.2 'event stream, return code 0': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "child":{
-	|      "0":{
-	|        "child_argv":[
-	|          "_EXE_",
-	|          "trace2",
-	|          "004child",
-	|          "test-tool",
-	|          "trace2",
-	|          "001return",
-	|          "0"
-	|        ],
-	|        "child_class":"?",
-	|        "child_code":0,
-	|        "use_shell":0
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  },
-	|  "_SID0_/_SID1_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "child":{
-	|      "0":{
-	|        "child_argv":[
-	|          "_EXE_",
-	|          "trace2",
-	|          "001return",
-	|          "0"
-	|        ],
-	|        "child_class":"?",
-	|        "child_code":0,
-	|        "use_shell":0
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2/trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  },
-	|  "_SID0_/_SID1_/_SID2_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2/trace2/trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 2 - event stream, return code 0
-
-expecting success of 0212.3 'event stream, list config': 
-	test_when_finished "rm trace.event actual expect" &&
-	git config --local t0212.abc 1 &&
-	git config --local t0212.def "hello world" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" GIT_TRACE2_CONFIG_PARAMS="t0212.*" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "params":[
-	|      {
-	|        "param":"t0212.abc",
-	|        "value":"1"
-	|      },
-	|      {
-	|        "param":"t0212.def",
-	|        "value":"hello world"
-	|      }
-	|    ],
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 3 - event stream, list config
-
-expecting success of 0212.4 'event stream, list env vars': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \
-		A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "params":[
-	|      {
-	|        "param":"A_VAR",
-	|        "value":"1"
-	|      },
-	|      {
-	|        "param":"OTHER_VAR",
-	|        "value":"hello world"
-	|      }
-	|    ],
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 4 - event stream, list env vars
-
-expecting success of 0212.5 'basic trace2_data': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "006data",
-	|      "test_category",
-	|      "k1",
-	|      "v1",
-	|      "test_category",
-	|      "k2",
-	|      "v2"
-	|    ],
-	|    "data":{
-	|      "test_category":{
-	|        "k1":"v1",
-	|        "k2":"v2"
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 5 - basic trace2_data
-
-expecting success of 0212.6 'using global config, event stream, error event': 
-	test_when_finished "rm trace.event actual expect" &&
-	test_config_global trace2.eventTarget "$(pwd)/trace.event" &&
-	test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "003error",
-	|      "hello world",
-	|      "this is a test"
-	|    ],
-	|    "errors":[
-	|      "%s",
-	|      "%s"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 6 - using global config, event stream, error event
-
-expecting success of 0212.7 'discard traces when there are too many files': 
-	mkdir trace_target_dir &&
-	test_when_finished "rm -r trace_target_dir" &&
-	(
-		GIT_TRACE2_MAX_FILES=5 &&
-		export GIT_TRACE2_MAX_FILES &&
-		cd trace_target_dir &&
-		test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt &&
-		xargs touch <../expected_filenames.txt &&
-		cd .. &&
-		GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0
-	) &&
-	echo git-trace2-discard >>expected_filenames.txt &&
-	ls trace_target_dir >ls_output.txt &&
-	test_cmp expected_filenames.txt ls_output.txt &&
-	head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" &&
-	head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\"
-
-{"event":"version","sid":"20260419T191505.515733Z-H8d819085-P001a6cb3","thread":"main","time":"2026-04-19T19:15:05.515833Z","file":"common-init.c","line":57,"evt":"4","exe":"2.49.0.395.g12beb8f557c"}
-{"event":"too_many_files","sid":"20260419T191505.515733Z-H8d819085-P001a6cb3","thread":"main","time":"2026-04-19T19:15:05.515850Z","file":"common-init.c","line":57}
-ok 7 - discard traces when there are too many files
-
-expecting success of 0212.8 'unsafe URLs are redacted by default in cmd_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 300redact_start git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 8 - unsafe URLs are redacted by default in cmd_start events
-
-expecting success of 0212.9 'unsafe URLs are redacted by default in child_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 301redact_child_start git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 9 - unsafe URLs are redacted by default in child_start events
-
-expecting success of 0212.10 'unsafe URLs are redacted by default in exec events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 302redact_exec git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 10 - unsafe URLs are redacted by default in exec events
-
-expecting success of 0212.11 'unsafe URLs are redacted by default in def_param events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 303redact_def_param url https://user:pwd@example.com/ &&
-	! grep user:pwd trace.event
-
-ok 11 - unsafe URLs are redacted by default in def_param events
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0210-trace2-normal.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0210-trace2-normal/.git/
-expecting success of 0210.1 'normal stream, return code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 1 - normal stream, return code 0
-
-expecting success of 0210.2 'normal stream, return code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 2 - normal stream, return code 1
-
-expecting success of 0210.3 'automatic filename': 
-	test_when_finished "rm -r traces actual expect" &&
-	mkdir traces &&
-	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 3 - automatic filename
-
-expecting success of 0210.4 'normal stream, exit code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 4 - normal stream, exit code 0
-
-expecting success of 0210.5 'normal stream, exit code 1': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 002exit 1
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:1
-		atexit elapsed:_TIME_ code:1
-	EOF
-	test_cmp expect actual
-
-ok 5 - normal stream, exit code 1
-
-expecting success of 0210.6 'normal stream, error event': 
-	test_when_finished "rm trace.normal actual expect" &&
-	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 003error 'hello world' 'this is a test'
-		cmd_name trace2 (trace2)
-		error hello world
-		error this is a test
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 6 - normal stream, error event
-
-expecting success of 0210.7 'BUG messages are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 007bug
-		cmd_name trace2 (trace2)
-		error the bug message
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-BUG: t/helper/test-trace2.c:213: the bug message
-ok 7 - BUG messages are written to trace2
-
-expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 008bug 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 008bug
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 8 - bug messages with BUG_if_bug() are written to trace2
-
-expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 009bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	another bug message
-	had bug() call(s) in this process without explicit BUG_if_bug()
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 009bug_BUG
-		cmd_name trace2 (trace2)
-		error a bug message
-		error another bug message
-		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
-
-expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
-		test-tool trace2 010bug_BUG 2>err &&
-	cat >expect <<-\EOF &&
-	a bug message
-	a BUG message
-	EOF
-	sed "s/^.*: //" <err >actual &&
-	test_cmp expect actual &&
-
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 010bug_BUG
-		cmd_name trace2 (trace2)
-		error a bug message
-		error a BUG message
-		exit elapsed:_TIME_ code:99
-		atexit elapsed:_TIME_ code:99
-	EOF
-	test_cmp expect actual
-
-ok 10 - bug messages followed by BUG() are written to trace2
-
-expecting success of 0210.11 'a valueless true configuration variable is handled': 
-	test_when_finished "rm -f trace2.normal actual expect" &&
-	echo >expect &&
-	GIT_TRACE2="$(pwd)/trace2.normal" \
-	GIT_TRACE2_CONFIG_PARAMS=foo.true \
-	git -c foo.true config foo.true >actual &&
-	test_cmp expect actual
-
-ok 11 - a valueless true configuration variable is handled
-
-expecting success of 0210.12 'using global config, normal stream, return code 0': 
-	test_when_finished "rm trace.normal actual expect" &&
-	test_config_global trace2.normalBrief 1 &&
-	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
-	test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 12 - using global config, normal stream, return code 0
-
-expecting success of 0210.13 'using global config with include': 
-	test_when_finished "rm trace.normal actual expect real.gitconfig" &&
-	test_config_global trace2.normalBrief 1 &&
-	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
-	mv "$(pwd)/.gitconfig" "$(pwd)/real.gitconfig" &&
-	test_config_global include.path "$(pwd)/real.gitconfig" &&
-	test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
-	cat >expect <<-EOF &&
-		version $V
-		start _EXE_ trace2 001return 0
-		cmd_name trace2 (trace2)
-		exit elapsed:_TIME_ code:0
-		atexit elapsed:_TIME_ code:0
-	EOF
-	test_cmp expect actual
-
-ok 13 - using global config with include
-
-expecting success of 0210.14 'unsafe URLs are redacted by default': 
-	test_when_finished \
-		"rm -r trace.normal unredacted.normal clone clone2" &&
-
-	test_config_global \
-		"url.$(pwd).insteadOf" https://user:pwd@example.com/ &&
-	test_config_global trace2.configParams "core.*,remote.*.url" &&
-
-	GIT_TRACE2="$(pwd)/trace.normal" \
-		git clone https://user:pwd@example.com/ clone &&
-	! grep user:pwd trace.normal &&
-
-	GIT_TRACE2_REDACT=0 GIT_TRACE2="$(pwd)/unredacted.normal" \
-		git clone https://user:pwd@example.com/ clone2 &&
-	grep "start .* clone https://user:pwd@example.com" unredacted.normal &&
-	grep "remote.origin.url=https://user:pwd@example.com" unredacted.normal
-
-Cloning into 'clone'...
-warning: You appear to have cloned an empty repository.
-done.
-Cloning into 'clone2'...
-warning: You appear to have cloned an empty repository.
-done.
-19:15:05.928495 common-init.c:58                  start /build/reproducible-path/git-2.49.0+next.20250314/git clone https://user:pwd@example.com/ clone2
-19:15:05.929885 config.c:3098                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
-ok 14 - unsafe URLs are redacted by default
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0021-conversion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0021-conversion/.git/
 expecting success of 0021.1 'setup': 
@@ -24743,7 +24105,7 @@
 
 [main 2e1b3a0] one
  Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
+ 9 files changed, 9 insertions(+)
  create mode 100644 30MB
  create mode 100644 big
  create mode 100644 empty-in-repo
@@ -25213,8 +24575,8 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0021-conversion/repo/.git/
 fatal: smudge write error
 error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
---- smudge-write-fail.o	2026-04-19 19:14:57.875659440 +0000
-+++ smudge-write-fail.r	2026-04-19 19:14:58.335659440 +0000
+--- smudge-write-fail.o	2025-03-17 13:17:04.667088970 +0000
++++ smudge-write-fail.r	2025-03-17 13:17:04.959090816 +0000
 @@ -1 +1 @@
 -this is going to fail
 +guvf vf tbvat gb snvy
@@ -25660,511 +25022,598 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0090-cache-tree/.git/
-expecting success of 0090.1 'initial commit has cache-tree': 
-	test_commit foo &&
-	test_cache_tree
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - initial commit has cache-tree
-
-expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
-	git read-tree HEAD &&
-	test_cache_tree
-
-ok 2 - read-tree HEAD establishes cache-tree
-
-expecting success of 0090.3 'git-add invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git add foo &&
-	test_invalid_cache_tree
-
-HEAD is now at ddd63c9 foo
-ok 3 - git-add invalidates cache-tree
-
-expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	mkdir dirx &&
-	echo "I changed this file" >dirx/foo &&
-	git add dirx/foo &&
-	test_invalid_cache_tree
-
-error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
-HEAD is now at ddd63c9 foo
-ok 4 - git-add in subdir invalidates cache-tree
-
-expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
-	git tag no-children &&
-	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
-	mkdir dir1 dir2 &&
-	test_commit dir1/a &&
-	test_commit dir2/b &&
-	echo "I changed this file" >dir1/a &&
-	test_when_finished "rm before" &&
-	cat >before <<-\EOF &&
-	SHA  (3 entries, 2 subtrees)
-	SHA dir1/ (1 entries, 0 subtrees)
-	SHA dir2/ (1 entries, 0 subtrees)
-	EOF
-	cmp_cache_tree before &&
-	echo "I changed this file" >dir1/a &&
-	git add dir1/a &&
-	cat >expect <<-\EOF &&
-	invalid                                   (2 subtrees)
-	invalid                                  dir1/ (0 subtrees)
-	SHA dir2/ (1 entries, 0 subtrees)
+*** t0212-trace2-event.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0212-trace2-event/.git/
+expecting success of 0212.1 'event stream, error event': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "003error",
+	|      "hello world",
+	|      "this is a test"
+	|    ],
+	|    "errors":[
+	|      "%s",
+	|      "%s"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
 	EOF
-	cmp_cache_tree expect
-
-[master 365c8fc] dir1/a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir1/a.t
-[master 8be4607] dir2/b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir2/b.t
-error: invalid object 040000 3b5b859722b671676295bf3795f34b8c6f2393f5 for 'dir1'
-HEAD is now at ddd63c9 foo
-ok 5 - git-add in subdir does not invalidate sibling cache-tree
-
-expecting success of 0090.6 'update-index invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git update-index --add foo &&
-	test_invalid_cache_tree
-
-HEAD is now at ddd63c9 foo
-ok 6 - update-index invalidates cache-tree
-
-expecting success of 0090.7 'write-tree establishes cache-tree': 
-	test-tool scrap-cache-tree &&
-	git write-tree &&
-	test_cache_tree
-
-64fd3796c57084e7b8cbae358ce37970b8e954f6
-ok 7 - write-tree establishes cache-tree
-
-expecting success of 0090.8 'test-tool scrap-cache-tree works': 
-	git read-tree HEAD &&
-	test-tool scrap-cache-tree &&
-	test_no_cache_tree
-
-ok 8 - test-tool scrap-cache-tree works
-
-expecting success of 0090.9 'second commit has cache-tree': 
-	test_commit bar &&
-	test_cache_tree
+	test_cmp expect actual
 
-[master eeeeed8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 9 - second commit has cache-tree
+error: hello world
+error: this is a test
+ok 1 - event stream, error event
 
-expecting success of 0090.10 'commit --interactive gives cache-tree on partial commit': 
-	test_when_finished "git reset --hard" &&
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 42;
-	}
-	int bar()
-	{
-		return 42;
-	}
-	EOT
-	git add foo.c &&
-	test_invalid_cache_tree &&
-	git commit -m "add a file" &&
-	test_cache_tree &&
-	cat <<-\EOT >foo.c &&
-	int foo()
-	{
-		return 43;
-	}
-	int bar()
-	{
-		return 44;
-	}
-	EOT
-	test_write_lines p 1 "" s n y q |
-	git commit --interactive -m foo &&
-	cat <<-\EOF >expected.status &&
-	 M foo.c
+expecting success of 0212.2 'event stream, return code 0': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "child":{
+	|      "0":{
+	|        "child_argv":[
+	|          "_EXE_",
+	|          "trace2",
+	|          "004child",
+	|          "test-tool",
+	|          "trace2",
+	|          "001return",
+	|          "0"
+	|        ],
+	|        "child_class":"?",
+	|        "child_code":0,
+	|        "use_shell":0
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  },
+	|  "_SID0_/_SID1_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "child":{
+	|      "0":{
+	|        "child_argv":[
+	|          "_EXE_",
+	|          "trace2",
+	|          "001return",
+	|          "0"
+	|        ],
+	|        "child_class":"?",
+	|        "child_code":0,
+	|        "use_shell":0
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2/trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  },
+	|  "_SID0_/_SID1_/_SID2_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2/trace2/trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
 	EOF
-	test_cache_tree expected.status
-
-[master d1075a6] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo.c
-           staged     unstaged path
-  1:    unchanged        +2/-2 foo.c
-
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now>            staged     unstaged path
-  1:    unchanged        +2/-2 [f]oo.c
-Patch update>>            staged     unstaged path
-* 1:    unchanged        +2/-2 [f]oo.c
-Patch update>> diff --git a/foo.c b/foo.c
-index 75522e2..3f7f049 100644
---- a/foo.c
-+++ b/foo.c
-@@ -1,8 +1,8 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
--return 42;
-+return 44;
- }
-(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
-@@ -1,6 +1,6 @@
- int foo()
- {
--return 42;
-+return 43;
- }
- int bar()
- {
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -4,5 +4,5 @@
- }
- int bar()
- {
--return 42;
-+return 44;
- }
-(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
-*** Commands ***
-  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
-  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
-What now> Bye.
-[master 65d7dde] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 65d7dde foo
-ok 10 - commit --interactive gives cache-tree on partial commit
-
-expecting success of 0090.11 'commit -p with shrinking cache-tree': 
-	mkdir -p deep/very-long-subdir &&
-	echo content >deep/very-long-subdir/file &&
-	git add deep &&
-	git commit -m add &&
-	git rm -r deep &&
-
-	before=$(wc -c <.git/index) &&
-	git commit -m delete -p &&
-	after=$(wc -c <.git/index) &&
-
-	# double check that the index shrank
-	test $before -gt $after &&
-
-	# and that our index was not corrupted
-	git fsck
-
-[master 10c383a] add
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deep/very-long-subdir/file
-rm 'deep/very-long-subdir/file'
-No changes.
-[master 73c66c3] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 deep/very-long-subdir/file
-dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
-ok 11 - commit -p with shrinking cache-tree
-
-expecting success of 0090.12 'commit in child dir has cache-tree': 
-	mkdir dir &&
-	>dir/child.t &&
-	git add dir/child.t &&
-	git commit -m dir/child.t &&
-	test_cache_tree
-
-[master d3413ee] dir/child.t
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/child.t
-ok 12 - commit in child dir has cache-tree
-
-expecting success of 0090.13 'reset --hard gives cache-tree': 
-	test-tool scrap-cache-tree &&
-	git reset --hard &&
-	test_cache_tree
+	test_cmp expect actual
 
-HEAD is now at d3413ee dir/child.t
-ok 13 - reset --hard gives cache-tree
+ok 2 - event stream, return code 0
 
-expecting success of 0090.14 'reset --hard without index gives cache-tree': 
-	rm -f .git/index &&
-	git clean -fd &&
-	git reset --hard &&
-	test_cache_tree
+expecting success of 0212.3 'event stream, list config': 
+	test_when_finished "rm trace.event actual expect" &&
+	git config --local t0212.abc 1 &&
+	git config --local t0212.def "hello world" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" GIT_TRACE2_CONFIG_PARAMS="t0212.*" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "params":[
+	|      {
+	|        "param":"t0212.abc",
+	|        "value":"1"
+	|      },
+	|      {
+	|        "param":"t0212.def",
+	|        "value":"hello world"
+	|      }
+	|    ],
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
 
-Removing bar.t
-Removing dir/
-Removing expected.status
-Removing foo.c
-Removing foo.t
-Removing status
-HEAD is now at d3413ee dir/child.t
-ok 14 - reset --hard without index gives cache-tree
+ok 3 - event stream, list config
 
-expecting success of 0090.15 'checkout gives cache-tree': 
-	git tag current &&
-	git checkout HEAD^ &&
-	test_cache_tree
+expecting success of 0212.4 'event stream, list env vars': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \
+		A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "params":[
+	|      {
+	|        "param":"A_VAR",
+	|        "value":"1"
+	|      },
+	|      {
+	|        "param":"OTHER_VAR",
+	|        "value":"hello world"
+	|      }
+	|    ],
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
 
-Note: switching to 'HEAD^'.
+ok 4 - event stream, list env vars
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 0212.5 'basic trace2_data': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "006data",
+	|      "test_category",
+	|      "k1",
+	|      "v1",
+	|      "test_category",
+	|      "k2",
+	|      "v2"
+	|    ],
+	|    "data":{
+	|      "test_category":{
+	|        "k1":"v1",
+	|        "k2":"v2"
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 5 - basic trace2_data
 
-  git switch -c <new-branch-name>
+expecting success of 0212.6 'using global config, event stream, error event': 
+	test_when_finished "rm trace.event actual expect" &&
+	test_config_global trace2.eventTarget "$(pwd)/trace.event" &&
+	test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "003error",
+	|      "hello world",
+	|      "this is a test"
+	|    ],
+	|    "errors":[
+	|      "%s",
+	|      "%s"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
 
-Or undo this operation with:
+error: hello world
+error: this is a test
+ok 6 - using global config, event stream, error event
 
-  git switch -
+expecting success of 0212.7 'discard traces when there are too many files': 
+	mkdir trace_target_dir &&
+	test_when_finished "rm -r trace_target_dir" &&
+	(
+		GIT_TRACE2_MAX_FILES=5 &&
+		export GIT_TRACE2_MAX_FILES &&
+		cd trace_target_dir &&
+		test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt &&
+		xargs touch <../expected_filenames.txt &&
+		cd .. &&
+		GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0
+	) &&
+	echo git-trace2-discard >>expected_filenames.txt &&
+	ls trace_target_dir >ls_output.txt &&
+	test_cmp expected_filenames.txt ls_output.txt &&
+	head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" &&
+	head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\"
 
-Turn off this advice by setting config variable advice.detachedHead to false
+{"event":"version","sid":"20250317T131713.363186Z-H5c947e1c-P002d2639","thread":"main","time":"2025-03-17T13:17:13.363278Z","file":"common-init.c","line":57,"evt":"4","exe":"2.49.0.395.g12beb8f557c"}
+{"event":"too_many_files","sid":"20250317T131713.363186Z-H5c947e1c-P002d2639","thread":"main","time":"2025-03-17T13:17:13.363293Z","file":"common-init.c","line":57}
+ok 7 - discard traces when there are too many files
 
-HEAD is now at 73c66c3 delete
-ok 15 - checkout gives cache-tree
+expecting success of 0212.8 'unsafe URLs are redacted by default in cmd_start events': 
+	test_when_finished \
+		"rm -r trace.event" &&
 
-expecting success of 0090.16 'checkout -b gives cache-tree': 
-	git checkout current &&
-	git checkout -b prev HEAD^ &&
-	test_cache_tree
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 300redact_start git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
 
-Previous HEAD position was 73c66c3 delete
-HEAD is now at d3413ee dir/child.t
-Previous HEAD position was d3413ee dir/child.t
-Switched to a new branch 'prev'
-ok 16 - checkout -b gives cache-tree
+ok 8 - unsafe URLs are redacted by default in cmd_start events
 
-expecting success of 0090.17 'checkout -B gives cache-tree': 
-	git checkout current &&
-	git checkout -B prev HEAD^ &&
-	test_cache_tree
+expecting success of 0212.9 'unsafe URLs are redacted by default in child_start events': 
+	test_when_finished \
+		"rm -r trace.event" &&
 
-Note: switching to 'current'.
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 301redact_child_start git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 9 - unsafe URLs are redacted by default in child_start events
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 0212.10 'unsafe URLs are redacted by default in exec events': 
+	test_when_finished \
+		"rm -r trace.event" &&
 
-  git switch -c <new-branch-name>
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 302redact_exec git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
 
-Or undo this operation with:
+ok 10 - unsafe URLs are redacted by default in exec events
 
-  git switch -
+expecting success of 0212.11 'unsafe URLs are redacted by default in def_param events': 
+	test_when_finished \
+		"rm -r trace.event" &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 303redact_def_param url https://user:pwd@example.com/ &&
+	! grep user:pwd trace.event
 
-HEAD is now at d3413ee dir/child.t
-Previous HEAD position was d3413ee dir/child.t
-Switched to and reset branch 'prev'
-ok 17 - checkout -B gives cache-tree
+ok 11 - unsafe URLs are redacted by default in def_param events
 
-expecting success of 0090.18 'merge --ff-only maintains cache-tree': 
-	git checkout current &&
-	git checkout -b changes &&
-	test_commit llamas &&
-	test_commit pachyderm &&
-	test_cache_tree &&
-	git checkout current &&
-	test_cache_tree &&
-	git merge --ff-only changes &&
-	test_cache_tree
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0210-trace2-normal.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0210-trace2-normal/.git/
+expecting success of 0210.1 'normal stream, return code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
 
-Note: switching to 'current'.
+ok 1 - normal stream, return code 0
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 0210.2 'normal stream, return code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 001return 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 2 - normal stream, return code 1
 
-  git switch -c <new-branch-name>
+expecting success of 0210.3 'automatic filename': 
+	test_when_finished "rm -r traces actual expect" &&
+	mkdir traces &&
+	GIT_TRACE2="$(pwd)/traces" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <"$(ls traces/*)" >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 3 - automatic filename
 
-  git switch -
+expecting success of 0210.4 'normal stream, exit code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 4 - normal stream, exit code 0
 
-HEAD is now at d3413ee dir/child.t
-Switched to a new branch 'changes'
-[changes 229c856] llamas
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 llamas.t
-[changes f10d9f3] pachyderm
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pachyderm.t
-Note: switching to 'current'.
+expecting success of 0210.5 'normal stream, exit code 1': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 002exit 1 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 002exit 1
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:1
+		atexit elapsed:_TIME_ code:1
+	EOF
+	test_cmp expect actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 5 - normal stream, exit code 1
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 0210.6 'normal stream, error event': 
+	test_when_finished "rm trace.normal actual expect" &&
+	GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 003error 'hello world' 'this is a test'
+		cmd_name trace2 (trace2)
+		error hello world
+		error this is a test
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+error: hello world
+error: this is a test
+ok 6 - normal stream, error event
 
-Or undo this operation with:
+expecting success of 0210.7 'BUG messages are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 007bug
+		cmd_name trace2 (trace2)
+		error the bug message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
 
-  git switch -
+BUG: t/helper/test-trace2.c:213: the bug message
+ok 7 - BUG messages are written to trace2
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 0210.8 'bug messages with BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 008bug 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
 
-HEAD is now at d3413ee dir/child.t
-Updating d3413ee..f10d9f3
-Fast-forward
- llamas.t    | 1 +
- pachyderm.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 llamas.t
- create mode 100644 pachyderm.t
-ok 18 - merge --ff-only maintains cache-tree
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 008bug
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error an explicit BUG_if_bug() following bug() call(s) is nice, but not required
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
 
-expecting success of 0090.19 'merge maintains cache-tree': 
-	git checkout current &&
-	git checkout -b changes2 &&
-	test_commit alpacas &&
-	test_cache_tree &&
-	git checkout current &&
-	test_commit struthio &&
-	test_cache_tree &&
-	git merge changes2 &&
-	test_cache_tree
+ok 8 - bug messages with BUG_if_bug() are written to trace2
 
-Previous HEAD position was f10d9f3 pachyderm
-HEAD is now at d3413ee dir/child.t
-Switched to a new branch 'changes2'
-[changes2 4b1575a] alpacas
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 alpacas.t
-Note: switching to 'current'.
+expecting success of 0210.9 'bug messages without explicit BUG_if_bug() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 009bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	another bug message
+	had bug() call(s) in this process without explicit BUG_if_bug()
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 009bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error another bug message
+		error on exit(): had bug() call(s) in this process without explicit BUG_if_bug()
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 9 - bug messages without explicit BUG_if_bug() are written to trace2
 
-  git switch -c <new-branch-name>
+expecting success of 0210.10 'bug messages followed by BUG() are written to trace2': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_expect_code 99 env GIT_TRACE2="$(pwd)/trace.normal" \
+		test-tool trace2 010bug_BUG 2>err &&
+	cat >expect <<-\EOF &&
+	a bug message
+	a BUG message
+	EOF
+	sed "s/^.*: //" <err >actual &&
+	test_cmp expect actual &&
 
-Or undo this operation with:
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 010bug_BUG
+		cmd_name trace2 (trace2)
+		error a bug message
+		error a BUG message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
 
-  git switch -
+ok 10 - bug messages followed by BUG() are written to trace2
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 0210.11 'a valueless true configuration variable is handled': 
+	test_when_finished "rm -f trace2.normal actual expect" &&
+	echo >expect &&
+	GIT_TRACE2="$(pwd)/trace2.normal" \
+	GIT_TRACE2_CONFIG_PARAMS=foo.true \
+	git -c foo.true config foo.true >actual &&
+	test_cmp expect actual
 
-HEAD is now at d3413ee dir/child.t
-[detached HEAD 5a63c6d] struthio
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 struthio.t
-Merge made by the 'ort' strategy.
- alpacas.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 alpacas.t
-ok 19 - merge maintains cache-tree
+ok 11 - a valueless true configuration variable is handled
 
-expecting success of 0090.20 'partial commit gives cache-tree': 
-	git checkout -b partial no-children &&
-	test_commit one &&
-	test_commit two &&
-	echo "some change" >one.t &&
-	git add one.t &&
-	echo "some other change" >two.t &&
-	git commit two.t -m partial &&
-	cat <<-\EOF >expected.status &&
-	M  one.t
+expecting success of 0210.12 'using global config, normal stream, return code 0': 
+	test_when_finished "rm trace.normal actual expect" &&
+	test_config_global trace2.normalBrief 1 &&
+	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+	test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
 	EOF
-	test_cache_tree expected.status
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	test_cmp expect actual
 
-  e104fa1 Merge branch 'changes2' into HEAD
+ok 12 - using global config, normal stream, return code 0
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 0210.13 'using global config with include': 
+	test_when_finished "rm trace.normal actual expect real.gitconfig" &&
+	test_config_global trace2.normalBrief 1 &&
+	test_config_global trace2.normalTarget "$(pwd)/trace.normal" &&
+	mv "$(pwd)/.gitconfig" "$(pwd)/real.gitconfig" &&
+	test_config_global include.path "$(pwd)/real.gitconfig" &&
+	test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 001return 0
+		cmd_name trace2 (trace2)
+		exit elapsed:_TIME_ code:0
+		atexit elapsed:_TIME_ code:0
+	EOF
+	test_cmp expect actual
 
- git branch <new-branch-name> e104fa1
+ok 13 - using global config with include
 
-Switched to a new branch 'partial'
-[partial 6771940] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[partial cd7fad9] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[partial f24c7c2] partial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - partial commit gives cache-tree
+expecting success of 0210.14 'unsafe URLs are redacted by default': 
+	test_when_finished \
+		"rm -r trace.normal unredacted.normal clone clone2" &&
 
-expecting success of 0090.21 'no phantom error when switching trees': 
-	mkdir newdir &&
-	>newdir/one &&
-	git add newdir/one &&
-	git checkout 2>errors &&
-	test_must_be_empty errors
+	test_config_global \
+		"url.$(pwd).insteadOf" https://user:pwd@example.com/ &&
+	test_config_global trace2.configParams "core.*,remote.*.url" &&
 
-A	newdir/one
-M	one.t
-ok 21 - no phantom error when switching trees
+	GIT_TRACE2="$(pwd)/trace.normal" \
+		git clone https://user:pwd@example.com/ clone &&
+	! grep user:pwd trace.normal &&
 
-expecting success of 0090.22 'switching trees does not invalidate shared index': 
-	(
-		sane_unset GIT_TEST_SPLIT_INDEX &&
-		git update-index --split-index &&
-		>split &&
-		git add split &&
-		test-tool dump-split-index .git/index | grep -v ^own >before &&
-		git commit -m "as-is" &&
-		test-tool dump-split-index .git/index | grep -v ^own >after &&
-		test_cmp before after
-	)
+	GIT_TRACE2_REDACT=0 GIT_TRACE2="$(pwd)/unredacted.normal" \
+		git clone https://user:pwd@example.com/ clone2 &&
+	grep "start .* clone https://user:pwd@example.com" unredacted.normal &&
+	grep "remote.origin.url=https://user:pwd@example.com" unredacted.normal
 
-[partial dc7a831] as-is
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 newdir/one
- create mode 100644 split
-ok 22 - switching trees does not invalidate shared index
+Cloning into 'clone'...
+warning: You appear to have cloned an empty repository.
+done.
+Cloning into 'clone2'...
+warning: You appear to have cloned an empty repository.
+done.
+13:17:13.906698 common-init.c:58                  start /build/reproducible-path/git-2.49.0+next.20250314/git clone https://user:pwd@example.com/ clone2
+13:17:13.908011 config.c:3098                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
+ok 14 - unsafe URLs are redacted by default
 
-# passed all 22 test(s)
-1..22
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0060-path-utils.sh ***
@@ -28004,94 +27453,511 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0411-clone-from-partial.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0411-clone-from-partial/.git/
-expecting success of 0411.1 'create evil repo': 
-	git init tmp &&
-	test_commit -C tmp a &&
-	git -C tmp config uploadpack.allowfilter 1 &&
-	git clone --filter=blob:none --no-local --no-checkout tmp evil &&
-	rm -rf tmp &&
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0090-cache-tree/.git/
+expecting success of 0090.1 'initial commit has cache-tree': 
+	test_commit foo &&
+	test_cache_tree
 
-	git -C evil config remote.origin.uploadpack \"\$TRASH_DIRECTORY/fake-upload-pack\" &&
-	write_script fake-upload-pack <<-\EOF &&
-		echo >&2 "fake-upload-pack running"
-		>"$TRASH_DIRECTORY/script-executed"
-		exit 1
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - initial commit has cache-tree
+
+expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
+	git read-tree HEAD &&
+	test_cache_tree
+
+ok 2 - read-tree HEAD establishes cache-tree
+
+expecting success of 0090.3 'git-add invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git add foo &&
+	test_invalid_cache_tree
+
+HEAD is now at ddd63c9 foo
+ok 3 - git-add invalidates cache-tree
+
+expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	mkdir dirx &&
+	echo "I changed this file" >dirx/foo &&
+	git add dirx/foo &&
+	test_invalid_cache_tree
+
+error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
+HEAD is now at ddd63c9 foo
+ok 4 - git-add in subdir invalidates cache-tree
+
+expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
+	git tag no-children &&
+	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
+	mkdir dir1 dir2 &&
+	test_commit dir1/a &&
+	test_commit dir2/b &&
+	echo "I changed this file" >dir1/a &&
+	test_when_finished "rm before" &&
+	cat >before <<-\EOF &&
+	SHA  (3 entries, 2 subtrees)
+	SHA dir1/ (1 entries, 0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
 	EOF
-	export TRASH_DIRECTORY &&
+	cmp_cache_tree before &&
+	echo "I changed this file" >dir1/a &&
+	git add dir1/a &&
+	cat >expect <<-\EOF &&
+	invalid                                   (2 subtrees)
+	invalid                                  dir1/ (0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
+	cmp_cache_tree expect
 
-	# empty shallow file disables local clone optimization
-	>evil/.git/shallow
+[master 365c8fc] dir1/a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir1/a.t
+[master 8be4607] dir2/b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir2/b.t
+error: invalid object 040000 3b5b859722b671676295bf3795f34b8c6f2393f5 for 'dir1'
+HEAD is now at ddd63c9 foo
+ok 5 - git-add in subdir does not invalidate sibling cache-tree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0411-clone-from-partial/tmp/.git/
-[master (root-commit) ce450c7] a
+expecting success of 0090.6 'update-index invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git update-index --add foo &&
+	test_invalid_cache_tree
+
+HEAD is now at ddd63c9 foo
+ok 6 - update-index invalidates cache-tree
+
+expecting success of 0090.7 'write-tree establishes cache-tree': 
+	test-tool scrap-cache-tree &&
+	git write-tree &&
+	test_cache_tree
+
+64fd3796c57084e7b8cbae358ce37970b8e954f6
+ok 7 - write-tree establishes cache-tree
+
+expecting success of 0090.8 'test-tool scrap-cache-tree works': 
+	git read-tree HEAD &&
+	test-tool scrap-cache-tree &&
+	test_no_cache_tree
+
+ok 8 - test-tool scrap-cache-tree works
+
+expecting success of 0090.9 'second commit has cache-tree': 
+	test_commit bar &&
+	test_cache_tree
+
+[master eeeeed8] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Cloning into 'evil'...
-ok 1 - create evil repo
+ create mode 100644 bar.t
+ok 9 - second commit has cache-tree
 
-expecting success of 0411.2 'local clone must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git clone \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		evil clone1 2>err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+expecting success of 0090.10 'commit --interactive gives cache-tree on partial commit': 
+	test_when_finished "git reset --hard" &&
+	cat <<-\EOT >foo.c &&
+	int foo()
+	{
+		return 42;
+	}
+	int bar()
+	{
+		return 42;
+	}
+	EOT
+	git add foo.c &&
+	test_invalid_cache_tree &&
+	git commit -m "add a file" &&
+	test_cache_tree &&
+	cat <<-\EOT >foo.c &&
+	int foo()
+	{
+		return 43;
+	}
+	int bar()
+	{
+		return 44;
+	}
+	EOT
+	test_write_lines p 1 "" s n y q |
+	git commit --interactive -m foo &&
+	cat <<-\EOF >expected.status &&
+	 M foo.c
+	EOF
+	test_cache_tree expected.status
 
-ok 2 - local clone must not fetch from promisor remote and execute script
+[master d1075a6] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 foo.c
+           staged     unstaged path
+  1:    unchanged        +2/-2 foo.c
 
-expecting success of 0411.3 'clone from file://... must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git clone \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		"file://$(pwd)/evil" clone2 2>err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now>            staged     unstaged path
+  1:    unchanged        +2/-2 [f]oo.c
+Patch update>>            staged     unstaged path
+* 1:    unchanged        +2/-2 [f]oo.c
+Patch update>> diff --git a/foo.c b/foo.c
+index 75522e2..3f7f049 100644
+--- a/foo.c
++++ b/foo.c
+@@ -1,8 +1,8 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+-return 42;
++return 44;
+ }
+(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? Split into 2 hunks.
+@@ -1,6 +1,6 @@
+ int foo()
+ {
+-return 42;
++return 43;
+ }
+ int bar()
+ {
+(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,p,?]? @@ -4,5 +4,5 @@
+ }
+ int bar()
+ {
+-return 42;
++return 44;
+ }
+(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,p,?]? 
+*** Commands ***
+  1: [s]tatus	  2: [u]pdate	  3: [r]evert	  4: [a]dd untracked
+  5: [p]atch	  6: [d]iff	  7: [q]uit	  8: [h]elp
+What now> Bye.
+[master 65d7dde] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 65d7dde foo
+ok 10 - commit --interactive gives cache-tree on partial commit
 
-ok 3 - clone from file://... must not fetch from promisor remote and execute script
+expecting success of 0090.11 'commit -p with shrinking cache-tree': 
+	mkdir -p deep/very-long-subdir &&
+	echo content >deep/very-long-subdir/file &&
+	git add deep &&
+	git commit -m add &&
+	git rm -r deep &&
 
-expecting success of 0411.4 'fetch from file://... must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git fetch \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		"file://$(pwd)/evil" 2>err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
+	before=$(wc -c <.git/index) &&
+	git commit -m delete -p &&
+	after=$(wc -c <.git/index) &&
 
-ok 4 - fetch from file://... must not fetch from promisor remote and execute script
+	# double check that the index shrank
+	test $before -gt $after &&
 
-expecting success of 0411.5 'pack-objects should fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	echo "HEAD" | test_must_fail git -C evil pack-objects --revs --stdout >/dev/null 2>err &&
-	test_grep "fake-upload-pack running" err &&
-	test_path_is_file script-executed
+	# and that our index was not corrupted
+	git fsck
 
-fake-upload-pack running
-ok 5 - pack-objects should fetch from promisor remote and execute script
+[master 10c383a] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deep/very-long-subdir/file
+rm 'deep/very-long-subdir/file'
+No changes.
+[master 73c66c3] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 deep/very-long-subdir/file
+dangling blob d238b40d1657b1cc3ebd9a3c55ef04f303c694ae
+ok 11 - commit -p with shrinking cache-tree
 
-expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
-	rm -f script-executed &&
-	test_must_fail git clone evil no-lazy 2>err &&
-	test_grep "lazy fetching disabled" err &&
-	test_path_is_missing script-executed
+expecting success of 0090.12 'commit in child dir has cache-tree': 
+	mkdir dir &&
+	>dir/child.t &&
+	git add dir/child.t &&
+	git commit -m dir/child.t &&
+	test_cache_tree
 
-remote: warning: lazy fetching disabled; some objects may not be available        
-ok 6 - clone from promisor remote does not lazy-fetch by default
+[master d3413ee] dir/child.t
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/child.t
+ok 12 - commit in child dir has cache-tree
 
-expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
-	rm -f script-executed &&
-	test_must_fail env GIT_NO_LAZY_FETCH=0 \
-		git clone evil lazy-ok 2>err &&
-	test_grep "fake-upload-pack running" err &&
-	test_path_is_file script-executed
+expecting success of 0090.13 'reset --hard gives cache-tree': 
+	test-tool scrap-cache-tree &&
+	git reset --hard &&
+	test_cache_tree
 
-remote: fake-upload-pack running        
-ok 7 - promisor lazy-fetching can be re-enabled
+HEAD is now at d3413ee dir/child.t
+ok 13 - reset --hard gives cache-tree
 
-# passed all 7 test(s)
-1..7
+expecting success of 0090.14 'reset --hard without index gives cache-tree': 
+	rm -f .git/index &&
+	git clean -fd &&
+	git reset --hard &&
+	test_cache_tree
+
+Removing bar.t
+Removing dir/
+Removing expected.status
+Removing foo.c
+Removing foo.t
+Removing status
+HEAD is now at d3413ee dir/child.t
+ok 14 - reset --hard without index gives cache-tree
+
+expecting success of 0090.15 'checkout gives cache-tree': 
+	git tag current &&
+	git checkout HEAD^ &&
+	test_cache_tree
+
+Note: switching to 'HEAD^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 73c66c3 delete
+ok 15 - checkout gives cache-tree
+
+expecting success of 0090.16 'checkout -b gives cache-tree': 
+	git checkout current &&
+	git checkout -b prev HEAD^ &&
+	test_cache_tree
+
+Previous HEAD position was 73c66c3 delete
+HEAD is now at d3413ee dir/child.t
+Previous HEAD position was d3413ee dir/child.t
+Switched to a new branch 'prev'
+ok 16 - checkout -b gives cache-tree
+
+expecting success of 0090.17 'checkout -B gives cache-tree': 
+	git checkout current &&
+	git checkout -B prev HEAD^ &&
+	test_cache_tree
+
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Previous HEAD position was d3413ee dir/child.t
+Switched to and reset branch 'prev'
+ok 17 - checkout -B gives cache-tree
+
+expecting success of 0090.18 'merge --ff-only maintains cache-tree': 
+	git checkout current &&
+	git checkout -b changes &&
+	test_commit llamas &&
+	test_commit pachyderm &&
+	test_cache_tree &&
+	git checkout current &&
+	test_cache_tree &&
+	git merge --ff-only changes &&
+	test_cache_tree
+
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Switched to a new branch 'changes'
+[changes 229c856] llamas
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 llamas.t
+[changes f10d9f3] pachyderm
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pachyderm.t
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+Updating d3413ee..f10d9f3
+Fast-forward
+ llamas.t    | 1 +
+ pachyderm.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 llamas.t
+ create mode 100644 pachyderm.t
+ok 18 - merge --ff-only maintains cache-tree
+
+expecting success of 0090.19 'merge maintains cache-tree': 
+	git checkout current &&
+	git checkout -b changes2 &&
+	test_commit alpacas &&
+	test_cache_tree &&
+	git checkout current &&
+	test_commit struthio &&
+	test_cache_tree &&
+	git merge changes2 &&
+	test_cache_tree
+
+Previous HEAD position was f10d9f3 pachyderm
+HEAD is now at d3413ee dir/child.t
+Switched to a new branch 'changes2'
+[changes2 4b1575a] alpacas
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpacas.t
+Note: switching to 'current'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d3413ee dir/child.t
+[detached HEAD 5a63c6d] struthio
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 struthio.t
+Merge made by the 'ort' strategy.
+ alpacas.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 alpacas.t
+ok 19 - merge maintains cache-tree
+
+expecting success of 0090.20 'partial commit gives cache-tree': 
+	git checkout -b partial no-children &&
+	test_commit one &&
+	test_commit two &&
+	echo "some change" >one.t &&
+	git add one.t &&
+	echo "some other change" >two.t &&
+	git commit two.t -m partial &&
+	cat <<-\EOF >expected.status &&
+	M  one.t
+	EOF
+	test_cache_tree expected.status
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e104fa1 Merge branch 'changes2' into HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> e104fa1
+
+Switched to a new branch 'partial'
+[partial 6771940] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[partial cd7fad9] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[partial f24c7c2] partial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - partial commit gives cache-tree
+
+expecting success of 0090.21 'no phantom error when switching trees': 
+	mkdir newdir &&
+	>newdir/one &&
+	git add newdir/one &&
+	git checkout 2>errors &&
+	test_must_be_empty errors
+
+A	newdir/one
+M	one.t
+ok 21 - no phantom error when switching trees
+
+expecting success of 0090.22 'switching trees does not invalidate shared index': 
+	(
+		sane_unset GIT_TEST_SPLIT_INDEX &&
+		git update-index --split-index &&
+		>split &&
+		git add split &&
+		test-tool dump-split-index .git/index | grep -v ^own >before &&
+		git commit -m "as-is" &&
+		test-tool dump-split-index .git/index | grep -v ^own >after &&
+		test_cmp before after
+	)
+
+[partial dc7a831] as-is
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 newdir/one
+ create mode 100644 split
+ok 22 - switching trees does not invalidate shared index
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0211-trace2-perf.sh ***
@@ -28293,26 +28159,26 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-19:15:06.012476 common-init.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.49.0+next.20250314/git clone https://user:pwd@example.com/ clone2
-19:15:06.013937 config.c:3098|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
+13:17:13.699783 common-init.c:58|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.49.0+next.20250314/git clone https://user:pwd@example.com/ clone2
+13:17:13.709352 config.c:3098|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
 ok 10 - unsafe URLs are redacted by default
 
 expecting success of 0211.11 'expect def_params for normal builtin command': 
 	try_simple "git version" "version"
 
 git version 2.49.0.395.g12beb8f557c
-19:15:06.288039 git.c:477|d0|main|cmd_name|||||version (version)
-19:15:06.288124 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:06.288142 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:13.958720 git.c:477|d0|main|cmd_name|||||version (version)
+13:17:13.958805 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:13.958821 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 11 - expect def_params for normal builtin command
 
 expecting success of 0211.12 'expect def_params for query command': 
 	try_simple "git --man-path" "_query_"
 
 /usr/share/man
-19:15:06.573260 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
-19:15:06.573353 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:06.573370 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:14.251930 git.c:187|d0|main|cmd_name|||||_query_ (_query_)
+13:17:14.252013 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:14.252029 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 12 - expect def_params for query command
 
 expecting success of 0211.13 'expect def_params for remote-curl and _run_dashed_': 
@@ -28340,12 +28206,12 @@
 
 warning: url has no scheme: y/
 fatal: credential url cannot be parsed: y/
-19:15:06.844174 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-19:15:06.844231 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:06.844246 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-19:15:06.873914 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
-19:15:06.873938 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:06.873953 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:14.553651 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:17:14.553706 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:14.553721 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:14.608410 remote-curl.c:1573|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
+13:17:14.608433 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:14.608449 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 13 - expect def_params for remote-curl and _run_dashed_
 
 expecting success of 0211.14 'expect def_params for http-fetch and _run_dashed_': 
@@ -28372,12 +28238,12 @@
 	grep "d1|main|def_param|.*|cfg.prop.foo:red" actual &&
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
-19:15:07.160692 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-19:15:07.160747 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.160762 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-19:15:07.213362 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
-19:15:07.213384 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.213399 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.012558 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:17:15.012613 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.012628 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.067713 http-fetch.c:151|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
+13:17:15.067736 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.067751 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 14 - expect def_params for http-fetch and _run_dashed_
 
 expecting success of 0211.15 'expect def_params during git alias expansion': 
@@ -28415,13 +28281,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.49.0.395.g12beb8f557c
-19:15:07.526637 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-19:15:07.526824 git.c:823|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
-19:15:07.526697 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.526712 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-19:15:07.544074 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
-19:15:07.544155 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.544172 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.500229 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:17:15.500407 git.c:823|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
+13:17:15.500284 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.500299 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.510624 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
+13:17:15.510703 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.510720 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 15 - expect def_params during git alias expansion
 
 expecting success of 0211.16 'expect def_params during shell alias expansion': 
@@ -28462,13 +28328,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.49.0.395.g12beb8f557c
-19:15:07.869449 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-19:15:07.869683 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
-19:15:07.869503 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.869519 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-19:15:07.884113 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
-19:15:07.884197 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:07.884214 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.880018 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:17:15.880250 git.c:394|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
+13:17:15.880071 trace2.c:439|d0|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.880086 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:15.887825 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
+13:17:15.887908 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:15.887925 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 16 - expect def_params during shell alias expansion
 
 expecting success of 0211.17 'expect def_params during nested git alias expansion': 
@@ -28519,23 +28385,113 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.49.0.395.g12beb8f557c
-19:15:08.188803 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-19:15:08.188885 run-command.c:734|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
-19:15:08.188976 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
-19:15:08.189031 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
-19:15:08.189035 run-command.c:734|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
-19:15:08.189106 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
-19:15:08.189113 git.c:823|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
-19:15:08.188875 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-19:15:08.196068 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
-19:15:08.196147 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
-19:15:08.196164 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:16.316124 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+13:17:16.316207 run-command.c:734|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
+13:17:16.316295 git.c:424|d0|main|alias|||||alias:xxx argv:[yyy]
+13:17:16.316351 git.c:767|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
+13:17:16.316355 run-command.c:734|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
+13:17:16.316430 git.c:424|d0|main|alias|||||alias:yyy argv:[version]
+13:17:16.316437 git.c:823|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
+13:17:16.316197 trace2.c:440|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+13:17:16.334591 git.c:477|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
+13:17:16.334674 trace2.c:439|d1|main|def_param||||scope:global|cfg.prop.foo:red
+13:17:16.334691 trace2.c:440|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 17 - expect def_params during nested git alias expansion
 
 # passed all 17 test(s)
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0411-clone-from-partial.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0411-clone-from-partial/.git/
+expecting success of 0411.1 'create evil repo': 
+	git init tmp &&
+	test_commit -C tmp a &&
+	git -C tmp config uploadpack.allowfilter 1 &&
+	git clone --filter=blob:none --no-local --no-checkout tmp evil &&
+	rm -rf tmp &&
+
+	git -C evil config remote.origin.uploadpack \"\$TRASH_DIRECTORY/fake-upload-pack\" &&
+	write_script fake-upload-pack <<-\EOF &&
+		echo >&2 "fake-upload-pack running"
+		>"$TRASH_DIRECTORY/script-executed"
+		exit 1
+	EOF
+	export TRASH_DIRECTORY &&
+
+	# empty shallow file disables local clone optimization
+	>evil/.git/shallow
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0411-clone-from-partial/tmp/.git/
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Cloning into 'evil'...
+ok 1 - create evil repo
+
+expecting success of 0411.2 'local clone must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git clone \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		evil clone1 2>err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+ok 2 - local clone must not fetch from promisor remote and execute script
+
+expecting success of 0411.3 'clone from file://... must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git clone \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		"file://$(pwd)/evil" clone2 2>err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+ok 3 - clone from file://... must not fetch from promisor remote and execute script
+
+expecting success of 0411.4 'fetch from file://... must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git fetch \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		"file://$(pwd)/evil" 2>err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+ok 4 - fetch from file://... must not fetch from promisor remote and execute script
+
+expecting success of 0411.5 'pack-objects should fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	echo "HEAD" | test_must_fail git -C evil pack-objects --revs --stdout >/dev/null 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+fake-upload-pack running
+ok 5 - pack-objects should fetch from promisor remote and execute script
+
+expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
+	rm -f script-executed &&
+	test_must_fail git clone evil no-lazy 2>err &&
+	test_grep "lazy fetching disabled" err &&
+	test_path_is_missing script-executed
+
+remote: warning: lazy fetching disabled; some objects may not be available        
+ok 6 - clone from promisor remote does not lazy-fetch by default
+
+expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
+	rm -f script-executed &&
+	test_must_fail env GIT_NO_LAZY_FETCH=0 \
+		git clone evil lazy-ok 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+remote: fake-upload-pack running        
+ok 7 - promisor lazy-fetching can be re-enabled
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0500-progress-display.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0500-progress-display/.git/
 expecting success of 0500.1 'simple progress display': 
@@ -28863,10 +28819,10 @@
 	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
 	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
 
-{"event":"region_enter","sid":"20260419T191509.508272Z-H8d819085-P001a7d13","thread":"main","time":"2026-04-19T19:15:09.508699Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20260419T191509.508272Z-H8d819085-P001a7d13","thread":"main","time":"2026-04-19T19:15:09.508743Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000045,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"data","sid":"20260419T191509.508272Z-H8d819085-P001a7d13","thread":"main","time":"2026-04-19T19:15:09.508730Z","file":"progress.c","line":350,"repo":0,"t_abs":0.000669,"t_rel":0.000031,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
-{"event":"data","sid":"20260419T191509.508272Z-H8d819085-P001a7d13","thread":"main","time":"2026-04-19T19:15:09.508738Z","file":"progress.c","line":354,"repo":0,"t_abs":0.000678,"t_rel":0.000040,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
+{"event":"region_enter","sid":"20250317T131717.860946Z-H5c947e1c-P002d3676","thread":"main","time":"2025-03-17T13:17:17.861360Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20250317T131717.860946Z-H5c947e1c-P002d3676","thread":"main","time":"2025-03-17T13:17:17.861406Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000045,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"data","sid":"20250317T131717.860946Z-H5c947e1c-P002d3676","thread":"main","time":"2025-03-17T13:17:17.861392Z","file":"progress.c","line":350,"repo":0,"t_abs":0.000630,"t_rel":0.000031,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
+{"event":"data","sid":"20250317T131717.860946Z-H5c947e1c-P002d3676","thread":"main","time":"2025-03-17T13:17:17.861400Z","file":"progress.c","line":354,"repo":0,"t_abs":0.000639,"t_rel":0.000040,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
 ok 12 - progress generates traces
 
 expecting success of 0500.13 'progress generates traces: stop / start': 
@@ -28879,8 +28835,8 @@
 		<in 2>stderr &&
 	test_region progress "Working hard" trace-startstop.event
 
-{"event":"region_enter","sid":"20260419T191509.613997Z-H8d819085-P001a7d8d","thread":"main","time":"2026-04-19T19:15:09.614372Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20260419T191509.613997Z-H8d819085-P001a7d8d","thread":"main","time":"2026-04-19T19:15:09.614386Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000013,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20250317T131717.955833Z-H5c947e1c-P002d36ca","thread":"main","time":"2025-03-17T13:17:17.956197Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20250317T131717.955833Z-H5c947e1c-P002d36ca","thread":"main","time":"2025-03-17T13:17:17.956214Z","file":"progress.c","line":357,"repo":0,"t_rel":0.000017,"nesting":1,"category":"progress","label":"Working hard"}
 ok 13 - progress generates traces: stop / start
 
 expecting success of 0500.14 'progress generates traces: start without stop': 
@@ -28895,7 +28851,7 @@
 	grep region_enter.*progress trace-start.event &&
 	! grep region_leave.*progress trace-start.event
 
-{"event":"region_enter","sid":"20260419T191509.676929Z-H8d819085-P001a7db9","thread":"main","time":"2026-04-19T19:15:09.677328Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_enter","sid":"20250317T131718.023527Z-H5c947e1c-P002d370c","thread":"main","time":"2025-03-17T13:17:18.023871Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
 ok 14 - progress generates traces: start without stop
 
 expecting success of 0500.15 'progress generates traces: stop without start': 
@@ -28924,8 +28880,8 @@
 	grep region_enter.*progress.*Two trace-2start.event &&
 	! grep region_leave trace-2start.event
 
-{"event":"region_enter","sid":"20260419T191509.808982Z-H8d819085-P001a7e37","thread":"main","time":"2026-04-19T19:15:09.809349Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"One"}
-{"event":"region_enter","sid":"20260419T191509.808982Z-H8d819085-P001a7e37","thread":"main","time":"2026-04-19T19:15:09.809356Z","file":"progress.c","line":275,"repo":0,"nesting":2,"category":"progress","label":"Two"}
+{"event":"region_enter","sid":"20250317T131718.179723Z-H5c947e1c-P002d3789","thread":"main","time":"2025-03-17T13:17:18.180068Z","file":"progress.c","line":275,"repo":0,"nesting":1,"category":"progress","label":"One"}
+{"event":"region_enter","sid":"20250317T131718.179723Z-H5c947e1c-P002d3789","thread":"main","time":"2025-03-17T13:17:18.180072Z","file":"progress.c","line":275,"repo":0,"nesting":2,"category":"progress","label":"Two"}
 ok 16 - progress generates traces: start with active progress bar (no stops)
 
 # passed all 16 test(s)
@@ -30510,126 +30466,1836 @@
 1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0008-ignores.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0008-ignores/.git/
-expecting success of 0008.1 'setup': 
-	init_vars &&
-	mkdir -p a/b/ignored-dir a/submodule b &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s b a/symlink
-	fi &&
-	(
-		cd a/submodule &&
-		git init &&
-		echo a >a &&
-		git add a &&
-		git commit -m"commit in submodule"
-	) &&
-	git add a/submodule &&
-	cat <<-\EOF >.gitignore &&
-		one
-		ignored-*
-		top-level-dir/
-	EOF
-	for dir in . a
-	do
-		: >$dir/not-ignored &&
-		: >$dir/ignored-and-untracked &&
-		: >$dir/ignored-but-in-index || return 1
-	done &&
-	git add -f ignored-but-in-index a/ignored-but-in-index &&
-	cat <<-\EOF >a/.gitignore &&
-		two*
-		*three
-	EOF
-	cat <<-\EOF >a/b/.gitignore &&
-		four
-		five
-		# this comment should affect the line numbers
-		six
-		ignored-dir/
-		# and so should this blank line:
-
-		!on*
-		!two
-	EOF
-	echo "seven" >a/b/ignored-dir/.gitignore &&
-	test -n "$HOME" &&
-	cat <<-\EOF >"$global_excludes" &&
-		globalone
-		!globaltwo
-		globalthree
-	EOF
-	mkdir .git/info &&
-	cat <<-\EOF >.git/info/exclude
-		per-repo
-	EOF
-
-checking prerequisite: SYMLINKS
+*** t0611-reftable-httpd.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0611-reftable-httpd/.git/
+checking prerequisite: NOT_ROOT
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
 )
-prerequisite SYMLINKS ok
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0008-ignores/a/submodule/.git/
-[master (root-commit) d93acdf] commit in submodule
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0600-reffiles-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/
+expecting success of 0600.1 'setup': 
+	git commit --allow-empty -m Initial &&
+	C=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Second &&
+	D=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Third &&
+	E=$(git rev-parse HEAD)
+
+[main (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+[main e6940ad] Second
+ Author: A U Thor <author@example.com>
+[main c2327cb] Third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-warning: adding embedded git repository: a/submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> a/submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached a/submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
 ok 1 - setup
 
-expecting success of 0008.2 '. corner-case': 
-		expect "$expect" &&
-		eval "$code"
-	
-ok 2 - . corner-case
-
-expecting success of 0008.3 '. corner-case with -q': 
-			expect '' &&
-			
-	test_check_ignore . 1
+expecting success of 0600.2 'empty directory should not fool rev-parse': 
+	prefix=refs/e-rev-parse &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	echo "$C" >expected &&
+	git rev-parse $prefix/foo >actual &&
+	test_cmp expected actual
 
-		
-ok 3 - . corner-case with -q
+ok 2 - empty directory should not fool rev-parse
 
-expecting success of 0008.4 '. corner-case with --quiet': 
-			expect '' &&
-			
-	test_check_ignore . 1
+expecting success of 0600.3 'empty directory should not fool for-each-ref': 
+	prefix=refs/e-for-each-ref &&
+	git update-ref $prefix/foo $C &&
+	git for-each-ref $prefix >expected &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	git for-each-ref $prefix >actual &&
+	test_cmp expected actual
 
-		
-ok 4 - . corner-case with --quiet
+ok 3 - empty directory should not fool for-each-ref
 
-expecting success of 0008.5 '. corner-case with -v': 
-				expect '' &&
-				
-	test_check_ignore . 1
+expecting success of 0600.4 'empty directory should not fool create': 
+	prefix=refs/e-create &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "create %s $C\n" $prefix/foo |
+	git update-ref --stdin
 
-			
-ok 5 - . corner-case with -v
+ok 4 - empty directory should not fool create
 
-expecting success of 0008.6 '. corner-case with -v -n': 
-				expect '::	.' &&
+expecting success of 0600.5 'empty directory should not fool verify': 
+	prefix=refs/e-verify &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "verify %s $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 5 - empty directory should not fool verify
+
+expecting success of 0600.6 'empty directory should not fool 1-arg update': 
+	prefix=refs/e-update-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 6 - empty directory should not fool 1-arg update
+
+expecting success of 0600.7 'empty directory should not fool 2-arg update': 
+	prefix=refs/e-update-2 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 7 - empty directory should not fool 2-arg update
+
+expecting success of 0600.8 'empty directory should not fool 0-arg delete': 
+	prefix=refs/e-delete-0 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 8 - empty directory should not fool 0-arg delete
+
+expecting success of 0600.9 'empty directory should not fool 1-arg delete': 
+	prefix=refs/e-delete-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 9 - empty directory should not fool 1-arg delete
+
+expecting success of 0600.10 'non-empty directory blocks create': 
+	prefix=refs/ne-create &&
+	mkdir -p .git/$prefix/foo/bar &&
+	: >.git/$prefix/foo/bar/baz.lock &&
+	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/foo': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo'
+	EOF
+	printf "%s\n" "update $prefix/foo $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo'
+	EOF
+	printf "%s\n" "update $prefix/foo $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+
+ok 10 - non-empty directory blocks create
+
+expecting success of 0600.11 'broken reference blocks create': 
+	prefix=refs/broken-create &&
+	mkdir -p .git/$prefix &&
+	echo "gobbledigook" >.git/$prefix/foo &&
+	test_when_finished "rm -f .git/$prefix/foo" &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken
+	EOF
+	printf "%s\n" "update $prefix/foo $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken
+	EOF
+	printf "%s\n" "update $prefix/foo $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+
+ok 11 - broken reference blocks create
+
+expecting success of 0600.12 'non-empty directory blocks indirect create': 
+	prefix=refs/ne-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	mkdir -p .git/$prefix/foo/bar &&
+	: >.git/$prefix/foo/bar/baz.lock &&
+	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/symref': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo'
+	EOF
+	printf "%s\n" "update $prefix/symref $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo'
+	EOF
+	printf "%s\n" "update $prefix/symref $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+
+ok 12 - non-empty directory blocks indirect create
+
+expecting success of 0600.13 'broken reference blocks indirect create': 
+	prefix=refs/broken-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	echo "gobbledigook" >.git/$prefix/foo &&
+	test_when_finished "rm -f .git/$prefix/foo" &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken
+	EOF
+	printf "%s\n" "update $prefix/symref $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken
+	EOF
+	printf "%s\n" "update $prefix/symref $D $C" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
+
+ok 13 - broken reference blocks indirect create
+
+expecting success of 0600.14 'no bogus intermediate values during delete': 
+	prefix=refs/slow-transaction &&
+	# Set up a reference with differing loose and packed versions:
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	# Now try to update the reference, but hold the `packed-refs` lock
+	# for a while to see what happens while the process is blocked:
+	: >.git/packed-refs.lock &&
+	test_when_finished "rm -f .git/packed-refs.lock" &&
+	{
+		# Note: the following command is intentionally run in the
+		# background. We increase the timeout so that `update-ref`
+		# attempts to acquire the `packed-refs` lock for much longer
+		# than it takes for us to do the check then delete it:
+		git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo &
+	} &&
+	pid2=$! &&
+	# Give update-ref plenty of time to get to the point where it tries
+	# to lock packed-refs:
+	sleep 1 &&
+	# Make sure that update-ref did not complete despite the lock:
+	kill -0 $pid2 &&
+	# Verify that the reference still has its old value:
+	sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
+	case "$sha1" in
+	$D)
+		# This is what we hope for; it means that nothing
+		# user-visible has changed yet.
+		: ;;
+	undefined)
+		# This is not correct; it means the deletion has happened
+		# already even though update-ref should not have been
+		# able to acquire the lock yet.
+		echo "$prefix/foo deleted prematurely" &&
+		break
+		;;
+	$C)
+		# This value should never be seen. Probably the loose
+		# reference has been deleted but the packed reference
+		# is still there:
+		echo "$prefix/foo incorrectly observed to be C" &&
+		break
+		;;
+	*)
+		# WTF?
+		echo "unexpected value observed for $prefix/foo: $sha1" &&
+		break
+		;;
+	esac >out &&
+	rm -f .git/packed-refs.lock &&
+	wait $pid2 &&
+	test_must_be_empty out &&
+	test_must_fail git rev-parse --verify --quiet $prefix/foo
+
+ok 14 - no bogus intermediate values during delete
+
+expecting success of 0600.15 'delete fails cleanly if packed-refs file is locked': 
+	prefix=refs/locked-packed-refs &&
+	# Set up a reference with differing loose and packed versions:
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	git for-each-ref $prefix >unchanged &&
+	# Now try to delete it while the `packed-refs` lock is held:
+	: >.git/packed-refs.lock &&
+	test_when_finished "rm -f .git/packed-refs.lock" &&
+	test_must_fail git update-ref -d $prefix/foo >out 2>err &&
+	git for-each-ref $prefix >actual &&
+	test_grep "Unable to create '.*packed-refs.lock': " err &&
+	test_cmp unchanged actual
+
+error: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
+ok 15 - delete fails cleanly if packed-refs file is locked
+
+expecting success of 0600.16 'delete fails cleanly if packed-refs.new write fails': 
+	# Setup and expectations are similar to the test above.
+	prefix=refs/failed-packed-refs &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	git for-each-ref $prefix >unchanged &&
+	# This should not happen in practice, but it is an easy way to get a
+	# reliable error (we open with create_tempfile(), which uses O_EXCL).
+	: >.git/packed-refs.new &&
+	test_when_finished "rm -f .git/packed-refs.new" &&
+	test_must_fail git update-ref -d $prefix/foo &&
+	git for-each-ref $prefix >actual &&
+	test_cmp unchanged actual
+
+error: unable to create file /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
+ok 16 - delete fails cleanly if packed-refs.new write fails
+
+expecting success of 0600.17 'setup worktree': 
+	test_commit first &&
+	git worktree add -b wt-main wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
+
+[main 89a3a1d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'wt-main')
+HEAD is now at 89a3a1d first
+[wt-main da840b1] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 17 - setup worktree
+
+expecting success of 0600.18 'for_each_reflog()': 
+	echo $ZERO_OID >.git/logs/PSEUDO_MAIN_HEAD &&
+	mkdir -p     .git/logs/refs/bisect &&
+	echo $ZERO_OID >.git/logs/refs/bisect/random &&
+
+	echo $ZERO_OID >.git/worktrees/wt/logs/PSEUDO_WT_HEAD &&
+	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
+	echo $ZERO_OID >.git/worktrees/wt/logs/refs/bisect/wt-random &&
+
+	$RWT for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	PSEUDO_WT_HEAD
+	refs/bisect/wt-random
+	refs/heads/main
+	refs/heads/wt-main
+	EOF
+	test_cmp expected actual &&
+
+	$RMAIN for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	PSEUDO_MAIN_HEAD
+	refs/bisect/random
+	refs/heads/main
+	refs/heads/wt-main
+	EOF
+	test_cmp expected actual
+
+ok 18 - for_each_reflog()
+
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+	case "$GIT_DEFAULT_HASH" in
+	sha1) true ;;
+	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
+	*) false ;;
+	esac
+
+)
+prerequisite SHA1 ok
+expecting success of 0600.19 'parsing reverse reflogs at BUFSIZ boundaries': 
+	git checkout -b reflogskip &&
+	zf=$(test_oid zero_2) &&
+	ident="abc <xyz> 0000000001 +0000" &&
+	for i in $(test_seq 1 75); do
+		printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
+		if test $i = 75; then
+			for j in $(test_seq 1 89); do
+				printf X || return 1
+			done
+		else
+			printf X
+		fi &&
+		printf "\n" || return 1
+	done >.git/logs/refs/heads/reflogskip &&
+	git rev-parse reflogskip@{73} >actual &&
+	echo ${zf}03 >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'reflogskip'
+ok 19 - parsing reverse reflogs at BUFSIZ boundaries
+
+expecting success of 0600.20 'reflog expire operates on symref not referrent': 
+	git branch --create-reflog the_symref &&
+	git branch --create-reflog referrent &&
+	git update-ref referrent HEAD &&
+	git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
+	test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
+	touch .git/refs/heads/referrent.lock &&
+	git reflog expire --expire=all the_symref
+
+ok 20 - reflog expire operates on symref not referrent
+
+expecting success of 0600.21 'empty reflog': 
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	test_commit -C empty A &&
+	>empty/.git/logs/refs/heads/foo &&
+	git -C empty reflog expire --all 2>err &&
+	test_must_be_empty err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
+[main (root-commit) 508df12] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 21 - empty reflog
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0600.22 'ref resolution not confused by broken symlinks': 
+       ln -s does-not-exist .git/refs/heads/broken &&
+       test_must_fail git rev-parse --verify broken
+
+fatal: Needed a single revision
+ok 22 - ref resolution not confused by broken symlinks
+
+expecting success of 0600.23 'log diagnoses bogus HEAD hash': 
+	git init empty &&
+	test_when_finished "rm -rf empty" &&
+	echo 1234abcd >empty/.git/refs/heads/main &&
+	test_must_fail git -C empty log 2>stderr &&
+	test_grep broken stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
+fatal: your current branch appears to be broken
+ok 23 - log diagnoses bogus HEAD hash
+
+expecting success of 0600.24 'log diagnoses bogus HEAD symref': 
+	git init empty &&
+	test-tool -C empty ref-store main create-symref HEAD refs/heads/invalid.lock &&
+	test_must_fail git -C empty log 2>stderr &&
+	test_grep broken stderr &&
+	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
+	test_grep broken stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
+fatal: your current branch appears to be broken
+fatal: your current branch appears to be broken
+ok 24 - log diagnoses bogus HEAD symref
+
+expecting success of 0600.25 'empty directory removal': 
+	git branch d1/d2/r1 HEAD &&
+	git branch d1/r2 HEAD &&
+	test_path_is_file .git/refs/heads/d1/d2/r1 &&
+	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
+	git branch -d d1/d2/r1 &&
+	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
+	test_path_is_file .git/refs/heads/d1/r2 &&
+	test_path_is_file .git/logs/refs/heads/d1/r2
+
+Deleted branch d1/d2/r1 (was 89a3a1d).
+ok 25 - empty directory removal
+
+expecting success of 0600.26 'symref empty directory removal': 
+	git branch e1/e2/r1 HEAD &&
+	git branch e1/r2 HEAD &&
+	git checkout e1/e2/r1 &&
+	test_when_finished "git checkout main" &&
+	test_path_is_file .git/refs/heads/e1/e2/r1 &&
+	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
+	git update-ref -d HEAD &&
+	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
+	test_path_is_file .git/refs/heads/e1/r2 &&
+	test_path_is_file .git/logs/refs/heads/e1/r2 &&
+	test_path_is_file .git/logs/HEAD
+
+Switched to branch 'e1/e2/r1'
+Switched to branch 'main'
+ok 26 - symref empty directory removal
+
+expecting success of 0600.27 'directory not created deleting packed ref': 
+	git branch d1/d2/r1 HEAD &&
+	git pack-refs --all &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	git update-ref -d refs/heads/d1/d2/r1 &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	test_path_is_missing .git/refs/heads/d1
+
+ok 27 - directory not created deleting packed ref
+
+expecting success of 0600.28 'git branch -m u v should fail when the reflog for u is a symlink': 
+	git branch --create-reflog u &&
+	mv .git/logs/refs/heads/u real-u &&
+	ln -s real-u .git/logs/refs/heads/u &&
+	test_must_fail git branch -m u v
+
+error: reflog for refs/heads/u is a symlink
+fatal: branch rename failed
+ok 28 - git branch -m u v should fail when the reflog for u is a symlink
+
+expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
+	test_when_finished "rm -rf subdir" &&
+	git init --bare subdir &&
+
+	rm -rf subdir/refs subdir/objects subdir/packed-refs &&
+	ln -s ../.git/refs subdir/refs &&
+	ln -s ../.git/objects subdir/objects &&
+	ln -s ../.git/packed-refs subdir/packed-refs &&
+
+	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
+	git rev-parse --absolute-git-dir >our.dir &&
+	! test_cmp subdir.dir our.dir &&
+
+	git -C subdir log &&
+	git -C subdir branch rename-src &&
+	git rev-parse rename-src >expect &&
+	git -C subdir branch -m rename-src rename-dest &&
+	git rev-parse rename-dest >actual &&
+	test_cmp expect actual &&
+	git branch -D rename-dest
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/subdir/
+--- subdir.dir	2025-03-17 13:17:23.699209288 +0000
++++ our.dir	2025-03-17 13:17:23.719209415 +0000
+@@ -1 +1 @@
+-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/subdir
++/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git
+commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit c2327cb6b086a944f739ef59ddcffd3d45998884
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third
+
+commit e6940ad615916edba236dd73cb432b3598c8537f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Second
+
+commit d31adcd248e1f85d12741183d231fa5260dcfd5e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Initial
+Deleted branch rename-dest (was 89a3a1d).
+ok 29 - git branch -m with symlinked .git/refs
+
+checking prerequisite: SYMLINKS_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+	# test whether symbolic links are enabled on Windows
+	test_have_prereq MINGW &&
+	cmd //c "mklink y x" &> /dev/null && test -h y
+
+)
+prerequisite SYMLINKS_WINDOWS not satisfied
+ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
+
+expecting success of 0600.31 'git reflog expire honors core.sharedRepository': 
+	umask 077 &&
+	git config core.sharedRepository group &&
+	git reflog expire --all &&
+	actual="$(ls -l .git/logs/refs/heads/main)" &&
+	case "$actual" in
+	-rw-rw-*)
+		: happy
+		;;
+	*)
+		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
+		false
+		;;
+	esac
+
+ok 31 - git reflog expire honors core.sharedRepository
+
+expecting success of 0600.32 'symref transaction supports symlinks': 
+	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
+	git update-ref refs/heads/new @ &&
+	test_config core.prefersymlinkrefs true &&
+	cat >stdin <<-EOF &&
+	start
+	symref-create TEST_SYMREF_HEAD refs/heads/new
+	prepare
+	commit
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	test_path_is_symlink .git/TEST_SYMREF_HEAD &&
+	test "$(test_readlink .git/TEST_SYMREF_HEAD)" = refs/heads/new
+
+start: ok
+prepare: ok
+commit: ok
+ok 32 - symref transaction supports symlinks
+
+expecting success of 0600.33 'symref transaction supports false symlink config': 
+	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
+	git update-ref refs/heads/new @ &&
+	test_config core.prefersymlinkrefs false &&
+	cat >stdin <<-EOF &&
+	start
+	symref-create TEST_SYMREF_HEAD refs/heads/new
+	prepare
+	commit
+	EOF
+	git update-ref --no-deref --stdin <stdin &&
+	test_path_is_file .git/TEST_SYMREF_HEAD &&
+	git symbolic-ref TEST_SYMREF_HEAD >actual &&
+	echo refs/heads/new >expect &&
+	test_cmp expect actual
+
+start: ok
+prepare: ok
+commit: ok
+ok 33 - symref transaction supports false symlink config
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0612-reftable-jgit-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0612-reftable-jgit-compatibility/.git/
+checking prerequisite: JGIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
+	jgit --version
+
+)
+./test-lib.sh: line 1010: jgit: command not found
+prerequisite JGIT not satisfied
+1..0 # SKIP skipping reftable JGit tests; JGit is not present in PATH
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0301-credential-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0301-credential-cache/.git/
+expecting success of 0301.1 'helper (cache) has no existing data': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 1 - helper (cache) has no existing data
+
+expecting success of 0301.2 'helper (cache) stores password': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		EOF
+	
+ok 2 - helper (cache) stores password
+
+expecting success of 0301.3 'helper (cache) can retrieve password': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		--
+		EOF
+	
+ok 3 - helper (cache) can retrieve password
+
+expecting success of 0301.4 'helper (cache) requires matching protocol': 
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=example.com
+		--
+		protocol=http
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://example.com':
+		askpass: Password for 'http://askpass-username@example.com':
+		EOF
+	
+ok 4 - helper (cache) requires matching protocol
+
+expecting success of 0301.5 'helper (cache) requires matching host': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=other.tld
+		--
+		protocol=https
+		host=other.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://other.tld':
+		askpass: Password for 'https://askpass-username@other.tld':
+		EOF
+	
+ok 5 - helper (cache) requires matching host
+
+expecting success of 0301.6 'helper (cache) requires matching username': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=other
+		--
+		protocol=https
+		host=example.com
+		username=other
+		password=askpass-password
+		--
+		askpass: Password for 'https://other@example.com':
+		EOF
+	
+ok 6 - helper (cache) requires matching username
+
+expecting success of 0301.7 'helper (cache) requires matching path': 
+		test_config credential.usehttppath true &&
+		check approve $HELPER <<-\EOF &&
+		protocol=http
+		host=path.tld
+		path=foo.git
+		username=user
+		password=pass
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=path.tld
+		path=bar.git
+		--
+		protocol=http
+		host=path.tld
+		path=bar.git
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://path.tld/bar.git':
+		askpass: Password for 'http://askpass-username@path.tld/bar.git':
+		EOF
+	
+ok 7 - helper (cache) requires matching path
+
+expecting success of 0301.8 'helper (cache) overwrites on store': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-overwrite@example.com':
+		EOF
+	
+ok 8 - helper (cache) overwrites on store
+
+expecting success of 0301.9 'helper (cache) can forget host': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 9 - helper (cache) can forget host
+
+expecting success of 0301.10 'helper (cache) can store multiple users': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 10 - helper (cache) can store multiple users
+
+expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		--
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+	
+ok 11 - helper (cache) does not erase a password distinct from input
+
+expecting success of 0301.12 'helper (cache) can forget user': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=askpass-password
+		--
+		askpass: Password for 'https://user1@example.com':
+		EOF
+	
+ok 12 - helper (cache) can forget user
+
+expecting success of 0301.13 'helper (cache) remembers other user': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 13 - helper (cache) remembers other user
+
+expecting success of 0301.14 'helper (cache) can store empty username': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=sso.tld
+		--
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+	
+ok 14 - helper (cache) can store empty username
+
+expecting success of 0301.15 'helper (cache) erases all matching credentials': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase2
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 15 - helper (cache) erases all matching credentials
+
+expecting success of 0301.16 'helper (cache) not confused by long header': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=victim.example.com
+		username=user
+		password=to-be-stolen
+		EOF
+
+		check fill $HELPER <<-EOF
+		protocol=https
+		host=badguy.example.com
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		protocol=https
+		host=badguy.example.com
+		username=askpass-username
+		password=askpass-password
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		askpass: Username for 'https://badguy.example.com':
+		askpass: Password for 'https://askpass-username@badguy.example.com':
+		EOF
+	
+ok 16 - helper (cache) not confused by long header
+
+expecting success of 0301.17 'helper (cache) stores password_expiry_utc': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		EOF
+	
+ok 17 - helper (cache) stores password_expiry_utc
+
+expecting success of 0301.18 'helper (cache) gets password_expiry_utc': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry
+		password=pass
+		password_expiry_utc=9999999999
+		--
+		EOF
+	
+ok 18 - helper (cache) gets password_expiry_utc
+
+expecting success of 0301.19 'helper (cache) overwrites when password_expiry_utc changes': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass1
+		password_expiry_utc=9999999998
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		password_expiry_utc=9999999999
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-expiry-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-expiry-overwrite@example.com':
+		EOF
+	
+ok 19 - helper (cache) overwrites when password_expiry_utc changes
+
+expecting success of 0301.20 'helper (cache) stores oauth_refresh_token': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		EOF
+	
+ok 20 - helper (cache) stores oauth_refresh_token
+
+expecting success of 0301.21 'helper (cache) gets oauth_refresh_token': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user4
+		--
+		protocol=https
+		host=example.com
+		username=user4
+		password=pass
+		oauth_refresh_token=xyzzy
+		--
+		EOF
+	
+ok 21 - helper (cache) gets oauth_refresh_token
+
+expecting success of 0301.22 'helper (cache) stores authtype and credential': 
+		check approve $HELPER <<-\EOF
+		capability[]=authtype
+		authtype=Bearer
+		credential=random-token
+		protocol=https
+		host=git.example.com
+		EOF
+	
+ok 22 - helper (cache) stores authtype and credential
+
+expecting success of 0301.23 'helper (cache) gets authtype and credential': 
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git.example.com
+		--
+		capability[]=authtype
+		authtype=Bearer
+		credential=random-token
+		protocol=https
+		host=git.example.com
+		--
+		EOF
+	
+ok 23 - helper (cache) gets authtype and credential
+
+expecting success of 0301.24 'helper (cache) gets authtype and credential only if request has authtype capability': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=git.example.com
+		--
+		protocol=https
+		host=git.example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://git.example.com':
+		askpass: Password for 'https://askpass-username@git.example.com':
+		EOF
+	
+ok 24 - helper (cache) gets authtype and credential only if request has authtype capability
+
+expecting success of 0301.25 'helper (cache) stores authtype and credential with username': 
+		check approve $HELPER <<-\EOF
+		capability[]=authtype
+		authtype=Bearer
+		credential=other-token
+		protocol=https
+		host=git.example.com
+		username=foobar
+		EOF
+	
+ok 25 - helper (cache) stores authtype and credential with username
+
+expecting success of 0301.26 'helper (cache) gets authtype and credential with username': 
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git.example.com
+		username=foobar
+		--
+		capability[]=authtype
+		authtype=Bearer
+		credential=other-token
+		protocol=https
+		host=git.example.com
+		username=foobar
+		--
+		EOF
+	
+ok 26 - helper (cache) gets authtype and credential with username
+
+expecting success of 0301.27 'helper (cache) does not get authtype and credential with different username': 
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git.example.com
+		username=barbaz
+		--
+		protocol=https
+		host=git.example.com
+		username=barbaz
+		password=askpass-password
+		--
+		askpass: Password for 'https://barbaz@git.example.com':
+		EOF
+	
+ok 27 - helper (cache) does not get authtype and credential with different username
+
+expecting success of 0301.28 'helper (cache) does not store ephemeral authtype and credential': 
+		check approve $HELPER <<-\EOF &&
+		capability[]=authtype
+		authtype=Bearer
+		credential=git2-token
+		protocol=https
+		host=git2.example.com
+		ephemeral=1
+		EOF
+
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		--
+		protocol=https
+		host=git2.example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://git2.example.com':
+		askpass: Password for 'https://askpass-username@git2.example.com':
+		EOF
+	
+ok 28 - helper (cache) does not store ephemeral authtype and credential
+
+expecting success of 0301.29 'helper (cache) does not store ephemeral username and password': 
+		check approve $HELPER <<-\EOF &&
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		user=barbaz
+		password=secret
+		ephemeral=1
+		EOF
+
+		check fill $HELPER <<-\EOF
+		capability[]=authtype
+		protocol=https
+		host=git2.example.com
+		--
+		protocol=https
+		host=git2.example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://git2.example.com':
+		askpass: Password for 'https://askpass-username@git2.example.com':
+		EOF
+	
+ok 29 - helper (cache) does not store ephemeral username and password
+
+expecting success of 0301.30 'socket defaults to ~/.cache/git/credential/socket': 
+	test_when_finished "
+		git credential-cache exit &&
+		rmdir -p .cache/git/credential/
+	" &&
+	test_path_is_missing "$HOME/.git-credential-cache" &&
+	test_path_is_socket "$HOME/.cache/git/credential/socket"
+
+ok 30 - socket defaults to ~/.cache/git/credential/socket
+
+expecting success of 0301.31 'helper (cache) has no existing data': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 31 - helper (cache) has no existing data
+
+expecting success of 0301.32 'helper (cache) stores password': 
+		check approve $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		EOF
+	
+ok 32 - helper (cache) stores password
+
+expecting success of 0301.33 'helper (cache) can retrieve password': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=store-user
+		password=store-pass
+		--
+		EOF
+	
+ok 33 - helper (cache) can retrieve password
+
+expecting success of 0301.34 'helper (cache) requires matching protocol': 
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=example.com
+		--
+		protocol=http
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://example.com':
+		askpass: Password for 'http://askpass-username@example.com':
+		EOF
+	
+ok 34 - helper (cache) requires matching protocol
+
+expecting success of 0301.35 'helper (cache) requires matching host': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=other.tld
+		--
+		protocol=https
+		host=other.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://other.tld':
+		askpass: Password for 'https://askpass-username@other.tld':
+		EOF
+	
+ok 35 - helper (cache) requires matching host
+
+expecting success of 0301.36 'helper (cache) requires matching username': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=other
+		--
+		protocol=https
+		host=example.com
+		username=other
+		password=askpass-password
+		--
+		askpass: Password for 'https://other@example.com':
+		EOF
+	
+ok 36 - helper (cache) requires matching username
+
+expecting success of 0301.37 'helper (cache) requires matching path': 
+		test_config credential.usehttppath true &&
+		check approve $HELPER <<-\EOF &&
+		protocol=http
+		host=path.tld
+		path=foo.git
+		username=user
+		password=pass
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=http
+		host=path.tld
+		path=bar.git
+		--
+		protocol=http
+		host=path.tld
+		path=bar.git
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'http://path.tld/bar.git':
+		askpass: Password for 'http://askpass-username@path.tld/bar.git':
+		EOF
+	
+ok 37 - helper (cache) requires matching path
+
+expecting success of 0301.38 'helper (cache) overwrites on store': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		--
+		protocol=https
+		host=example.com
+		username=user-overwrite
+		password=askpass-password
+		--
+		askpass: Password for 'https://user-overwrite@example.com':
+		EOF
+	
+ok 38 - helper (cache) overwrites on store
+
+expecting success of 0301.39 'helper (cache) can forget host': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 39 - helper (cache) can forget host
+
+expecting success of 0301.40 'helper (cache) can store multiple users': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=pass1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 40 - helper (cache) can store multiple users
+
+expecting success of 0301.41 'helper (cache) does not erase a password distinct from input': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass2
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		--
+		protocol=https
+		host=example.com
+		username=user-distinct-pass
+		password=pass1
+		EOF
+	
+ok 41 - helper (cache) does not erase a password distinct from input
+
+expecting success of 0301.42 'helper (cache) can forget user': 
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user1
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user1
+		--
+		protocol=https
+		host=example.com
+		username=user1
+		password=askpass-password
+		--
+		askpass: Password for 'https://user1@example.com':
+		EOF
+	
+ok 42 - helper (cache) can forget user
+
+expecting success of 0301.43 'helper (cache) remembers other user': 
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		username=user2
+		--
+		protocol=https
+		host=example.com
+		username=user2
+		password=pass2
+		EOF
+	
+ok 43 - helper (cache) remembers other user
+
+expecting success of 0301.44 'helper (cache) can store empty username': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=sso.tld
+		--
+		protocol=https
+		host=sso.tld
+		username=
+		password=
+		EOF
+	
+ok 44 - helper (cache) can store empty username
+
+expecting success of 0301.45 'helper (cache) erases all matching credentials': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase1
+		password=pass1
+		EOF
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		username=user-erase2
+		password=pass1
+		EOF
+		check reject $HELPER <<-\EOF &&
+		protocol=https
+		host=example.com
+		EOF
+		check fill $HELPER <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		EOF
+	
+ok 45 - helper (cache) erases all matching credentials
+
+expecting success of 0301.46 'helper (cache) not confused by long header': 
+		check approve $HELPER <<-\EOF &&
+		protocol=https
+		host=victim.example.com
+		username=user
+		password=to-be-stolen
+		EOF
+
+		check fill $HELPER <<-EOF
+		protocol=https
+		host=badguy.example.com
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		protocol=https
+		host=badguy.example.com
+		username=askpass-username
+		password=askpass-password
+		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
+		--
+		askpass: Username for 'https://badguy.example.com':
+		askpass: Password for 'https://askpass-username@badguy.example.com':
+		EOF
+	
+ok 46 - helper (cache) not confused by long header
+
+expecting success of 0301.47 'use custom XDG_CACHE_HOME if set and default sockets are not created': 
+	test_when_finished "git credential-cache exit" &&
+	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket" &&
+	test_path_is_missing "$HOME/.git-credential-cache/socket" &&
+	test_path_is_missing "$HOME/.cache/git/credential/socket"
+
+ok 47 - use custom XDG_CACHE_HOME if set and default sockets are not created
+
+expecting success of 0301.48 'credential-cache --socket option overrides default location': 
+	test_when_finished "
+		git credential-cache exit --socket \"\$HOME/dir/socket\" &&
+		rmdir \"\$HOME/dir\"
+	" &&
+	check approve "cache --socket \"\$HOME/dir/socket\"" <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	test_path_is_socket "$HOME/dir/socket"
+
+ok 48 - credential-cache --socket option overrides default location
+
+expecting success of 0301.49 'use custom XDG_CACHE_HOME even if xdg socket exists': 
+	test_when_finished "
+		git credential-cache exit &&
+		sane_unset XDG_CACHE_HOME
+	" &&
+	check approve cache <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	test_path_is_socket "$HOME/.cache/git/credential/socket" &&
+	XDG_CACHE_HOME="$HOME/xdg" &&
+	export XDG_CACHE_HOME &&
+	check approve cache <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
+
+ok 49 - use custom XDG_CACHE_HOME even if xdg socket exists
+
+expecting success of 0301.50 'use user socket if user directory exists': 
+	test_when_finished "
+		git credential-cache exit &&
+		rmdir \"\$HOME/.git-credential-cache/\"
+	" &&
+	mkdir -p "$HOME/.git-credential-cache/" &&
+	chmod 700 "$HOME/.git-credential-cache/" &&
+	check approve cache <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
+
+ok 50 - use user socket if user directory exists
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0301.51 'use user socket if user directory is a symlink to a directory': 
+	test_when_finished "
+		git credential-cache exit &&
+		rmdir \"\$HOME/dir/\" &&
+		rm \"\$HOME/.git-credential-cache\"
+	" &&
+	mkdir -p -m 700 "$HOME/dir/" &&
+	ln -s "$HOME/dir" "$HOME/.git-credential-cache" &&
+	check approve cache <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
+
+ok 51 - use user socket if user directory is a symlink to a directory
+
+expecting success of 0301.52 'helper (cache --timeout=1) times out': 
+		check approve "$HELPER" <<-\EOF &&
+		protocol=https
+		host=timeout.tld
+		username=user
+		password=pass
+		EOF
+		sleep 2 &&
+		check fill "$HELPER" <<-\EOF
+		protocol=https
+		host=timeout.tld
+		--
+		protocol=https
+		host=timeout.tld
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://timeout.tld':
+		askpass: Password for 'https://askpass-username@timeout.tld':
+		EOF
+	
+ok 52 - helper (cache --timeout=1) times out
+
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0008-ignores.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0008-ignores/.git/
+expecting success of 0008.1 'setup': 
+	init_vars &&
+	mkdir -p a/b/ignored-dir a/submodule b &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s b a/symlink
+	fi &&
+	(
+		cd a/submodule &&
+		git init &&
+		echo a >a &&
+		git add a &&
+		git commit -m"commit in submodule"
+	) &&
+	git add a/submodule &&
+	cat <<-\EOF >.gitignore &&
+		one
+		ignored-*
+		top-level-dir/
+	EOF
+	for dir in . a
+	do
+		: >$dir/not-ignored &&
+		: >$dir/ignored-and-untracked &&
+		: >$dir/ignored-but-in-index || return 1
+	done &&
+	git add -f ignored-but-in-index a/ignored-but-in-index &&
+	cat <<-\EOF >a/.gitignore &&
+		two*
+		*three
+	EOF
+	cat <<-\EOF >a/b/.gitignore &&
+		four
+		five
+		# this comment should affect the line numbers
+		six
+		ignored-dir/
+		# and so should this blank line:
+
+		!on*
+		!two
+	EOF
+	echo "seven" >a/b/ignored-dir/.gitignore &&
+	test -n "$HOME" &&
+	cat <<-\EOF >"$global_excludes" &&
+		globalone
+		!globaltwo
+		globalthree
+	EOF
+	mkdir .git/info &&
+	cat <<-\EOF >.git/info/exclude
+		per-repo
+	EOF
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0008-ignores/a/submodule/.git/
+[master (root-commit) d93acdf] commit in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+warning: adding embedded git repository: a/submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> a/submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached a/submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 1 - setup
+
+expecting success of 0008.2 '. corner-case': 
+		expect "$expect" &&
+		eval "$code"
+	
+ok 2 - . corner-case
+
+expecting success of 0008.3 '. corner-case with -q': 
+			expect '' &&
+			
+	test_check_ignore . 1
+
+		
+ok 3 - . corner-case with -q
+
+expecting success of 0008.4 '. corner-case with --quiet': 
+			expect '' &&
+			
+	test_check_ignore . 1
+
+		
+ok 4 - . corner-case with --quiet
+
+expecting success of 0008.5 '. corner-case with -v': 
+				expect '' &&
+				
+	test_check_ignore . 1
+
+			
+ok 5 - . corner-case with -v
+
+expecting success of 0008.6 '. corner-case with -v -n': 
+				expect '::	.' &&
 				
 	test_check_ignore . 1
 
@@ -33891,1302 +35557,9 @@
 1..397
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0611-reftable-httpd.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0611-reftable-httpd/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0600-reffiles-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/
-expecting success of 0600.1 'setup': 
-	git commit --allow-empty -m Initial &&
-	C=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m Second &&
-	D=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m Third &&
-	E=$(git rev-parse HEAD)
-
-[main (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-[main e6940ad] Second
- Author: A U Thor <author@example.com>
-[main c2327cb] Third
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 0600.2 'empty directory should not fool rev-parse': 
-	prefix=refs/e-rev-parse &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	echo "$C" >expected &&
-	git rev-parse $prefix/foo >actual &&
-	test_cmp expected actual
-
-ok 2 - empty directory should not fool rev-parse
-
-expecting success of 0600.3 'empty directory should not fool for-each-ref': 
-	prefix=refs/e-for-each-ref &&
-	git update-ref $prefix/foo $C &&
-	git for-each-ref $prefix >expected &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	git for-each-ref $prefix >actual &&
-	test_cmp expected actual
-
-ok 3 - empty directory should not fool for-each-ref
-
-expecting success of 0600.4 'empty directory should not fool create': 
-	prefix=refs/e-create &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "create %s $C\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 4 - empty directory should not fool create
-
-expecting success of 0600.5 'empty directory should not fool verify': 
-	prefix=refs/e-verify &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "verify %s $C\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 5 - empty directory should not fool verify
-
-expecting success of 0600.6 'empty directory should not fool 1-arg update': 
-	prefix=refs/e-update-1 &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "update %s $D\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 6 - empty directory should not fool 1-arg update
-
-expecting success of 0600.7 'empty directory should not fool 2-arg update': 
-	prefix=refs/e-update-2 &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "update %s $D $C\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 7 - empty directory should not fool 2-arg update
-
-expecting success of 0600.8 'empty directory should not fool 0-arg delete': 
-	prefix=refs/e-delete-0 &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "delete %s\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 8 - empty directory should not fool 0-arg delete
-
-expecting success of 0600.9 'empty directory should not fool 1-arg delete': 
-	prefix=refs/e-delete-1 &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	printf "delete %s $C\n" $prefix/foo |
-	git update-ref --stdin
-
-ok 9 - empty directory should not fool 1-arg delete
-
-expecting success of 0600.10 'non-empty directory blocks create': 
-	prefix=refs/ne-create &&
-	mkdir -p .git/$prefix/foo/bar &&
-	: >.git/$prefix/foo/bar/baz.lock &&
-	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/foo': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/foo $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/foo $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 10 - non-empty directory blocks create
-
-expecting success of 0600.11 'broken reference blocks create': 
-	prefix=refs/broken-create &&
-	mkdir -p .git/$prefix &&
-	echo "gobbledigook" >.git/$prefix/foo &&
-	test_when_finished "rm -f .git/$prefix/foo" &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken
-	EOF
-	printf "%s\n" "update $prefix/foo $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/foo': unable to resolve reference '$prefix/foo': reference broken
-	EOF
-	printf "%s\n" "update $prefix/foo $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 11 - broken reference blocks create
-
-expecting success of 0600.12 'non-empty directory blocks indirect create': 
-	prefix=refs/ne-indirect-create &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	mkdir -p .git/$prefix/foo/bar &&
-	: >.git/$prefix/foo/bar/baz.lock &&
-	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': there is a non-empty directory '.git/$prefix/foo' blocking reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/symref $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo'
-	EOF
-	printf "%s\n" "update $prefix/symref $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 12 - non-empty directory blocks indirect create
-
-expecting success of 0600.13 'broken reference blocks indirect create': 
-	prefix=refs/broken-indirect-create &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	echo "gobbledigook" >.git/$prefix/foo &&
-	test_when_finished "rm -f .git/$prefix/foo" &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken
-	EOF
-	printf "%s\n" "update $prefix/symref $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref '$prefix/symref': unable to resolve reference '$prefix/foo': reference broken
-	EOF
-	printf "%s\n" "update $prefix/symref $D $C" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
-
-ok 13 - broken reference blocks indirect create
-
-expecting success of 0600.14 'no bogus intermediate values during delete': 
-	prefix=refs/slow-transaction &&
-	# Set up a reference with differing loose and packed versions:
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	git update-ref $prefix/foo $D &&
-	# Now try to update the reference, but hold the `packed-refs` lock
-	# for a while to see what happens while the process is blocked:
-	: >.git/packed-refs.lock &&
-	test_when_finished "rm -f .git/packed-refs.lock" &&
-	{
-		# Note: the following command is intentionally run in the
-		# background. We increase the timeout so that `update-ref`
-		# attempts to acquire the `packed-refs` lock for much longer
-		# than it takes for us to do the check then delete it:
-		git -c core.packedrefstimeout=30000 update-ref -d $prefix/foo &
-	} &&
-	pid2=$! &&
-	# Give update-ref plenty of time to get to the point where it tries
-	# to lock packed-refs:
-	sleep 1 &&
-	# Make sure that update-ref did not complete despite the lock:
-	kill -0 $pid2 &&
-	# Verify that the reference still has its old value:
-	sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
-	case "$sha1" in
-	$D)
-		# This is what we hope for; it means that nothing
-		# user-visible has changed yet.
-		: ;;
-	undefined)
-		# This is not correct; it means the deletion has happened
-		# already even though update-ref should not have been
-		# able to acquire the lock yet.
-		echo "$prefix/foo deleted prematurely" &&
-		break
-		;;
-	$C)
-		# This value should never be seen. Probably the loose
-		# reference has been deleted but the packed reference
-		# is still there:
-		echo "$prefix/foo incorrectly observed to be C" &&
-		break
-		;;
-	*)
-		# WTF?
-		echo "unexpected value observed for $prefix/foo: $sha1" &&
-		break
-		;;
-	esac >out &&
-	rm -f .git/packed-refs.lock &&
-	wait $pid2 &&
-	test_must_be_empty out &&
-	test_must_fail git rev-parse --verify --quiet $prefix/foo
-
-ok 14 - no bogus intermediate values during delete
-
-expecting success of 0600.15 'delete fails cleanly if packed-refs file is locked': 
-	prefix=refs/locked-packed-refs &&
-	# Set up a reference with differing loose and packed versions:
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	git update-ref $prefix/foo $D &&
-	git for-each-ref $prefix >unchanged &&
-	# Now try to delete it while the `packed-refs` lock is held:
-	: >.git/packed-refs.lock &&
-	test_when_finished "rm -f .git/packed-refs.lock" &&
-	test_must_fail git update-ref -d $prefix/foo >out 2>err &&
-	git for-each-ref $prefix >actual &&
-	test_grep "Unable to create '.*packed-refs.lock': " err &&
-	test_cmp unchanged actual
-
-error: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
-ok 15 - delete fails cleanly if packed-refs file is locked
-
-expecting success of 0600.16 'delete fails cleanly if packed-refs.new write fails': 
-	# Setup and expectations are similar to the test above.
-	prefix=refs/failed-packed-refs &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	git update-ref $prefix/foo $D &&
-	git for-each-ref $prefix >unchanged &&
-	# This should not happen in practice, but it is an easy way to get a
-	# reliable error (we open with create_tempfile(), which uses O_EXCL).
-	: >.git/packed-refs.new &&
-	test_when_finished "rm -f .git/packed-refs.new" &&
-	test_must_fail git update-ref -d $prefix/foo &&
-	git for-each-ref $prefix >actual &&
-	test_cmp unchanged actual
-
-error: unable to create file /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
-ok 16 - delete fails cleanly if packed-refs.new write fails
-
-expecting success of 0600.17 'setup worktree': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[main 89a3a1d] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'wt-main')
-HEAD is now at 89a3a1d first
-[wt-main da840b1] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 17 - setup worktree
-
-expecting success of 0600.18 'for_each_reflog()': 
-	echo $ZERO_OID >.git/logs/PSEUDO_MAIN_HEAD &&
-	mkdir -p     .git/logs/refs/bisect &&
-	echo $ZERO_OID >.git/logs/refs/bisect/random &&
-
-	echo $ZERO_OID >.git/worktrees/wt/logs/PSEUDO_WT_HEAD &&
-	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
-	echo $ZERO_OID >.git/worktrees/wt/logs/refs/bisect/wt-random &&
-
-	$RWT for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	PSEUDO_WT_HEAD
-	refs/bisect/wt-random
-	refs/heads/main
-	refs/heads/wt-main
-	EOF
-	test_cmp expected actual &&
-
-	$RMAIN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	PSEUDO_MAIN_HEAD
-	refs/bisect/random
-	refs/heads/main
-	refs/heads/wt-main
-	EOF
-	test_cmp expected actual
-
-ok 18 - for_each_reflog()
-
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-expecting success of 0600.19 'parsing reverse reflogs at BUFSIZ boundaries': 
-	git checkout -b reflogskip &&
-	zf=$(test_oid zero_2) &&
-	ident="abc <xyz> 0000000001 +0000" &&
-	for i in $(test_seq 1 75); do
-		printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
-		if test $i = 75; then
-			for j in $(test_seq 1 89); do
-				printf X || return 1
-			done
-		else
-			printf X
-		fi &&
-		printf "\n" || return 1
-	done >.git/logs/refs/heads/reflogskip &&
-	git rev-parse reflogskip@{73} >actual &&
-	echo ${zf}03 >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'reflogskip'
-ok 19 - parsing reverse reflogs at BUFSIZ boundaries
-
-expecting success of 0600.20 'reflog expire operates on symref not referrent': 
-	git branch --create-reflog the_symref &&
-	git branch --create-reflog referrent &&
-	git update-ref referrent HEAD &&
-	git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
-	test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
-	touch .git/refs/heads/referrent.lock &&
-	git reflog expire --expire=all the_symref
-
-ok 20 - reflog expire operates on symref not referrent
-
-expecting success of 0600.21 'empty reflog': 
-	test_when_finished "rm -rf empty" &&
-	git init empty &&
-	test_commit -C empty A &&
-	>empty/.git/logs/refs/heads/foo &&
-	git -C empty reflog expire --all 2>err &&
-	test_must_be_empty err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
-[main (root-commit) 508df12] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 21 - empty reflog
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0600.22 'ref resolution not confused by broken symlinks': 
-       ln -s does-not-exist .git/refs/heads/broken &&
-       test_must_fail git rev-parse --verify broken
-
-fatal: Needed a single revision
-ok 22 - ref resolution not confused by broken symlinks
-
-expecting success of 0600.23 'log diagnoses bogus HEAD hash': 
-	git init empty &&
-	test_when_finished "rm -rf empty" &&
-	echo 1234abcd >empty/.git/refs/heads/main &&
-	test_must_fail git -C empty log 2>stderr &&
-	test_grep broken stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
-fatal: your current branch appears to be broken
-ok 23 - log diagnoses bogus HEAD hash
-
-expecting success of 0600.24 'log diagnoses bogus HEAD symref': 
-	git init empty &&
-	test-tool -C empty ref-store main create-symref HEAD refs/heads/invalid.lock &&
-	test_must_fail git -C empty log 2>stderr &&
-	test_grep broken stderr &&
-	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
-	test_grep broken stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/empty/.git/
-fatal: your current branch appears to be broken
-fatal: your current branch appears to be broken
-ok 24 - log diagnoses bogus HEAD symref
-
-expecting success of 0600.25 'empty directory removal': 
-	git branch d1/d2/r1 HEAD &&
-	git branch d1/r2 HEAD &&
-	test_path_is_file .git/refs/heads/d1/d2/r1 &&
-	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
-	git branch -d d1/d2/r1 &&
-	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
-	test_path_is_file .git/refs/heads/d1/r2 &&
-	test_path_is_file .git/logs/refs/heads/d1/r2
-
-Deleted branch d1/d2/r1 (was 89a3a1d).
-ok 25 - empty directory removal
-
-expecting success of 0600.26 'symref empty directory removal': 
-	git branch e1/e2/r1 HEAD &&
-	git branch e1/r2 HEAD &&
-	git checkout e1/e2/r1 &&
-	test_when_finished "git checkout main" &&
-	test_path_is_file .git/refs/heads/e1/e2/r1 &&
-	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
-	git update-ref -d HEAD &&
-	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
-	test_path_is_file .git/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/HEAD
-
-Switched to branch 'e1/e2/r1'
-Switched to branch 'main'
-ok 26 - symref empty directory removal
-
-expecting success of 0600.27 'directory not created deleting packed ref': 
-	git branch d1/d2/r1 HEAD &&
-	git pack-refs --all &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	git update-ref -d refs/heads/d1/d2/r1 &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	test_path_is_missing .git/refs/heads/d1
-
-ok 27 - directory not created deleting packed ref
-
-expecting success of 0600.28 'git branch -m u v should fail when the reflog for u is a symlink': 
-	git branch --create-reflog u &&
-	mv .git/logs/refs/heads/u real-u &&
-	ln -s real-u .git/logs/refs/heads/u &&
-	test_must_fail git branch -m u v
-
-error: reflog for refs/heads/u is a symlink
-fatal: branch rename failed
-ok 28 - git branch -m u v should fail when the reflog for u is a symlink
-
-expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
-	test_when_finished "rm -rf subdir" &&
-	git init --bare subdir &&
-
-	rm -rf subdir/refs subdir/objects subdir/packed-refs &&
-	ln -s ../.git/refs subdir/refs &&
-	ln -s ../.git/objects subdir/objects &&
-	ln -s ../.git/packed-refs subdir/packed-refs &&
-
-	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
-	git rev-parse --absolute-git-dir >our.dir &&
-	! test_cmp subdir.dir our.dir &&
-
-	git -C subdir log &&
-	git -C subdir branch rename-src &&
-	git rev-parse rename-src >expect &&
-	git -C subdir branch -m rename-src rename-dest &&
-	git rev-parse rename-dest >actual &&
-	test_cmp expect actual &&
-	git branch -D rename-dest
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/subdir/
---- subdir.dir	2026-04-19 19:15:15.539659440 +0000
-+++ our.dir	2026-04-19 19:15:15.555659440 +0000
-@@ -1 +1 @@
--/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/subdir
-+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/.git
-commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit c2327cb6b086a944f739ef59ddcffd3d45998884
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Third
-
-commit e6940ad615916edba236dd73cb432b3598c8537f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Second
-
-commit d31adcd248e1f85d12741183d231fa5260dcfd5e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Initial
-Deleted branch rename-dest (was 89a3a1d).
-ok 29 - git branch -m with symlinked .git/refs
-
-checking prerequisite: SYMLINKS_WINDOWS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
-	# test whether symbolic links are enabled on Windows
-	test_have_prereq MINGW &&
-	cmd //c "mklink y x" &> /dev/null && test -h y
-
-)
-prerequisite SYMLINKS_WINDOWS not satisfied
-ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
-
-t0600-reffiles-backend.sh: 6: cd: can't cd to /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0600-reffiles-backend/prereq-test-dir-SYMLINKS_WINDOWS
-expecting success of 0600.31 'git reflog expire honors core.sharedRepository': 
-	umask 077 &&
-	git config core.sharedRepository group &&
-	git reflog expire --all &&
-	actual="$(ls -l .git/logs/refs/heads/main)" &&
-	case "$actual" in
-	-rw-rw-*)
-		: happy
-		;;
-	*)
-		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
-		false
-		;;
-	esac
-
-ok 31 - git reflog expire honors core.sharedRepository
-
-expecting success of 0600.32 'symref transaction supports symlinks': 
-	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
-	git update-ref refs/heads/new @ &&
-	test_config core.prefersymlinkrefs true &&
-	cat >stdin <<-EOF &&
-	start
-	symref-create TEST_SYMREF_HEAD refs/heads/new
-	prepare
-	commit
-	EOF
-	git update-ref --no-deref --stdin <stdin &&
-	test_path_is_symlink .git/TEST_SYMREF_HEAD &&
-	test "$(test_readlink .git/TEST_SYMREF_HEAD)" = refs/heads/new
-
-start: ok
-prepare: ok
-commit: ok
-ok 32 - symref transaction supports symlinks
-
-expecting success of 0600.33 'symref transaction supports false symlink config': 
-	test_when_finished "git symbolic-ref -d TEST_SYMREF_HEAD" &&
-	git update-ref refs/heads/new @ &&
-	test_config core.prefersymlinkrefs false &&
-	cat >stdin <<-EOF &&
-	start
-	symref-create TEST_SYMREF_HEAD refs/heads/new
-	prepare
-	commit
-	EOF
-	git update-ref --no-deref --stdin <stdin &&
-	test_path_is_file .git/TEST_SYMREF_HEAD &&
-	git symbolic-ref TEST_SYMREF_HEAD >actual &&
-	echo refs/heads/new >expect &&
-	test_cmp expect actual
-
-start: ok
-prepare: ok
-commit: ok
-ok 33 - symref transaction supports false symlink config
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0601-reffiles-pack-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/.git/
-expecting success of 0601.1 'enable reflogs': 
-	git config core.logallrefupdates true
-
-ok 1 - enable reflogs
-
-expecting success of 0601.2 'prepare a trivial repository': 
-	echo Hello > A &&
-	git update-index --add A &&
-	git commit -m "Initial commit." &&
-	HEAD=$(git rev-parse --verify HEAD)
-
-[main (root-commit) 2daebe9] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-ok 2 - prepare a trivial repository
-
-expecting success of 0601.3 'pack-refs --prune --all': 
-	test_path_is_missing .git/packed-refs &&
-	git pack-refs --no-prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f | wc -l) &&
-	test "$N" != 0 &&
-
-	git pack-refs --prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f) &&
-	test -z "$N"
-
-ok 3 - pack-refs --prune --all
-
-expecting success of 0601.4 'see if git show-ref works as expected': 
-	git branch a &&
-	SHA1=$(cat .git/refs/heads/a) &&
-	echo "$SHA1 refs/heads/a" >expect &&
-	git show-ref a >result &&
-	test_cmp expect result
-
-ok 4 - see if git show-ref works as expected
-
-expecting success of 0601.5 'see if a branch still exists when packed': 
-	git branch b &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/b &&
-	echo "$SHA1 refs/heads/b" >expect &&
-	git show-ref b >result &&
-	test_cmp expect result
-
-ok 5 - see if a branch still exists when packed
-
-expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
-	git branch c &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/c &&
-	test_must_fail git branch c/d
-
-fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
-ok 6 - git branch c/d should barf if branch c exists
-
-expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
-	git branch e &&
-	git pack-refs --all --prune &&
-	echo "$SHA1 refs/heads/e" >expect &&
-	git show-ref e >result &&
-	test_cmp expect result
-
-ok 7 - see if a branch still exists after git pack-refs --prune
-
-expecting success of 0601.8 'see if git pack-refs --prune remove ref files': 
-	git branch f &&
-	git pack-refs --all --prune &&
-	! test -f .git/refs/heads/f
-
-ok 8 - see if git pack-refs --prune remove ref files
-
-expecting success of 0601.9 'see if git pack-refs --prune removes empty dirs': 
-	git branch r/s/t &&
-	git pack-refs --all --prune &&
-	! test -e .git/refs/heads/r
-
-ok 9 - see if git pack-refs --prune removes empty dirs
-
-expecting success of 0601.10 'git branch g should work when git branch g/h has been deleted': 
-	git branch g/h &&
-	git pack-refs --all --prune &&
-	git branch -d g/h &&
-	git branch g &&
-	git pack-refs --all &&
-	git branch -d g
-
-Deleted branch g/h (was 2daebe9).
-Deleted branch g (was 2daebe9).
-ok 10 - git branch g should work when git branch g/h has been deleted
-
-expecting success of 0601.11 'git branch i/j/k should barf if branch i exists': 
-	git branch i &&
-	git pack-refs --all --prune &&
-	test_must_fail git branch i/j/k
-
-fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
-ok 11 - git branch i/j/k should barf if branch i exists
-
-expecting success of 0601.12 'test git branch k after branch k/l/m and k/lm have been deleted': 
-	git branch k/l &&
-	git branch k/lm &&
-	git branch -d k/l &&
-	git branch k/l/m &&
-	git branch -d k/l/m &&
-	git branch -d k/lm &&
-	git branch k
-
-Deleted branch k/l (was 2daebe9).
-Deleted branch k/l/m (was 2daebe9).
-Deleted branch k/lm (was 2daebe9).
-ok 12 - test git branch k after branch k/l/m and k/lm have been deleted
-
-expecting success of 0601.13 'test git branch n after some branch deletion and pruning': 
-	git branch n/o &&
-	git branch n/op &&
-	git branch -d n/o &&
-	git branch n/o/p &&
-	git branch -d n/op &&
-	git pack-refs --all --prune &&
-	git branch -d n/o/p &&
-	git branch n
-
-Deleted branch n/o (was 2daebe9).
-Deleted branch n/op (was 2daebe9).
-Deleted branch n/o/p (was 2daebe9).
-ok 13 - test git branch n after some branch deletion and pruning
-
-expecting success of 0601.14 'test excluded refs are not packed': 
-	git branch dont_pack1 &&
-	git branch dont_pack2 &&
-	git branch pack_this &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" &&
-	test -f .git/refs/heads/dont_pack1 &&
-	test -f .git/refs/heads/dont_pack2 &&
-	! test -f .git/refs/heads/pack_this
-ok 14 - test excluded refs are not packed
-
-expecting success of 0601.15 'test --no-exclude refs clears excluded refs': 
-	git branch dont_pack3 &&
-	git branch dont_pack4 &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" --no-exclude &&
-	! test -f .git/refs/heads/dont_pack3 &&
-	! test -f .git/refs/heads/dont_pack4
-ok 15 - test --no-exclude refs clears excluded refs
-
-expecting success of 0601.16 'test only included refs are packed': 
-	git branch pack_this1 &&
-	git branch pack_this2 &&
-	git tag dont_pack5 &&
-	git pack-refs --include "refs/heads/pack_this*" &&
-	test -f .git/refs/tags/dont_pack5 &&
-	! test -f .git/refs/heads/pack_this1 &&
-	! test -f .git/refs/heads/pack_this2
-ok 16 - test only included refs are packed
-
-expecting success of 0601.17 'test --no-include refs clears included refs': 
-	git branch pack1 &&
-	git branch pack2 &&
-	git pack-refs --include "refs/heads/pack*" --no-include &&
-	test -f .git/refs/heads/pack1 &&
-	test -f .git/refs/heads/pack2
-ok 17 - test --no-include refs clears included refs
-
-expecting success of 0601.18 'test --exclude takes precedence over --include': 
-	git branch dont_pack5 &&
-	git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
-	test -f .git/refs/heads/dont_pack5
-ok 18 - test --exclude takes precedence over --include
-
-expecting success of 0601.19 'see if up-to-date packed refs are preserved': 
-	git branch q &&
-	git pack-refs --all --prune &&
-	git update-ref refs/heads/q refs/heads/q &&
-	! test -f .git/refs/heads/q
-
-ok 19 - see if up-to-date packed refs are preserved
-
-expecting success of 0601.20 'pack, prune and repack': 
-	git tag foo &&
-	git pack-refs --all --prune &&
-	git show-ref >all-of-them &&
-	git pack-refs &&
-	git show-ref >again &&
-	test_cmp all-of-them again
-
-ok 20 - pack, prune and repack
-
-expecting success of 0601.21 'explicit pack-refs with dangling packed reference': 
-	git commit --allow-empty -m "soon to be garbage-collected" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git pack-refs --all 2>result &&
-	test_must_be_empty result
-
-[main 6d2fc87] soon to be garbage-collected
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-ok 21 - explicit pack-refs with dangling packed reference
-
-expecting success of 0601.22 'delete ref with dangling packed version': 
-	git checkout -b lamb &&
-	git commit --allow-empty -m "future garbage" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git checkout main &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git branch -d lamb 2>result &&
-	test_must_be_empty result
-
-Switched to a new branch 'lamb'
-[lamb ce057e0] future garbage
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-Switched to branch 'main'
-Deleted branch lamb (was 2daebe9).
-ok 22 - delete ref with dangling packed version
-
-expecting success of 0601.23 'delete ref while another dangling packed ref': 
-	git branch lamb &&
-	git commit --allow-empty -m "future garbage" &&
-	git pack-refs --all &&
-	git reset --hard HEAD^ &&
-	git reflog expire --expire=all --all &&
-	git prune --expire=all &&
-	git branch -d lamb 2>result &&
-	test_must_be_empty result
-
-[main ce057e0] future garbage
- Author: A U Thor <author@example.com>
-HEAD is now at 2daebe9 Initial commit.
-Deleted branch lamb (was 2daebe9).
-ok 23 - delete ref while another dangling packed ref
-
-expecting success of 0601.24 'pack ref directly below refs/': 
-	git update-ref refs/top HEAD &&
-	git pack-refs --all --prune &&
-	grep refs/top .git/packed-refs &&
-	test_path_is_missing .git/refs/top
-
-2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
-ok 24 - pack ref directly below refs/
-
-expecting success of 0601.25 'do not pack ref in refs/bisect': 
-	git update-ref refs/bisect/local HEAD &&
-	git pack-refs --all --prune &&
-	! grep refs/bisect/local .git/packed-refs >/dev/null &&
-	test_path_is_file .git/refs/bisect/local
-
-ok 25 - do not pack ref in refs/bisect
-
-expecting success of 0601.26 'disable reflogs': 
-	git config core.logallrefupdates false &&
-	rm -rf .git/logs
-
-ok 26 - disable reflogs
-
-expecting success of 0601.27 'create packed foo/bar/baz branch': 
-	git branch foo/bar/baz &&
-	git pack-refs --all --prune &&
-	test_path_is_missing .git/refs/heads/foo/bar/baz &&
-	test_must_fail git reflog exists refs/heads/foo/bar/baz
-
-ok 27 - create packed foo/bar/baz branch
-
-expecting success of 0601.28 'notice d/f conflict with existing directory': 
-	test_must_fail git branch foo &&
-	test_must_fail git branch foo/bar
-
-fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-fatal: cannot lock ref 'refs/heads/foo/bar': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar'
-ok 28 - notice d/f conflict with existing directory
-
-expecting success of 0601.29 'existing directory reports concrete ref': 
-	test_must_fail git branch foo 2>stderr &&
-	test_grep refs/heads/foo/bar/baz stderr
-
-fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
-ok 29 - existing directory reports concrete ref
-
-expecting success of 0601.30 'notice d/f conflict with existing ref': 
-	test_must_fail git branch foo/bar/baz/extra &&
-	test_must_fail git branch foo/bar/baz/lots/of/extra/components
-
-fatal: cannot lock ref 'refs/heads/foo/bar/baz/extra': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
-fatal: cannot lock ref 'refs/heads/foo/bar/baz/lots/of/extra/components': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/lots/of/extra/components'
-ok 30 - notice d/f conflict with existing ref
-
-expecting success of 0601.31 'reject packed-refs with unterminated line': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
-	echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 31 - reject packed-refs with unterminated line
-
-expecting success of 0601.32 'reject packed-refs containing junk': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%s\n" "bogus content" >>.git/packed-refs &&
-	echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 32 - reject packed-refs containing junk
-
-expecting success of 0601.33 'reject packed-refs with a short SHA-1': 
-	cp .git/packed-refs .git/packed-refs.bak &&
-	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
-	printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
-	printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
-	test_must_fail git for-each-ref >out 2>err &&
-	test_cmp expected_err err
-
-ok 33 - reject packed-refs with a short SHA-1
-
-expecting success of 0601.34 'timeout if packed-refs.lock exists': 
-	LOCK=.git/packed-refs.lock &&
-	>"$LOCK" &&
-	test_when_finished "rm -f $LOCK" &&
-	test_must_fail git pack-refs --all --prune
-
-fatal: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/.git/packed-refs.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-ok 34 - timeout if packed-refs.lock exists
-
-expecting success of 0601.35 'retry acquiring packed-refs.lock': 
-	LOCK=.git/packed-refs.lock &&
-	>"$LOCK" &&
-	test_when_finished "wait && rm -f $LOCK" &&
-	{
-		( sleep 1 && rm -f $LOCK ) &
-	} &&
-	git -c core.packedrefstimeout=3000 pack-refs --all --prune
-
-ok 35 - retry acquiring packed-refs.lock
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0601.36 'pack symlinked packed-refs': 
-	# First make sure that symlinking works when reading:
-	git update-ref refs/heads/lossy refs/heads/main &&
-	git for-each-ref >all-refs-before &&
-	mv .git/packed-refs .git/my-deviant-packed-refs &&
-	ln -s my-deviant-packed-refs .git/packed-refs &&
-	git for-each-ref >all-refs-linked &&
-	test_cmp all-refs-before all-refs-linked &&
-	git pack-refs --all --prune &&
-	git for-each-ref >all-refs-packed &&
-	test_cmp all-refs-before all-refs-packed &&
-	test -h .git/packed-refs &&
-	test "$(test_readlink .git/packed-refs)" = "my-deviant-packed-refs"
-
-ok 36 - pack symlinked packed-refs
-
-expecting success of 0601.37 'refs/worktree must not be packed': 
-	test_commit initial &&
-	test_commit wt1 &&
-	test_commit wt2 &&
-	git worktree add wt1 wt1 &&
-	git worktree add wt2 wt2 &&
-	git checkout initial &&
-	git update-ref refs/worktree/foo HEAD &&
-	git -C wt1 update-ref refs/worktree/foo HEAD &&
-	git -C wt2 update-ref refs/worktree/foo HEAD &&
-	git pack-refs --all &&
-	test_path_is_missing .git/refs/tags/wt1 &&
-	test_path_is_file .git/refs/worktree/foo &&
-	test_path_is_file .git/worktrees/wt1/refs/worktree/foo &&
-	test_path_is_file .git/worktrees/wt2/refs/worktree/foo
-
-[main 68c0c7f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main e8c3d37] wt1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wt1.t
-[main dfc35c5] wt2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 wt2.t
-Preparing worktree (detached HEAD e8c3d37)
-HEAD is now at e8c3d37 wt1
-Preparing worktree (detached HEAD dfc35c5)
-HEAD is now at dfc35c5 wt2
-Note: switching to 'initial'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 68c0c7f initial
-ok 37 - refs/worktree must not be packed
-
-expecting success of 0601.38 'create packed-refs file with broken ref': 
-	test_tick && git commit --allow-empty -m one &&
-	recoverable=$(git rev-parse HEAD) &&
-	test_tick && git commit --allow-empty -m two &&
-	missing=$(git rev-parse HEAD) &&
-	rm -f .git/refs/heads/main &&
-	cat >.git/packed-refs <<-EOF &&
-	$missing refs/heads/main
-	$recoverable refs/heads/other
-	EOF
-	echo $missing >expect &&
-	git rev-parse refs/heads/main >actual &&
-	test_cmp expect actual
-
-[detached HEAD 23b55e4] one
- Author: A U Thor <author@example.com>
-[detached HEAD 8e70490] two
- Author: A U Thor <author@example.com>
-ok 38 - create packed-refs file with broken ref
-
-expecting success of 0601.39 'pack-refs does not silently delete broken packed ref': 
-	git pack-refs --all --prune &&
-	git rev-parse refs/heads/main >actual &&
-	test_cmp expect actual
-
-ok 39 - pack-refs does not silently delete broken packed ref
-
-expecting success of 0601.40 'pack-refs does not drop broken refs during deletion': 
-	git update-ref -d refs/heads/other &&
-	git rev-parse refs/heads/main >actual &&
-	test_cmp expect actual
-
-ok 40 - pack-refs does not drop broken refs during deletion
-
-expecting success of 0601.41 'git pack-refs --all --auto does not repack below 16 refs without packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			# Create 14 additional references, which brings us to
-			# 15 together with the default branch.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 14) >stdin &&
-			git update-ref --stdin <stdin &&
-			test_path_is_missing .git/packed-refs &&
-			git pack-refs --auto --all &&
-			test_path_is_missing .git/packed-refs &&
-
-			# Create the 16th reference, which should cause us to repack.
-			git update-ref refs/heads/loose-15 HEAD &&
-			git pack-refs --auto --all &&
-			test_path_is_file .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 41 - git pack-refs --all --auto does not repack below 16 refs without packed-refs
-
-expecting success of 0601.42 'git pack-refs --all --auto does not repack below 16 refs with small packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			git pack-refs --all &&
-			test_line_count = 2 .git/packed-refs &&
-
-			# Create 15 loose references.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 15) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 2 .git/packed-refs &&
-
-			# Create the 16th loose reference, which should cause us to repack.
-			git update-ref refs/heads/loose-17 HEAD &&
-			git pack-refs --auto --all &&
-			test_line_count = 18 .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 42 - git pack-refs --all --auto does not repack below 16 refs with small packed-refs
-
-expecting success of 0601.43 'git pack-refs --all --auto scales with size of packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			# Create 99 packed refs. This should cause the heuristic
-			# to require more than the minimum amount of loose refs.
-			test_seq 99 |
-			while read i
-			do
-				printf "create refs/heads/packed-%d HEAD\n" $i || return 1
-			done >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --all &&
-			test_line_count = 101 .git/packed-refs &&
-
-			# Create 24 loose refs, which should not yet cause us to repack.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 24) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 101 .git/packed-refs &&
-
-			# Create another handful of refs to cross the border.
-			# Note that we explicitly do not check for strict
-			# boundaries here, as this also depends on the size of
-			# the object hash.
-			printf "create refs/heads/addn-%d HEAD\n" $(test_seq 10) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 135 .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 43 - git pack-refs --all --auto scales with size of packed-refs
-
-expecting success of 0601.44 'git maintenance run --task=pack-refs --auto does not repack below 16 refs without packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			# Create 14 additional references, which brings us to
-			# 15 together with the default branch.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 14) >stdin &&
-			git update-ref --stdin <stdin &&
-			test_path_is_missing .git/packed-refs &&
-			git pack-refs --auto --all &&
-			test_path_is_missing .git/packed-refs &&
-
-			# Create the 16th reference, which should cause us to repack.
-			git update-ref refs/heads/loose-15 HEAD &&
-			git pack-refs --auto --all &&
-			test_path_is_file .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 44 - git maintenance run --task=pack-refs --auto does not repack below 16 refs without packed-refs
-
-expecting success of 0601.45 'git maintenance run --task=pack-refs --auto does not repack below 16 refs with small packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			git pack-refs --all &&
-			test_line_count = 2 .git/packed-refs &&
-
-			# Create 15 loose references.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 15) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 2 .git/packed-refs &&
-
-			# Create the 16th loose reference, which should cause us to repack.
-			git update-ref refs/heads/loose-17 HEAD &&
-			git pack-refs --auto --all &&
-			test_line_count = 18 .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 45 - git maintenance run --task=pack-refs --auto does not repack below 16 refs with small packed-refs
-
-expecting success of 0601.46 'git maintenance run --task=pack-refs --auto scales with size of packed-refs': 
-		test_when_finished "rm -rf repo" &&
-		git init repo &&
-		(
-			cd repo &&
-			git config set maintenance.auto false &&
-			git commit --allow-empty --message "initial" &&
-
-			# Create 99 packed refs. This should cause the heuristic
-			# to require more than the minimum amount of loose refs.
-			test_seq 99 |
-			while read i
-			do
-				printf "create refs/heads/packed-%d HEAD\n" $i || return 1
-			done >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --all &&
-			test_line_count = 101 .git/packed-refs &&
-
-			# Create 24 loose refs, which should not yet cause us to repack.
-			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 24) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 101 .git/packed-refs &&
-
-			# Create another handful of refs to cross the border.
-			# Note that we explicitly do not check for strict
-			# boundaries here, as this also depends on the size of
-			# the object hash.
-			printf "create refs/heads/addn-%d HEAD\n" $(test_seq 10) >stdin &&
-			git update-ref --stdin <stdin &&
-			git pack-refs --auto --all &&
-			test_line_count = 135 .git/packed-refs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
-[main (root-commit) de45b2c] initial
- Author: A U Thor <author@example.com>
-ok 46 - git maintenance run --task=pack-refs --auto scales with size of packed-refs
-
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0612-reftable-jgit-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0612-reftable-jgit-compatibility/.git/
-checking prerequisite: JGIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-JGIT" &&
-	jgit --version
-
-)
-t0612-reftable-jgit-compatibility.sh: 7: eval: jgit: not found
-prerequisite JGIT not satisfied
-1..0 # SKIP skipping reftable JGit tests; JGit is not present in PATH
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0301-credential-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0301-credential-cache/.git/
-expecting success of 0301.1 'helper (cache) has no existing data': 
+*** t0302-credential-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0302-credential-store/.git/
+expecting success of 0302.1 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35200,9 +35573,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 1 - helper (cache) has no existing data
+ok 1 - helper (store) has no existing data
 
-expecting success of 0301.2 'helper (cache) stores password': 
+expecting success of 0302.2 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35210,9 +35583,9 @@
 		password=store-pass
 		EOF
 	
-ok 2 - helper (cache) stores password
+ok 2 - helper (store) stores password
 
-expecting success of 0301.3 'helper (cache) can retrieve password': 
+expecting success of 0302.3 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35224,9 +35597,9 @@
 		--
 		EOF
 	
-ok 3 - helper (cache) can retrieve password
+ok 3 - helper (store) can retrieve password
 
-expecting success of 0301.4 'helper (cache) requires matching protocol': 
+expecting success of 0302.4 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -35240,9 +35613,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 4 - helper (cache) requires matching protocol
+ok 4 - helper (store) requires matching protocol
 
-expecting success of 0301.5 'helper (cache) requires matching host': 
+expecting success of 0302.5 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -35256,9 +35629,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 5 - helper (cache) requires matching host
+ok 5 - helper (store) requires matching host
 
-expecting success of 0301.6 'helper (cache) requires matching username': 
+expecting success of 0302.6 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35272,9 +35645,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 6 - helper (cache) requires matching username
+ok 6 - helper (store) requires matching username
 
-expecting success of 0301.7 'helper (cache) requires matching path': 
+expecting success of 0302.7 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -35298,9 +35671,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 7 - helper (cache) requires matching path
+ok 7 - helper (store) requires matching path
 
-expecting success of 0301.8 'helper (cache) overwrites on store': 
+expecting success of 0302.8 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35342,9 +35715,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 8 - helper (cache) overwrites on store
+ok 8 - helper (store) overwrites on store
 
-expecting success of 0301.9 'helper (cache) can forget host': 
+expecting success of 0302.9 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35362,9 +35735,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 9 - helper (cache) can forget host
+ok 9 - helper (store) can forget host
 
-expecting success of 0301.10 'helper (cache) can store multiple users': 
+expecting success of 0302.10 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35398,9 +35771,9 @@
 		password=pass2
 		EOF
 	
-ok 10 - helper (cache) can store multiple users
+ok 10 - helper (store) can store multiple users
 
-expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
+expecting success of 0302.11 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35424,9 +35797,9 @@
 		password=pass1
 		EOF
 	
-ok 11 - helper (cache) does not erase a password distinct from input
+ok 11 - helper (store) does not erase a password distinct from input
 
-expecting success of 0301.12 'helper (cache) can forget user': 
+expecting success of 0302.12 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35445,9 +35818,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 12 - helper (cache) can forget user
+ok 12 - helper (store) can forget user
 
-expecting success of 0301.13 'helper (cache) remembers other user': 
+expecting success of 0302.13 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35459,9 +35832,9 @@
 		password=pass2
 		EOF
 	
-ok 13 - helper (cache) remembers other user
+ok 13 - helper (store) remembers other user
 
-expecting success of 0301.14 'helper (cache) can store empty username': 
+expecting success of 0302.14 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -35478,9 +35851,9 @@
 		password=
 		EOF
 	
-ok 14 - helper (cache) can store empty username
+ok 14 - helper (store) can store empty username
 
-expecting success of 0301.15 'helper (cache) erases all matching credentials': 
+expecting success of 0302.15 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35510,9 +35883,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 15 - helper (cache) erases all matching credentials
+ok 15 - helper (store) erases all matching credentials
 
-expecting success of 0301.16 'helper (cache) not confused by long header': 
+expecting success of 0302.16 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -35535,262 +35908,22 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 16 - helper (cache) not confused by long header
-
-expecting success of 0301.17 'helper (cache) stores password_expiry_utc': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry
-		password=pass
-		password_expiry_utc=9999999999
-		EOF
-	
-ok 17 - helper (cache) stores password_expiry_utc
-
-expecting success of 0301.18 'helper (cache) gets password_expiry_utc': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry
-		password=pass
-		password_expiry_utc=9999999999
-		--
-		EOF
-	
-ok 18 - helper (cache) gets password_expiry_utc
-
-expecting success of 0301.19 'helper (cache) overwrites when password_expiry_utc changes': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass1
-		password_expiry_utc=9999999998
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		password_expiry_utc=9999999999
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		password_expiry_utc=9999999999
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-expiry-overwrite
-		password=askpass-password
-		--
-		askpass: Password for 'https://user-expiry-overwrite@example.com':
-		EOF
-	
-ok 19 - helper (cache) overwrites when password_expiry_utc changes
-
-expecting success of 0301.20 'helper (cache) stores oauth_refresh_token': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
-		EOF
-	
-ok 20 - helper (cache) stores oauth_refresh_token
-
-expecting success of 0301.21 'helper (cache) gets oauth_refresh_token': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user4
-		--
-		protocol=https
-		host=example.com
-		username=user4
-		password=pass
-		oauth_refresh_token=xyzzy
-		--
-		EOF
-	
-ok 21 - helper (cache) gets oauth_refresh_token
-
-expecting success of 0301.22 'helper (cache) stores authtype and credential': 
-		check approve $HELPER <<-\EOF
-		capability[]=authtype
-		authtype=Bearer
-		credential=random-token
-		protocol=https
-		host=git.example.com
-		EOF
-	
-ok 22 - helper (cache) stores authtype and credential
-
-expecting success of 0301.23 'helper (cache) gets authtype and credential': 
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git.example.com
-		--
-		capability[]=authtype
-		authtype=Bearer
-		credential=random-token
-		protocol=https
-		host=git.example.com
-		--
-		EOF
-	
-ok 23 - helper (cache) gets authtype and credential
-
-expecting success of 0301.24 'helper (cache) gets authtype and credential only if request has authtype capability': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=git.example.com
-		--
-		protocol=https
-		host=git.example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://git.example.com':
-		askpass: Password for 'https://askpass-username@git.example.com':
-		EOF
-	
-ok 24 - helper (cache) gets authtype and credential only if request has authtype capability
-
-expecting success of 0301.25 'helper (cache) stores authtype and credential with username': 
-		check approve $HELPER <<-\EOF
-		capability[]=authtype
-		authtype=Bearer
-		credential=other-token
-		protocol=https
-		host=git.example.com
-		username=foobar
-		EOF
-	
-ok 25 - helper (cache) stores authtype and credential with username
-
-expecting success of 0301.26 'helper (cache) gets authtype and credential with username': 
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git.example.com
-		username=foobar
-		--
-		capability[]=authtype
-		authtype=Bearer
-		credential=other-token
-		protocol=https
-		host=git.example.com
-		username=foobar
-		--
-		EOF
-	
-ok 26 - helper (cache) gets authtype and credential with username
-
-expecting success of 0301.27 'helper (cache) does not get authtype and credential with different username': 
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git.example.com
-		username=barbaz
-		--
-		protocol=https
-		host=git.example.com
-		username=barbaz
-		password=askpass-password
-		--
-		askpass: Password for 'https://barbaz@git.example.com':
-		EOF
-	
-ok 27 - helper (cache) does not get authtype and credential with different username
-
-expecting success of 0301.28 'helper (cache) does not store ephemeral authtype and credential': 
-		check approve $HELPER <<-\EOF &&
-		capability[]=authtype
-		authtype=Bearer
-		credential=git2-token
-		protocol=https
-		host=git2.example.com
-		ephemeral=1
-		EOF
-
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		--
-		protocol=https
-		host=git2.example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://git2.example.com':
-		askpass: Password for 'https://askpass-username@git2.example.com':
-		EOF
-	
-ok 28 - helper (cache) does not store ephemeral authtype and credential
+ok 16 - helper (store) not confused by long header
 
-expecting success of 0301.29 'helper (cache) does not store ephemeral username and password': 
-		check approve $HELPER <<-\EOF &&
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		user=barbaz
-		password=secret
-		ephemeral=1
-		EOF
+expecting success of 0302.17 'when xdg file does not exist, xdg file not created': 
+	test_path_is_missing "$HOME/.config/git/credentials" &&
+	test -s "$HOME/.git-credentials"
 
-		check fill $HELPER <<-\EOF
-		capability[]=authtype
-		protocol=https
-		host=git2.example.com
-		--
-		protocol=https
-		host=git2.example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://git2.example.com':
-		askpass: Password for 'https://askpass-username@git2.example.com':
-		EOF
-	
-ok 29 - helper (cache) does not store ephemeral username and password
+ok 17 - when xdg file does not exist, xdg file not created
 
-expecting success of 0301.30 'socket defaults to ~/.cache/git/credential/socket': 
-	test_when_finished "
-		git credential-cache exit &&
-		rmdir -p .cache/git/credential/
-	" &&
-	test_path_is_missing "$HOME/.git-credential-cache" &&
-	test_path_is_socket "$HOME/.cache/git/credential/socket"
+expecting success of 0302.18 'setup xdg file': 
+	rm -f "$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	>"$HOME/.config/git/credentials"
 
-ok 30 - socket defaults to ~/.cache/git/credential/socket
+ok 18 - setup xdg file
 
-expecting success of 0301.31 'helper (cache) has no existing data': 
+expecting success of 0302.19 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35804,9 +35937,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 31 - helper (cache) has no existing data
+ok 19 - helper (store) has no existing data
 
-expecting success of 0301.32 'helper (cache) stores password': 
+expecting success of 0302.20 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35814,9 +35947,9 @@
 		password=store-pass
 		EOF
 	
-ok 32 - helper (cache) stores password
+ok 20 - helper (store) stores password
 
-expecting success of 0301.33 'helper (cache) can retrieve password': 
+expecting success of 0302.21 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35828,9 +35961,9 @@
 		--
 		EOF
 	
-ok 33 - helper (cache) can retrieve password
+ok 21 - helper (store) can retrieve password
 
-expecting success of 0301.34 'helper (cache) requires matching protocol': 
+expecting success of 0302.22 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -35844,9 +35977,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 34 - helper (cache) requires matching protocol
+ok 22 - helper (store) requires matching protocol
 
-expecting success of 0301.35 'helper (cache) requires matching host': 
+expecting success of 0302.23 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -35860,9 +35993,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 35 - helper (cache) requires matching host
+ok 23 - helper (store) requires matching host
 
-expecting success of 0301.36 'helper (cache) requires matching username': 
+expecting success of 0302.24 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35876,9 +36009,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 36 - helper (cache) requires matching username
+ok 24 - helper (store) requires matching username
 
-expecting success of 0301.37 'helper (cache) requires matching path': 
+expecting success of 0302.25 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -35902,9 +36035,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 37 - helper (cache) requires matching path
+ok 25 - helper (store) requires matching path
 
-expecting success of 0301.38 'helper (cache) overwrites on store': 
+expecting success of 0302.26 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35946,9 +36079,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 38 - helper (cache) overwrites on store
+ok 26 - helper (store) overwrites on store
 
-expecting success of 0301.39 'helper (cache) can forget host': 
+expecting success of 0302.27 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35966,9 +36099,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 39 - helper (cache) can forget host
+ok 27 - helper (store) can forget host
 
-expecting success of 0301.40 'helper (cache) can store multiple users': 
+expecting success of 0302.28 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36002,9 +36135,9 @@
 		password=pass2
 		EOF
 	
-ok 40 - helper (cache) can store multiple users
+ok 28 - helper (store) can store multiple users
 
-expecting success of 0301.41 'helper (cache) does not erase a password distinct from input': 
+expecting success of 0302.29 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36028,9 +36161,9 @@
 		password=pass1
 		EOF
 	
-ok 41 - helper (cache) does not erase a password distinct from input
+ok 29 - helper (store) does not erase a password distinct from input
 
-expecting success of 0301.42 'helper (cache) can forget user': 
+expecting success of 0302.30 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36049,9 +36182,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 42 - helper (cache) can forget user
+ok 30 - helper (store) can forget user
 
-expecting success of 0301.43 'helper (cache) remembers other user': 
+expecting success of 0302.31 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36063,9 +36196,9 @@
 		password=pass2
 		EOF
 	
-ok 43 - helper (cache) remembers other user
+ok 31 - helper (store) remembers other user
 
-expecting success of 0301.44 'helper (cache) can store empty username': 
+expecting success of 0302.32 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -36082,9 +36215,9 @@
 		password=
 		EOF
 	
-ok 44 - helper (cache) can store empty username
+ok 32 - helper (store) can store empty username
 
-expecting success of 0301.45 'helper (cache) erases all matching credentials': 
+expecting success of 0302.33 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36114,9 +36247,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 45 - helper (cache) erases all matching credentials
+ok 33 - helper (store) erases all matching credentials
 
-expecting success of 0301.46 'helper (cache) not confused by long header': 
+expecting success of 0302.34 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -36139,168 +36272,23 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 46 - helper (cache) not confused by long header
-
-expecting success of 0301.47 'use custom XDG_CACHE_HOME if set and default sockets are not created': 
-	test_when_finished "git credential-cache exit" &&
-	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket" &&
-	test_path_is_missing "$HOME/.git-credential-cache/socket" &&
-	test_path_is_missing "$HOME/.cache/git/credential/socket"
-
-ok 47 - use custom XDG_CACHE_HOME if set and default sockets are not created
-
-expecting success of 0301.48 'credential-cache --socket option overrides default location': 
-	test_when_finished "
-		git credential-cache exit --socket \"\$HOME/dir/socket\" &&
-		rmdir \"\$HOME/dir\"
-	" &&
-	check approve "cache --socket \"\$HOME/dir/socket\"" <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	test_path_is_socket "$HOME/dir/socket"
-
-ok 48 - credential-cache --socket option overrides default location
-
-expecting success of 0301.49 'use custom XDG_CACHE_HOME even if xdg socket exists': 
-	test_when_finished "
-		git credential-cache exit &&
-		sane_unset XDG_CACHE_HOME
-	" &&
-	check approve cache <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	test_path_is_socket "$HOME/.cache/git/credential/socket" &&
-	XDG_CACHE_HOME="$HOME/xdg" &&
-	export XDG_CACHE_HOME &&
-	check approve cache <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
-
-ok 49 - use custom XDG_CACHE_HOME even if xdg socket exists
-
-expecting success of 0301.50 'use user socket if user directory exists': 
-	test_when_finished "
-		git credential-cache exit &&
-		rmdir \"\$HOME/.git-credential-cache/\"
-	" &&
-	mkdir -p "$HOME/.git-credential-cache/" &&
-	chmod 700 "$HOME/.git-credential-cache/" &&
-	check approve cache <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	test_path_is_socket "$HOME/.git-credential-cache/socket"
-
-ok 50 - use user socket if user directory exists
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0301.51 'use user socket if user directory is a symlink to a directory': 
-	test_when_finished "
-		git credential-cache exit &&
-		rmdir \"\$HOME/dir/\" &&
-		rm \"\$HOME/.git-credential-cache\"
-	" &&
-	mkdir -p -m 700 "$HOME/dir/" &&
-	ln -s "$HOME/dir" "$HOME/.git-credential-cache" &&
-	check approve cache <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	test_path_is_socket "$HOME/.git-credential-cache/socket"
-
-ok 51 - use user socket if user directory is a symlink to a directory
-
-expecting success of 0301.52 'helper (cache --timeout=1) times out': 
-		check approve "$HELPER" <<-\EOF &&
-		protocol=https
-		host=timeout.tld
-		username=user
-		password=pass
-		EOF
-		sleep 2 &&
-		check fill "$HELPER" <<-\EOF
-		protocol=https
-		host=timeout.tld
-		--
-		protocol=https
-		host=timeout.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://timeout.tld':
-		askpass: Password for 'https://askpass-username@timeout.tld':
-		EOF
-	
-ok 52 - helper (cache --timeout=1) times out
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1003-read-tree-prefix/.git/
-expecting success of 1003.1 'setup': 
-	echo hello >one &&
-	git update-index --add one &&
-	tree=$(git write-tree) &&
-	echo tree is $tree
-
-tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
-ok 1 - setup
-
-expecting success of 1003.2 'read-tree --prefix': 
-	git read-tree --prefix=two/ $tree &&
-	git ls-files >actual &&
-	cmp expect actual
+ok 34 - helper (store) not confused by long header
 
-ok 2 - read-tree --prefix
+expecting success of 0302.35 'when xdg file exists, home file not created': 
+	test -s "$HOME/.config/git/credentials" &&
+	test_path_is_missing "$HOME/.git-credentials"
 
-expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/two/ $tree &&
-	git read-tree --prefix=two/ $tree &&
+ok 35 - when xdg file exists, home file not created
 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/ $tree &&
-	git read-tree --prefix= $tree
+expecting success of 0302.36 'setup custom xdg file': 
+	rm -f "$HOME/.git-credentials" &&
+	rm -f "$HOME/.config/git/credentials" &&
+	mkdir -p "$HOME/xdg/git" &&
+	>"$HOME/xdg/git/credentials"
 
-rm 'one'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-ok 3 - read-tree --prefix with leading slash exits with error
+ok 36 - setup custom xdg file
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t0302-credential-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0302-credential-store/.git/
-expecting success of 0302.1 'helper (store) has no existing data': 
+expecting success of 0302.37 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36314,9 +36302,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 1 - helper (store) has no existing data
+ok 37 - helper (store) has no existing data
 
-expecting success of 0302.2 'helper (store) stores password': 
+expecting success of 0302.38 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36324,9 +36312,9 @@
 		password=store-pass
 		EOF
 	
-ok 2 - helper (store) stores password
+ok 38 - helper (store) stores password
 
-expecting success of 0302.3 'helper (store) can retrieve password': 
+expecting success of 0302.39 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36338,9 +36326,9 @@
 		--
 		EOF
 	
-ok 3 - helper (store) can retrieve password
+ok 39 - helper (store) can retrieve password
 
-expecting success of 0302.4 'helper (store) requires matching protocol': 
+expecting success of 0302.40 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -36354,9 +36342,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 4 - helper (store) requires matching protocol
+ok 40 - helper (store) requires matching protocol
 
-expecting success of 0302.5 'helper (store) requires matching host': 
+expecting success of 0302.41 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -36370,9 +36358,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 5 - helper (store) requires matching host
+ok 41 - helper (store) requires matching host
 
-expecting success of 0302.6 'helper (store) requires matching username': 
+expecting success of 0302.42 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36386,9 +36374,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 6 - helper (store) requires matching username
+ok 42 - helper (store) requires matching username
 
-expecting success of 0302.7 'helper (store) requires matching path': 
+expecting success of 0302.43 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -36412,9 +36400,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 7 - helper (store) requires matching path
+ok 43 - helper (store) requires matching path
 
-expecting success of 0302.8 'helper (store) overwrites on store': 
+expecting success of 0302.44 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36456,9 +36444,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 8 - helper (store) overwrites on store
+ok 44 - helper (store) overwrites on store
 
-expecting success of 0302.9 'helper (store) can forget host': 
+expecting success of 0302.45 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36476,9 +36464,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 9 - helper (store) can forget host
+ok 45 - helper (store) can forget host
 
-expecting success of 0302.10 'helper (store) can store multiple users': 
+expecting success of 0302.46 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36512,9 +36500,9 @@
 		password=pass2
 		EOF
 	
-ok 10 - helper (store) can store multiple users
+ok 46 - helper (store) can store multiple users
 
-expecting success of 0302.11 'helper (store) does not erase a password distinct from input': 
+expecting success of 0302.47 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36538,9 +36526,9 @@
 		password=pass1
 		EOF
 	
-ok 11 - helper (store) does not erase a password distinct from input
+ok 47 - helper (store) does not erase a password distinct from input
 
-expecting success of 0302.12 'helper (store) can forget user': 
+expecting success of 0302.48 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36559,9 +36547,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 12 - helper (store) can forget user
+ok 48 - helper (store) can forget user
 
-expecting success of 0302.13 'helper (store) remembers other user': 
+expecting success of 0302.49 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36573,9 +36561,9 @@
 		password=pass2
 		EOF
 	
-ok 13 - helper (store) remembers other user
+ok 49 - helper (store) remembers other user
 
-expecting success of 0302.14 'helper (store) can store empty username': 
+expecting success of 0302.50 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -36592,9 +36580,9 @@
 		password=
 		EOF
 	
-ok 14 - helper (store) can store empty username
+ok 50 - helper (store) can store empty username
 
-expecting success of 0302.15 'helper (store) erases all matching credentials': 
+expecting success of 0302.51 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36624,9 +36612,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 15 - helper (store) erases all matching credentials
+ok 51 - helper (store) erases all matching credentials
 
-expecting success of 0302.16 'helper (store) not confused by long header': 
+expecting success of 0302.52 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -36649,185 +36637,126 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 16 - helper (store) not confused by long header
+ok 52 - helper (store) not confused by long header
 
-expecting success of 0302.17 'when xdg file does not exist, xdg file not created': 
-	test_path_is_missing "$HOME/.config/git/credentials" &&
-	test -s "$HOME/.git-credentials"
+expecting success of 0302.53 'if custom xdg file exists, home and xdg files not created': 
+	test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
+	test -s "$HOME/xdg/git/credentials" &&
+	test_path_is_missing "$HOME/.git-credentials" &&
+	test_path_is_missing "$HOME/.config/git/credentials"
 
-ok 17 - when xdg file does not exist, xdg file not created
+ok 53 - if custom xdg file exists, home and xdg files not created
 
-expecting success of 0302.18 'setup xdg file': 
-	rm -f "$HOME/.git-credentials" &&
+expecting success of 0302.54 'get: use home file if both home and xdg files have matches': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
 	mkdir -p "$HOME/.config/git" &&
-	>"$HOME/.config/git/credentials"
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=home-user
+	password=home-pass
+	--
+	EOF
 
-ok 18 - setup xdg file
+ok 54 - get: use home file if both home and xdg files have matches
 
-expecting success of 0302.19 'helper (store) has no existing data': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 19 - helper (store) has no existing data
+expecting success of 0302.55 'get: use xdg file if home file has no matches': 
+	>"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=xdg-user
+	password=xdg-pass
+	--
+	EOF
 
-expecting success of 0302.20 'helper (store) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 20 - helper (store) stores password
+ok 55 - get: use xdg file if home file has no matches
 
-expecting success of 0302.21 'helper (store) can retrieve password': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		--
-		EOF
-	
-ok 21 - helper (store) can retrieve password
+checking prerequisite: SANITY
 
-expecting success of 0302.22 'helper (store) requires matching protocol': 
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=example.com
-		--
-		protocol=http
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://example.com':
-		askpass: Password for 'http://askpass-username@example.com':
-		EOF
-	
-ok 22 - helper (store) requires matching protocol
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 0302.23 'helper (store) requires matching host': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=other.tld
-		--
-		protocol=https
-		host=other.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://other.tld':
-		askpass: Password for 'https://askpass-username@other.tld':
-		EOF
-	
-ok 23 - helper (store) requires matching host
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
 
-expecting success of 0302.24 'helper (store) requires matching username': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=other
-		--
-		protocol=https
-		host=example.com
-		username=other
-		password=askpass-password
-		--
-		askpass: Password for 'https://other@example.com':
-		EOF
-	
-ok 24 - helper (store) requires matching username
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 0302.25 'helper (store) requires matching path': 
-		test_config credential.usehttppath true &&
-		check approve $HELPER <<-\EOF &&
-		protocol=http
-		host=path.tld
-		path=foo.git
-		username=user
-		password=pass
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=path.tld
-		path=bar.git
-		--
-		protocol=http
-		host=path.tld
-		path=bar.git
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://path.tld/bar.git':
-		askpass: Password for 'http://askpass-username@path.tld/bar.git':
-		EOF
-	
-ok 25 - helper (store) requires matching path
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 0302.26 'helper (store) overwrites on store': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=askpass-password
-		--
-		askpass: Password for 'https://user-overwrite@example.com':
-		EOF
-	
-ok 26 - helper (store) overwrites on store
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 0302.56 'get: use xdg file if home file is unreadable': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
+	chmod -r "$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=xdg-user
+	password=xdg-pass
+	--
+	EOF
 
-expecting success of 0302.27 'helper (store) can forget host': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
+ok 56 - get: use xdg file if home file is unreadable
+
+expecting success of 0302.57 'store: if both xdg and home files exist, only store in home file': 
+	>"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	>"$HOME/.config/git/credentials" &&
+	check approve store <<-\EOF &&
+	protocol=https
+	host=example.com
+	username=store-user
+	password=store-pass
+	EOF
+	echo "https://store-user:store-pass@example.com" >expected &&
+	test_cmp expected "$HOME/.git-credentials" &&
+	test_must_be_empty "$HOME/.config/git/credentials"
+
+ok 57 - store: if both xdg and home files exist, only store in home file
+
+expecting success of 0302.58 'erase: erase matching credentials from both xdg and home files': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check reject store <<-\EOF &&
+	protocol=https
+	host=example.com
+	EOF
+	test_must_be_empty "$HOME/.git-credentials" &&
+	test_must_be_empty "$HOME/.config/git/credentials"
+
+ok 58 - erase: erase matching credentials from both xdg and home files
+
+expecting success of 0302.59 'get: ignore credentials without scheme as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
 		protocol=https
 		host=example.com
 		--
@@ -36838,144 +36767,32 @@
 		--
 		askpass: Username for 'https://example.com':
 		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 27 - helper (store) can forget host
-
-expecting success of 0302.28 'helper (store) can store multiple users': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		--
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-	
-ok 28 - helper (store) can store multiple users
-
-expecting success of 0302.29 'helper (store) does not erase a password distinct from input': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
 		--
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
 		EOF
 	
-ok 29 - helper (store) does not erase a password distinct from input
+ok 59 - get: ignore credentials without scheme as invalid
 
-expecting success of 0302.30 'helper (store) can forget user': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		EOF
-		check fill $HELPER <<-\EOF
+expecting success of 0302.60 'get: ignore credentials without valid host/path as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
 		protocol=https
 		host=example.com
-		username=user1
 		--
 		protocol=https
 		host=example.com
-		username=user1
+		username=askpass-username
 		password=askpass-password
 		--
-		askpass: Password for 'https://user1@example.com':
-		EOF
-	
-ok 30 - helper (store) can forget user
-
-expecting success of 0302.31 'helper (store) remembers other user': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-	
-ok 31 - helper (store) remembers other user
-
-expecting success of 0302.32 'helper (store) can store empty username': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=sso.tld
-		username=
-		password=
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=sso.tld
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
 		--
-		protocol=https
-		host=sso.tld
-		username=
-		password=
 		EOF
 	
-ok 32 - helper (store) can store empty username
+ok 60 - get: ignore credentials without valid host/path as invalid
 
-expecting success of 0302.33 'helper (store) erases all matching credentials': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase2
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
+expecting success of 0302.61 'get: ignore credentials without username/password as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
 		protocol=https
 		host=example.com
 		--
@@ -36986,568 +36803,10 @@
 		--
 		askpass: Username for 'https://example.com':
 		askpass: Password for 'https://askpass-username@example.com':
+		--
 		EOF
 	
-ok 33 - helper (store) erases all matching credentials
-
-expecting success of 0302.34 'helper (store) not confused by long header': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=victim.example.com
-		username=user
-		password=to-be-stolen
-		EOF
-
-		check fill $HELPER <<-EOF
-		protocol=https
-		host=badguy.example.com
-		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
-		--
-		protocol=https
-		host=badguy.example.com
-		username=askpass-username
-		password=askpass-password
-		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
-		--
-		askpass: Username for 'https://badguy.example.com':
-		askpass: Password for 'https://askpass-username@badguy.example.com':
-		EOF
-	
-ok 34 - helper (store) not confused by long header
-
-expecting success of 0302.35 'when xdg file exists, home file not created': 
-	test -s "$HOME/.config/git/credentials" &&
-	test_path_is_missing "$HOME/.git-credentials"
-
-ok 35 - when xdg file exists, home file not created
-
-expecting success of 0302.36 'setup custom xdg file': 
-	rm -f "$HOME/.git-credentials" &&
-	rm -f "$HOME/.config/git/credentials" &&
-	mkdir -p "$HOME/xdg/git" &&
-	>"$HOME/xdg/git/credentials"
-
-ok 36 - setup custom xdg file
-
-expecting success of 0302.37 'helper (store) has no existing data': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 37 - helper (store) has no existing data
-
-expecting success of 0302.38 'helper (store) stores password': 
-		check approve $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		EOF
-	
-ok 38 - helper (store) stores password
-
-expecting success of 0302.39 'helper (store) can retrieve password': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=store-user
-		password=store-pass
-		--
-		EOF
-	
-ok 39 - helper (store) can retrieve password
-
-expecting success of 0302.40 'helper (store) requires matching protocol': 
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=example.com
-		--
-		protocol=http
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://example.com':
-		askpass: Password for 'http://askpass-username@example.com':
-		EOF
-	
-ok 40 - helper (store) requires matching protocol
-
-expecting success of 0302.41 'helper (store) requires matching host': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=other.tld
-		--
-		protocol=https
-		host=other.tld
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://other.tld':
-		askpass: Password for 'https://askpass-username@other.tld':
-		EOF
-	
-ok 41 - helper (store) requires matching host
-
-expecting success of 0302.42 'helper (store) requires matching username': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=other
-		--
-		protocol=https
-		host=example.com
-		username=other
-		password=askpass-password
-		--
-		askpass: Password for 'https://other@example.com':
-		EOF
-	
-ok 42 - helper (store) requires matching username
-
-expecting success of 0302.43 'helper (store) requires matching path': 
-		test_config credential.usehttppath true &&
-		check approve $HELPER <<-\EOF &&
-		protocol=http
-		host=path.tld
-		path=foo.git
-		username=user
-		password=pass
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=http
-		host=path.tld
-		path=bar.git
-		--
-		protocol=http
-		host=path.tld
-		path=bar.git
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'http://path.tld/bar.git':
-		askpass: Password for 'http://askpass-username@path.tld/bar.git':
-		EOF
-	
-ok 43 - helper (store) requires matching path
-
-expecting success of 0302.44 'helper (store) overwrites on store': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		--
-		protocol=https
-		host=example.com
-		username=user-overwrite
-		password=askpass-password
-		--
-		askpass: Password for 'https://user-overwrite@example.com':
-		EOF
-	
-ok 44 - helper (store) overwrites on store
-
-expecting success of 0302.45 'helper (store) can forget host': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 45 - helper (store) can forget host
-
-expecting success of 0302.46 'helper (store) can store multiple users': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		--
-		protocol=https
-		host=example.com
-		username=user1
-		password=pass1
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-	
-ok 46 - helper (store) can store multiple users
-
-expecting success of 0302.47 'helper (store) does not erase a password distinct from input': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass2
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		--
-		protocol=https
-		host=example.com
-		username=user-distinct-pass
-		password=pass1
-		EOF
-	
-ok 47 - helper (store) does not erase a password distinct from input
-
-expecting success of 0302.48 'helper (store) can forget user': 
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user1
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user1
-		--
-		protocol=https
-		host=example.com
-		username=user1
-		password=askpass-password
-		--
-		askpass: Password for 'https://user1@example.com':
-		EOF
-	
-ok 48 - helper (store) can forget user
-
-expecting success of 0302.49 'helper (store) remembers other user': 
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		username=user2
-		--
-		protocol=https
-		host=example.com
-		username=user2
-		password=pass2
-		EOF
-	
-ok 49 - helper (store) remembers other user
-
-expecting success of 0302.50 'helper (store) can store empty username': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=sso.tld
-		username=
-		password=
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=sso.tld
-		--
-		protocol=https
-		host=sso.tld
-		username=
-		password=
-		EOF
-	
-ok 50 - helper (store) can store empty username
-
-expecting success of 0302.51 'helper (store) erases all matching credentials': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase1
-		password=pass1
-		EOF
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		username=user-erase2
-		password=pass1
-		EOF
-		check reject $HELPER <<-\EOF &&
-		protocol=https
-		host=example.com
-		EOF
-		check fill $HELPER <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		EOF
-	
-ok 51 - helper (store) erases all matching credentials
-
-expecting success of 0302.52 'helper (store) not confused by long header': 
-		check approve $HELPER <<-\EOF &&
-		protocol=https
-		host=victim.example.com
-		username=user
-		password=to-be-stolen
-		EOF
-
-		check fill $HELPER <<-EOF
-		protocol=https
-		host=badguy.example.com
-		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
-		--
-		protocol=https
-		host=badguy.example.com
-		username=askpass-username
-		password=askpass-password
-		wwwauth[]=basic realm=${LONG_VALUE}host=victim.example.com
-		--
-		askpass: Username for 'https://badguy.example.com':
-		askpass: Password for 'https://askpass-username@badguy.example.com':
-		EOF
-	
-ok 52 - helper (store) not confused by long header
-
-expecting success of 0302.53 'if custom xdg file exists, home and xdg files not created': 
-	test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
-	test -s "$HOME/xdg/git/credentials" &&
-	test_path_is_missing "$HOME/.git-credentials" &&
-	test_path_is_missing "$HOME/.config/git/credentials"
-
-ok 53 - if custom xdg file exists, home and xdg files not created
-
-expecting success of 0302.54 'get: use home file if both home and xdg files have matches': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
-	protocol=https
-	host=example.com
-	username=home-user
-	password=home-pass
-	--
-	EOF
-
-ok 54 - get: use home file if both home and xdg files have matches
-
-expecting success of 0302.55 'get: use xdg file if home file has no matches': 
-	>"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
-	protocol=https
-	host=example.com
-	username=xdg-user
-	password=xdg-pass
-	--
-	EOF
-
-ok 55 - get: use xdg file if home file has no matches
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 0302.56 'get: use xdg file if home file is unreadable': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	chmod -r "$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
-	protocol=https
-	host=example.com
-	username=xdg-user
-	password=xdg-pass
-	--
-	EOF
-
-ok 56 - get: use xdg file if home file is unreadable
-
-expecting success of 0302.57 'store: if both xdg and home files exist, only store in home file': 
-	>"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	>"$HOME/.config/git/credentials" &&
-	check approve store <<-\EOF &&
-	protocol=https
-	host=example.com
-	username=store-user
-	password=store-pass
-	EOF
-	echo "https://store-user:store-pass@example.com" >expected &&
-	test_cmp expected "$HOME/.git-credentials" &&
-	test_must_be_empty "$HOME/.config/git/credentials"
-
-ok 57 - store: if both xdg and home files exist, only store in home file
-
-expecting success of 0302.58 'erase: erase matching credentials from both xdg and home files': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check reject store <<-\EOF &&
-	protocol=https
-	host=example.com
-	EOF
-	test_must_be_empty "$HOME/.git-credentials" &&
-	test_must_be_empty "$HOME/.config/git/credentials"
-
-ok 58 - erase: erase matching credentials from both xdg and home files
-
-expecting success of 0302.59 'get: ignore credentials without scheme as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		--
-		EOF
-	
-ok 59 - get: ignore credentials without scheme as invalid
-
-expecting success of 0302.60 'get: ignore credentials without valid host/path as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		--
-		EOF
-	
-ok 60 - get: ignore credentials without valid host/path as invalid
-
-expecting success of 0302.61 'get: ignore credentials without username/password as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		--
-		EOF
-	
-ok 61 - get: ignore credentials without username/password as invalid
+ok 61 - get: ignore credentials without username/password as invalid
 
 expecting success of 0302.62 'get: credentials with DOS line endings are invalid': 
 	printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" &&
@@ -37624,6 +36883,702 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t0601-reffiles-pack-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/.git/
+expecting success of 0601.1 'enable reflogs': 
+	git config core.logallrefupdates true
+
+ok 1 - enable reflogs
+
+expecting success of 0601.2 'prepare a trivial repository': 
+	echo Hello > A &&
+	git update-index --add A &&
+	git commit -m "Initial commit." &&
+	HEAD=$(git rev-parse --verify HEAD)
+
+[main (root-commit) 2daebe9] Initial commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+ok 2 - prepare a trivial repository
+
+expecting success of 0601.3 'pack-refs --prune --all': 
+	test_path_is_missing .git/packed-refs &&
+	git pack-refs --no-prune --all &&
+	test_path_is_file .git/packed-refs &&
+	N=$(find .git/refs -type f | wc -l) &&
+	test "$N" != 0 &&
+
+	git pack-refs --prune --all &&
+	test_path_is_file .git/packed-refs &&
+	N=$(find .git/refs -type f) &&
+	test -z "$N"
+
+ok 3 - pack-refs --prune --all
+
+expecting success of 0601.4 'see if git show-ref works as expected': 
+	git branch a &&
+	SHA1=$(cat .git/refs/heads/a) &&
+	echo "$SHA1 refs/heads/a" >expect &&
+	git show-ref a >result &&
+	test_cmp expect result
+
+ok 4 - see if git show-ref works as expected
+
+expecting success of 0601.5 'see if a branch still exists when packed': 
+	git branch b &&
+	git pack-refs --all &&
+	rm -f .git/refs/heads/b &&
+	echo "$SHA1 refs/heads/b" >expect &&
+	git show-ref b >result &&
+	test_cmp expect result
+
+ok 5 - see if a branch still exists when packed
+
+expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
+	git branch c &&
+	git pack-refs --all &&
+	rm -f .git/refs/heads/c &&
+	test_must_fail git branch c/d
+
+fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
+ok 6 - git branch c/d should barf if branch c exists
+
+expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
+	git branch e &&
+	git pack-refs --all --prune &&
+	echo "$SHA1 refs/heads/e" >expect &&
+	git show-ref e >result &&
+	test_cmp expect result
+
+ok 7 - see if a branch still exists after git pack-refs --prune
+
+expecting success of 0601.8 'see if git pack-refs --prune remove ref files': 
+	git branch f &&
+	git pack-refs --all --prune &&
+	! test -f .git/refs/heads/f
+
+ok 8 - see if git pack-refs --prune remove ref files
+
+expecting success of 0601.9 'see if git pack-refs --prune removes empty dirs': 
+	git branch r/s/t &&
+	git pack-refs --all --prune &&
+	! test -e .git/refs/heads/r
+
+ok 9 - see if git pack-refs --prune removes empty dirs
+
+expecting success of 0601.10 'git branch g should work when git branch g/h has been deleted': 
+	git branch g/h &&
+	git pack-refs --all --prune &&
+	git branch -d g/h &&
+	git branch g &&
+	git pack-refs --all &&
+	git branch -d g
+
+Deleted branch g/h (was 2daebe9).
+Deleted branch g (was 2daebe9).
+ok 10 - git branch g should work when git branch g/h has been deleted
+
+expecting success of 0601.11 'git branch i/j/k should barf if branch i exists': 
+	git branch i &&
+	git pack-refs --all --prune &&
+	test_must_fail git branch i/j/k
+
+fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
+ok 11 - git branch i/j/k should barf if branch i exists
+
+expecting success of 0601.12 'test git branch k after branch k/l/m and k/lm have been deleted': 
+	git branch k/l &&
+	git branch k/lm &&
+	git branch -d k/l &&
+	git branch k/l/m &&
+	git branch -d k/l/m &&
+	git branch -d k/lm &&
+	git branch k
+
+Deleted branch k/l (was 2daebe9).
+Deleted branch k/l/m (was 2daebe9).
+Deleted branch k/lm (was 2daebe9).
+ok 12 - test git branch k after branch k/l/m and k/lm have been deleted
+
+expecting success of 0601.13 'test git branch n after some branch deletion and pruning': 
+	git branch n/o &&
+	git branch n/op &&
+	git branch -d n/o &&
+	git branch n/o/p &&
+	git branch -d n/op &&
+	git pack-refs --all --prune &&
+	git branch -d n/o/p &&
+	git branch n
+
+Deleted branch n/o (was 2daebe9).
+Deleted branch n/op (was 2daebe9).
+Deleted branch n/o/p (was 2daebe9).
+ok 13 - test git branch n after some branch deletion and pruning
+
+expecting success of 0601.14 'test excluded refs are not packed': 
+	git branch dont_pack1 &&
+	git branch dont_pack2 &&
+	git branch pack_this &&
+	git pack-refs --all --exclude "refs/heads/dont_pack*" &&
+	test -f .git/refs/heads/dont_pack1 &&
+	test -f .git/refs/heads/dont_pack2 &&
+	! test -f .git/refs/heads/pack_this
+ok 14 - test excluded refs are not packed
+
+expecting success of 0601.15 'test --no-exclude refs clears excluded refs': 
+	git branch dont_pack3 &&
+	git branch dont_pack4 &&
+	git pack-refs --all --exclude "refs/heads/dont_pack*" --no-exclude &&
+	! test -f .git/refs/heads/dont_pack3 &&
+	! test -f .git/refs/heads/dont_pack4
+ok 15 - test --no-exclude refs clears excluded refs
+
+expecting success of 0601.16 'test only included refs are packed': 
+	git branch pack_this1 &&
+	git branch pack_this2 &&
+	git tag dont_pack5 &&
+	git pack-refs --include "refs/heads/pack_this*" &&
+	test -f .git/refs/tags/dont_pack5 &&
+	! test -f .git/refs/heads/pack_this1 &&
+	! test -f .git/refs/heads/pack_this2
+ok 16 - test only included refs are packed
+
+expecting success of 0601.17 'test --no-include refs clears included refs': 
+	git branch pack1 &&
+	git branch pack2 &&
+	git pack-refs --include "refs/heads/pack*" --no-include &&
+	test -f .git/refs/heads/pack1 &&
+	test -f .git/refs/heads/pack2
+ok 17 - test --no-include refs clears included refs
+
+expecting success of 0601.18 'test --exclude takes precedence over --include': 
+	git branch dont_pack5 &&
+	git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
+	test -f .git/refs/heads/dont_pack5
+ok 18 - test --exclude takes precedence over --include
+
+expecting success of 0601.19 'see if up-to-date packed refs are preserved': 
+	git branch q &&
+	git pack-refs --all --prune &&
+	git update-ref refs/heads/q refs/heads/q &&
+	! test -f .git/refs/heads/q
+
+ok 19 - see if up-to-date packed refs are preserved
+
+expecting success of 0601.20 'pack, prune and repack': 
+	git tag foo &&
+	git pack-refs --all --prune &&
+	git show-ref >all-of-them &&
+	git pack-refs &&
+	git show-ref >again &&
+	test_cmp all-of-them again
+
+ok 20 - pack, prune and repack
+
+expecting success of 0601.21 'explicit pack-refs with dangling packed reference': 
+	git commit --allow-empty -m "soon to be garbage-collected" &&
+	git pack-refs --all &&
+	git reset --hard HEAD^ &&
+	git reflog expire --expire=all --all &&
+	git prune --expire=all &&
+	git pack-refs --all 2>result &&
+	test_must_be_empty result
+
+[main 6d2fc87] soon to be garbage-collected
+ Author: A U Thor <author@example.com>
+HEAD is now at 2daebe9 Initial commit.
+ok 21 - explicit pack-refs with dangling packed reference
+
+expecting success of 0601.22 'delete ref with dangling packed version': 
+	git checkout -b lamb &&
+	git commit --allow-empty -m "future garbage" &&
+	git pack-refs --all &&
+	git reset --hard HEAD^ &&
+	git checkout main &&
+	git reflog expire --expire=all --all &&
+	git prune --expire=all &&
+	git branch -d lamb 2>result &&
+	test_must_be_empty result
+
+Switched to a new branch 'lamb'
+[lamb ce057e0] future garbage
+ Author: A U Thor <author@example.com>
+HEAD is now at 2daebe9 Initial commit.
+Switched to branch 'main'
+Deleted branch lamb (was 2daebe9).
+ok 22 - delete ref with dangling packed version
+
+expecting success of 0601.23 'delete ref while another dangling packed ref': 
+	git branch lamb &&
+	git commit --allow-empty -m "future garbage" &&
+	git pack-refs --all &&
+	git reset --hard HEAD^ &&
+	git reflog expire --expire=all --all &&
+	git prune --expire=all &&
+	git branch -d lamb 2>result &&
+	test_must_be_empty result
+
+[main ce057e0] future garbage
+ Author: A U Thor <author@example.com>
+HEAD is now at 2daebe9 Initial commit.
+Deleted branch lamb (was 2daebe9).
+ok 23 - delete ref while another dangling packed ref
+
+expecting success of 0601.24 'pack ref directly below refs/': 
+	git update-ref refs/top HEAD &&
+	git pack-refs --all --prune &&
+	grep refs/top .git/packed-refs &&
+	test_path_is_missing .git/refs/top
+
+2daebe96d7fd03d28875d852f87c06a18f4a6639 refs/top
+ok 24 - pack ref directly below refs/
+
+expecting success of 0601.25 'do not pack ref in refs/bisect': 
+	git update-ref refs/bisect/local HEAD &&
+	git pack-refs --all --prune &&
+	! grep refs/bisect/local .git/packed-refs >/dev/null &&
+	test_path_is_file .git/refs/bisect/local
+
+ok 25 - do not pack ref in refs/bisect
+
+expecting success of 0601.26 'disable reflogs': 
+	git config core.logallrefupdates false &&
+	rm -rf .git/logs
+
+ok 26 - disable reflogs
+
+expecting success of 0601.27 'create packed foo/bar/baz branch': 
+	git branch foo/bar/baz &&
+	git pack-refs --all --prune &&
+	test_path_is_missing .git/refs/heads/foo/bar/baz &&
+	test_must_fail git reflog exists refs/heads/foo/bar/baz
+
+ok 27 - create packed foo/bar/baz branch
+
+expecting success of 0601.28 'notice d/f conflict with existing directory': 
+	test_must_fail git branch foo &&
+	test_must_fail git branch foo/bar
+
+fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
+fatal: cannot lock ref 'refs/heads/foo/bar': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar'
+ok 28 - notice d/f conflict with existing directory
+
+expecting success of 0601.29 'existing directory reports concrete ref': 
+	test_must_fail git branch foo 2>stderr &&
+	test_grep refs/heads/foo/bar/baz stderr
+
+fatal: cannot lock ref 'refs/heads/foo': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo'
+ok 29 - existing directory reports concrete ref
+
+expecting success of 0601.30 'notice d/f conflict with existing ref': 
+	test_must_fail git branch foo/bar/baz/extra &&
+	test_must_fail git branch foo/bar/baz/lots/of/extra/components
+
+fatal: cannot lock ref 'refs/heads/foo/bar/baz/extra': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/extra'
+fatal: cannot lock ref 'refs/heads/foo/bar/baz/lots/of/extra/components': 'refs/heads/foo/bar/baz' exists; cannot create 'refs/heads/foo/bar/baz/lots/of/extra/components'
+ok 30 - notice d/f conflict with existing ref
+
+expecting success of 0601.31 'reject packed-refs with unterminated line': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
+	echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 31 - reject packed-refs with unterminated line
+
+expecting success of 0601.32 'reject packed-refs containing junk': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%s\n" "bogus content" >>.git/packed-refs &&
+	echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 32 - reject packed-refs containing junk
+
+expecting success of 0601.33 'reject packed-refs with a short SHA-1': 
+	cp .git/packed-refs .git/packed-refs.bak &&
+	test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+	printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
+	printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
+	test_must_fail git for-each-ref >out 2>err &&
+	test_cmp expected_err err
+
+ok 33 - reject packed-refs with a short SHA-1
+
+expecting success of 0601.34 'timeout if packed-refs.lock exists': 
+	LOCK=.git/packed-refs.lock &&
+	>"$LOCK" &&
+	test_when_finished "rm -f $LOCK" &&
+	test_must_fail git pack-refs --all --prune
+
+fatal: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/.git/packed-refs.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+ok 34 - timeout if packed-refs.lock exists
+
+expecting success of 0601.35 'retry acquiring packed-refs.lock': 
+	LOCK=.git/packed-refs.lock &&
+	>"$LOCK" &&
+	test_when_finished "wait && rm -f $LOCK" &&
+	{
+		( sleep 1 && rm -f $LOCK ) &
+	} &&
+	git -c core.packedrefstimeout=3000 pack-refs --all --prune
+
+ok 35 - retry acquiring packed-refs.lock
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0601.36 'pack symlinked packed-refs': 
+	# First make sure that symlinking works when reading:
+	git update-ref refs/heads/lossy refs/heads/main &&
+	git for-each-ref >all-refs-before &&
+	mv .git/packed-refs .git/my-deviant-packed-refs &&
+	ln -s my-deviant-packed-refs .git/packed-refs &&
+	git for-each-ref >all-refs-linked &&
+	test_cmp all-refs-before all-refs-linked &&
+	git pack-refs --all --prune &&
+	git for-each-ref >all-refs-packed &&
+	test_cmp all-refs-before all-refs-packed &&
+	test -h .git/packed-refs &&
+	test "$(test_readlink .git/packed-refs)" = "my-deviant-packed-refs"
+
+ok 36 - pack symlinked packed-refs
+
+expecting success of 0601.37 'refs/worktree must not be packed': 
+	test_commit initial &&
+	test_commit wt1 &&
+	test_commit wt2 &&
+	git worktree add wt1 wt1 &&
+	git worktree add wt2 wt2 &&
+	git checkout initial &&
+	git update-ref refs/worktree/foo HEAD &&
+	git -C wt1 update-ref refs/worktree/foo HEAD &&
+	git -C wt2 update-ref refs/worktree/foo HEAD &&
+	git pack-refs --all &&
+	test_path_is_missing .git/refs/tags/wt1 &&
+	test_path_is_file .git/refs/worktree/foo &&
+	test_path_is_file .git/worktrees/wt1/refs/worktree/foo &&
+	test_path_is_file .git/worktrees/wt2/refs/worktree/foo
+
+[main 68c0c7f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main e8c3d37] wt1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wt1.t
+[main dfc35c5] wt2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 wt2.t
+Preparing worktree (detached HEAD e8c3d37)
+HEAD is now at e8c3d37 wt1
+Preparing worktree (detached HEAD dfc35c5)
+HEAD is now at dfc35c5 wt2
+Note: switching to 'initial'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 68c0c7f initial
+ok 37 - refs/worktree must not be packed
+
+expecting success of 0601.38 'create packed-refs file with broken ref': 
+	test_tick && git commit --allow-empty -m one &&
+	recoverable=$(git rev-parse HEAD) &&
+	test_tick && git commit --allow-empty -m two &&
+	missing=$(git rev-parse HEAD) &&
+	rm -f .git/refs/heads/main &&
+	cat >.git/packed-refs <<-EOF &&
+	$missing refs/heads/main
+	$recoverable refs/heads/other
+	EOF
+	echo $missing >expect &&
+	git rev-parse refs/heads/main >actual &&
+	test_cmp expect actual
+
+[detached HEAD 23b55e4] one
+ Author: A U Thor <author@example.com>
+[detached HEAD 8e70490] two
+ Author: A U Thor <author@example.com>
+ok 38 - create packed-refs file with broken ref
+
+expecting success of 0601.39 'pack-refs does not silently delete broken packed ref': 
+	git pack-refs --all --prune &&
+	git rev-parse refs/heads/main >actual &&
+	test_cmp expect actual
+
+ok 39 - pack-refs does not silently delete broken packed ref
+
+expecting success of 0601.40 'pack-refs does not drop broken refs during deletion': 
+	git update-ref -d refs/heads/other &&
+	git rev-parse refs/heads/main >actual &&
+	test_cmp expect actual
+
+ok 40 - pack-refs does not drop broken refs during deletion
+
+expecting success of 0601.41 'git pack-refs --all --auto does not repack below 16 refs without packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			# Create 14 additional references, which brings us to
+			# 15 together with the default branch.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 14) >stdin &&
+			git update-ref --stdin <stdin &&
+			test_path_is_missing .git/packed-refs &&
+			git pack-refs --auto --all &&
+			test_path_is_missing .git/packed-refs &&
+
+			# Create the 16th reference, which should cause us to repack.
+			git update-ref refs/heads/loose-15 HEAD &&
+			git pack-refs --auto --all &&
+			test_path_is_file .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 41 - git pack-refs --all --auto does not repack below 16 refs without packed-refs
+
+expecting success of 0601.42 'git pack-refs --all --auto does not repack below 16 refs with small packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			git pack-refs --all &&
+			test_line_count = 2 .git/packed-refs &&
+
+			# Create 15 loose references.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 15) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 2 .git/packed-refs &&
+
+			# Create the 16th loose reference, which should cause us to repack.
+			git update-ref refs/heads/loose-17 HEAD &&
+			git pack-refs --auto --all &&
+			test_line_count = 18 .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 42 - git pack-refs --all --auto does not repack below 16 refs with small packed-refs
+
+expecting success of 0601.43 'git pack-refs --all --auto scales with size of packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			# Create 99 packed refs. This should cause the heuristic
+			# to require more than the minimum amount of loose refs.
+			test_seq 99 |
+			while read i
+			do
+				printf "create refs/heads/packed-%d HEAD\n" $i || return 1
+			done >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --all &&
+			test_line_count = 101 .git/packed-refs &&
+
+			# Create 24 loose refs, which should not yet cause us to repack.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 24) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 101 .git/packed-refs &&
+
+			# Create another handful of refs to cross the border.
+			# Note that we explicitly do not check for strict
+			# boundaries here, as this also depends on the size of
+			# the object hash.
+			printf "create refs/heads/addn-%d HEAD\n" $(test_seq 10) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 135 .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 43 - git pack-refs --all --auto scales with size of packed-refs
+
+expecting success of 0601.44 'git maintenance run --task=pack-refs --auto does not repack below 16 refs without packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			# Create 14 additional references, which brings us to
+			# 15 together with the default branch.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 14) >stdin &&
+			git update-ref --stdin <stdin &&
+			test_path_is_missing .git/packed-refs &&
+			git pack-refs --auto --all &&
+			test_path_is_missing .git/packed-refs &&
+
+			# Create the 16th reference, which should cause us to repack.
+			git update-ref refs/heads/loose-15 HEAD &&
+			git pack-refs --auto --all &&
+			test_path_is_file .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 44 - git maintenance run --task=pack-refs --auto does not repack below 16 refs without packed-refs
+
+expecting success of 0601.45 'git maintenance run --task=pack-refs --auto does not repack below 16 refs with small packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			git pack-refs --all &&
+			test_line_count = 2 .git/packed-refs &&
+
+			# Create 15 loose references.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 15) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 2 .git/packed-refs &&
+
+			# Create the 16th loose reference, which should cause us to repack.
+			git update-ref refs/heads/loose-17 HEAD &&
+			git pack-refs --auto --all &&
+			test_line_count = 18 .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 45 - git maintenance run --task=pack-refs --auto does not repack below 16 refs with small packed-refs
+
+expecting success of 0601.46 'git maintenance run --task=pack-refs --auto scales with size of packed-refs': 
+		test_when_finished "rm -rf repo" &&
+		git init repo &&
+		(
+			cd repo &&
+			git config set maintenance.auto false &&
+			git commit --allow-empty --message "initial" &&
+
+			# Create 99 packed refs. This should cause the heuristic
+			# to require more than the minimum amount of loose refs.
+			test_seq 99 |
+			while read i
+			do
+				printf "create refs/heads/packed-%d HEAD\n" $i || return 1
+			done >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --all &&
+			test_line_count = 101 .git/packed-refs &&
+
+			# Create 24 loose refs, which should not yet cause us to repack.
+			printf "create refs/heads/loose-%d HEAD\n" $(test_seq 24) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 101 .git/packed-refs &&
+
+			# Create another handful of refs to cross the border.
+			# Note that we explicitly do not check for strict
+			# boundaries here, as this also depends on the size of
+			# the object hash.
+			printf "create refs/heads/addn-%d HEAD\n" $(test_seq 10) >stdin &&
+			git update-ref --stdin <stdin &&
+			git pack-refs --auto --all &&
+			test_line_count = 135 .git/packed-refs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0601-reffiles-pack-refs/repo/.git/
+[main (root-commit) de45b2c] initial
+ Author: A U Thor <author@example.com>
+ok 46 - git maintenance run --task=pack-refs --auto scales with size of packed-refs
+
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1003-read-tree-prefix/.git/
+expecting success of 1003.1 'setup': 
+	echo hello >one &&
+	git update-index --add one &&
+	tree=$(git write-tree) &&
+	echo tree is $tree
+
+tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
+ok 1 - setup
+
+expecting success of 1003.2 'read-tree --prefix': 
+	git read-tree --prefix=two/ $tree &&
+	git ls-files >actual &&
+	cmp expect actual
+
+ok 2 - read-tree --prefix
+
+expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/two/ $tree &&
+	git read-tree --prefix=two/ $tree &&
+
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/ $tree &&
+	git read-tree --prefix= $tree
+
+rm 'one'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+ok 3 - read-tree --prefix with leading slash exits with error
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0613-reftable-write-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0613-reftable-write-options/.git/
 expecting success of 0613.1 'default write options': 
@@ -39125,6 +39080,481 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1001-read-tree-m-2way/.git/
+expecting success of 1001.1 'setup': 
+	echo frotz >frotz &&
+	echo nitfol >nitfol &&
+	cat bozbar-old >bozbar &&
+	echo rezrov >rezrov &&
+	echo yomin >yomin &&
+	git update-index --add nitfol bozbar rezrov &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH &&
+
+	cat bozbar-new >bozbar &&
+	git update-index --add frotz bozbar --force-remove rezrov &&
+	git ls-files --stage >M.out &&
+	treeM=$(git write-tree) &&
+	echo treeM $treeM &&
+	git ls-tree $treeM &&
+	git diff-tree $treeH $treeM
+
+treeH ca3aa9e6ee09349df7db6f0de15016afcdf5d9e4
+100644 blob 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab	bozbar
+100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
+100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
+treeM d2c045ead2ecb56f2632385a395918bf21816c12
+100644 blob 346d4e61f111336a1443ef6b2e834aa5b1a7f91a	bozbar
+100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
+100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
+:100644 100644 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab 346d4e61f111336a1443ef6b2e834aa5b1a7f91a M	bozbar
+:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
+:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
+ok 1 - setup
+
+expecting success of 1001.2 '1, 2, 3 - no carry forward': 
+	rm -f .git/index &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >1-3.out &&
+	test_cmp M.out 1-3.out &&
+	check_cache_at bozbar dirty &&
+	check_cache_at frotz dirty &&
+	check_cache_at nitfol dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+bozbar: dirty
+frotz: dirty
+nitfol: dirty
+ok 2 - 1, 2, 3 - no carry forward
+
+expecting success of 1001.3 '4 - carry forward local addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	git update-index --add yomin &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >4.out &&
+	test_must_fail git diff --no-index M.out 4.out >4diff.out &&
+	compare_change 4diff.out expected &&
+	check_cache_at yomin clean
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
+yomin: clean
+ok 3 - 4 - carry forward local addition.
+
+expecting success of 1001.4 '5 - carry forward local addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo yomin >yomin &&
+	git update-index --add yomin &&
+	echo yomin yomin >yomin &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >5.out &&
+	test_must_fail git diff --no-index M.out 5.out >5diff.out &&
+	compare_change 5diff.out expected &&
+	check_cache_at yomin dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
+yomin: dirty
+ok 4 - 5 - carry forward local addition.
+
+expecting success of 1001.5 '6 - local addition already has the same.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	git update-index --add frotz &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >6.out &&
+	test_cmp M.out 6.out &&
+	check_cache_at frotz clean
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: clean
+ok 5 - 6 - local addition already has the same.
+
+expecting success of 1001.6 '7 - local addition already has the same.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz frotz >frotz &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >7.out &&
+	test_cmp M.out 7.out &&
+	check_cache_at frotz dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: dirty
+ok 6 - 7 - local addition already has the same.
+
+expecting success of 1001.7 '8 - conflicting addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
+
+expecting success of 1001.8 '9 - conflicting addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz >frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 8 - 9 - conflicting addition.
+
+expecting success of 1001.9 '10 - path removed.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo rezrov >rezrov &&
+	git update-index --add rezrov &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >10.out &&
+	test_cmp M.out 10.out
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+ok 9 - 10 - path removed.
+
+expecting success of 1001.10 '11 - dirty path removed.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo rezrov >rezrov &&
+	git update-index --add rezrov &&
+	echo rezrov rezrov >rezrov &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'rezrov' not uptodate. Cannot merge.
+ok 10 - 11 - dirty path removed.
+
+expecting success of 1001.11 '12 - unmatching local changes being removed.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo rezrov rezrov >rezrov &&
+	git update-index --add rezrov &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 11 - 12 - unmatching local changes being removed.
+
+expecting success of 1001.12 '13 - unmatching local changes being removed.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo rezrov rezrov >rezrov &&
+	git update-index --add rezrov &&
+	echo rezrov >rezrov &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
+ok 12 - 13 - unmatching local changes being removed.
+
+expecting success of 1001.13 '14 - unchanged in two heads.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo nitfol nitfol >nitfol &&
+	git update-index --add nitfol &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >14.out &&
+	test_must_fail git diff --no-index M.out 14.out >14diff.out &&
+	compare_change 14diff.out expected &&
+	check_cache_at nitfol clean
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: clean
+ok 13 - 14 - unchanged in two heads.
+
+expecting success of 1001.14 '15 - unchanged in two heads.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo nitfol nitfol >nitfol &&
+	git update-index --add nitfol &&
+	echo nitfol nitfol nitfol >nitfol &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >15.out &&
+	test_must_fail git diff --no-index M.out 15.out >15diff.out &&
+	compare_change 15diff.out expected &&
+	check_cache_at nitfol dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
+nitfol: dirty
+ok 14 - 15 - unchanged in two heads.
+
+expecting success of 1001.15 '16 - conflicting local change.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo bozbar bozbar >bozbar &&
+	git update-index --add bozbar &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 15 - 16 - conflicting local change.
+
+expecting success of 1001.16 '17 - conflicting local change.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo bozbar bozbar >bozbar &&
+	git update-index --add bozbar &&
+	echo bozbar bozbar bozbar >bozbar &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 16 - 17 - conflicting local change.
+
+expecting success of 1001.17 '18 - local change already having a good result.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	cat bozbar-new >bozbar &&
+	git update-index --add bozbar &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >18.out &&
+	test_cmp M.out 18.out &&
+	check_cache_at bozbar clean
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+bozbar: clean
+ok 17 - 18 - local change already having a good result.
+
+expecting success of 1001.18 '19 - local change already having a good result, further modified.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	cat bozbar-new >bozbar &&
+	git update-index --add bozbar &&
+	echo gnusto gnusto >bozbar &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >19.out &&
+	test_cmp M.out 19.out &&
+	check_cache_at bozbar dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+bozbar: dirty
+ok 18 - 19 - local change already having a good result, further modified.
+
+expecting success of 1001.19 '20 - no local change, use new tree.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	cat bozbar-old >bozbar &&
+	git update-index --add bozbar &&
+	read_tree_twoway $treeH $treeM &&
+	git ls-files --stage >20.out &&
+	test_cmp M.out 20.out &&
+	check_cache_at bozbar dirty
+
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+bozbar: dirty
+ok 19 - 20 - no local change, use new tree.
+
+expecting success of 1001.20 '21 - no local change, dirty cache.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	cat bozbar-old >bozbar &&
+	git update-index --add bozbar &&
+	echo gnusto gnusto >bozbar &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'bozbar' not uptodate. Cannot merge.
+ok 20 - 21 - no local change, dirty cache.
+
+expecting success of 1001.21 '22 - local change cache updated.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
+	git update-index --add bozbar &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
+
+error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
+ok 21 - 22 - local change cache updated.
+
+expecting success of 1001.22 'DF vs DF/DF case setup.': 
+	rm -f .git/index &&
+	echo DF >DF &&
+	git update-index --add DF &&
+	treeDF=$(git write-tree) &&
+	echo treeDF $treeDF &&
+	git ls-tree $treeDF &&
+
+	rm -f DF &&
+	mkdir DF &&
+	echo DF/DF >DF/DF &&
+	git update-index --add --remove DF DF/DF &&
+	treeDFDF=$(git write-tree) &&
+	echo treeDFDF $treeDFDF &&
+	git ls-tree $treeDFDF &&
+	git ls-files --stage >DFDF.out
+
+treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
+100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
+treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
+040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
+ok 22 - DF vs DF/DF case setup.
+
+expecting success of 1001.23 'DF vs DF/DF case test.': 
+	rm -f .git/index &&
+	rm -fr DF &&
+	echo DF >DF &&
+	git update-index --add DF &&
+	read_tree_twoway $treeDF $treeDFDF &&
+	git ls-files --stage >DFDFcheck.out &&
+	test_cmp DFDF.out DFDFcheck.out &&
+	check_cache_at DF/DF dirty &&
+	:
+
+100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
+DF/DF: dirty
+ok 23 - DF vs DF/DF case test.
+
+expecting success of 1001.24 'a/b (untracked) vs a case setup.': 
+	rm -f .git/index &&
+	: >a &&
+	git update-index --add a &&
+	treeM=$(git write-tree) &&
+	echo treeM $treeM &&
+	git ls-tree $treeM &&
+	git ls-files --stage >treeM.out &&
+
+	rm -f a &&
+	git update-index --remove a &&
+	mkdir a &&
+	: >a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
+
+treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
+100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
+treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 24 - a/b (untracked) vs a case setup.
+
+expecting success of 1001.25 'a/b (untracked) vs a, plus c/d case test.': 
+	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
+	git ls-files --stage &&
+	test -f a/b
+
+error: Updating 'a' would lose untracked files in it
+error: Updating 'a' would lose untracked files in it
+ok 25 - a/b (untracked) vs a, plus c/d case test.
+
+expecting success of 1001.26 'read-tree supports the super-prefix': 
+	cat <<-EOF >expect &&
+		error: Updating 'fictional/a' would lose untracked files in it
+	EOF
+	test_must_fail git read-tree --super-prefix fictional/ -u -m "$treeH" "$treeM" 2>actual &&
+	test_cmp expect actual
+
+ok 26 - read-tree supports the super-prefix
+
+expecting success of 1001.27 'a/b vs a, plus c/d case setup.': 
+	rm -f .git/index &&
+	rm -fr a &&
+	: >a &&
+	mkdir c &&
+	: >c/d &&
+	git update-index --add a c/d &&
+	treeM=$(git write-tree) &&
+	echo treeM $treeM &&
+	git ls-tree $treeM &&
+	git ls-files --stage >treeM.out &&
+
+	rm -f a &&
+	mkdir a &&
+	: >a/b &&
+	git update-index --add --remove a a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
+
+treeM 3e82e8b9894d6c7982dcd25a6dad66400d52735f
+100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
+040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
+treeH 02c6f058fb950781e5b773c21e4c237db1ff4d5a
+040000 tree 4277b6e69d25e5efa77c455340557b384a4c018a	a
+040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
+ok 27 - a/b vs a, plus c/d case setup.
+
+expecting success of 1001.28 'a/b vs a, plus c/d case test.': 
+	read_tree_u_must_succeed -u -m "$treeH" "$treeM" &&
+	git ls-files --stage >treeMcheck.out &&
+	test_cmp treeM.out treeMcheck.out
+
+ok 28 - a/b vs a, plus c/d case test.
+
+expecting success of 1001.29 '-m references the correct modified tree': 
+	echo >file-a &&
+	echo >file-b &&
+	git add file-a file-b &&
+	git commit -a -m "test for correct modified tree" &&
+	git branch initial-mod &&
+	echo b >file-b &&
+	git commit -a -m "B" &&
+	echo a >file-a &&
+	git add file-a &&
+	git ls-tree $(git write-tree) file-a >expect &&
+	read_tree_must_succeed -m HEAD initial-mod &&
+	git ls-tree $(git write-tree) file-a >actual &&
+	test_cmp expect actual
+
+[master (root-commit) 0d16b8a] test for correct modified tree
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 c/d
+ create mode 100644 file-a
+ create mode 100644 file-b
+[master 9f64e7b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 29 - -m references the correct modified tree
+
+# passed all 29 test(s)
+1..29
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1004-read-tree-m-u-wf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1004-read-tree-m-u-wf/.git/
 expecting success of 1004.1 'two-way setup': 
@@ -39493,338 +39923,407 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1001-read-tree-m-2way/.git/
-expecting success of 1001.1 'setup': 
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1008-read-tree-overlay/.git/
+expecting success of 1008.1 'setup': 
+	echo one >a &&
+	git add a &&
+	git commit -m initial &&
+	git tag initial &&
+	echo two >b &&
+	git add b &&
+	git commit -m second &&
+	git checkout -b side initial &&
+	echo three >a &&
+	mkdir b &&
+	echo four >b/c &&
+	git add b/c &&
+	git commit -m third
+
+[main (root-commit) 4d54ff5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main a9fb064] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to a new branch 'side'
+[side 2be041c] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b/c
+ok 1 - setup
+
+expecting success of 1008.2 'multi-read': 
+	read_tree_must_succeed initial main side &&
+	test_write_lines a b/c >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 2 - multi-read
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1009-read-tree-new-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1009-read-tree-new-index/.git/
+expecting success of 1009.1 'setup': 
+	echo one >a &&
+	git add a &&
+	git commit -m initial
+
+[main (root-commit) 4d54ff5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 1009.2 'non-existent index file': 
+	rm -f new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
+
+ok 2 - non-existent index file
+
+expecting success of 1009.3 'empty index file': 
+	rm -f new-index &&
+	> new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
+
+ok 3 - empty index file
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1002-read-tree-m-u-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1002-read-tree-m-u-2way/.git/
+expecting success of 1002.1 'setup': 
 	echo frotz >frotz &&
 	echo nitfol >nitfol &&
-	cat bozbar-old >bozbar &&
+	echo bozbar >bozbar &&
 	echo rezrov >rezrov &&
-	echo yomin >yomin &&
 	git update-index --add nitfol bozbar rezrov &&
 	treeH=$(git write-tree) &&
 	echo treeH $treeH &&
 	git ls-tree $treeH &&
 
-	cat bozbar-new >bozbar &&
+	echo gnusto >bozbar &&
 	git update-index --add frotz bozbar --force-remove rezrov &&
 	git ls-files --stage >M.out &&
 	treeM=$(git write-tree) &&
 	echo treeM $treeM &&
 	git ls-tree $treeM &&
+	cp bozbar bozbar.M &&
+	cp frotz frotz.M &&
+	cp nitfol nitfol.M &&
 	git diff-tree $treeH $treeM
 
-treeH ca3aa9e6ee09349df7db6f0de15016afcdf5d9e4
-100644 blob 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab	bozbar
+treeH 661afa9096b7e2d4b9a28a6e43736cd0b06d1308
+100644 blob 78d812a2124ff980a1a70f8cca493698d643d242	bozbar
 100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
 100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
-treeM d2c045ead2ecb56f2632385a395918bf21816c12
-100644 blob 346d4e61f111336a1443ef6b2e834aa5b1a7f91a	bozbar
+treeM 05bf9652e9b06473d6ca2f32ff60e2401e59bfa6
+100644 blob bb3b2cd2e136e1e4e7ecdf10068e246196dd8294	bozbar
 100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
 100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-:100644 100644 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab 346d4e61f111336a1443ef6b2e834aa5b1a7f91a M	bozbar
+:100644 100644 78d812a2124ff980a1a70f8cca493698d643d242 bb3b2cd2e136e1e4e7ecdf10068e246196dd8294 M	bozbar
 :000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
 :100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
 ok 1 - setup
 
-expecting success of 1001.2 '1, 2, 3 - no carry forward': 
-	rm -f .git/index &&
-	read_tree_twoway $treeH $treeM &&
+expecting success of 1002.2 '1, 2, 3 - no carry forward': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >1-3.out &&
-	test_cmp M.out 1-3.out &&
-	check_cache_at bozbar dirty &&
-	check_cache_at frotz dirty &&
-	check_cache_at nitfol dirty
+	cmp M.out 1-3.out &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	check_cache_at bozbar clean &&
+	check_cache_at frotz clean &&
+	check_cache_at nitfol clean
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-frotz: dirty
-nitfol: dirty
+bozbar: clean
+frotz: clean
+nitfol: clean
 ok 2 - 1, 2, 3 - no carry forward
 
-expecting success of 1001.3 '4 - carry forward local addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.3 '4 - carry forward local addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo "+100644 X 0	yomin" >expected &&
+	echo yomin >yomin &&
 	git update-index --add yomin &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >4.out &&
-	test_must_fail git diff --no-index M.out 4.out >4diff.out &&
+	test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out &&
 	compare_change 4diff.out expected &&
-	check_cache_at yomin clean
+	check_cache_at yomin clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo yomin >yomin1 &&
+	diff yomin yomin1 &&
+	rm -f yomin1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
 yomin: clean
 ok 3 - 4 - carry forward local addition.
 
-expecting success of 1001.4 '5 - carry forward local addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.4 '5 - carry forward local addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	read_tree_u_must_succeed -m -u $treeH &&
 	echo yomin >yomin &&
 	git update-index --add yomin &&
 	echo yomin yomin >yomin &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >5.out &&
-	test_must_fail git diff --no-index M.out 5.out >5diff.out &&
+	test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
 	compare_change 5diff.out expected &&
-	check_cache_at yomin dirty
+	check_cache_at yomin dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo yomin yomin >yomin1 &&
+	diff yomin yomin1 &&
+	rm -f yomin1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
 yomin: dirty
 ok 4 - 5 - carry forward local addition.
 
-expecting success of 1001.5 '6 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.5 '6 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz >frotz &&
 	git update-index --add frotz &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >6.out &&
 	test_cmp M.out 6.out &&
-	check_cache_at frotz clean
+	check_cache_at frotz clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 frotz: clean
 ok 5 - 6 - local addition already has the same.
 
-expecting success of 1001.6 '7 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.6 '7 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz >frotz &&
 	git update-index --add frotz &&
 	echo frotz frotz >frotz &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >7.out &&
 	test_cmp M.out 7.out &&
-	check_cache_at frotz dirty
+	check_cache_at frotz dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo frotz frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 frotz: dirty
 ok 6 - 7 - local addition already has the same.
 
-expecting success of 1001.7 '8 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.7 '8 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz frotz >frotz &&
 	git update-index --add frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'frotz' would be overwritten by merge. Cannot merge.
 ok 7 - 8 - conflicting addition.
 
-expecting success of 1001.8 '9 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.8 '9 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz frotz >frotz &&
 	git update-index --add frotz &&
 	echo frotz >frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'frotz' would be overwritten by merge. Cannot merge.
 ok 8 - 9 - conflicting addition.
 
-expecting success of 1001.9 '10 - path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.9 '10 - path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov >rezrov &&
 	git update-index --add rezrov &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >10.out &&
-	test_cmp M.out 10.out
+	cmp M.out 10.out &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 ok 9 - 10 - path removed.
 
-expecting success of 1001.10 '11 - dirty path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.10 '11 - dirty path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov >rezrov &&
 	git update-index --add rezrov &&
 	echo rezrov rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' not uptodate. Cannot merge.
 ok 10 - 11 - dirty path removed.
 
-expecting success of 1001.11 '12 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.11 '12 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov rezrov >rezrov &&
 	git update-index --add rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
 ok 11 - 12 - unmatching local changes being removed.
 
-expecting success of 1001.12 '13 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.12 '13 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov rezrov >rezrov &&
 	git update-index --add rezrov &&
 	echo rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
 ok 12 - 13 - unmatching local changes being removed.
 
-expecting success of 1001.13 '14 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.13 '14 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo nitfol nitfol >nitfol &&
 	git update-index --add nitfol &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >14.out &&
-	test_must_fail git diff --no-index M.out 14.out >14diff.out &&
+	test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
 	compare_change 14diff.out expected &&
-	check_cache_at nitfol clean
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	check_cache_at nitfol clean &&
+	echo nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
 nitfol: clean
 ok 13 - 14 - unchanged in two heads.
 
-expecting success of 1001.14 '15 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.14 '15 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo nitfol nitfol >nitfol &&
 	git update-index --add nitfol &&
 	echo nitfol nitfol nitfol >nitfol &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >15.out &&
-	test_must_fail git diff --no-index M.out 15.out >15diff.out &&
+	test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
 	compare_change 15diff.out expected &&
-	check_cache_at nitfol dirty
+	check_cache_at nitfol dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	echo nitfol nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
 nitfol: dirty
 ok 14 - 15 - unchanged in two heads.
 
-expecting success of 1001.15 '16 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.15 '16 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo bozbar bozbar >bozbar &&
 	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
 ok 15 - 16 - conflicting local change.
 
-expecting success of 1001.16 '17 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.16 '17 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo bozbar bozbar >bozbar &&
 	git update-index --add bozbar &&
 	echo bozbar bozbar bozbar >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
 ok 16 - 17 - conflicting local change.
 
-expecting success of 1001.17 '18 - local change already having a good result.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
+expecting success of 1002.17 '18 - local change already having a good result.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
 	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >18.out &&
 	test_cmp M.out 18.out &&
-	check_cache_at bozbar clean
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 bozbar: clean
 ok 17 - 18 - local change already having a good result.
 
-expecting success of 1001.18 '19 - local change already having a good result, further modified.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
+expecting success of 1002.18 '19 - local change already having a good result, further modified.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
 	git update-index --add bozbar &&
 	echo gnusto gnusto >bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >19.out &&
 	test_cmp M.out 19.out &&
-	check_cache_at bozbar dirty
+	check_cache_at bozbar dirty &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo gnusto gnusto >bozbar1 &&
+	diff bozbar bozbar1 &&
+	rm -f bozbar1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 bozbar: dirty
 ok 18 - 19 - local change already having a good result, further modified.
 
-expecting success of 1001.19 '20 - no local change, use new tree.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
+expecting success of 1002.19 '20 - no local change, use new tree.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
 	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >20.out &&
 	test_cmp M.out 20.out &&
-	check_cache_at bozbar dirty
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
+bozbar: clean
 ok 19 - 20 - no local change, use new tree.
 
-expecting success of 1001.20 '21 - no local change, dirty cache.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
+expecting success of 1002.20 '21 - no local change, dirty cache.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
 	git update-index --add bozbar &&
 	echo gnusto gnusto >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' not uptodate. Cannot merge.
 ok 20 - 21 - no local change, dirty cache.
 
-expecting success of 1001.21 '22 - local change cache updated.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
-	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 21 - 22 - local change cache updated.
-
-expecting success of 1001.22 'DF vs DF/DF case setup.': 
+expecting success of 1002.21 'DF vs DF/DF case setup.': 
 	rm -f .git/index &&
 	echo DF >DF &&
 	git update-index --add DF &&
@@ -39845,201 +40344,482 @@
 100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
 treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
 040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 22 - DF vs DF/DF case setup.
+ok 21 - DF vs DF/DF case setup.
 
-expecting success of 1001.23 'DF vs DF/DF case test.': 
+expecting success of 1002.22 'DF vs DF/DF case test.': 
 	rm -f .git/index &&
 	rm -fr DF &&
 	echo DF >DF &&
 	git update-index --add DF &&
-	read_tree_twoway $treeDF $treeDFDF &&
+	read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
 	git ls-files --stage >DFDFcheck.out &&
 	test_cmp DFDF.out DFDFcheck.out &&
-	check_cache_at DF/DF dirty &&
-	:
+	check_cache_at DF/DF clean
 
-100644 b90ea14b2dd74b6f377c10870b3757344bbe077c 0	DF/DF
-DF/DF: dirty
-ok 23 - DF vs DF/DF case test.
+DF/DF: clean
+ok 22 - DF vs DF/DF case test.
 
-expecting success of 1001.24 'a/b (untracked) vs a case setup.': 
-	rm -f .git/index &&
-	: >a &&
-	git update-index --add a &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git ls-files --stage >treeM.out &&
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1007-hash-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/.git/
+expecting success of 1007.1 'setup': 
+	setup_repo &&
+	test_oid_cache <<-EOF
+	hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
 
-	rm -f a &&
-	git update-index --remove a &&
-	mkdir a &&
-	: >a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
+	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+	EOF
 
-treeM 496d6428b9cf92981dc9495211e6e1120fb6f2ba
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-treeH 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 24 - a/b (untracked) vs a case setup.
+ok 1 - setup
 
-expecting success of 1001.25 'a/b (untracked) vs a, plus c/d case test.': 
-	read_tree_u_must_fail -u -m "$treeH" "$treeM" &&
-	git ls-files --stage &&
-	test -f a/b
+expecting success of 1007.2 'multiple '--stdin's are rejected': 
+	echo example | test_must_fail git hash-object --stdin --stdin
 
-error: Updating 'a' would lose untracked files in it
-error: Updating 'a' would lose untracked files in it
-ok 25 - a/b (untracked) vs a, plus c/d case test.
+error: Multiple --stdin arguments are not supported
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
 
-expecting success of 1001.26 'read-tree supports the super-prefix': 
-	cat <<-EOF >expect &&
-		error: Updating 'fictional/a' would lose untracked files in it
-	EOF
-	test_must_fail git read-tree --super-prefix fictional/ -u -m "$treeH" "$treeM" 2>actual &&
-	test_cmp expect actual
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
 
-ok 26 - read-tree supports the super-prefix
+ok 2 - multiple '--stdin's are rejected
 
-expecting success of 1001.27 'a/b vs a, plus c/d case setup.': 
-	rm -f .git/index &&
-	rm -fr a &&
-	: >a &&
-	mkdir c &&
-	: >c/d &&
-	git update-index --add a c/d &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git ls-files --stage >treeM.out &&
+expecting success of 1007.3 'Can't use --stdin and --stdin-paths together': 
+	echo example | test_must_fail git hash-object --stdin --stdin-paths &&
+	echo example | test_must_fail git hash-object --stdin-paths --stdin
 
-	rm -f a &&
-	mkdir a &&
-	: >a/b &&
-	git update-index --add --remove a a/b &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH
+error: Can't use --stdin-paths with --stdin
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
 
-treeM 3e82e8b9894d6c7982dcd25a6dad66400d52735f
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391	a
-040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
-treeH 02c6f058fb950781e5b773c21e4c237db1ff4d5a
-040000 tree 4277b6e69d25e5efa77c455340557b384a4c018a	a
-040000 tree 2a26db49a6962700da5bd4084ae0e5a22d6583ee	c
-ok 27 - a/b vs a, plus c/d case setup.
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
 
-expecting success of 1001.28 'a/b vs a, plus c/d case test.': 
-	read_tree_u_must_succeed -u -m "$treeH" "$treeM" &&
-	git ls-files --stage >treeMcheck.out &&
-	test_cmp treeM.out treeMcheck.out
+error: Can't use --stdin-paths with --stdin
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
 
-ok 28 - a/b vs a, plus c/d case test.
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
 
-expecting success of 1001.29 '-m references the correct modified tree': 
-	echo >file-a &&
-	echo >file-b &&
-	git add file-a file-b &&
-	git commit -a -m "test for correct modified tree" &&
-	git branch initial-mod &&
-	echo b >file-b &&
-	git commit -a -m "B" &&
-	echo a >file-a &&
-	git add file-a &&
-	git ls-tree $(git write-tree) file-a >expect &&
-	read_tree_must_succeed -m HEAD initial-mod &&
-	git ls-tree $(git write-tree) file-a >actual &&
-	test_cmp expect actual
+ok 3 - Can't use --stdin and --stdin-paths together
 
-[master (root-commit) 0d16b8a] test for correct modified tree
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 c/d
- create mode 100644 file-a
- create mode 100644 file-b
-[master 9f64e7b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 29 - -m references the correct modified tree
+expecting success of 1007.4 'Can't pass filenames as arguments with --stdin-paths': 
+	echo example | test_must_fail git hash-object --stdin-paths hello
 
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1008-read-tree-overlay/.git/
-expecting success of 1008.1 'setup': 
-	echo one >a &&
-	git add a &&
-	git commit -m initial &&
-	git tag initial &&
-	echo two >b &&
-	git add b &&
-	git commit -m second &&
-	git checkout -b side initial &&
-	echo three >a &&
-	mkdir b &&
-	echo four >b/c &&
-	git add b/c &&
-	git commit -m third
+error: Can't specify files with --stdin-paths
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
 
-[main (root-commit) 4d54ff5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main a9fb064] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to a new branch 'side'
-[side 2be041c] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b/c
-ok 1 - setup
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
 
-expecting success of 1008.2 'multi-read': 
-	read_tree_must_succeed initial main side &&
-	test_write_lines a b/c >expect &&
-	git ls-files >actual &&
+ok 4 - Can't pass filenames as arguments with --stdin-paths
+
+expecting success of 1007.5 'Can't use --path with --stdin-paths': 
+	echo example | test_must_fail git hash-object --stdin-paths --path=foo
+
+error: Can't use --stdin-paths with --path
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 5 - Can't use --path with --stdin-paths
+
+expecting success of 1007.6 'Can't use --path with --no-filters': 
+	test_must_fail git hash-object --no-filters --path=foo
+
+error: Can't use --path with --no-filters
+usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
+                       [--stdin [--literally]] [--] <file>...
+   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
+
+    -t <type>             object type
+    -w                    write the object into the object database
+    --[no-]stdin          read the object from stdin
+    --[no-]stdin-paths    read file names from stdin
+    --no-filters          store file as is without filters
+    --filters             opposite of --no-filters
+    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
+    --[no-]path <file>    process file as it were from this path
+
+ok 6 - Can't use --path with --no-filters
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.7 'hash a file': 
+	test "$(test_oid hello)" = $(git hash-object hello)
+
+ok 7 - hash a file
+
+expecting success of 1007.8 'blob does not exist in database': 
+		test_must_fail git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+fatal: git cat-file 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689: bad file
+ok 8 - blob does not exist in database
+
+expecting success of 1007.9 'hash from stdin': 
+	test "$(test_oid example)" = $(git hash-object --stdin < example)
+
+ok 9 - hash from stdin
+
+expecting success of 1007.10 'blob does not exist in database': 
+		test_must_fail git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+fatal: git cat-file ddd3f836d3e3fbb7ae289aa9ae83536f76956399: bad file
+ok 10 - blob does not exist in database
+
+expecting success of 1007.11 'hash a file and write to database': 
+	test "$(test_oid hello)" = $(git hash-object -w hello)
+
+ok 11 - hash a file and write to database
+
+expecting success of 1007.12 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 12 - blob exists in database
+
+expecting success of 1007.13 'git hash-object --stdin file1 <file0 first operates on file0, then file1': 
+	echo foo > file1 &&
+	obname0=$(echo bar | git hash-object --stdin) &&
+	obname1=$(git hash-object file1) &&
+	obname0new=$(echo bar | git hash-object --stdin file1 | sed -n -e 1p) &&
+	obname1new=$(echo bar | git hash-object --stdin file1 | sed -n -e 2p) &&
+	test "$obname0" = "$obname0new" &&
+	test "$obname1" = "$obname1new"
+
+ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
+
+expecting success of 1007.14 'set up crlf tests': 
+	echo fooQ | tr Q "\\015" >file0 &&
+	cp file0 file1 &&
+	echo "file0 -crlf" >.gitattributes &&
+	echo "file1 crlf" >>.gitattributes &&
+	git config core.autocrlf true &&
+	file0_sha=$(git hash-object file0) &&
+	file1_sha=$(git hash-object file1) &&
+	test "$file0_sha" != "$file1_sha"
+
+ok 14 - set up crlf tests
+
+expecting success of 1007.15 'check that appropriate filter is invoke when --path is used': 
+	path1_sha=$(git hash-object --path=file1 file0) &&
+	path0_sha=$(git hash-object --path=file0 file1) &&
+	test "$file0_sha" = "$path0_sha" &&
+	test "$file1_sha" = "$path1_sha" &&
+	path1_sha=$(git hash-object --path=file1 --stdin <file0) &&
+	path0_sha=$(git hash-object --path=file0 --stdin <file1) &&
+	test "$file0_sha" = "$path0_sha" &&
+	test "$file1_sha" = "$path1_sha"
+
+ok 15 - check that appropriate filter is invoke when --path is used
+
+expecting success of 1007.16 'gitattributes also work in a subdirectory': 
+	mkdir subdir &&
+	(
+		cd subdir &&
+		subdir_sha0=$(git hash-object ../file0) &&
+		subdir_sha1=$(git hash-object ../file1) &&
+		test "$file0_sha" = "$subdir_sha0" &&
+		test "$file1_sha" = "$subdir_sha1"
+	)
+
+ok 16 - gitattributes also work in a subdirectory
+
+expecting success of 1007.17 '--path works in a subdirectory': 
+	(
+		cd subdir &&
+		path1_sha=$(git hash-object --path=../file1 ../file0) &&
+		path0_sha=$(git hash-object --path=../file0 ../file1) &&
+		test "$file0_sha" = "$path0_sha" &&
+		test "$file1_sha" = "$path1_sha"
+	)
+
+ok 17 - --path works in a subdirectory
+
+expecting success of 1007.18 'check that --no-filters option works': 
+	nofilters_file1=$(git hash-object --no-filters file1) &&
+	test "$file0_sha" = "$nofilters_file1" &&
+	nofilters_file1=$(git hash-object --stdin <file1) &&
+	test "$file0_sha" = "$nofilters_file1"
+
+ok 18 - check that --no-filters option works
+
+expecting success of 1007.19 'check that --no-filters option works with --stdin-paths': 
+	nofilters_file1=$(echo "file1" | git hash-object --stdin-paths --no-filters) &&
+	test "$file0_sha" = "$nofilters_file1"
+
+ok 19 - check that --no-filters option works with --stdin-paths
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
+	
+ok 20 - hash from stdin and write to database (-w --stdin)
+
+expecting success of 1007.21 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 21 - blob exists in database
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
+	
+ok 22 - hash from stdin and write to database (--stdin -w)
+
+expecting success of 1007.23 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 23 - blob exists in database
+
+expecting success of 1007.24 'hash two files with names on stdin': 
+	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
+
+ok 24 - hash two files with names on stdin
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+	
+ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
+
+expecting success of 1007.26 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 26 - blob exists in database
+
+expecting success of 1007.27 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 27 - blob exists in database
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+	
+ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
+
+expecting success of 1007.29 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 29 - blob exists in database
+
+expecting success of 1007.30 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	
+This is an exampleok 30 - blob exists in database
+
+expecting success of 1007.31 'too-short tree': 
+	echo abc >malformed-tree &&
+	test_must_fail git hash-object -t tree malformed-tree 2>err &&
+	grep "too-short tree object" err
+
+error: too-short tree object
+ok 31 - too-short tree
+
+expecting success of 1007.32 'malformed mode in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	printf "9100644 \0$bin_oid" >tree-with-malformed-mode &&
+	test_must_fail git hash-object -t tree tree-with-malformed-mode 2>err &&
+	grep "malformed mode in tree entry" err
+
+error: malformed mode in tree entry
+ok 32 - malformed mode in tree
+
+expecting success of 1007.33 'empty filename in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	printf "100644 \0$bin_oid" >tree-with-empty-filename &&
+	test_must_fail git hash-object -t tree tree-with-empty-filename 2>err &&
+	grep "empty filename in tree entry" err
+
+error: empty filename in tree entry
+ok 33 - empty filename in tree
+
+expecting success of 1007.34 'duplicate filename in tree': 
+	hex_oid=$(echo foo | git hash-object --stdin -w) &&
+	bin_oid=$(echo $hex_oid | hex2oct) &&
+	{
+		printf "100644 file\0$bin_oid" &&
+		printf "100644 file\0$bin_oid"
+	} >tree-with-duplicate-filename &&
+	test_must_fail git hash-object -t tree tree-with-duplicate-filename 2>err &&
+	grep "duplicateEntries" err
+
+error: object fails fsck: duplicateEntries: contains duplicate file entries
+ok 34 - duplicate filename in tree
+
+expecting success of 1007.35 'corrupt commit': 
+	test_must_fail git hash-object -t commit --stdin </dev/null
+
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 35 - corrupt commit
+
+expecting success of 1007.36 'corrupt tag': 
+	test_must_fail git hash-object -t tag --stdin </dev/null
+
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 36 - corrupt tag
+
+expecting success of 1007.37 'hash-object complains about bogus type name': 
+	test_must_fail git hash-object -t bogus --stdin </dev/null
+
+fatal: invalid object type "bogus"
+ok 37 - hash-object complains about bogus type name
+
+expecting success of 1007.38 'hash-object complains about truncated type name': 
+	test_must_fail git hash-object -t bl --stdin </dev/null
+
+fatal: invalid object type "bl"
+ok 38 - hash-object complains about truncated type name
+
+expecting success of 1007.39 '--literally': 
+	t=1234567890 &&
+	echo example | git hash-object -t $t --literally --stdin
+
+f78b23c3f872d473c764d5fcf4fb39af8bbf2123
+ok 39 - --literally
+
+expecting success of 1007.40 '--literally with extra-long type': 
+	t=12345678901234567890123456789012345678901234567890 &&
+	t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" &&
+	echo example | git hash-object -t $t --literally --stdin
+
+2a881776ee43e849175ee7158075560ca0ae7692
+ok 40 - --literally with extra-long type
+
+expecting success of 1007.41 '--stdin outside of repository (uses SHA-1)': 
+	nongit git hash-object --stdin <hello >actual &&
+	echo "$(test_oid --hash=sha1 hello)" >expect &&
 	test_cmp expect actual
 
-ok 2 - multi-read
+ok 41 - --stdin outside of repository (uses SHA-1)
 
-# passed all 2 test(s)
-1..2
+# passed all 41 test(s)
+1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1009-read-tree-new-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1009-read-tree-new-index/.git/
-expecting success of 1009.1 'setup': 
-	echo one >a &&
-	git add a &&
-	git commit -m initial
+*** t1010-mktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1010-mktree/.git/
+expecting success of 1010.1 'setup': 
+	for d in a a- a0
+	do
+		mkdir "$d" && echo "$d/one" >"$d/one" &&
+		git add "$d" || return 1
+	done &&
+	echo zero >one &&
+	git update-index --add --info-only one &&
+	git write-tree --missing-ok >tree.missing &&
+	git ls-tree $(cat tree.missing) >top.missing &&
+	git ls-tree -r $(cat tree.missing) >all.missing &&
+	echo one >one &&
+	git add one &&
+	git write-tree >tree &&
+	git ls-tree $(cat tree) >top &&
+	git ls-tree -r $(cat tree) >all &&
+	test_tick &&
+	git commit -q -m one &&
+	H=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 $H sub &&
+	test_tick &&
+	git commit -q -m two &&
+	git rev-parse HEAD^{tree} >tree.withsub &&
+	git ls-tree HEAD >top.withsub &&
+	git ls-tree -r HEAD >all.withsub
 
-[main (root-commit) 4d54ff5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
 ok 1 - setup
 
-expecting success of 1009.2 'non-existent index file': 
-	rm -f new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+expecting success of 1010.2 'ls-tree piped to mktree (1)': 
+	git mktree <top >actual &&
+	test_cmp tree actual
 
-ok 2 - non-existent index file
+ok 2 - ls-tree piped to mktree (1)
 
-expecting success of 1009.3 'empty index file': 
-	rm -f new-index &&
-	> new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+expecting success of 1010.3 'ls-tree piped to mktree (2)': 
+	git mktree <top.withsub >actual &&
+	test_cmp tree.withsub actual
 
-ok 3 - empty index file
+ok 3 - ls-tree piped to mktree (2)
 
-# passed all 3 test(s)
-1..3
+expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
+	perl -e "print reverse <>" <top |
+	git mktree >actual &&
+	test_cmp tree actual
+
+ok 4 - ls-tree output in wrong order given to mktree (1)
+
+expecting success of 1010.5 'ls-tree output in wrong order given to mktree (2)': 
+	perl -e "print reverse <>" <top.withsub |
+	git mktree >actual &&
+	test_cmp tree.withsub actual
+
+ok 5 - ls-tree output in wrong order given to mktree (2)
+
+expecting success of 1010.6 'allow missing object with --missing': 
+	git mktree --missing <top.missing >actual &&
+	test_cmp tree.missing actual
+
+ok 6 - allow missing object with --missing
+
+expecting success of 1010.7 'mktree refuses to read ls-tree -r output (1)': 
+	test_must_fail git mktree <all
+
+fatal: path a-/one contains slash
+ok 7 - mktree refuses to read ls-tree -r output (1)
+
+expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
+	test_must_fail git mktree <all.withsub
+
+fatal: path a-/one contains slash
+ok 8 - mktree refuses to read ls-tree -r output (2)
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1000-read-tree-m-3way.sh ***
@@ -40684,831 +41464,6 @@
 1..83
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1007-hash-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/.git/
-expecting success of 1007.1 'setup': 
-	setup_repo &&
-	test_oid_cache <<-EOF
-	hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
-
-	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
-	EOF
-
-ok 1 - setup
-
-expecting success of 1007.2 'multiple '--stdin's are rejected': 
-	echo example | test_must_fail git hash-object --stdin --stdin
-
-error: Multiple --stdin arguments are not supported
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-ok 2 - multiple '--stdin's are rejected
-
-expecting success of 1007.3 'Can't use --stdin and --stdin-paths together': 
-	echo example | test_must_fail git hash-object --stdin --stdin-paths &&
-	echo example | test_must_fail git hash-object --stdin-paths --stdin
-
-error: Can't use --stdin-paths with --stdin
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-error: Can't use --stdin-paths with --stdin
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-ok 3 - Can't use --stdin and --stdin-paths together
-
-expecting success of 1007.4 'Can't pass filenames as arguments with --stdin-paths': 
-	echo example | test_must_fail git hash-object --stdin-paths hello
-
-error: Can't specify files with --stdin-paths
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-ok 4 - Can't pass filenames as arguments with --stdin-paths
-
-expecting success of 1007.5 'Can't use --path with --stdin-paths': 
-	echo example | test_must_fail git hash-object --stdin-paths --path=foo
-
-error: Can't use --stdin-paths with --path
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-ok 5 - Can't use --path with --stdin-paths
-
-expecting success of 1007.6 'Can't use --path with --no-filters': 
-	test_must_fail git hash-object --no-filters --path=foo
-
-error: Can't use --path with --no-filters
-usage: git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]
-                       [--stdin [--literally]] [--] <file>...
-   or: git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]
-
-    -t <type>             object type
-    -w                    write the object into the object database
-    --[no-]stdin          read the object from stdin
-    --[no-]stdin-paths    read file names from stdin
-    --no-filters          store file as is without filters
-    --filters             opposite of --no-filters
-    --[no-]literally      just hash any random garbage to create corrupt objects for debugging Git
-    --[no-]path <file>    process file as it were from this path
-
-ok 6 - Can't use --path with --no-filters
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.7 'hash a file': 
-	test "$(test_oid hello)" = $(git hash-object hello)
-
-ok 7 - hash a file
-
-expecting success of 1007.8 'blob does not exist in database': 
-		test_must_fail git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-fatal: git cat-file 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689: bad file
-ok 8 - blob does not exist in database
-
-expecting success of 1007.9 'hash from stdin': 
-	test "$(test_oid example)" = $(git hash-object --stdin < example)
-
-ok 9 - hash from stdin
-
-expecting success of 1007.10 'blob does not exist in database': 
-		test_must_fail git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-fatal: git cat-file ddd3f836d3e3fbb7ae289aa9ae83536f76956399: bad file
-ok 10 - blob does not exist in database
-
-expecting success of 1007.11 'hash a file and write to database': 
-	test "$(test_oid hello)" = $(git hash-object -w hello)
-
-ok 11 - hash a file and write to database
-
-expecting success of 1007.12 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 12 - blob exists in database
-
-expecting success of 1007.13 'git hash-object --stdin file1 <file0 first operates on file0, then file1': 
-	echo foo > file1 &&
-	obname0=$(echo bar | git hash-object --stdin) &&
-	obname1=$(git hash-object file1) &&
-	obname0new=$(echo bar | git hash-object --stdin file1 | sed -n -e 1p) &&
-	obname1new=$(echo bar | git hash-object --stdin file1 | sed -n -e 2p) &&
-	test "$obname0" = "$obname0new" &&
-	test "$obname1" = "$obname1new"
-
-ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
-
-expecting success of 1007.14 'set up crlf tests': 
-	echo fooQ | tr Q "\\015" >file0 &&
-	cp file0 file1 &&
-	echo "file0 -crlf" >.gitattributes &&
-	echo "file1 crlf" >>.gitattributes &&
-	git config core.autocrlf true &&
-	file0_sha=$(git hash-object file0) &&
-	file1_sha=$(git hash-object file1) &&
-	test "$file0_sha" != "$file1_sha"
-
-ok 14 - set up crlf tests
-
-expecting success of 1007.15 'check that appropriate filter is invoke when --path is used': 
-	path1_sha=$(git hash-object --path=file1 file0) &&
-	path0_sha=$(git hash-object --path=file0 file1) &&
-	test "$file0_sha" = "$path0_sha" &&
-	test "$file1_sha" = "$path1_sha" &&
-	path1_sha=$(git hash-object --path=file1 --stdin <file0) &&
-	path0_sha=$(git hash-object --path=file0 --stdin <file1) &&
-	test "$file0_sha" = "$path0_sha" &&
-	test "$file1_sha" = "$path1_sha"
-
-ok 15 - check that appropriate filter is invoke when --path is used
-
-expecting success of 1007.16 'gitattributes also work in a subdirectory': 
-	mkdir subdir &&
-	(
-		cd subdir &&
-		subdir_sha0=$(git hash-object ../file0) &&
-		subdir_sha1=$(git hash-object ../file1) &&
-		test "$file0_sha" = "$subdir_sha0" &&
-		test "$file1_sha" = "$subdir_sha1"
-	)
-
-ok 16 - gitattributes also work in a subdirectory
-
-expecting success of 1007.17 '--path works in a subdirectory': 
-	(
-		cd subdir &&
-		path1_sha=$(git hash-object --path=../file1 ../file0) &&
-		path0_sha=$(git hash-object --path=../file0 ../file1) &&
-		test "$file0_sha" = "$path0_sha" &&
-		test "$file1_sha" = "$path1_sha"
-	)
-
-ok 17 - --path works in a subdirectory
-
-expecting success of 1007.18 'check that --no-filters option works': 
-	nofilters_file1=$(git hash-object --no-filters file1) &&
-	test "$file0_sha" = "$nofilters_file1" &&
-	nofilters_file1=$(git hash-object --stdin <file1) &&
-	test "$file0_sha" = "$nofilters_file1"
-
-ok 18 - check that --no-filters option works
-
-expecting success of 1007.19 'check that --no-filters option works with --stdin-paths': 
-	nofilters_file1=$(echo "file1" | git hash-object --stdin-paths --no-filters) &&
-	test "$file0_sha" = "$nofilters_file1"
-
-ok 19 - check that --no-filters option works with --stdin-paths
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 20 - hash from stdin and write to database (-w --stdin)
-
-expecting success of 1007.21 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 21 - blob exists in database
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 22 - hash from stdin and write to database (--stdin -w)
-
-expecting success of 1007.23 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 23 - blob exists in database
-
-expecting success of 1007.24 'hash two files with names on stdin': 
-	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
-
-ok 24 - hash two files with names on stdin
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
-	
-ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
-
-expecting success of 1007.26 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 26 - blob exists in database
-
-expecting success of 1007.27 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 27 - blob exists in database
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
-	
-ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
-
-expecting success of 1007.29 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 29 - blob exists in database
-
-expecting success of 1007.30 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 30 - blob exists in database
-
-expecting success of 1007.31 'too-short tree': 
-	echo abc >malformed-tree &&
-	test_must_fail git hash-object -t tree malformed-tree 2>err &&
-	grep "too-short tree object" err
-
-error: too-short tree object
-ok 31 - too-short tree
-
-expecting success of 1007.32 'malformed mode in tree': 
-	hex_oid=$(echo foo | git hash-object --stdin -w) &&
-	bin_oid=$(echo $hex_oid | hex2oct) &&
-	printf "9100644 \0$bin_oid" >tree-with-malformed-mode &&
-	test_must_fail git hash-object -t tree tree-with-malformed-mode 2>err &&
-	grep "malformed mode in tree entry" err
-
-error: malformed mode in tree entry
-ok 32 - malformed mode in tree
-
-expecting success of 1007.33 'empty filename in tree': 
-	hex_oid=$(echo foo | git hash-object --stdin -w) &&
-	bin_oid=$(echo $hex_oid | hex2oct) &&
-	printf "100644 \0$bin_oid" >tree-with-empty-filename &&
-	test_must_fail git hash-object -t tree tree-with-empty-filename 2>err &&
-	grep "empty filename in tree entry" err
-
-error: empty filename in tree entry
-ok 33 - empty filename in tree
-
-expecting success of 1007.34 'duplicate filename in tree': 
-	hex_oid=$(echo foo | git hash-object --stdin -w) &&
-	bin_oid=$(echo $hex_oid | hex2oct) &&
-	{
-		printf "100644 file\0$bin_oid" &&
-		printf "100644 file\0$bin_oid"
-	} >tree-with-duplicate-filename &&
-	test_must_fail git hash-object -t tree tree-with-duplicate-filename 2>err &&
-	grep "duplicateEntries" err
-
-error: object fails fsck: duplicateEntries: contains duplicate file entries
-ok 34 - duplicate filename in tree
-
-expecting success of 1007.35 'corrupt commit': 
-	test_must_fail git hash-object -t commit --stdin </dev/null
-
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 35 - corrupt commit
-
-expecting success of 1007.36 'corrupt tag': 
-	test_must_fail git hash-object -t tag --stdin </dev/null
-
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 36 - corrupt tag
-
-expecting success of 1007.37 'hash-object complains about bogus type name': 
-	test_must_fail git hash-object -t bogus --stdin </dev/null
-
-fatal: invalid object type "bogus"
-ok 37 - hash-object complains about bogus type name
-
-expecting success of 1007.38 'hash-object complains about truncated type name': 
-	test_must_fail git hash-object -t bl --stdin </dev/null
-
-fatal: invalid object type "bl"
-ok 38 - hash-object complains about truncated type name
-
-expecting success of 1007.39 '--literally': 
-	t=1234567890 &&
-	echo example | git hash-object -t $t --literally --stdin
-
-f78b23c3f872d473c764d5fcf4fb39af8bbf2123
-ok 39 - --literally
-
-expecting success of 1007.40 '--literally with extra-long type': 
-	t=12345678901234567890123456789012345678901234567890 &&
-	t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" &&
-	echo example | git hash-object -t $t --literally --stdin
-
-2a881776ee43e849175ee7158075560ca0ae7692
-ok 40 - --literally with extra-long type
-
-expecting success of 1007.41 '--stdin outside of repository (uses SHA-1)': 
-	nongit git hash-object --stdin <hello >actual &&
-	echo "$(test_oid --hash=sha1 hello)" >expect &&
-	test_cmp expect actual
-
-ok 41 - --stdin outside of repository (uses SHA-1)
-
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1010-mktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1010-mktree/.git/
-expecting success of 1010.1 'setup': 
-	for d in a a- a0
-	do
-		mkdir "$d" && echo "$d/one" >"$d/one" &&
-		git add "$d" || return 1
-	done &&
-	echo zero >one &&
-	git update-index --add --info-only one &&
-	git write-tree --missing-ok >tree.missing &&
-	git ls-tree $(cat tree.missing) >top.missing &&
-	git ls-tree -r $(cat tree.missing) >all.missing &&
-	echo one >one &&
-	git add one &&
-	git write-tree >tree &&
-	git ls-tree $(cat tree) >top &&
-	git ls-tree -r $(cat tree) >all &&
-	test_tick &&
-	git commit -q -m one &&
-	H=$(git rev-parse HEAD) &&
-	git update-index --add --cacheinfo 160000 $H sub &&
-	test_tick &&
-	git commit -q -m two &&
-	git rev-parse HEAD^{tree} >tree.withsub &&
-	git ls-tree HEAD >top.withsub &&
-	git ls-tree -r HEAD >all.withsub
-
-ok 1 - setup
-
-expecting success of 1010.2 'ls-tree piped to mktree (1)': 
-	git mktree <top >actual &&
-	test_cmp tree actual
-
-ok 2 - ls-tree piped to mktree (1)
-
-expecting success of 1010.3 'ls-tree piped to mktree (2)': 
-	git mktree <top.withsub >actual &&
-	test_cmp tree.withsub actual
-
-ok 3 - ls-tree piped to mktree (2)
-
-expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
-	perl -e "print reverse <>" <top |
-	git mktree >actual &&
-	test_cmp tree actual
-
-ok 4 - ls-tree output in wrong order given to mktree (1)
-
-expecting success of 1010.5 'ls-tree output in wrong order given to mktree (2)': 
-	perl -e "print reverse <>" <top.withsub |
-	git mktree >actual &&
-	test_cmp tree.withsub actual
-
-ok 5 - ls-tree output in wrong order given to mktree (2)
-
-expecting success of 1010.6 'allow missing object with --missing': 
-	git mktree --missing <top.missing >actual &&
-	test_cmp tree.missing actual
-
-ok 6 - allow missing object with --missing
-
-expecting success of 1010.7 'mktree refuses to read ls-tree -r output (1)': 
-	test_must_fail git mktree <all
-
-fatal: path a-/one contains slash
-ok 7 - mktree refuses to read ls-tree -r output (1)
-
-expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
-	test_must_fail git mktree <all.withsub
-
-fatal: path a-/one contains slash
-ok 8 - mktree refuses to read ls-tree -r output (2)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1002-read-tree-m-u-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1002-read-tree-m-u-2way/.git/
-expecting success of 1002.1 'setup': 
-	echo frotz >frotz &&
-	echo nitfol >nitfol &&
-	echo bozbar >bozbar &&
-	echo rezrov >rezrov &&
-	git update-index --add nitfol bozbar rezrov &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH &&
-
-	echo gnusto >bozbar &&
-	git update-index --add frotz bozbar --force-remove rezrov &&
-	git ls-files --stage >M.out &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	cp bozbar bozbar.M &&
-	cp frotz frotz.M &&
-	cp nitfol nitfol.M &&
-	git diff-tree $treeH $treeM
-
-treeH 661afa9096b7e2d4b9a28a6e43736cd0b06d1308
-100644 blob 78d812a2124ff980a1a70f8cca493698d643d242	bozbar
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
-treeM 05bf9652e9b06473d6ca2f32ff60e2401e59bfa6
-100644 blob bb3b2cd2e136e1e4e7ecdf10068e246196dd8294	bozbar
-100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-:100644 100644 78d812a2124ff980a1a70f8cca493698d643d242 bb3b2cd2e136e1e4e7ecdf10068e246196dd8294 M	bozbar
-:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
-:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
-ok 1 - setup
-
-expecting success of 1002.2 '1, 2, 3 - no carry forward': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >1-3.out &&
-	cmp M.out 1-3.out &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	check_cache_at bozbar clean &&
-	check_cache_at frotz clean &&
-	check_cache_at nitfol clean
-
-bozbar: clean
-frotz: clean
-nitfol: clean
-ok 2 - 1, 2, 3 - no carry forward
-
-expecting success of 1002.3 '4 - carry forward local addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo "+100644 X 0	yomin" >expected &&
-	echo yomin >yomin &&
-	git update-index --add yomin &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >4.out &&
-	test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out &&
-	compare_change 4diff.out expected &&
-	check_cache_at yomin clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo yomin >yomin1 &&
-	diff yomin yomin1 &&
-	rm -f yomin1
-
-yomin: clean
-ok 3 - 4 - carry forward local addition.
-
-expecting success of 1002.4 '5 - carry forward local addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	read_tree_u_must_succeed -m -u $treeH &&
-	echo yomin >yomin &&
-	git update-index --add yomin &&
-	echo yomin yomin >yomin &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >5.out &&
-	test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
-	compare_change 5diff.out expected &&
-	check_cache_at yomin dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	: dirty index should have prevented -u from checking it out. &&
-	echo yomin yomin >yomin1 &&
-	diff yomin yomin1 &&
-	rm -f yomin1
-
-yomin: dirty
-ok 4 - 5 - carry forward local addition.
-
-expecting success of 1002.5 '6 - local addition already has the same.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz >frotz &&
-	git update-index --add frotz &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >6.out &&
-	test_cmp M.out 6.out &&
-	check_cache_at frotz clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo frotz >frotz1 &&
-	diff frotz frotz1 &&
-	rm -f frotz1
-
-frotz: clean
-ok 5 - 6 - local addition already has the same.
-
-expecting success of 1002.6 '7 - local addition already has the same.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz frotz >frotz &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >7.out &&
-	test_cmp M.out 7.out &&
-	check_cache_at frotz dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp nitfol.M nitfol &&
-	: dirty index should have prevented -u from checking it out. &&
-	echo frotz frotz >frotz1 &&
-	diff frotz frotz1 &&
-	rm -f frotz1
-
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
-
-expecting success of 1002.7 '8 - conflicting addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
-
-expecting success of 1002.8 '9 - conflicting addition.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo frotz frotz >frotz &&
-	git update-index --add frotz &&
-	echo frotz >frotz &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
-
-expecting success of 1002.9 '10 - path removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >10.out &&
-	cmp M.out 10.out &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-ok 9 - 10 - path removed.
-
-expecting success of 1002.10 '11 - dirty path removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov rezrov >rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
-
-expecting success of 1002.11 '12 - unmatching local changes being removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
-
-expecting success of 1002.12 '13 - unmatching local changes being removed.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo rezrov rezrov >rezrov &&
-	git update-index --add rezrov &&
-	echo rezrov >rezrov &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
-
-expecting success of 1002.13 '14 - unchanged in two heads.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >14.out &&
-	test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
-	compare_change 14diff.out expected &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	check_cache_at nitfol clean &&
-	echo nitfol nitfol >nitfol1 &&
-	diff nitfol nitfol1 &&
-	rm -f nitfol1
-
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
-
-expecting success of 1002.14 '15 - unchanged in two heads.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo nitfol nitfol >nitfol &&
-	git update-index --add nitfol &&
-	echo nitfol nitfol nitfol >nitfol &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >15.out &&
-	test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
-	compare_change 15diff.out expected &&
-	check_cache_at nitfol dirty &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	echo nitfol nitfol nitfol >nitfol1 &&
-	diff nitfol nitfol1 &&
-	rm -f nitfol1
-
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
-
-expecting success of 1002.15 '16 - conflicting local change.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
-
-expecting success of 1002.16 '17 - conflicting local change.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar bozbar >bozbar &&
-	git update-index --add bozbar &&
-	echo bozbar bozbar bozbar >bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
-
-expecting success of 1002.17 '18 - local change already having a good result.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo gnusto >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >18.out &&
-	test_cmp M.out 18.out &&
-	check_cache_at bozbar clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-bozbar: clean
-ok 17 - 18 - local change already having a good result.
-
-expecting success of 1002.18 '19 - local change already having a good result, further modified.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo gnusto >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >19.out &&
-	test_cmp M.out 19.out &&
-	check_cache_at bozbar dirty &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol &&
-	echo gnusto gnusto >bozbar1 &&
-	diff bozbar bozbar1 &&
-	rm -f bozbar1
-
-bozbar: dirty
-ok 18 - 19 - local change already having a good result, further modified.
-
-expecting success of 1002.19 '20 - no local change, use new tree.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar >bozbar &&
-	git update-index --add bozbar &&
-	read_tree_u_must_succeed -m -u $treeH $treeM &&
-	git ls-files --stage >20.out &&
-	test_cmp M.out 20.out &&
-	check_cache_at bozbar clean &&
-	test_cmp bozbar.M bozbar &&
-	test_cmp frotz.M frotz &&
-	test_cmp nitfol.M nitfol
-
-bozbar: clean
-ok 19 - 20 - no local change, use new tree.
-
-expecting success of 1002.20 '21 - no local change, dirty cache.': 
-	rm -f .git/index nitfol bozbar rezrov frotz &&
-	read_tree_u_must_succeed --reset -u $treeH &&
-	echo bozbar >bozbar &&
-	git update-index --add bozbar &&
-	echo gnusto gnusto >bozbar &&
-	! read_tree_u_must_succeed -m -u $treeH $treeM
-
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
-
-expecting success of 1002.21 'DF vs DF/DF case setup.': 
-	rm -f .git/index &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	treeDF=$(git write-tree) &&
-	echo treeDF $treeDF &&
-	git ls-tree $treeDF &&
-
-	rm -f DF &&
-	mkdir DF &&
-	echo DF/DF >DF/DF &&
-	git update-index --add --remove DF DF/DF &&
-	treeDFDF=$(git write-tree) &&
-	echo treeDFDF $treeDFDF &&
-	git ls-tree $treeDFDF &&
-	git ls-files --stage >DFDF.out
-
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 21 - DF vs DF/DF case setup.
-
-expecting success of 1002.22 'DF vs DF/DF case test.': 
-	rm -f .git/index &&
-	rm -fr DF &&
-	echo DF >DF &&
-	git update-index --add DF &&
-	read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
-	git ls-files --stage >DFDFcheck.out &&
-	test_cmp DFDF.out DFDFcheck.out &&
-	check_cache_at DF/DF clean
-
-DF/DF: clean
-ok 22 - DF vs DF/DF case test.
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0410-partial-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0410-partial-clone/.git/
 expecting success of 0410.1 'extensions.partialclone without filter': 
@@ -42706,7 +42661,7 @@
 
 Cloning into 'repo'...
 foo
-Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 4.00 KiB/s, done.
+Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 7.00 KiB/s, done.
 ok 35 - promisor.quiet=false shows progress messages
 
 expecting success of 0410.36 'promisor.quiet=true does not show progress messages': 
@@ -42734,7 +42689,7 @@
 
 Cloning into 'repo'...
 foo
-Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 45.00 KiB/s, done.
+Receiving objects: 100% (1/1)
Receiving objects: 100% (1/1), 45 bytes | 7.00 KiB/s, done.
 ok 37 - promisor.quiet=unconfigured shows progress messages
 
 checking prerequisite: NOT_ROOT
@@ -42752,236 +42707,6 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1014-read-tree-confusing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1014-read-tree-confusing/.git/
-expecting success of 1014.1 'create base tree': 
-	echo content >file &&
-	git add file &&
-	git commit -m base &&
-	blob=$(git rev-parse HEAD:file) &&
-	tree=$(git rev-parse HEAD^{tree})
-
-[master (root-commit) 5d770fe] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create base tree
-
-expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
-	git config core.protectHFS true
-
-ok 2 - enable core.protectHFS for rejection tests
-
-expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
-	git config core.protectNTFS true
-
-ok 3 - enable core.protectNTFS for rejection tests
-
-expecting success of 1014.4 'reject . at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.'
-ok 4 - reject . at end of path
-
-expecting success of 1014.5 'reject . as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path './file'
-ok 5 - reject . as subtree
-
-expecting success of 1014.6 'reject .. at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '..'
-ok 6 - reject .. at end of path
-
-expecting success of 1014.7 'reject .. as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '../file'
-ok 7 - reject .. as subtree
-
-expecting success of 1014.8 'reject .git at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git'
-ok 8 - reject .git at end of path
-
-expecting success of 1014.9 'reject .git as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git/file'
-ok 9 - reject .git as subtree
-
-expecting success of 1014.10 'reject .GIT at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GIT'
-ok 10 - reject .GIT at end of path
-
-expecting success of 1014.11 'reject .GIT as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GIT/file'
-ok 11 - reject .GIT as subtree
-
-expecting success of 1014.12 'reject {u200c}.Git at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '‌.Git'
-ok 12 - reject {u200c}.Git at end of path
-
-expecting success of 1014.13 'reject {u200c}.Git as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '‌.Git/file'
-ok 13 - reject {u200c}.Git as subtree
-
-expecting success of 1014.14 'reject .gI{u200c}T at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.gI‌T'
-ok 14 - reject .gI{u200c}T at end of path
-
-expecting success of 1014.15 'reject .gI{u200c}T as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.gI‌T/file'
-ok 15 - reject .gI{u200c}T as subtree
-
-expecting success of 1014.16 'reject .GiT{u200c} at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GiT‌'
-ok 16 - reject .GiT{u200c} at end of path
-
-expecting success of 1014.17 'reject .GiT{u200c} as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.GiT‌/file'
-ok 17 - reject .GiT{u200c} as subtree
-
-expecting success of 1014.18 'reject git~1 at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path 'git~1'
-ok 18 - reject git~1 at end of path
-
-expecting success of 1014.19 'reject git~1 as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path 'git~1/file'
-ok 19 - reject git~1 as subtree
-
-expecting success of 1014.20 'reject .git.{space} at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git. '
-ok 20 - reject .git.{space} at end of path
-
-expecting success of 1014.21 'reject .git.{space} as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git. /file'
-ok 21 - reject .git.{space} as subtree
-
-expecting success of 1014.22 'reject backslashes at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.\.GIT\foobar'
-ok 22 - reject backslashes at end of path
-
-expecting success of 1014.23 'reject backslashes as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.\.GIT\foobar/file'
-ok 23 - reject backslashes as subtree
-
-expecting success of 1014.24 'reject backslashes2 at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git\foobar'
-ok 24 - reject backslashes2 at end of path
-
-expecting success of 1014.25 'reject backslashes2 as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git\foobar/file'
-ok 25 - reject backslashes2 as subtree
-
-expecting success of 1014.26 'reject .git...:alternate-stream at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git...:alternate-stream'
-ok 26 - reject .git...:alternate-stream at end of path
-
-expecting success of 1014.27 'reject .git...:alternate-stream as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.git...:alternate-stream/file'
-ok 27 - reject .git...:alternate-stream as subtree
-
-expecting success of 1014.28 'utf-8 paths allowed with core.protectHFS off': 
-	test_when_finished "git read-tree HEAD" &&
-	test_config core.protectHFS false &&
-	printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
-	ok=$(git mktree <tree) &&
-	git read-tree $ok
-
-ok 28 - utf-8 paths allowed with core.protectHFS off
-
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1015-read-index-unmerged.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1015-read-index-unmerged/.git/
 expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
@@ -43231,78 +42956,234 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1012-read-tree-df/.git/
-expecting success of 1012.1 'setup': 
-	maketree O-000 a/b-2/c/d a/b/c/d a/x &&
-	maketree A-000 a/b-2/c/d a/b/c/d a/x &&
-	maketree A-001 a/b-2/c/d a/b/c/d a/b/c/e a/x &&
-	maketree B-000 a/b-2/c/d a/b     a/x &&
+*** t1014-read-tree-confusing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1014-read-tree-confusing/.git/
+expecting success of 1014.1 'create base tree': 
+	echo content >file &&
+	git add file &&
+	git commit -m base &&
+	blob=$(git rev-parse HEAD:file) &&
+	tree=$(git rev-parse HEAD^{tree})
 
-	maketree O-010 t-0     t/1  t/2 t=3 &&
-	maketree A-010 t-0 t            t=3 &&
-	maketree B-010         t/1:     t=3: &&
+[master (root-commit) 5d770fe] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create base tree
 
-	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
-	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
-	:
+expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
+	git config core.protectHFS true
 
-ok 1 - setup
+ok 2 - enable core.protectHFS for rejection tests
 
-expecting success of 1012.2 '3-way (1)': 
-	settree A-000 &&
-	read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
-	checkindex <<-EOF
-	3 a/b
-	0 a/b-2/c/d
-	1 a/b/c/d
-	2 a/b/c/d
-	0 a/x
-	EOF
+expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
+	git config core.protectNTFS true
 
-ok 2 - 3-way (1)
+ok 3 - enable core.protectNTFS for rejection tests
 
-expecting success of 1012.3 '3-way (2)': 
-	settree A-001 &&
-	read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
-	checkindex <<-EOF
-	3 a/b
-	0 a/b-2/c/d
-	1 a/b/c/d
-	2 a/b/c/d
-	2 a/b/c/e
-	0 a/x
-	EOF
+expecting success of 1014.4 'reject . at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.'
+ok 4 - reject . at end of path
 
-ok 3 - 3-way (2)
+expecting success of 1014.5 'reject . as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path './file'
+ok 5 - reject . as subtree
 
-expecting success of 1012.4 '3-way (3)': 
-	settree A-010 &&
-	read_tree_u_must_succeed -m -u O-010 A-010 B-010 &&
-	checkindex <<-EOF
-	2 t
-	1 t-0
-	2 t-0
-	1 t/1
-	3 t/1
-	1 t/2
-	0 t=3
-	EOF
+expecting success of 1014.6 'reject .. at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '..'
+ok 6 - reject .. at end of path
 
-ok 4 - 3-way (3)
+expecting success of 1014.7 'reject .. as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '../file'
+ok 7 - reject .. as subtree
 
-expecting success of 1012.5 '2-way (1)': 
-	settree O-020 &&
-	read_tree_u_must_succeed -m -u O-020 A-020 &&
-	checkindex <<-EOF
-	0 ds/dma/ioat/Makefile
-	0 ds/dma/ioat/registers.h
-	EOF
+expecting success of 1014.8 'reject .git at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git'
+ok 8 - reject .git at end of path
 
-ok 5 - 2-way (1)
+expecting success of 1014.9 'reject .git as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git/file'
+ok 9 - reject .git as subtree
 
-# passed all 5 test(s)
-1..5
+expecting success of 1014.10 'reject .GIT at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GIT'
+ok 10 - reject .GIT at end of path
+
+expecting success of 1014.11 'reject .GIT as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GIT/file'
+ok 11 - reject .GIT as subtree
+
+expecting success of 1014.12 'reject {u200c}.Git at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '‌.Git'
+ok 12 - reject {u200c}.Git at end of path
+
+expecting success of 1014.13 'reject {u200c}.Git as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '‌.Git/file'
+ok 13 - reject {u200c}.Git as subtree
+
+expecting success of 1014.14 'reject .gI{u200c}T at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.gI‌T'
+ok 14 - reject .gI{u200c}T at end of path
+
+expecting success of 1014.15 'reject .gI{u200c}T as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.gI‌T/file'
+ok 15 - reject .gI{u200c}T as subtree
+
+expecting success of 1014.16 'reject .GiT{u200c} at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GiT‌'
+ok 16 - reject .GiT{u200c} at end of path
+
+expecting success of 1014.17 'reject .GiT{u200c} as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.GiT‌/file'
+ok 17 - reject .GiT{u200c} as subtree
+
+expecting success of 1014.18 'reject git~1 at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path 'git~1'
+ok 18 - reject git~1 at end of path
+
+expecting success of 1014.19 'reject git~1 as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path 'git~1/file'
+ok 19 - reject git~1 as subtree
+
+expecting success of 1014.20 'reject .git.{space} at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git. '
+ok 20 - reject .git.{space} at end of path
+
+expecting success of 1014.21 'reject .git.{space} as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git. /file'
+ok 21 - reject .git.{space} as subtree
+
+expecting success of 1014.22 'reject backslashes at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.\.GIT\foobar'
+ok 22 - reject backslashes at end of path
+
+expecting success of 1014.23 'reject backslashes as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.\.GIT\foobar/file'
+ok 23 - reject backslashes as subtree
+
+expecting success of 1014.24 'reject backslashes2 at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git\foobar'
+ok 24 - reject backslashes2 at end of path
+
+expecting success of 1014.25 'reject backslashes2 as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git\foobar/file'
+ok 25 - reject backslashes2 as subtree
+
+expecting success of 1014.26 'reject .git...:alternate-stream at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git...:alternate-stream'
+ok 26 - reject .git...:alternate-stream at end of path
+
+expecting success of 1014.27 'reject .git...:alternate-stream as subtree': 
+		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
+	
+error: invalid path '.git...:alternate-stream/file'
+ok 27 - reject .git...:alternate-stream as subtree
+
+expecting success of 1014.28 'utf-8 paths allowed with core.protectHFS off': 
+	test_when_finished "git read-tree HEAD" &&
+	test_config core.protectHFS false &&
+	printf "100644 blob %s\t%s" "$blob" ".gi${u200c}t" >tree &&
+	ok=$(git mktree <tree) &&
+	git read-tree $ok
+
+ok 28 - utf-8 paths allowed with core.protectHFS off
+
+# passed all 28 test(s)
+1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1020-subdirectory.sh ***
@@ -43602,109 +43483,24 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1021-rerere-in-workdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1021-rerere-in-workdir/.git/
-checking prerequisite: SYMLINKS
+*** t1011-read-tree-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1011-read-tree-sparse-checkout/.git/
+expecting success of 1011.1 'setup': 
+	test_commit init &&
+	echo modified >>init.t &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 1021.1 'setup': 
-	git config rerere.enabled true &&
-	>world &&
-	git add world &&
-	test_tick &&
-	git commit -m initial &&
-
-	echo hello >world &&
-	test_tick &&
-	git commit -a -m hello &&
-
-	git checkout -b side HEAD^ &&
-	echo goodbye >world &&
-	test_tick &&
-	git commit -a -m goodbye &&
-
-	git checkout main
-
-[main (root-commit) 21975ff] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 world
-[main 02943d2] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'side'
-[side 5611ff9] goodbye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 1021.2 'rerere in workdir': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
-	(
-		cd work &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-Recorded preimage for 'world'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - rerere in workdir
-
-checking known breakage of 1021.3 'rerere in workdir (relative)': 
-	rm -rf .git/rr-cache &&
-	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
-	(
-		cd krow &&
-		rm -f .git/rr-cache &&
-		ln -s ../.git/rr-cache .git/rr-cache &&
-		test_must_fail git merge side &&
-		git rerere status >actual &&
-		echo world >expect &&
-		test_cmp expect actual
-	)
-
-Auto-merging world
-CONFLICT (content): Merge conflict in world
-fatal: could not create directory '.git/rr-cache'
-fatal: could not create directory '.git/rr-cache'
-not ok 3 - rerere in workdir (relative) # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 2 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1011-read-tree-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1011-read-tree-sparse-checkout/.git/
-expecting success of 1011.1 'setup': 
-	test_commit init &&
-	echo modified >>init.t &&
-
-	cat >expected <<-EOF &&
-	100644 $(git hash-object init.t) 0	init.t
-	100644 $EMPTY_BLOB 0	sub/added
-	100644 $EMPTY_BLOB 0	sub/addedtoo
-	100644 $EMPTY_BLOB 0	subsub/added
-	EOF
-	cat >expected.swt <<-\EOF &&
-	H init.t
-	H sub/added
-	H sub/addedtoo
-	H subsub/added
-	EOF
+	cat >expected <<-EOF &&
+	100644 $(git hash-object init.t) 0	init.t
+	100644 $EMPTY_BLOB 0	sub/added
+	100644 $EMPTY_BLOB 0	sub/addedtoo
+	100644 $EMPTY_BLOB 0	subsub/added
+	EOF
+	cat >expected.swt <<-\EOF &&
+	H init.t
+	H sub/added
+	H sub/addedtoo
+	H subsub/added
+	EOF
 
 	mkdir sub subsub &&
 	touch sub/added sub/addedtoo subsub/added &&
@@ -44062,6 +43858,80 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1012-read-tree-df/.git/
+expecting success of 1012.1 'setup': 
+	maketree O-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-001 a/b-2/c/d a/b/c/d a/b/c/e a/x &&
+	maketree B-000 a/b-2/c/d a/b     a/x &&
+
+	maketree O-010 t-0     t/1  t/2 t=3 &&
+	maketree A-010 t-0 t            t=3 &&
+	maketree B-010         t/1:     t=3: &&
+
+	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
+	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
+	:
+
+ok 1 - setup
+
+expecting success of 1012.2 '3-way (1)': 
+	settree A-000 &&
+	read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	0 a/x
+	EOF
+
+ok 2 - 3-way (1)
+
+expecting success of 1012.3 '3-way (2)': 
+	settree A-001 &&
+	read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	2 a/b/c/e
+	0 a/x
+	EOF
+
+ok 3 - 3-way (2)
+
+expecting success of 1012.4 '3-way (3)': 
+	settree A-010 &&
+	read_tree_u_must_succeed -m -u O-010 A-010 B-010 &&
+	checkindex <<-EOF
+	2 t
+	1 t-0
+	2 t-0
+	1 t/1
+	3 t/1
+	1 t/2
+	0 t=3
+	EOF
+
+ok 4 - 3-way (3)
+
+expecting success of 1012.5 '2-way (1)': 
+	settree O-020 &&
+	read_tree_u_must_succeed -m -u O-020 A-020 &&
+	checkindex <<-EOF
+	0 ds/dma/ioat/Makefile
+	0 ds/dma/ioat/registers.h
+	EOF
+
+ok 5 - 2-way (1)
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1022-read-tree-partial-clone.sh ***
 expecting success of 1022.1 'read-tree in partial clone prefetches in one batch': 
 	test_when_finished "rm -rf server client trace" &&
@@ -44096,6 +43966,91 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1021-rerere-in-workdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1021-rerere-in-workdir/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 1021.1 'setup': 
+	git config rerere.enabled true &&
+	>world &&
+	git add world &&
+	test_tick &&
+	git commit -m initial &&
+
+	echo hello >world &&
+	test_tick &&
+	git commit -a -m hello &&
+
+	git checkout -b side HEAD^ &&
+	echo goodbye >world &&
+	test_tick &&
+	git commit -a -m goodbye &&
+
+	git checkout main
+
+[main (root-commit) 21975ff] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 world
+[main 02943d2] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'side'
+[side 5611ff9] goodbye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 1021.2 'rerere in workdir': 
+	rm -rf .git/rr-cache &&
+	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . work &&
+	(
+		cd work &&
+		test_must_fail git merge side &&
+		git rerere status >actual &&
+		echo world >expect &&
+		test_cmp expect actual
+	)
+
+Auto-merging world
+CONFLICT (content): Merge conflict in world
+Recorded preimage for 'world'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - rerere in workdir
+
+checking known breakage of 1021.3 'rerere in workdir (relative)': 
+	rm -rf .git/rr-cache &&
+	"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" . krow &&
+	(
+		cd krow &&
+		rm -f .git/rr-cache &&
+		ln -s ../.git/rr-cache .git/rr-cache &&
+		test_must_fail git merge side &&
+		git rerere status >actual &&
+		echo world >expect &&
+		test_cmp expect actual
+	)
+
+Auto-merging world
+CONFLICT (content): Merge conflict in world
+fatal: could not create directory '.git/rr-cache'
+fatal: could not create directory '.git/rr-cache'
+not ok 3 - rerere in workdir (relative) # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 2 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1051-large-conversion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1051-large-conversion/.git/
 expecting success of 1051.1 'setup input tests': 
@@ -44390,7 +44345,7 @@
  create mode 100644 content.t
 1+0 records in
 1+0 records out
-1 byte copied, 0.0002534 s, 3.9 kB/s
+1 byte copied, 3.728e-05 s, 26.8 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1060-object-corruption/no-bit-error/.git/
 [master (root-commit) f374eba] content
  Author: A U Thor <author@example.com>
@@ -44960,6 +44915,549 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1302-repo-version.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/.git/
+expecting success of 1302.1 'setup': 
+	cat >test.patch <<-\EOF &&
+	diff --git a/test.txt b/test.txt
+	new file mode 100644
+	--- /dev/null
+	+++ b/test.txt
+	@@ -0,0 +1 @@
+	+123
+	EOF
+
+	test_create_repo "test" &&
+	test_create_repo "test2" &&
+	git config --file=test2/.git/config core.repositoryformatversion 99
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/test/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/test2/.git/
+ok 1 - setup
+
+expecting success of 1302.2 'gitdir selection on normal repos': 
+	if test_have_prereq DEFAULT_REPO_FORMAT
+	then
+		echo 0
+	else
+		echo 1
+	fi >expect &&
+	git config core.repositoryformatversion >actual &&
+	git -C test config core.repositoryformatversion >actual2 &&
+	test_cmp expect actual &&
+	test_cmp expect actual2
+
+checking prerequisite: DEFAULT_REPO_FORMAT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+	test_have_prereq SHA1,REFFILES
+
+)
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+	case "$GIT_DEFAULT_HASH" in
+	sha1) true ;;
+	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
+	*) false ;;
+	esac
+
+)
+prerequisite SHA1 ok
+prerequisite DEFAULT_REPO_FORMAT ok
+ok 2 - gitdir selection on normal repos
+
+expecting success of 1302.3 'gitdir selection on unsupported repo': 
+	# Make sure it would stop at test2, not trash
+	test_expect_code 1 git -C test2 config core.repositoryformatversion
+
+warning: Expected git repo version <= 1, found 99
+ok 3 - gitdir selection on unsupported repo
+
+expecting success of 1302.4 'gitdir not required mode': 
+	git apply --stat test.patch &&
+	git -C test apply --stat ../test.patch &&
+	git -C test2 apply --stat ../test.patch
+
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+warning: Expected git repo version <= 1, found 99
+warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+ok 4 - gitdir not required mode
+
+expecting success of 1302.5 'gitdir required mode': 
+	git apply --check --index test.patch &&
+	git -C test apply --check --index ../test.patch &&
+	test_must_fail git -C test2 apply --check --index ../test.patch
+
+warning: Expected git repo version <= 1, found 99
+warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
+error: '--index' outside a repository
+ok 5 - gitdir required mode
+
+expecting success of 1302.6 'allow version=0 ': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0  >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 6 - allow version=0 
+
+expecting success of 1302.7 'allow version=1 ': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1  >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 7 - allow version=1 
+
+expecting success of 1302.8 'allow version=1 noop': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 noop >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 8 - allow version=1 noop
+
+expecting success of 1302.9 'abort version=1 no-such-extension': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 no-such-extension >.git/config &&
+			check_abort
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+fatal: unknown repository extension found:
+	no-such-extension
+ok 9 - abort version=1 no-such-extension
+
+expecting success of 1302.10 'allow version=0 no-such-extension': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 no-such-extension >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 10 - allow version=0 no-such-extension
+
+expecting success of 1302.11 'allow version=0 noop': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 noop >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 11 - allow version=0 noop
+
+expecting success of 1302.12 'abort version=0 noop-v1': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 noop-v1 >.git/config &&
+			check_abort
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+fatal: repo version is 0, but v1-only extension found:
+	noop-v1
+ok 12 - abort version=0 noop-v1
+
+expecting success of 1302.13 'allow version=1 noop-v1': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 noop-v1 >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
+ok 13 - allow version=1 noop-v1
+
+expecting success of 1302.14 'precious-objects allowed': 
+	git config core.repositoryFormatVersion 1 &&
+	git config extensions.preciousObjects 1 &&
+	check_allow
+
+ok 14 - precious-objects allowed
+
+expecting success of 1302.15 'precious-objects blocks destructive repack': 
+	test_must_fail git repack -ad
+
+fatal: cannot delete packs in a precious-objects repo
+ok 15 - precious-objects blocks destructive repack
+
+expecting success of 1302.16 'other repacks are OK': 
+	test_commit foo &&
+	git repack
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 16 - other repacks are OK
+
+expecting success of 1302.17 'precious-objects blocks prune': 
+	test_must_fail git prune
+
+fatal: cannot prune in a precious-objects repo
+ok 17 - precious-objects blocks prune
+
+expecting success of 1302.18 'gc runs without complaint': 
+	git gc
+
+ok 18 - gc runs without complaint
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1301-shared-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
+expecting success of 1301.1 'shared = 0400 (faulty permission u-w)': 
+	test_when_finished "rm -rf sub" &&
+	mkdir sub && (
+		cd sub &&
+		test_must_fail git init --shared=0400
+	)
+
+fatal: problem with core.sharedRepository filemode value (0400).
+The owner of files must always have read and write permissions.
+ok 1 - shared = 0400 (faulty permission u-w)
+
+expecting success of 1301.2 'shared=1 does not clear bits preset by umask 002': 
+		test_when_finished "rm -rf sub" &&
+		mkdir sub && (
+			cd sub &&
+			umask $u &&
+			git init --shared=1 &&
+			test 1 = "$(git config core.sharedrepository)"
+		) &&
+		actual=$(ls -l sub/.git/HEAD) &&
+		case "$actual" in
+		-rw-rw-r--*)
+			: happy
+			;;
+		*)
+			echo Oops, .git/HEAD is not 0664 but $actual
+			false
+			;;
+		esac
+	
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/sub/.git/
+ok 2 - shared=1 does not clear bits preset by umask 002
+
+expecting success of 1301.3 'shared=1 does not clear bits preset by umask 022': 
+		test_when_finished "rm -rf sub" &&
+		mkdir sub && (
+			cd sub &&
+			umask $u &&
+			git init --shared=1 &&
+			test 1 = "$(git config core.sharedrepository)"
+		) &&
+		actual=$(ls -l sub/.git/HEAD) &&
+		case "$actual" in
+		-rw-rw-r--*)
+			: happy
+			;;
+		*)
+			echo Oops, .git/HEAD is not 0664 but $actual
+			false
+			;;
+		esac
+	
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/sub/.git/
+ok 3 - shared=1 does not clear bits preset by umask 022
+
+expecting success of 1301.4 'shared=all': 
+	git init --template= --shared=all &&
+	test 2 = $(git config core.sharedrepository)
+
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
+ok 4 - shared=all
+
+expecting success of 1301.5 'template cannot set core.bare': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "rm -rf templates" &&
+	test_config core.bare true &&
+	umask 0022 &&
+	mkdir -p templates/ &&
+	cp .git/config templates/config &&
+	git init --template=templates subdir &&
+	test_path_is_missing subdir/HEAD
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/subdir/.git/
+ok 5 - template cannot set core.bare
+
+expecting success of 1301.6 'update-server-info honors core.sharedRepository': 
+	: > a1 &&
+	git add a1 &&
+	test_tick &&
+	git commit -m a1 &&
+	mkdir .git/info &&
+	umask 0277 &&
+	git update-server-info &&
+	actual="$(ls -l .git/info/refs)" &&
+	case "$actual" in
+	-r--r--r--*)
+		: happy
+		;;
+	*)
+		echo Oops, .git/info/refs is not 0444
+		false
+		;;
+	esac
+
+[main (root-commit) a2bd363] a1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a1
+ok 6 - update-server-info honors core.sharedRepository
+
+expecting success of 1301.7 'shared = 0660 (r--r-----) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 7 - shared = 0660 (r--r-----) ro
+
+expecting success of 1301.8 'shared = 0660 (rw-rw----) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 8 - shared = 0660 (rw-rw----) rw
+
+expecting success of 1301.9 'shared = 0640 (r--r-----) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 9 - shared = 0640 (r--r-----) ro
+
+expecting success of 1301.10 'shared = 0640 (rw-r-----) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 10 - shared = 0640 (rw-r-----) rw
+
+expecting success of 1301.11 'shared = 0600 (r--------) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 11 - shared = 0600 (r--------) ro
+
+expecting success of 1301.12 'shared = 0600 (rw-------) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 12 - shared = 0600 (rw-------) rw
+
+expecting success of 1301.13 'shared = 0666 (r--r--r--) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 13 - shared = 0666 (r--r--r--) ro
+
+expecting success of 1301.14 'shared = 0666 (rw-rw-rw-) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 14 - shared = 0666 (rw-rw-rw-) rw
+
+expecting success of 1301.15 'shared = 0664 (r--r--r--) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 15 - shared = 0664 (r--r--r--) ro
+
+expecting success of 1301.16 'shared = 0664 (rw-rw-r--) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 16 - shared = 0664 (rw-rw-r--) rw
+
+expecting success of 1301.17 'info/refs respects umask in unshared repo': 
+	rm -f .git/info/refs &&
+	test_unconfig core.sharedrepository &&
+	umask 002 &&
+	git update-server-info &&
+	echo "-rw-rw-r--" >expect &&
+	test_modebits .git/info/refs >actual &&
+	test_cmp expect actual
+
+ok 17 - info/refs respects umask in unshared repo
+
+expecting success of 1301.18 'forced modes': 
+	test_when_finished "rm -rf new" &&
+	mkdir -p templates/hooks &&
+	echo update-server-info >templates/hooks/post-update &&
+	chmod +x templates/hooks/post-update &&
+	echo : >random-file &&
+	mkdir new &&
+	(
+		cd new &&
+		umask 002 &&
+		git init --shared=0660 --template=../templates &&
+		test_path_is_file .git/hooks/post-update &&
+		>frotz &&
+		git add frotz &&
+		git commit -a -m initial &&
+		git repack
+	) &&
+	# List repository files meant to be protected; note that
+	# COMMIT_EDITMSG does not matter---0mode is not about a
+	# repository with a work tree.
+	find new/.git -type f -name COMMIT_EDITMSG -prune -o -print |
+	xargs ls -ld >actual &&
+
+	# Everything must be unaccessible to others
+	test -z "$(sed -e "/^.......---/d" actual)" &&
+
+	# All directories must have either 2770 or 770
+	test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
+
+	# post-update hook must be 0770
+	test -z "$(sed -n -e "/post-update/{
+		/^-rwxrwx---/d
+		p
+	}" actual)" &&
+
+	# All files inside objects must be accessible by us
+	test -z "$(sed -n -e "/objects\//{
+		/^d/d
+		/^-r.-r.----/d
+		p
+	}" actual)"
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/new/.git/
+[main (root-commit) e4c5dc6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 frotz
+ok 18 - forced modes
+
+expecting success of 1301.19 'remote init does not use config from cwd': 
+	test_when_finished "rm -rf child.git" &&
+	git config core.sharedrepository 0666 &&
+	umask 0022 &&
+	git init --bare child.git &&
+	echo "-rw-r--r--" >expect &&
+	test_modebits child.git/config >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
+ok 19 - remote init does not use config from cwd
+
+expecting success of 1301.20 're-init respects core.sharedrepository (local)': 
+	git config core.sharedrepository 0666 &&
+	umask 0022 &&
+	echo whatever >templates/foo &&
+	git init --template=templates &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits .git/foo >actual &&
+	test_cmp expect actual
+
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
+ok 20 - re-init respects core.sharedrepository (local)
+
+expecting success of 1301.21 're-init respects core.sharedrepository (remote)': 
+	test_when_finished "rm -rf child.git" &&
+	umask 0022 &&
+	git init --bare --shared=0666 child.git &&
+	test_path_is_missing child.git/foo &&
+	git init --bare --template=templates child.git &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits child.git/foo >actual &&
+	test_cmp expect actual
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
+ok 21 - re-init respects core.sharedrepository (remote)
+
+expecting success of 1301.22 'template can set core.sharedrepository': 
+	test_when_finished "rm -rf child.git" &&
+	umask 0022 &&
+	git config core.sharedrepository 0666 &&
+	cp .git/config templates/config &&
+	git init --bare --template=templates child.git &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits child.git/HEAD >actual &&
+	test_cmp expect actual
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
+ok 22 - template can set core.sharedrepository
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0610-reftable-basics.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t0610-reftable-basics/.git/
 expecting success of 0610.1 'pack-refs does not crash with -h': 
@@ -47047,549 +47545,6 @@
 1..90
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1302-repo-version.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/.git/
-expecting success of 1302.1 'setup': 
-	cat >test.patch <<-\EOF &&
-	diff --git a/test.txt b/test.txt
-	new file mode 100644
-	--- /dev/null
-	+++ b/test.txt
-	@@ -0,0 +1 @@
-	+123
-	EOF
-
-	test_create_repo "test" &&
-	test_create_repo "test2" &&
-	git config --file=test2/.git/config core.repositoryformatversion 99
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/test/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/test2/.git/
-ok 1 - setup
-
-expecting success of 1302.2 'gitdir selection on normal repos': 
-	if test_have_prereq DEFAULT_REPO_FORMAT
-	then
-		echo 0
-	else
-		echo 1
-	fi >expect &&
-	git config core.repositoryformatversion >actual &&
-	git -C test config core.repositoryformatversion >actual2 &&
-	test_cmp expect actual &&
-	test_cmp expect actual2
-
-checking prerequisite: DEFAULT_REPO_FORMAT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-	test_have_prereq SHA1,REFFILES
-
-)
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-prerequisite DEFAULT_REPO_FORMAT ok
-ok 2 - gitdir selection on normal repos
-
-expecting success of 1302.3 'gitdir selection on unsupported repo': 
-	# Make sure it would stop at test2, not trash
-	test_expect_code 1 git -C test2 config core.repositoryformatversion
-
-warning: Expected git repo version <= 1, found 99
-ok 3 - gitdir selection on unsupported repo
-
-expecting success of 1302.4 'gitdir not required mode': 
-	git apply --stat test.patch &&
-	git -C test apply --stat ../test.patch &&
-	git -C test2 apply --stat ../test.patch
-
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
-warning: Expected git repo version <= 1, found 99
-warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
-ok 4 - gitdir not required mode
-
-expecting success of 1302.5 'gitdir required mode': 
-	git apply --check --index test.patch &&
-	git -C test apply --check --index ../test.patch &&
-	test_must_fail git -C test2 apply --check --index ../test.patch
-
-warning: Expected git repo version <= 1, found 99
-warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
-error: '--index' outside a repository
-ok 5 - gitdir required mode
-
-expecting success of 1302.6 'allow version=0 ': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0  >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 6 - allow version=0 
-
-expecting success of 1302.7 'allow version=1 ': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1  >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 7 - allow version=1 
-
-expecting success of 1302.8 'allow version=1 noop': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 noop >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 8 - allow version=1 noop
-
-expecting success of 1302.9 'abort version=1 no-such-extension': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 no-such-extension >.git/config &&
-			check_abort
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-fatal: unknown repository extension found:
-	no-such-extension
-ok 9 - abort version=1 no-such-extension
-
-expecting success of 1302.10 'allow version=0 no-such-extension': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 no-such-extension >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 10 - allow version=0 no-such-extension
-
-expecting success of 1302.11 'allow version=0 noop': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 noop >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 11 - allow version=0 noop
-
-expecting success of 1302.12 'abort version=0 noop-v1': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 noop-v1 >.git/config &&
-			check_abort
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-fatal: repo version is 0, but v1-only extension found:
-	noop-v1
-ok 12 - abort version=0 noop-v1
-
-expecting success of 1302.13 'allow version=1 noop-v1': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 noop-v1 >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1302-repo-version/extensions/.git/
-ok 13 - allow version=1 noop-v1
-
-expecting success of 1302.14 'precious-objects allowed': 
-	git config core.repositoryFormatVersion 1 &&
-	git config extensions.preciousObjects 1 &&
-	check_allow
-
-ok 14 - precious-objects allowed
-
-expecting success of 1302.15 'precious-objects blocks destructive repack': 
-	test_must_fail git repack -ad
-
-fatal: cannot delete packs in a precious-objects repo
-ok 15 - precious-objects blocks destructive repack
-
-expecting success of 1302.16 'other repacks are OK': 
-	test_commit foo &&
-	git repack
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 16 - other repacks are OK
-
-expecting success of 1302.17 'precious-objects blocks prune': 
-	test_must_fail git prune
-
-fatal: cannot prune in a precious-objects repo
-ok 17 - precious-objects blocks prune
-
-expecting success of 1302.18 'gc runs without complaint': 
-	git gc
-
-ok 18 - gc runs without complaint
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1301-shared-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
-expecting success of 1301.1 'shared = 0400 (faulty permission u-w)': 
-	test_when_finished "rm -rf sub" &&
-	mkdir sub && (
-		cd sub &&
-		test_must_fail git init --shared=0400
-	)
-
-fatal: problem with core.sharedRepository filemode value (0400).
-The owner of files must always have read and write permissions.
-ok 1 - shared = 0400 (faulty permission u-w)
-
-expecting success of 1301.2 'shared=1 does not clear bits preset by umask 002': 
-		test_when_finished "rm -rf sub" &&
-		mkdir sub && (
-			cd sub &&
-			umask $u &&
-			git init --shared=1 &&
-			test 1 = "$(git config core.sharedrepository)"
-		) &&
-		actual=$(ls -l sub/.git/HEAD) &&
-		case "$actual" in
-		-rw-rw-r--*)
-			: happy
-			;;
-		*)
-			echo Oops, .git/HEAD is not 0664 but $actual
-			false
-			;;
-		esac
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/sub/.git/
-ok 2 - shared=1 does not clear bits preset by umask 002
-
-expecting success of 1301.3 'shared=1 does not clear bits preset by umask 022': 
-		test_when_finished "rm -rf sub" &&
-		mkdir sub && (
-			cd sub &&
-			umask $u &&
-			git init --shared=1 &&
-			test 1 = "$(git config core.sharedrepository)"
-		) &&
-		actual=$(ls -l sub/.git/HEAD) &&
-		case "$actual" in
-		-rw-rw-r--*)
-			: happy
-			;;
-		*)
-			echo Oops, .git/HEAD is not 0664 but $actual
-			false
-			;;
-		esac
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/sub/.git/
-ok 3 - shared=1 does not clear bits preset by umask 022
-
-expecting success of 1301.4 'shared=all': 
-	git init --template= --shared=all &&
-	test 2 = $(git config core.sharedrepository)
-
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
-ok 4 - shared=all
-
-expecting success of 1301.5 'template cannot set core.bare': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "rm -rf templates" &&
-	test_config core.bare true &&
-	umask 0022 &&
-	mkdir -p templates/ &&
-	cp .git/config templates/config &&
-	git init --template=templates subdir &&
-	test_path_is_missing subdir/HEAD
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/subdir/.git/
-ok 5 - template cannot set core.bare
-
-expecting success of 1301.6 'update-server-info honors core.sharedRepository': 
-	: > a1 &&
-	git add a1 &&
-	test_tick &&
-	git commit -m a1 &&
-	mkdir .git/info &&
-	umask 0277 &&
-	git update-server-info &&
-	actual="$(ls -l .git/info/refs)" &&
-	case "$actual" in
-	-r--r--r--*)
-		: happy
-		;;
-	*)
-		echo Oops, .git/info/refs is not 0444
-		false
-		;;
-	esac
-
-[main (root-commit) a2bd363] a1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a1
-ok 6 - update-server-info honors core.sharedRepository
-
-expecting success of 1301.7 'shared = 0660 (r--r-----) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 7 - shared = 0660 (r--r-----) ro
-
-expecting success of 1301.8 'shared = 0660 (rw-rw----) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 8 - shared = 0660 (rw-rw----) rw
-
-expecting success of 1301.9 'shared = 0640 (r--r-----) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 9 - shared = 0640 (r--r-----) ro
-
-expecting success of 1301.10 'shared = 0640 (rw-r-----) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 10 - shared = 0640 (rw-r-----) rw
-
-expecting success of 1301.11 'shared = 0600 (r--------) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 11 - shared = 0600 (r--------) ro
-
-expecting success of 1301.12 'shared = 0600 (rw-------) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 12 - shared = 0600 (rw-------) rw
-
-expecting success of 1301.13 'shared = 0666 (r--r--r--) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 13 - shared = 0666 (r--r--r--) ro
-
-expecting success of 1301.14 'shared = 0666 (rw-rw-rw-) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 14 - shared = 0666 (rw-rw-rw-) rw
-
-expecting success of 1301.15 'shared = 0664 (r--r--r--) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 15 - shared = 0664 (r--r--r--) ro
-
-expecting success of 1301.16 'shared = 0664 (rw-rw-r--) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 16 - shared = 0664 (rw-rw-r--) rw
-
-expecting success of 1301.17 'info/refs respects umask in unshared repo': 
-	rm -f .git/info/refs &&
-	test_unconfig core.sharedrepository &&
-	umask 002 &&
-	git update-server-info &&
-	echo "-rw-rw-r--" >expect &&
-	test_modebits .git/info/refs >actual &&
-	test_cmp expect actual
-
-ok 17 - info/refs respects umask in unshared repo
-
-expecting success of 1301.18 'forced modes': 
-	test_when_finished "rm -rf new" &&
-	mkdir -p templates/hooks &&
-	echo update-server-info >templates/hooks/post-update &&
-	chmod +x templates/hooks/post-update &&
-	echo : >random-file &&
-	mkdir new &&
-	(
-		cd new &&
-		umask 002 &&
-		git init --shared=0660 --template=../templates &&
-		test_path_is_file .git/hooks/post-update &&
-		>frotz &&
-		git add frotz &&
-		git commit -a -m initial &&
-		git repack
-	) &&
-	# List repository files meant to be protected; note that
-	# COMMIT_EDITMSG does not matter---0mode is not about a
-	# repository with a work tree.
-	find new/.git -type f -name COMMIT_EDITMSG -prune -o -print |
-	xargs ls -ld >actual &&
-
-	# Everything must be unaccessible to others
-	test -z "$(sed -e "/^.......---/d" actual)" &&
-
-	# All directories must have either 2770 or 770
-	test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
-
-	# post-update hook must be 0770
-	test -z "$(sed -n -e "/post-update/{
-		/^-rwxrwx---/d
-		p
-	}" actual)" &&
-
-	# All files inside objects must be accessible by us
-	test -z "$(sed -n -e "/objects\//{
-		/^d/d
-		/^-r.-r.----/d
-		p
-	}" actual)"
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/new/.git/
-[main (root-commit) e4c5dc6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 frotz
-ok 18 - forced modes
-
-expecting success of 1301.19 'remote init does not use config from cwd': 
-	test_when_finished "rm -rf child.git" &&
-	git config core.sharedrepository 0666 &&
-	umask 0022 &&
-	git init --bare child.git &&
-	echo "-rw-r--r--" >expect &&
-	test_modebits child.git/config >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
-ok 19 - remote init does not use config from cwd
-
-expecting success of 1301.20 're-init respects core.sharedrepository (local)': 
-	git config core.sharedrepository 0666 &&
-	umask 0022 &&
-	echo whatever >templates/foo &&
-	git init --template=templates &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits .git/foo >actual &&
-	test_cmp expect actual
-
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/.git/
-ok 20 - re-init respects core.sharedrepository (local)
-
-expecting success of 1301.21 're-init respects core.sharedrepository (remote)': 
-	test_when_finished "rm -rf child.git" &&
-	umask 0022 &&
-	git init --bare --shared=0666 child.git &&
-	test_path_is_missing child.git/foo &&
-	git init --bare --template=templates child.git &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits child.git/foo >actual &&
-	test_cmp expect actual
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
-ok 21 - re-init respects core.sharedrepository (remote)
-
-expecting success of 1301.22 'template can set core.sharedrepository': 
-	test_when_finished "rm -rf child.git" &&
-	umask 0022 &&
-	git config core.sharedrepository 0666 &&
-	cp .git/config templates/config &&
-	git init --bare --template=templates child.git &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits child.git/HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1301-shared-repo/child.git/
-ok 22 - template can set core.sharedrepository
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1016-compatObjectFormat.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1016-compatObjectFormat/.git/
 expecting success of 1016.1 'setup sha1 repository': 
@@ -48620,6 +48575,30 @@
 1..202
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1304-default-acl/.git/
+expecting success of 1304.1 'checking for a working acl setup': 
+	if setfacl -m d:m:rwx -m u:root:rwx . &&
+	   getfacl . | grep user:root:rwx &&
+	   touch should-have-readable-acl &&
+	   getfacl should-have-readable-acl | grep -E "mask::?rw-"
+	then
+		test_set_prereq SETFACL
+	fi
+
+./test-lib.sh: line 1007: setfacl: command not found
+ok 1 - checking for a working acl setup
+
+ok 2 # skip Setup test repo (missing SETFACL)
+
+ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+
+ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1303-wacky-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1303-wacky-config/.git/
 expecting success of 1303.1 'modify same key': 
@@ -48720,28 +48699,330 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1304-default-acl/.git/
-expecting success of 1304.1 'checking for a working acl setup': 
-	if setfacl -m d:m:rwx -m u:root:rwx . &&
-	   getfacl . | grep user:root:rwx &&
-	   touch should-have-readable-acl &&
-	   getfacl should-have-readable-acl | grep -E "mask::?rw-"
-	then
-		test_set_prereq SETFACL
-	fi
+*** t1306-xdg-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1306-xdg-files/.git/
+expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p .config/git &&
+	echo "[alias]" >.config/git/config &&
+	echo "	myalias = !echo in_config" >>.config/git/config &&
+	echo in_config >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
 
-t1304-default-acl.sh: 4: eval: setfacl: not found
-ok 1 - checking for a working acl setup
+ok 1 - read config: xdg file exists and ~/.gitconfig doesn't
 
-ok 2 # skip Setup test repo (missing SETFACL)
+expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[alias]" >.gitconfig &&
+	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
+	echo in_gitconfig >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
 
-ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+ok 2 - read config: xdg file exists and ~/.gitconfig exists
 
-ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo "[user]" >.config/git/config &&
+	echo "	name = read_config" >>.config/git/config &&
+	echo read_config >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
 
-# passed all 4 test(s)
-1..4
+ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
+	echo in_xdg >expected &&
+	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
+	test_cmp expected actual
+
+ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
+
+expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo read_gitconfig >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
+
+ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo user.name=read_config >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo user.name=read_gitconfig >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 7 - read with --list: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.8 'Setup': 
+	git init git &&
+	cd git &&
+	echo foo >to_be_excluded
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1306-xdg-files/git/.git/
+ok 8 - Setup
+
+expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
+	mkdir -p "$HOME"/.config/git/ &&
+	echo to_be_excluded >"$HOME"/.config/git/ignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config set advice.addIgnoredFile false"
+ok 9 - Exclusion of a file in the XDG ignore file
+
+expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo content >excluded_by_xdg_only &&
+	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
+	test_when_finished "git read-tree --empty" &&
+	(XDG_CONFIG_HOME="$HOME/xdg" &&
+	 export XDG_CONFIG_HOME &&
+	 git add to_be_excluded &&
+	 test_must_fail git add excluded_by_xdg_only
+	)
+
+The following paths are ignored by one of your .gitignore files:
+excluded_by_xdg_only
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config set advice.addIgnoredFile false"
+ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
+
+expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
+	echo to_be_excluded >.gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config set advice.addIgnoredFile false"
+ok 11 - Exclusion in both XDG and local ignore files
+
+expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
+	rm .gitignore &&
+	echo >"$HOME"/.config/git/ignore &&
+	echo to_be_excluded >"$HOME"/my_gitignore &&
+	git config core.excludesfile "$HOME"/my_gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config set advice.addIgnoredFile false"
+ok 12 - Exclusion in a non-XDG global ignore file
+
+expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
+	(sane_unset HOME &&
+	 git config --unset core.excludesfile &&
+	 git ls-files --exclude-standard --ignored --others >actual) &&
+	test_must_be_empty actual
+
+ok 13 - Checking XDG ignore file when HOME is unset
+
+expecting success of 1306.14 'Checking attributes in the XDG attributes file': 
+	echo foo >f &&
+	git check-attr -a f >actual &&
+	test_line_count -eq 0 actual &&
+	echo "f attr_f" >"$HOME"/.config/git/attributes &&
+	echo "f: attr_f: set" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 14 - Checking attributes in the XDG attributes file
+
+expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
+	(sane_unset HOME &&
+	 git check-attr -a f >actual) &&
+	test_must_be_empty actual
+
+ok 15 - Checking XDG attributes when HOME is unset
+
+expecting success of 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
+	echo "f: attr_f: xdg" >expected &&
+	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
+
+expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
+	echo "f -attr_f" >.gitattributes &&
+	echo "f: attr_f: unset" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 17 - Checking attributes in both XDG and local attributes files
+
+expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
+	rm -f .gitattributes &&
+	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
+	git config core.attributesfile "$HOME"/my_gitattributes &&
+	echo "f: attr_f: test" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 18 - Checking attributes in a non-XDG global attributes file
+
+expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p "$HOME"/.config/git &&
+	>"$HOME"/.config/git/config &&
+	rm -f "$HOME"/.gitconfig &&
+	git config --global user.name "write_config" &&
+	echo "[user]" >expected &&
+	echo "	name = write_config" >>expected &&
+	test_cmp expected "$HOME"/.config/git/config
+
+ok 19 - write: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
+	>"$HOME"/.gitconfig &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 20 - write: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
+	rm -f "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.config/git/config &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 21 - write: ~/.config/git/ exists and config file doesn't
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1307-config-blob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1307-config-blob/.git/
+expecting success of 1307.1 'create config blob': 
+	cat >config <<-\EOF &&
+	[some]
+		value = 1
+	EOF
+	git add config &&
+	git commit -m foo
+
+[master (root-commit) 5571afa] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 config
+ok 1 - create config blob
+
+expecting success of 1307.2 'list config blob contents': 
+	echo some.value=1 >expect &&
+	git config --blob=HEAD:config --list >actual &&
+	test_cmp expect actual
+
+ok 2 - list config blob contents
+
+expecting success of 1307.3 'fetch value from blob': 
+	echo true >expect &&
+	git config --blob=HEAD:config --bool some.value >actual &&
+	test_cmp expect actual
+
+ok 3 - fetch value from blob
+
+expecting success of 1307.4 'reading non-existing value from blob is an error': 
+	test_must_fail git config --blob=HEAD:config non.existing
+
+ok 4 - reading non-existing value from blob is an error
+
+expecting success of 1307.5 'reading from blob and file is an error': 
+	test_must_fail git config --blob=HEAD:config --system --list
+
+error: only one config file at a time
+ok 5 - reading from blob and file is an error
+
+expecting success of 1307.6 'reading from missing ref is an error': 
+	test_must_fail git config --blob=HEAD:doesnotexist --list
+
+error: unable to resolve config blob 'HEAD:doesnotexist'
+fatal: error processing config file(s)
+ok 6 - reading from missing ref is an error
+
+expecting success of 1307.7 'reading from non-blob is an error': 
+	test_must_fail git config --blob=HEAD --list
+
+error: reference 'HEAD' does not point to a blob
+fatal: error processing config file(s)
+ok 7 - reading from non-blob is an error
+
+expecting success of 1307.8 'setting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config some.value foo
+
+fatal: writing config blobs is not supported
+ok 8 - setting a value in a blob is an error
+
+expecting success of 1307.9 'deleting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --unset some.value
+
+fatal: writing config blobs is not supported
+ok 9 - deleting a value in a blob is an error
+
+expecting success of 1307.10 'editing a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --edit
+
+fatal: editing blobs is not supported
+ok 10 - editing a blob is an error
+
+expecting success of 1307.11 'parse errors in blobs are properly attributed': 
+	cat >config <<-\EOF &&
+	[some]
+		value = "
+	EOF
+	git add config &&
+	git commit -m broken &&
+
+	test_must_fail git config --blob=HEAD:config some.value 2>err &&
+	test_grep "HEAD:config" err
+
+[master 91b4611] broken
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: bad config line 2 in blob HEAD:config
+ok 11 - parse errors in blobs are properly attributed
+
+expecting success of 1307.12 'can parse blob ending with CR': 
+	test_commit --printf CR config "[some]key = value\\r" &&
+	echo value >expect &&
+	git config --blob=HEAD:config some.key >actual &&
+	test_cmp expect actual
+
+[master f02e06a] CR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 12 - can parse blob ending with CR
+
+expecting success of 1307.13 'config --blob outside of a repository is an error': 
+	nongit test_must_fail git config --blob=foo --list
+
+fatal: --blob can only be used inside a git repository
+ok 13 - config --blob outside of a repository is an error
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0000-basic.sh ***
@@ -49489,7 +49770,7 @@
 
 	grep "echo trace" lazy-prereq-and-tracing/err
 
-+ echo trace
+++ echo trace
 ok 44 - subtest: lazy prereqs do not turn off tracing
 
 expecting success of 0000.45 'subtest: tests clean up after themselves': 
@@ -50039,374 +50320,6 @@
 1..92
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1306-xdg-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1306-xdg-files/.git/
-expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p .config/git &&
-	echo "[alias]" >.config/git/config &&
-	echo "	myalias = !echo in_config" >>.config/git/config &&
-	echo in_config >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
-
-ok 1 - read config: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[alias]" >.gitconfig &&
-	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
-	echo in_gitconfig >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
-
-ok 2 - read config: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo "[user]" >.config/git/config &&
-	echo "	name = read_config" >>.config/git/config &&
-	echo read_config >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
-
-ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
-	echo in_xdg >expected &&
-	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
-	test_cmp expected actual
-
-ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
-
-expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo read_gitconfig >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
-
-ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo user.name=read_config >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
-
-ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo user.name=read_gitconfig >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
-
-ok 7 - read with --list: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.8 'Setup': 
-	git init git &&
-	cd git &&
-	echo foo >to_be_excluded
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1306-xdg-files/git/.git/
-ok 8 - Setup
-
-expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
-	mkdir -p "$HOME"/.config/git/ &&
-	echo to_be_excluded >"$HOME"/.config/git/ignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config set advice.addIgnoredFile false"
-ok 9 - Exclusion of a file in the XDG ignore file
-
-expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo content >excluded_by_xdg_only &&
-	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
-	test_when_finished "git read-tree --empty" &&
-	(XDG_CONFIG_HOME="$HOME/xdg" &&
-	 export XDG_CONFIG_HOME &&
-	 git add to_be_excluded &&
-	 test_must_fail git add excluded_by_xdg_only
-	)
-
-The following paths are ignored by one of your .gitignore files:
-excluded_by_xdg_only
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config set advice.addIgnoredFile false"
-ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
-
-expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
-	echo to_be_excluded >.gitignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config set advice.addIgnoredFile false"
-ok 11 - Exclusion in both XDG and local ignore files
-
-expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
-	rm .gitignore &&
-	echo >"$HOME"/.config/git/ignore &&
-	echo to_be_excluded >"$HOME"/my_gitignore &&
-	git config core.excludesfile "$HOME"/my_gitignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config set advice.addIgnoredFile false"
-ok 12 - Exclusion in a non-XDG global ignore file
-
-expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
-	(sane_unset HOME &&
-	 git config --unset core.excludesfile &&
-	 git ls-files --exclude-standard --ignored --others >actual) &&
-	test_must_be_empty actual
-
-ok 13 - Checking XDG ignore file when HOME is unset
-
-expecting success of 1306.14 'Checking attributes in the XDG attributes file': 
-	echo foo >f &&
-	git check-attr -a f >actual &&
-	test_line_count -eq 0 actual &&
-	echo "f attr_f" >"$HOME"/.config/git/attributes &&
-	echo "f: attr_f: set" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 14 - Checking attributes in the XDG attributes file
-
-expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
-	(sane_unset HOME &&
-	 git check-attr -a f >actual) &&
-	test_must_be_empty actual
-
-ok 15 - Checking XDG attributes when HOME is unset
-
-expecting success of 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
-	echo "f: attr_f: xdg" >expected &&
-	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
-
-expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
-	echo "f -attr_f" >.gitattributes &&
-	echo "f: attr_f: unset" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 17 - Checking attributes in both XDG and local attributes files
-
-expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
-	rm -f .gitattributes &&
-	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
-	git config core.attributesfile "$HOME"/my_gitattributes &&
-	echo "f: attr_f: test" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 18 - Checking attributes in a non-XDG global attributes file
-
-expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p "$HOME"/.config/git &&
-	>"$HOME"/.config/git/config &&
-	rm -f "$HOME"/.gitconfig &&
-	git config --global user.name "write_config" &&
-	echo "[user]" >expected &&
-	echo "	name = write_config" >>expected &&
-	test_cmp expected "$HOME"/.config/git/config
-
-ok 19 - write: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
-	>"$HOME"/.gitconfig &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
-
-ok 20 - write: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
-	rm -f "$HOME"/.gitconfig &&
-	rm -f "$HOME"/.config/git/config &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
-
-ok 21 - write: ~/.config/git/ exists and config file doesn't
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1307-config-blob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1307-config-blob/.git/
-expecting success of 1307.1 'create config blob': 
-	cat >config <<-\EOF &&
-	[some]
-		value = 1
-	EOF
-	git add config &&
-	git commit -m foo
-
-[master (root-commit) 5571afa] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 config
-ok 1 - create config blob
-
-expecting success of 1307.2 'list config blob contents': 
-	echo some.value=1 >expect &&
-	git config --blob=HEAD:config --list >actual &&
-	test_cmp expect actual
-
-ok 2 - list config blob contents
-
-expecting success of 1307.3 'fetch value from blob': 
-	echo true >expect &&
-	git config --blob=HEAD:config --bool some.value >actual &&
-	test_cmp expect actual
-
-ok 3 - fetch value from blob
-
-expecting success of 1307.4 'reading non-existing value from blob is an error': 
-	test_must_fail git config --blob=HEAD:config non.existing
-
-ok 4 - reading non-existing value from blob is an error
-
-expecting success of 1307.5 'reading from blob and file is an error': 
-	test_must_fail git config --blob=HEAD:config --system --list
-
-error: only one config file at a time
-ok 5 - reading from blob and file is an error
-
-expecting success of 1307.6 'reading from missing ref is an error': 
-	test_must_fail git config --blob=HEAD:doesnotexist --list
-
-error: unable to resolve config blob 'HEAD:doesnotexist'
-fatal: error processing config file(s)
-ok 6 - reading from missing ref is an error
-
-expecting success of 1307.7 'reading from non-blob is an error': 
-	test_must_fail git config --blob=HEAD --list
-
-error: reference 'HEAD' does not point to a blob
-fatal: error processing config file(s)
-ok 7 - reading from non-blob is an error
-
-expecting success of 1307.8 'setting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config some.value foo
-
-fatal: writing config blobs is not supported
-ok 8 - setting a value in a blob is an error
-
-expecting success of 1307.9 'deleting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --unset some.value
-
-fatal: writing config blobs is not supported
-ok 9 - deleting a value in a blob is an error
-
-expecting success of 1307.10 'editing a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --edit
-
-fatal: editing blobs is not supported
-ok 10 - editing a blob is an error
-
-expecting success of 1307.11 'parse errors in blobs are properly attributed': 
-	cat >config <<-\EOF &&
-	[some]
-		value = "
-	EOF
-	git add config &&
-	git commit -m broken &&
-
-	test_must_fail git config --blob=HEAD:config some.value 2>err &&
-	test_grep "HEAD:config" err
-
-[master 91b4611] broken
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: bad config line 2 in blob HEAD:config
-ok 11 - parse errors in blobs are properly attributed
-
-expecting success of 1307.12 'can parse blob ending with CR': 
-	test_commit --printf CR config "[some]key = value\\r" &&
-	echo value >expect &&
-	git config --blob=HEAD:config some.key >actual &&
-	test_cmp expect actual
-
-[master f02e06a] CR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 12 - can parse blob ending with CR
-
-expecting success of 1307.13 'config --blob outside of a repository is an error': 
-	nongit test_must_fail git config --blob=foo --list
-
-fatal: --blob can only be used inside a git repository
-ok 13 - config --blob outside of a repository is an error
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1310-config-default/.git/
-expecting success of 1310.1 'uses --default when entry missing': 
-	echo quux >expect &&
-	git config -f config --default=quux core.foo >actual &&
-	test_cmp expect actual
-
-ok 1 - uses --default when entry missing
-
-expecting success of 1310.2 'does not use --default when entry present': 
-	echo bar >expect &&
-	git -c core.foo=bar config --default=baz core.foo >actual &&
-	test_cmp expect actual
-
-ok 2 - does not use --default when entry present
-
-expecting success of 1310.3 'canonicalizes --default with appropriate type': 
-	echo true >expect &&
-	git config -f config --default=yes --bool core.foo >actual &&
-	test_cmp expect actual
-
-ok 3 - canonicalizes --default with appropriate type
-
-expecting success of 1310.4 'dies when --default cannot be parsed': 
-	test_must_fail git config -f config --type=expiry-date --default=x --get \
-		not.a.section 2>error &&
-	test_grep "failed to format default config value" error
-
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
-
-expecting success of 1310.5 'does not allow --default without --get': 
-	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
-	test_grep "\-\-default is only applicable to" output
-
-error: --default is only applicable to --get
-ok 5 - does not allow --default without --get
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1305-config-include.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1305-config-include/.git/
 expecting success of 1305.1 'include file by absolute path': 
@@ -51679,6 +51592,7 @@
 warning: disabling cone pattern matching
 warning: disabling cone pattern matching
 warning: disabling cone pattern matching
+warning: disabling cone pattern matching
 ok 48 - pattern-checks: contained glob characters
 
 expecting success of 1091.49 'pattern-checks: escaped characters': 
@@ -52083,6 +51997,48 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1310-config-default/.git/
+expecting success of 1310.1 'uses --default when entry missing': 
+	echo quux >expect &&
+	git config -f config --default=quux core.foo >actual &&
+	test_cmp expect actual
+
+ok 1 - uses --default when entry missing
+
+expecting success of 1310.2 'does not use --default when entry present': 
+	echo bar >expect &&
+	git -c core.foo=bar config --default=baz core.foo >actual &&
+	test_cmp expect actual
+
+ok 2 - does not use --default when entry present
+
+expecting success of 1310.3 'canonicalizes --default with appropriate type': 
+	echo true >expect &&
+	git config -f config --default=yes --bool core.foo >actual &&
+	test_cmp expect actual
+
+ok 3 - canonicalizes --default with appropriate type
+
+expecting success of 1310.4 'dies when --default cannot be parsed': 
+	test_must_fail git config -f config --type=expiry-date --default=x --get \
+		not.a.section 2>error &&
+	test_grep "failed to format default config value" error
+
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
+
+expecting success of 1310.5 'does not allow --default without --get': 
+	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
+	test_grep "\-\-default is only applicable to" output
+
+error: --default is only applicable to --get
+ok 5 - does not allow --default without --get
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1309-early-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1309-early-config/.git/
 expecting success of 1309.1 'read early config': 
@@ -59195,6 +59151,129 @@
 1..374
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1406-submodule-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1406-submodule-ref-store/.git/
+expecting success of 1406.1 'setup': 
+	git init sub &&
+	(
+		cd sub &&
+		test_commit first &&
+		git checkout -b new-main &&
+		git tag -a -m new-tag new-tag HEAD
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1406-submodule-ref-store/sub/.git/
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Switched to a new branch 'new-main'
+ok 1 - setup
+
+expecting success of 1406.2 'pack_refs() not allowed': 
+	test_must_fail $RUN pack-refs 3
+
+fatal: unknown function pack-refs
+ok 2 - pack_refs() not allowed
+
+expecting success of 1406.3 'create_symref() not allowed': 
+	test_must_fail $RUN create-symref FOO refs/heads/main nothing
+
+BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
+ok 3 - create_symref() not allowed
+
+expecting success of 1406.4 'delete_refs() not allowed': 
+	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
+
+BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
+ok 4 - delete_refs() not allowed
+
+expecting success of 1406.5 'rename_refs() not allowed': 
+	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
+
+BUG: refs/files-backend.c:159: operation rename_ref requires abilities 0x2, but only have 0x5
+ok 5 - rename_refs() not allowed
+
+expecting success of 1406.6 'for_each_ref(refs/heads/)': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	cat >expected <<-\EOF &&
+	main 0x0
+	new-main 0x0
+	EOF
+	test_cmp expected actual
+
+ok 6 - for_each_ref(refs/heads/)
+
+expecting success of 1406.7 'for_each_ref() is sorted': 
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
+	sort actual > expected &&
+	test_cmp expected actual
+
+ok 7 - for_each_ref() is sorted
+
+expecting success of 1406.8 'resolve_ref(main)': 
+	SHA1=`git -C sub rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RUN resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual
+
+ok 8 - resolve_ref(main)
+
+expecting success of 1406.9 'verify_ref(new-main)': 
+	$RUN verify-ref refs/heads/new-main
+
+ok 9 - verify_ref(new-main)
+
+expecting success of 1406.10 'for_each_reflog()': 
+	$RUN for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	refs/heads/main
+	refs/heads/new-main
+	EOF
+	test_cmp expected actual
+
+ok 10 - for_each_reflog()
+
+expecting success of 1406.11 'for_each_reflog_ent()': 
+	$RUN for-each-reflog-ent HEAD >actual &&
+	head -n1 actual | grep first &&
+	tail -n1 actual | grep main.to.new
+
+0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
+50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
+ok 11 - for_each_reflog_ent()
+
+expecting success of 1406.12 'for_each_reflog_ent_reverse()': 
+	$RUN for-each-reflog-ent-reverse HEAD >actual &&
+	head -n1 actual | grep main.to.new &&
+	tail -n1 actual | grep first
+
+50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
+0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
+ok 12 - for_each_reflog_ent_reverse()
+
+expecting success of 1406.13 'reflog_exists(HEAD)': 
+	$RUN reflog-exists HEAD
+
+ok 13 - reflog_exists(HEAD)
+
+expecting success of 1406.14 'delete_reflog() not allowed': 
+	test_must_fail $RUN delete-reflog HEAD
+
+BUG: refs/files-backend.c:159: operation delete_reflog requires abilities 0x2, but only have 0x5
+ok 14 - delete_reflog() not allowed
+
+expecting success of 1406.15 'create-reflog() not allowed': 
+	test_must_fail $RUN create-reflog HEAD
+
+BUG: refs/files-backend.c:159: operation create_reflog requires abilities 0x2, but only have 0x5
+ok 15 - create-reflog() not allowed
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1401-symbolic-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1401-symbolic-ref/.git/
 expecting success of 1401.1 'setup': 
@@ -59628,129 +59707,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1406-submodule-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1406-submodule-ref-store/.git/
-expecting success of 1406.1 'setup': 
-	git init sub &&
-	(
-		cd sub &&
-		test_commit first &&
-		git checkout -b new-main &&
-		git tag -a -m new-tag new-tag HEAD
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1406-submodule-ref-store/sub/.git/
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Switched to a new branch 'new-main'
-ok 1 - setup
-
-expecting success of 1406.2 'pack_refs() not allowed': 
-	test_must_fail $RUN pack-refs 3
-
-fatal: unknown function pack-refs
-ok 2 - pack_refs() not allowed
-
-expecting success of 1406.3 'create_symref() not allowed': 
-	test_must_fail $RUN create-symref FOO refs/heads/main nothing
-
-BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
-ok 3 - create_symref() not allowed
-
-expecting success of 1406.4 'delete_refs() not allowed': 
-	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
-
-BUG: refs/files-backend.c:159: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
-ok 4 - delete_refs() not allowed
-
-expecting success of 1406.5 'rename_refs() not allowed': 
-	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
-
-BUG: refs/files-backend.c:159: operation rename_ref requires abilities 0x2, but only have 0x5
-ok 5 - rename_refs() not allowed
-
-expecting success of 1406.6 'for_each_ref(refs/heads/)': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	cat >expected <<-\EOF &&
-	main 0x0
-	new-main 0x0
-	EOF
-	test_cmp expected actual
-
-ok 6 - for_each_ref(refs/heads/)
-
-expecting success of 1406.7 'for_each_ref() is sorted': 
-	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
-	sort actual > expected &&
-	test_cmp expected actual
-
-ok 7 - for_each_ref() is sorted
-
-expecting success of 1406.8 'resolve_ref(main)': 
-	SHA1=`git -C sub rev-parse main` &&
-	echo "$SHA1 refs/heads/main 0x0" >expected &&
-	$RUN resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual
-
-ok 8 - resolve_ref(main)
-
-expecting success of 1406.9 'verify_ref(new-main)': 
-	$RUN verify-ref refs/heads/new-main
-
-ok 9 - verify_ref(new-main)
-
-expecting success of 1406.10 'for_each_reflog()': 
-	$RUN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	refs/heads/main
-	refs/heads/new-main
-	EOF
-	test_cmp expected actual
-
-ok 10 - for_each_reflog()
-
-expecting success of 1406.11 'for_each_reflog_ent()': 
-	$RUN for-each-reflog-ent HEAD >actual &&
-	head -n1 actual | grep first &&
-	tail -n1 actual | grep main.to.new
-
-0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
-50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
-ok 11 - for_each_reflog_ent()
-
-expecting success of 1406.12 'for_each_reflog_ent_reverse()': 
-	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep main.to.new &&
-	tail -n1 actual | grep first
-
-50e526bb426771f6036ad3a8b0c81d511d91fc2a 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	checkout: moving from main to new-main
-0000000000000000000000000000000000000000 50e526bb426771f6036ad3a8b0c81d511d91fc2a C O Mitter <committer@example.com> 1112911993 -0700	commit (initial): first
-ok 12 - for_each_reflog_ent_reverse()
-
-expecting success of 1406.13 'reflog_exists(HEAD)': 
-	$RUN reflog-exists HEAD
-
-ok 13 - reflog_exists(HEAD)
-
-expecting success of 1406.14 'delete_reflog() not allowed': 
-	test_must_fail $RUN delete-reflog HEAD
-
-BUG: refs/files-backend.c:159: operation delete_reflog requires abilities 0x2, but only have 0x5
-ok 14 - delete_reflog() not allowed
-
-expecting success of 1406.15 'create-reflog() not allowed': 
-	test_must_fail $RUN create-reflog HEAD
-
-BUG: refs/files-backend.c:159: operation create_reflog requires abilities 0x2, but only have 0x5
-ok 15 - create-reflog() not allowed
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1403-show-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1403-show-ref/.git/
 expecting success of 1403.1 'setup': 
@@ -60107,6 +60063,68 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1407-worktree-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1407-worktree-ref-store/.git/
+expecting success of 1407.1 'setup': 
+	test_commit first &&
+	git worktree add -b wt-main wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
+
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'wt-main')
+HEAD is now at 50e526b first
+[wt-main d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 1 - setup
+
+expecting success of 1407.2 'resolve_ref(<shared-ref>)': 
+	SHA1=`git rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RWT resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual &&
+	$RMAIN resolve-ref refs/heads/main 0 >actual &&
+	test_cmp expected actual
+
+ok 2 - resolve_ref(<shared-ref>)
+
+expecting success of 1407.3 'resolve_ref(<per-worktree-ref>)': 
+	SHA1=`git -C wt rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
+	$RWT resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual &&
+
+	SHA1=`git rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/main 0x1" >expected &&
+	$RMAIN resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual
+
+ok 3 - resolve_ref(<per-worktree-ref>)
+
+expecting success of 1407.4 'create_symref(FOO, refs/heads/main)': 
+	$RWT create-symref FOO refs/heads/main nothing &&
+	echo refs/heads/main >expected &&
+	git -C wt symbolic-ref FOO >actual &&
+	test_cmp expected actual &&
+
+	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
+	echo refs/heads/wt-main >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
+
+ok 4 - create_symref(FOO, refs/heads/main)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1402-check-ref-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1402-check-ref-format/.git/
 expecting success of 1402.1 'ref name '' is invalid': 
@@ -60689,68 +60707,6 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1407-worktree-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1407-worktree-ref-store/.git/
-expecting success of 1407.1 'setup': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'wt-main')
-HEAD is now at 50e526b first
-[wt-main d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 1 - setup
-
-expecting success of 1407.2 'resolve_ref(<shared-ref>)': 
-	SHA1=`git rev-parse main` &&
-	echo "$SHA1 refs/heads/main 0x0" >expected &&
-	$RWT resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual &&
-	$RMAIN resolve-ref refs/heads/main 0 >actual &&
-	test_cmp expected actual
-
-ok 2 - resolve_ref(<shared-ref>)
-
-expecting success of 1407.3 'resolve_ref(<per-worktree-ref>)': 
-	SHA1=`git -C wt rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
-	$RWT resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual &&
-
-	SHA1=`git rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/main 0x1" >expected &&
-	$RMAIN resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual
-
-ok 3 - resolve_ref(<per-worktree-ref>)
-
-expecting success of 1407.4 'create_symref(FOO, refs/heads/main)': 
-	$RWT create-symref FOO refs/heads/main nothing &&
-	echo refs/heads/main >expected &&
-	git -C wt symbolic-ref FOO >actual &&
-	test_cmp expected actual &&
-
-	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
-	echo refs/heads/wt-main >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
-
-ok 4 - create_symref(FOO, refs/heads/main)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1408-packed-refs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1408-packed-refs/.git/
 expecting success of 1408.1 'setup': 
@@ -60922,52 +60878,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1412-reflog-loop.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1412-reflog-loop/.git/
-expecting success of 1412.1 'setup commits': 
-	test_commit one file content &&
-	test_commit --append two file content
-
-[master (root-commit) e46513e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 98995b2] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup commits
-
-expecting success of 1412.2 'setup reflog with alternating commits': 
-	git checkout -b topic &&
-	git reset one &&
-	git reset two &&
-	git reset one &&
-	git reset two
-
-Switched to a new branch 'topic'
-Unstaged changes after reset:
-M	file
-Unstaged changes after reset:
-M	file
-ok 2 - setup reflog with alternating commits
-
-expecting success of 1412.3 'reflog shows all entries': 
-	cat >expect <<-\EOF &&
-		topic@{0} reset: moving to two
-		topic@{1} reset: moving to one
-		topic@{2} reset: moving to two
-		topic@{3} reset: moving to one
-		topic@{4} branch: Created from HEAD
-	EOF
-	git log -g --format="%gd %gs" topic >actual &&
-	test_cmp expect actual
-
-ok 3 - reflog shows all entries
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1404-update-ref-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1404-update-ref-errors/.git/
 expecting success of 1404.1 'setup': 
@@ -61326,6 +61236,52 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1412-reflog-loop.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1412-reflog-loop/.git/
+expecting success of 1412.1 'setup commits': 
+	test_commit one file content &&
+	test_commit --append two file content
+
+[master (root-commit) e46513e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 98995b2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup commits
+
+expecting success of 1412.2 'setup reflog with alternating commits': 
+	git checkout -b topic &&
+	git reset one &&
+	git reset two &&
+	git reset one &&
+	git reset two
+
+Switched to a new branch 'topic'
+Unstaged changes after reset:
+M	file
+Unstaged changes after reset:
+M	file
+ok 2 - setup reflog with alternating commits
+
+expecting success of 1412.3 'reflog shows all entries': 
+	cat >expect <<-\EOF &&
+		topic@{0} reset: moving to two
+		topic@{1} reset: moving to one
+		topic@{2} reset: moving to two
+		topic@{3} reset: moving to one
+		topic@{4} branch: Created from HEAD
+	EOF
+	git log -g --format="%gd %gs" topic >actual &&
+	test_cmp expect actual
+
+ok 3 - reflog shows all entries
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1413-reflog-detach.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1413-reflog-detach/.git/
 expecting success of 1413.1 'setup': 
@@ -63682,7 +63638,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: .badbranchname
-fast-import: dumping crash report to .git/fast_import_crash_1775838
+fast-import: dumping crash report to .git/fast_import_crash_2998826
 ok 2 - fast-import: fail on invalid branch name ".badbranchname"
 
 expecting success of 1430.3 'fast-import: fail on invalid branch name "bad[branch]name"': 
@@ -63700,7 +63656,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Branch name doesn't conform to GIT standards: bad[branch]name
-fast-import: dumping crash report to .git/fast_import_crash_1775900
+fast-import: dumping crash report to .git/fast_import_crash_2998892
 ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
 
 expecting success of 1430.4 'git branch shows badly named ref as warning': 
@@ -68072,6 +68028,11 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1509-root-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1509-root-work-tree/.git/
+1..0 # SKIP Test requiring writable / skipped. Read this test if you want to run it
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1506-rev-parse-diagnosis.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1506-rev-parse-diagnosis/.git/
 expecting success of 1506.1 'set up basic repo': 
@@ -68425,11 +68386,6 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1509-root-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1509-root-work-tree/.git/
-1..0 # SKIP Test requiring writable / skipped. Read this test if you want to run it
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1508-at-combinations.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1508-at-combinations/.git/
 expecting success of 1508.1 'setup': 
@@ -69558,6 +69514,118 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1513-rev-parse-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1513-rev-parse-prefix/.git/
+expecting success of 1513.1 'setup': 
+	mkdir -p sub1/sub2 &&
+	echo top >top &&
+	echo file1 >sub1/file1 &&
+	echo file2 >sub1/sub2/file2 &&
+	git add top sub1/file1 sub1/sub2/file2 &&
+	git commit -m commit
+
+[main (root-commit) 2a70803] commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/sub2/file2
+ create mode 100644 top
+ok 1 - setup
+
+expecting success of 1513.2 'empty prefix -- file': 
+	git rev-parse --prefix "" -- top sub1/file1 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	top
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 2 - empty prefix -- file
+
+expecting success of 1513.3 'valid prefix -- file': 
+	git rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/file1
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
+
+ok 3 - valid prefix -- file
+
+expecting success of 1513.4 'valid prefix -- ../file': 
+	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/../top
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
+
+ok 4 - valid prefix -- ../file
+
+expecting success of 1513.5 'empty prefix HEAD:./path': 
+	git rev-parse --prefix "" HEAD:./top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
+
+ok 5 - empty prefix HEAD:./path
+
+expecting success of 1513.6 'valid prefix HEAD:./path': 
+	git rev-parse --prefix sub1/ HEAD:./file1 >actual &&
+	git rev-parse HEAD:sub1/file1 >expected &&
+	test_cmp expected actual
+
+ok 6 - valid prefix HEAD:./path
+
+expecting success of 1513.7 'valid prefix HEAD:../path': 
+	git rev-parse --prefix sub1/ HEAD:../top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
+
+ok 7 - valid prefix HEAD:../path
+
+expecting success of 1513.8 'prefix ignored with HEAD:top': 
+	git rev-parse --prefix sub1/ HEAD:top >actual &&
+	git rev-parse HEAD:top >expected &&
+	test_cmp expected actual
+
+ok 8 - prefix ignored with HEAD:top
+
+expecting success of 1513.9 'disambiguate path with valid prefix': 
+	git rev-parse --prefix sub1/ file1 >actual &&
+	cat <<-\EOF >expected &&
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 9 - disambiguate path with valid prefix
+
+expecting success of 1513.10 'file and refs with prefix': 
+	git rev-parse --prefix sub1/ main file1 >actual &&
+	cat <<-EOF >expected &&
+	$(git rev-parse main)
+	sub1/file1
+	EOF
+	test_cmp expected actual
+
+ok 10 - file and refs with prefix
+
+expecting success of 1513.11 'two-levels deep': 
+	git rev-parse --prefix sub1/sub2/ -- file2 >actual &&
+	cat <<-\EOF >expected &&
+	--
+	sub1/sub2/file2
+	EOF
+	test_cmp expected actual
+
+ok 11 - two-levels deep
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1400-update-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1400-update-ref/.git/
 expecting success of 1400.1 'setup': 
@@ -71262,8 +71330,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 refs/bisect/something
---- main-head	2026-04-19 19:15:55.535659440 +0000
-+++ worktree-head	2026-04-19 19:15:55.443659440 +0000
+--- main-head	2025-03-17 13:18:11.911514070 +0000
++++ worktree-head	2025-03-17 13:18:11.815513463 +0000
 @@ -1 +1 @@
 -58a052250c09f010b95ad9bfe32f35d704eda1a0
 +b62e0cb4990da3244885da90fe7d493334cca9f5
@@ -72537,118 +72605,6 @@
 1..279
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1513-rev-parse-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1513-rev-parse-prefix/.git/
-expecting success of 1513.1 'setup': 
-	mkdir -p sub1/sub2 &&
-	echo top >top &&
-	echo file1 >sub1/file1 &&
-	echo file2 >sub1/sub2/file2 &&
-	git add top sub1/file1 sub1/sub2/file2 &&
-	git commit -m commit
-
-[main (root-commit) 2a70803] commit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 sub1/file1
- create mode 100644 sub1/sub2/file2
- create mode 100644 top
-ok 1 - setup
-
-expecting success of 1513.2 'empty prefix -- file': 
-	git rev-parse --prefix "" -- top sub1/file1 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	top
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 2 - empty prefix -- file
-
-expecting success of 1513.3 'valid prefix -- file': 
-	git rev-parse --prefix sub1/ -- file1 sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/file1
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 3 - valid prefix -- file
-
-expecting success of 1513.4 'valid prefix -- ../file': 
-	git rev-parse --prefix sub1/ -- ../top sub2/file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/../top
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 4 - valid prefix -- ../file
-
-expecting success of 1513.5 'empty prefix HEAD:./path': 
-	git rev-parse --prefix "" HEAD:./top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 5 - empty prefix HEAD:./path
-
-expecting success of 1513.6 'valid prefix HEAD:./path': 
-	git rev-parse --prefix sub1/ HEAD:./file1 >actual &&
-	git rev-parse HEAD:sub1/file1 >expected &&
-	test_cmp expected actual
-
-ok 6 - valid prefix HEAD:./path
-
-expecting success of 1513.7 'valid prefix HEAD:../path': 
-	git rev-parse --prefix sub1/ HEAD:../top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 7 - valid prefix HEAD:../path
-
-expecting success of 1513.8 'prefix ignored with HEAD:top': 
-	git rev-parse --prefix sub1/ HEAD:top >actual &&
-	git rev-parse HEAD:top >expected &&
-	test_cmp expected actual
-
-ok 8 - prefix ignored with HEAD:top
-
-expecting success of 1513.9 'disambiguate path with valid prefix': 
-	git rev-parse --prefix sub1/ file1 >actual &&
-	cat <<-\EOF >expected &&
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 9 - disambiguate path with valid prefix
-
-expecting success of 1513.10 'file and refs with prefix': 
-	git rev-parse --prefix sub1/ main file1 >actual &&
-	cat <<-EOF >expected &&
-	$(git rev-parse main)
-	sub1/file1
-	EOF
-	test_cmp expected actual
-
-ok 10 - file and refs with prefix
-
-expecting success of 1513.11 'two-levels deep': 
-	git rev-parse --prefix sub1/sub2/ -- file2 >actual &&
-	cat <<-\EOF >expected &&
-	--
-	sub1/sub2/file2
-	EOF
-	test_cmp expected actual
-
-ok 11 - two-levels deep
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1515-rev-parse-outside-repo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1515-rev-parse-outside-repo/.git/
 expecting success of 1515.1 'set up non-repo directory': 
@@ -80915,7 +80871,7 @@
 	git checkout-index --stage=all -- path1 &&
 	test_path_is_missing path1
 
-.merge_file_ug0L54 .merge_file_0NlhTi .merge_file_r5lsxQ	path1
+.merge_file_p1POOM .merge_file_p8jOfJ .merge_file_CJpOGF	path1
 ok 10 - --stage=all implies --temp
 
 expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
@@ -81170,7 +81126,7 @@
 	test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
 	test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
 
-.merge_file_I7bWd9	file
+.merge_file_SWU0UY	file
 error: unable to read sha1 file of file (3685f0bc3974902b137f7dc59ac799c006cdec92)
 error: unable to read sha1 file of symlink (3685f0bc3974902b137f7dc59ac799c006cdec92)
 ok 8 - checkout-index --temp correctly reports error on missing blobs
@@ -81581,94 +81537,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2015-checkout-unborn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/.git/
-expecting success of 2015.1 'setup': 
-	mkdir parent &&
-	(
-		cd parent &&
-		git init &&
-		echo content >file &&
-		git add file &&
-		git commit -m base
-	) &&
-	git fetch parent main:origin
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/parent/.git/
-[main (root-commit) 5d770fe] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-From parent
- * [new branch]      main       -> origin
-ok 1 - setup
-
-expecting success of 2015.2 'checkout from unborn preserves untracked files': 
-	echo precious >expect &&
-	echo precious >file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file
-
-error: The following untracked working tree files would be overwritten by checkout:
-	file
-Please move or remove them before you switch branches.
-Aborting
-ok 2 - checkout from unborn preserves untracked files
-
-expecting success of 2015.3 'checkout from unborn preserves index contents': 
-	echo precious >expect &&
-	echo precious >file &&
-	git add file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file &&
-	git show :file >file &&
-	test_cmp expect file
-
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-ok 3 - checkout from unborn preserves index contents
-
-expecting success of 2015.4 'checkout from unborn merges identical index contents': 
-	echo content >file &&
-	git add file &&
-	git checkout -b new origin
-
-Switched to a new branch 'new'
-ok 4 - checkout from unborn merges identical index contents
-
-expecting success of 2015.5 'checking out another branch from unborn state': 
-	git checkout --orphan newroot &&
-	git checkout -b anothername &&
-	test_must_fail git show-ref --verify refs/heads/newroot &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/anothername >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'newroot'
-Switched to a new branch 'anothername'
-fatal: 'refs/heads/newroot' - not a valid ref
-ok 5 - checking out another branch from unborn state
-
-expecting success of 2015.6 'checking out in a newly created repo': 
-	test_create_repo empty &&
-	(
-		cd empty &&
-		git symbolic-ref HEAD >expect &&
-		test_must_fail git checkout &&
-		git symbolic-ref HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/empty/.git/
-fatal: You are on a branch yet to be born
-ok 6 - checking out in a newly created repo
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1450-fsck.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1450-fsck/.git/
 expecting success of 1450.1 'setup': 
@@ -83282,7 +83150,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.024e-05 s, 24.9 kB/s
+1 byte copied, 3.676e-05 s, 27.2 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 79 - fsck fails on corrupt packfile
 
@@ -83526,702 +83394,92 @@
 1..94
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2012-checkout-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2012-checkout-last/.git/
-expecting success of 2012.1 'setup': 
-	test_commit initial world hello &&
-	git branch other &&
-	test_commit --append second world "hello again"
+*** t2015-checkout-unborn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/.git/
+expecting success of 2015.1 'setup': 
+	mkdir parent &&
+	(
+		cd parent &&
+		git init &&
+		echo content >file &&
+		git add file &&
+		git commit -m base
+	) &&
+	git fetch parent main:origin
 
-[main (root-commit) b77667e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-[main 5146e8d] second
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/parent/.git/
+[main (root-commit) 5d770fe] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
+ create mode 100644 file
+From parent
+ * [new branch]      main       -> origin
 ok 1 - setup
 
-expecting success of 2012.2 '"checkout -" does not work initially': 
-	test_must_fail git checkout -
-
-error: pathspec '-' did not match any file(s) known to git
-ok 2 - "checkout -" does not work initially
-
-expecting success of 2012.3 'first branch switch': 
-	git checkout other
-
-Switched to branch 'other'
-ok 3 - first branch switch
-
-expecting success of 2012.4 '"checkout -" switches back': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Switched to branch 'main'
-ok 4 - "checkout -" switches back
-
-expecting success of 2012.5 '"checkout -" switches forth': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref other
-
-Switched to branch 'other'
-ok 5 - "checkout -" switches forth
-
-expecting success of 2012.6 'detach HEAD': 
-	git checkout $(git rev-parse HEAD)
-
-Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 6 - detach HEAD
-
-expecting success of 2012.7 '"checkout -" attaches again': 
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref other
-
-Switched to branch 'other'
-ok 7 - "checkout -" attaches again
-
-expecting success of 2012.8 '"checkout -" detaches again': 
-	git checkout - &&
-
-	git rev-parse other >expect &&
-	git rev-parse HEAD >actual &&
-	test_cmp expect actual &&
-
-	test_must_fail git symbolic-ref HEAD
-
-Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-fatal: ref HEAD is not a symbolic ref
-ok 8 - "checkout -" detaches again
-
-expecting success of 2012.9 'more switches': 
-	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
-	do
-		git checkout -b branch$i || return 1
-	done
-
-Switched to a new branch 'branch16'
-Switched to a new branch 'branch15'
-Switched to a new branch 'branch14'
-Switched to a new branch 'branch13'
-Switched to a new branch 'branch12'
-Switched to a new branch 'branch11'
-Switched to a new branch 'branch10'
-Switched to a new branch 'branch9'
-Switched to a new branch 'branch8'
-Switched to a new branch 'branch7'
-Switched to a new branch 'branch6'
-Switched to a new branch 'branch5'
-Switched to a new branch 'branch4'
-Switched to a new branch 'branch3'
-Switched to a new branch 'branch2'
-Switched to a new branch 'branch1'
-ok 9 - more switches
-
-expecting success of 2012.10 'switch to the last': 
-	more_switches &&
-	git checkout @{-1} &&
-	test_cmp_symbolic_HEAD_ref branch2
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch2'
-ok 10 - switch to the last
-
-expecting success of 2012.11 'switch to second from the last': 
-	more_switches &&
-	git checkout @{-2} &&
-	test_cmp_symbolic_HEAD_ref branch3
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch3'
-ok 11 - switch to second from the last
-
-expecting success of 2012.12 'switch to third from the last': 
-	more_switches &&
-	git checkout @{-3} &&
-	test_cmp_symbolic_HEAD_ref branch4
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch4'
-ok 12 - switch to third from the last
-
-expecting success of 2012.13 'switch to fourth from the last': 
-	more_switches &&
-	git checkout @{-4} &&
-	test_cmp_symbolic_HEAD_ref branch5
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch5'
-ok 13 - switch to fourth from the last
-
-expecting success of 2012.14 'switch to twelfth from the last': 
-	more_switches &&
-	git checkout @{-12} &&
-	test_cmp_symbolic_HEAD_ref branch13
-
-Switched to branch 'branch16'
-Switched to branch 'branch15'
-Switched to branch 'branch14'
-Switched to branch 'branch13'
-Switched to branch 'branch12'
-Switched to branch 'branch11'
-Switched to branch 'branch10'
-Switched to branch 'branch9'
-Switched to branch 'branch8'
-Switched to branch 'branch7'
-Switched to branch 'branch6'
-Switched to branch 'branch5'
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-Switched to branch 'branch2'
-Switched to branch 'branch1'
-Switched to branch 'branch13'
-ok 14 - switch to twelfth from the last
-
-expecting success of 2012.15 'merge base test setup': 
-	git checkout -b another other &&
-	test_commit --append third world "hello again"
-
-Switched to a new branch 'another'
-[another d04d7df] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 15 - merge base test setup
-
-expecting success of 2012.16 'another...main': 
-	git checkout another &&
-	git checkout another...main &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Already on 'another'
-Note: switching to 'another...main'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 16 - another...main
-
-expecting success of 2012.17 '...main': 
-	git checkout another &&
-	git checkout ...main &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to '...main'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 17 - ...main
-
-expecting success of 2012.18 'main...': 
-	git checkout another &&
-	git checkout main... &&
-
-	git rev-parse --verify main^ >expect &&
-	git rev-parse --verify HEAD >actual &&
-	test_cmp expect actual
-
-Previous HEAD position was b77667e initial
-Switched to branch 'another'
-Note: switching to 'main...'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b77667e initial
-ok 18 - main...
-
-expecting success of 2012.19 '"checkout -" works after a rebase A': 
-	git checkout main &&
-	git checkout other &&
-	git rebase main &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Previous HEAD position was b77667e initial
-Switched to branch 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/other.
-Switched to branch 'main'
-ok 19 - "checkout -" works after a rebase A
-
-expecting success of 2012.20 '"checkout -" works after a rebase A B': 
-	git branch moodle main~1 &&
-	git checkout main &&
-	git checkout other &&
-	git rebase main moodle &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/moodle.
-Switched to branch 'main'
-ok 20 - "checkout -" works after a rebase A B
-
-expecting success of 2012.21 '"checkout -" works after a rebase -i A': 
-	git checkout main &&
-	git checkout other &&
-	git rebase -i main &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/other.
-Switched to branch 'main'
-ok 21 - "checkout -" works after a rebase -i A
-
-expecting success of 2012.22 '"checkout -" works after a rebase -i A B': 
-	git branch foodle main~1 &&
-	git checkout main &&
-	git checkout other &&
-	git rebase main foodle &&
-	git checkout - &&
-	test_cmp_symbolic_HEAD_ref main
-
-Already on 'main'
-Switched to branch 'other'
-Successfully rebased and updated refs/heads/foodle.
-Switched to branch 'main'
-ok 22 - "checkout -" works after a rebase -i A B
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2017-checkout-orphan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2017-checkout-orphan/.git/
-expecting success of 2017.1 'Setup': 
-	echo "Initial" >"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	git commit -m "First Commit" &&
-	test_tick &&
-	echo "State 1" >>"$TEST_FILE" &&
-	git add "$TEST_FILE" &&
-	test_tick &&
-	git commit -m "Second Commit"
-
-[main (root-commit) df316c6] First Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 8c3f362] Second Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - Setup
-
-expecting success of 2017.2 '--orphan creates a new orphan branch from HEAD': 
-	git checkout --orphan alpha &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Third Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet main alpha
-
-Switched to a new branch 'alpha'
-fatal: Needed a single revision
-[alpha (root-commit) 6f20c32] Third Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 2 - --orphan creates a new orphan branch from HEAD
-
-expecting success of 2017.3 '--orphan creates a new orphan branch from <start_point>': 
-	git checkout main &&
-	git checkout --orphan beta main^ &&
-	test_must_fail git rev-parse --verify HEAD &&
-	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
-	test_tick &&
-	git commit -m "Fourth Commit" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet main^ beta
-
-Switched to branch 'main'
-Switched to a new branch 'beta'
-fatal: Needed a single revision
-[beta (root-commit) 530edda] Fourth Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 3 - --orphan creates a new orphan branch from <start_point>
-
-expecting success of 2017.4 '--orphan must be rejected with -b': 
-	git checkout main &&
-	test_must_fail git checkout --orphan new -b newer &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
-
-Switched to branch 'main'
-fatal: options '-b', '-B', and '--orphan' cannot be used together
-ok 4 - --orphan must be rejected with -b
-
-expecting success of 2017.5 '--orphan must be rejected with -t': 
-	git checkout main &&
-	test_must_fail git checkout --orphan new -t main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
-
-Already on 'main'
-fatal: '--orphan' cannot be used with '-t'
-ok 5 - --orphan must be rejected with -t
-
-expecting success of 2017.6 '--orphan ignores branch.autosetupmerge': 
-	git checkout main &&
-	git config branch.autosetupmerge always &&
-	git checkout --orphan gamma &&
-	test_cmp_config "" --default "" branch.gamma.merge &&
-	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
-	test_must_fail git rev-parse --verify HEAD^ &&
-	git checkout main &&
-	git config branch.autosetupmerge inherit &&
-	git checkout --orphan eta &&
-	test_cmp_config "" --default "" branch.eta.merge &&
-	test_cmp_config "" --default "" branch.eta.remote &&
-	echo refs/heads/eta >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual &&
-	test_must_fail git rev-parse --verify HEAD^
-
-Already on 'main'
-Switched to a new branch 'gamma'
-fatal: Needed a single revision
-Switched to branch 'main'
-Switched to a new branch 'eta'
-fatal: Needed a single revision
-ok 6 - --orphan ignores branch.autosetupmerge
-
-expecting success of 2017.7 '--orphan makes reflog by default': 
-	git checkout main &&
-	git config --unset core.logAllRefUpdates &&
-	git checkout --orphan delta &&
-	test_must_fail git rev-parse --verify delta@{0} &&
-	git commit -m Delta &&
-	git rev-parse --verify delta@{0}
-
-Switched to branch 'main'
-Switched to a new branch 'delta'
-fatal: Needed a single revision
-[delta (root-commit) 9beee35] Delta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-9beee35744aee191f8186ef0a6ab78f710cdd57c
-ok 7 - --orphan makes reflog by default
-
-expecting success of 2017.8 '--orphan does not make reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git config core.logAllRefUpdates false &&
-	git checkout --orphan epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0} &&
-	git commit -m Epsilon &&
-	test_must_fail git rev-parse --verify epsilon@{0}
-
-Switched to branch 'main'
-Switched to a new branch 'epsilon'
-fatal: Needed a single revision
-[epsilon (root-commit) c5e7701] Epsilon
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-fatal: Needed a single revision
-ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
-
-expecting success of 2017.9 '--orphan with -l makes reflog when core.logAllRefUpdates = false': 
-	git checkout main &&
-	git checkout -l --orphan zeta &&
-	test_must_fail git rev-parse --verify zeta@{0} &&
-	git commit -m Zeta &&
-	git rev-parse --verify zeta@{0}
-
-Switched to branch 'main'
-Switched to a new branch 'zeta'
-fatal: Needed a single revision
-[zeta (root-commit) 1b23595] Zeta
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 foo
-1b235958474dccc5c8f228713c620d22e7d1825d
-ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
-
-expecting success of 2017.10 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog': 
-	git checkout main &&
-	git checkout -l --orphan eta &&
-	test_must_fail git rev-parse --verify eta@{0} &&
-	git checkout main &&
-	test_must_fail git rev-parse --verify eta@{0}
-
-Switched to branch 'main'
-Switched to a new branch 'eta'
-fatal: Needed a single revision
-Switched to branch 'main'
-fatal: Needed a single revision
-ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
-
-expecting success of 2017.11 '--orphan is rejected with an existing name': 
-	git checkout main &&
-	test_must_fail git checkout --orphan main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
+expecting success of 2015.2 'checkout from unborn preserves untracked files': 
+	echo precious >expect &&
+	echo precious >file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file
 
-Already on 'main'
-fatal: a branch named 'main' already exists
-ok 11 - --orphan is rejected with an existing name
+error: The following untracked working tree files would be overwritten by checkout:
+	file
+Please move or remove them before you switch branches.
+Aborting
+ok 2 - checkout from unborn preserves untracked files
 
-expecting success of 2017.12 '--orphan refuses to switch if a merge is needed': 
-	git checkout main &&
-	git reset --hard &&
-	echo local >>"$TEST_FILE" &&
-	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
-	test_must_fail git checkout --orphan new main^ &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)" &&
-	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
-	git diff-index --quiet --cached HEAD &&
-	git reset --hard
+expecting success of 2015.3 'checkout from unborn preserves index contents': 
+	echo precious >expect &&
+	echo precious >file &&
+	git add file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file &&
+	git show :file >file &&
+	test_cmp expect file
 
-Already on 'main'
-HEAD is now at 8c3f362 Second Commit
 error: Your local changes to the following files would be overwritten by checkout:
-	foo
+	file
 Please commit your changes or stash them before you switch branches.
 Aborting
-HEAD is now at 8c3f362 Second Commit
-ok 12 - --orphan refuses to switch if a merge is needed
+ok 3 - checkout from unborn preserves index contents
 
-expecting success of 2017.13 'cannot --detach on an unborn branch': 
-	git checkout main &&
-	git checkout --orphan new &&
-	test_must_fail git checkout --detach
+expecting success of 2015.4 'checkout from unborn merges identical index contents': 
+	echo content >file &&
+	git add file &&
+	git checkout -b new origin
 
-Already on 'main'
 Switched to a new branch 'new'
-fatal: You are on a branch yet to be born
-ok 13 - cannot --detach on an unborn branch
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2019-checkout-ambiguous-ref/.git/
-expecting success of 2019.1 'setup ambiguous refs': 
-	test_commit branch file &&
-	git branch ambiguity &&
-	git branch vagueness &&
-	test_commit tag file &&
-	git tag ambiguity &&
-	git tag vagueness HEAD:file &&
-	test_commit other file
-
-[master (root-commit) c291a6e] branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master a40f7cf] tag
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3b61e26] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup ambiguous refs
-
-expecting success of 2019.2 'checkout ambiguous ref succeeds': 
-	git checkout ambiguity 2>stderr
-
-ok 2 - checkout ambiguous ref succeeds
-
-expecting success of 2019.3 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
-
-warning: refname 'ambiguity' is ambiguous.
-ok 3 - checkout produces ambiguity warning
-
-expecting success of 2019.4 'checkout chooses branch over tag': 
-	echo refs/heads/ambiguity >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	echo branch >expect &&
-	test_cmp expect file
-
-ok 4 - checkout chooses branch over tag
-
-expecting success of 2019.5 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
-
-Switched to branch 'ambiguity'
-ok 5 - checkout reports switch to branch
-
-expecting success of 2019.6 'checkout vague ref succeeds': 
-	git checkout vagueness 2>stderr &&
-	test_set_prereq VAGUENESS_SUCCESS
-
-ok 6 - checkout vague ref succeeds
-
-expecting success of 2019.7 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
-
-warning: refname 'vagueness' is ambiguous.
-ok 7 - checkout produces ambiguity warning
+ok 4 - checkout from unborn merges identical index contents
 
-expecting success of 2019.8 'checkout chooses branch over tag': 
-	echo refs/heads/vagueness >expect &&
+expecting success of 2015.5 'checking out another branch from unborn state': 
+	git checkout --orphan newroot &&
+	git checkout -b anothername &&
+	test_must_fail git show-ref --verify refs/heads/newroot &&
 	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	echo branch >expect &&
-	test_cmp expect file
+	echo refs/heads/anothername >expect &&
+	test_cmp expect actual
 
-ok 8 - checkout chooses branch over tag
+Switched to a new branch 'newroot'
+Switched to a new branch 'anothername'
+fatal: 'refs/heads/newroot' - not a valid ref
+ok 5 - checking out another branch from unborn state
 
-expecting success of 2019.9 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
+expecting success of 2015.6 'checking out in a newly created repo': 
+	test_create_repo empty &&
+	(
+		cd empty &&
+		git symbolic-ref HEAD >expect &&
+		test_must_fail git checkout &&
+		git symbolic-ref HEAD >actual &&
+		test_cmp expect actual
+	)
 
-Switched to branch 'vagueness'
-ok 9 - checkout reports switch to branch
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2015-checkout-unborn/empty/.git/
+fatal: You are on a branch yet to be born
+ok 6 - checking out in a newly created repo
 
-# passed all 9 test(s)
-1..9
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0450-txt-doc-vs-help.sh ***
@@ -84288,8 +83546,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:08.635659440 +0000
-+++ help	2026-04-19 19:15:08.707659440 +0000
+--- adoc	2025-03-17 13:17:17.339169081 +0000
++++ help	2025-03-17 13:17:17.375169309 +0000
 @@ -1,5 +1 @@
 -git add [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
 -        [--edit | -e] [--[no-]all | -A | --[no-]ignore-removal | [--update | -u]] [--sparse]
@@ -84347,8 +83605,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:09.155659440 +0000
-+++ help	2026-04-19 19:15:09.207659440 +0000
+--- adoc	2025-03-17 13:17:17.775171838 +0000
++++ help	2025-03-17 13:17:17.831172192 +0000
 @@ -1,10 +1,2 @@
 -git am [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8] [--no-verify]
 -       [--[no-]3way] [--interactive] [--committer-date-is-author-date]
@@ -84462,8 +83720,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:10.051659440 +0000
-+++ help	2026-04-19 19:15:10.115659440 +0000
+--- adoc	2025-03-17 13:17:18.775178159 +0000
++++ help	2025-03-17 13:17:18.831178513 +0000
 @@ -1,9 +1 @@
 -git apply [--stat] [--numstat] [--summary] [--check]
 -          [--index | --intent-to-add] [--3way] [--ours | --theirs | --union]
@@ -84525,8 +83783,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:10.547659440 +0000
-+++ help	2026-04-19 19:15:10.607659440 +0000
+--- adoc	2025-03-17 13:17:19.355181826 +0000
++++ help	2025-03-17 13:17:19.419182231 +0000
 @@ -1,4 +1,4 @@
 -git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 -            [-o <file> | --output=<file>] [--worktree-attributes]
@@ -84636,8 +83894,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:11.535659440 +0000
-+++ help	2026-04-19 19:15:11.599659440 +0000
+--- adoc	2025-03-17 13:17:20.355188148 +0000
++++ help	2025-03-17 13:17:20.419188553 +0000
 @@ -1 +1,10 @@
 -git bisect <subcommand> <options>
 +git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]    [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]    [<pathspec>...]
@@ -84700,8 +83958,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:12.047659440 +0000
-+++ help	2026-04-19 19:15:12.119659440 +0000
+--- adoc	2025-03-17 13:17:20.879191461 +0000
++++ help	2025-03-17 13:17:20.947191890 +0000
 @@ -1,5 +1 @@
 -git blame [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
 -          [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
@@ -84759,8 +84017,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:12.583659440 +0000
-+++ help	2026-04-19 19:15:12.651659440 +0000
+--- adoc	2025-03-17 13:17:21.419194874 +0000
++++ help	2025-03-17 13:17:21.479195254 +0000
 @@ -1,16 +1,8 @@
 -git branch [--color[=<when>] | --no-color] [--show-current]
 -           [-v [--abbrev=<n> | --no-abbrev]]
@@ -85136,8 +84394,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:16.859659440 +0000
-+++ help	2026-04-19 19:15:16.923659440 +0000
+--- adoc	2025-03-17 13:17:25.115218240 +0000
++++ help	2025-03-17 13:17:25.187218695 +0000
 @@ -1,4 +1,2 @@
 -git check-ref-format [--normalize]
 -                     [--[no-]allow-onelevel] [--refspec-pattern]
@@ -85194,8 +84452,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:17.439659440 +0000
-+++ help	2026-04-19 19:15:17.523659440 +0000
+--- adoc	2025-03-17 13:17:25.647221603 +0000
++++ help	2025-03-17 13:17:25.719222058 +0000
 @@ -1,9 +1,2 @@
 -git checkout [-q] [-f] [-m] [<branch>]
 -git checkout [-q] [-f] [-m] --detach [<branch>]
@@ -85289,8 +84547,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:18.483659440 +0000
-+++ help	2026-04-19 19:15:18.515659440 +0000
+--- adoc	2025-03-17 13:17:26.655227975 +0000
++++ help	2025-03-17 13:17:26.703228279 +0000
 @@ -1,6 +1 @@
 -git checkout-index [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
 -                   [--stage=<number>|all]
@@ -85499,8 +84757,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:20.523659440 +0000
-+++ help	2026-04-19 19:15:20.587659440 +0000
+--- adoc	2025-03-17 13:17:28.875242010 +0000
++++ help	2025-03-17 13:17:28.951242490 +0000
 @@ -1,9 +1 @@
 -git clone [--template=<template-directory>]
 -          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
@@ -85562,8 +84820,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:21.103659440 +0000
-+++ help	2026-04-19 19:15:21.155659440 +0000
+--- adoc	2025-03-17 13:17:29.507246005 +0000
++++ help	2025-03-17 13:17:29.583246486 +0000
 @@ -1,2 +1 @@
 -git column [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]
 -           [--indent=<string>] [--nl=<string>] [--padding=<n>]
@@ -85868,8 +85126,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:24.495659440 +0000
-+++ help	2026-04-19 19:15:24.627659440 +0000
+--- adoc	2025-03-17 13:17:32.911267525 +0000
++++ help	2025-03-17 13:17:33.027268258 +0000
 @@ -0,0 +1 @@
 +git credential (fill|approve|reject)
 not ok 152 - credential -h output and SYNOPSIS agree # TODO known breakage
@@ -85922,8 +85180,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:24.979659440 +0000
-+++ help	2026-04-19 19:15:25.095659440 +0000
+--- adoc	2025-03-17 13:17:33.455270964 +0000
++++ help	2025-03-17 13:17:33.555271596 +0000
 @@ -0,0 +1 @@
 +git credential-cache [<options>] <action>
 not ok 157 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
@@ -86026,8 +85284,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:26.071659440 +0000
-+++ help	2026-04-19 19:15:26.175659440 +0000
+--- adoc	2025-03-17 13:17:34.555277918 +0000
++++ help	2025-03-17 13:17:34.687278752 +0000
 @@ -0,0 +1 @@
 +git credential-store [<options>] <action>
 not ok 167 - credential-store -h output and SYNOPSIS agree # TODO known breakage
@@ -86480,8 +85738,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:30.643659440 +0000
-+++ help	2026-04-19 19:15:30.695659440 +0000
+--- adoc	2025-03-17 13:17:39.835311296 +0000
++++ help	2025-03-17 13:17:39.875311549 +0000
 @@ -1 +1 @@
 -git fast-export [<options>] | git fast-import
 +git fast-export [<rev-list-opts>]
@@ -86535,8 +85793,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:31.151659440 +0000
-+++ help	2026-04-19 19:15:31.223659440 +0000
+--- adoc	2025-03-17 13:17:40.311314306 +0000
++++ help	2025-03-17 13:17:40.367314660 +0000
 @@ -1 +1 @@
 -frontend | git fast-import [<options>]
 +git fast-import [--date-format=<f>] [--max-pack-size=<n>] [--big-file-threshold=<n>] [--depth=<n>] [--active-branches=<n>] [--export-marks=<marks.file>]
@@ -86640,8 +85898,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:32.263659440 +0000
-+++ help	2026-04-19 19:15:32.323659440 +0000
+--- adoc	2025-03-17 13:17:41.475321664 +0000
++++ help	2025-03-17 13:17:41.543322094 +0000
 @@ -1,4 +1 @@
 -git fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag]
 -               [--upload-pack=<git-upload-pack>]
@@ -86698,8 +85956,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:32.863659440 +0000
-+++ help	2026-04-19 19:15:32.919659440 +0000
+--- adoc	2025-03-17 13:17:42.079325482 +0000
++++ help	2025-03-17 13:17:42.135325836 +0000
 @@ -1,2 +1 @@
 -git fmt-merge-msg [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
 -git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] -F <file>
@@ -86754,8 +86012,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:33.459659440 +0000
-+++ help	2026-04-19 19:15:33.531659440 +0000
+--- adoc	2025-03-17 13:17:42.659329149 +0000
++++ help	2025-03-17 13:17:42.715329503 +0000
 @@ -1,7 +1,4 @@
 -git for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl]
 -                 [(--sort=<key>)...] [--format=<format>]
@@ -86868,8 +86126,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:34.591659440 +0000
-+++ help	2026-04-19 19:15:34.655659440 +0000
+--- adoc	2025-03-17 13:17:43.847336659 +0000
++++ help	2025-03-17 13:17:43.923337140 +0000
 @@ -1,23 +1 @@
 -git format-patch [-k] [(-o|--output-directory) <dir> | --stdout]
 -                 [--no-thread | --thread[=<style>]]
@@ -86995,8 +86253,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:35.779659440 +0000
-+++ help	2026-04-19 19:15:35.831659440 +0000
+--- adoc	2025-03-17 13:17:45.011344018 +0000
++++ help	2025-03-17 13:17:45.087344498 +0000
 @@ -1 +1,4 @@
 -git fsck-objects ...
 +git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
@@ -87053,8 +86311,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:36.303659440 +0000
-+++ help	2026-04-19 19:15:36.367659440 +0000
+--- adoc	2025-03-17 13:17:45.591347684 +0000
++++ help	2025-03-17 13:17:45.659348114 +0000
 @@ -1,4 +1,4 @@
 -git fsmonitor--daemon start
 -git fsmonitor--daemon run
@@ -87112,8 +86370,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:36.903659440 +0000
-+++ help	2026-04-19 19:15:36.947659440 +0000
+--- adoc	2025-03-17 13:17:46.251351857 +0000
++++ help	2025-03-17 13:17:46.299352160 +0000
 @@ -1 +1 @@
 -git gc [--aggressive] [--auto] [--[no-]detach] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
 +git gc [<options>]
@@ -87217,8 +86475,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:37.835659440 +0000
-+++ help	2026-04-19 19:15:37.887659440 +0000
+--- adoc	2025-03-17 13:17:47.507359797 +0000
++++ help	2025-03-17 13:17:47.575360226 +0000
 @@ -1,21 +1 @@
 -git grep [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]
 -         [-v | --invert-match] [-h|-H] [--full-name]
@@ -87442,8 +86700,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:39.807659440 +0000
-+++ help	2026-04-19 19:15:39.855659440 +0000
+--- adoc	2025-03-17 13:17:49.963375323 +0000
++++ help	2025-03-17 13:17:50.035375778 +0000
 @@ -1,3 +1 @@
 -git index-pack [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>
 -git index-pack --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
@@ -87549,8 +86807,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:40.783659440 +0000
-+++ help	2026-04-19 19:15:40.851659440 +0000
+--- adoc	2025-03-17 13:17:51.335383996 +0000
++++ help	2025-03-17 13:17:51.407384451 +0000
 @@ -1 +1,5 @@
 -git init-db [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]
 +git init [-q | --quiet] [--bare] [--template=<template-directory>]
@@ -87658,8 +86916,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:41.795659440 +0000
-+++ help	2026-04-19 19:15:41.835659440 +0000
+--- adoc	2025-03-17 13:17:52.623392138 +0000
++++ help	2025-03-17 13:17:52.675392467 +0000
 @@ -1 +1,2 @@
  git log [<options>] [<revision-range>] [[--] <path>...]
 +git show [<options>] <object>...
@@ -87713,8 +86971,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:42.223659440 +0000
-+++ help	2026-04-19 19:15:42.267659440 +0000
+--- adoc	2025-03-17 13:17:53.271396235 +0000
++++ help	2025-03-17 13:17:53.343396690 +0000
 @@ -1,13 +1 @@
 -git ls-files [-z] [-t] [-v] [-f]
 -             [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
@@ -87830,8 +87088,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:43.243659440 +0000
-+++ help	2026-04-19 19:15:43.275659440 +0000
+--- adoc	2025-03-17 13:17:54.599404630 +0000
++++ help	2025-03-17 13:17:54.651404959 +0000
 @@ -1,3 +1 @@
 -git ls-tree [-d] [-r] [-t] [-l] [-z]
 -            [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<format>]
@@ -87887,8 +87145,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:43.543659440 +0000
-+++ help	2026-04-19 19:15:43.595659440 +0000
+--- adoc	2025-03-17 13:17:55.159408170 +0000
++++ help	2025-03-17 13:17:55.235408650 +0000
 @@ -1,3 +1 @@
 -git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n]
 -             [--[no-]scissors] [--quoted-cr=<action>]
@@ -87944,8 +87202,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:43.995659440 +0000
-+++ help	2026-04-19 19:15:44.051659440 +0000
+--- adoc	2025-03-17 13:17:55.739411837 +0000
++++ help	2025-03-17 13:17:55.803412241 +0000
 @@ -1,2 +1 @@
 -git mailsplit [-b] [-f<nn>] [-d<prec>] [--keep-cr] [--mboxrd]
 -              -o<directory> [--] [(<mbox>|<Maildir>)...]
@@ -88000,8 +87258,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:44.431659440 +0000
-+++ help	2026-04-19 19:15:44.495659440 +0000
+--- adoc	2025-03-17 13:17:56.347415680 +0000
++++ help	2025-03-17 13:17:56.419416135 +0000
 @@ -1,3 +1 @@
 -git maintenance run [<options>]
 -git maintenance start [--scheduler=<scheduler>]
@@ -88057,8 +87315,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:44.911659440 +0000
-+++ help	2026-04-19 19:15:44.963659440 +0000
+--- adoc	2025-03-17 13:17:57.063420206 +0000
++++ help	2025-03-17 13:17:57.143420712 +0000
 @@ -1,6 +1,3 @@
 -git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 -          [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
@@ -88169,8 +87427,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:45.839659440 +0000
-+++ help	2026-04-19 19:15:45.923659440 +0000
+--- adoc	2025-03-17 13:17:58.431428854 +0000
++++ help	2025-03-17 13:17:58.499429284 +0000
 @@ -1,3 +1 @@
 -git merge-file [-L <current-name> [-L <base-name> [-L <other-name>]]]
 -               [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
@@ -88226,8 +87484,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:46.391659440 +0000
-+++ help	2026-04-19 19:15:46.451659440 +0000
+--- adoc	2025-03-17 13:17:59.043432723 +0000
++++ help	2025-03-17 13:17:59.095433052 +0000
 @@ -1 +1 @@
 -git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
 +git merge-index [-o] [-q] <merge-program> (-a | [--] [<filename>...])
@@ -88586,8 +87844,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:49.883659440 +0000
-+++ help	2026-04-19 19:15:49.955659440 +0000
+--- adoc	2025-03-17 13:18:03.435460488 +0000
++++ help	2025-03-17 13:18:03.507460943 +0000
 @@ -1 +1,4 @@
 -git multi-pack-index [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
 +git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-snapshot=<path>]
@@ -88694,8 +87952,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:50.931659440 +0000
-+++ help	2026-04-19 19:15:50.991659440 +0000
+--- adoc	2025-03-17 13:18:04.519467340 +0000
++++ help	2025-03-17 13:18:04.583467745 +0000
 @@ -1,2 +1,3 @@
 -git name-rev [--tags] [--refs=<pattern>]
 -             ( --all | --annotate-stdin | <commit-ish>... )
@@ -88752,8 +88010,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:51.439659440 +0000
-+++ help	2026-04-19 19:15:51.491659440 +0000
+--- adoc	2025-03-17 13:18:05.127471184 +0000
++++ help	2025-03-17 13:18:05.187471563 +0000
 @@ -1,12 +1,12 @@
 -git notes [list [<object>]]
 -git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [-e] [<object>]
@@ -88827,8 +88085,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:52.047659440 +0000
-+++ help	2026-04-19 19:15:52.123659440 +0000
+--- adoc	2025-03-17 13:18:05.731475002 +0000
++++ help	2025-03-17 13:18:05.779475306 +0000
 @@ -1,8 +1,2 @@
 -git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]
 -                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]
@@ -89221,8 +88479,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:56.083659440 +0000
-+++ help	2026-04-19 19:15:56.135659440 +0000
+--- adoc	2025-03-17 13:18:10.515505245 +0000
++++ help	2025-03-17 13:18:10.591505725 +0000
 @@ -1,6 +1 @@
 -git push [--all | --branches | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 -         [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-q | --quiet] [-v | --verbose]
@@ -89281,8 +88539,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:56.411659440 +0000
-+++ help	2026-04-19 19:15:56.487659440 +0000
+--- adoc	2025-03-17 13:18:11.183509468 +0000
++++ help	2025-03-17 13:18:11.255509923 +0000
 @@ -1,6 +1,3 @@
 -git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
 -               [--no-dual-color] [--creation-factor=<factor>]
@@ -89393,8 +88651,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:57.527659440 +0000
-+++ help	2026-04-19 19:15:57.595659440 +0000
+--- adoc	2025-03-17 13:18:12.459517534 +0000
++++ help	2025-03-17 13:18:12.523517938 +0000
 @@ -1,5 +1,3 @@
 -git rebase [-i | --interactive] [<options>] [--exec <cmd>]
 -           [--onto <newbase> | --keep-base] [<upstream> [<branch>]]
@@ -89604,8 +88862,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:15:59.675659440 +0000
-+++ help	2026-04-19 19:15:59.731659440 +0000
+--- adoc	2025-03-17 13:18:14.939533211 +0000
++++ help	2025-03-17 13:18:15.003533616 +0000
 @@ -1,13 +1,13 @@
  git remote [-v | --verbose]
 -git remote add [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
@@ -89676,8 +88934,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:00.235659440 +0000
-+++ help	2026-04-19 19:16:00.295659440 +0000
+--- adoc	2025-03-17 13:18:15.571537206 +0000
++++ help	2025-03-17 13:18:15.639537636 +0000
 @@ -1 +1 @@
 -git remote add <nick> "ext::<command>[ <arguments>...]"
 +git remote-ext <remote> <url>
@@ -89731,8 +88989,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:00.703659440 +0000
-+++ help	2026-04-19 19:16:00.803659440 +0000
+--- adoc	2025-03-17 13:18:16.159540924 +0000
++++ help	2025-03-17 13:18:16.307541859 +0000
 @@ -0,0 +1 @@
 +git remote-fd <remote> <url>
 not ok 517 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
@@ -89985,8 +89243,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:03.495659440 +0000
-+++ help	2026-04-19 19:16:03.555659440 +0000
+--- adoc	2025-03-17 13:18:19.475561886 +0000
++++ help	2025-03-17 13:18:19.535562265 +0000
 @@ -1,4 +1,4 @@
 +git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
  git reset [-q] [<tree-ish>] [--] <pathspec>...
@@ -90045,8 +89303,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:04.079659440 +0000
-+++ help	2026-04-19 19:16:04.155659440 +0000
+--- adoc	2025-03-17 13:18:19.987565122 +0000
++++ help	2025-03-17 13:18:20.039565451 +0000
 @@ -1,3 +1 @@
 -git restore [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...
 -git restore [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]
@@ -90152,8 +89410,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:05.311659440 +0000
-+++ help	2026-04-19 19:16:05.387659440 +0000
+--- adoc	2025-03-17 13:18:21.027571697 +0000
++++ help	2025-03-17 13:18:21.091572101 +0000
 @@ -1 +1,3 @@
 -git rev-parse [<options>] <arg>...
 +git rev-parse --parseopt [<options>] -- [<args>...]
@@ -90409,8 +89667,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:08.351659440 +0000
-+++ help	2026-04-19 19:16:08.431659440 +0000
+--- adoc	2025-03-17 13:18:23.783589119 +0000
++++ help	2025-03-17 13:18:23.847589523 +0000
 @@ -1 +1,2 @@
 -git show [<options>] [<object>...]
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -90665,8 +89923,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:11.139659440 +0000
-+++ help	2026-04-19 19:16:11.199659440 +0000
+--- adoc	2025-03-17 13:18:26.563606693 +0000
++++ help	2025-03-17 13:18:26.639607173 +0000
 @@ -1 +1 @@
 -git stage <arg>...
 +git add [<options>] [--] <pathspec>...
@@ -90901,8 +90159,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:14.043659440 +0000
-+++ help	2026-04-19 19:16:14.123659440 +0000
+--- adoc	2025-03-17 13:18:29.107622774 +0000
++++ help	2025-03-17 13:18:29.159623103 +0000
 @@ -1,4 +1 @@
 -git switch [<options>] [--no-guess] <branch>
 -git switch [<options>] --detach [<start-point>]
@@ -91159,8 +90417,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:16.987659440 +0000
-+++ help	2026-04-19 19:16:17.071659440 +0000
+--- adoc	2025-03-17 13:18:31.803639817 +0000
++++ help	2025-03-17 13:18:31.867640222 +0000
 @@ -1,19 +1 @@
 -git update-index
 -                 [--add] [--remove | --force-remove] [--replace]
@@ -91232,8 +90490,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:17.607659440 +0000
-+++ help	2026-04-19 19:16:17.687659440 +0000
+--- adoc	2025-03-17 13:18:32.311643028 +0000
++++ help	2025-03-17 13:18:32.355643306 +0000
 @@ -1 +1,3 @@
 -git update-ref [-m <reason>] [--no-deref] (-d <ref> [<old-oid>] | [--create-reflog] <ref> <new-oid> [<old-oid>] | --stdin [-z])
 +git update-ref [<options>] -d <refname> [<old-oid>]
@@ -91720,8 +90978,8 @@
 		align_after_nl "$builtin" <"$h2s" >help &&
 		test_cmp adoc help
 	
---- adoc	2026-04-19 19:16:23.691659440 +0000
-+++ help	2026-04-19 19:16:23.759659440 +0000
+--- adoc	2025-03-17 13:18:37.723677240 +0000
++++ help	2025-03-17 13:18:37.787677644 +0000
 @@ -1 +1,2 @@
 -git whatchanged <option>...
 +git log [<options>] [<revision-range>] [[--] <path>...]
@@ -91833,306 +91091,272 @@
 1..722
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2022-checkout-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2022-checkout-paths/.git/
-expecting success of 2022.1 'setup': 
-	mkdir dir &&
-	>dir/main &&
-	echo common >dir/common &&
-	git add dir/main dir/common &&
-	test_tick && git commit -m "main has dir/main" &&
-	git checkout -b next &&
-	git mv dir/main dir/next0 &&
-	echo next >dir/next1 &&
-	git add dir &&
-	test_tick && git commit -m "next has dir/next but not dir/main"
+*** t2012-checkout-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2012-checkout-last/.git/
+expecting success of 2012.1 'setup': 
+	test_commit initial world hello &&
+	git branch other &&
+	test_commit --append second world "hello again"
 
-[main (root-commit) 0ea9f56] main has dir/main
+[main (root-commit) b77667e] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dir/common
- create mode 100644 dir/main
-Switched to a new branch 'next'
-[next 30942f7] next has dir/next but not dir/main
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+[main 5146e8d] second
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename dir/{main => next0} (100%)
- create mode 100644 dir/next1
+ 1 file changed, 1 insertion(+)
 ok 1 - setup
 
-expecting success of 2022.2 'checking out paths out of a tree does not clobber unrelated paths': 
-	git checkout next &&
-	git reset --hard &&
-	rm dir/next0 &&
-	cat dir/common >expect.common &&
-	echo modified >expect.next1 &&
-	cat expect.next1 >dir/next1 &&
-	echo untracked >expect.next2 &&
-	cat expect.next2 >dir/next2 &&
-
-	git checkout main dir &&
+expecting success of 2012.2 '"checkout -" does not work initially': 
+	test_must_fail git checkout -
 
-	test_cmp expect.common dir/common &&
-	test_path_is_file dir/main &&
-	git diff --exit-code main dir/main &&
+error: pathspec '-' did not match any file(s) known to git
+ok 2 - "checkout -" does not work initially
 
-	test_path_is_missing dir/next0 &&
-	test_cmp expect.next1 dir/next1 &&
-	test_path_is_file dir/next2 &&
-	test_must_fail git ls-files --error-unmatch dir/next2 &&
-	test_cmp expect.next2 dir/next2
+expecting success of 2012.3 'first branch switch': 
+	git checkout other
 
-Already on 'next'
-HEAD is now at 30942f7 next has dir/next but not dir/main
-Updated 1 path from 4e95d5f
-error: pathspec 'dir/next2' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 2 - checking out paths out of a tree does not clobber unrelated paths
+Switched to branch 'other'
+ok 3 - first branch switch
 
-expecting success of 2022.3 'do not touch unmerged entries matching $path but not in $tree': 
-	git checkout next &&
-	git reset --hard &&
+expecting success of 2012.4 '"checkout -" switches back': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
 
-	cat dir/common >expect.common &&
-	EMPTY_SHA1=$(git hash-object -w --stdin </dev/null) &&
-	git rm dir/next0 &&
-	cat >expect.next0 <<-EOF &&
-	100644 $EMPTY_SHA1 1	dir/next0
-	100644 $EMPTY_SHA1 2	dir/next0
-	EOF
-	git update-index --index-info <expect.next0 &&
+Switched to branch 'main'
+ok 4 - "checkout -" switches back
 
-	git checkout main dir &&
+expecting success of 2012.5 '"checkout -" switches forth': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
 
-	test_cmp expect.common dir/common &&
-	test_path_is_file dir/main &&
-	git diff --exit-code main dir/main &&
-	git ls-files -s dir/next0 >actual.next0 &&
-	test_cmp expect.next0 actual.next0
+Switched to branch 'other'
+ok 5 - "checkout -" switches forth
 
-Already on 'next'
-A	dir/main
-D	dir/next0
-M	dir/next1
-HEAD is now at 30942f7 next has dir/next but not dir/main
-rm 'dir/next0'
-Updated 1 path from 4e95d5f
-ok 3 - do not touch unmerged entries matching $path but not in $tree
+expecting success of 2012.6 'detach HEAD': 
+	git checkout $(git rev-parse HEAD)
 
-expecting success of 2022.4 'do not touch files that are already up-to-date': 
-	git reset --hard &&
-	echo one >file1 &&
-	echo two >file2 &&
-	git add file1 file2 &&
-	git commit -m base &&
-	echo modified >file1 &&
-	test-tool chmtime =1000000000 file2 &&
-	git update-index -q --refresh &&
-	git checkout HEAD -- file1 file2 &&
-	echo one >expect &&
-	test_cmp expect file1 &&
-	echo "1000000000" >expect &&
-	test-tool chmtime --get file2 >actual &&
-	test_cmp expect actual
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
 
-HEAD is now at 30942f7 next has dir/next but not dir/main
-[next 567e06c] base
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-ok 4 - do not touch files that are already up-to-date
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 2022.5 'checkout HEAD adds deleted intent-to-add file back to index': 
-	echo "nonempty" >nonempty &&
-	>empty &&
-	git add nonempty empty &&
-	git commit -m "create files to be deleted" &&
-	git rm --cached nonempty empty &&
-	git add -N nonempty empty &&
-	git checkout HEAD nonempty empty &&
-	git diff --cached --exit-code
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[next 6bd1da2] create files to be deleted
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 empty
- create mode 100644 nonempty
-rm 'empty'
-rm 'nonempty'
-Updated 2 paths from cb321d9
-ok 5 - checkout HEAD adds deleted intent-to-add file back to index
+  git switch -c <new-branch-name>
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2021-checkout-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2021-checkout-overwrite/.git/
-expecting success of 2021.1 'setup': 
+Or undo this operation with:
 
-	mkdir -p a/b/c &&
-	>a/b/c/d &&
-	git add -A &&
-	git commit -m base &&
-	git tag start
+  git switch -
 
-[master (root-commit) 6ef9cb1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b/c/d
-ok 1 - setup
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 2021.2 'create a commit where dir a/b changed to file': 
+HEAD is now at b77667e initial
+ok 6 - detach HEAD
 
-	git checkout -b file &&
-	rm -rf a/b &&
-	>a/b &&
-	git add -A &&
-	git commit -m "dir to file"
+expecting success of 2012.7 '"checkout -" attaches again': 
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref other
 
-Switched to a new branch 'file'
-[file ef05f50] dir to file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/{b/c/d => b} (100%)
-ok 2 - create a commit where dir a/b changed to file
+Switched to branch 'other'
+ok 7 - "checkout -" attaches again
 
-expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
+expecting success of 2012.8 '"checkout -" detaches again': 
+	git checkout - &&
 
-	git rm --cached a/b &&
-	git commit -m "un-track the file" &&
-	test_must_fail git checkout start &&
-	test -f a/b
+	git rev-parse other >expect &&
+	git rev-parse HEAD >actual &&
+	test_cmp expect actual &&
 
-rm 'a/b'
-[file 1d595a3] un-track the file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 3 - checkout commit with dir must not remove untracked a/b
+	test_must_fail git symbolic-ref HEAD
 
-expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
+Note: switching to 'b77667e36f2efc50d31c716f0d5e6db09fe4a8e9'.
 
-	rm -rf a/b &&	# cleanup if previous test failed
-	git checkout -f -b symlink start &&
-	rm -rf a/b &&
-	git add -A &&
-	test_ln_s_add foo a/b &&
-	git commit -m "dir to symlink"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Switched to a new branch 'symlink'
-checking prerequisite: SYMLINKS
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+  git switch -c <new-branch-name>
 
-)
-prerequisite SYMLINKS ok
-[symlink 6de6f3e] dir to symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b
- delete mode 100644 a/b/c/d
-ok 4 - create a commit where dir a/b changed to symlink
+Or undo this operation with:
 
-expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
+  git switch -
 
-	git rm --cached a/b &&
-	git commit -m "un-track the symlink" &&
-	test_must_fail git checkout start
+Turn off this advice by setting config variable advice.detachedHead to false
 
-rm 'a/b'
-[symlink 43da882] un-track the symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 5 - checkout commit with dir must not remove untracked a/b
+HEAD is now at b77667e initial
+fatal: ref HEAD is not a symbolic ref
+ok 8 - "checkout -" detaches again
 
-expecting success of 2021.6 'the symlink remained': 
+expecting success of 2012.9 'more switches': 
+	for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
+	do
+		git checkout -b branch$i || return 1
+	done
 
-	test -h a/b
+Switched to a new branch 'branch16'
+Switched to a new branch 'branch15'
+Switched to a new branch 'branch14'
+Switched to a new branch 'branch13'
+Switched to a new branch 'branch12'
+Switched to a new branch 'branch11'
+Switched to a new branch 'branch10'
+Switched to a new branch 'branch9'
+Switched to a new branch 'branch8'
+Switched to a new branch 'branch7'
+Switched to a new branch 'branch6'
+Switched to a new branch 'branch5'
+Switched to a new branch 'branch4'
+Switched to a new branch 'branch3'
+Switched to a new branch 'branch2'
+Switched to a new branch 'branch1'
+ok 9 - more switches
 
-ok 6 - the symlink remained
+expecting success of 2012.10 'switch to the last': 
+	more_switches &&
+	git checkout @{-1} &&
+	test_cmp_symbolic_HEAD_ref branch2
 
-expecting success of 2021.7 'cleanup after previous symlink tests': 
-	rm a/b
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch2'
+ok 10 - switch to the last
 
-ok 7 - cleanup after previous symlink tests
+expecting success of 2012.11 'switch to second from the last': 
+	more_switches &&
+	git checkout @{-2} &&
+	test_cmp_symbolic_HEAD_ref branch3
 
-expecting success of 2021.8 'checkout -f must not follow symlinks when removing entries': 
-	git checkout -f start &&
-	mkdir dir &&
-	>dir/f &&
-	git add dir/f &&
-	git commit -m "add dir/f" &&
-	mv dir untracked &&
-	ln -s untracked dir &&
-	git checkout -f HEAD~ &&
-	test_path_is_file untracked/f
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch3'
+ok 11 - switch to second from the last
 
-Note: switching to 'start'.
+expecting success of 2012.12 'switch to third from the last': 
+	more_switches &&
+	git checkout @{-3} &&
+	test_cmp_symbolic_HEAD_ref branch4
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch4'
+ok 12 - switch to third from the last
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 2012.13 'switch to fourth from the last': 
+	more_switches &&
+	git checkout @{-4} &&
+	test_cmp_symbolic_HEAD_ref branch5
 
-  git switch -c <new-branch-name>
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch5'
+ok 13 - switch to fourth from the last
 
-Or undo this operation with:
+expecting success of 2012.14 'switch to twelfth from the last': 
+	more_switches &&
+	git checkout @{-12} &&
+	test_cmp_symbolic_HEAD_ref branch13
 
-  git switch -
+Switched to branch 'branch16'
+Switched to branch 'branch15'
+Switched to branch 'branch14'
+Switched to branch 'branch13'
+Switched to branch 'branch12'
+Switched to branch 'branch11'
+Switched to branch 'branch10'
+Switched to branch 'branch9'
+Switched to branch 'branch8'
+Switched to branch 'branch7'
+Switched to branch 'branch6'
+Switched to branch 'branch5'
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+Switched to branch 'branch2'
+Switched to branch 'branch1'
+Switched to branch 'branch13'
+ok 14 - switch to twelfth from the last
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 2012.15 'merge base test setup': 
+	git checkout -b another other &&
+	test_commit --append third world "hello again"
 
-HEAD is now at 6ef9cb1 base
-[detached HEAD 63af845] add dir/f
+Switched to a new branch 'another'
+[another d04d7df] third
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/f
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  63af845 add dir/f
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 63af845
+ 1 file changed, 1 insertion(+)
+ok 15 - merge base test setup
 
-HEAD is now at 6ef9cb1 base
-ok 8 - checkout -f must not follow symlinks when removing entries
+expecting success of 2012.16 'another...main': 
+	git checkout another &&
+	git checkout another...main &&
 
-expecting success of 2021.9 'checkout --overwrite-ignore should succeed if only ignored files in the way': 
-	git checkout -b df_conflict &&
-	test_commit contents some_dir &&
-	git checkout start &&
-	mkdir some_dir &&
-	echo autogenerated information >some_dir/ignore &&
-	echo ignore >.git/info/exclude &&
-	git checkout --overwrite-ignore df_conflict &&
-	test_path_is_file some_dir
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'df_conflict'
-[df_conflict aa83f36] contents
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some_dir
-Note: switching to 'start'.
+Already on 'another'
+Note: switching to 'another...main'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -92149,343 +91373,1061 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 6ef9cb1 base
-Previous HEAD position was 6ef9cb1 base
-Switched to branch 'df_conflict'
-ok 9 - checkout --overwrite-ignore should succeed if only ignored files in the way
+HEAD is now at b77667e initial
+ok 16 - another...main
 
-# passed all 9 test(s)
-1..9
+expecting success of 2012.17 '...main': 
+	git checkout another &&
+	git checkout ...main &&
+
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to '...main'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 17 - ...main
+
+expecting success of 2012.18 'main...': 
+	git checkout another &&
+	git checkout main... &&
+
+	git rev-parse --verify main^ >expect &&
+	git rev-parse --verify HEAD >actual &&
+	test_cmp expect actual
+
+Previous HEAD position was b77667e initial
+Switched to branch 'another'
+Note: switching to 'main...'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b77667e initial
+ok 18 - main...
+
+expecting success of 2012.19 '"checkout -" works after a rebase A': 
+	git checkout main &&
+	git checkout other &&
+	git rebase main &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Previous HEAD position was b77667e initial
+Switched to branch 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/other.
+Switched to branch 'main'
+ok 19 - "checkout -" works after a rebase A
+
+expecting success of 2012.20 '"checkout -" works after a rebase A B': 
+	git branch moodle main~1 &&
+	git checkout main &&
+	git checkout other &&
+	git rebase main moodle &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/moodle.
+Switched to branch 'main'
+ok 20 - "checkout -" works after a rebase A B
+
+expecting success of 2012.21 '"checkout -" works after a rebase -i A': 
+	git checkout main &&
+	git checkout other &&
+	git rebase -i main &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/other.
+Switched to branch 'main'
+ok 21 - "checkout -" works after a rebase -i A
+
+expecting success of 2012.22 '"checkout -" works after a rebase -i A B': 
+	git branch foodle main~1 &&
+	git checkout main &&
+	git checkout other &&
+	git rebase main foodle &&
+	git checkout - &&
+	test_cmp_symbolic_HEAD_ref main
+
+Already on 'main'
+Switched to branch 'other'
+Successfully rebased and updated refs/heads/foodle.
+Switched to branch 'main'
+ok 22 - "checkout -" works after a rebase -i A B
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2016-checkout-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2016-checkout-patch/.git/
-expecting success of 2016.1 'setup': 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	git add bar dir/foo &&
-	git commit -m initial &&
+*** t2017-checkout-orphan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2017-checkout-orphan/.git/
+expecting success of 2017.1 'Setup': 
+	echo "Initial" >"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	git commit -m "First Commit" &&
 	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
+	echo "State 1" >>"$TEST_FILE" &&
+	git add "$TEST_FILE" &&
+	test_tick &&
+	git commit -m "Second Commit"
 
-[master (root-commit) 758b165] initial
+[main (root-commit) df316c6] First Commit
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 3319288] second
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main 8c3f362] Second Commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ok 1 - Setup
+
+expecting success of 2017.2 '--orphan creates a new orphan branch from HEAD': 
+	git checkout --orphan alpha &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Third Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet main alpha
+
+Switched to a new branch 'alpha'
+fatal: Needed a single revision
+[alpha (root-commit) 6f20c32] Third Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 2 - --orphan creates a new orphan branch from HEAD
+
+expecting success of 2017.3 '--orphan creates a new orphan branch from <start_point>': 
+	git checkout main &&
+	git checkout --orphan beta main^ &&
+	test_must_fail git rev-parse --verify HEAD &&
+	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
+	test_tick &&
+	git commit -m "Fourth Commit" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git diff-tree --quiet main^ beta
+
+Switched to branch 'main'
+Switched to a new branch 'beta'
+fatal: Needed a single revision
+[beta (root-commit) 530edda] Fourth Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 3 - --orphan creates a new orphan branch from <start_point>
+
+expecting success of 2017.4 '--orphan must be rejected with -b': 
+	git checkout main &&
+	test_must_fail git checkout --orphan new -b newer &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
+
+Switched to branch 'main'
+fatal: options '-b', '-B', and '--orphan' cannot be used together
+ok 4 - --orphan must be rejected with -b
+
+expecting success of 2017.5 '--orphan must be rejected with -t': 
+	git checkout main &&
+	test_must_fail git checkout --orphan new -t main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
+
+Already on 'main'
+fatal: '--orphan' cannot be used with '-t'
+ok 5 - --orphan must be rejected with -t
+
+expecting success of 2017.6 '--orphan ignores branch.autosetupmerge': 
+	git checkout main &&
+	git config branch.autosetupmerge always &&
+	git checkout --orphan gamma &&
+	test_cmp_config "" --default "" branch.gamma.merge &&
+	test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
+	test_must_fail git rev-parse --verify HEAD^ &&
+	git checkout main &&
+	git config branch.autosetupmerge inherit &&
+	git checkout --orphan eta &&
+	test_cmp_config "" --default "" branch.eta.merge &&
+	test_cmp_config "" --default "" branch.eta.remote &&
+	echo refs/heads/eta >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual &&
+	test_must_fail git rev-parse --verify HEAD^
+
+Already on 'main'
+Switched to a new branch 'gamma'
+fatal: Needed a single revision
+Switched to branch 'main'
+Switched to a new branch 'eta'
+fatal: Needed a single revision
+ok 6 - --orphan ignores branch.autosetupmerge
+
+expecting success of 2017.7 '--orphan makes reflog by default': 
+	git checkout main &&
+	git config --unset core.logAllRefUpdates &&
+	git checkout --orphan delta &&
+	test_must_fail git rev-parse --verify delta@{0} &&
+	git commit -m Delta &&
+	git rev-parse --verify delta@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'delta'
+fatal: Needed a single revision
+[delta (root-commit) 9beee35] Delta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+9beee35744aee191f8186ef0a6ab78f710cdd57c
+ok 7 - --orphan makes reflog by default
+
+expecting success of 2017.8 '--orphan does not make reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git config core.logAllRefUpdates false &&
+	git checkout --orphan epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0} &&
+	git commit -m Epsilon &&
+	test_must_fail git rev-parse --verify epsilon@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'epsilon'
+fatal: Needed a single revision
+[epsilon (root-commit) c5e7701] Epsilon
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+fatal: Needed a single revision
+ok 8 - --orphan does not make reflog when core.logAllRefUpdates = false
+
+expecting success of 2017.9 '--orphan with -l makes reflog when core.logAllRefUpdates = false': 
+	git checkout main &&
+	git checkout -l --orphan zeta &&
+	test_must_fail git rev-parse --verify zeta@{0} &&
+	git commit -m Zeta &&
+	git rev-parse --verify zeta@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'zeta'
+fatal: Needed a single revision
+[zeta (root-commit) 1b23595] Zeta
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 foo
+1b235958474dccc5c8f228713c620d22e7d1825d
+ok 9 - --orphan with -l makes reflog when core.logAllRefUpdates = false
+
+expecting success of 2017.10 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog': 
+	git checkout main &&
+	git checkout -l --orphan eta &&
+	test_must_fail git rev-parse --verify eta@{0} &&
+	git checkout main &&
+	test_must_fail git rev-parse --verify eta@{0}
+
+Switched to branch 'main'
+Switched to a new branch 'eta'
+fatal: Needed a single revision
+Switched to branch 'main'
+fatal: Needed a single revision
+ok 10 - giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog
+
+expecting success of 2017.11 '--orphan is rejected with an existing name': 
+	git checkout main &&
+	test_must_fail git checkout --orphan main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
+
+Already on 'main'
+fatal: a branch named 'main' already exists
+ok 11 - --orphan is rejected with an existing name
+
+expecting success of 2017.12 '--orphan refuses to switch if a merge is needed': 
+	git checkout main &&
+	git reset --hard &&
+	echo local >>"$TEST_FILE" &&
+	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
+	test_must_fail git checkout --orphan new main^ &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)" &&
+	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
+	git diff-index --quiet --cached HEAD &&
+	git reset --hard
+
+Already on 'main'
+HEAD is now at 8c3f362 Second Commit
+error: Your local changes to the following files would be overwritten by checkout:
+	foo
+Please commit your changes or stash them before you switch branches.
+Aborting
+HEAD is now at 8c3f362 Second Commit
+ok 12 - --orphan refuses to switch if a merge is needed
+
+expecting success of 2017.13 'cannot --detach on an unborn branch': 
+	git checkout main &&
+	git checkout --orphan new &&
+	test_must_fail git checkout --detach
+
+Already on 'main'
+Switched to a new branch 'new'
+fatal: You are on a branch yet to be born
+ok 13 - cannot --detach on an unborn branch
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t1460-refs-migrate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/.git/
+expecting success of 1460.1 'setup': 
+	rm -rf .git
+
 ok 1 - setup
 
-expecting success of 2016.2 'saying "n" does nothing': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n n | git checkout -p &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
+expecting success of 1460.2 'superfluous arguments': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate foo 2>err &&
+	cat >expect <<-EOF &&
+	usage: too many arguments
+	EOF
+	test_cmp expect err
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 2 - saying "n" does nothing
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 2 - superfluous arguments
 
-expecting success of 2016.3 'git checkout -p': 
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1460.3 'missing ref storage format': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate 2>err &&
+	cat >expect <<-EOF &&
+	usage: missing --ref-format=<format>
+	EOF
+	test_cmp expect err
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 3 - git checkout -p
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 3 - missing ref storage format
 
-expecting success of 2016.4 'git checkout -p with staged changes': 
-	set_state dir/foo work index &&
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
+expecting success of 1460.4 'unknown ref storage format': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_must_fail git -C repo refs migrate \
+		--ref-format=unknown 2>err &&
+	cat >expect <<-EOF &&
+	error: unknown ref storage format ${SQ}unknown${SQ}
+	EOF
+	test_cmp expect err
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--index
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 4 - git checkout -p with staged changes
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 4 - unknown ref storage format
 
-expecting success of 2016.5 'git checkout -p HEAD with NO staged changes: abort': 
-		set_and_save_state dir/foo work head &&
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_saved_state dir/foo &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 5 - git checkout -p HEAD with NO staged changes: abort
+expecting success of 1460.5 'files: migration to same format fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$from_format 2>err &&
+			cat >expect <<-EOF &&
+			error: repository already uses ${SQ}$from_format${SQ} format
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 5 - files: migration to same format fails
 
-expecting success of 2016.6 'git checkout -p HEAD with NO staged changes: apply': 
-		test_write_lines n y y | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 6 - git checkout -p HEAD with NO staged changes: apply
+expecting success of 1460.6 'files -> reftable: migration with worktree fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			git -C repo worktree add wt &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$to_format 2>err &&
+			cat >expect <<-EOF &&
+			error: migrating repositories with worktrees is not supported yet
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+No possible source branch, inferring '--orphan'
+Preparing worktree (new branch 'wt')
+ok 6 - files -> reftable: migration with worktree fails
 
-expecting success of 2016.7 'git checkout -p HEAD with change already staged': 
-		set_state dir/foo index index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-ok 7 - git checkout -p HEAD with change already staged
+expecting success of 1460.7 'files -> reftable: unborn HEAD': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 7 - files -> reftable: unborn HEAD
 
-expecting success of 2016.8 'git checkout -p @ with NO staged changes: abort': 
-		set_and_save_state dir/foo work head &&
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_saved_state dir/foo &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 8 - git checkout -p @ with NO staged changes: abort
+expecting success of 1460.8 'files -> reftable: single ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 8 - files -> reftable: single ref
 
-expecting success of 2016.9 'git checkout -p @ with NO staged changes: apply': 
-		test_write_lines n y y | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
-ok 9 - git checkout -p @ with NO staged changes: apply
+expecting success of 1460.9 'files -> reftable: bare repository': 
+			test_when_finished "rm -rf repo repo.git" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git clone --ref-format=$from_format --mirror repo repo.git &&
+			test_migration repo.git "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into bare repository 'repo.git'...
+done.
+ok 9 - files -> reftable: bare repository
 
-expecting success of 2016.10 'git checkout -p @ with change already staged': 
-		set_state dir/foo index index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git checkout -p $opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head head &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
-ok 10 - git checkout -p @ with change already staged
+expecting success of 1460.10 'files -> reftable: dangling symref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
+			test_migration repo "$to_format" &&
+			echo refs/heads/nonexistent >expect &&
+			git -C repo symbolic-ref BROKEN_HEAD >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) d39e3de] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 10 - files -> reftable: dangling symref
 
-expecting success of 2016.11 'git checkout -p HEAD^...': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git checkout -p HEAD^... &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
+expecting success of 1460.11 'files -> reftable: broken ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
+				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
+			test_migration repo "$to_format" true &&
+			test_oid 001 >expect &&
+			git -C repo rev-parse refs/heads/broken >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 1935181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 11 - files -> reftable: broken ref
 
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 11 - git checkout -p HEAD^...
+expecting success of 1460.12 'files -> reftable: pseudo-refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo update-ref FOO_HEAD HEAD &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 12 - files -> reftable: pseudo-refs
 
-expecting success of 2016.12 'git checkout -p HEAD^': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git checkout -p HEAD^ &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
+expecting success of 1460.13 'files -> reftable: special refs are left alone': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
+			git -C repo rev-parse MERGE_HEAD &&
+			test_migration repo "$to_format" &&
+			test_path_is_file repo/.git/MERGE_HEAD
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+31243c69d8d79236a6f50781bf4138e2507bab91
+ok 13 - files -> reftable: special refs are left alone
 
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 12 - git checkout -p HEAD^
+expecting success of 1460.14 'files -> reftable: a bunch of refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
 
-expecting success of 2016.13 'git checkout -p handles deletion': 
-	set_state dir/foo work index &&
-	rm dir/foo &&
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
+			test_commit -C repo initial &&
+			cat >input <<-EOF &&
+			create FOO_HEAD HEAD
+			create refs/heads/branch-1 HEAD
+			create refs/heads/branch-2 HEAD
+			create refs/heads/branch-3 HEAD
+			create refs/heads/branch-4 HEAD
+			create refs/tags/tag-1 HEAD
+			create refs/tags/tag-2 HEAD
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 167ffd6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 14 - files -> reftable: a bunch of refs
 
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-deleted file mode 100644
-index 9015a7a..0000000
---- a/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--index
-(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
-ok 13 - git checkout -p handles deletion
+expecting success of 1460.15 'files -> reftable: dry-run migration does not modify repository': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo refs migrate --dry-run \
+				--ref-format=$to_format >output &&
+			grep "Finished dry-run migration of refs" output &&
+			test_path_is_dir repo/.git/ref_migration.* &&
+			echo $from_format >expect &&
+			git -C repo rev-parse --show-ref-format >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) f844f1e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.7N8jwX'
+ok 15 - files -> reftable: dry-run migration does not modify repository
 
-expecting success of 2016.14 'path limiting works: dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git checkout -p dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1460.16 'files -> reftable: reflogs of symrefs with target deleted': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo branch branch-1 HEAD &&
+			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
+			cat >input <<-EOF &&
+			delete refs/heads/branch-1
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b13909b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 16 - files -> reftable: reflogs of symrefs with target deleted
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 14 - path limiting works: dir
+expecting success of 1460.17 'files -> reftable: reflogs order is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
+			test_commit --date "100003000 +0700" --no-tag -C repo second &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b2ea3e6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main a1e4c45] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 17 - files -> reftable: reflogs order is retained
 
-expecting success of 2016.15 'path limiting works: -- dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git checkout -p -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1460.18 'files -> reftable: stash is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			(
+				cd repo &&
+				test_commit initial A &&
+				echo foo >A &&
+				git stash push &&
+				echo bar >A &&
+				git stash push &&
+				git stash list >expect.reflog &&
+				test_migration . "$to_format" &&
+				git stash list >actual.reflog &&
+				test_cmp expect.reflog actual.reflog
+			)
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 43952a4] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Saved working directory and index state WIP on main: 43952a4 initial
+Saved working directory and index state WIP on main: 43952a4 initial
+ok 18 - files -> reftable: stash is retained
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 15 - path limiting works: -- dir
+expecting success of 1460.19 'files -> reftable: skip reflog with --skip-reflog': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			# we see that the repository contains reflogs.
+			git -C repo reflog --all >reflogs &&
+			test_line_count = 2 reflogs &&
+			test_migration repo "$to_format" true --no-reflog &&
+			# there should be no reflogs post migration.
+			git -C repo reflog --all >reflogs &&
+			test_must_be_empty reflogs
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 2aabd22] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 19 - files -> reftable: skip reflog with --skip-reflog
 
-expecting success of 2016.16 'path limiting works: HEAD^ -- dir': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
+expecting success of 1460.20 'reftable: migration to same format fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$from_format 2>err &&
+			cat >expect <<-EOF &&
+			error: repository already uses ${SQ}$from_format${SQ} format
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 20 - reftable: migration to same format fails
 
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
-ok 16 - path limiting works: HEAD^ -- dir
+expecting success of 1460.21 'reftable -> files: migration with worktree fails': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			git -C repo worktree add wt &&
+			test_must_fail git -C repo refs migrate \
+				--ref-format=$to_format 2>err &&
+			cat >expect <<-EOF &&
+			error: migrating repositories with worktrees is not supported yet
+			EOF
+			test_cmp expect err
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+No possible source branch, inferring '--orphan'
+Preparing worktree (new branch 'wt')
+ok 21 - reftable -> files: migration with worktree fails
 
-expecting success of 2016.17 'path limiting works: foo inside dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | (cd dir && git checkout -p foo) &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1460.22 'reftable -> files: unborn HEAD': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+ok 22 - reftable -> files: unborn HEAD
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 17 - path limiting works: foo inside dir
+expecting success of 1460.23 'reftable -> files: single ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 3805046] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 23 - reftable -> files: single ref
 
-expecting success of 2016.18 'none of this moved HEAD': 
-	verify_saved_head
+expecting success of 1460.24 'reftable -> files: bare repository': 
+			test_when_finished "rm -rf repo repo.git" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git clone --ref-format=$from_format --mirror repo repo.git &&
+			test_migration repo.git "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 971e222] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into bare repository 'repo.git'...
+done.
+ok 24 - reftable -> files: bare repository
 
-ok 18 - none of this moved HEAD
+expecting success of 1460.25 'reftable -> files: dangling symref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
+			test_migration repo "$to_format" &&
+			echo refs/heads/nonexistent >expect &&
+			git -C repo symbolic-ref BROKEN_HEAD >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) cf21f93] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 25 - reftable -> files: dangling symref
 
-expecting success of 2016.19 'empty tree can be handled': 
-	test_when_finished "git reset --hard" &&
-	git checkout -p $(test_oid empty_tree) --
+expecting success of 1460.26 'reftable -> files: broken ref': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
+				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
+			test_migration repo "$to_format" true &&
+			test_oid 001 >expect &&
+			git -C repo rev-parse refs/heads/broken >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) f175d86] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 26 - reftable -> files: broken ref
 
-diff --git b/bar a/bar
-deleted file mode 100644
-index 8c999e6..0000000
---- b/bar
-+++ /dev/null
-@@ -1 +0,0 @@
--bar_work
-(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
-diff --git b/dir/foo a/dir/foo
-deleted file mode 100644
-index 564b12f..0000000
---- b/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--head
-(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
-HEAD is now at 3319288 second
-ok 19 - empty tree can be handled
+expecting success of 1460.27 'reftable -> files: pseudo-refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo update-ref FOO_HEAD HEAD &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 1aef781] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 27 - reftable -> files: pseudo-refs
 
-# passed all 19 test(s)
-1..19
+expecting success of 1460.28 'reftable -> files: special refs are left alone': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
+			git -C repo rev-parse MERGE_HEAD &&
+			test_migration repo "$to_format" &&
+			test_path_is_file repo/.git/MERGE_HEAD
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 8858db3] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+8858db371362b5c8b32b61d0c007bb805cd3258c
+ok 28 - reftable -> files: special refs are left alone
+
+expecting success of 1460.29 'reftable -> files: a bunch of refs': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+
+			test_commit -C repo initial &&
+			cat >input <<-EOF &&
+			create FOO_HEAD HEAD
+			create refs/heads/branch-1 HEAD
+			create refs/heads/branch-2 HEAD
+			create refs/heads/branch-3 HEAD
+			create refs/heads/branch-4 HEAD
+			create refs/tags/tag-1 HEAD
+			create refs/tags/tag-2 HEAD
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 68d032e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 29 - reftable -> files: a bunch of refs
+
+expecting success of 1460.30 'reftable -> files: dry-run migration does not modify repository': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo refs migrate --dry-run \
+				--ref-format=$to_format >output &&
+			grep "Finished dry-run migration of refs" output &&
+			test_path_is_dir repo/.git/ref_migration.* &&
+			echo $from_format >expect &&
+			git -C repo rev-parse --show-ref-format >actual &&
+			test_cmp expect actual
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 8cd44c7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Finished dry-run migration of refs, the result can be found at '.git/ref_migration.U1yf0S'
+ok 30 - reftable -> files: dry-run migration does not modify repository
+
+expecting success of 1460.31 'reftable -> files: reflogs of symrefs with target deleted': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			git -C repo branch branch-1 HEAD &&
+			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
+			cat >input <<-EOF &&
+			delete refs/heads/branch-1
+			EOF
+			git -C repo update-ref --stdin <input &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) d8072fd] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 31 - reftable -> files: reflogs of symrefs with target deleted
+
+expecting success of 1460.32 'reftable -> files: reflogs order is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
+			test_commit --date "100003000 +0700" --no-tag -C repo second &&
+			test_migration repo "$to_format"
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) b2ea3e6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main a1e4c45] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 32 - reftable -> files: reflogs order is retained
+
+expecting success of 1460.33 'reftable -> files: stash is retained': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			(
+				cd repo &&
+				test_commit initial A &&
+				echo foo >A &&
+				git stash push &&
+				echo bar >A &&
+				git stash push &&
+				git stash list >expect.reflog &&
+				test_migration . "$to_format" &&
+				git stash list >actual.reflog &&
+				test_cmp expect.reflog actual.reflog
+			)
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 2e6ee6d] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Saved working directory and index state WIP on main: 2e6ee6d initial
+Saved working directory and index state WIP on main: 2e6ee6d initial
+ok 33 - reftable -> files: stash is retained
+
+expecting success of 1460.34 'reftable -> files: skip reflog with --skip-reflog': 
+			test_when_finished "rm -rf repo" &&
+			git init --ref-format=$from_format repo &&
+			test_commit -C repo initial &&
+			# we see that the repository contains reflogs.
+			git -C repo reflog --all >reflogs &&
+			test_line_count = 2 reflogs &&
+			test_migration repo "$to_format" true --no-reflog &&
+			# there should be no reflogs post migration.
+			git -C repo reflog --all >reflogs &&
+			test_must_be_empty reflogs
+		
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) ee4b540] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 34 - reftable -> files: skip reflog with --skip-reflog
+
+expecting success of 1460.35 'multiple reftable blocks with multiple entries': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=files repo &&
+	test_commit -C repo first &&
+	printf "create refs/heads/ref-%d HEAD\n" $(test_seq 5000) >stdin &&
+	git -C repo update-ref --stdin <stdin &&
+	test_commit -C repo second &&
+	printf "update refs/heads/ref-%d HEAD\n" $(test_seq 3000) >stdin &&
+	git -C repo update-ref --stdin <stdin &&
+	test_migration repo reftable
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) fdc6a6a] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[main 22e3fb8] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 35 - multiple reftable blocks with multiple entries
+
+expecting success of 1460.36 'migrating from files format deletes backend files': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=files repo &&
+	test_commit -C repo first &&
+	git -C repo pack-refs --all &&
+	test_commit -C repo second &&
+	git -C repo update-ref ORIG_HEAD HEAD &&
+	git -C repo rev-parse HEAD >repo/.git/FETCH_HEAD &&
+
+	test_path_is_file repo/.git/HEAD &&
+	test_path_is_file repo/.git/ORIG_HEAD &&
+	test_path_is_file repo/.git/refs/heads/main &&
+	test_path_is_file repo/.git/packed-refs &&
+
+	test_migration repo reftable &&
+
+	echo "ref: refs/heads/.invalid" >expect &&
+	test_cmp expect repo/.git/HEAD &&
+	echo "this repository uses the reftable format" >expect &&
+	test_cmp expect repo/.git/refs/heads &&
+	test_path_is_file repo/.git/FETCH_HEAD &&
+	test_path_is_missing repo/.git/ORIG_HEAD &&
+	test_path_is_missing repo/.git/refs/heads/main &&
+	test_path_is_missing repo/.git/logs &&
+	test_path_is_missing repo/.git/packed-refs
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) 8172781] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[main 97fa77d] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 36 - migrating from files format deletes backend files
+
+expecting success of 1460.37 'migrating from reftable format deletes backend files': 
+	test_when_finished "rm -rf repo" &&
+	git init --ref-format=reftable repo &&
+	test_commit -C repo first &&
+
+	test_path_is_dir repo/.git/reftable &&
+	test_migration repo files &&
+
+	test_path_is_missing repo/.git/reftable &&
+	echo "ref: refs/heads/main" >expect &&
+	test_cmp expect repo/.git/HEAD &&
+	test_path_is_file repo/.git/packed-refs
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
+[main (root-commit) d9dae97] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 37 - migrating from reftable format deletes backend files
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2019-checkout-ambiguous-ref/.git/
+expecting success of 2019.1 'setup ambiguous refs': 
+	test_commit branch file &&
+	git branch ambiguity &&
+	git branch vagueness &&
+	test_commit tag file &&
+	git tag ambiguity &&
+	git tag vagueness HEAD:file &&
+	test_commit other file
+
+[master (root-commit) c291a6e] branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master a40f7cf] tag
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3b61e26] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup ambiguous refs
+
+expecting success of 2019.2 'checkout ambiguous ref succeeds': 
+	git checkout ambiguity 2>stderr
+
+ok 2 - checkout ambiguous ref succeeds
+
+expecting success of 2019.3 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
+
+warning: refname 'ambiguity' is ambiguous.
+ok 3 - checkout produces ambiguity warning
+
+expecting success of 2019.4 'checkout chooses branch over tag': 
+	echo refs/heads/ambiguity >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
+
+ok 4 - checkout chooses branch over tag
+
+expecting success of 2019.5 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
+
+Switched to branch 'ambiguity'
+ok 5 - checkout reports switch to branch
+
+expecting success of 2019.6 'checkout vague ref succeeds': 
+	git checkout vagueness 2>stderr &&
+	test_set_prereq VAGUENESS_SUCCESS
+
+ok 6 - checkout vague ref succeeds
+
+expecting success of 2019.7 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
+
+warning: refname 'vagueness' is ambiguous.
+ok 7 - checkout produces ambiguity warning
+
+expecting success of 2019.8 'checkout chooses branch over tag': 
+	echo refs/heads/vagueness >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
+
+ok 8 - checkout chooses branch over tag
+
+expecting success of 2019.9 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
+
+Switched to branch 'vagueness'
+ok 9 - checkout reports switch to branch
+
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2018-checkout-branch.sh ***
@@ -92886,6 +92828,331 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2022-checkout-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2022-checkout-paths/.git/
+expecting success of 2022.1 'setup': 
+	mkdir dir &&
+	>dir/main &&
+	echo common >dir/common &&
+	git add dir/main dir/common &&
+	test_tick && git commit -m "main has dir/main" &&
+	git checkout -b next &&
+	git mv dir/main dir/next0 &&
+	echo next >dir/next1 &&
+	git add dir &&
+	test_tick && git commit -m "next has dir/next but not dir/main"
+
+[main (root-commit) 0ea9f56] main has dir/main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dir/common
+ create mode 100644 dir/main
+Switched to a new branch 'next'
+[next 30942f7] next has dir/next but not dir/main
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename dir/{main => next0} (100%)
+ create mode 100644 dir/next1
+ok 1 - setup
+
+expecting success of 2022.2 'checking out paths out of a tree does not clobber unrelated paths': 
+	git checkout next &&
+	git reset --hard &&
+	rm dir/next0 &&
+	cat dir/common >expect.common &&
+	echo modified >expect.next1 &&
+	cat expect.next1 >dir/next1 &&
+	echo untracked >expect.next2 &&
+	cat expect.next2 >dir/next2 &&
+
+	git checkout main dir &&
+
+	test_cmp expect.common dir/common &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
+
+	test_path_is_missing dir/next0 &&
+	test_cmp expect.next1 dir/next1 &&
+	test_path_is_file dir/next2 &&
+	test_must_fail git ls-files --error-unmatch dir/next2 &&
+	test_cmp expect.next2 dir/next2
+
+Already on 'next'
+HEAD is now at 30942f7 next has dir/next but not dir/main
+Updated 1 path from 4e95d5f
+error: pathspec 'dir/next2' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 2 - checking out paths out of a tree does not clobber unrelated paths
+
+expecting success of 2022.3 'do not touch unmerged entries matching $path but not in $tree': 
+	git checkout next &&
+	git reset --hard &&
+
+	cat dir/common >expect.common &&
+	EMPTY_SHA1=$(git hash-object -w --stdin </dev/null) &&
+	git rm dir/next0 &&
+	cat >expect.next0 <<-EOF &&
+	100644 $EMPTY_SHA1 1	dir/next0
+	100644 $EMPTY_SHA1 2	dir/next0
+	EOF
+	git update-index --index-info <expect.next0 &&
+
+	git checkout main dir &&
+
+	test_cmp expect.common dir/common &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
+	git ls-files -s dir/next0 >actual.next0 &&
+	test_cmp expect.next0 actual.next0
+
+Already on 'next'
+A	dir/main
+D	dir/next0
+M	dir/next1
+HEAD is now at 30942f7 next has dir/next but not dir/main
+rm 'dir/next0'
+Updated 1 path from 4e95d5f
+ok 3 - do not touch unmerged entries matching $path but not in $tree
+
+expecting success of 2022.4 'do not touch files that are already up-to-date': 
+	git reset --hard &&
+	echo one >file1 &&
+	echo two >file2 &&
+	git add file1 file2 &&
+	git commit -m base &&
+	echo modified >file1 &&
+	test-tool chmtime =1000000000 file2 &&
+	git update-index -q --refresh &&
+	git checkout HEAD -- file1 file2 &&
+	echo one >expect &&
+	test_cmp expect file1 &&
+	echo "1000000000" >expect &&
+	test-tool chmtime --get file2 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 30942f7 next has dir/next but not dir/main
+[next 567e06c] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ok 4 - do not touch files that are already up-to-date
+
+expecting success of 2022.5 'checkout HEAD adds deleted intent-to-add file back to index': 
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git checkout HEAD nonempty empty &&
+	git diff --cached --exit-code
+
+[next 6bd1da2] create files to be deleted
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 empty
+ create mode 100644 nonempty
+rm 'empty'
+rm 'nonempty'
+Updated 2 paths from cb321d9
+ok 5 - checkout HEAD adds deleted intent-to-add file back to index
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2021-checkout-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2021-checkout-overwrite/.git/
+expecting success of 2021.1 'setup': 
+
+	mkdir -p a/b/c &&
+	>a/b/c/d &&
+	git add -A &&
+	git commit -m base &&
+	git tag start
+
+[master (root-commit) 6ef9cb1] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ok 1 - setup
+
+expecting success of 2021.2 'create a commit where dir a/b changed to file': 
+
+	git checkout -b file &&
+	rm -rf a/b &&
+	>a/b &&
+	git add -A &&
+	git commit -m "dir to file"
+
+Switched to a new branch 'file'
+[file ef05f50] dir to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/{b/c/d => b} (100%)
+ok 2 - create a commit where dir a/b changed to file
+
+expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
+
+	git rm --cached a/b &&
+	git commit -m "un-track the file" &&
+	test_must_fail git checkout start &&
+	test -f a/b
+
+rm 'a/b'
+[file 1d595a3] un-track the file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 a/b
+error: The following untracked working tree files would be overwritten by checkout:
+	a/b
+Please move or remove them before you switch branches.
+Aborting
+ok 3 - checkout commit with dir must not remove untracked a/b
+
+expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
+
+	rm -rf a/b &&	# cleanup if previous test failed
+	git checkout -f -b symlink start &&
+	rm -rf a/b &&
+	git add -A &&
+	test_ln_s_add foo a/b &&
+	git commit -m "dir to symlink"
+
+Switched to a new branch 'symlink'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[symlink 6de6f3e] dir to symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 a/b
+ delete mode 100644 a/b/c/d
+ok 4 - create a commit where dir a/b changed to symlink
+
+expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
+
+	git rm --cached a/b &&
+	git commit -m "un-track the symlink" &&
+	test_must_fail git checkout start
+
+rm 'a/b'
+[symlink 43da882] un-track the symlink
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 120000 a/b
+error: The following untracked working tree files would be overwritten by checkout:
+	a/b
+Please move or remove them before you switch branches.
+Aborting
+ok 5 - checkout commit with dir must not remove untracked a/b
+
+expecting success of 2021.6 'the symlink remained': 
+
+	test -h a/b
+
+ok 6 - the symlink remained
+
+expecting success of 2021.7 'cleanup after previous symlink tests': 
+	rm a/b
+
+ok 7 - cleanup after previous symlink tests
+
+expecting success of 2021.8 'checkout -f must not follow symlinks when removing entries': 
+	git checkout -f start &&
+	mkdir dir &&
+	>dir/f &&
+	git add dir/f &&
+	git commit -m "add dir/f" &&
+	mv dir untracked &&
+	ln -s untracked dir &&
+	git checkout -f HEAD~ &&
+	test_path_is_file untracked/f
+
+Note: switching to 'start'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6ef9cb1 base
+[detached HEAD 63af845] add dir/f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/f
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  63af845 add dir/f
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 63af845
+
+HEAD is now at 6ef9cb1 base
+ok 8 - checkout -f must not follow symlinks when removing entries
+
+expecting success of 2021.9 'checkout --overwrite-ignore should succeed if only ignored files in the way': 
+	git checkout -b df_conflict &&
+	test_commit contents some_dir &&
+	git checkout start &&
+	mkdir some_dir &&
+	echo autogenerated information >some_dir/ignore &&
+	echo ignore >.git/info/exclude &&
+	git checkout --overwrite-ignore df_conflict &&
+	test_path_is_file some_dir
+
+Switched to a new branch 'df_conflict'
+[df_conflict aa83f36] contents
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 some_dir
+Note: switching to 'start'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6ef9cb1 base
+Previous HEAD position was 6ef9cb1 base
+Switched to branch 'df_conflict'
+ok 9 - checkout --overwrite-ignore should succeed if only ignored files in the way
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2023-checkout-m.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2023-checkout-m/.git/
 expecting success of 2023.1 'setup': 
@@ -92992,6 +93259,336 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2016-checkout-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2016-checkout-patch/.git/
+expecting success of 2016.1 'setup': 
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	git add bar dir/foo &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 758b165] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 3319288] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2016.2 'saying "n" does nothing': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n n | git checkout -p &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 2 - saying "n" does nothing
+
+expecting success of 2016.3 'git checkout -p': 
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 3 - git checkout -p
+
+expecting success of 2016.4 'git checkout -p with staged changes': 
+	set_state dir/foo work index &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 4 - git checkout -p with staged changes
+
+expecting success of 2016.5 'git checkout -p HEAD with NO staged changes: abort': 
+		set_and_save_state dir/foo work head &&
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_saved_state dir/foo &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 5 - git checkout -p HEAD with NO staged changes: abort
+
+expecting success of 2016.6 'git checkout -p HEAD with NO staged changes: apply': 
+		test_write_lines n y y | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 6 - git checkout -p HEAD with NO staged changes: apply
+
+expecting success of 2016.7 'git checkout -p HEAD with change already staged': 
+		set_state dir/foo index index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+ok 7 - git checkout -p HEAD with change already staged
+
+expecting success of 2016.8 'git checkout -p @ with NO staged changes: abort': 
+		set_and_save_state dir/foo work head &&
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_saved_state dir/foo &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 8 - git checkout -p @ with NO staged changes: abort
+
+expecting success of 2016.9 'git checkout -p @ with NO staged changes: apply': 
+		test_write_lines n y y | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+error: patch failed: dir/foo:1
+error: dir/foo: patch does not apply
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? The selected hunks do not apply to the index!
+ok 9 - git checkout -p @ with NO staged changes: apply
+
+expecting success of 2016.10 'git checkout -p @ with change already staged': 
+		set_state dir/foo index index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+ok 10 - git checkout -p @ with change already staged
+
+expecting success of 2016.11 'git checkout -p HEAD^...': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - git checkout -p HEAD^...
+
+expecting success of 2016.12 'git checkout -p HEAD^': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - git checkout -p HEAD^
+
+expecting success of 2016.13 'git checkout -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 13 - git checkout -p handles deletion
+
+expecting success of 2016.14 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: dir
+
+expecting success of 2016.15 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 15 - path limiting works: -- dir
+
+expecting success of 2016.16 'path limiting works: HEAD^ -- dir': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 16 - path limiting works: HEAD^ -- dir
+
+expecting success of 2016.17 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git checkout -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 17 - path limiting works: foo inside dir
+
+expecting success of 2016.18 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 18 - none of this moved HEAD
+
+expecting success of 2016.19 'empty tree can be handled': 
+	test_when_finished "git reset --hard" &&
+	git checkout -p $(test_oid empty_tree) --
+
+diff --git b/bar a/bar
+deleted file mode 100644
+index 8c999e6..0000000
+--- b/bar
++++ /dev/null
+@@ -1 +0,0 @@
+-bar_work
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+diff --git b/dir/foo a/dir/foo
+deleted file mode 100644
+index 564b12f..0000000
+--- b/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-head
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+HEAD is now at 3319288 second
+ok 19 - empty tree can be handled
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2025-checkout-no-overlay.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2025-checkout-no-overlay/.git/
 expecting success of 2025.1 'setup': 
@@ -93077,6 +93674,75 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2027-checkout-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2027-checkout-track/.git/
+expecting success of 2027.1 'setup': 
+	test_commit one &&
+	test_commit two
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
+
+expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
+	git checkout --track -b branch1 main &&
+	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+	test $(git config --get branch.branch1.remote) = . &&
+	test $(git config --get branch.branch1.merge) = refs/heads/main
+
+Switched to a new branch 'branch1'
+branch 'branch1' set up to track 'main'.
+ok 2 - checkout --track -b creates a new tracking branch
+
+expecting success of 2027.3 'checkout --track -b rejects an extra path argument': 
+	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
+	test_grep "cannot be used with updating paths" err
+
+fatal: '--track' cannot be used with updating paths
+ok 3 - checkout --track -b rejects an extra path argument
+
+expecting success of 2027.4 'checkout --track -b overrides autoSetupMerge=inherit': 
+	# Set up tracking config on main
+	test_config branch.main.remote origin &&
+	test_config branch.main.merge refs/heads/some-branch &&
+	test_config branch.autoSetupMerge inherit &&
+	# With --track=inherit, we copy the tracking config from main
+	git checkout --track=inherit -b b1 main &&
+	test_cmp_config origin branch.b1.remote &&
+	test_cmp_config refs/heads/some-branch branch.b1.merge &&
+	# With branch.autoSetupMerge=inherit, we do the same
+	git checkout -b b2 main &&
+	test_cmp_config origin branch.b2.remote &&
+	test_cmp_config refs/heads/some-branch branch.b2.merge &&
+	# But --track overrides this
+	git checkout --track -b b3 main &&
+	test_cmp_config . branch.b3.remote &&
+	test_cmp_config refs/heads/main branch.b3.merge &&
+	# And --track=direct does as well
+	git checkout --track=direct -b b4 main &&
+	test_cmp_config . branch.b4.remote &&
+	test_cmp_config refs/heads/main branch.b4.merge
+
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/some-branch'.
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/some-branch'.
+Switched to a new branch 'b3'
+branch 'b3' set up to track 'main'.
+Switched to a new branch 'b4'
+branch 'b4' set up to track 'main'.
+ok 4 - checkout --track -b overrides autoSetupMerge=inherit
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2020-checkout-detach.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2020-checkout-detach/.git/
 expecting success of 2020.1 'setup': 
@@ -93899,73 +94565,1665 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2027-checkout-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2027-checkout-track/.git/
-expecting success of 2027.1 'setup': 
-	test_commit one &&
-	test_commit two
+*** t2072-restore-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2072-restore-pathspec-file/.git/
+expecting success of 2072.1 'setup': 
+	test_commit file0 &&
 
-[main (root-commit) d79ce16] one
+	mkdir dir1 &&
+	echo 1 >dir1/file &&
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >dir1/file &&
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+
+[master (root-commit) ad2e047] file0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
+ create mode 100644 file0.t
+[master 17aa47d] files 1
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/file
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+[master 4c6d82b] files 2
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ok 1 - setup
+
+expecting success of 2072.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 2072.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 3 - --pathspec-from-file from file
+
+expecting success of 2072.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 4 - NUL delimiters
+
+expecting success of 2072.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 5 - LF delimiters
+
+expecting success of 2072.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 6 - no trailing delimiter
+
+expecting success of 2072.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 7 - CRLF delimiters
+
+expecting success of 2072.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 8 - quotes
+
+expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+
+HEAD is now at 4c6d82b files 2
+error: pathspec '"file\101.t"
+' did not match any file(s) known to git
+ok 9 - quotes not compatible with --pathspec-file-nul
+
+expecting success of 2072.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileB.t
+	 M fileC.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 10 - only touches what was listed
+
+expecting success of 2072.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+
+	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
+	test_grep -e "you must specify path(s) to restore" err
+
+HEAD is now at 4c6d82b files 2
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: you must specify path(s) to restore
+ok 11 - error conditions
+
+expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
+	restore_checkpoint &&
+
+	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	cat >expect <<-\EOF &&
+	 M dir1/file
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 12 - wildcard pathspec matches file in subdirectory
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2070-restore.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2070-restore/.git/
+expecting success of 2070.1 'setup': 
+	test_commit first &&
+	echo first-and-a-half >>first.t &&
+	git add first.t &&
+	test_commit second &&
+	echo one >one &&
+	echo two >two &&
+	echo untracked >untracked &&
+	echo ignored >ignored &&
+	echo /ignored >.gitignore &&
+	git add one two .gitignore &&
+	git update-ref refs/heads/one main
+
+[main (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
+ create mode 100644 first.t
+[main a46c920] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 second.t
 ok 1 - setup
 
-expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
-	git checkout --track -b branch1 main &&
-	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
-	test $(git config --get branch.branch1.remote) = . &&
-	test $(git config --get branch.branch1.merge) = refs/heads/main
+expecting success of 2070.2 'restore without pathspec is not ok': 
+	test_must_fail git restore &&
+	test_must_fail git restore --source=first
 
-Switched to a new branch 'branch1'
-branch 'branch1' set up to track 'main'.
-ok 2 - checkout --track -b creates a new tracking branch
+fatal: you must specify path(s) to restore
+fatal: you must specify path(s) to restore
+ok 2 - restore without pathspec is not ok
 
-expecting success of 2027.3 'checkout --track -b rejects an extra path argument': 
-	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
-	test_grep "cannot be used with updating paths" err
+expecting success of 2070.3 'restore a file, ignoring branch of same name': 
+	cat one >expected &&
+	echo dirty >>one &&
+	git restore one &&
+	test_cmp expected one
 
-fatal: '--track' cannot be used with updating paths
-ok 3 - checkout --track -b rejects an extra path argument
+ok 3 - restore a file, ignoring branch of same name
 
-expecting success of 2027.4 'checkout --track -b overrides autoSetupMerge=inherit': 
-	# Set up tracking config on main
-	test_config branch.main.remote origin &&
-	test_config branch.main.merge refs/heads/some-branch &&
+expecting success of 2070.4 'restore a file on worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first first.t &&
+	test_cmp expected first.t &&
+	git cat-file blob HEAD:./first.t >expected &&
+	git show :first.t >actual &&
+	test_cmp expected actual
+
+HEAD is now at a46c920 second
+ok 4 - restore a file on worktree from another ref
+
+expecting success of 2070.5 'restore a file in the index from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	git cat-file blob HEAD:./first.t >expected &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 5 - restore a file in the index from another ref
+
+expecting success of 2070.6 'restore a file in both the index and worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged --worktree first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 6 - restore a file in both the index and worktree from another ref
+
+expecting success of 2070.7 'restore --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git cat-file blob :./first.t >expected &&
+	echo index-dirty >>first.t &&
+	git add first.t &&
+	git restore --staged first.t &&
+	git cat-file blob :./first.t >actual &&
+	test_cmp expected actual
+
+HEAD is now at a46c920 second
+ok 7 - restore --staged uses HEAD as source
+
+expecting success of 2070.8 'restore --worktree --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git show HEAD:./first.t >expected &&
+	echo dirty >>first.t &&
+	git add first.t &&
+	git restore --worktree --staged first.t &&
+	git show :./first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 8 - restore --worktree --staged uses HEAD as source
+
+expecting success of 2070.9 'restore --ignore-unmerged ignores unmerged entries': 
+	git init unmerged &&
+	(
+		cd unmerged &&
+		echo one >unmerged &&
+		echo one >common &&
+		git add unmerged common &&
+		git commit -m common &&
+		git switch -c first &&
+		echo first >unmerged &&
+		git commit -am first &&
+		git switch -c second main &&
+		echo second >unmerged &&
+		git commit -am second &&
+		test_must_fail git merge first &&
+
+		echo dirty >>common &&
+		test_must_fail git restore . &&
+
+		git restore --ignore-unmerged --quiet . >output 2>&1 &&
+		git diff common >diff-output &&
+		test_must_be_empty output &&
+		test_must_be_empty diff-output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2070-restore/unmerged/.git/
+[main (root-commit) b83edd8] common
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 common
+ create mode 100644 unmerged
+Switched to a new branch 'first'
+[first 753ae86] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'second'
+[second 06de6fa] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging unmerged
+CONFLICT (content): Merge conflict in unmerged
+Automatic merge failed; fix conflicts and then commit the result.
+error: path 'unmerged' is unmerged
+ok 9 - restore --ignore-unmerged ignores unmerged entries
+
+expecting success of 2070.10 'restore --staged adds deleted intent-to-add file back to index': 
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git restore --staged nonempty empty &&
+	git diff --cached --exit-code
+
+[main 94e3084] create files to be deleted
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 empty
+ create mode 100644 nonempty
+rm 'empty'
+rm 'nonempty'
+ok 10 - restore --staged adds deleted intent-to-add file back to index
+
+expecting success of 2070.11 'restore --staged invalidates cache tree for deletions': 
+	test_when_finished git reset --hard &&
+	>new1 &&
+	>new2 &&
+	git add new1 new2 &&
+
+	# It is important to commit and then reset here, so that the index
+	# contains a valid cache-tree for the "both" tree.
+	git commit -m both &&
+	git reset --soft HEAD^ &&
+
+	git restore --staged new1 &&
+	git commit -m "just new2" &&
+	git rev-parse HEAD:new2 &&
+	test_must_fail git rev-parse HEAD:new1
+
+[main 19f4790] both
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new1
+ create mode 100644 new2
+[main 2c4724a] just new2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new2
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+fatal: path 'new1' exists on disk, but not in 'HEAD'
+HEAD:new1
+HEAD is now at 2c4724a just new2
+ok 11 - restore --staged invalidates cache tree for deletions
+
+expecting success of 2070.12 'restore --merge to unresolve': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 12 - restore --merge to unresolve
+
+expecting success of 2070.13 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git add file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 13 - restore --merge to unresolve after (mistaken) resolution
+
+expecting success of 2070.14 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	git rm -f file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+rm 'file'
+ok 14 - restore --merge to unresolve after (mistaken) resolution
+
+expecting success of 2070.15 'restore with merge options are incompatible with certain options': 
+	for opts in \
+		"--staged --ours" \
+		"--staged --theirs" \
+		"--staged --merge" \
+		"--source=HEAD --ours" \
+		"--source=HEAD --theirs" \
+		"--source=HEAD --merge" \
+		"--staged --conflict=diff3" \
+		"--staged --worktree --ours" \
+		"--staged --worktree --theirs" \
+		"--staged --worktree --merge" \
+		"--staged --worktree --conflict=zdiff3"
+	do
+		test_must_fail git restore $opts . 2>err &&
+		grep "cannot be used" err || return
+	done
+
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+ok 15 - restore with merge options are incompatible with certain options
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2060-switch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch/.git/
+expecting success of 2060.1 'setup': 
+	test_commit first &&
+	git branch first-branch &&
+	test_commit second &&
+	test_commit third &&
+	git remote add origin nohost:/nopath &&
+	git update-ref refs/remotes/origin/foo first-branch
+
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[main d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[main cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+ok 1 - setup
+
+expecting success of 2060.2 'switch branch no arguments': 
+	test_must_fail git switch
+
+fatal: missing branch or commit argument
+ok 2 - switch branch no arguments
+
+expecting success of 2060.3 'switch branch': 
+	git switch first-branch &&
+	test_path_is_missing second.t
+
+Switched to branch 'first-branch'
+ok 3 - switch branch
+
+expecting success of 2060.4 'switch and detach': 
+	test_when_finished git switch main &&
+	test_must_fail git switch main^{commit} &&
+	git switch --detach main^{commit} &&
+	test_must_fail git symbolic-ref HEAD
+
+fatal: a branch is expected, got commit 'main^{commit}'
+hint: If you want to detach HEAD at the commit, try again with the --detach option.
+HEAD is now at cd7036d third
+fatal: ref HEAD is not a symbolic ref
+Switched to branch 'main'
+ok 4 - switch and detach
+
+expecting success of 2060.5 'suggestion to detach': 
+	test_must_fail git switch main^{commit} 2>stderr &&
+	grep "try again with the --detach option" stderr
+
+hint: If you want to detach HEAD at the commit, try again with the --detach option.
+ok 5 - suggestion to detach
+
+expecting success of 2060.6 'suggestion to detach is suppressed with advice.suggestDetachingHead=false': 
+	test_config advice.suggestDetachingHead false &&
+	test_must_fail git switch main^{commit} 2>stderr &&
+	! grep "try again with the --detach option" stderr
+
+ok 6 - suggestion to detach is suppressed with advice.suggestDetachingHead=false
+
+expecting success of 2060.7 'switch and detach current branch': 
+	test_when_finished git switch main &&
+	git switch main &&
+	git switch --detach &&
+	test_must_fail git symbolic-ref HEAD
+
+Already on 'main'
+HEAD is now at cd7036d third
+fatal: ref HEAD is not a symbolic ref
+Switched to branch 'main'
+ok 7 - switch and detach current branch
+
+expecting success of 2060.8 'switch and create branch': 
+	test_when_finished git switch main &&
+	git switch -c temp main^ &&
+	test_cmp_rev main^ refs/heads/temp &&
+	echo refs/heads/temp >expected-branch &&
+	git symbolic-ref HEAD >actual-branch &&
+	test_cmp expected-branch actual-branch
+
+Switched to a new branch 'temp'
+Switched to branch 'main'
+ok 8 - switch and create branch
+
+expecting success of 2060.9 'force create branch from HEAD': 
+	test_when_finished git switch main &&
+	git switch --detach main &&
+	test_must_fail git switch -c temp &&
+	git switch -C temp &&
+	test_cmp_rev main refs/heads/temp &&
+	echo refs/heads/temp >expected-branch &&
+	git symbolic-ref HEAD >actual-branch &&
+	test_cmp expected-branch actual-branch
+
+HEAD is now at cd7036d third
+fatal: a branch named 'temp' already exists
+Switched to and reset branch 'temp'
+Switched to branch 'main'
+ok 9 - force create branch from HEAD
+
+expecting success of 2060.10 'new orphan branch from empty': 
+	test_when_finished git switch main &&
+	test_must_fail git switch --orphan new-orphan HEAD &&
+	git switch --orphan new-orphan &&
+	test_commit orphan &&
+	git cat-file commit refs/heads/new-orphan >commit &&
+	! grep ^parent commit &&
+	git ls-files >tracked-files &&
+	echo orphan.t >expected &&
+	test_cmp expected tracked-files
+
+fatal: '--orphan' cannot take <start-point>
+Switched to a new branch 'new-orphan'
+[new-orphan (root-commit) 11bb70e] orphan
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 orphan.t
+Switched to branch 'main'
+ok 10 - new orphan branch from empty
+
+expecting success of 2060.11 'orphan branch works with --discard-changes': 
+	test_when_finished git switch main &&
+	echo foo >foo.txt &&
+	git switch --discard-changes --orphan new-orphan2 &&
+	git ls-files >tracked-files &&
+	test_must_be_empty tracked-files
+
+Switched to a new branch 'new-orphan2'
+Switched to branch 'main'
+ok 11 - orphan branch works with --discard-changes
+
+expecting success of 2060.12 'switching ignores file of same branch name': 
+	test_when_finished git switch main &&
+	: >first-branch &&
+	git switch first-branch &&
+	echo refs/heads/first-branch >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+Switched to branch 'first-branch'
+Switched to branch 'main'
+ok 12 - switching ignores file of same branch name
+
+expecting success of 2060.13 'guess and create branch': 
+	test_when_finished git switch main &&
+	test_must_fail git switch --no-guess foo &&
+	test_config checkout.guess false &&
+	test_must_fail git switch foo &&
+	test_config checkout.guess true &&
+	git switch foo &&
+	echo refs/heads/foo >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
+
+fatal: invalid reference: foo
+fatal: invalid reference: foo
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'origin/foo'.
+Switched to branch 'main'
+ok 13 - guess and create branch
+
+expecting success of 2060.14 'not switching when something is in progress': 
+	test_when_finished rm -f .git/MERGE_HEAD &&
+	# fake a merge-in-progress
+	cp .git/HEAD .git/MERGE_HEAD &&
+	test_must_fail git switch -d @^
+
+fatal: cannot switch branch while merging
+Consider "git merge --quit" or "git worktree add".
+ok 14 - not switching when something is in progress
+
+expecting success of 2060.15 'tracking info copied with autoSetupMerge=inherit': 
+	# default config does not copy tracking info
+	git switch -c foo-no-inherit foo &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with --track=inherit, we copy tracking info from foo
+	git switch --track=inherit -c foo2 foo &&
+	test_cmp_config origin branch.foo2.remote &&
+	test_cmp_config refs/heads/foo branch.foo2.merge &&
+	# with autoSetupMerge=inherit, we do the same
 	test_config branch.autoSetupMerge inherit &&
-	# With --track=inherit, we copy the tracking config from main
-	git checkout --track=inherit -b b1 main &&
-	test_cmp_config origin branch.b1.remote &&
-	test_cmp_config refs/heads/some-branch branch.b1.merge &&
-	# With branch.autoSetupMerge=inherit, we do the same
-	git checkout -b b2 main &&
-	test_cmp_config origin branch.b2.remote &&
-	test_cmp_config refs/heads/some-branch branch.b2.merge &&
-	# But --track overrides this
-	git checkout --track -b b3 main &&
-	test_cmp_config . branch.b3.remote &&
-	test_cmp_config refs/heads/main branch.b3.merge &&
-	# And --track=direct does as well
-	git checkout --track=direct -b b4 main &&
-	test_cmp_config . branch.b4.remote &&
-	test_cmp_config refs/heads/main branch.b4.merge
+	git switch -c foo3 foo &&
+	test_cmp_config origin branch.foo3.remote &&
+	test_cmp_config refs/heads/foo branch.foo3.merge &&
+	# with --track, we override autoSetupMerge
+	git switch --track -c foo4 foo &&
+	test_cmp_config . branch.foo4.remote &&
+	test_cmp_config refs/heads/foo branch.foo4.merge &&
+	# and --track=direct does as well
+	git switch --track=direct -c foo5 foo &&
+	test_cmp_config . branch.foo5.remote &&
+	test_cmp_config refs/heads/foo branch.foo5.merge &&
+	# no tracking info to inherit from main
+	git switch -c main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
 
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/some-branch'.
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/some-branch'.
-Switched to a new branch 'b3'
-branch 'b3' set up to track 'main'.
-Switched to a new branch 'b4'
-branch 'b4' set up to track 'main'.
-ok 4 - checkout --track -b overrides autoSetupMerge=inherit
+Switched to a new branch 'foo-no-inherit'
+Switched to a new branch 'foo2'
+branch 'foo2' set up to track 'origin/foo'.
+Switched to a new branch 'foo3'
+branch 'foo3' set up to track 'origin/foo'.
+Switched to a new branch 'foo4'
+branch 'foo4' set up to track 'foo'.
+Switched to a new branch 'foo5'
+branch 'foo5' set up to track 'foo'.
+warning: asked to inherit tracking from 'main', but no remote is set
+Switched to a new branch 'main2'
+ok 15 - tracking info copied with autoSetupMerge=inherit
 
-# passed all 4 test(s)
-1..4
+expecting success of 2060.16 'switch back when temporarily detached and checked out elsewhere ': 
+	test_when_finished "
+		git worktree remove wt1 ||:
+		git worktree remove wt2 ||:
+		git checkout - ||:
+		git branch -D shared ||:
+	" &&
+	git checkout -b shared &&
+	test_commit shared-first &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	test_commit shared-second &&
+	test_commit shared-third &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	git worktree add wt1 -f shared &&
+	git -C wt1 bisect start &&
+	git -C wt1 bisect good $HASH1 &&
+	git -C wt1 bisect bad $HASH2 &&
+	git worktree add wt2 -f shared &&
+	git -C wt2 bisect start &&
+	git -C wt2 bisect good $HASH1 &&
+	git -C wt2 bisect bad $HASH2 &&
+	# we test in both worktrees to ensure that works
+	# as expected with "first" and "next" worktrees
+	test_must_fail git -C wt1 switch shared &&
+	test_must_fail git -C wt1 switch -C shared &&
+	git -C wt1 switch --ignore-other-worktrees shared &&
+	test_must_fail git -C wt2 switch shared &&
+	test_must_fail git -C wt2 switch -C shared &&
+	git -C wt2 switch --ignore-other-worktrees shared
+
+Switched to a new branch 'shared'
+[shared 814c97a] shared-first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-first.t
+[shared 7162996] shared-second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-second.t
+[shared 90dda28] shared-third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-third.t
+Preparing worktree (checking out 'shared')
+HEAD is now at 90dda28 shared-third
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[716299614285626473e2ba3b8caf8b7633592842] shared-second
+Preparing worktree (checking out 'shared')
+HEAD is now at 90dda28 shared-third
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[716299614285626473e2ba3b8caf8b7633592842] shared-second
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+Previous HEAD position was 7162996 shared-second
+Switched to branch 'shared'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
+warning: you are switching branch while bisecting
+Previous HEAD position was 7162996 shared-second
+Switched to branch 'shared'
+Switched to branch 'main2'
+Deleted branch shared (was 90dda28).
+ok 16 - switch back when temporarily detached and checked out elsewhere 
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2024-checkout-dwim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/.git/
+expecting success of 2024.1 'setup': 
+	test_commit my_main &&
+	git init repo_a &&
+	(
+		cd repo_a &&
+		test_commit a_main &&
+		git checkout -b foo &&
+		test_commit a_foo &&
+		git checkout -b bar &&
+		test_commit a_bar &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit a_ambiguous_branch_and_file
+	) &&
+	git init repo_b &&
+	(
+		cd repo_b &&
+		test_commit b_main &&
+		git checkout -b foo &&
+		test_commit b_foo &&
+		git checkout -b baz &&
+		test_commit b_baz &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit b_ambiguous_branch_and_file
+	) &&
+	git remote add repo_a repo_a &&
+	git remote add repo_b repo_b &&
+	git config remote.repo_b.fetch \
+		"+refs/heads/*:refs/remotes/other_b/*" &&
+	git fetch --all
+
+[master (root-commit) 476f86c] my_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 my_main.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_a/.git/
+[master (root-commit) d6d6851] a_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_main.t
+Switched to a new branch 'foo'
+[foo e2c25ec] a_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_foo.t
+Switched to a new branch 'bar'
+[bar bfd2f16] a_bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_bar.t
+Switched to a new branch 'ambiguous_branch_and_file'
+[ambiguous_branch_and_file 225901c] a_ambiguous_branch_and_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a_ambiguous_branch_and_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_b/.git/
+[master (root-commit) 272258e] b_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_main.t
+Switched to a new branch 'foo'
+[foo 7eb022a] b_foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_foo.t
+Switched to a new branch 'baz'
+[baz 8ac57c7] b_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_baz.t
+Switched to a new branch 'ambiguous_branch_and_file'
+[ambiguous_branch_and_file 1b5c299] b_ambiguous_branch_and_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b_ambiguous_branch_and_file.t
+Fetching repo_a
+From repo_a
+ * [new branch]      ambiguous_branch_and_file   -> repo_a/ambiguous_branch_and_file
+ * [new branch]      bar                         -> repo_a/bar
+ * [new branch]      foo                         -> repo_a/foo
+ * [new branch]      master                      -> repo_a/master
+ * [new tag]         a_ambiguous_branch_and_file -> a_ambiguous_branch_and_file
+ * [new tag]         a_bar                       -> a_bar
+ * [new tag]         a_foo                       -> a_foo
+ * [new tag]         a_main                      -> a_main
+Fetching repo_b
+From repo_b
+ * [new branch]      ambiguous_branch_and_file   -> other_b/ambiguous_branch_and_file
+ * [new branch]      baz                         -> other_b/baz
+ * [new branch]      foo                         -> other_b/foo
+ * [new branch]      master                      -> other_b/master
+ * [new tag]         b_ambiguous_branch_and_file -> b_ambiguous_branch_and_file
+ * [new tag]         b_baz                       -> b_baz
+ * [new tag]         b_foo                       -> b_foo
+ * [new tag]         b_main                      -> b_main
+ok 1 - setup
+
+expecting success of 2024.2 'checkout of non-existing branch fails': 
+	git checkout -B main &&
+	test_might_fail git branch -D xyzzy &&
+
+	test_must_fail git checkout xyzzy &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
+	test_branch main
+
+Switched to a new branch 'main'
+error: branch 'xyzzy' not found
+error: pathspec 'xyzzy' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 2 - checkout of non-existing branch fails
+
+expecting success of 2024.3 'checkout of branch from multiple remotes fails #1': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
+
+	test_must_fail git checkout foo &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/foo &&
+	test_branch main
+
+Reset branch 'main'
+error: branch 'foo' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'foo' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 3 - checkout of branch from multiple remotes fails #1
+
+expecting success of 2024.4 'when arg matches multiple remotes, do not fallback to interpreting as pathspec': 
+	# create a file with name matching remote branch name
+	git checkout -b t_ambiguous_branch_and_file &&
+	>ambiguous_branch_and_file &&
+	git add ambiguous_branch_and_file &&
+	git commit -m "ambiguous_branch_and_file" &&
+
+	# modify file to verify that it will not be touched by checkout
+	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
+	echo "file contents" >ambiguous_branch_and_file &&
+	cp ambiguous_branch_and_file expect &&
+
+	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
+
+	test_grep "matched multiple (2) remote tracking branches" err &&
+
+	# file must not be altered
+	test_cmp expect ambiguous_branch_and_file
+
+Switched to a new branch 't_ambiguous_branch_and_file'
+[t_ambiguous_branch_and_file 8830e76] ambiguous_branch_and_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 ambiguous_branch_and_file
+fatal: 'ambiguous_branch_and_file' matched multiple (2) remote tracking branches
+ok 4 - when arg matches multiple remotes, do not fallback to interpreting as pathspec
+
+expecting success of 2024.5 'checkout of branch from multiple remotes fails with advice': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
+	test_must_fail git checkout foo 2>stderr &&
+	test_branch main &&
+	status_uno_is_clean &&
+	test_grep "^hint: " stderr &&
+	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
+		checkout foo 2>stderr &&
+	test_branch main &&
+	status_uno_is_clean &&
+	test_grep ! "^hint: " stderr
+
+Switched to and reset branch 'main'
+error: branch 'foo' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:     git checkout --track origin/<name>
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+ok 5 - checkout of branch from multiple remotes fails with advice
+
+expecting success of 2024.6 'checkout -p with multiple remotes does not print advice': 
+	git checkout -B main &&
+	test_might_fail git branch -D foo &&
+
+	git checkout -p foo 2>stderr &&
+	test_grep ! "^hint: " stderr &&
+	status_uno_is_clean
+
+Reset branch 'main'
+error: branch 'foo' not found
+No changes.
+ok 6 - checkout -p with multiple remotes does not print advice
+
+expecting success of 2024.7 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D foo &&
+
+	git -c checkout.defaultRemote=repo_a checkout foo &&
+	status_uno_is_clean &&
+	test_branch foo &&
+	test_cmp_rev remotes/repo_a/foo HEAD &&
+	test_branch_upstream foo repo_a foo
+
+Reset branch 'main'
+error: branch 'foo' not found
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'repo_a/foo'.
+ok 7 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
+
+expecting success of 2024.8 'checkout of branch from a single remote succeeds #1': 
+	git checkout -B main &&
+	test_might_fail git branch -D bar &&
+
+	git checkout bar &&
+	status_uno_is_clean &&
+	test_branch bar &&
+	test_cmp_rev remotes/repo_a/bar HEAD &&
+	test_branch_upstream bar repo_a bar
+
+Switched to and reset branch 'main'
+error: branch 'bar' not found
+Switched to a new branch 'bar'
+branch 'bar' set up to track 'repo_a/bar'.
+ok 8 - checkout of branch from a single remote succeeds #1
+
+expecting success of 2024.9 'checkout of branch from a single remote succeeds #2': 
+	git checkout -B main &&
+	test_might_fail git branch -D baz &&
+
+	git checkout baz &&
+	status_uno_is_clean &&
+	test_branch baz &&
+	test_cmp_rev remotes/other_b/baz HEAD &&
+	test_branch_upstream baz repo_b baz
+
+Switched to and reset branch 'main'
+error: branch 'baz' not found
+Switched to a new branch 'baz'
+branch 'baz' set up to track 'repo_b/baz'.
+ok 9 - checkout of branch from a single remote succeeds #2
+
+expecting success of 2024.10 '--no-guess suppresses branch auto-vivification': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
+
+	test_must_fail git checkout --no-guess bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
+
+Switched to and reset branch 'main'
+Deleted branch bar (was bfd2f16).
+error: pathspec 'bar' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 10 - --no-guess suppresses branch auto-vivification
+
+expecting success of 2024.11 'checkout.guess = false suppresses branch auto-vivification': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
+
+	test_config checkout.guess false &&
+	test_must_fail git checkout bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
+
+Reset branch 'main'
+error: branch 'bar' not found
+error: pathspec 'bar' did not match any file(s) known to git
+fatal: Needed a single revision
+ok 11 - checkout.guess = false suppresses branch auto-vivification
+
+expecting success of 2024.12 'setup more remotes with unconventional refspecs': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	git init repo_c &&
+	(
+		cd repo_c &&
+		test_commit c_main &&
+		git checkout -b bar &&
+		test_commit c_bar &&
+		git checkout -b spam &&
+		test_commit c_spam
+	) &&
+	git init repo_d &&
+	(
+		cd repo_d &&
+		test_commit d_main &&
+		git checkout -b baz &&
+		test_commit d_baz &&
+		git checkout -b eggs &&
+		test_commit d_eggs
+	) &&
+	git remote add repo_c repo_c &&
+	git config remote.repo_c.fetch \
+		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
+	git remote add repo_d repo_d &&
+	git config remote.repo_d.fetch \
+		"+refs/heads/*:refs/repo_d/*" &&
+	git fetch --all
+
+Reset branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_c/.git/
+[master (root-commit) cdfe1c8] c_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_main.t
+Switched to a new branch 'bar'
+[bar b017b41] c_bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_bar.t
+Switched to a new branch 'spam'
+[spam 449823f] c_spam
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c_spam.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_d/.git/
+[master (root-commit) b0e85f1] d_main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_main.t
+Switched to a new branch 'baz'
+[baz b83c7c6] d_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_baz.t
+Switched to a new branch 'eggs'
+[eggs e1ffd37] d_eggs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d_eggs.t
+Fetching repo_a
+Fetching repo_b
+Fetching repo_c
+From repo_c
+ * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
+ * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
+ * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
+ * [new tag]         c_bar      -> c_bar
+ * [new tag]         c_main     -> c_main
+ * [new tag]         c_spam     -> c_spam
+Fetching repo_d
+From repo_d
+ * [new branch]      baz        -> refs/repo_d/baz
+ * [new branch]      eggs       -> refs/repo_d/eggs
+ * [new branch]      master     -> refs/repo_d/master
+ * [new tag]         d_baz      -> d_baz
+ * [new tag]         d_eggs     -> d_eggs
+ * [new tag]         d_main     -> d_main
+ok 12 - setup more remotes with unconventional refspecs
+
+expecting success of 2024.13 'checkout of branch from multiple remotes fails #2': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
+
+	test_must_fail git checkout bar &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
+
+Reset branch 'main'
+error: branch 'bar' not found
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'bar' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 13 - checkout of branch from multiple remotes fails #2
+
+expecting success of 2024.14 'checkout of branch from multiple remotes fails #3': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D baz &&
+
+	test_must_fail git checkout baz &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/baz &&
+	test_branch main
+
+Reset branch 'main'
+Deleted branch baz (was 8ac57c7).
+hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
+hint: you can do so by fully qualifying the name with the --track option:
+hint:
+hint:     git checkout --track origin/<name>
+hint:
+hint: If you'd like to always have checkouts of an ambiguous <name> prefer
+hint: one remote, e.g. the 'origin' remote, consider setting
+hint: checkout.defaultRemote=origin in your config.
+fatal: 'baz' matched multiple (2) remote tracking branches
+fatal: Needed a single revision
+ok 14 - checkout of branch from multiple remotes fails #3
+
+expecting success of 2024.15 'checkout of branch from a single remote succeeds #3': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
+
+	git checkout spam &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
+
+Reset branch 'main'
+error: branch 'spam' not found
+Switched to a new branch 'spam'
+branch 'spam' set up to track 'repo_c/spam'.
+ok 15 - checkout of branch from a single remote succeeds #3
+
+expecting success of 2024.16 'checkout of branch from a single remote succeeds #4': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D eggs &&
+
+	git checkout eggs &&
+	status_uno_is_clean &&
+	test_branch eggs &&
+	test_cmp_rev refs/repo_d/eggs HEAD &&
+	test_branch_upstream eggs repo_d eggs
+
+Switched to and reset branch 'main'
+error: branch 'eggs' not found
+Switched to a new branch 'eggs'
+branch 'eggs' set up to track 'repo_d/eggs'.
+ok 16 - checkout of branch from a single remote succeeds #4
+
+expecting success of 2024.17 'checkout of branch with a file having the same name fails': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
+
+	>spam &&
+	test_must_fail git checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch main
+
+Switched to and reset branch 'main'
+Deleted branch spam (was 449823f).
+fatal: 'spam' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: Needed a single revision
+ok 17 - checkout of branch with a file having the same name fails
+
+expecting success of 2024.18 'checkout of branch with a file in subdir having the same name fails': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
+
+	>spam &&
+	mkdir sub &&
+	mv spam sub/spam &&
+	test_must_fail git -C sub checkout spam &&
+	status_uno_is_clean &&
+	test_must_fail git rev-parse --verify refs/heads/spam &&
+	test_branch main
+
+Reset branch 'main'
+error: branch 'spam' not found
+fatal: 'spam' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: Needed a single revision
+ok 18 - checkout of branch with a file in subdir having the same name fails
+
+expecting success of 2024.19 'checkout <branch> -- succeeds, even if a file with the same name exists': 
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D spam &&
+
+	>spam &&
+	git checkout spam -- &&
+	status_uno_is_clean &&
+	test_branch spam &&
+	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
+	test_branch_upstream spam repo_c spam
+
+Reset branch 'main'
+error: branch 'spam' not found
+Switched to a new branch 'spam'
+branch 'spam' set up to track 'repo_c/spam'.
+ok 19 - checkout <branch> -- succeeds, even if a file with the same name exists
+
+expecting success of 2024.20 'loosely defined local base branch is reported correctly': 
+
+	git checkout main &&
+	status_uno_is_clean &&
+	git branch strict &&
+	git branch loose &&
+	git commit --allow-empty -m "a bit more" &&
+
+	test_config branch.strict.remote . &&
+	test_config branch.loose.remote . &&
+	test_config branch.strict.merge refs/heads/main &&
+	test_config branch.loose.merge main &&
+
+	git checkout strict >expect.raw 2>&1 &&
+	sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
+	status_uno_is_clean &&
+	git checkout loose >actual.raw 2>&1 &&
+	sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
+	status_uno_is_clean &&
+	grep BRANCHNAME actual &&
+
+	test_cmp expect actual
+
+Switched to branch 'main'
+[main 0b0f2ce] a bit more
+ Author: A U Thor <author@example.com>
+Switched to branch 'BRANCHNAME'
+ok 20 - loosely defined local base branch is reported correctly
+
+expecting success of 2024.21 'reject when arg could be part of dwim branch': 
+	git remote add foo file://non-existent-place &&
+	git update-ref refs/remotes/foo/dwim-arg HEAD &&
+	echo foo >dwim-arg &&
+	git add dwim-arg &&
+	echo bar >dwim-arg &&
+	test_must_fail git checkout dwim-arg &&
+	test_must_fail git rev-parse refs/heads/dwim-arg -- &&
+	grep bar dwim-arg
+
+fatal: 'dwim-arg' could be both a local file and a tracking branch.
+Please use -- (and optionally --no-guess) to disambiguate
+fatal: bad revision 'refs/heads/dwim-arg'
+bar
+ok 21 - reject when arg could be part of dwim branch
+
+expecting success of 2024.22 'disambiguate dwim branch and checkout path (1)': 
+	git update-ref refs/remotes/foo/dwim-arg1 HEAD &&
+	echo foo >dwim-arg1 &&
+	git add dwim-arg1 &&
+	echo bar >dwim-arg1 &&
+	git checkout -- dwim-arg1 &&
+	test_must_fail git rev-parse refs/heads/dwim-arg1 -- &&
+	grep foo dwim-arg1
+
+fatal: bad revision 'refs/heads/dwim-arg1'
+foo
+ok 22 - disambiguate dwim branch and checkout path (1)
+
+expecting success of 2024.23 'disambiguate dwim branch and checkout path (2)': 
+	git update-ref refs/remotes/foo/dwim-arg2 HEAD &&
+	echo foo >dwim-arg2 &&
+	git add dwim-arg2 &&
+	echo bar >dwim-arg2 &&
+	git checkout dwim-arg2 -- &&
+	git rev-parse refs/heads/dwim-arg2 -- &&
+	grep bar dwim-arg2
+
+Switched to a new branch 'dwim-arg2'
+A	dwim-arg
+A	dwim-arg1
+A	dwim-arg2
+branch 'dwim-arg2' set up to track 'foo/dwim-arg2'.
+e1ffd376e093970186efb2074ec16dcb57d23789
+--
+bar
+ok 23 - disambiguate dwim branch and checkout path (2)
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2071-restore-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2071-restore-patch/.git/
+expecting success of 2071.1 'setup': 
+	mkdir dir &&
+	echo parent >dir/foo &&
+	echo dummy >bar &&
+	git add bar dir/foo &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 758b165] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 3319288] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2071.2 'restore -p without pathspec is fine': 
+	echo q >cmd &&
+	git restore -p <cmd
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 2 - restore -p without pathspec is fine
+
+expecting success of 2071.3 'saying "n" does nothing': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n n | git restore -p &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 3 - saying "n" does nothing
+
+expecting success of 2071.4 'git restore -p': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 4 - git restore -p
+
+expecting success of 2071.5 'git restore -p with staged changes': 
+	set_state dir/foo work index &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 5 - git restore -p with staged changes
+
+expecting success of 2071.6 'git restore -p --source=HEAD': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 6 - git restore -p --source=HEAD
+
+expecting success of 2071.7 'git restore -p --source=@': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 7 - git restore -p --source=@
+
+expecting success of 2071.8 'git restore -p --source=HEAD^': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 8 - git restore -p --source=HEAD^
+
+expecting success of 2071.9 'git restore -p --source=HEAD^...': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 9 - git restore -p --source=HEAD^...
+
+expecting success of 2071.10 'git restore -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 10 - git restore -p handles deletion
+
+expecting success of 2071.11 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - path limiting works: dir
+
+expecting success of 2071.12 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - path limiting works: -- dir
+
+expecting success of 2071.13 'path limiting works: HEAD^ -- dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent head
+
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 13 - path limiting works: HEAD^ -- dir
+
+expecting success of 2071.14 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git restore -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: foo inside dir
+
+expecting success of 2071.15 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 15 - none of this moved HEAD
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1701-racy-split-index.sh ***
@@ -94840,2025 +97098,197 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2024-checkout-dwim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/.git/
-expecting success of 2024.1 'setup': 
-	test_commit my_main &&
-	git init repo_a &&
-	(
-		cd repo_a &&
-		test_commit a_main &&
-		git checkout -b foo &&
-		test_commit a_foo &&
-		git checkout -b bar &&
-		test_commit a_bar &&
-		git checkout -b ambiguous_branch_and_file &&
-		test_commit a_ambiguous_branch_and_file
-	) &&
-	git init repo_b &&
-	(
-		cd repo_b &&
-		test_commit b_main &&
-		git checkout -b foo &&
-		test_commit b_foo &&
-		git checkout -b baz &&
-		test_commit b_baz &&
-		git checkout -b ambiguous_branch_and_file &&
-		test_commit b_ambiguous_branch_and_file
-	) &&
-	git remote add repo_a repo_a &&
-	git remote add repo_b repo_b &&
-	git config remote.repo_b.fetch \
-		"+refs/heads/*:refs/remotes/other_b/*" &&
-	git fetch --all
+*** t2081-parallel-checkout-collisions.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2081-parallel-checkout-collisions/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
 
-[master (root-commit) 476f86c] my_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 my_main.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_a/.git/
-[master (root-commit) d6d6851] a_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_main.t
-Switched to a new branch 'foo'
-[foo e2c25ec] a_foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_foo.t
-Switched to a new branch 'bar'
-[bar bfd2f16] a_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_bar.t
-Switched to a new branch 'ambiguous_branch_and_file'
-[ambiguous_branch_and_file 225901c] a_ambiguous_branch_and_file
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
+
+ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
+
+ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 4 # skip do not follow symlinks colliding with leading dir (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+ok 5 # skip collision report on clone (w/ racy file creation) (missing CASE_INSENSITIVE_FS)
+
+ok 6 # skip collision report on clone (w/ colliding peer after the detected entry) (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,!MINGW,!CYGWIN)
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2030-unresolve-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2030-unresolve-info/.git/
+expecting success of 2030.1 'setup': 
+	mkdir fi &&
+	printf "a\0a" >binary &&
+	git add binary &&
+	test_commit initial fi/le first &&
+	git branch side &&
+	git branch another &&
+	printf "a\0b" >binary &&
+	git add binary &&
+	test_commit second fi/le second &&
+	git checkout side &&
+	test_commit third fi/le third &&
+	git branch add-add &&
+	git checkout another &&
+	test_commit fourth fi/le fourth &&
+	git checkout add-add &&
+	test_commit fifth add-differently &&
+	git checkout main
+
+[main (root-commit) 7b271e3] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a_ambiguous_branch_and_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_b/.git/
-[master (root-commit) 272258e] b_main
+ 2 files changed, 1 insertion(+)
+ create mode 100644 binary
+ create mode 100644 fi/le
+[main 9a00f99] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_main.t
-Switched to a new branch 'foo'
-[foo 7eb022a] b_foo
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side b18340d] third
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_foo.t
-Switched to a new branch 'baz'
-[baz 8ac57c7] b_baz
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'another'
+[another cf4d985] fourth
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b_baz.t
-Switched to a new branch 'ambiguous_branch_and_file'
-[ambiguous_branch_and_file 1b5c299] b_ambiguous_branch_and_file
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'add-add'
+[add-add b851e77] fifth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b_ambiguous_branch_and_file.t
-Fetching repo_a
-From repo_a
- * [new branch]      ambiguous_branch_and_file   -> repo_a/ambiguous_branch_and_file
- * [new branch]      bar                         -> repo_a/bar
- * [new branch]      foo                         -> repo_a/foo
- * [new branch]      master                      -> repo_a/master
- * [new tag]         a_ambiguous_branch_and_file -> a_ambiguous_branch_and_file
- * [new tag]         a_bar                       -> a_bar
- * [new tag]         a_foo                       -> a_foo
- * [new tag]         a_main                      -> a_main
-Fetching repo_b
-From repo_b
- * [new branch]      ambiguous_branch_and_file   -> other_b/ambiguous_branch_and_file
- * [new branch]      baz                         -> other_b/baz
- * [new branch]      foo                         -> other_b/foo
- * [new branch]      master                      -> other_b/master
- * [new tag]         b_ambiguous_branch_and_file -> b_ambiguous_branch_and_file
- * [new tag]         b_baz                       -> b_baz
- * [new tag]         b_foo                       -> b_foo
- * [new tag]         b_main                      -> b_main
+ create mode 100644 add-differently
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 2024.2 'checkout of non-existing branch fails': 
-	git checkout -B main &&
-	test_might_fail git branch -D xyzzy &&
-
-	test_must_fail git checkout xyzzy &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
-	test_branch main
+expecting success of 2030.2 'add records switch clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	git checkout second^0 &&
+	echo switching clears &&
+	check_resolve_undo cleared
 
-Switched to a new branch 'main'
-error: branch 'xyzzy' not found
-error: pathspec 'xyzzy' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 2 - checkout of non-existing branch fails
+HEAD is now at 9a00f99 second
+Note: switching to 'second^0'.
 
-expecting success of 2024.3 'checkout of branch from multiple remotes fails #1': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	test_must_fail git checkout foo &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/foo &&
-	test_branch main
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Reset branch 'main'
-error: branch 'foo' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'foo' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 3 - checkout of branch from multiple remotes fails #1
+  git switch -c <new-branch-name>
 
-expecting success of 2024.4 'when arg matches multiple remotes, do not fallback to interpreting as pathspec': 
-	# create a file with name matching remote branch name
-	git checkout -b t_ambiguous_branch_and_file &&
-	>ambiguous_branch_and_file &&
-	git add ambiguous_branch_and_file &&
-	git commit -m "ambiguous_branch_and_file" &&
+Or undo this operation with:
 
-	# modify file to verify that it will not be touched by checkout
-	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
-	echo "file contents" >ambiguous_branch_and_file &&
-	cp ambiguous_branch_and_file expect &&
+  git switch -
 
-	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	test_grep "matched multiple (2) remote tracking branches" err &&
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD b3a51df] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	# file must not be altered
-	test_cmp expect ambiguous_branch_and_file
+  b3a51df merged
 
-Switched to a new branch 't_ambiguous_branch_and_file'
-[t_ambiguous_branch_and_file 8830e76] ambiguous_branch_and_file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 ambiguous_branch_and_file
-fatal: 'ambiguous_branch_and_file' matched multiple (2) remote tracking branches
-ok 4 - when arg matches multiple remotes, do not fallback to interpreting as pathspec
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 2024.5 'checkout of branch from multiple remotes fails with advice': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
-	test_must_fail git checkout foo 2>stderr &&
-	test_branch main &&
-	status_uno_is_clean &&
-	test_grep "^hint: " stderr &&
-	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
-		checkout foo 2>stderr &&
-	test_branch main &&
-	status_uno_is_clean &&
-	test_grep ! "^hint: " stderr
+ git branch <new-branch-name> b3a51df
 
-Switched to and reset branch 'main'
-error: branch 'foo' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:     git checkout --track origin/<name>
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-ok 5 - checkout of branch from multiple remotes fails with advice
+HEAD is now at 9a00f99 second
+switching clears
+ok 2 - add records switch clears
 
-expecting success of 2024.6 'checkout -p with multiple remotes does not print advice': 
-	git checkout -B main &&
-	test_might_fail git branch -D foo &&
+expecting success of 2030.3 'rm records reset clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
-	git checkout -p foo 2>stderr &&
-	test_grep ! "^hint: " stderr &&
-	status_uno_is_clean
+	echo merge clears upfront &&
+	test_must_fail git merge fourth^0 &&
+	check_resolve_undo nuked &&
 
-Reset branch 'main'
-error: branch 'foo' not found
-No changes.
-ok 6 - checkout -p with multiple remotes does not print advice
+	git rm -f fi/le &&
+	echo resolving records &&
+	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
 
-expecting success of 2024.7 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D foo &&
+	git reset --hard &&
+	echo resetting discards &&
+	check_resolve_undo discarded
 
-	git -c checkout.defaultRemote=repo_a checkout foo &&
-	status_uno_is_clean &&
-	test_branch foo &&
-	test_cmp_rev remotes/repo_a/foo HEAD &&
-	test_branch_upstream foo repo_a foo
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 70d285e] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+merge clears upfront
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+resolving records
+HEAD is now at 70d285e merged
+resetting discards
+ok 3 - rm records reset clears
 
-Reset branch 'main'
-error: branch 'foo' not found
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'repo_a/foo'.
-ok 7 - checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1
+expecting success of 2030.4 'plumbing clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
 
-expecting success of 2024.8 'checkout of branch from a single remote succeeds #1': 
-	git checkout -B main &&
-	test_might_fail git branch -D bar &&
+	echo plumbing clear &&
+	git update-index --clear-resolve-undo &&
+	check_resolve_undo cleared
 
-	git checkout bar &&
-	status_uno_is_clean &&
-	test_branch bar &&
-	test_cmp_rev remotes/repo_a/bar HEAD &&
-	test_branch_upstream bar repo_a bar
+HEAD is now at 70d285e merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Switched to and reset branch 'main'
-error: branch 'bar' not found
-Switched to a new branch 'bar'
-branch 'bar' set up to track 'repo_a/bar'.
-ok 8 - checkout of branch from a single remote succeeds #1
+  70d285e merged
 
-expecting success of 2024.9 'checkout of branch from a single remote succeeds #2': 
-	git checkout -B main &&
-	test_might_fail git branch -D baz &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	git checkout baz &&
-	status_uno_is_clean &&
-	test_branch baz &&
-	test_cmp_rev remotes/other_b/baz HEAD &&
-	test_branch_upstream baz repo_b baz
-
-Switched to and reset branch 'main'
-error: branch 'baz' not found
-Switched to a new branch 'baz'
-branch 'baz' set up to track 'repo_b/baz'.
-ok 9 - checkout of branch from a single remote succeeds #2
-
-expecting success of 2024.10 '--no-guess suppresses branch auto-vivification': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
-
-	test_must_fail git checkout --no-guess bar &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
-
-Switched to and reset branch 'main'
-Deleted branch bar (was bfd2f16).
-error: pathspec 'bar' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 10 - --no-guess suppresses branch auto-vivification
-
-expecting success of 2024.11 'checkout.guess = false suppresses branch auto-vivification': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
-
-	test_config checkout.guess false &&
-	test_must_fail git checkout bar &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
-
-Reset branch 'main'
-error: branch 'bar' not found
-error: pathspec 'bar' did not match any file(s) known to git
-fatal: Needed a single revision
-ok 11 - checkout.guess = false suppresses branch auto-vivification
-
-expecting success of 2024.12 'setup more remotes with unconventional refspecs': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	git init repo_c &&
-	(
-		cd repo_c &&
-		test_commit c_main &&
-		git checkout -b bar &&
-		test_commit c_bar &&
-		git checkout -b spam &&
-		test_commit c_spam
-	) &&
-	git init repo_d &&
-	(
-		cd repo_d &&
-		test_commit d_main &&
-		git checkout -b baz &&
-		test_commit d_baz &&
-		git checkout -b eggs &&
-		test_commit d_eggs
-	) &&
-	git remote add repo_c repo_c &&
-	git config remote.repo_c.fetch \
-		"+refs/heads/*:refs/remotes/extra_dir/repo_c/extra_dir/*" &&
-	git remote add repo_d repo_d &&
-	git config remote.repo_d.fetch \
-		"+refs/heads/*:refs/repo_d/*" &&
-	git fetch --all
-
-Reset branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_c/.git/
-[master (root-commit) cdfe1c8] c_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_main.t
-Switched to a new branch 'bar'
-[bar b017b41] c_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_bar.t
-Switched to a new branch 'spam'
-[spam 449823f] c_spam
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c_spam.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2024-checkout-dwim/repo_d/.git/
-[master (root-commit) b0e85f1] d_main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_main.t
-Switched to a new branch 'baz'
-[baz b83c7c6] d_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_baz.t
-Switched to a new branch 'eggs'
-[eggs e1ffd37] d_eggs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d_eggs.t
-Fetching repo_a
-Fetching repo_b
-Fetching repo_c
-From repo_c
- * [new branch]      bar        -> extra_dir/repo_c/extra_dir/bar
- * [new branch]      master     -> extra_dir/repo_c/extra_dir/master
- * [new branch]      spam       -> extra_dir/repo_c/extra_dir/spam
- * [new tag]         c_bar      -> c_bar
- * [new tag]         c_main     -> c_main
- * [new tag]         c_spam     -> c_spam
-Fetching repo_d
-From repo_d
- * [new branch]      baz        -> refs/repo_d/baz
- * [new branch]      eggs       -> refs/repo_d/eggs
- * [new branch]      master     -> refs/repo_d/master
- * [new tag]         d_baz      -> d_baz
- * [new tag]         d_eggs     -> d_eggs
- * [new tag]         d_main     -> d_main
-ok 12 - setup more remotes with unconventional refspecs
-
-expecting success of 2024.13 'checkout of branch from multiple remotes fails #2': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D bar &&
-
-	test_must_fail git checkout bar &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch main
-
-Reset branch 'main'
-error: branch 'bar' not found
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'bar' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 13 - checkout of branch from multiple remotes fails #2
-
-expecting success of 2024.14 'checkout of branch from multiple remotes fails #3': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D baz &&
-
-	test_must_fail git checkout baz &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/baz &&
-	test_branch main
-
-Reset branch 'main'
-Deleted branch baz (was 8ac57c7).
-hint: If you meant to check out a remote tracking branch on, e.g. 'origin',
-hint: you can do so by fully qualifying the name with the --track option:
-hint:
-hint:     git checkout --track origin/<name>
-hint:
-hint: If you'd like to always have checkouts of an ambiguous <name> prefer
-hint: one remote, e.g. the 'origin' remote, consider setting
-hint: checkout.defaultRemote=origin in your config.
-fatal: 'baz' matched multiple (2) remote tracking branches
-fatal: Needed a single revision
-ok 14 - checkout of branch from multiple remotes fails #3
-
-expecting success of 2024.15 'checkout of branch from a single remote succeeds #3': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
-
-	git checkout spam &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
-
-Reset branch 'main'
-error: branch 'spam' not found
-Switched to a new branch 'spam'
-branch 'spam' set up to track 'repo_c/spam'.
-ok 15 - checkout of branch from a single remote succeeds #3
-
-expecting success of 2024.16 'checkout of branch from a single remote succeeds #4': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D eggs &&
-
-	git checkout eggs &&
-	status_uno_is_clean &&
-	test_branch eggs &&
-	test_cmp_rev refs/repo_d/eggs HEAD &&
-	test_branch_upstream eggs repo_d eggs
-
-Switched to and reset branch 'main'
-error: branch 'eggs' not found
-Switched to a new branch 'eggs'
-branch 'eggs' set up to track 'repo_d/eggs'.
-ok 16 - checkout of branch from a single remote succeeds #4
-
-expecting success of 2024.17 'checkout of branch with a file having the same name fails': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
-
-	>spam &&
-	test_must_fail git checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch main
-
-Switched to and reset branch 'main'
-Deleted branch spam (was 449823f).
-fatal: 'spam' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: Needed a single revision
-ok 17 - checkout of branch with a file having the same name fails
-
-expecting success of 2024.18 'checkout of branch with a file in subdir having the same name fails': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
-
-	>spam &&
-	mkdir sub &&
-	mv spam sub/spam &&
-	test_must_fail git -C sub checkout spam &&
-	status_uno_is_clean &&
-	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch main
-
-Reset branch 'main'
-error: branch 'spam' not found
-fatal: 'spam' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: Needed a single revision
-ok 18 - checkout of branch with a file in subdir having the same name fails
-
-expecting success of 2024.19 'checkout <branch> -- succeeds, even if a file with the same name exists': 
-	git checkout -B main &&
-	status_uno_is_clean &&
-	test_might_fail git branch -D spam &&
-
-	>spam &&
-	git checkout spam -- &&
-	status_uno_is_clean &&
-	test_branch spam &&
-	test_cmp_rev refs/remotes/extra_dir/repo_c/extra_dir/spam HEAD &&
-	test_branch_upstream spam repo_c spam
-
-Reset branch 'main'
-error: branch 'spam' not found
-Switched to a new branch 'spam'
-branch 'spam' set up to track 'repo_c/spam'.
-ok 19 - checkout <branch> -- succeeds, even if a file with the same name exists
-
-expecting success of 2024.20 'loosely defined local base branch is reported correctly': 
-
-	git checkout main &&
-	status_uno_is_clean &&
-	git branch strict &&
-	git branch loose &&
-	git commit --allow-empty -m "a bit more" &&
-
-	test_config branch.strict.remote . &&
-	test_config branch.loose.remote . &&
-	test_config branch.strict.merge refs/heads/main &&
-	test_config branch.loose.merge main &&
-
-	git checkout strict >expect.raw 2>&1 &&
-	sed -e "s/strict/BRANCHNAME/g" <expect.raw >expect &&
-	status_uno_is_clean &&
-	git checkout loose >actual.raw 2>&1 &&
-	sed -e "s/loose/BRANCHNAME/g" <actual.raw >actual &&
-	status_uno_is_clean &&
-	grep BRANCHNAME actual &&
-
-	test_cmp expect actual
-
-Switched to branch 'main'
-[main 0b0f2ce] a bit more
- Author: A U Thor <author@example.com>
-Switched to branch 'BRANCHNAME'
-ok 20 - loosely defined local base branch is reported correctly
-
-expecting success of 2024.21 'reject when arg could be part of dwim branch': 
-	git remote add foo file://non-existent-place &&
-	git update-ref refs/remotes/foo/dwim-arg HEAD &&
-	echo foo >dwim-arg &&
-	git add dwim-arg &&
-	echo bar >dwim-arg &&
-	test_must_fail git checkout dwim-arg &&
-	test_must_fail git rev-parse refs/heads/dwim-arg -- &&
-	grep bar dwim-arg
-
-fatal: 'dwim-arg' could be both a local file and a tracking branch.
-Please use -- (and optionally --no-guess) to disambiguate
-fatal: bad revision 'refs/heads/dwim-arg'
-bar
-ok 21 - reject when arg could be part of dwim branch
-
-expecting success of 2024.22 'disambiguate dwim branch and checkout path (1)': 
-	git update-ref refs/remotes/foo/dwim-arg1 HEAD &&
-	echo foo >dwim-arg1 &&
-	git add dwim-arg1 &&
-	echo bar >dwim-arg1 &&
-	git checkout -- dwim-arg1 &&
-	test_must_fail git rev-parse refs/heads/dwim-arg1 -- &&
-	grep foo dwim-arg1
-
-fatal: bad revision 'refs/heads/dwim-arg1'
-foo
-ok 22 - disambiguate dwim branch and checkout path (1)
-
-expecting success of 2024.23 'disambiguate dwim branch and checkout path (2)': 
-	git update-ref refs/remotes/foo/dwim-arg2 HEAD &&
-	echo foo >dwim-arg2 &&
-	git add dwim-arg2 &&
-	echo bar >dwim-arg2 &&
-	git checkout dwim-arg2 -- &&
-	git rev-parse refs/heads/dwim-arg2 -- &&
-	grep bar dwim-arg2
-
-Switched to a new branch 'dwim-arg2'
-A	dwim-arg
-A	dwim-arg1
-A	dwim-arg2
-branch 'dwim-arg2' set up to track 'foo/dwim-arg2'.
-e1ffd376e093970186efb2074ec16dcb57d23789
---
-bar
-ok 23 - disambiguate dwim branch and checkout path (2)
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2072-restore-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2072-restore-pathspec-file/.git/
-expecting success of 2072.1 'setup': 
-	test_commit file0 &&
-
-	mkdir dir1 &&
-	echo 1 >dir1/file &&
-	echo 1 >fileA.t &&
-	echo 1 >fileB.t &&
-	echo 1 >fileC.t &&
-	echo 1 >fileD.t &&
-	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files 1" &&
-
-	echo 2 >dir1/file &&
-	echo 2 >fileA.t &&
-	echo 2 >fileB.t &&
-	echo 2 >fileC.t &&
-	echo 2 >fileD.t &&
-	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files 2" &&
-
-	git tag checkpoint
-
-[master (root-commit) ad2e047] file0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0.t
-[master 17aa47d] files 1
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/file
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
-[master 4c6d82b] files 2
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+), 5 deletions(-)
-ok 1 - setup
-
-expecting success of 2072.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
-
-	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 2 - --pathspec-from-file from stdin
-
-expecting success of 2072.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
-
-	echo fileA.t >list &&
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 3 - --pathspec-from-file from file
-
-expecting success of 2072.4 'NUL delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 4 - NUL delimiters
-
-expecting success of 2072.5 'LF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 5 - LF delimiters
-
-expecting success of 2072.6 'no trailing delimiter': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 6 - no trailing delimiter
-
-expecting success of 2072.7 'CRLF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 7 - CRLF delimiters
-
-expecting success of 2072.8 'quotes': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 8 - quotes
-
-expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
-
-HEAD is now at 4c6d82b files 2
-error: pathspec '"file\101.t"
-' did not match any file(s) known to git
-ok 9 - quotes not compatible with --pathspec-file-nul
-
-expecting success of 2072.10 'only touches what was listed': 
-	restore_checkpoint &&
-
-	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-
-	cat >expect <<-\EOF &&
-	 M fileB.t
-	 M fileC.t
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 10 - only touches what was listed
-
-expecting success of 2072.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
-
-	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
-
-	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
-
-	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
-
-	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
-	test_grep -e "you must specify path(s) to restore" err
-
-HEAD is now at 4c6d82b files 2
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: you must specify path(s) to restore
-ok 11 - error conditions
-
-expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
-	restore_checkpoint &&
-
-	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-	cat >expect <<-\EOF &&
-	 M dir1/file
-	EOF
-	verify_expect
-
-HEAD is now at 4c6d82b files 2
-ok 12 - wildcard pathspec matches file in subdirectory
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2070-restore.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2070-restore/.git/
-expecting success of 2070.1 'setup': 
-	test_commit first &&
-	echo first-and-a-half >>first.t &&
-	git add first.t &&
-	test_commit second &&
-	echo one >one &&
-	echo two >two &&
-	echo untracked >untracked &&
-	echo ignored >ignored &&
-	echo /ignored >.gitignore &&
-	git add one two .gitignore &&
-	git update-ref refs/heads/one main
-
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main a46c920] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 second.t
-ok 1 - setup
-
-expecting success of 2070.2 'restore without pathspec is not ok': 
-	test_must_fail git restore &&
-	test_must_fail git restore --source=first
-
-fatal: you must specify path(s) to restore
-fatal: you must specify path(s) to restore
-ok 2 - restore without pathspec is not ok
-
-expecting success of 2070.3 'restore a file, ignoring branch of same name': 
-	cat one >expected &&
-	echo dirty >>one &&
-	git restore one &&
-	test_cmp expected one
-
-ok 3 - restore a file, ignoring branch of same name
-
-expecting success of 2070.4 'restore a file on worktree from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first first.t &&
-	test_cmp expected first.t &&
-	git cat-file blob HEAD:./first.t >expected &&
-	git show :first.t >actual &&
-	test_cmp expected actual
-
-HEAD is now at a46c920 second
-ok 4 - restore a file on worktree from another ref
-
-expecting success of 2070.5 'restore a file in the index from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first --staged first.t &&
-	git show :first.t >actual &&
-	test_cmp expected actual &&
-	git cat-file blob HEAD:./first.t >expected &&
-	test_cmp expected first.t
-
-HEAD is now at a46c920 second
-ok 5 - restore a file in the index from another ref
-
-expecting success of 2070.6 'restore a file in both the index and worktree from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first --staged --worktree first.t &&
-	git show :first.t >actual &&
-	test_cmp expected actual &&
-	test_cmp expected first.t
-
-HEAD is now at a46c920 second
-ok 6 - restore a file in both the index and worktree from another ref
-
-expecting success of 2070.7 'restore --staged uses HEAD as source': 
-	test_when_finished git reset --hard &&
-	git cat-file blob :./first.t >expected &&
-	echo index-dirty >>first.t &&
-	git add first.t &&
-	git restore --staged first.t &&
-	git cat-file blob :./first.t >actual &&
-	test_cmp expected actual
-
-HEAD is now at a46c920 second
-ok 7 - restore --staged uses HEAD as source
-
-expecting success of 2070.8 'restore --worktree --staged uses HEAD as source': 
-	test_when_finished git reset --hard &&
-	git show HEAD:./first.t >expected &&
-	echo dirty >>first.t &&
-	git add first.t &&
-	git restore --worktree --staged first.t &&
-	git show :./first.t >actual &&
-	test_cmp expected actual &&
-	test_cmp expected first.t
-
-HEAD is now at a46c920 second
-ok 8 - restore --worktree --staged uses HEAD as source
-
-expecting success of 2070.9 'restore --ignore-unmerged ignores unmerged entries': 
-	git init unmerged &&
-	(
-		cd unmerged &&
-		echo one >unmerged &&
-		echo one >common &&
-		git add unmerged common &&
-		git commit -m common &&
-		git switch -c first &&
-		echo first >unmerged &&
-		git commit -am first &&
-		git switch -c second main &&
-		echo second >unmerged &&
-		git commit -am second &&
-		test_must_fail git merge first &&
-
-		echo dirty >>common &&
-		test_must_fail git restore . &&
-
-		git restore --ignore-unmerged --quiet . >output 2>&1 &&
-		git diff common >diff-output &&
-		test_must_be_empty output &&
-		test_must_be_empty diff-output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2070-restore/unmerged/.git/
-[main (root-commit) b83edd8] common
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 common
- create mode 100644 unmerged
-Switched to a new branch 'first'
-[first 753ae86] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'second'
-[second 06de6fa] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging unmerged
-CONFLICT (content): Merge conflict in unmerged
-Automatic merge failed; fix conflicts and then commit the result.
-error: path 'unmerged' is unmerged
-ok 9 - restore --ignore-unmerged ignores unmerged entries
-
-expecting success of 2070.10 'restore --staged adds deleted intent-to-add file back to index': 
-	echo "nonempty" >nonempty &&
-	>empty &&
-	git add nonempty empty &&
-	git commit -m "create files to be deleted" &&
-	git rm --cached nonempty empty &&
-	git add -N nonempty empty &&
-	git restore --staged nonempty empty &&
-	git diff --cached --exit-code
-
-[main 94e3084] create files to be deleted
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 empty
- create mode 100644 nonempty
-rm 'empty'
-rm 'nonempty'
-ok 10 - restore --staged adds deleted intent-to-add file back to index
-
-expecting success of 2070.11 'restore --staged invalidates cache tree for deletions': 
-	test_when_finished git reset --hard &&
-	>new1 &&
-	>new2 &&
-	git add new1 new2 &&
-
-	# It is important to commit and then reset here, so that the index
-	# contains a valid cache-tree for the "both" tree.
-	git commit -m both &&
-	git reset --soft HEAD^ &&
-
-	git restore --staged new1 &&
-	git commit -m "just new2" &&
-	git rev-parse HEAD:new2 &&
-	test_must_fail git rev-parse HEAD:new1
-
-[main 19f4790] both
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 new1
- create mode 100644 new2
-[main 2c4724a] just new2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 new2
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-fatal: path 'new1' exists on disk, but not in 'HEAD'
-HEAD:new1
-HEAD is now at 2c4724a just new2
-ok 11 - restore --staged invalidates cache tree for deletions
-
-expecting success of 2070.12 'restore --merge to unresolve': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	echo nothing >file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
-
-ok 12 - restore --merge to unresolve
-
-expecting success of 2070.13 'restore --merge to unresolve after (mistaken) resolution': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	echo nothing >file &&
-	git add file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
-
-ok 13 - restore --merge to unresolve after (mistaken) resolution
-
-expecting success of 2070.14 'restore --merge to unresolve after (mistaken) resolution': 
-	O=$(echo original | git hash-object -w --stdin) &&
-	A=$(echo ourside | git hash-object -w --stdin) &&
-	B=$(echo theirside | git hash-object -w --stdin) &&
-	{
-		echo "100644 $O 1	file" &&
-		echo "100644 $A 2	file" &&
-		echo "100644 $B 3	file"
-	} | git update-index --index-info &&
-	git rm -f file &&
-	git restore --worktree --merge file &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
-
-rm 'file'
-ok 14 - restore --merge to unresolve after (mistaken) resolution
-
-expecting success of 2070.15 'restore with merge options are incompatible with certain options': 
-	for opts in \
-		"--staged --ours" \
-		"--staged --theirs" \
-		"--staged --merge" \
-		"--source=HEAD --ours" \
-		"--source=HEAD --theirs" \
-		"--source=HEAD --merge" \
-		"--staged --conflict=diff3" \
-		"--staged --worktree --ours" \
-		"--staged --worktree --theirs" \
-		"--staged --worktree --merge" \
-		"--staged --worktree --conflict=zdiff3"
-	do
-		test_must_fail git restore $opts . 2>err &&
-		grep "cannot be used" err || return
-	done
-
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--ours' or '--theirs' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-fatal: '--merge' or '--conflict' cannot be used with --staged
-ok 15 - restore with merge options are incompatible with certain options
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2060-switch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch/.git/
-expecting success of 2060.1 'setup': 
-	test_commit first &&
-	git branch first-branch &&
-	test_commit second &&
-	test_commit third &&
-	git remote add origin nohost:/nopath &&
-	git update-ref refs/remotes/origin/foo first-branch
-
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[main cd7036d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-ok 1 - setup
-
-expecting success of 2060.2 'switch branch no arguments': 
-	test_must_fail git switch
-
-fatal: missing branch or commit argument
-ok 2 - switch branch no arguments
-
-expecting success of 2060.3 'switch branch': 
-	git switch first-branch &&
-	test_path_is_missing second.t
-
-Switched to branch 'first-branch'
-ok 3 - switch branch
-
-expecting success of 2060.4 'switch and detach': 
-	test_when_finished git switch main &&
-	test_must_fail git switch main^{commit} &&
-	git switch --detach main^{commit} &&
-	test_must_fail git symbolic-ref HEAD
-
-fatal: a branch is expected, got commit 'main^{commit}'
-hint: If you want to detach HEAD at the commit, try again with the --detach option.
-HEAD is now at cd7036d third
-fatal: ref HEAD is not a symbolic ref
-Switched to branch 'main'
-ok 4 - switch and detach
-
-expecting success of 2060.5 'suggestion to detach': 
-	test_must_fail git switch main^{commit} 2>stderr &&
-	grep "try again with the --detach option" stderr
-
-hint: If you want to detach HEAD at the commit, try again with the --detach option.
-ok 5 - suggestion to detach
-
-expecting success of 2060.6 'suggestion to detach is suppressed with advice.suggestDetachingHead=false': 
-	test_config advice.suggestDetachingHead false &&
-	test_must_fail git switch main^{commit} 2>stderr &&
-	! grep "try again with the --detach option" stderr
-
-ok 6 - suggestion to detach is suppressed with advice.suggestDetachingHead=false
-
-expecting success of 2060.7 'switch and detach current branch': 
-	test_when_finished git switch main &&
-	git switch main &&
-	git switch --detach &&
-	test_must_fail git symbolic-ref HEAD
-
-Already on 'main'
-HEAD is now at cd7036d third
-fatal: ref HEAD is not a symbolic ref
-Switched to branch 'main'
-ok 7 - switch and detach current branch
-
-expecting success of 2060.8 'switch and create branch': 
-	test_when_finished git switch main &&
-	git switch -c temp main^ &&
-	test_cmp_rev main^ refs/heads/temp &&
-	echo refs/heads/temp >expected-branch &&
-	git symbolic-ref HEAD >actual-branch &&
-	test_cmp expected-branch actual-branch
-
-Switched to a new branch 'temp'
-Switched to branch 'main'
-ok 8 - switch and create branch
-
-expecting success of 2060.9 'force create branch from HEAD': 
-	test_when_finished git switch main &&
-	git switch --detach main &&
-	test_must_fail git switch -c temp &&
-	git switch -C temp &&
-	test_cmp_rev main refs/heads/temp &&
-	echo refs/heads/temp >expected-branch &&
-	git symbolic-ref HEAD >actual-branch &&
-	test_cmp expected-branch actual-branch
-
-HEAD is now at cd7036d third
-fatal: a branch named 'temp' already exists
-Switched to and reset branch 'temp'
-Switched to branch 'main'
-ok 9 - force create branch from HEAD
-
-expecting success of 2060.10 'new orphan branch from empty': 
-	test_when_finished git switch main &&
-	test_must_fail git switch --orphan new-orphan HEAD &&
-	git switch --orphan new-orphan &&
-	test_commit orphan &&
-	git cat-file commit refs/heads/new-orphan >commit &&
-	! grep ^parent commit &&
-	git ls-files >tracked-files &&
-	echo orphan.t >expected &&
-	test_cmp expected tracked-files
-
-fatal: '--orphan' cannot take <start-point>
-Switched to a new branch 'new-orphan'
-[new-orphan (root-commit) 11bb70e] orphan
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 orphan.t
-Switched to branch 'main'
-ok 10 - new orphan branch from empty
-
-expecting success of 2060.11 'orphan branch works with --discard-changes': 
-	test_when_finished git switch main &&
-	echo foo >foo.txt &&
-	git switch --discard-changes --orphan new-orphan2 &&
-	git ls-files >tracked-files &&
-	test_must_be_empty tracked-files
-
-Switched to a new branch 'new-orphan2'
-Switched to branch 'main'
-ok 11 - orphan branch works with --discard-changes
-
-expecting success of 2060.12 'switching ignores file of same branch name': 
-	test_when_finished git switch main &&
-	: >first-branch &&
-	git switch first-branch &&
-	echo refs/heads/first-branch >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
-
-Switched to branch 'first-branch'
-Switched to branch 'main'
-ok 12 - switching ignores file of same branch name
-
-expecting success of 2060.13 'guess and create branch': 
-	test_when_finished git switch main &&
-	test_must_fail git switch --no-guess foo &&
-	test_config checkout.guess false &&
-	test_must_fail git switch foo &&
-	test_config checkout.guess true &&
-	git switch foo &&
-	echo refs/heads/foo >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
-
-fatal: invalid reference: foo
-fatal: invalid reference: foo
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'origin/foo'.
-Switched to branch 'main'
-ok 13 - guess and create branch
-
-expecting success of 2060.14 'not switching when something is in progress': 
-	test_when_finished rm -f .git/MERGE_HEAD &&
-	# fake a merge-in-progress
-	cp .git/HEAD .git/MERGE_HEAD &&
-	test_must_fail git switch -d @^
-
-fatal: cannot switch branch while merging
-Consider "git merge --quit" or "git worktree add".
-ok 14 - not switching when something is in progress
-
-expecting success of 2060.15 'tracking info copied with autoSetupMerge=inherit': 
-	# default config does not copy tracking info
-	git switch -c foo-no-inherit foo &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
-	# with --track=inherit, we copy tracking info from foo
-	git switch --track=inherit -c foo2 foo &&
-	test_cmp_config origin branch.foo2.remote &&
-	test_cmp_config refs/heads/foo branch.foo2.merge &&
-	# with autoSetupMerge=inherit, we do the same
-	test_config branch.autoSetupMerge inherit &&
-	git switch -c foo3 foo &&
-	test_cmp_config origin branch.foo3.remote &&
-	test_cmp_config refs/heads/foo branch.foo3.merge &&
-	# with --track, we override autoSetupMerge
-	git switch --track -c foo4 foo &&
-	test_cmp_config . branch.foo4.remote &&
-	test_cmp_config refs/heads/foo branch.foo4.merge &&
-	# and --track=direct does as well
-	git switch --track=direct -c foo5 foo &&
-	test_cmp_config . branch.foo5.remote &&
-	test_cmp_config refs/heads/foo branch.foo5.merge &&
-	# no tracking info to inherit from main
-	git switch -c main2 main &&
-	test_cmp_config "" --default "" branch.main2.remote &&
-	test_cmp_config "" --default "" branch.main2.merge
-
-Switched to a new branch 'foo-no-inherit'
-Switched to a new branch 'foo2'
-branch 'foo2' set up to track 'origin/foo'.
-Switched to a new branch 'foo3'
-branch 'foo3' set up to track 'origin/foo'.
-Switched to a new branch 'foo4'
-branch 'foo4' set up to track 'foo'.
-Switched to a new branch 'foo5'
-branch 'foo5' set up to track 'foo'.
-warning: asked to inherit tracking from 'main', but no remote is set
-Switched to a new branch 'main2'
-ok 15 - tracking info copied with autoSetupMerge=inherit
-
-expecting success of 2060.16 'switch back when temporarily detached and checked out elsewhere ': 
-	test_when_finished "
-		git worktree remove wt1 ||:
-		git worktree remove wt2 ||:
-		git checkout - ||:
-		git branch -D shared ||:
-	" &&
-	git checkout -b shared &&
-	test_commit shared-first &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	test_commit shared-second &&
-	test_commit shared-third &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	git worktree add wt1 -f shared &&
-	git -C wt1 bisect start &&
-	git -C wt1 bisect good $HASH1 &&
-	git -C wt1 bisect bad $HASH2 &&
-	git worktree add wt2 -f shared &&
-	git -C wt2 bisect start &&
-	git -C wt2 bisect good $HASH1 &&
-	git -C wt2 bisect bad $HASH2 &&
-	# we test in both worktrees to ensure that works
-	# as expected with "first" and "next" worktrees
-	test_must_fail git -C wt1 switch shared &&
-	test_must_fail git -C wt1 switch -C shared &&
-	git -C wt1 switch --ignore-other-worktrees shared &&
-	test_must_fail git -C wt2 switch shared &&
-	test_must_fail git -C wt2 switch -C shared &&
-	git -C wt2 switch --ignore-other-worktrees shared
-
-Switched to a new branch 'shared'
-[shared 814c97a] shared-first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-first.t
-[shared 7162996] shared-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-second.t
-[shared 90dda28] shared-third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-third.t
-Preparing worktree (checking out 'shared')
-HEAD is now at 90dda28 shared-third
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[716299614285626473e2ba3b8caf8b7633592842] shared-second
-Preparing worktree (checking out 'shared')
-HEAD is now at 90dda28 shared-third
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[716299614285626473e2ba3b8caf8b7633592842] shared-second
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-Previous HEAD position was 7162996 shared-second
-Switched to branch 'shared'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2060-switch'
-warning: you are switching branch while bisecting
-Previous HEAD position was 7162996 shared-second
-Switched to branch 'shared'
-Switched to branch 'main2'
-Deleted branch shared (was 90dda28).
-ok 16 - switch back when temporarily detached and checked out elsewhere 
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2071-restore-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2071-restore-patch/.git/
-expecting success of 2071.1 'setup': 
-	mkdir dir &&
-	echo parent >dir/foo &&
-	echo dummy >bar &&
-	git add bar dir/foo &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
-
-[master (root-commit) 758b165] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 dir/foo
-[master 3319288] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 2071.2 'restore -p without pathspec is fine': 
-	echo q >cmd &&
-	git restore -p <cmd
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 2 - restore -p without pathspec is fine
-
-expecting success of 2071.3 'saying "n" does nothing': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n n | git restore -p &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 3 - saying "n" does nothing
-
-expecting success of 2071.4 'git restore -p': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 4 - git restore -p
-
-expecting success of 2071.5 'git restore -p with staged changes': 
-	set_state dir/foo work index &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 9015a7a..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--index
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 5 - git restore -p with staged changes
-
-expecting success of 2071.6 'git restore -p --source=HEAD': 
-		set_state dir/foo work index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git restore -p --source=$opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head index &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 6 - git restore -p --source=HEAD
-
-expecting success of 2071.7 'git restore -p --source=@': 
-		set_state dir/foo work index &&
-		# the third n is to get out in case it mistakenly does not apply
-		test_write_lines n y n | git restore -p --source=$opt >output &&
-		verify_saved_state bar &&
-		verify_state dir/foo head index &&
-		test_grep "Discard" output
-	
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 7 - git restore -p --source=@
-
-expecting success of 2071.8 'git restore -p --source=HEAD^': 
-	set_state dir/foo work index &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git restore -p --source=HEAD^ &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent index
-
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 8 - git restore -p --source=HEAD^
-
-expecting success of 2071.9 'git restore -p --source=HEAD^...': 
-	set_state dir/foo work index &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git restore -p --source=HEAD^... &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent index
-
-diff --git b/bar a/bar
-index 8c999e6..421376d 100644
---- b/bar
-+++ a/bar
-@@ -1 +1 @@
--bar_work
-+dummy
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 9 - git restore -p --source=HEAD^...
-
-expecting success of 2071.10 'git restore -p handles deletion': 
-	set_state dir/foo work index &&
-	rm dir/foo &&
-	test_write_lines n y | git restore -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo index index
-
-diff --git a/bar b/bar
-index 7780244..8c999e6 100644
---- a/bar
-+++ b/bar
-@@ -1 +1 @@
--bar_index
-+bar_work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-deleted file mode 100644
-index 9015a7a..0000000
---- a/dir/foo
-+++ /dev/null
-@@ -1 +0,0 @@
--index
-(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
-ok 10 - git restore -p handles deletion
-
-expecting success of 2071.11 'path limiting works: dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git restore -p dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 11 - path limiting works: dir
-
-expecting success of 2071.12 'path limiting works: -- dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git restore -p -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 12 - path limiting works: -- dir
-
-expecting success of 2071.13 'path limiting works: HEAD^ -- dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent head
-
-diff --git b/dir/foo a/dir/foo
-index b8f99f5..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--work
-+parent
-(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
-ok 13 - path limiting works: HEAD^ -- dir
-
-expecting success of 2071.14 'path limiting works: foo inside dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | (cd dir && git restore -p foo) &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
-
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
-ok 14 - path limiting works: foo inside dir
-
-expecting success of 2071.15 'none of this moved HEAD': 
-	verify_saved_head
-
-ok 15 - none of this moved HEAD
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2100-update-cache-badpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2100-update-cache-badpath/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 2100.1 'git update-index --add to add various paths.': git update-index --add -- path0 path1 path2/file2 path3/file3
-ok 1 - git update-index --add to add various paths.
-
-expecting success of 2100.2 'git update-index to add conflicting path path0/file0 should fail.': test_must_fail git update-index --add -- path0/file0
-error: 'path0/file0' appears as both a file and as a directory
-error: path0/file0: cannot add to the index - missing --add option?
-fatal: Unable to process path path0/file0
-ok 2 - git update-index to add conflicting path path0/file0 should fail.
-
-expecting success of 2100.3 'git update-index to add conflicting path path1/file1 should fail.': test_must_fail git update-index --add -- path1/file1
-error: 'path1/file1' appears as both a file and as a directory
-error: path1/file1: cannot add to the index - missing --add option?
-fatal: Unable to process path path1/file1
-ok 3 - git update-index to add conflicting path path1/file1 should fail.
-
-expecting success of 2100.4 'git update-index to add conflicting path path2 should fail.': test_must_fail git update-index --add -- path2
-error: 'path2' appears as both a file and as a directory
-error: path2: cannot add to the index - missing --add option?
-fatal: Unable to process path path2
-ok 4 - git update-index to add conflicting path path2 should fail.
-
-expecting success of 2100.5 'git update-index to add conflicting path path3 should fail.': test_must_fail git update-index --add -- path3
-error: 'path3' appears as both a file and as a directory
-error: path3: cannot add to the index - missing --add option?
-fatal: Unable to process path path3
-ok 5 - git update-index to add conflicting path path3 should fail.
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2081-parallel-checkout-collisions.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2081-parallel-checkout-collisions/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
-
-ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
-
-ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 4 # skip do not follow symlinks colliding with leading dir (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-ok 5 # skip collision report on clone (w/ racy file creation) (missing CASE_INSENSITIVE_FS)
-
-ok 6 # skip collision report on clone (w/ colliding peer after the detected entry) (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,!MINGW,!CYGWIN)
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2102-update-index-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2102-update-index-symlinks/.git/
-expecting success of 2102.1 'preparation': 
-git config core.symlinks false &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info
-ok 1 - preparation
-
-expecting success of 2102.2 'modify the symbolic link': 
-printf new-file > symlink &&
-git update-index symlink
-ok 2 - modify the symbolic link
-
-expecting success of 2102.3 'the index entry must still be a symbolic link': 
-case "$(git ls-files --stage --cached symlink)" in
-120000" "*symlink) echo pass;;
-*) echo fail; git ls-files --stage --cached symlink; false;;
-esac
-pass
-ok 3 - the index entry must still be a symbolic link
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2101-update-index-reupdate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2101-update-index-reupdate/.git/
-expecting success of 2101.1 'update-index --add': 
-	echo hello world >file1 &&
-	echo goodbye people >file2 &&
-	git update-index --add file1 file2 &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file1) 0	file1
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 1 - update-index --add
-
-expecting success of 2101.2 'update-index --again': 
-	rm -f file1 &&
-	echo hello everybody >file2 &&
-	if git update-index --again
-	then
-		echo should have refused to remove file1
-		exit 1
-	else
-		echo happy - failed as expected
-	fi &&
-	git ls-files -s >current &&
-	cmp current expected
-
-error: file1: does not exist and --remove not passed
-fatal: Unable to process path file1
-happy - failed as expected
-ok 2 - update-index --again
-
-expecting success of 2101.3 'update-index --remove --again': 
-	git update-index --remove --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 3 - update-index --remove --again
-
-expecting success of 2101.4 'first commit': git commit -m initial
-[master (root-commit) 823d2a7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 4 - first commit
-
-expecting success of 2101.5 'update-index again': 
-	mkdir -p dir1 &&
-	echo hello world >dir1/file3 &&
-	echo goodbye people >file2 &&
-	git update-index --add file2 dir1/file3 &&
-	echo hello everybody >file2 &&
-	echo happy >dir1/file3 &&
-	git update-index --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 5 - update-index again
-
-expecting success of 2101.6 'update-index --update from subdir': 
-	echo not so happy >file2 &&
-	(cd dir1 &&
-	cat ../file2 >file3 &&
-	git update-index --again
-	) &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	test_cmp expected current
-
-ok 6 - update-index --update from subdir
-
-expecting success of 2101.7 'update-index --update with pathspec': 
-	echo very happy >file2 &&
-	cat file2 >dir1/file3 &&
-	git update-index --again dir1/ &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	cmp current expected
-
-ok 7 - update-index --update with pathspec
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2030-unresolve-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2030-unresolve-info/.git/
-expecting success of 2030.1 'setup': 
-	mkdir fi &&
-	printf "a\0a" >binary &&
-	git add binary &&
-	test_commit initial fi/le first &&
-	git branch side &&
-	git branch another &&
-	printf "a\0b" >binary &&
-	git add binary &&
-	test_commit second fi/le second &&
-	git checkout side &&
-	test_commit third fi/le third &&
-	git branch add-add &&
-	git checkout another &&
-	test_commit fourth fi/le fourth &&
-	git checkout add-add &&
-	test_commit fifth add-differently &&
-	git checkout main
-
-[main (root-commit) 7b271e3] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 binary
- create mode 100644 fi/le
-[main 9a00f99] second
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side b18340d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'another'
-[another cf4d985] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'add-add'
-[add-add b851e77] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 2030.2 'add records switch clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	git checkout second^0 &&
-	echo switching clears &&
-	check_resolve_undo cleared
-
-HEAD is now at 9a00f99 second
-Note: switching to 'second^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD b3a51df] merged
- Author: A U Thor <author@example.com>
-committing keeps
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b3a51df merged
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> b3a51df
-
-HEAD is now at 9a00f99 second
-switching clears
-ok 2 - add records switch clears
-
-expecting success of 2030.3 'rm records reset clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-
-	echo merge clears upfront &&
-	test_must_fail git merge fourth^0 &&
-	check_resolve_undo nuked &&
-
-	git rm -f fi/le &&
-	echo resolving records &&
-	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
-
-	git reset --hard &&
-	echo resetting discards &&
-	check_resolve_undo discarded
-
-HEAD is now at 9a00f99 second
-HEAD is now at 9a00f99 second
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-[detached HEAD 70d285e] merged
- Author: A U Thor <author@example.com>
-committing keeps
-merge clears upfront
-Auto-merging fi/le
-CONFLICT (content): Merge conflict in fi/le
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'fi/le'
-resolving records
-HEAD is now at 70d285e merged
-resetting discards
-ok 3 - rm records reset clears
-
-expecting success of 2030.4 'plumbing clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-
-	echo plumbing clear &&
-	git update-index --clear-resolve-undo &&
-	check_resolve_undo cleared
-
-HEAD is now at 70d285e merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  70d285e merged
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 70d285e
+ git branch <new-branch-name> 70d285e
 
 HEAD is now at 9a00f99 second
 Auto-merging fi/le
@@ -97205,6 +97635,173 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2100-update-cache-badpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2100-update-cache-badpath/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 2100.1 'git update-index --add to add various paths.': git update-index --add -- path0 path1 path2/file2 path3/file3
+ok 1 - git update-index --add to add various paths.
+
+expecting success of 2100.2 'git update-index to add conflicting path path0/file0 should fail.': test_must_fail git update-index --add -- path0/file0
+error: 'path0/file0' appears as both a file and as a directory
+error: path0/file0: cannot add to the index - missing --add option?
+fatal: Unable to process path path0/file0
+ok 2 - git update-index to add conflicting path path0/file0 should fail.
+
+expecting success of 2100.3 'git update-index to add conflicting path path1/file1 should fail.': test_must_fail git update-index --add -- path1/file1
+error: 'path1/file1' appears as both a file and as a directory
+error: path1/file1: cannot add to the index - missing --add option?
+fatal: Unable to process path path1/file1
+ok 3 - git update-index to add conflicting path path1/file1 should fail.
+
+expecting success of 2100.4 'git update-index to add conflicting path path2 should fail.': test_must_fail git update-index --add -- path2
+error: 'path2' appears as both a file and as a directory
+error: path2: cannot add to the index - missing --add option?
+fatal: Unable to process path path2
+ok 4 - git update-index to add conflicting path path2 should fail.
+
+expecting success of 2100.5 'git update-index to add conflicting path path3 should fail.': test_must_fail git update-index --add -- path3
+error: 'path3' appears as both a file and as a directory
+error: path3: cannot add to the index - missing --add option?
+fatal: Unable to process path path3
+ok 5 - git update-index to add conflicting path path3 should fail.
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2102-update-index-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2102-update-index-symlinks/.git/
+expecting success of 2102.1 'preparation': 
+git config core.symlinks false &&
+l=$(printf file | git hash-object -t blob -w --stdin) &&
+echo "120000 $l	symlink" | git update-index --index-info
+ok 1 - preparation
+
+expecting success of 2102.2 'modify the symbolic link': 
+printf new-file > symlink &&
+git update-index symlink
+ok 2 - modify the symbolic link
+
+expecting success of 2102.3 'the index entry must still be a symbolic link': 
+case "$(git ls-files --stage --cached symlink)" in
+120000" "*symlink) echo pass;;
+*) echo fail; git ls-files --stage --cached symlink; false;;
+esac
+pass
+ok 3 - the index entry must still be a symbolic link
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2101-update-index-reupdate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2101-update-index-reupdate/.git/
+expecting success of 2101.1 'update-index --add': 
+	echo hello world >file1 &&
+	echo goodbye people >file2 &&
+	git update-index --add file1 file2 &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file1) 0	file1
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 1 - update-index --add
+
+expecting success of 2101.2 'update-index --again': 
+	rm -f file1 &&
+	echo hello everybody >file2 &&
+	if git update-index --again
+	then
+		echo should have refused to remove file1
+		exit 1
+	else
+		echo happy - failed as expected
+	fi &&
+	git ls-files -s >current &&
+	cmp current expected
+
+error: file1: does not exist and --remove not passed
+fatal: Unable to process path file1
+happy - failed as expected
+ok 2 - update-index --again
+
+expecting success of 2101.3 'update-index --remove --again': 
+	git update-index --remove --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 3 - update-index --remove --again
+
+expecting success of 2101.4 'first commit': git commit -m initial
+[master (root-commit) 823d2a7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 4 - first commit
+
+expecting success of 2101.5 'update-index again': 
+	mkdir -p dir1 &&
+	echo hello world >dir1/file3 &&
+	echo goodbye people >file2 &&
+	git update-index --add file2 dir1/file3 &&
+	echo hello everybody >file2 &&
+	echo happy >dir1/file3 &&
+	git update-index --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 5 - update-index again
+
+expecting success of 2101.6 'update-index --update from subdir': 
+	echo not so happy >file2 &&
+	(cd dir1 &&
+	cat ../file2 >file3 &&
+	git update-index --again
+	) &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	test_cmp expected current
+
+ok 6 - update-index --update from subdir
+
+expecting success of 2101.7 'update-index --update with pathspec': 
+	echo very happy >file2 &&
+	cat file2 >dir1/file3 &&
+	git update-index --again dir1/ &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	cmp current expected
+
+ok 7 - update-index --update with pathspec
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2103-update-index-ignore-missing.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2103-update-index-ignore-missing/.git/
 expecting success of 2103.1 'basics': 
@@ -97343,53 +97940,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/.git/
-expecting success of 2105.1 'submodule with absolute .git file': 
-	mkdir sub1 &&
-	(cd sub1 &&
-	 git init &&
-	 REAL="$(pwd)/.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git &&
-	 test_commit first)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/sub1/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 1 - submodule with absolute .git file
-
-expecting success of 2105.2 'add gitlink to absolute .git file': 
-	git update-index --add -- sub1
-
-ok 2 - add gitlink to absolute .git file
-
-expecting success of 2105.3 'submodule with relative .git file': 
-	mkdir sub2 &&
-	(cd sub2 &&
-	 git init &&
-	 mv .git .real &&
-	 echo "gitdir: .real" >.git &&
-	 test_commit first)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/sub2/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 3 - submodule with relative .git file
-
-expecting success of 2105.4 'add gitlink to relative .git file': 
-	git update-index --add -- sub2
-
-ok 4 - add gitlink to relative .git file
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2104-update-index-skip-worktree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2104-update-index-skip-worktree/.git/
 expecting success of 2104.1 'setup': 
@@ -97450,6 +98000,53 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/.git/
+expecting success of 2105.1 'submodule with absolute .git file': 
+	mkdir sub1 &&
+	(cd sub1 &&
+	 git init &&
+	 REAL="$(pwd)/.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git &&
+	 test_commit first)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/sub1/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 1 - submodule with absolute .git file
+
+expecting success of 2105.2 'add gitlink to absolute .git file': 
+	git update-index --add -- sub1
+
+ok 2 - add gitlink to absolute .git file
+
+expecting success of 2105.3 'submodule with relative .git file': 
+	mkdir sub2 &&
+	(cd sub2 &&
+	 git init &&
+	 mv .git .real &&
+	 echo "gitdir: .real" >.git &&
+	 test_commit first)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2105-update-index-gitfile/sub2/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 3 - submodule with relative .git file
+
+expecting success of 2105.4 'add gitlink to relative .git file': 
+	git update-index --add -- sub2
+
+ok 4 - add gitlink to relative .git file
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2106-update-index-assume-unchanged.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2106-update-index-assume-unchanged/.git/
 expecting success of 2106.1 'setup': 
@@ -98477,22 +99074,22 @@
 	reset_files &&
 	update_assert_changed --refresh
 
---- .git/test-mtime-expect	2026-04-19 19:16:43.611659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:16:43.627659440 +0000
+--- .git/test-mtime-expect	2025-03-17 13:18:55.691790822 +0000
++++ .git/test-mtime-actual	2025-03-17 13:18:55.699790873 +0000
 @@ -1 +1 @@
 -1234567890
-+1776626203
++1742217535
 ok 3 - --refresh should fix racy timestamp
 
 expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
 	reset_files &&
 	update_assert_changed --really-refresh
 
---- .git/test-mtime-expect	2026-04-19 19:16:43.979659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:16:43.999659440 +0000
+--- .git/test-mtime-expect	2025-03-17 13:18:56.011792845 +0000
++++ .git/test-mtime-actual	2025-03-17 13:18:56.023792921 +0000
 @@ -1 +1 @@
 -1234567890
-+1776626203
++1742217536
 ok 4 - --really-refresh should fix racy timestamp
 
 expecting success of 2108.5 '--refresh should fix racy timestamp if other file needs update': 
@@ -98502,11 +99099,11 @@
 	update_assert_changed --refresh
 
 other: needs update
---- .git/test-mtime-expect	2026-04-19 19:16:44.567659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:16:44.567659440 +0000
+--- .git/test-mtime-expect	2025-03-17 13:18:56.435795525 +0000
++++ .git/test-mtime-actual	2025-03-17 13:18:56.463795702 +0000
 @@ -1 +1 @@
 -1234567890
-+1776626204
++1742217536
 ok 5 - --refresh should fix racy timestamp if other file needs update
 
 expecting success of 2108.6 '--refresh should fix racy timestamp if racy file needs update': 
@@ -98516,17 +99113,1355 @@
 	update_assert_changed --refresh
 
 file: needs update
---- .git/test-mtime-expect	2026-04-19 19:16:44.879659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:16:44.911659440 +0000
+--- .git/test-mtime-expect	2025-03-17 13:18:56.863798231 +0000
++++ .git/test-mtime-actual	2025-03-17 13:18:56.879798332 +0000
 @@ -1 +1 @@
 -1234567890
-+1776626204
++1742217536
 ok 6 - --refresh should fix racy timestamp if racy file needs update
 
 # passed all 6 test(s)
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2205-add-worktree-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/.git/
+expecting success of 2205.1 '1a: setup--config worktree': 
+	mkdir test1 &&
+	(
+	cd test1 &&
+	test_create_repo repo &&
+	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
+
+	mkdir -p outside-tracked outside-untracked &&
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>file-tracked &&
+	>file-untracked &&
+	>outside-tracked/file &&
+	>outside-untracked/file &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	../file-tracked
+	../outside-tracked/file
+	file-tracked
+	inside-tracked/file
+	EOF
+
+	cat >expect-untracked-unsorted <<-EOF &&
+	../file-untracked
+	../outside-untracked/file
+	file-untracked
+	inside-untracked/file
+	EOF
+
+	cat >expect-all-dir-unsorted <<-EOF &&
+	../file-untracked
+	../file-tracked
+	../outside-untracked/
+	../outside-tracked/
+	./
+	EOF
+
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
+ok 1 - 1a: setup--config worktree
+
+expecting success of 2205.2 '1b: pre-add all': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+
+ok 2 - 1b: pre-add all
+
+expecting success of 2205.3 '1c: pre-add dir all': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --directory --exclude-standard "$parent_dir" >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+
+ok 3 - 1c: pre-add dir all
+
+expecting success of 2205.4 '1d: post-add tracked': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	(
+		cd repo &&
+		git add file-tracked &&
+		git add inside-tracked &&
+		git add ../outside-tracked &&
+		git add "$parent_dir/file-tracked" &&
+		git ls-files "$parent_dir" >../actual-tracked-unsorted
+	) &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+
+ok 4 - 1d: post-add tracked
+
+expecting success of 2205.5 '1e: post-add untracked': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
+
+ok 5 - 1e: post-add untracked
+
+expecting success of 2205.6 '2a: setup--set git-dir': 
+	mkdir test2 &&
+	(
+	cd test2 &&
+	test_create_repo repo &&
+	# create two foreign repositories that should remain untracked
+	test_create_repo repo-outside &&
+	test_create_repo repo/repo-inside &&
+
+	mkdir -p repo/inside-tracked repo/inside-untracked &&
+	>repo/file-tracked &&
+	>repo/file-untracked &&
+	>repo/inside-tracked/file &&
+	>repo/inside-untracked/file &&
+	>repo-outside/file &&
+	>repo/repo-inside/file &&
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
+
+	cat >expect-untracked-unsorted <<-EOF &&
+	repo/file-untracked
+	repo/inside-untracked/file
+	repo/repo-inside/
+	repo-outside/
+	EOF
+
+	cat >expect-all-dir-unsorted <<-EOF &&
+	repo/
+	repo-outside/
+	EOF
+
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
+ok 6 - 2a: setup--set git-dir
+
+expecting success of 2205.7 '2b: pre-add all': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+
+ok 7 - 2b: pre-add all
+
+expecting success of 2205.8 '2c: pre-add dir all': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
+	sort actual-all-dir-unsorted >actual-all &&
+	sort expect-all-dir-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
+
+ok 8 - 2c: pre-add dir all
+
+expecting success of 2205.9 '2d: post-add tracked': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git add repo/file-tracked &&
+	git --git-dir=repo/.git add repo/inside-tracked &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+
+ok 9 - 2d: post-add tracked
+
+expecting success of 2205.10 '2e: post-add untracked': 
+	(
+	cd test2 &&
+	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
+
+ok 10 - 2e: post-add untracked
+
+expecting success of 2205.11 '3a: setup--add repo dir': 
+	mkdir test3 &&
+	(
+	cd test3 &&
+	test_create_repo repo &&
+
+	mkdir -p repo/inside-tracked repo/inside-ignored &&
+	>repo/file-tracked &&
+	>repo/file-ignored &&
+	>repo/inside-tracked/file &&
+	>repo/inside-ignored/file &&
+
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	actual-*
+	expect-*
+	*ignored
+	EOF
+
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
+
+	cat >expect-ignored-unsorted <<-EOF
+	repo/file-ignored
+	repo/inside-ignored/
+	.gitignore
+	actual-ignored-unsorted
+	expect-ignored-unsorted
+	expect-tracked-unsorted
+	EOF
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
+ok 11 - 3a: setup--add repo dir
+
+expecting success of 2205.12 '3b: ignored': 
+	(
+	cd test3 &&
+	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
+	sort actual-ignored-unsorted >actual-ignored &&
+	sort expect-ignored-unsorted >expect-ignored &&
+	test_cmp expect-ignored actual-ignored
+	)
+
+ok 12 - 3b: ignored
+
+expecting success of 2205.13 '3c: add repo': 
+	(
+	cd test3 &&
+	git --git-dir=repo/.git add repo &&
+	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
+	sort actual-tracked-unsorted >actual-tracked &&
+	sort expect-tracked-unsorted >expect-tracked &&
+	test_cmp expect-tracked actual-tracked
+	)
+
+ok 13 - 3c: add repo
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2300-cd-to-toplevel/.git/
+expecting success of 2300.1 'at physical root': 
+		(
+			cd 'repo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 1 - at physical root
+
+expecting success of 2300.2 'at physical subdir': 
+		(
+			cd 'repo/sub/dir' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 2 - at physical subdir
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 2300.3 'at symbolic root': 
+		(
+			cd 'symrepo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 3 - at symbolic root
+
+expecting success of 2300.4 'at symbolic subdir': 
+		(
+			cd 'subdir-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 4 - at symbolic subdir
+
+expecting success of 2300.5 'at internal symbolic subdir': 
+		(
+			cd 'internal-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 5 - at internal symbolic subdir
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2204-add-ignored.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2204-add-ignored/.git/
+expecting success of 2204.1 'setup': 
+	mkdir sub dir dir/sub &&
+	echo sub >.gitignore &&
+	echo ign >>.gitignore &&
+	for p in . sub dir dir/sub
+	do
+		>"$p/ign" &&
+		>"$p/file" || exit 1
+	done
+
+ok 1 - setup
+
+expecting success of 2204.2 'no complaints for unignored file': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 2 - no complaints for unignored file
+
+expecting success of 2204.3 'no complaints for unignored dir/file': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 3 - no complaints for unignored dir/file
+
+expecting success of 2204.4 'no complaints for unignored dir': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 4 - no complaints for unignored dir
+
+expecting success of 2204.5 'no complaints for unignored d*': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 5 - no complaints for unignored d*
+
+expecting success of 2204.6 'complaints for ignored ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 6 - complaints for ignored ign
+
+expecting success of 2204.7 'complaints for ignored ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 7 - complaints for ignored ign output
+
+expecting success of 2204.8 'complaints for ignored ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 8 - complaints for ignored ign with unignored file
+
+expecting success of 2204.9 'complaints for ignored ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 9 - complaints for ignored ign with unignored file output
+
+expecting success of 2204.10 'complaints for ignored dir/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 10 - complaints for ignored dir/ign
+
+expecting success of 2204.11 'complaints for ignored dir/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 11 - complaints for ignored dir/ign output
+
+expecting success of 2204.12 'complaints for ignored dir/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 12 - complaints for ignored dir/ign with unignored file
+
+expecting success of 2204.13 'complaints for ignored dir/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 13 - complaints for ignored dir/ign with unignored file output
+
+expecting success of 2204.14 'complaints for ignored dir/sub': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 14 - complaints for ignored dir/sub
+
+expecting success of 2204.15 'complaints for ignored dir/sub output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 15 - complaints for ignored dir/sub output
+
+expecting success of 2204.16 'complaints for ignored dir/sub with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 16 - complaints for ignored dir/sub with unignored file
+
+expecting success of 2204.17 'complaints for ignored dir/sub with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 17 - complaints for ignored dir/sub with unignored file output
+
+expecting success of 2204.18 'complaints for ignored dir/sub/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 18 - complaints for ignored dir/sub/ign
+
+expecting success of 2204.19 'complaints for ignored dir/sub/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 19 - complaints for ignored dir/sub/ign output
+
+expecting success of 2204.20 'complaints for ignored dir/sub/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 20 - complaints for ignored dir/sub/ign with unignored file
+
+expecting success of 2204.21 'complaints for ignored dir/sub/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 21 - complaints for ignored dir/sub/ign with unignored file output
+
+expecting success of 2204.22 'complaints for ignored sub/file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 22 - complaints for ignored sub/file
+
+expecting success of 2204.23 'complaints for ignored sub/file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 23 - complaints for ignored sub/file output
+
+expecting success of 2204.24 'complaints for ignored sub/file with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 24 - complaints for ignored sub/file with unignored file
+
+expecting success of 2204.25 'complaints for ignored sub/file with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 25 - complaints for ignored sub/file with unignored file output
+
+expecting success of 2204.26 'complaints for ignored sub': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 26 - complaints for ignored sub
+
+expecting success of 2204.27 'complaints for ignored sub output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 27 - complaints for ignored sub output
+
+expecting success of 2204.28 'complaints for ignored sub with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 28 - complaints for ignored sub with unignored file
+
+expecting success of 2204.29 'complaints for ignored sub with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 29 - complaints for ignored sub with unignored file output
+
+expecting success of 2204.30 'complaints for ignored sub/file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 30 - complaints for ignored sub/file
+
+expecting success of 2204.31 'complaints for ignored sub/file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 31 - complaints for ignored sub/file output
+
+expecting success of 2204.32 'complaints for ignored sub/file with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 32 - complaints for ignored sub/file with unignored file
+
+expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 33 - complaints for ignored sub/file with unignored file output
+
+expecting success of 2204.34 'complaints for ignored sub/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 34 - complaints for ignored sub/ign
+
+expecting success of 2204.35 'complaints for ignored sub/ign output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 35 - complaints for ignored sub/ign output
+
+expecting success of 2204.36 'complaints for ignored sub/ign with unignored file': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" file 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 36 - complaints for ignored sub/ign with unignored file
+
+expecting success of 2204.37 'complaints for ignored sub/ign with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 37 - complaints for ignored sub/ign with unignored file output
+
+expecting success of 2204.38 'complaints for ignored sub in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 38 - complaints for ignored sub in dir
+
+expecting success of 2204.39 'complaints for ignored sub in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 39 - complaints for ignored sub in dir output
+
+expecting success of 2204.40 'complaints for ignored sub/file in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 40 - complaints for ignored sub/file in dir
+
+expecting success of 2204.41 'complaints for ignored sub/file in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 41 - complaints for ignored sub/file in dir output
+
+expecting success of 2204.42 'complaints for ignored sub/ign in dir': 
+		rm -f .git/index &&
+		(
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 42 - complaints for ignored sub/ign in dir
+
+expecting success of 2204.43 'complaints for ignored sub/ign in dir output': 
+		(
+			cd dir &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 43 - complaints for ignored sub/ign in dir output
+
+expecting success of 2204.44 'complaints for ignored ign in sub': 
+		rm -f .git/index &&
+		(
+			cd sub &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 44 - complaints for ignored ign in sub
+
+expecting success of 2204.45 'complaints for ignored ign in sub output': 
+		(
+			cd sub &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 45 - complaints for ignored ign in sub output
+
+expecting success of 2204.46 'complaints for ignored file in sub': 
+		rm -f .git/index &&
+		(
+			cd sub &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
+		)
+	
+ok 46 - complaints for ignored file in sub
+
+expecting success of 2204.47 'complaints for ignored file in sub output': 
+		(
+			cd sub &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 47 - complaints for ignored file in sub output
+
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2203-add-intent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/.git/
+expecting success of 2203.1 'intent to add': 
+	test_commit 1 &&
+	git rm 1.t &&
+	echo hello >1.t &&
+	echo hello >file &&
+	echo hello >elif &&
+	git add -N file &&
+	git add elif &&
+	git add -N 1.t
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+rm '1.t'
+ok 1 - intent to add
+
+expecting success of 2203.2 'git status': 
+	git status --porcelain | grep -v actual >actual &&
+	cat >expect <<-\EOF &&
+	DA 1.t
+	A  elif
+	 A file
+	EOF
+	test_cmp expect actual
+
+ok 2 - git status
+
+expecting success of 2203.3 'git status with porcelain v2': 
+	git status --porcelain=v2 | grep -v "^?" >actual &&
+	nam1=$(echo 1 | git hash-object --stdin) &&
+	nam2=$(git hash-object elif) &&
+	cat >expect <<-EOF &&
+	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
+	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
+	EOF
+	test_cmp expect actual
+
+ok 3 - git status with porcelain v2
+
+expecting success of 2203.4 'check result of "add -N"': 
+	git ls-files -s file >actual &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	echo "100644 $empty 0	file" >expect &&
+	test_cmp expect actual
+
+ok 4 - check result of "add -N"
+
+expecting success of 2203.5 'intent to add is just an ordinary empty blob': 
+	git add -u &&
+	git ls-files -s file >actual &&
+	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
+	test_cmp expect actual
+
+ok 5 - intent to add is just an ordinary empty blob
+
+expecting success of 2203.6 'intent to add does not clobber existing paths': 
+	git add -N file elif &&
+	empty=$(git hash-object --stdin </dev/null) &&
+	git ls-files -s >actual &&
+	! grep "$empty" actual
+
+ok 6 - intent to add does not clobber existing paths
+
+expecting success of 2203.7 'i-t-a entry is simply ignored': 
+	test_tick &&
+	git commit -a -m initial &&
+	git reset --hard &&
+
+	echo xyzzy >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m second &&
+	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
+	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
+	test $(git diff --name-only -- nitfol | wc -l) = 1
+
+[master b7cca08] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 elif
+ create mode 100644 file
+HEAD is now at b7cca08 initial
+[master b70ad0b] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rezrov
+ok 7 - i-t-a entry is simply ignored
+
+expecting success of 2203.8 'can commit with an unrelated i-t-a entry in index': 
+	git reset --hard &&
+	echo bozbar >rezrov &&
+	echo frotz >nitfol &&
+	git add rezrov &&
+	git add -N nitfol &&
+	git commit -m partial rezrov
+
+HEAD is now at b70ad0b second
+[master 1ed15b5] partial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - can commit with an unrelated i-t-a entry in index
+
+expecting success of 2203.9 'can "commit -a" with an i-t-a entry': 
+	git reset --hard &&
+	: >nitfol &&
+	git add -N nitfol &&
+	git commit -a -m all
+
+HEAD is now at 1ed15b5 partial
+[master 415f3ad] all
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nitfol
+ok 9 - can "commit -a" with an i-t-a entry
+
+expecting success of 2203.10 'cache-tree invalidates i-t-a paths': 
+	git reset --hard &&
+	mkdir dir &&
+	: >dir/foo &&
+	git add dir/foo &&
+	git commit -m foo &&
+
+	: >dir/bar &&
+	git add -N dir/bar &&
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual &&
+
+	git write-tree >/dev/null &&
+
+	git diff --name-only >actual &&
+	echo dir/bar >expect &&
+	test_cmp expect actual
+
+HEAD is now at 415f3ad all
+[master 03f6a20] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir/foo
+ok 10 - cache-tree invalidates i-t-a paths
+
+expecting success of 2203.11 'cache-tree does not ignore dir that has i-t-a entries': 
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir 2 &&
+		for f in 1 2/1 2/2 3
+		do
+			echo "$f" >"$f" || return 1
+		done &&
+		git add 1 2/2 3 &&
+		git add -N 2/1 &&
+		git commit -m committed &&
+		git ls-tree -r HEAD >actual &&
+		grep 2/2 actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+[master (root-commit) 7b0eb4f] committed
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 1
+ create mode 100644 2/2
+ create mode 100644 3
+100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
+ok 11 - cache-tree does not ignore dir that has i-t-a entries
+
+expecting success of 2203.12 'cache-tree does skip dir that becomes empty': 
+	rm -fr ita-in-dir &&
+	git init ita-in-dir &&
+	(
+		cd ita-in-dir &&
+		mkdir -p 1/2/3 &&
+		echo 4 >1/2/3/4 &&
+		git add -N 1/2/3/4 &&
+		git write-tree >actual &&
+		echo $EMPTY_TREE >expected &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/ita-in-dir/.git/
+ok 12 - cache-tree does skip dir that becomes empty
+
+expecting success of 2203.13 'commit: ita entries ignored in empty initial commit check': 
+	git init empty-initial-commit &&
+	(
+		cd empty-initial-commit &&
+		: >one &&
+		git add -N one &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
+On branch master
+
+Initial commit
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   one
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 13 - commit: ita entries ignored in empty initial commit check
+
+expecting success of 2203.14 'commit: ita entries ignored in empty commit check': 
+	git init empty-subsequent-commit &&
+	(
+		cd empty-subsequent-commit &&
+		test_commit one &&
+		: >two &&
+		git add -N two &&
+		test_must_fail git commit -m nothing-new-here
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
+[master (root-commit) 4331c28] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	new file:   two
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 14 - commit: ita entries ignored in empty commit check
+
+expecting success of 2203.15 'rename detection finds the right names': 
+	git init rename-detection &&
+	(
+		cd rename-detection &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		mv first third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		 R first -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
+		EOF
+		test_cmp expected.3 actual.3 &&
+
+		git diff --stat >actual.4 &&
+		cat >expected.4 <<-EOF &&
+		 first => third | 0
+		 1 file changed, 0 insertions(+), 0 deletions(-)
+		EOF
+		test_cmp expected.4 actual.4 &&
+
+		git diff --cached --stat >actual.5 &&
+		test_must_be_empty actual.5
+
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/rename-detection/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> third
+ok 15 - rename detection finds the right names
+
+expecting success of 2203.16 'double rename detection in status': 
+	git init rename-detection-2 &&
+	(
+		cd rename-detection-2 &&
+		echo contents >first &&
+		git add first &&
+		git commit -m first &&
+		git mv first second &&
+		mv second third &&
+		git add -N third &&
+
+		git status | grep -v "^?" >actual.1 &&
+		test_grep "renamed: *first -> second" actual.1 &&
+		test_grep "renamed: *second -> third" actual.1 &&
+
+		git status --porcelain | grep -v "^?" >actual.2 &&
+		cat >expected.2 <<-\EOF &&
+		R  first -> second
+		 R second -> third
+		EOF
+		test_cmp expected.2 actual.2 &&
+
+		hash=$(git hash-object third) &&
+		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+		cat >expected.3 <<-EOF &&
+		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
+		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
+		EOF
+		test_cmp expected.3 actual.3
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/rename-detection-2/.git/
+[master (root-commit) 0bad72c] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+	renamed:    first -> second
+	renamed:    second -> third
+ok 16 - double rename detection in status
+
+expecting success of 2203.17 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"': 
+	git reset --hard &&
+	: >empty &&
+	content="foo" &&
+	echo "$content" >not-empty &&
+
+	hash_e=$(git hash-object empty) &&
+	hash_n=$(git hash-object not-empty) &&
+
+	cat >expect.diff_p <<-EOF &&
+	diff --git a/empty b/empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_e)
+	diff --git a/not-empty b/not-empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_n)
+	--- /dev/null
+	+++ b/not-empty
+	@@ -0,0 +1 @@
+	+$content
+	EOF
+	cat >expect.diff_s <<-EOF &&
+	 create mode 100644 empty
+	 create mode 100644 not-empty
+	EOF
+	cat >expect.diff_a <<-EOF &&
+	:000000 100644 0000000 0000000 A$(printf "\t")empty
+	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
+	EOF
+
+	git add -N empty not-empty &&
+
+	git diff >actual &&
+	test_cmp expect.diff_p actual &&
+
+	git diff --summary >actual &&
+	test_cmp expect.diff_s actual &&
+
+	git diff-files -p >actual &&
+	test_cmp expect.diff_p actual &&
+
+	git diff-files --abbrev >actual &&
+	test_cmp expect.diff_a actual &&
+
+	git diff --cached >actual &&
+	test_must_be_empty actual
+
+HEAD is now at 03f6a20 foo
+ok 17 - i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"
+
+expecting success of 2203.18 '"diff HEAD" includes ita as new files': 
+	git reset --hard &&
+	echo new >new-ita &&
+	oid=$(git hash-object new-ita) &&
+	oid=$(git rev-parse --short $oid) &&
+	git add -N new-ita &&
+	git diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/new-ita b/new-ita
+	new file mode 100644
+	index 0000000..$oid
+	--- /dev/null
+	+++ b/new-ita
+	@@ -0,0 +1 @@
+	+new
+	EOF
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+ok 18 - "diff HEAD" includes ita as new files
+
+expecting success of 2203.19 'apply --intent-to-add': 
+	git reset --hard &&
+	echo new >new-ita &&
+	git add -N new-ita &&
+	git diff >expected &&
+	grep "new file" expected &&
+	git reset --hard &&
+	git apply --intent-to-add expected &&
+	git diff >actual &&
+	test_cmp expected actual
+
+HEAD is now at 03f6a20 foo
+new file mode 100644
+HEAD is now at 03f6a20 foo
+ok 19 - apply --intent-to-add
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2401-worktree-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/.git/
+expecting success of 2401.1 'initialize': 
+	git commit --allow-empty -m init
+
+[main (root-commit) 50572bf] init
+ Author: A U Thor <author@example.com>
+ok 1 - initialize
+
+expecting success of 2401.2 'worktree prune on normal repo': 
+	git worktree prune &&
+	test_must_fail git worktree prune abc
+
+usage: git worktree prune [-n] [-v] [--expire <expire>]
+
+    -n, --[no-]dry-run    do not remove, show only
+    -v, --[no-]verbose    report pruned working trees
+    --[no-]expire <expiry-date>
+                          expire working trees older than <time>
+
+ok 2 - worktree prune on normal repo
+
+expecting success of 2401.3 'prune files inside $GIT_DIR/worktrees': 
+	mkdir .git/worktrees &&
+	: >.git/worktrees/abc &&
+	git worktree prune --verbose 2>actual &&
+	cat >expect <<EOF &&
+Removing worktrees/abc: not a valid directory
+EOF
+	test_cmp expect actual &&
+	! test -f .git/worktrees/abc &&
+	! test -d .git/worktrees
+
+ok 3 - prune files inside $GIT_DIR/worktrees
+
+expecting success of 2401.4 'prune directories without gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	cat >expect <<EOF &&
+Removing worktrees/def: gitdir file does not exist
+EOF
+	git worktree prune --verbose 2>actual &&
+	test_cmp expect actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
+
+ok 4 - prune directories without gitdir
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
+
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
+
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
+
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
+
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 2401.5 'prune directories with unreadable gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	: >.git/worktrees/def/gitdir &&
+	chmod u-r .git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
+
+Removing worktrees/def: unable to read gitdir file (Permission denied)
+ok 5 - prune directories with unreadable gitdir
+
+expecting success of 2401.6 'prune directories with invalid gitdir': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	: >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: invalid gitdir file" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
+
+Removing worktrees/def: invalid gitdir file
+ok 6 - prune directories with invalid gitdir
+
+expecting success of 2401.7 'prune directories with gitdir pointing to nowhere': 
+	mkdir -p .git/worktrees/def/abc &&
+	: >.git/worktrees/def/def &&
+	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
+	! test -d .git/worktrees/def &&
+	! test -d .git/worktrees
+
+Removing worktrees/def: gitdir file points to non-existent location
+ok 7 - prune directories with gitdir pointing to nowhere
+
+expecting success of 2401.8 'not prune locked checkout': 
+	test_when_finished rm -r .git/worktrees &&
+	mkdir -p .git/worktrees/ghi &&
+	: >.git/worktrees/ghi/locked &&
+	git worktree prune &&
+	test -d .git/worktrees/ghi
+
+ok 8 - not prune locked checkout
+
+expecting success of 2401.9 'not prune recent checkouts': 
+	test_when_finished rm -r .git/worktrees &&
+	git worktree add jlm HEAD &&
+	test -d .git/worktrees/jlm &&
+	rm -rf jlm &&
+	git worktree prune --verbose --expire=2.days.ago &&
+	test -d .git/worktrees/jlm
+
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 9 - not prune recent checkouts
+
+expecting success of 2401.10 'not prune proper checkouts': 
+	test_when_finished rm -r .git/worktrees &&
+	git worktree add --detach "$PWD/nop" main &&
+	git worktree prune &&
+	test -d .git/worktrees/nop
+
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 10 - not prune proper checkouts
+
+expecting success of 2401.11 'prune duplicate (linked/linked)': 
+	test_when_finished rm -fr .git/worktrees w1 w2 &&
+	git worktree add --detach w1 &&
+	git worktree add --detach w2 &&
+	sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
+	mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
+	git worktree prune --verbose 2>actual &&
+	test_grep "duplicate entry" actual &&
+	test -d .git/worktrees/w1 &&
+	! test -d .git/worktrees/w2
+
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+Removing worktrees/w2: duplicate entry
+ok 11 - prune duplicate (linked/linked)
+
+expecting success of 2401.12 'prune duplicate (main/linked)': 
+	test_when_finished rm -fr repo wt &&
+	test_create_repo repo &&
+	test_commit -C repo x &&
+	git -C repo worktree add --detach ../wt &&
+	rm -fr wt &&
+	mv repo wt &&
+	git -C wt worktree prune --verbose 2>actual &&
+	test_grep "duplicate entry" actual &&
+	! test -d .git/worktrees/wt
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/repo/.git/
+[main (root-commit) cb85766] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Preparing worktree (detached HEAD cb85766)
+HEAD is now at cb85766 x
+Removing worktrees/wt: duplicate entry
+ok 12 - prune duplicate (main/linked)
+
+expecting success of 2401.13 'not prune proper worktrees inside linked worktree with relative paths': 
+	test_when_finished rm -rf repo wt_ext &&
+	git init repo &&
+	(
+	    cd repo &&
+	    git config worktree.useRelativePaths true &&
+	    echo content >file &&
+	    git add file &&
+	    git commit -m msg &&
+	    git worktree add ../wt_ext &&
+	    git worktree add wt_int &&
+	    cd wt_int &&
+	    git worktree prune -v >out &&
+	    test_must_be_empty out &&
+	    cd ../../wt_ext &&
+	    git worktree prune -v >out &&
+	    test_must_be_empty out
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/repo/.git/
+[main (root-commit) b2ccb9a] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Preparing worktree (new branch 'wt_ext')
+HEAD is now at b2ccb9a msg
+Preparing worktree (new branch 'wt_int')
+HEAD is now at b2ccb9a msg
+ok 13 - not prune proper worktrees inside linked worktree with relative paths
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1013-read-tree-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1013-read-tree-submodule/.git/
 expecting success of 1013.1 'git read-tree -u -m --recurse-submodules: added submodule is checked out': 
@@ -100288,716 +102223,1830 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2204-add-ignored.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2204-add-ignored/.git/
-expecting success of 2204.1 'setup': 
-	mkdir sub dir dir/sub &&
-	echo sub >.gitignore &&
-	echo ign >>.gitignore &&
-	for p in . sub dir dir/sub
-	do
-		>"$p/ign" &&
-		>"$p/file" || exit 1
-	done
+*** t2404-worktree-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2404-worktree-config/.git/
+expecting success of 2404.1 'setup': 
+	test_commit start
 
+[master (root-commit) bb4ab09] start
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 start.t
 ok 1 - setup
 
-expecting success of 2204.2 'no complaints for unignored file': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 2 - no complaints for unignored file
-
-expecting success of 2204.3 'no complaints for unignored dir/file': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 3 - no complaints for unignored dir/file
+expecting success of 2404.2 'config --worktree in single worktree': 
+	git config --worktree foo.bar true &&
+	test_cmp_config true foo.bar
 
-expecting success of 2204.4 'no complaints for unignored dir': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 4 - no complaints for unignored dir
+ok 2 - config --worktree in single worktree
 
-expecting success of 2204.5 'no complaints for unignored d*': 
-		rm -f .git/index &&
-		git add "$i" &&
-		git ls-files "$i" >out &&
-		test -s out
-	
-ok 5 - no complaints for unignored d*
+expecting success of 2404.3 'add worktrees': 
+	git worktree add wt1 &&
+	git worktree add wt2
 
-expecting success of 2204.6 'complaints for ignored ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 6 - complaints for ignored ign
+Preparing worktree (new branch 'wt1')
+HEAD is now at bb4ab09 start
+Preparing worktree (new branch 'wt2')
+HEAD is now at bb4ab09 start
+ok 3 - add worktrees
 
-expecting success of 2204.7 'complaints for ignored ign output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 7 - complaints for ignored ign output
+expecting success of 2404.4 'config --worktree without extension': 
+	test_must_fail git config --worktree foo.bar false
 
-expecting success of 2204.8 'complaints for ignored ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 8 - complaints for ignored ign with unignored file
+fatal: --worktree cannot be used with multiple working trees unless the config
+extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
+section in "git help worktree" for details
+ok 4 - config --worktree without extension
 
-expecting success of 2204.9 'complaints for ignored ign with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 9 - complaints for ignored ign with unignored file output
+expecting success of 2404.5 'enable worktreeConfig extension': 
+	git config core.repositoryformatversion 1 &&
+	git config extensions.worktreeConfig true &&
+	test_cmp_config true extensions.worktreeConfig &&
+	test_cmp_config 1 core.repositoryformatversion
 
-expecting success of 2204.10 'complaints for ignored dir/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 10 - complaints for ignored dir/ign
+ok 5 - enable worktreeConfig extension
 
-expecting success of 2204.11 'complaints for ignored dir/ign output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 11 - complaints for ignored dir/ign output
+expecting success of 2404.6 'config is shared as before': 
+	git config this.is shared &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-expecting success of 2204.12 'complaints for ignored dir/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 12 - complaints for ignored dir/ign with unignored file
+ok 6 - config is shared as before
 
-expecting success of 2204.13 'complaints for ignored dir/ign with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 13 - complaints for ignored dir/ign with unignored file output
+expecting success of 2404.7 'config is shared (set from another worktree)': 
+	git -C wt1 config that.is also-shared &&
+	test_cmp_config also-shared that.is &&
+	test_cmp_config -C wt1 also-shared that.is &&
+	test_cmp_config -C wt2 also-shared that.is
 
-expecting success of 2204.14 'complaints for ignored dir/sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 14 - complaints for ignored dir/sub
+ok 7 - config is shared (set from another worktree)
 
-expecting success of 2204.15 'complaints for ignored dir/sub output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 15 - complaints for ignored dir/sub output
+expecting success of 2404.8 'config private to main worktree': 
+	git config --worktree this.is for-main &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-expecting success of 2204.16 'complaints for ignored dir/sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 16 - complaints for ignored dir/sub with unignored file
+ok 8 - config private to main worktree
 
-expecting success of 2204.17 'complaints for ignored dir/sub with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 17 - complaints for ignored dir/sub with unignored file output
+expecting success of 2404.9 'config private to linked worktree': 
+	git -C wt1 config --worktree this.is for-wt1 &&
+	test_cmp_config for-main this.is &&
+	test_cmp_config -C wt1 for-wt1 this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-expecting success of 2204.18 'complaints for ignored dir/sub/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 18 - complaints for ignored dir/sub/ign
+ok 9 - config private to linked worktree
 
-expecting success of 2204.19 'complaints for ignored dir/sub/ign output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 19 - complaints for ignored dir/sub/ign output
+expecting success of 2404.10 'core.bare no longer for main only': 
+	test_config core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
 
-expecting success of 2204.20 'complaints for ignored dir/sub/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 20 - complaints for ignored dir/sub/ign with unignored file
+ok 10 - core.bare no longer for main only
 
-expecting success of 2204.21 'complaints for ignored dir/sub/ign with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 21 - complaints for ignored dir/sub/ign with unignored file output
+expecting success of 2404.11 'per-worktree core.bare is picked up': 
+	git -C wt1 config --worktree core.bare true &&
+	test "$(git rev-parse --is-bare-repository)" = false &&
+	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
+	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
 
-expecting success of 2204.22 'complaints for ignored sub/file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 22 - complaints for ignored sub/file
+ok 11 - per-worktree core.bare is picked up
 
-expecting success of 2204.23 'complaints for ignored sub/file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 23 - complaints for ignored sub/file output
+expecting success of 2404.12 'config.worktree no longer read without extension': 
+	git config --unset extensions.worktreeConfig &&
+	test_cmp_config shared this.is &&
+	test_cmp_config -C wt1 shared this.is &&
+	test_cmp_config -C wt2 shared this.is
 
-expecting success of 2204.24 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 24 - complaints for ignored sub/file with unignored file
+ok 12 - config.worktree no longer read without extension
 
-expecting success of 2204.25 'complaints for ignored sub/file with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 25 - complaints for ignored sub/file with unignored file output
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2405-worktree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/.git/
+expecting success of 2405.1 'setup: create origin repos': 
+	git config --global protocol.file.allow always &&
+	git init origin/sub &&
+	test_commit -C origin/sub file1 &&
+	git init origin/main &&
+	test_commit -C origin/main first &&
+	git -C origin/main submodule add ../sub &&
+	git -C origin/main commit -m "add sub" &&
+	test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
+	git -C origin/main/sub pull &&
+	git -C origin/main add sub &&
+	git -C origin/main commit -m "sub updated"
 
-expecting success of 2204.26 'complaints for ignored sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 26 - complaints for ignored sub
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub/.git/
+[main (root-commit) 69af168] file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/main/.git/
+[main (root-commit) 1e96f59] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
+done.
+[main 322c452] add sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main 7829796] file1 updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub
+   69af168..7829796  main         -> origin/main
+ * [new tag]         file1updated -> file1updated
+Updating 69af168..7829796
+Fast-forward
+ file1 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[main d717f19] sub updated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup: create origin repos
 
-expecting success of 2204.27 'complaints for ignored sub output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 27 - complaints for ignored sub output
+expecting success of 2405.2 'setup: clone superproject to create main worktree': 
+	git clone --recursive "$base_path/origin/main" main
 
-expecting success of 2204.28 'complaints for ignored sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 28 - complaints for ignored sub with unignored file
+Cloning into 'main'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/main/sub'...
+done.
+Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
+ok 2 - setup: clone superproject to create main worktree
 
-expecting success of 2204.29 'complaints for ignored sub with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 29 - complaints for ignored sub with unignored file output
+expecting success of 2405.3 'add superproject worktree': 
+	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
 
-expecting success of 2204.30 'complaints for ignored sub/file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 30 - complaints for ignored sub/file
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+ok 3 - add superproject worktree
 
-expecting success of 2204.31 'complaints for ignored sub/file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 31 - complaints for ignored sub/file output
+checking known breakage of 2405.4 'submodule is checked out just after worktree add': 
+	git -C worktree diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 2204.32 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 32 - complaints for ignored sub/file with unignored file
+not ok 4 - submodule is checked out just after worktree add # TODO known breakage
 
-expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 33 - complaints for ignored sub/file with unignored file output
+expecting success of 2405.5 'add superproject worktree and initialize submodules': 
+	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
+	git -C worktree-submodule-update submodule update
 
-expecting success of 2204.34 'complaints for ignored sub/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 34 - complaints for ignored sub/ign
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/worktree-submodule-update/sub'...
+done.
+Submodule path 'sub': checked out '69af1687b671131ed0cfa61b7fcdc907a4c21f2c'
+ok 5 - add superproject worktree and initialize submodules
 
-expecting success of 2204.35 'complaints for ignored sub/ign output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 35 - complaints for ignored sub/ign output
+expecting success of 2405.6 'submodule is checked out just after submodule update in linked worktree': 
+	git -C worktree-submodule-update diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 2204.36 'complaints for ignored sub/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 36 - complaints for ignored sub/ign with unignored file
+  > file1 updated
+ok 6 - submodule is checked out just after submodule update in linked worktree
 
-expecting success of 2204.37 'complaints for ignored sub/ign with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 37 - complaints for ignored sub/ign with unignored file output
+expecting success of 2405.7 'add superproject worktree and manually add submodule worktree': 
+	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
+	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
 
-expecting success of 2204.38 'complaints for ignored sub in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 38 - complaints for ignored sub in dir
+Preparing worktree (detached HEAD 322c452)
+HEAD is now at 322c452 add sub
+Preparing worktree (detached HEAD 69af168)
+HEAD is now at 69af168 file1
+ok 7 - add superproject worktree and manually add submodule worktree
 
-expecting success of 2204.39 'complaints for ignored sub in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
-	
-hint: Use -f if you really want to add them.
-ok 39 - complaints for ignored sub in dir output
+expecting success of 2405.8 'submodule is checked out after manually adding submodule worktree': 
+	git -C linked_submodule diff --submodule main"^!" >out &&
+	grep "file1 updated" out
 
-expecting success of 2204.40 'complaints for ignored sub/file in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 40 - complaints for ignored sub/file in dir
+  > file1 updated
+ok 8 - submodule is checked out after manually adding submodule worktree
 
-expecting success of 2204.41 'complaints for ignored sub/file in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
-	
-hint: Use -f if you really want to add them.
-ok 41 - complaints for ignored sub/file in dir output
+expecting success of 2405.9 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree': 
+	git -C main worktree add "$base_path/checkout-recurse" --detach  &&
+	git -C checkout-recurse submodule update --init &&
+	echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	test_cmp expect-gitfile actual-gitfile &&
+	git -C main/sub rev-parse HEAD >expect-head-main &&
+	git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	git -C main/sub rev-parse HEAD >actual-head-main &&
+	test_cmp expect-gitfile actual-gitfile &&
+	test_cmp expect-head-main actual-head-main
 
-expecting success of 2204.42 'complaints for ignored sub/ign in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 42 - complaints for ignored sub/ign in dir
+Preparing worktree (detached HEAD d717f19)
+HEAD is now at d717f19 sub updated
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/checkout-recurse/sub'...
+done.
+Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
+Previous HEAD position was d717f19 sub updated
+HEAD is now at 322c452 add sub
+ok 9 - checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree
 
-expecting success of 2204.43 'complaints for ignored sub/ign in dir output': 
-		(
-			cd dir &&
-			test_grep -e "Use -f if" err
-		)
-	
-hint: Use -f if you really want to add them.
-ok 43 - complaints for ignored sub/ign in dir output
+expecting success of 2405.10 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config': 
+	echo "../../../sub" >expect-main &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main &&
+	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
+	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
+	test_cmp expect-linked actual-linked &&
+	git -C checkout-recurse checkout --recurse-submodules first &&
+	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
+	test_must_be_empty linked-config &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main
 
-expecting success of 2204.44 'complaints for ignored ign in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 44 - complaints for ignored ign in sub
+Previous HEAD position was 322c452 add sub
+HEAD is now at 1e96f59 first
+ok 10 - core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config
 
-expecting success of 2204.45 'complaints for ignored ign in sub output': 
-		(
-			cd sub &&
-			test_grep -e "Use -f if" err
-		)
-	
-hint: Use -f if you really want to add them.
-ok 45 - complaints for ignored ign in sub output
+expecting success of 2405.11 'unsetting core.worktree does not prevent running commands directly against the submodule repository': 
+	git -C main/.git/worktrees/checkout-recurse/modules/sub log
 
-expecting success of 2204.46 'complaints for ignored file in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 46 - complaints for ignored file in sub
+commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 2204.47 'complaints for ignored file in sub output': 
-		(
-			cd sub &&
-			test_grep -e "Use -f if" err
-		)
-	
-hint: Use -f if you really want to add them.
-ok 47 - complaints for ignored file in sub output
+    file1
+ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
 
-# passed all 47 test(s)
-1..47
+# still have 1 known breakage(s)
+# passed all remaining 10 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2205-add-worktree-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/.git/
-expecting success of 2205.1 '1a: setup--config worktree': 
-	mkdir test1 &&
-	(
-	cd test1 &&
-	test_create_repo repo &&
-	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
-
-	mkdir -p outside-tracked outside-untracked &&
-	mkdir -p repo/inside-tracked repo/inside-untracked &&
-	>file-tracked &&
-	>file-untracked &&
-	>outside-tracked/file &&
-	>outside-untracked/file &&
-	>repo/file-tracked &&
-	>repo/file-untracked &&
-	>repo/inside-tracked/file &&
-	>repo/inside-untracked/file &&
-
-	cat >expect-tracked-unsorted <<-EOF &&
-	../file-tracked
-	../outside-tracked/file
-	file-tracked
-	inside-tracked/file
+*** t2403-worktree-move.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/.git/
+expecting success of 2403.1 'setup': 
+	test_commit init &&
+	git worktree add source &&
+	git worktree list --porcelain >out &&
+	grep "^worktree" out >actual &&
+	cat <<-EOF >expected &&
+	worktree $(pwd)
+	worktree $(pwd)/source
 	EOF
+	test_cmp expected actual
 
-	cat >expect-untracked-unsorted <<-EOF &&
-	../file-untracked
-	../outside-untracked/file
-	file-untracked
-	inside-untracked/file
-	EOF
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (new branch 'source')
+HEAD is now at 2519212 init
+ok 1 - setup
 
-	cat >expect-all-dir-unsorted <<-EOF &&
-	../file-untracked
-	../file-tracked
-	../outside-untracked/
-	../outside-tracked/
-	./
-	EOF
+expecting success of 2403.2 'lock main worktree': 
+	test_must_fail git worktree lock .
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+fatal: The main working tree cannot be locked or unlocked
+ok 2 - lock main worktree
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
-	)
+expecting success of 2403.3 'lock linked worktree': 
+	git worktree lock --reason hahaha source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
-ok 1 - 1a: setup--config worktree
+ok 3 - lock linked worktree
 
-expecting success of 2205.2 '1b: pre-add all': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
-	sort actual-all-unsorted >actual-all &&
-	sort expect-all-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+expecting success of 2403.4 'lock linked worktree from another worktree': 
+	rm .git/worktrees/source/locked &&
+	git worktree add elsewhere &&
+	git -C elsewhere worktree lock --reason hahaha ../source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-ok 2 - 1b: pre-add all
+Preparing worktree (new branch 'elsewhere')
+HEAD is now at 2519212 init
+ok 4 - lock linked worktree from another worktree
 
-expecting success of 2205.3 '1c: pre-add dir all': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --directory --exclude-standard "$parent_dir" >actual-all-dir-unsorted &&
-	sort actual-all-dir-unsorted >actual-all &&
-	sort expect-all-dir-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+expecting success of 2403.5 'lock worktree twice': 
+	test_must_fail git worktree lock source &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-ok 3 - 1c: pre-add dir all
+fatal: 'source' is already locked, reason: hahaha
+ok 5 - lock worktree twice
 
-expecting success of 2205.4 '1d: post-add tracked': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	(
-		cd repo &&
-		git add file-tracked &&
-		git add inside-tracked &&
-		git add ../outside-tracked &&
-		git add "$parent_dir/file-tracked" &&
-		git ls-files "$parent_dir" >../actual-tracked-unsorted
-	) &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
-	)
+expecting success of 2403.6 'lock worktree twice (from the locked worktree)': 
+	test_must_fail git -C source worktree lock . &&
+	echo hahaha >expected &&
+	test_cmp expected .git/worktrees/source/locked
 
-ok 4 - 1d: post-add tracked
+fatal: '.' is already locked, reason: hahaha
+ok 6 - lock worktree twice (from the locked worktree)
 
-expecting success of 2205.5 '1e: post-add untracked': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
-	sort actual-untracked-unsorted >actual-untracked &&
-	sort expect-untracked-unsorted >expect-untracked &&
-	test_cmp expect-untracked actual-untracked
-	)
+expecting success of 2403.7 'unlock main worktree': 
+	test_must_fail git worktree unlock .
 
-ok 5 - 1e: post-add untracked
+fatal: The main working tree cannot be locked or unlocked
+ok 7 - unlock main worktree
 
-expecting success of 2205.6 '2a: setup--set git-dir': 
-	mkdir test2 &&
-	(
-	cd test2 &&
-	test_create_repo repo &&
-	# create two foreign repositories that should remain untracked
-	test_create_repo repo-outside &&
-	test_create_repo repo/repo-inside &&
+expecting success of 2403.8 'unlock linked worktree': 
+	git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-	mkdir -p repo/inside-tracked repo/inside-untracked &&
-	>repo/file-tracked &&
-	>repo/file-untracked &&
-	>repo/inside-tracked/file &&
-	>repo/inside-untracked/file &&
-	>repo-outside/file &&
-	>repo/repo-inside/file &&
+ok 8 - unlock linked worktree
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
-	EOF
+expecting success of 2403.9 'unlock worktree twice': 
+	test_must_fail git worktree unlock source &&
+	test_path_is_missing .git/worktrees/source/locked
 
-	cat >expect-untracked-unsorted <<-EOF &&
-	repo/file-untracked
-	repo/inside-untracked/file
-	repo/repo-inside/
-	repo-outside/
-	EOF
+fatal: 'source' is not locked
+ok 9 - unlock worktree twice
 
-	cat >expect-all-dir-unsorted <<-EOF &&
-	repo/
-	repo-outside/
-	EOF
+expecting success of 2403.10 'move non-worktree': 
+	mkdir abc &&
+	test_must_fail git worktree move abc def
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+fatal: 'abc' is not a working tree
+ok 10 - move non-worktree
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
+expecting success of 2403.11 'move locked worktree': 
+	git worktree lock source &&
+	test_when_finished "git worktree unlock source" &&
+	test_must_fail git worktree move source destination
+
+fatal: cannot move a locked working tree;
+use 'move -f -f' to override or unlock first
+ok 11 - move locked worktree
+
+expecting success of 2403.12 'move worktree': 
+	git worktree move source destination &&
+	test_path_is_missing source &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/destination$" out &&
+	! grep "^worktree.*/source$" out &&
+	git -C destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
+
+worktree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/destination
+ok 12 - move worktree
+
+expecting success of 2403.13 'move main worktree': 
+	test_must_fail git worktree move . def
+
+fatal: '.' is a main working tree
+ok 13 - move main worktree
+
+expecting success of 2403.14 'move worktree to another dir': 
+	mkdir some-dir &&
+	git worktree move destination some-dir &&
+	test_when_finished "git worktree move some-dir/destination destination" &&
+	test_path_is_missing destination &&
+	git worktree list --porcelain >out &&
+	grep "^worktree.*/some-dir/destination$" out &&
+	git -C some-dir/destination log --format=%s >actual2 &&
+	echo init >expected2 &&
+	test_cmp expected2 actual2
+
+worktree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/some-dir/destination
+ok 14 - move worktree to another dir
+
+expecting success of 2403.15 'move locked worktree (force)': 
+	test_when_finished "
+		git worktree unlock flump || :
+		git worktree remove flump || :
+		git worktree unlock ploof || :
+		git worktree remove ploof || :
+		" &&
+	git worktree add --detach flump &&
+	git worktree lock flump &&
+	test_must_fail git worktree move flump ploof" &&
+	test_must_fail git worktree move --force flump ploof" &&
+	git worktree move --force --force flump ploof
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: cannot move a locked working tree;
+use 'move -f -f' to override or unlock first
+fatal: 'flump' is not a working tree
+fatal: 'flump' is not a working tree
+ok 15 - move locked worktree (force)
+
+expecting success of 2403.16 'refuse to move worktree atop existing path': 
+	>bobble &&
+	git worktree add --detach beeble &&
+	test_must_fail git worktree move beeble bobble
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: 'bobble' already exists
+ok 16 - refuse to move worktree atop existing path
+
+expecting success of 2403.17 'move atop existing but missing worktree': 
+	git worktree add --detach gnoo &&
+	git worktree add --detach pneu &&
+	rm -fr pneu &&
+	test_must_fail git worktree move gnoo pneu &&
+	git worktree move --force gnoo pneu &&
+
+	git worktree add --detach nu &&
+	git worktree lock nu &&
+	rm -fr nu &&
+	test_must_fail git worktree move pneu nu &&
+	test_must_fail git worktree --force move pneu nu &&
+	git worktree move --force --force pneu nu
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: 'pneu' is a missing but already registered worktree;
+use 'move -f' to override, or 'prune' or 'remove' to clear
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: 'nu' is a missing but locked worktree;
+use 'move -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
+error: unknown option `force'
+usage: git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]
+                        [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]
+   or: git worktree list [-v | --porcelain [-z]]
+   or: git worktree lock [--reason <string>] <worktree>
+   or: git worktree move <worktree> <new-path>
+   or: git worktree prune [-n] [-v] [--expire <expire>]
+   or: git worktree remove [-f] <worktree>
+   or: git worktree repair [<path>...]
+   or: git worktree unlock <worktree>
+
+ok 17 - move atop existing but missing worktree
+
+expecting success of 2403.18 'move a repo with uninitialized submodule': 
+	git init withsub &&
+	(
+		cd withsub &&
+		test_commit initial &&
+		git -c protocol.file.allow=always \
+			submodule add "$PWD"/.git sub &&
+		git commit -m withsub &&
+		git worktree add second HEAD &&
+		git worktree move second third
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
-ok 6 - 2a: setup--set git-dir
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/.git/
+[master (root-commit) 5e30013] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/sub'...
+done.
+[master 13577cc] withsub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Preparing worktree (detached HEAD 13577cc)
+HEAD is now at 13577cc withsub
+ok 18 - move a repo with uninitialized submodule
 
-expecting success of 2205.7 '2b: pre-add all': 
+expecting success of 2403.19 'not move a repo with initialized submodule': 
 	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-all-unsorted &&
-	sort actual-all-unsorted >actual-all &&
-	sort expect-all-unsorted >expect-all &&
-	test_cmp expect-all actual-all
+		cd withsub &&
+		git -c protocol.file.allow=always -C third submodule update &&
+		test_must_fail git worktree move third forth
 	)
 
-ok 7 - 2b: pre-add all
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/third/sub'...
+done.
+Submodule path 'sub': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
+fatal: working trees containing submodules cannot be moved or removed
+ok 19 - not move a repo with initialized submodule
 
-expecting success of 2205.8 '2c: pre-add dir all': 
+expecting success of 2403.20 'remove main worktree': 
+	test_must_fail git worktree remove .
+
+fatal: '.' is a main working tree
+ok 20 - remove main worktree
+
+expecting success of 2403.21 'remove locked worktree': 
+	git worktree lock destination &&
+	test_when_finished "git worktree unlock destination" &&
+	test_must_fail git worktree remove destination
+
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+ok 21 - remove locked worktree
+
+expecting success of 2403.22 'remove worktree with dirty tracked file': 
+	echo dirty >>destination/init.t &&
+	test_when_finished "git -C destination checkout init.t" &&
+	test_must_fail git worktree remove destination
+
+fatal: 'destination' contains modified or untracked files, use --force to delete it
+Updated 1 path from the index
+ok 22 - remove worktree with dirty tracked file
+
+expecting success of 2403.23 'remove worktree with untracked file': 
+	: >destination/untracked &&
+	test_must_fail git worktree remove destination
+
+fatal: 'destination' contains modified or untracked files, use --force to delete it
+ok 23 - remove worktree with untracked file
+
+expecting success of 2403.24 'force remove worktree with untracked file': 
+	git worktree remove --force destination &&
+	test_path_is_missing destination
+
+ok 24 - force remove worktree with untracked file
+
+expecting success of 2403.25 'remove missing worktree': 
+	git worktree add to-be-gone &&
+	test -d .git/worktrees/to-be-gone &&
+	mv to-be-gone gone &&
+	git worktree remove to-be-gone &&
+	test_path_is_missing .git/worktrees/to-be-gone
+
+Preparing worktree (new branch 'to-be-gone')
+HEAD is now at 2519212 init
+ok 25 - remove missing worktree
+
+expecting success of 2403.26 'NOT remove missing-but-locked worktree': 
+	git worktree add gone-but-locked &&
+	git worktree lock gone-but-locked &&
+	test -d .git/worktrees/gone-but-locked &&
+	mv gone-but-locked really-gone-now &&
+	test_must_fail git worktree remove gone-but-locked &&
+	test_path_is_dir .git/worktrees/gone-but-locked
+
+Preparing worktree (new branch 'gone-but-locked')
+HEAD is now at 2519212 init
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+ok 26 - NOT remove missing-but-locked worktree
+
+expecting success of 2403.27 'proper error when worktree not found': 
+	for i in noodle noodle/bork
+	do
+		test_must_fail git worktree lock $i 2>err &&
+		test_grep "not a working tree" err || return 1
+	done
+
+fatal: 'noodle' is not a working tree
+fatal: 'noodle/bork' is not a working tree
+ok 27 - proper error when worktree not found
+
+expecting success of 2403.28 'remove locked worktree (force)': 
+	git worktree add --detach gumby &&
+	test_when_finished "git worktree remove gumby || :" &&
+	git worktree lock gumby &&
+	test_when_finished "git worktree unlock gumby || :" &&
+	test_must_fail git worktree remove gumby &&
+	test_must_fail git worktree remove --force gumby &&
+	git worktree remove --force --force gumby
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+fatal: cannot remove a locked working tree;
+use 'remove -f -f' to override or unlock first
+fatal: 'gumby' is not a working tree
+fatal: 'gumby' is not a working tree
+ok 28 - remove locked worktree (force)
+
+expecting success of 2403.29 'remove cleans up .git/worktrees when empty': 
+	git init moog &&
 	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --directory --exclude-standard >actual-all-dir-unsorted &&
-	sort actual-all-dir-unsorted >actual-all &&
-	sort expect-all-dir-unsorted >expect-all &&
-	test_cmp expect-all actual-all
+		cd moog &&
+		test_commit bim &&
+		git worktree add --detach goom &&
+		test_path_exists .git/worktrees &&
+		git worktree remove goom &&
+		test_path_is_missing .git/worktrees
 	)
 
-ok 8 - 2c: pre-add dir all
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/moog/.git/
+[master (root-commit) 89d547b] bim
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bim.t
+Preparing worktree (detached HEAD 89d547b)
+HEAD is now at 89d547b bim
+ok 29 - remove cleans up .git/worktrees when empty
 
-expecting success of 2205.9 '2d: post-add tracked': 
+expecting success of 2403.30 'remove a repo with uninitialized submodule': 
+	test_config_global protocol.file.allow always &&
 	(
-	cd test2 &&
-	git --git-dir=repo/.git add repo/file-tracked &&
-	git --git-dir=repo/.git add repo/inside-tracked &&
-	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
+		cd withsub &&
+		git worktree add to-remove HEAD &&
+		git worktree remove to-remove
 	)
 
-ok 9 - 2d: post-add tracked
+Preparing worktree (detached HEAD 13577cc)
+HEAD is now at 13577cc withsub
+ok 30 - remove a repo with uninitialized submodule
 
-expecting success of 2205.10 '2e: post-add untracked': 
+expecting success of 2403.31 'not remove a repo with initialized submodule': 
+	test_config_global protocol.file.allow always &&
 	(
-	cd test2 &&
-	git --git-dir=repo/.git ls-files -o --exclude-standard >actual-untracked-unsorted &&
-	sort actual-untracked-unsorted >actual-untracked &&
-	sort expect-untracked-unsorted >expect-untracked &&
-	test_cmp expect-untracked actual-untracked
+		cd withsub &&
+		git worktree add to-remove HEAD &&
+		git -C to-remove submodule update &&
+		test_must_fail git worktree remove to-remove
 	)
 
-ok 10 - 2e: post-add untracked
+Preparing worktree (detached HEAD 13577cc)
+HEAD is now at 13577cc withsub
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/to-remove/sub'...
+done.
+Submodule path 'sub': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
+fatal: working trees containing submodules cannot be moved or removed
+ok 31 - not remove a repo with initialized submodule
 
-expecting success of 2205.11 '3a: setup--add repo dir': 
-	mkdir test3 &&
+expecting success of 2403.32 'move worktree with absolute path to relative path': 
+	test_config worktree.useRelativePaths false &&
+	git worktree add ./absolute &&
+	git worktree move --relative-paths absolute relative &&
+	echo "gitdir: ../.git/worktrees/absolute" >expect &&
+	test_cmp expect relative/.git &&
+	echo "../../../relative/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir &&
+	test_config worktree.useRelativePaths true &&
+	git worktree move relative relative2 &&
+	echo "gitdir: ../.git/worktrees/absolute" >expect &&
+	test_cmp expect relative2/.git &&
+	echo "../../../relative2/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir
+
+Preparing worktree (new branch 'absolute')
+HEAD is now at 2519212 init
+ok 32 - move worktree with absolute path to relative path
+
+expecting success of 2403.33 'move worktree with relative path to absolute path': 
+	test_config worktree.useRelativePaths true &&
+	git worktree move --no-relative-paths relative2 absolute &&
+	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
+	test_cmp expect absolute/.git &&
+	echo "$(pwd)/absolute/.git" >expect &&
+	test_cmp expect .git/worktrees/absolute/gitdir
+
+ok 33 - move worktree with relative path to absolute path
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2402-worktree-list.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/.git/
+expecting success of 2402.1 'setup': 
+	test_commit init
+
+[main (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
+
+expecting success of 2402.2 'rev-parse --git-common-dir on main worktree': 
+	git rev-parse --git-common-dir >actual &&
+	echo .git >expected &&
+	test_cmp expected actual &&
+	mkdir sub &&
+	git -C sub rev-parse --git-common-dir >actual2 &&
+	echo ../.git >expected2 &&
+	test_cmp expected2 actual2
+
+ok 2 - rev-parse --git-common-dir on main worktree
+
+expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
+	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
+	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
+	git worktree add --detach linked-tree main &&
+	git -C linked-tree rev-parse --git-path objects >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 3 - rev-parse --git-path objects linked worktree
+
+expecting success of 2402.4 '"list" all worktrees from main': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 4 - "list" all worktrees from main
+
+expecting success of 2402.5 '"list" all worktrees from linked': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C here worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 5 - "list" all worktrees from linked
+
+expecting success of 2402.6 '"list" all worktrees --porcelain': 
+	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "branch $(git symbolic-ref HEAD)" >>expect &&
+	echo >>expect &&
+	test_when_finished "rm -rf here actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git worktree list --porcelain >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 6 - "list" all worktrees --porcelain
+
+expecting success of 2402.7 '"list" all worktrees --porcelain -z': 
+	test_when_finished "rm -rf here _actual actual expect &&
+				git worktree prune" &&
+	printf "worktree %sQHEAD %sQbranch %sQQ" \
+		"$(git rev-parse --show-toplevel)" \
+		$(git rev-parse HEAD --symbolic-full-name HEAD) >expect &&
+	git worktree add --detach here main &&
+	printf "worktree %sQHEAD %sQdetachedQQ" \
+		"$(git -C here rev-parse --show-toplevel)" \
+		"$(git rev-parse HEAD)" >>expect &&
+	git worktree list --porcelain -z >_actual &&
+	nul_to_q <_actual >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 7 - "list" all worktrees --porcelain -z
+
+expecting success of 2402.8 '"list" -z fails without --porcelain': 
+	test_must_fail git worktree list -z
+
+fatal: the option '-z' requires '--porcelain'
+ok 8 - "list" -z fails without --porcelain
+
+expecting success of 2402.9 '"list" all worktrees with locked annotation': 
+	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
+	git worktree add --detach locked main &&
+	git worktree add --detach unlocked main &&
+	git worktree lock locked &&
+	test_when_finished "git worktree unlock locked" &&
+	git worktree list >out &&
+	grep "/locked  *[0-9a-f].* locked$" out &&
+	! grep "/unlocked  *[0-9a-f].* locked$" out
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
+ok 9 - "list" all worktrees with locked annotation
+
+expecting success of 2402.10 '"list" all worktrees --porcelain with locked': 
+	test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
+	echo "locked" >expect &&
+	echo "locked with reason" >>expect &&
+	git worktree add --detach locked1 &&
+	git worktree add --detach locked2 &&
+	# unlocked worktree should not be annotated with "locked"
+	git worktree add --detach unlocked &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 10 - "list" all worktrees --porcelain with locked
+
+expecting success of 2402.11 '"list" all worktrees --porcelain with locked reason newline escaped': 
+	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
+	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
+	printf "locked \"locked\\\\nreason\"\n" >>expect &&
+	git worktree add --detach locked_lf &&
+	git worktree add --detach locked_crlf &&
+	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
+	test_when_finished "git worktree unlock locked_lf" &&
+	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
+	test_when_finished "git worktree unlock locked_crlf" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 11 - "list" all worktrees --porcelain with locked reason newline escaped
+
+expecting success of 2402.12 '"list" all worktrees with prunable annotation': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* prunable$"
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
+ok 12 - "list" all worktrees with prunable annotation
+
+expecting success of 2402.13 '"list" all worktrees --porcelain with prunable': 
+	test_when_finished "rm -rf prunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	rm -rf prunable &&
+	git worktree list --porcelain >out &&
+	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
+	test_grep "^prunable gitdir file points to non-existent location$" only_prunable
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+prunable gitdir file points to non-existent location
+ok 13 - "list" all worktrees --porcelain with prunable
+
+expecting success of 2402.14 '"list" all worktrees with prunable consistent with "prune"': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
+	git worktree prune --verbose 2>out &&
+	test_grep "^Removing worktrees/prunable" out &&
+	test_grep ! "^Removing worktrees/unprunable" out
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
+Removing worktrees/prunable: gitdir file points to non-existent location
+ok 14 - "list" all worktrees with prunable consistent with "prune"
+
+expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
+	test_must_fail git worktree list --verbose --porcelain
+
+fatal: options '--verbose' and '--porcelain' cannot be used together
+ok 15 - "list" --verbose and --porcelain mutually exclusive
+
+expecting success of 2402.16 '"list" all worktrees --verbose with locked': 
+	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
+	git worktree add locked1 --detach &&
+	git worktree add locked2 --detach &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tlocked: with reason\n" >>expect &&
+	git worktree list --verbose >out &&
+	grep "/locked1  *[0-9a-f].* locked$" out &&
+	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
+	test_cmp actual expect
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
+ok 16 - "list" all worktrees --verbose with locked
+
+expecting success of 2402.17 '"list" all worktrees --verbose with prunable': 
+	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
+	git worktree add prunable --detach &&
+	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
+	rm -rf prunable &&
+	git worktree list --verbose >out &&
+	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
+	test_cmp actual expect
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 17 - "list" all worktrees --verbose with prunable
+
+expecting success of 2402.18 'bare repo setup': 
+	git init --bare bare1 &&
+	echo "data" >file1 &&
+	git add file1 &&
+	git commit -m"File1: add data" &&
+	git push bare1 main &&
+	git reset --hard HEAD^
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/bare1/
+[main 7c81006] File1: add data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+To bare1
+ * [new branch]      main -> main
+HEAD is now at 2519212 init
+ok 18 - bare repo setup
+
+expecting success of 2402.19 '"list" all worktrees from bare main': 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C bare1 worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 19 - "list" all worktrees from bare main
+
+expecting success of 2402.20 '"list" all worktrees --porcelain from bare main': 
+	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "worktree $(pwd)/bare1" >expect &&
+	echo "bare" >>expect &&
+	echo >>expect &&
+	echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git -C bare1 worktree list --porcelain >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 20 - "list" all worktrees --porcelain from bare main
+
+expecting success of 2402.21 '"list" all worktrees from linked with a bare main': 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C there worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 21 - "list" all worktrees from linked with a bare main
+
+expecting success of 2402.22 'bare repo cleanup': 
+	rm -rf bare1
+
+ok 22 - bare repo cleanup
+
+expecting success of 2402.23 'broken main worktree still at the top': 
+	git init broken-main &&
 	(
-	cd test3 &&
-	test_create_repo repo &&
+		cd broken-main &&
+		test_commit new &&
+		git worktree add linked &&
+		cat >expected <<-EOF &&
+		worktree $(pwd)
+		HEAD $ZERO_OID
 
-	mkdir -p repo/inside-tracked repo/inside-ignored &&
-	>repo/file-tracked &&
-	>repo/file-ignored &&
-	>repo/inside-tracked/file &&
-	>repo/inside-ignored/file &&
+		EOF
+		cd linked &&
+		echo "worktree $(pwd)" >expected &&
+		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
+		git worktree list --porcelain >out &&
+		head -n 3 out >actual &&
+		test_cmp ../expected actual &&
+		git worktree list >out &&
+		head -n 1 out >actual.2 &&
+		grep -F "(error)" actual.2
+	)
 
-	cat >.gitignore <<-EOF &&
-	.gitignore
-	actual-*
-	expect-*
-	*ignored
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/broken-main/.git/
+[main (root-commit) 3325ee1] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'linked')
+HEAD is now at 3325ee1 new
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
+ok 23 - broken main worktree still at the top
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
+expecting success of 2402.24 'linked worktrees are sorted': 
+	test_when_finished "rm -rf sorted" &&
+	mkdir sorted &&
+	git init sorted/main &&
+	(
+		cd sorted/main &&
+		test_tick &&
+		test_commit new &&
+		git worktree add ../first &&
+		git worktree add ../second &&
+		git worktree list --porcelain >out &&
+		grep ^worktree out >actual
+	) &&
+	cat >expected <<-EOF &&
+	worktree $(pwd)/sorted/main
+	worktree $(pwd)/sorted/first
+	worktree $(pwd)/sorted/second
 	EOF
+	test_cmp expected sorted/main/actual
 
-	cat >expect-ignored-unsorted <<-EOF
-	repo/file-ignored
-	repo/inside-ignored/
-	.gitignore
-	actual-ignored-unsorted
-	expect-ignored-unsorted
-	expect-tracked-unsorted
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/sorted/main/.git/
+[main (root-commit) d8ef111] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'first')
+HEAD is now at d8ef111 new
+Preparing worktree (new branch 'second')
+HEAD is now at d8ef111 new
+ok 24 - linked worktrees are sorted
+
+expecting success of 2402.25 'linked worktrees with relative paths are shown with absolute paths': 
+	test_when_finished "rm -rf sorted" &&
+	mkdir sorted &&
+	git init sorted/main &&
+	(
+		cd sorted/main &&
+		test_tick &&
+		test_commit new &&
+		git worktree add --relative-paths ../first &&
+		git worktree add ../second &&
+		git worktree list --porcelain >out &&
+		grep ^worktree out >actual
+	) &&
+	cat >expected <<-EOF &&
+	worktree $(pwd)/sorted/main
+	worktree $(pwd)/sorted/first
+	worktree $(pwd)/sorted/second
 	EOF
-	)
+	test_cmp expected sorted/main/actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
-ok 11 - 3a: setup--add repo dir
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/sorted/main/.git/
+[main (root-commit) d8ef111] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'first')
+HEAD is now at d8ef111 new
+Preparing worktree (new branch 'second')
+HEAD is now at d8ef111 new
+ok 25 - linked worktrees with relative paths are shown with absolute paths
 
-expecting success of 2205.12 '3b: ignored': 
-	(
-	cd test3 &&
-	git --git-dir=repo/.git ls-files -io --directory --exclude-standard >actual-ignored-unsorted &&
-	sort actual-ignored-unsorted >actual-ignored &&
-	sort expect-ignored-unsorted >expect-ignored &&
-	test_cmp expect-ignored actual-ignored
-	)
+expecting success of 2402.26 'worktree path when called in .git directory': 
+	git worktree list >list1 &&
+	git -C .git worktree list >list2 &&
+	test_cmp list1 list2
 
-ok 12 - 3b: ignored
+ok 26 - worktree path when called in .git directory
 
-expecting success of 2205.13 '3c: add repo': 
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2407-worktree-heads.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/.git/
+expecting success of 2407.1 'setup': 
+	test_commit init &&
+
+	for i in 1 2 3 4
+	do
+		git checkout -b conflict-$i &&
+		echo "not I" >$i.t &&
+		git add $i.t &&
+		git commit -m "will conflict" &&
+
+		git checkout - &&
+		test_commit $i &&
+		git branch wt-$i &&
+		git branch fake-$i &&
+		git worktree add wt-$i wt-$i || return 1
+	done &&
+
+	# Create a server that updates each branch by one commit
+	git init server &&
+	test_commit -C server initial &&
+	git remote add server ./server &&
+	for i in 1 2 3 4
+	do
+		git -C server checkout -b wt-$i &&
+		test_commit -C server A-$i || return 1
+	done &&
+	for i in 1 2
+	do
+		git -C server checkout -b fake-$i &&
+		test_commit -C server f-$i || return 1
+	done
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to a new branch 'conflict-1'
+[conflict-1 0bd9076] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to branch 'master'
+[master dd232bf] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Preparing worktree (checking out 'wt-1')
+HEAD is now at dd232bf 1
+Switched to a new branch 'conflict-2'
+[conflict-2 881ff7f] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to branch 'master'
+[master 8f55bc3] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Preparing worktree (checking out 'wt-2')
+HEAD is now at 8f55bc3 2
+Switched to a new branch 'conflict-3'
+[conflict-3 016e7ca] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Switched to branch 'master'
+[master 4c93b0a] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Preparing worktree (checking out 'wt-3')
+HEAD is now at 4c93b0a 3
+Switched to a new branch 'conflict-4'
+[conflict-4 11365f4] will conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Switched to branch 'master'
+[master 3fbd4b0] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Preparing worktree (checking out 'wt-4')
+HEAD is now at 3fbd4b0 4
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/server/.git/
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'wt-1'
+[wt-1 4e3ca6d] A-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-1.t
+Switched to a new branch 'wt-2'
+[wt-2 3582f45] A-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-2.t
+Switched to a new branch 'wt-3'
+[wt-3 b62f76d] A-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-3.t
+Switched to a new branch 'wt-4'
+[wt-4 5e1557d] A-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A-4.t
+Switched to a new branch 'fake-1'
+[fake-1 ae0524d] f-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f-1.t
+Switched to a new branch 'fake-2'
+[fake-2 8b85f46] f-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f-2.t
+ok 1 - setup
+
+expecting success of 2407.2 'refuse to overwrite: checked out in worktree': 
+	for i in 1 2 3 4
+	do
+		test_must_fail git branch -f wt-$i HEAD 2>err &&
+		grep "cannot force update the branch" err &&
+
+		test_must_fail git branch -D wt-$i 2>err &&
+		grep "cannot delete branch" err || return 1
+	done
+
+fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
+error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
+fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
+error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
+fatal: cannot force update the branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
+error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
+ok 2 - refuse to overwrite: checked out in worktree
+
+expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
+
+	# Set up a bisect so HEAD no longer points to wt-4.
+	git -C wt-4 bisect start &&
+	git -C wt-4 bisect bad wt-4 &&
+	git -C wt-4 bisect good wt-1 &&
+
+	test_must_fail git branch -f wt-4 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-4' used by worktree at.*wt-4" err
+
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
+fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
+Previous HEAD position was 4c93b0a 3
+Switched to branch 'wt-4'
+ok 3 - refuse to overwrite: worktree in bisect
+
+expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
+	test_when_finished git -C wt-2 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
+
+	test_must_fail git branch -f wt-2 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
+
+First, rewinding head to replay your work on top of it...
+Applying: 2
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+881ff7f will conflict
+virtual 2
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in 2.t
+Auto-merging 2.t
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 2
+fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
+ok 4 - refuse to overwrite: worktree in rebase (apply)
+
+expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
+	test_when_finished git -C wt-2 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-2 rebase conflict-2 &&
+
+	test_must_fail git branch -f wt-2 HEAD 2>err &&
+	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
+
+Rebasing (1/1)
Auto-merging 2.t
+CONFLICT (add/add): Merge conflict in 2.t
+error: could not apply 8f55bc3... 2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 8f55bc3... 2
+fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
+ok 5 - refuse to overwrite: worktree in rebase (merge)
+
+expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
+	test_when_finished git -C wt-3 rebase --abort &&
+
+	git branch -f can-be-updated wt-3 &&
+	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
+
+	for i in 3 4
+	do
+		test_must_fail git branch -f can-be-updated HEAD 2>err &&
+		grep "cannot force update the branch 'can-be-updated' used by worktree at.*wt-3" err ||
+			return 1
+	done
+
+Rebasing (1/3)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 4c93b0a... 3
+fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+ok 6 - refuse to overwrite: worktree in rebase with --update-refs
+
+expecting success of 2407.7 'refuse to fetch over ref: checked out': 
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch 'refs/heads/wt-3'" err &&
+
+	# General fetch into refs/heads/ will fail on first ref,
+	# so use a generic error message check.
+	test_must_fail git fetch server +refs/heads/*:refs/heads/* 2>err &&
+	grep "refusing to fetch into branch" err
+
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+fatal: refusing to fetch into branch 'refs/heads/master' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads'
+ok 7 - refuse to fetch over ref: checked out
+
+expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
+	test_when_finished git -C wt-4 bisect reset &&
+
+	# Set up a bisect so HEAD no longer points to wt-4.
+	git -C wt-4 bisect start &&
+	git -C wt-4 bisect bad wt-4 &&
+	git -C wt-4 bisect good wt-1 &&
+
+	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
+	grep "refusing to fetch into branch" err
+
+status: waiting for both good and bad commits
+status: waiting for good commit(s), bad commit known
+Bisecting: 0 revisions left to test after this (roughly 1 step)
+[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
+fatal: refusing to fetch into branch 'refs/heads/wt-4' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
+Previous HEAD position was 4c93b0a 3
+Switched to branch 'wt-4'
+ok 8 - refuse to fetch over ref: worktree in bisect
+
+expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
+	test_when_finished git -C wt-3 rebase --abort &&
+
+	# This will fail part-way through due to a conflict.
+	test_must_fail git -C wt-3 rebase conflict-3 &&
+
+	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
+	grep "refusing to fetch into branch" err
+
+Rebasing (1/1)
Auto-merging 3.t
+CONFLICT (add/add): Merge conflict in 3.t
+error: could not apply 4c93b0a... 3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 4c93b0a... 3
+fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
+ok 9 - refuse to fetch over ref: worktree in rebase
+
+expecting success of 2407.10 'refuse to overwrite when in error states': 
+	test_when_finished rm -rf .git/worktrees/wt-*/rebase-merge &&
+	test_when_finished rm -rf .git/worktrees/wt-*/BISECT_* &&
+
+	# Both branches are currently under rebase.
+	mkdir -p .git/worktrees/wt-3/rebase-merge &&
+	touch .git/worktrees/wt-3/rebase-merge/interactive &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-3/rebase-merge/head-name &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-3/rebase-merge/onto &&
+	mkdir -p .git/worktrees/wt-4/rebase-merge &&
+	touch .git/worktrees/wt-4/rebase-merge/interactive &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-4/rebase-merge/head-name &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-4/rebase-merge/onto &&
+
+	# Both branches are currently under bisect.
+	touch .git/worktrees/wt-4/BISECT_LOG &&
+	echo refs/heads/fake-2 >.git/worktrees/wt-4/BISECT_START &&
+	touch .git/worktrees/wt-1/BISECT_LOG &&
+	echo refs/heads/fake-1 >.git/worktrees/wt-1/BISECT_START &&
+
+	for i in 1 2
+	do
+		test_must_fail git branch -f fake-$i HEAD 2>err &&
+		grep "cannot force update the branch 'fake-$i' used by worktree at" err ||
+			return 1
+	done
+
+fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
+fatal: cannot force update the branch 'fake-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
+ok 10 - refuse to overwrite when in error states
+
+expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
+	git commit --fixup HEAD~2 --allow-empty &&
 	(
-	cd test3 &&
-	git --git-dir=repo/.git add repo &&
-	git --git-dir=repo/.git ls-files >actual-tracked-unsorted &&
-	sort actual-tracked-unsorted >actual-tracked &&
-	sort expect-tracked-unsorted >expect-tracked &&
-	test_cmp expect-tracked actual-tracked
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		! grep "update-refs" todo
+	) &&
+	git branch -f allow-update HEAD~2 &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
+		grep "update-ref refs/heads/allow-update" todo
 	)
 
-ok 13 - 3c: add repo
+[master 3e1ca9c] fixup! 2
+ Author: A U Thor <author@example.com>
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+update-ref refs/heads/allow-update
+ok 11 - refuse to overwrite during rebase with --update-refs
 
-# passed all 13 test(s)
-1..13
+expecting success of 2407.12 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 12 - $EDITOR and friends are unchanged
+
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2300-cd-to-toplevel/.git/
-expecting success of 2300.1 'at physical root': 
-		(
-			cd 'repo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 1 - at physical root
+*** t2406-worktree-repair.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/
+expecting success of 2406.1 'setup': 
+	test_commit init
 
-expecting success of 2300.2 'at physical subdir': 
-		(
-			cd 'repo/sub/dir' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 2 - at physical subdir
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
 
-checking prerequisite: SYMLINKS
+expecting success of 2406.2 'skip missing worktree': 
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach missing &&
+	rm -rf missing &&
+	git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 2 - skip missing worktree
 
-)
-prerequisite SYMLINKS ok
-expecting success of 2300.3 'at symbolic root': 
-		(
-			cd 'symrepo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 3 - at symbolic root
+expecting success of 2406.3 'worktree path not directory': 
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach notdir &&
+	rm -rf notdir &&
+	>notdir &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_grep "not a directory" err
 
-expecting success of 2300.4 'at symbolic subdir': 
-		(
-			cd 'subdir-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 4 - at symbolic subdir
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: not a directory: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/notdir
+ok 3 - worktree path not directory
 
-expecting success of 2300.5 'at internal symbolic subdir': 
-		(
-			cd 'internal-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
-		)
-	
-ok 5 - at internal symbolic subdir
+expecting success of 2406.4 'don't clobber .git repo': 
+	test_when_finished "rm -rf repo && git worktree prune" &&
+	git worktree add --detach repo &&
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git is not a file" err
 
-# passed all 5 test(s)
-1..5
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/repo/.git/
+error: .git is not a file: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/repo
+ok 4 - don't clobber .git repo
+
+expecting success of 2406.5 'repair missing .git file': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 5 - repair missing .git file
+
+expecting success of 2406.6 'repair bogus .git file': 
+	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
+		".git file broken"
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 6 - repair bogus .git file
+
+expecting success of 2406.7 'repair incorrect .git file': 
+	test_when_finished "rm -rf other && git worktree prune" &&
+	test_create_repo other &&
+	other=$(git -C other rev-parse --absolute-git-dir) &&
+	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
+		".git file incorrect"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/other/.git/
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 7 - repair incorrect .git file
+
+expecting success of 2406.8 'repair .git file from main/.git': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 8 - repair .git file from main/.git
+
+expecting success of 2406.9 'repair .git file from linked worktree': 
+	test_when_finished "rm -rf other && git worktree prune" &&
+	git worktree add --detach other &&
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 9 - repair .git file from linked worktree
+
+expecting success of 2406.10 'repair .git file from bare.git': 
+	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add --detach ../corrupt &&
+	git -C corrupt rev-parse --absolute-git-dir >expect &&
+	rm -f corrupt/.git &&
+	git -C bare.git worktree repair &&
+	git -C corrupt rev-parse --absolute-git-dir >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
+ok 10 - repair .git file from bare.git
+
+expecting success of 2406.11 'invalid worktree path': 
+	test_must_fail git worktree repair /notvalid >out 2>err &&
+	test_must_be_empty out &&
+	test_grep "not a valid path" err
+
+error: not a valid path: /notvalid
+ok 11 - invalid worktree path
+
+expecting success of 2406.12 'repo not found; .git not file': 
+	test_when_finished "rm -rf not-a-worktree" &&
+	test_create_repo not-a-worktree &&
+	test_must_fail git worktree repair not-a-worktree >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git is not a file" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/not-a-worktree/.git/
+error: unable to locate repository; .git is not a file: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
+ok 12 - repo not found; .git not file
+
+expecting success of 2406.13 'repo not found; .git not referencing repo': 
+	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
+	git worktree add --detach side &&
+	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
+	mv side/.newgit side/.git &&
+	mkdir not-a-repo &&
+	test_must_fail git worktree repair side 2>err &&
+	test_grep ".git file does not reference a repository" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file does not reference a repository: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/side/.git
+ok 13 - repo not found; .git not referencing repo
+
+expecting success of 2406.14 'repo not found; .git file broken': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	echo /invalid >orig/.git &&
+	mv orig moved &&
+	test_must_fail git worktree repair moved >out 2>err &&
+	test_must_be_empty out &&
+	test_grep ".git file broken" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/moved/.git
+ok 14 - repo not found; .git file broken
+
+expecting success of 2406.15 'repair broken gitdir': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	rm .git/worktrees/orig/gitdir &&
+	mv orig moved &&
+	git worktree repair moved 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir unreadable" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir unreadable: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 15 - repair broken gitdir
+
+expecting success of 2406.16 'repair incorrect gitdir': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git worktree repair moved 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir incorrect" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 16 - repair incorrect gitdir
+
+expecting success of 2406.17 'repair gitdir (implicit) from linked worktree': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git -C moved worktree repair 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_grep "gitdir incorrect" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 17 - repair gitdir (implicit) from linked worktree
+
+expecting success of 2406.18 'unable to repair gitdir (implicit) from main worktree': 
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	cat .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git worktree repair 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_must_be_empty err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 18 - unable to repair gitdir (implicit) from main worktree
+
+expecting success of 2406.19 'repair multiple gitdir files': 
+	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
+		git worktree prune" &&
+	git worktree add --detach orig1 &&
+	git worktree add --detach orig2 &&
+	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
+	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
+	mv orig1 moved1 &&
+	mv orig2 moved2 &&
+	git worktree repair moved1 moved2 2>err &&
+	test_cmp expect1 .git/worktrees/orig1/gitdir &&
+	test_cmp expect2 .git/worktrees/orig2/gitdir &&
+	test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
+	test_grep "gitdir incorrect:.*orig2/gitdir$" err
+
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
+ok 19 - repair multiple gitdir files
+
+expecting success of 2406.20 'repair moved main and linked worktrees': 
+	test_when_finished "rm -rf main side mainmoved sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../side &&
+	sed "s,side/\.git$,sidemoved/.git," \
+		main/.git/worktrees/side/gitdir >expect-gitdir &&
+	sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
+		side/.git >expect-gitfile &&
+	mv main mainmoved &&
+	mv side sidemoved &&
+	git -C mainmoved worktree repair ../sidemoved &&
+	test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) f54694c] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD f54694c)
+HEAD is now at f54694c init
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/mainmoved/.git/worktrees/side/gitdir
+ok 20 - repair moved main and linked worktrees
+
+expecting success of 2406.21 'repair copied main and linked worktrees': 
+	test_when_finished "rm -rf orig dup" &&
+	mkdir -p orig &&
+	git -C orig init main &&
+	test_commit -C orig/main nothing &&
+	git -C orig/main worktree add ../linked &&
+	cp orig/main/.git/worktrees/linked/gitdir orig/main.expect &&
+	cp orig/linked/.git orig/linked.expect &&
+	cp -R orig dup &&
+	sed "s,orig/linked/\.git$,dup/linked/.git," orig/main.expect >dup/main.expect &&
+	sed "s,orig/main/\.git/worktrees/linked$,dup/main/.git/worktrees/linked," \
+		orig/linked.expect >dup/linked.expect &&
+	git -C dup/main worktree repair ../linked &&
+	test_cmp orig/main.expect orig/main/.git/worktrees/linked/gitdir &&
+	test_cmp orig/linked.expect orig/linked/.git &&
+	test_cmp dup/main.expect dup/main/.git/worktrees/linked/gitdir &&
+	test_cmp dup/linked.expect dup/linked/.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/orig/main/.git/
+[master (root-commit) a5c17d1] nothing
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nothing.t
+Preparing worktree (new branch 'linked')
+HEAD is now at a5c17d1 nothing
+repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/dup/main/.git/worktrees/linked/gitdir
+ok 21 - repair copied main and linked worktrees
+
+expecting success of 2406.22 'repair worktree with relative path with missing gitfile': 
+	test_when_finished "rm -rf main wt" &&
+	test_create_repo main &&
+	git -C main config worktree.useRelativePaths true &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../wt &&
+	rm wt/.git &&
+	test_path_is_missing wt/.git &&
+	git -C main worktree repair &&
+	echo "gitdir: ../main/.git/worktrees/wt" >expect &&
+	test_cmp expect wt/.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 49cd008] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 49cd008)
+HEAD is now at 49cd008 init
+repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/wt
+ok 22 - repair worktree with relative path with missing gitfile
+
+expecting success of 2406.23 'repair absolute worktree to use relative paths': 
+	test_when_finished "rm -rf main side sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../side &&
+	echo "../../../../sidemoved/.git" >expect-gitdir &&
+	echo "gitdir: ../main/.git/worktrees/side" >expect-gitfile &&
+	mv side sidemoved &&
+	git -C main worktree repair --relative-paths ../sidemoved &&
+	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 7e6fdee] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 7e6fdee)
+HEAD is now at 7e6fdee init
+repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
+repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/sidemoved
+ok 23 - repair absolute worktree to use relative paths
+
+expecting success of 2406.24 'repair relative worktree to use absolute paths': 
+	test_when_finished "rm -rf main side sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --relative-paths --detach ../side &&
+	echo "$(pwd)/sidemoved/.git" >expect-gitdir &&
+	echo "gitdir: $(pwd)/main/.git/worktrees/side" >expect-gitfile &&
+	mv side sidemoved &&
+	git -C main worktree repair ../sidemoved &&
+	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
+[master (root-commit) 6f4234e] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Preparing worktree (detached HEAD 6f4234e)
+HEAD is now at 6f4234e init
+repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
+ok 24 - repair relative worktree to use absolute paths
+
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t1510-repo-setup.sh ***
@@ -102400,3564 +105449,1261 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2203-add-intent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/.git/
-expecting success of 2203.1 'intent to add': 
-	test_commit 1 &&
-	git rm 1.t &&
-	echo hello >1.t &&
-	echo hello >file &&
-	echo hello >elif &&
-	git add -N file &&
-	git add elif &&
-	git add -N 1.t
+*** t3002-ls-files-dashpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3002-ls-files-dashpath/.git/
+expecting success of 3002.1 'setup': 
+	echo frotz >path0 &&
+	echo frotz >./-foo &&
+	echo frotz >./--
 
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-rm '1.t'
-ok 1 - intent to add
+ok 1 - setup
 
-expecting success of 2203.2 'git status': 
-	git status --porcelain | grep -v actual >actual &&
+expecting success of 3002.2 'git ls-files without path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others >output &&
 	cat >expect <<-\EOF &&
-	DA 1.t
-	A  elif
-	 A file
+	--
+	-foo
+	output
+	path0
 	EOF
-	test_cmp expect actual
+	test_cmp output expect
 
-ok 2 - git status
+ok 2 - git ls-files without path restriction.
 
-expecting success of 2203.3 'git status with porcelain v2': 
-	git status --porcelain=v2 | grep -v "^?" >actual &&
-	nam1=$(echo 1 | git hash-object --stdin) &&
-	nam2=$(git hash-object elif) &&
-	cat >expect <<-EOF &&
-	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
-	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID file
+expecting success of 3002.3 'git ls-files with path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
 	EOF
-	test_cmp expect actual
-
-ok 3 - git status with porcelain v2
+	test_cmp output expect
 
-expecting success of 2203.4 'check result of "add -N"': 
-	git ls-files -s file >actual &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	echo "100644 $empty 0	file" >expect &&
-	test_cmp expect actual
+ok 3 - git ls-files with path restriction.
 
-ok 4 - check result of "add -N"
+expecting success of 3002.4 'git ls-files with path restriction with --.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- path0 >output &&
+	cat >expect <<-\EOF &&
+	path0
+	EOF
+	test_cmp output expect
 
-expecting success of 2203.5 'intent to add is just an ordinary empty blob': 
-	git add -u &&
-	git ls-files -s file >actual &&
-	git ls-files -s elif | sed -e "s/elif/file/" >expect &&
-	test_cmp expect actual
+ok 4 - git ls-files with path restriction with --.
 
-ok 5 - intent to add is just an ordinary empty blob
+expecting success of 3002.5 'git ls-files with path restriction with -- --.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	EOF
+	test_cmp output expect
 
-expecting success of 2203.6 'intent to add does not clobber existing paths': 
-	git add -N file elif &&
-	empty=$(git hash-object --stdin </dev/null) &&
-	git ls-files -s >actual &&
-	! grep "$empty" actual
+ok 5 - git ls-files with path restriction with -- --.
 
-ok 6 - intent to add does not clobber existing paths
+expecting success of 3002.6 'git ls-files with no path restriction.': 
+	test_when_finished "rm -f expect" &&
+	git ls-files --others -- >output &&
+	cat >expect <<-\EOF &&
+	--
+	-foo
+	output
+	path0
+	EOF
+	test_cmp output expect
 
-expecting success of 2203.7 'i-t-a entry is simply ignored': 
-	test_tick &&
-	git commit -a -m initial &&
-	git reset --hard &&
 
-	echo xyzzy >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m second &&
-	test $(git ls-tree HEAD -- nitfol | wc -l) = 0 &&
-	test $(git diff --name-only HEAD -- nitfol | wc -l) = 1 &&
-	test $(git diff --name-only -- nitfol | wc -l) = 1
+ok 6 - git ls-files with no path restriction.
 
-[master b7cca08] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 elif
- create mode 100644 file
-HEAD is now at b7cca08 initial
-[master b70ad0b] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rezrov
-ok 7 - i-t-a entry is simply ignored
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2080-parallel-checkout-basics.sh ***
+expecting success of 2080.1 'setup repo for checkout with various types of changes': 
+	test_config_global protocol.file.allow always &&
 
-expecting success of 2203.8 'can commit with an unrelated i-t-a entry in index': 
-	git reset --hard &&
-	echo bozbar >rezrov &&
-	echo frotz >nitfol &&
-	git add rezrov &&
-	git add -N nitfol &&
-	git commit -m partial rezrov
+	git init sub &&
+	(
+		cd sub &&
+		git checkout -b B2 &&
+		echo B2 >file &&
+		git add file &&
+		git commit -m file &&
 
-HEAD is now at b70ad0b second
-[master 1ed15b5] partial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - can commit with an unrelated i-t-a entry in index
+		git checkout -b B1 &&
+		echo B1 >file &&
+		git add file &&
+		git commit -m file
+	) &&
 
-expecting success of 2203.9 'can "commit -a" with an i-t-a entry': 
-	git reset --hard &&
-	: >nitfol &&
-	git add -N nitfol &&
-	git commit -a -m all
+	git init various &&
+	(
+		cd various &&
 
-HEAD is now at 1ed15b5 partial
-[master 415f3ad] all
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nitfol
-ok 9 - can "commit -a" with an i-t-a entry
+		git checkout -b B1 &&
+		mkdir a c e &&
+		echo a/a >a/a &&
+		echo b >b &&
+		echo c/c >c/c &&
+		test_ln_s_add c d &&
+		echo e/e >e/e &&
+		git submodule add ../sub f &&
+		git submodule add ../sub g &&
+		test_ln_s_add c h &&
 
-expecting success of 2203.10 'cache-tree invalidates i-t-a paths': 
-	git reset --hard &&
-	mkdir dir &&
-	: >dir/foo &&
-	git add dir/foo &&
-	git commit -m foo &&
+		echo "B1 i" >i &&
+		test_ln_s_add c j &&
+		git submodule add -b B1 ../sub k &&
+		mkdir l &&
+		echo l/l >l/l &&
 
-	: >dir/bar &&
-	git add -N dir/bar &&
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual &&
+		git add . &&
+		git commit -m B1 &&
 
-	git write-tree >/dev/null &&
+		git checkout -b B2 &&
+		git rm -rf :^.gitmodules :^k &&
+		mkdir b d f &&
+		echo a >a &&
+		echo b/b >b/b &&
+		test_ln_s_add b c &&
+		echo d/d >d/d &&
+		git submodule add ../sub e &&
+		echo f/f >f/f &&
+		test_ln_s_add b g &&
+		git submodule add ../sub h &&
 
-	git diff --name-only >actual &&
-	echo dir/bar >expect &&
-	test_cmp expect actual
+		echo "B2 i" >i &&
+		test_ln_s_add b j &&
+		git -C k checkout B2 &&
+		mkdir m &&
+		echo m/m >m/m &&
 
-HEAD is now at 415f3ad all
-[master 03f6a20] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/foo
-ok 10 - cache-tree invalidates i-t-a paths
+		git add . &&
+		git commit -m B2 &&
 
-expecting success of 2203.11 'cache-tree does not ignore dir that has i-t-a entries': 
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir 2 &&
-		for f in 1 2/1 2/2 3
-		do
-			echo "$f" >"$f" || return 1
-		done &&
-		git add 1 2/2 3 &&
-		git add -N 2/1 &&
-		git commit -m committed &&
-		git ls-tree -r HEAD >actual &&
-		grep 2/2 actual
+		git checkout --recurse-submodules B1
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-[master (root-commit) 7b0eb4f] committed
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub/.git/
+Switched to a new branch 'B2'
+[B2 (root-commit) 880a0eb] file
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 1
- create mode 100644 2/2
- create mode 100644 3
-100644 blob 6b8a6f549c42bad0c52be670caa297a269052aa7	2/2
-ok 11 - cache-tree does not ignore dir that has i-t-a entries
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'B1'
+[B1 0f06b39] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/.git/
+Switched to a new branch 'B1'
+checking prerequisite: SYMLINKS
 
-expecting success of 2203.12 'cache-tree does skip dir that becomes empty': 
-	rm -fr ita-in-dir &&
-	git init ita-in-dir &&
-	(
-		cd ita-in-dir &&
-		mkdir -p 1/2/3 &&
-		echo 4 >1/2/3/4 &&
-		git add -N 1/2/3/4 &&
-		git write-tree >actual &&
-		echo $EMPTY_TREE >expected &&
-		test_cmp expected actual
-	)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/ita-in-dir/.git/
-ok 12 - cache-tree does skip dir that becomes empty
+)
+prerequisite SYMLINKS ok
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/f'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/g'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/k'...
+done.
+[B1 (root-commit) 46a23ce] B1
+ Author: A U Thor <author@example.com>
+ 13 files changed, 22 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a/a
+ create mode 100644 b
+ create mode 100644 c/c
+ create mode 120000 d
+ create mode 100644 e/e
+ create mode 160000 f
+ create mode 160000 g
+ create mode 120000 h
+ create mode 100644 i
+ create mode 120000 j
+ create mode 160000 k
+ create mode 100644 l/l
+Switched to a new branch 'B2'
+rm 'a/a'
+rm 'b'
+rm 'c/c'
+rm 'd'
+rm 'e/e'
+rm 'f'
+rm 'g'
+rm 'h'
+rm 'i'
+rm 'j'
+rm 'l/l'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/h'...
+done.
+Switched to a new branch 'B2'
+branch 'B2' set up to track 'origin/B2'.
+[B2 176cae8] B2
+ Author: A U Thor <author@example.com>
+ 19 files changed, 17 insertions(+), 17 deletions(-)
+ create mode 100644 a
+ delete mode 100644 a/a
+ delete mode 100644 b
+ create mode 100644 b/b
+ create mode 120000 c
+ delete mode 100644 c/c
+ delete mode 120000 d
+ create mode 100644 d/d
+ rename f => e (100%)
+ delete mode 100644 e/e
+ create mode 100644 f/f
+ mode change 160000 => 120000 g
+ mode change 120000 => 160000 h
+ delete mode 100644 l/l
+ create mode 100644 m/m
+Switched to branch 'B1'
+ok 1 - setup repo for checkout with various types of changes
 
-expecting success of 2203.13 'commit: ita entries ignored in empty initial commit check': 
-	git init empty-initial-commit &&
-	(
-		cd empty-initial-commit &&
-		: >one &&
-		git add -N one &&
-		test_must_fail git commit -m nothing-new-here
-	)
+expecting success of 2080.2 'sequential checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/empty-initial-commit/.git/
-On branch master
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-Initial commit
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 2 - sequential checkout
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   one
+expecting success of 2080.3 'parallel checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 13 - commit: ita entries ignored in empty initial commit check
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-expecting success of 2203.14 'commit: ita entries ignored in empty commit check': 
-	git init empty-subsequent-commit &&
-	(
-		cd empty-subsequent-commit &&
-		test_commit one &&
-		: >two &&
-		git add -N two &&
-		test_must_fail git commit -m nothing-new-here
-	)
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 3 - parallel checkout
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/empty-subsequent-commit/.git/
-[master (root-commit) 4331c28] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	new file:   two
+expecting success of 2080.4 'sequential-fallback checkout': 
+		repo=various_$mode &&
+		cp -R -P various $repo &&
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 14 - commit: ita entries ignored in empty commit check
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
 
-expecting success of 2203.15 'rename detection finds the right names': 
-	git init rename-detection &&
-	(
-		cd rename-detection &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		mv first third &&
-		git add -N third &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	
+Entering 'f'
+Entering 'g'
+Entering 'k'
+Switched to branch 'B2'
+ok 4 - sequential-fallback checkout
 
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> third" actual.1 &&
+expecting success of 2080.5 'parallel checkout on clone': 
+		test_config_global protocol.file.allow always &&
+		repo=various_${mode}_clone &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git clone --recurse-submodules --branch B2 various $repo &&
+		verify_checkout $repo
+	
+Cloning into 'various_parallel_clone'...
+done.
+Submodule 'e' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
+Submodule 'h' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
+Submodule 'k' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/h'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/k'...
+done.
+Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
+ok 5 - parallel checkout on clone
 
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		 R first -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
+expecting success of 2080.6 'sequential-fallback checkout on clone': 
+		test_config_global protocol.file.allow always &&
+		repo=various_${mode}_clone &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git clone --recurse-submodules --branch B2 various $repo &&
+		verify_checkout $repo
+	
+Cloning into 'various_sequential-fallback_clone'...
+done.
+Submodule 'e' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
+Submodule 'h' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
+Submodule 'k' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/e'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/h'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/k'...
+done.
+Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
+Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
+ok 6 - sequential-fallback checkout on clone
 
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
-		EOF
-		test_cmp expected.3 actual.3 &&
+expecting success of 2080.7 'compare the working trees': 
+	rm -rf various_*/.git &&
+	rm -rf various_*/*/.git &&
 
-		git diff --stat >actual.4 &&
-		cat >expected.4 <<-EOF &&
-		 first => third | 0
-		 1 file changed, 0 insertions(+), 0 deletions(-)
-		EOF
-		test_cmp expected.4 actual.4 &&
+	# We use `git diff` instead of `diff -r` because the latter would
+	# follow symlinks, and not all `diff` implementations support the
+	# `--no-dereference` option.
+	#
+	git diff --no-index various_sequential various_parallel &&
+	git diff --no-index various_sequential various_parallel_clone &&
+	git diff --no-index various_sequential various_sequential-fallback &&
+	git diff --no-index various_sequential various_sequential-fallback_clone
 
-		git diff --cached --stat >actual.5 &&
-		test_must_be_empty actual.5
+ok 7 - compare the working trees
 
+expecting success of 2080.8 'submodules can use parallel checkout': 
+	set_checkout_config 2 0 &&
+	git init super &&
+	(
+		cd super &&
+		git init sub &&
+		test_commit -C sub A &&
+		test_commit -C sub B &&
+		git submodule add ./sub &&
+		git commit -m sub &&
+		rm sub/* &&
+		test_checkout_workers 2 git checkout --recurse-submodules .
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/rename-detection/.git/
-[master (root-commit) 0bad72c] first
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git/
+[master (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> third
-ok 15 - rename detection finds the right names
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Adding existing repo at 'sub' to the index
+[master (root-commit) 00b6c10] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Migrating git directory of 'sub' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/.git/modules/sub'
+Updated 0 paths from the index
+ok 8 - submodules can use parallel checkout
 
-expecting success of 2203.16 'double rename detection in status': 
-	git init rename-detection-2 &&
+expecting success of 2080.9 'parallel checkout respects --[no]-force': 
+	set_checkout_config 2 0 &&
+	git init dirty &&
 	(
-		cd rename-detection-2 &&
-		echo contents >first &&
-		git add first &&
-		git commit -m first &&
-		git mv first second &&
-		mv second third &&
-		git add -N third &&
+		cd dirty &&
+		mkdir D &&
+		test_commit D/F &&
+		test_commit F &&
 
-		git status | grep -v "^?" >actual.1 &&
-		test_grep "renamed: *first -> second" actual.1 &&
-		test_grep "renamed: *second -> third" actual.1 &&
+		rm -rf D &&
+		echo changed >D &&
+		echo changed >F.t &&
 
-		git status --porcelain | grep -v "^?" >actual.2 &&
-		cat >expected.2 <<-\EOF &&
-		R  first -> second
-		 R second -> third
-		EOF
-		test_cmp expected.2 actual.2 &&
+		# We expect 0 workers because there is nothing to be done
+		test_checkout_workers 0 git checkout HEAD &&
+		test_path_is_file D &&
+		grep changed D &&
+		grep changed F.t &&
 
-		hash=$(git hash-object third) &&
-		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
-		cat >expected.3 <<-EOF &&
-		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
-		2 .R N... 100644 100644 100644 $hash $hash R100 third	second
-		EOF
-		test_cmp expected.3 actual.3
+		test_checkout_workers 2 git checkout --force HEAD &&
+		test_path_is_dir D &&
+		grep D/F D/F.t &&
+		grep F F.t
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2203-add-intent/rename-detection-2/.git/
-[master (root-commit) 0bad72c] first
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/dirty/.git/
+[master (root-commit) e516e44] D/F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first
-	renamed:    first -> second
-	renamed:    second -> third
-ok 16 - double rename detection in status
-
-expecting success of 2203.17 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"': 
-	git reset --hard &&
-	: >empty &&
-	content="foo" &&
-	echo "$content" >not-empty &&
-
-	hash_e=$(git hash-object empty) &&
-	hash_n=$(git hash-object not-empty) &&
-
-	cat >expect.diff_p <<-EOF &&
-	diff --git a/empty b/empty
-	new file mode 100644
-	index 0000000..$(git rev-parse --short $hash_e)
-	diff --git a/not-empty b/not-empty
-	new file mode 100644
-	index 0000000..$(git rev-parse --short $hash_n)
-	--- /dev/null
-	+++ b/not-empty
-	@@ -0,0 +1 @@
-	+$content
-	EOF
-	cat >expect.diff_s <<-EOF &&
-	 create mode 100644 empty
-	 create mode 100644 not-empty
-	EOF
-	cat >expect.diff_a <<-EOF &&
-	:000000 100644 0000000 0000000 A$(printf "\t")empty
-	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
-	EOF
+ create mode 100644 D/F.t
+[master a9126ab] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+D	D/F.t
+M	F.t
+changed
+changed
+D/F
+F
+ok 9 - parallel checkout respects --[no]-force
 
-	git add -N empty not-empty &&
+checking prerequisite: SYMLINKS
 
-	git diff >actual &&
-	test_cmp expect.diff_p actual &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	git diff --summary >actual &&
-	test_cmp expect.diff_s actual &&
+)
+prerequisite SYMLINKS ok
+expecting success of 2080.10 'parallel checkout checks for symlinks in leading dirs': 
+	set_checkout_config 2 0 &&
+	git init symlinks &&
+	(
+		cd symlinks &&
+		mkdir D untracked &&
+		# Commit 2 files to have enough work for 2 parallel workers
+		test_commit D/A &&
+		test_commit D/B &&
+		rm -rf D &&
+		ln -s untracked D &&
 
-	git diff-files -p >actual &&
-	test_cmp expect.diff_p actual &&
+		test_checkout_workers 2 git checkout --force HEAD &&
+		! test -h D &&
+		grep D/A D/A.t &&
+		grep D/B D/B.t
+	)
 
-	git diff-files --abbrev >actual &&
-	test_cmp expect.diff_a actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/symlinks/.git/
+[master (root-commit) dce6a14] D/A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D/A.t
+[master 59586d4] D/B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D/B.t
+D/A
+D/B
+ok 10 - parallel checkout checks for symlinks in leading dirs
 
-	git diff --cached >actual &&
-	test_must_be_empty actual
+expecting success of 2080.11 '"git checkout ." report should not include failed entries': 
+	test_config_global filter.delay.process \
+		"test-tool rot13-filter --always-delay --log=delayed.log clean smudge delay" &&
+	test_config_global filter.delay.required true &&
+	test_config_global filter.cat.clean cat  &&
+	test_config_global filter.cat.smudge cat  &&
+	test_config_global filter.cat.required true  &&
 
-HEAD is now at 03f6a20 foo
-ok 17 - i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"
+	set_checkout_config 2 0 &&
+	git init failed_entries &&
+	(
+		cd failed_entries &&
+		cat >.gitattributes <<-EOF &&
+		*delay*              filter=delay
+		parallel-ineligible* filter=cat
+		EOF
+		echo a >missing-delay.a &&
+		echo a >parallel-ineligible.a &&
+		echo a >parallel-eligible.a &&
+		echo b >success-delay.b &&
+		echo b >parallel-ineligible.b &&
+		echo b >parallel-eligible.b &&
+		git add -A &&
+		git commit -m files &&
 
-expecting success of 2203.18 '"diff HEAD" includes ita as new files': 
-	git reset --hard &&
-	echo new >new-ita &&
-	oid=$(git hash-object new-ita) &&
-	oid=$(git rev-parse --short $oid) &&
-	git add -N new-ita &&
-	git diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/new-ita b/new-ita
-	new file mode 100644
-	index 0000000..$oid
-	--- /dev/null
-	+++ b/new-ita
-	@@ -0,0 +1 @@
-	+new
-	EOF
-	test_cmp expected actual
+		a_blob="$(git rev-parse :parallel-ineligible.a)" &&
+		rm .git/objects/$(test_oid_to_path $a_blob) &&
+		rm *.a *.b &&
 
-HEAD is now at 03f6a20 foo
-ok 18 - "diff HEAD" includes ita as new files
+		test_checkout_workers 2 test_must_fail git checkout . 2>err &&
 
-expecting success of 2203.19 'apply --intent-to-add': 
-	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
-	git diff >expected &&
-	grep "new file" expected &&
-	git reset --hard &&
-	git apply --intent-to-add expected &&
-	git diff >actual &&
-	test_cmp expected actual
+		# All *.b entries should succeed and all *.a entries should fail:
+		#  - missing-delay.a: the delay filter will drop this path
+		#  - parallel-*.a: the blob will be missing
+		#
+		grep "Updated 3 paths from the index" err &&
+		test_stdout_line_count = 3 ls *.b &&
+		! ls *.a
+	)
 
-HEAD is now at 03f6a20 foo
-new file mode 100644
-HEAD is now at 03f6a20 foo
-ok 19 - apply --intent-to-add
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/failed_entries/.git/
+[master (root-commit) d1e22ca] files
+ Author: A U Thor <author@example.com>
+ 7 files changed, 8 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 missing-delay.a
+ create mode 100644 parallel-eligible.a
+ create mode 100644 parallel-eligible.b
+ create mode 100644 parallel-ineligible.a
+ create mode 100644 parallel-ineligible.b
+ create mode 100644 success-delay.b
+Updated 3 paths from the index
+ls: cannot access '*.a': No such file or directory
+ok 11 - "git checkout ." report should not include failed entries
 
-# passed all 19 test(s)
-1..19
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2401-worktree-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/.git/
-expecting success of 2401.1 'initialize': 
-	git commit --allow-empty -m init
+*** t3003-ls-files-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3003-ls-files-exclude/.git/
+expecting success of 3003.1 'create repo with file': 
+	echo content >file &&
+	git add file &&
+	git commit -m file &&
+	echo modification >file
 
-[main (root-commit) 50572bf] init
+[master (root-commit) 39caa03] file
  Author: A U Thor <author@example.com>
-ok 1 - initialize
-
-expecting success of 2401.2 'worktree prune on normal repo': 
-	git worktree prune &&
-	test_must_fail git worktree prune abc
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - create repo with file
 
-usage: git worktree prune [-n] [-v] [--expire <expire>]
+expecting success of 3003.2 'ls-files output contains file (cached)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
 
-    -n, --[no-]dry-run    do not remove, show only
-    -v, --[no-]verbose    report pruned working trees
-    --[no-]expire <expiry-date>
-                          expire working trees older than <time>
+ok 2 - ls-files output contains file (cached)
 
-ok 2 - worktree prune on normal repo
+expecting success of 3003.3 'ls-files output contains file (modified)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
 
-expecting success of 2401.3 'prune files inside $GIT_DIR/worktrees': 
-	mkdir .git/worktrees &&
-	: >.git/worktrees/abc &&
-	git worktree prune --verbose 2>actual &&
-	cat >expect <<EOF &&
-Removing worktrees/abc: not a valid directory
-EOF
-	test_cmp expect actual &&
-	! test -f .git/worktrees/abc &&
-	! test -d .git/worktrees
+ok 3 - ls-files output contains file (modified)
 
-ok 3 - prune files inside $GIT_DIR/worktrees
+expecting success of 3003.4 'add file to gitignore': 
+	echo file >.gitignore
 
-expecting success of 2401.4 'prune directories without gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	cat >expect <<EOF &&
-Removing worktrees/def: gitdir file does not exist
-EOF
-	git worktree prune --verbose 2>actual &&
-	test_cmp expect actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+ok 4 - add file to gitignore
 
-ok 4 - prune directories without gitdir
+expecting success of 3003.5 'ls-files output contains file (cached)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --cached >output &&
+	test_cmp expect output
 
-checking prerequisite: SANITY
+ok 5 - ls-files output contains file (cached)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+expecting success of 3003.6 'ls-files output contains file (modified)': 
+	echo 'file' >expect &&
+	git ls-files --exclude-standard --modified >output &&
+	test_cmp expect output
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+ok 6 - ls-files output contains file (modified)
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success of 3003.7 'ls-files -i -c lists only tracked-but-ignored files': 
+	echo content >other-file &&
+	git add other-file &&
+	echo file >expect &&
+	git ls-files -i -c --exclude-standard >output &&
+	test_cmp expect output
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+ok 7 - ls-files -i -c lists only tracked-but-ignored files
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 2401.5 'prune directories with unreadable gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	chmod u-r .git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3001-ls-files-others-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3001-ls-files-others-exclude/.git/
+expecting success of 3001.1 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-Removing worktrees/def: unable to read gitdir file (Permission denied)
-ok 5 - prune directories with unreadable gitdir
+ok 1 - git ls-files --others with various exclude options.
 
-expecting success of 2401.6 'prune directories with invalid gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: invalid gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-Removing worktrees/def: invalid gitdir file
-ok 6 - prune directories with invalid gitdir
+ok 2 - git ls-files --others with \r\n line endings.
 
-expecting success of 2401.7 'prune directories with gitdir pointing to nowhere': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
+expecting success of 3001.3 'setup skip-worktree gitignore': 
+	git add $allignores &&
+	git update-index --skip-worktree $allignores &&
+	rm $allignores
 
-Removing worktrees/def: gitdir file points to non-existent location
-ok 7 - prune directories with gitdir pointing to nowhere
+ok 3 - setup skip-worktree gitignore
 
-expecting success of 2401.8 'not prune locked checkout': 
-	test_when_finished rm -r .git/worktrees &&
-	mkdir -p .git/worktrees/ghi &&
-	: >.git/worktrees/ghi/locked &&
-	git worktree prune &&
-	test -d .git/worktrees/ghi
+expecting success of 3001.4 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
 
-ok 8 - not prune locked checkout
+ok 4 - git ls-files --others with various exclude options.
 
-expecting success of 2401.9 'not prune recent checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add jlm HEAD &&
-	test -d .git/worktrees/jlm &&
-	rm -rf jlm &&
-	git worktree prune --verbose --expire=2.days.ago &&
-	test -d .git/worktrees/jlm
+expecting success of 3001.5 'restore gitignore': 
+	git checkout --ignore-skip-worktree-bits $allignores &&
+	rm .git/index
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 9 - not prune recent checkouts
+Updated 3 paths from the index
+ok 5 - restore gitignore
 
-expecting success of 2401.10 'not prune proper checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add --detach "$PWD/nop" main &&
-	git worktree prune &&
-	test -d .git/worktrees/nop
+expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
+ok 6 - git status honors core.excludesfile
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 10 - not prune proper checkouts
+expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
 
-expecting success of 2401.11 'prune duplicate (linked/linked)': 
-	test_when_finished rm -fr .git/worktrees w1 w2 &&
-	git worktree add --detach w1 &&
-	git worktree add --detach w2 &&
-	sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new &&
-	mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "duplicate entry" actual &&
-	test -d .git/worktrees/w1 &&
-	! test -d .git/worktrees/w2
+	git ls-files --others --exclude=one/ >output &&
+	if grep "^one/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-Removing worktrees/w2: duplicate entry
-ok 11 - prune duplicate (linked/linked)
 
-expecting success of 2401.12 'prune duplicate (main/linked)': 
-	test_when_finished rm -fr repo wt &&
-	test_create_repo repo &&
-	test_commit -C repo x &&
-	git -C repo worktree add --detach ../wt &&
-	rm -fr wt &&
-	mv repo wt &&
-	git -C wt worktree prune --verbose 2>actual &&
-	test_grep "duplicate entry" actual &&
-	! test -d .git/worktrees/wt
+ok 7 - trailing slash in exclude allows directory match(1)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/repo/.git/
-[main (root-commit) cb85766] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Preparing worktree (detached HEAD cb85766)
-HEAD is now at cb85766 x
-Removing worktrees/wt: duplicate entry
-ok 12 - prune duplicate (main/linked)
+expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
 
-expecting success of 2401.13 'not prune proper worktrees inside linked worktree with relative paths': 
-	test_when_finished rm -rf repo wt_ext &&
-	git init repo &&
-	(
-	    cd repo &&
-	    git config worktree.useRelativePaths true &&
-	    echo content >file &&
-	    git add file &&
-	    git commit -m msg &&
-	    git worktree add ../wt_ext &&
-	    git worktree add wt_int &&
-	    cd wt_int &&
-	    git worktree prune -v >out &&
-	    test_must_be_empty out &&
-	    cd ../../wt_ext &&
-	    git worktree prune -v >out &&
-	    test_must_be_empty out
-	)
+	git ls-files --others --exclude=one/two/ >output &&
+	if grep "^one/two/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2401-worktree-prune/repo/.git/
-[main (root-commit) b2ccb9a] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Preparing worktree (new branch 'wt_ext')
-HEAD is now at b2ccb9a msg
-Preparing worktree (new branch 'wt_int')
-HEAD is now at b2ccb9a msg
-ok 13 - not prune proper worktrees inside linked worktree with relative paths
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2404-worktree-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2404-worktree-config/.git/
-expecting success of 2404.1 'setup': 
-	test_commit start
+ok 8 - trailing slash in exclude allows directory match (2)
 
-[master (root-commit) bb4ab09] start
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 start.t
-ok 1 - setup
+expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
 
-expecting success of 2404.2 'config --worktree in single worktree': 
-	git config --worktree foo.bar true &&
-	test_cmp_config true foo.bar
+	>two &&
+	git ls-files --others --exclude=two/ >output &&
+	grep "^two" output
 
-ok 2 - config --worktree in single worktree
 
-expecting success of 2404.3 'add worktrees': 
-	git worktree add wt1 &&
-	git worktree add wt2
+two
+ok 9 - trailing slash in exclude forces directory match (1)
 
-Preparing worktree (new branch 'wt1')
-HEAD is now at bb4ab09 start
-Preparing worktree (new branch 'wt2')
-HEAD is now at bb4ab09 start
-ok 3 - add worktrees
+expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
 
-expecting success of 2404.4 'config --worktree without extension': 
-	test_must_fail git config --worktree foo.bar false
+	git ls-files --others --exclude=one/a.1/ >output &&
+	grep "^one/a.1" output
 
-fatal: --worktree cannot be used with multiple working trees unless the config
-extension worktreeConfig is enabled. Please read "CONFIGURATION FILE"
-section in "git help worktree" for details
-ok 4 - config --worktree without extension
 
-expecting success of 2404.5 'enable worktreeConfig extension': 
-	git config core.repositoryformatversion 1 &&
-	git config extensions.worktreeConfig true &&
-	test_cmp_config true extensions.worktreeConfig &&
-	test_cmp_config 1 core.repositoryformatversion
+one/a.1
+ok 10 - trailing slash in exclude forces directory match (2)
 
-ok 5 - enable worktreeConfig extension
+expecting success of 3001.11 'negated exclude matches can override previous ones': 
 
-expecting success of 2404.6 'config is shared as before': 
-	git config this.is shared &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
+	grep "^a.1" output
 
-ok 6 - config is shared as before
+a.1
+ok 11 - negated exclude matches can override previous ones
 
-expecting success of 2404.7 'config is shared (set from another worktree)': 
-	git -C wt1 config that.is also-shared &&
-	test_cmp_config also-shared that.is &&
-	test_cmp_config -C wt1 also-shared that.is &&
-	test_cmp_config -C wt2 also-shared that.is
+expecting success of 3001.12 'excluded directory overrides content patterns': 
 
-ok 7 - config is shared (set from another worktree)
+	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
 
-expecting success of 2404.8 'config private to main worktree': 
-	git config --worktree this.is for-main &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+ok 12 - excluded directory overrides content patterns
 
-ok 8 - config private to main worktree
+expecting success of 3001.13 'negated directory doesn't affect content patterns': 
 
-expecting success of 2404.9 'config private to linked worktree': 
-	git -C wt1 config --worktree this.is for-wt1 &&
-	test_cmp_config for-main this.is &&
-	test_cmp_config -C wt1 for-wt1 this.is &&
-	test_cmp_config -C wt2 shared this.is
+	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
 
-ok 9 - config private to linked worktree
+ok 13 - negated directory doesn't affect content patterns
 
-expecting success of 2404.10 'core.bare no longer for main only': 
-	test_config core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = true
+expecting success of 3001.14 'subdirectory ignore (setup)': 
+	mkdir -p top/l1/l2 &&
+	(
+		cd top &&
+		git init &&
+		echo /.gitignore >.gitignore &&
+		echo l1 >>.gitignore &&
+		echo l2 >l1/.gitignore &&
+		>l1/l2/l1
+	)
 
-ok 10 - core.bare no longer for main only
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3001-ls-files-others-exclude/top/.git/
+ok 14 - subdirectory ignore (setup)
 
-expecting success of 2404.11 'per-worktree core.bare is picked up': 
-	git -C wt1 config --worktree core.bare true &&
-	test "$(git rev-parse --is-bare-repository)" = false &&
-	test "$(git -C wt1 rev-parse --is-bare-repository)" = true &&
-	test "$(git -C wt2 rev-parse --is-bare-repository)" = false
+expecting success of 3001.15 'subdirectory ignore (toplevel)': 
+	(
+		cd top &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-ok 11 - per-worktree core.bare is picked up
+ok 15 - subdirectory ignore (toplevel)
 
-expecting success of 2404.12 'config.worktree no longer read without extension': 
-	git config --unset extensions.worktreeConfig &&
-	test_cmp_config shared this.is &&
-	test_cmp_config -C wt1 shared this.is &&
-	test_cmp_config -C wt2 shared this.is
+expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
+	(
+		cd top/l1/l2 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-ok 12 - config.worktree no longer read without extension
+ok 16 - subdirectory ignore (l1/l2)
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1460-refs-migrate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/.git/
-expecting success of 1460.1 'setup': 
-	rm -rf .git
+expecting success of 3001.17 'subdirectory ignore (l1)': 
+	(
+		cd top/l1 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
 
-ok 1 - setup
+ok 17 - subdirectory ignore (l1)
 
-expecting success of 1460.2 'superfluous arguments': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate foo 2>err &&
-	cat >expect <<-EOF &&
-	usage: too many arguments
-	EOF
-	test_cmp expect err
+expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
+	rm top/l1/l2/l1 &&
+	rm top/l1/.gitignore
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 2 - superfluous arguments
+ok 18 - show/hide empty ignored directory (setup)
 
-expecting success of 1460.3 'missing ref storage format': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate 2>err &&
-	cat >expect <<-EOF &&
-	usage: missing --ref-format=<format>
-	EOF
-	test_cmp expect err
+expecting success of 3001.19 'show empty ignored directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/ >expect &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 3 - missing ref storage format
+ok 19 - show empty ignored directory with --directory
 
-expecting success of 1460.4 'unknown ref storage format': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_must_fail git -C repo refs migrate \
-		--ref-format=unknown 2>err &&
-	cat >expect <<-EOF &&
-	error: unknown ref storage format ${SQ}unknown${SQ}
-	EOF
-	test_cmp expect err
+expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 4 - unknown ref storage format
+ok 20 - hide empty ignored directory with --no-empty-directory
 
-expecting success of 1460.5 'files: migration to same format fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$from_format 2>err &&
-			cat >expect <<-EOF &&
-			error: repository already uses ${SQ}$from_format${SQ} format
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 5 - files: migration to same format fails
+expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
+	> top/l1/tracked &&
+	(
+		cd top &&
+		git add -f l1/tracked
+	)
 
-expecting success of 1460.6 'files -> reftable: migration with worktree fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			git -C repo worktree add wt &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$to_format 2>err &&
-			cat >expect <<-EOF &&
-			error: migrating repositories with worktrees is not supported yet
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-No possible source branch, inferring '--orphan'
-Preparing worktree (new branch 'wt')
-ok 6 - files -> reftable: migration with worktree fails
+ok 21 - show/hide empty ignored sub-directory (setup)
 
-expecting success of 1460.7 'files -> reftable: unborn HEAD': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 7 - files -> reftable: unborn HEAD
+expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/l2/ >expect &&
+	test_cmp expect actual
 
-expecting success of 1460.8 'files -> reftable: single ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 8 - files -> reftable: single ref
+ok 22 - show empty ignored sub-directory with --directory
 
-expecting success of 1460.9 'files -> reftable: bare repository': 
-			test_when_finished "rm -rf repo repo.git" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git clone --ref-format=$from_format --mirror repo repo.git &&
-			test_migration repo.git "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into bare repository 'repo.git'...
-done.
-ok 9 - files -> reftable: bare repository
+expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
 
-expecting success of 1460.10 'files -> reftable: dangling symref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
-			test_migration repo "$to_format" &&
-			echo refs/heads/nonexistent >expect &&
-			git -C repo symbolic-ref BROKEN_HEAD >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) d39e3de] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 10 - files -> reftable: dangling symref
+ok 23 - hide empty ignored sub-directory with --no-empty-directory
 
-expecting success of 1460.11 'files -> reftable: broken ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
-				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
-			test_migration repo "$to_format" true &&
-			test_oid 001 >expect &&
-			git -C repo rev-parse refs/heads/broken >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 1935181] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 11 - files -> reftable: broken ref
+expecting success of 3001.24 'pattern matches prefix completely': 
+	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
+	test_must_be_empty actual
 
-expecting success of 1460.12 'files -> reftable: pseudo-refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo update-ref FOO_HEAD HEAD &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 23fa7ba] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 12 - files -> reftable: pseudo-refs
+ok 24 - pattern matches prefix completely
 
-expecting success of 1460.13 'files -> reftable: special refs are left alone': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
-			git -C repo rev-parse MERGE_HEAD &&
-			test_migration repo "$to_format" &&
-			test_path_is_file repo/.git/MERGE_HEAD
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-31243c69d8d79236a6f50781bf4138e2507bab91
-ok 13 - files -> reftable: special refs are left alone
+expecting success of 3001.25 'ls-files with "**" patterns': 
+	cat <<-\EOF >expect &&
+	a.1
+	one/a.1
+	one/two/a.1
+	three/a.1
+	EOF
+	git ls-files -o -i --exclude "**/a.1" >actual &&
+	test_cmp expect actual
 
-expecting success of 1460.14 'files -> reftable: a bunch of refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
+ok 25 - ls-files with "**" patterns
 
-			test_commit -C repo initial &&
-			cat >input <<-EOF &&
-			create FOO_HEAD HEAD
-			create refs/heads/branch-1 HEAD
-			create refs/heads/branch-2 HEAD
-			create refs/heads/branch-3 HEAD
-			create refs/heads/branch-4 HEAD
-			create refs/tags/tag-1 HEAD
-			create refs/tags/tag-2 HEAD
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 167ffd6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 14 - files -> reftable: a bunch of refs
+expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
+	# Expectation same as previous test
+	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
+	test_cmp expect actual
 
-expecting success of 1460.15 'files -> reftable: dry-run migration does not modify repository': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo refs migrate --dry-run \
-				--ref-format=$to_format >output &&
-			grep "Finished dry-run migration of refs" output &&
-			test_path_is_dir repo/.git/ref_migration.* &&
-			echo $from_format >expect &&
-			git -C repo rev-parse --show-ref-format >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) f844f1e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Finished dry-run migration of refs, the result can be found at '.git/ref_migration.NcplFp'
-ok 15 - files -> reftable: dry-run migration does not modify repository
+ok 26 - ls-files with "**" patterns and --directory
 
-expecting success of 1460.16 'files -> reftable: reflogs of symrefs with target deleted': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo branch branch-1 HEAD &&
-			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
-			cat >input <<-EOF &&
-			delete refs/heads/branch-1
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b13909b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 16 - files -> reftable: reflogs of symrefs with target deleted
+expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
+	git ls-files -o -i --exclude "one**a.1" >actual &&
+	test_must_be_empty actual
 
-expecting success of 1460.17 'files -> reftable: reflogs order is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
-			test_commit --date "100003000 +0700" --no-tag -C repo second &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b2ea3e6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main a1e4c45] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 17 - files -> reftable: reflogs order is retained
+ok 27 - ls-files with "**" patterns and no slashes
 
-expecting success of 1460.18 'files -> reftable: stash is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			(
-				cd repo &&
-				test_commit initial A &&
-				echo foo >A &&
-				git stash push &&
-				echo bar >A &&
-				git stash push &&
-				git stash list >expect.reflog &&
-				test_migration . "$to_format" &&
-				git stash list >actual.reflog &&
-				test_cmp expect.reflog actual.reflog
-			)
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 43952a4] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Saved working directory and index state WIP on main: 43952a4 initial
-Saved working directory and index state WIP on main: 43952a4 initial
-ok 18 - files -> reftable: stash is retained
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3000-ls-files-others.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/.git/
+expecting success of 3000.1 'setup ': 
+	date >path0 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s xyzzy path1
+	else
+		date >path1
+	fi &&
+	mkdir path2 path3 path4 &&
+	date >path2/file2 &&
+	date >path2-junk &&
+	date >path3/file3 &&
+	date >path3-junk &&
+	git update-index --add path3-junk path3/file3
 
-expecting success of 1460.19 'files -> reftable: skip reflog with --skip-reflog': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			# we see that the repository contains reflogs.
-			git -C repo reflog --all >reflogs &&
-			test_line_count = 2 reflogs &&
-			test_migration repo "$to_format" true --no-reflog &&
-			# there should be no reflogs post migration.
-			git -C repo reflog --all >reflogs &&
-			test_must_be_empty reflogs
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 2aabd22] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 19 - files -> reftable: skip reflog with --skip-reflog
+checking prerequisite: SYMLINKS
 
-expecting success of 1460.20 'reftable: migration to same format fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$from_format 2>err &&
-			cat >expect <<-EOF &&
-			error: repository already uses ${SQ}$from_format${SQ} format
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 20 - reftable: migration to same format fails
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 1460.21 'reftable -> files: migration with worktree fails': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			git -C repo worktree add wt &&
-			test_must_fail git -C repo refs migrate \
-				--ref-format=$to_format 2>err &&
-			cat >expect <<-EOF &&
-			error: migrating repositories with worktrees is not supported yet
-			EOF
-			test_cmp expect err
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-No possible source branch, inferring '--orphan'
-Preparing worktree (new branch 'wt')
-ok 21 - reftable -> files: migration with worktree fails
+)
+prerequisite SYMLINKS ok
+ok 1 - setup 
 
-expecting success of 1460.22 'reftable -> files: unborn HEAD': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-ok 22 - reftable -> files: unborn HEAD
+expecting success of 3000.2 'setup: expected output': 
+	cat >expected1 <<-\EOF &&
+	expected1
+	expected2
+	expected3
+	output
+	path0
+	path1
+	path2-junk
+	path2/file2
+	EOF
 
-expecting success of 1460.23 'reftable -> files: single ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 3805046] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 23 - reftable -> files: single ref
+	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
+	cp expected2 expected3 &&
+	echo path4/ >>expected2
 
-expecting success of 1460.24 'reftable -> files: bare repository': 
-			test_when_finished "rm -rf repo repo.git" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git clone --ref-format=$from_format --mirror repo repo.git &&
-			test_migration repo.git "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 971e222] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into bare repository 'repo.git'...
-done.
-ok 24 - reftable -> files: bare repository
+ok 2 - setup: expected output
 
-expecting success of 1460.25 'reftable -> files: dangling symref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo symbolic-ref BROKEN_HEAD refs/heads/nonexistent &&
-			test_migration repo "$to_format" &&
-			echo refs/heads/nonexistent >expect &&
-			git -C repo symbolic-ref BROKEN_HEAD >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) cf21f93] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 25 - reftable -> files: dangling symref
+expecting success of 3000.3 'ls-files --others': 
+	git ls-files --others >output &&
+	test_cmp expected1 output
 
-expecting success of 1460.26 'reftable -> files: broken ref': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			test-tool -C repo ref-store main update-ref "" refs/heads/broken \
-				"$(test_oid 001)" "$ZERO_OID" REF_SKIP_CREATE_REFLOG,REF_SKIP_OID_VERIFICATION &&
-			test_migration repo "$to_format" true &&
-			test_oid 001 >expect &&
-			git -C repo rev-parse refs/heads/broken >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) f175d86] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 26 - reftable -> files: broken ref
+ok 3 - ls-files --others
 
-expecting success of 1460.27 'reftable -> files: pseudo-refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo update-ref FOO_HEAD HEAD &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 27 - reftable -> files: pseudo-refs
+expecting success of 3000.4 'ls-files --others --directory': 
+	git ls-files --others --directory >output &&
+	test_cmp expected2 output
 
-expecting success of 1460.28 'reftable -> files: special refs are left alone': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo rev-parse HEAD >repo/.git/MERGE_HEAD &&
-			git -C repo rev-parse MERGE_HEAD &&
-			test_migration repo "$to_format" &&
-			test_path_is_file repo/.git/MERGE_HEAD
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 8858db3] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-8858db371362b5c8b32b61d0c007bb805cd3258c
-ok 28 - reftable -> files: special refs are left alone
+ok 4 - ls-files --others --directory
 
-expecting success of 1460.29 'reftable -> files: a bunch of refs': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
+expecting success of 3000.5 '--no-empty-directory hides empty directory': 
+	git ls-files --others --directory --no-empty-directory >output &&
+	test_cmp expected3 output
 
-			test_commit -C repo initial &&
-			cat >input <<-EOF &&
-			create FOO_HEAD HEAD
-			create refs/heads/branch-1 HEAD
-			create refs/heads/branch-2 HEAD
-			create refs/heads/branch-3 HEAD
-			create refs/heads/branch-4 HEAD
-			create refs/tags/tag-1 HEAD
-			create refs/tags/tag-2 HEAD
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 68d032e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 29 - reftable -> files: a bunch of refs
+ok 5 - --no-empty-directory hides empty directory
 
-expecting success of 1460.30 'reftable -> files: dry-run migration does not modify repository': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo refs migrate --dry-run \
-				--ref-format=$to_format >output &&
-			grep "Finished dry-run migration of refs" output &&
-			test_path_is_dir repo/.git/ref_migration.* &&
-			echo $from_format >expect &&
-			git -C repo rev-parse --show-ref-format >actual &&
-			test_cmp expect actual
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 8cd44c7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Finished dry-run migration of refs, the result can be found at '.git/ref_migration.WEw83F'
-ok 30 - reftable -> files: dry-run migration does not modify repository
+expecting success of 3000.6 'ls-files --others handles non-submodule .git': 
+	mkdir not-a-submodule &&
+	echo foo >not-a-submodule/.git &&
+	git ls-files -o >output &&
+	test_cmp expected1 output
 
-expecting success of 1460.31 'reftable -> files: reflogs of symrefs with target deleted': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			git -C repo branch branch-1 HEAD &&
-			git -C repo symbolic-ref refs/heads/symref refs/heads/branch-1 &&
-			cat >input <<-EOF &&
-			delete refs/heads/branch-1
-			EOF
-			git -C repo update-ref --stdin <input &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) d8072fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 31 - reftable -> files: reflogs of symrefs with target deleted
+ok 6 - ls-files --others handles non-submodule .git
 
-expecting success of 1460.32 'reftable -> files: reflogs order is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit --date "100005000 +0700" --no-tag -C repo initial &&
-			test_commit --date "100003000 +0700" --no-tag -C repo second &&
-			test_migration repo "$to_format"
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) b2ea3e6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main a1e4c45] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 32 - reftable -> files: reflogs order is retained
+expecting success of 3000.7 'ls-files --others with symlinked submodule': 
+	git init super &&
+	git init sub &&
+	(
+		cd sub &&
+		>a &&
+		git add a &&
+		git commit -m sub &&
+		git pack-refs --all
+	) &&
+	(
+		cd super &&
+		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
+		git ls-files --others --exclude-standard >../actual
+	) &&
+	echo sub/ >expect &&
+	test_cmp expect actual
 
-expecting success of 1460.33 'reftable -> files: stash is retained': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			(
-				cd repo &&
-				test_commit initial A &&
-				echo foo >A &&
-				git stash push &&
-				echo bar >A &&
-				git stash push &&
-				git stash list >expect.reflog &&
-				test_migration . "$to_format" &&
-				git stash list >actual.reflog &&
-				test_cmp expect.reflog actual.reflog
-			)
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 2e6ee6d] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/sub/.git/
+[master (root-commit) 8c0a349] sub
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Saved working directory and index state WIP on main: 2e6ee6d initial
-Saved working directory and index state WIP on main: 2e6ee6d initial
-ok 33 - reftable -> files: stash is retained
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 7 - ls-files --others with symlinked submodule
 
-expecting success of 1460.34 'reftable -> files: skip reflog with --skip-reflog': 
-			test_when_finished "rm -rf repo" &&
-			git init --ref-format=$from_format repo &&
-			test_commit -C repo initial &&
-			# we see that the repository contains reflogs.
-			git -C repo reflog --all >reflogs &&
-			test_line_count = 2 reflogs &&
-			test_migration repo "$to_format" true --no-reflog &&
-			# there should be no reflogs post migration.
-			git -C repo reflog --all >reflogs &&
-			test_must_be_empty reflogs
-		
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) ee4b540] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 34 - reftable -> files: skip reflog with --skip-reflog
+expecting success of 3000.8 'setup nested pathspec search': 
+	test_create_repo nested &&
+	(
+		cd nested &&
 
-expecting success of 1460.35 'multiple reftable blocks with multiple entries': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=files repo &&
-	test_commit -C repo first &&
-	printf "create refs/heads/ref-%d HEAD\n" $(test_seq 5000) >stdin &&
-	git -C repo update-ref --stdin <stdin &&
-	test_commit -C repo second &&
-	printf "update refs/heads/ref-%d HEAD\n" $(test_seq 3000) >stdin &&
-	git -C repo update-ref --stdin <stdin &&
-	test_migration repo reftable
+		mkdir -p partially_tracked/untracked_dir &&
+		> partially_tracked/content &&
+		> partially_tracked/untracked_dir/file &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) fdc6a6a] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main 22e3fb8] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 35 - multiple reftable blocks with multiple entries
+		mkdir -p untracked/deep &&
+		> untracked/deep/path &&
+		> untracked/deep/foo.c &&
 
-expecting success of 1460.36 'migrating from files format deletes backend files': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=files repo &&
-	test_commit -C repo first &&
-	git -C repo pack-refs --all &&
-	test_commit -C repo second &&
-	git -C repo update-ref ORIG_HEAD HEAD &&
-	git -C repo rev-parse HEAD >repo/.git/FETCH_HEAD &&
+		git add partially_tracked/content
+	)
 
-	test_path_is_file repo/.git/HEAD &&
-	test_path_is_file repo/.git/ORIG_HEAD &&
-	test_path_is_file repo/.git/refs/heads/main &&
-	test_path_is_file repo/.git/packed-refs &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/nested/.git/
+ok 8 - setup nested pathspec search
 
-	test_migration repo reftable &&
+expecting success of 3000.9 'ls-files -o --directory with single deep dir pathspec': 
+	(
+		cd nested &&
 
-	echo "ref: refs/heads/.invalid" >expect &&
-	test_cmp expect repo/.git/HEAD &&
-	echo "this repository uses the reftable format" >expect &&
-	test_cmp expect repo/.git/refs/heads &&
-	test_path_is_file repo/.git/FETCH_HEAD &&
-	test_path_is_missing repo/.git/ORIG_HEAD &&
-	test_path_is_missing repo/.git/refs/heads/main &&
-	test_path_is_missing repo/.git/logs &&
-	test_path_is_missing repo/.git/packed-refs
+		git ls-files -o --directory untracked/deep/ >actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) 8172781] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[main 97fa77d] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 36 - migrating from files format deletes backend files
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
 
-expecting success of 1460.37 'migrating from reftable format deletes backend files': 
-	test_when_finished "rm -rf repo" &&
-	git init --ref-format=reftable repo &&
-	test_commit -C repo first &&
+		test_cmp expect actual
+	)
 
-	test_path_is_dir repo/.git/reftable &&
-	test_migration repo files &&
+ok 9 - ls-files -o --directory with single deep dir pathspec
 
-	test_path_is_missing repo/.git/reftable &&
-	echo "ref: refs/heads/main" >expect &&
-	test_cmp expect repo/.git/HEAD &&
-	test_path_is_file repo/.git/packed-refs
+expecting success of 3000.10 'ls-files -o --directory with multiple dir pathspecs': 
+	(
+		cd nested &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1460-refs-migrate/repo/.git/
-[main (root-commit) d9dae97] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 37 - migrating from reftable format deletes backend files
+		git ls-files -o --directory partially_tracked/ untracked/ >actual &&
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2405-worktree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/.git/
-expecting success of 2405.1 'setup: create origin repos': 
-	git config --global protocol.file.allow always &&
-	git init origin/sub &&
-	test_commit -C origin/sub file1 &&
-	git init origin/main &&
-	test_commit -C origin/main first &&
-	git -C origin/main submodule add ../sub &&
-	git -C origin/main commit -m "add sub" &&
-	test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
-	git -C origin/main/sub pull &&
-	git -C origin/main add sub &&
-	git -C origin/main commit -m "sub updated"
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/
+		EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub/.git/
-[main (root-commit) 69af168] file1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/main/.git/
-[main (root-commit) 1e96f59] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/main/sub'...
-done.
-[main 322c452] add sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main 7829796] file1 updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub
-   69af168..7829796  main         -> origin/main
- * [new tag]         file1updated -> file1updated
-Updating 69af168..7829796
-Fast-forward
- file1 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[main d717f19] sub updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup: create origin repos
+		test_cmp expect actual
+	)
 
-expecting success of 2405.2 'setup: clone superproject to create main worktree': 
-	git clone --recursive "$base_path/origin/main" main
+ok 10 - ls-files -o --directory with multiple dir pathspecs
 
-Cloning into 'main'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/origin/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/main/sub'...
-done.
-Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
-ok 2 - setup: clone superproject to create main worktree
+expecting success of 3000.11 'ls-files -o --directory with mix dir/file pathspecs': 
+	(
+		cd nested &&
 
-expecting success of 2405.3 'add superproject worktree': 
-	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+		git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-ok 3 - add superproject worktree
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/path
+		EOF
 
-checking known breakage of 2405.4 'submodule is checked out just after worktree add': 
-	git -C worktree diff --submodule main"^!" >out &&
-	grep "file1 updated" out
+		test_cmp expect actual
+	)
 
-not ok 4 - submodule is checked out just after worktree add # TODO known breakage
+ok 11 - ls-files -o --directory with mix dir/file pathspecs
 
-expecting success of 2405.5 'add superproject worktree and initialize submodules': 
-	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
-	git -C worktree-submodule-update submodule update
+expecting success of 3000.12 'ls-files -o --directory with glob filetype match': 
+	(
+		cd nested &&
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/worktree-submodule-update/sub'...
-done.
-Submodule path 'sub': checked out '69af1687b671131ed0cfa61b7fcdc907a4c21f2c'
-ok 5 - add superproject worktree and initialize submodules
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
 
-expecting success of 2405.6 'submodule is checked out just after submodule update in linked worktree': 
-	git -C worktree-submodule-update diff --submodule main"^!" >out &&
-	grep "file1 updated" out
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/foo.c
+		EOF
 
-  > file1 updated
-ok 6 - submodule is checked out just after submodule update in linked worktree
+		test_cmp expect actual
+	)
 
-expecting success of 2405.7 'add superproject worktree and manually add submodule worktree': 
-	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
-	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
+ok 12 - ls-files -o --directory with glob filetype match
 
-Preparing worktree (detached HEAD 322c452)
-HEAD is now at 322c452 add sub
-Preparing worktree (detached HEAD 69af168)
-HEAD is now at 69af168 file1
-ok 7 - add superproject worktree and manually add submodule worktree
+expecting success of 3000.13 'ls-files -o --directory with mix of tracked states': 
+	(
+		cd nested &&
 
-expecting success of 2405.8 'submodule is checked out after manually adding submodule worktree': 
-	git -C linked_submodule diff --submodule main"^!" >out &&
-	grep "file1 updated" out
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
 
-  > file1 updated
-ok 8 - submodule is checked out after manually adding submodule worktree
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/
+		EOF
 
-expecting success of 2405.9 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree': 
-	git -C main worktree add "$base_path/checkout-recurse" --detach  &&
-	git -C checkout-recurse submodule update --init &&
-	echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
-	cat checkout-recurse/sub/.git >actual-gitfile &&
-	test_cmp expect-gitfile actual-gitfile &&
-	git -C main/sub rev-parse HEAD >expect-head-main &&
-	git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
-	cat checkout-recurse/sub/.git >actual-gitfile &&
-	git -C main/sub rev-parse HEAD >actual-head-main &&
-	test_cmp expect-gitfile actual-gitfile &&
-	test_cmp expect-head-main actual-head-main
+		test_cmp expect actual
+	)
 
-Preparing worktree (detached HEAD d717f19)
-HEAD is now at d717f19 sub updated
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2405-worktree-submodule/checkout-recurse/sub'...
-done.
-Submodule path 'sub': checked out '782979677c1932d3806e9adc80194f805c02f4f3'
-Previous HEAD position was d717f19 sub updated
-HEAD is now at 322c452 add sub
-ok 9 - checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree
+ok 13 - ls-files -o --directory with mix of tracked states
 
-expecting success of 2405.10 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config': 
-	echo "../../../sub" >expect-main &&
-	git -C main/sub config --get core.worktree >actual-main &&
-	test_cmp expect-main actual-main &&
-	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
-	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
-	test_cmp expect-linked actual-linked &&
-	git -C checkout-recurse checkout --recurse-submodules first &&
-	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
-	test_must_be_empty linked-config &&
-	git -C main/sub config --get core.worktree >actual-main &&
-	test_cmp expect-main actual-main
+expecting success of 3000.14 'ls-files -o --directory with glob filetype match only': 
+	(
+		cd nested &&
 
-Previous HEAD position was 322c452 add sub
-HEAD is now at 1e96f59 first
-ok 10 - core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config
+		git ls-files --others --directory "untracked/*.c" >actual &&
 
-expecting success of 2405.11 'unsetting core.worktree does not prevent running commands directly against the submodule repository': 
-	git -C main/.git/worktrees/checkout-recurse/modules/sub log
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
 
-commit 69af1687b671131ed0cfa61b7fcdc907a4c21f2c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		test_cmp expect actual
+	)
 
-    file1
-ok 11 - unsetting core.worktree does not prevent running commands directly against the submodule repository
+ok 14 - ls-files -o --directory with glob filetype match only
 
-# still have 1 known breakage(s)
-# passed all remaining 10 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2403-worktree-move.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/.git/
-expecting success of 2403.1 'setup': 
-	test_commit init &&
-	git worktree add source &&
-	git worktree list --porcelain >out &&
-	grep "^worktree" out >actual &&
-	cat <<-EOF >expected &&
-	worktree $(pwd)
-	worktree $(pwd)/source
-	EOF
-	test_cmp expected actual
+expecting success of 3000.15 'ls-files -o --directory to get immediate paths under one dir only': 
+	(
+		cd nested &&
 
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (new branch 'source')
-HEAD is now at 2519212 init
-ok 1 - setup
+		git ls-files --others --directory "untracked/?*" >actual &&
 
-expecting success of 2403.2 'lock main worktree': 
-	test_must_fail git worktree lock .
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
 
-fatal: The main working tree cannot be locked or unlocked
-ok 2 - lock main worktree
+		test_cmp expect actual
+	)
 
-expecting success of 2403.3 'lock linked worktree': 
-	git worktree lock --reason hahaha source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+ok 15 - ls-files -o --directory to get immediate paths under one dir only
 
-ok 3 - lock linked worktree
+expecting success of 3000.16 'ls-files -o avoids listing untracked non-matching gitdir': 
+	test_when_finished "rm -rf nested/untracked/deep/empty" &&
+	(
+		cd nested &&
 
-expecting success of 2403.4 'lock linked worktree from another worktree': 
-	rm .git/worktrees/source/locked &&
-	git worktree add elsewhere &&
-	git -C elsewhere worktree lock --reason hahaha ../source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+		git init untracked/deep/empty &&
+		git ls-files --others "untracked/*.c" >actual &&
 
-Preparing worktree (new branch 'elsewhere')
-HEAD is now at 2519212 init
-ok 4 - lock linked worktree from another worktree
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
 
-expecting success of 2403.5 'lock worktree twice': 
-	test_must_fail git worktree lock source &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+		test_cmp expect actual
+	)
 
-fatal: 'source' is already locked, reason: hahaha
-ok 5 - lock worktree twice
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/nested/untracked/deep/empty/.git/
+ok 16 - ls-files -o avoids listing untracked non-matching gitdir
 
-expecting success of 2403.6 'lock worktree twice (from the locked worktree)': 
-	test_must_fail git -C source worktree lock . &&
-	echo hahaha >expected &&
-	test_cmp expected .git/worktrees/source/locked
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3004-ls-files-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3004-ls-files-basic/.git/
+expecting success of 3004.1 'ls-files in empty repository': 
+	git ls-files >actual &&
+	test_must_be_empty actual
 
-fatal: '.' is already locked, reason: hahaha
-ok 6 - lock worktree twice (from the locked worktree)
+ok 1 - ls-files in empty repository
 
-expecting success of 2403.7 'unlock main worktree': 
-	test_must_fail git worktree unlock .
+expecting success of 3004.2 'ls-files with nonexistent path': 
+	git ls-files doesnotexist >actual &&
+	test_must_be_empty actual
 
-fatal: The main working tree cannot be locked or unlocked
-ok 7 - unlock main worktree
+ok 2 - ls-files with nonexistent path
 
-expecting success of 2403.8 'unlock linked worktree': 
-	git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
+expecting success of 3004.3 'ls-files with nonsense option': 
+	test_expect_code 129 git ls-files --nonsense 2>actual &&
+	test_grep "[Uu]sage: git ls-files" actual
 
-ok 8 - unlock linked worktree
+usage: git ls-files [<options>] [<file>...]
+ok 3 - ls-files with nonsense option
 
-expecting success of 2403.9 'unlock worktree twice': 
-	test_must_fail git worktree unlock source &&
-	test_path_is_missing .git/worktrees/source/locked
+expecting success of 3004.4 'ls-files -h in corrupt repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		>.git/index &&
+		test_expect_code 129 git ls-files -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage: git ls-files " broken/usage
 
-fatal: 'source' is not locked
-ok 9 - unlock worktree twice
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3004-ls-files-basic/broken/.git/
+usage: git ls-files [<options>] [<file>...]
+ok 4 - ls-files -h in corrupt repository
 
-expecting success of 2403.10 'move non-worktree': 
-	mkdir abc &&
-	test_must_fail git worktree move abc def
+expecting success of 3004.5 'ls-files does not crash with -h': 
+	test_expect_code 129 git ls-files -h >usage &&
+	test_grep "[Uu]sage: git ls-files " usage &&
+	test_expect_code 129 nongit git ls-files -h >usage &&
+	test_grep "[Uu]sage: git ls-files " usage
 
-fatal: 'abc' is not a working tree
-ok 10 - move non-worktree
+usage: git ls-files [<options>] [<file>...]
+usage: git ls-files [<options>] [<file>...]
+ok 5 - ls-files does not crash with -h
 
-expecting success of 2403.11 'move locked worktree': 
-	git worktree lock source &&
-	test_when_finished "git worktree unlock source" &&
-	test_must_fail git worktree move source destination
+checking prerequisite: SYMLINKS
 
-fatal: cannot move a locked working tree;
-use 'move -f -f' to override or unlock first
-ok 11 - move locked worktree
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 2403.12 'move worktree': 
-	git worktree move source destination &&
-	test_path_is_missing source &&
-	git worktree list --porcelain >out &&
-	grep "^worktree.*/destination$" out &&
-	! grep "^worktree.*/source$" out &&
-	git -C destination log --format=%s >actual2 &&
-	echo init >expected2 &&
-	test_cmp expected2 actual2
+)
+prerequisite SYMLINKS ok
+expecting success of 3004.6 'ls-files with absolute paths to symlinks': 
+	mkdir subs &&
+	ln -s nosuch link &&
+	ln -s ../nosuch subs/link &&
+	git add link subs/link &&
+	git ls-files -s link subs/link >expect &&
+	git ls-files -s "$(pwd)/link" "$(pwd)/subs/link" >actual &&
+	test_cmp expect actual &&
 
-worktree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/destination
-ok 12 - move worktree
+	(
+		cd subs &&
+		git ls-files -s link >../expect &&
+		git ls-files -s "$(pwd)/link" >../actual
+	) &&
+	test_cmp expect actual
 
-expecting success of 2403.13 'move main worktree': 
-	test_must_fail git worktree move . def
+ok 6 - ls-files with absolute paths to symlinks
 
-fatal: '.' is a main working tree
-ok 13 - move main worktree
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2500-untracked-overwriting.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/.git/
+expecting success of 2500.1 'reset --hard will nuke untracked files/dirs': 
+	test_setup_reset hard &&
+	(
+		cd reset_hard &&
+		git ls-tree -r stable &&
+		git log --all --name-status --oneline &&
+		git ls-tree -r work &&
 
-expecting success of 2403.14 'move worktree to another dir': 
-	mkdir some-dir &&
-	git worktree move destination some-dir &&
-	test_when_finished "git worktree move some-dir/destination destination" &&
-	test_path_is_missing destination &&
-	git worktree list --porcelain >out &&
-	grep "^worktree.*/some-dir/destination$" out &&
-	git -C some-dir/destination log --format=%s >actual2 &&
-	echo init >expected2 &&
-	test_cmp expected2 actual2
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		echo foo >expect &&
 
-worktree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/some-dir/destination
-ok 14 - move worktree to another dir
+		git reset --hard work &&
 
-expecting success of 2403.15 'move locked worktree (force)': 
-	test_when_finished "
-		git worktree unlock flump || :
-		git worktree remove flump || :
-		git worktree unlock ploof || :
-		git worktree remove ploof || :
-		" &&
-	git worktree add --detach flump &&
-	git worktree lock flump &&
-	test_must_fail git worktree move flump ploof" &&
-	test_must_fail git worktree move --force flump ploof" &&
-	git worktree move --force --force flump ploof
+		# check that untracked directory foo.t/ was nuked
+		test_path_is_file foo.t &&
+		test_cmp expect foo.t
+	)
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: cannot move a locked working tree;
-use 'move -f -f' to override or unlock first
-fatal: 'flump' is not a working tree
-fatal: 'flump' is not a working tree
-ok 15 - move locked worktree (force)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/reset_hard/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to branch 'work'
+[work cb1b896] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Switched to branch 'stable'
+100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
+cb1b896 foo
+A	foo.t
+2519212 init
+A	init.t
+100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
+100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
+HEAD is now at cb1b896 foo
+ok 1 - reset --hard will nuke untracked files/dirs
 
-expecting success of 2403.16 'refuse to move worktree atop existing path': 
-	>bobble &&
-	git worktree add --detach beeble &&
-	test_must_fail git worktree move beeble bobble
+expecting success of 2500.2 'reset --merge will preserve untracked files/dirs': 
+	test_setup_reset merge &&
+	(
+		cd reset_merge &&
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: 'bobble' already exists
-ok 16 - refuse to move worktree atop existing path
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
 
-expecting success of 2403.17 'move atop existing but missing worktree': 
-	git worktree add --detach gnoo &&
-	git worktree add --detach pneu &&
-	rm -fr pneu &&
-	test_must_fail git worktree move gnoo pneu &&
-	git worktree move --force gnoo pneu &&
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating .foo.t. would lose untracked files" error
+	)
 
-	git worktree add --detach nu &&
-	git worktree lock nu &&
-	rm -fr nu &&
-	test_must_fail git worktree move pneu nu &&
-	test_must_fail git worktree --force move pneu nu &&
-	git worktree move --force --force pneu nu
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/reset_merge/.git/
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+Switched to branch 'work'
+[work cb1b896] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Switched to branch 'stable'
+error: Updating 'foo.t' would lose untracked files in it
+ok 2 - reset --merge will preserve untracked files/dirs
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: 'pneu' is a missing but already registered worktree;
-use 'move -f' to override, or 'prune' or 'remove' to clear
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: 'nu' is a missing but locked worktree;
-use 'move -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear
-error: unknown option `force'
-usage: git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]
-                        [--orphan] [(-b | -B) <new-branch>] <path> [<commit-ish>]
-   or: git worktree list [-v | --porcelain [-z]]
-   or: git worktree lock [--reason <string>] <worktree>
-   or: git worktree move <worktree> <new-path>
-   or: git worktree prune [-n] [-v] [--expire <expire>]
-   or: git worktree remove [-f] <worktree>
-   or: git worktree repair [<path>...]
-   or: git worktree unlock <worktree>
+expecting success of 2500.3 'reset --keep will preserve untracked files/dirs': 
+	test_setup_reset keep &&
+	(
+		cd reset_keep &&
 
-ok 17 - move atop existing but missing worktree
+		mkdir foo.t &&
+		echo precious >foo.t/file &&
+		cp foo.t/file expect &&
 
-expecting success of 2403.18 'move a repo with uninitialized submodule': 
-	git init withsub &&
-	(
-		cd withsub &&
-		test_commit initial &&
-		git -c protocol.file.allow=always \
-			submodule add "$PWD"/.git sub &&
-		git commit -m withsub &&
-		git worktree add second HEAD &&
-		git worktree move second third
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/.git/
-[master (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/sub'...
-done.
-[master 13577cc] withsub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Preparing worktree (detached HEAD 13577cc)
-HEAD is now at 13577cc withsub
-ok 18 - move a repo with uninitialized submodule
-
-expecting success of 2403.19 'not move a repo with initialized submodule': 
-	(
-		cd withsub &&
-		git -c protocol.file.allow=always -C third submodule update &&
-		test_must_fail git worktree move third forth
-	)
-
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/third/sub'...
-done.
-Submodule path 'sub': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
-fatal: working trees containing submodules cannot be moved or removed
-ok 19 - not move a repo with initialized submodule
-
-expecting success of 2403.20 'remove main worktree': 
-	test_must_fail git worktree remove .
-
-fatal: '.' is a main working tree
-ok 20 - remove main worktree
-
-expecting success of 2403.21 'remove locked worktree': 
-	git worktree lock destination &&
-	test_when_finished "git worktree unlock destination" &&
-	test_must_fail git worktree remove destination
-
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-ok 21 - remove locked worktree
-
-expecting success of 2403.22 'remove worktree with dirty tracked file': 
-	echo dirty >>destination/init.t &&
-	test_when_finished "git -C destination checkout init.t" &&
-	test_must_fail git worktree remove destination
-
-fatal: 'destination' contains modified or untracked files, use --force to delete it
-Updated 1 path from the index
-ok 22 - remove worktree with dirty tracked file
-
-expecting success of 2403.23 'remove worktree with untracked file': 
-	: >destination/untracked &&
-	test_must_fail git worktree remove destination
-
-fatal: 'destination' contains modified or untracked files, use --force to delete it
-ok 23 - remove worktree with untracked file
-
-expecting success of 2403.24 'force remove worktree with untracked file': 
-	git worktree remove --force destination &&
-	test_path_is_missing destination
-
-ok 24 - force remove worktree with untracked file
-
-expecting success of 2403.25 'remove missing worktree': 
-	git worktree add to-be-gone &&
-	test -d .git/worktrees/to-be-gone &&
-	mv to-be-gone gone &&
-	git worktree remove to-be-gone &&
-	test_path_is_missing .git/worktrees/to-be-gone
-
-Preparing worktree (new branch 'to-be-gone')
-HEAD is now at 2519212 init
-ok 25 - remove missing worktree
-
-expecting success of 2403.26 'NOT remove missing-but-locked worktree': 
-	git worktree add gone-but-locked &&
-	git worktree lock gone-but-locked &&
-	test -d .git/worktrees/gone-but-locked &&
-	mv gone-but-locked really-gone-now &&
-	test_must_fail git worktree remove gone-but-locked &&
-	test_path_is_dir .git/worktrees/gone-but-locked
-
-Preparing worktree (new branch 'gone-but-locked')
-HEAD is now at 2519212 init
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-ok 26 - NOT remove missing-but-locked worktree
-
-expecting success of 2403.27 'proper error when worktree not found': 
-	for i in noodle noodle/bork
-	do
-		test_must_fail git worktree lock $i 2>err &&
-		test_grep "not a working tree" err || return 1
-	done
-
-fatal: 'noodle' is not a working tree
-fatal: 'noodle/bork' is not a working tree
-ok 27 - proper error when worktree not found
-
-expecting success of 2403.28 'remove locked worktree (force)': 
-	git worktree add --detach gumby &&
-	test_when_finished "git worktree remove gumby || :" &&
-	git worktree lock gumby &&
-	test_when_finished "git worktree unlock gumby || :" &&
-	test_must_fail git worktree remove gumby &&
-	test_must_fail git worktree remove --force gumby &&
-	git worktree remove --force --force gumby
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-fatal: cannot remove a locked working tree;
-use 'remove -f -f' to override or unlock first
-fatal: 'gumby' is not a working tree
-fatal: 'gumby' is not a working tree
-ok 28 - remove locked worktree (force)
-
-expecting success of 2403.29 'remove cleans up .git/worktrees when empty': 
-	git init moog &&
-	(
-		cd moog &&
-		test_commit bim &&
-		git worktree add --detach goom &&
-		test_path_exists .git/worktrees &&
-		git worktree remove goom &&
-		test_path_is_missing .git/worktrees
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/moog/.git/
-[master (root-commit) 89d547b] bim
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bim.t
-Preparing worktree (detached HEAD 89d547b)
-HEAD is now at 89d547b bim
-ok 29 - remove cleans up .git/worktrees when empty
-
-expecting success of 2403.30 'remove a repo with uninitialized submodule': 
-	test_config_global protocol.file.allow always &&
-	(
-		cd withsub &&
-		git worktree add to-remove HEAD &&
-		git worktree remove to-remove
-	)
-
-Preparing worktree (detached HEAD 13577cc)
-HEAD is now at 13577cc withsub
-ok 30 - remove a repo with uninitialized submodule
-
-expecting success of 2403.31 'not remove a repo with initialized submodule': 
-	test_config_global protocol.file.allow always &&
-	(
-		cd withsub &&
-		git worktree add to-remove HEAD &&
-		git -C to-remove submodule update &&
-		test_must_fail git worktree remove to-remove
-	)
-
-Preparing worktree (detached HEAD 13577cc)
-HEAD is now at 13577cc withsub
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2403-worktree-move/withsub/to-remove/sub'...
-done.
-Submodule path 'sub': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
-fatal: working trees containing submodules cannot be moved or removed
-ok 31 - not remove a repo with initialized submodule
-
-expecting success of 2403.32 'move worktree with absolute path to relative path': 
-	test_config worktree.useRelativePaths false &&
-	git worktree add ./absolute &&
-	git worktree move --relative-paths absolute relative &&
-	echo "gitdir: ../.git/worktrees/absolute" >expect &&
-	test_cmp expect relative/.git &&
-	echo "../../../relative/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir &&
-	test_config worktree.useRelativePaths true &&
-	git worktree move relative relative2 &&
-	echo "gitdir: ../.git/worktrees/absolute" >expect &&
-	test_cmp expect relative2/.git &&
-	echo "../../../relative2/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir
-
-Preparing worktree (new branch 'absolute')
-HEAD is now at 2519212 init
-ok 32 - move worktree with absolute path to relative path
-
-expecting success of 2403.33 'move worktree with relative path to absolute path': 
-	test_config worktree.useRelativePaths true &&
-	git worktree move --no-relative-paths relative2 absolute &&
-	echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect &&
-	test_cmp expect absolute/.git &&
-	echo "$(pwd)/absolute/.git" >expect &&
-	test_cmp expect .git/worktrees/absolute/gitdir
-
-ok 33 - move worktree with relative path to absolute path
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2402-worktree-list.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/.git/
-expecting success of 2402.1 'setup': 
-	test_commit init
-
-[main (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
-
-expecting success of 2402.2 'rev-parse --git-common-dir on main worktree': 
-	git rev-parse --git-common-dir >actual &&
-	echo .git >expected &&
-	test_cmp expected actual &&
-	mkdir sub &&
-	git -C sub rev-parse --git-common-dir >actual2 &&
-	echo ../.git >expected2 &&
-	test_cmp expected2 actual2
-
-ok 2 - rev-parse --git-common-dir on main worktree
-
-expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
-	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
-	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
-	git worktree add --detach linked-tree main &&
-	git -C linked-tree rev-parse --git-path objects >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - rev-parse --git-path objects linked worktree
-
-expecting success of 2402.4 '"list" all worktrees from main': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 4 - "list" all worktrees from main
-
-expecting success of 2402.5 '"list" all worktrees from linked': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C here worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 5 - "list" all worktrees from linked
-
-expecting success of 2402.6 '"list" all worktrees --porcelain': 
-	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "branch $(git symbolic-ref HEAD)" >>expect &&
-	echo >>expect &&
-	test_when_finished "rm -rf here actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "detached" >>expect &&
-	echo >>expect &&
-	git worktree list --porcelain >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 6 - "list" all worktrees --porcelain
-
-expecting success of 2402.7 '"list" all worktrees --porcelain -z': 
-	test_when_finished "rm -rf here _actual actual expect &&
-				git worktree prune" &&
-	printf "worktree %sQHEAD %sQbranch %sQQ" \
-		"$(git rev-parse --show-toplevel)" \
-		$(git rev-parse HEAD --symbolic-full-name HEAD) >expect &&
-	git worktree add --detach here main &&
-	printf "worktree %sQHEAD %sQdetachedQQ" \
-		"$(git -C here rev-parse --show-toplevel)" \
-		"$(git rev-parse HEAD)" >>expect &&
-	git worktree list --porcelain -z >_actual &&
-	nul_to_q <_actual >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 7 - "list" all worktrees --porcelain -z
-
-expecting success of 2402.8 '"list" -z fails without --porcelain': 
-	test_must_fail git worktree list -z
-
-fatal: the option '-z' requires '--porcelain'
-ok 8 - "list" -z fails without --porcelain
-
-expecting success of 2402.9 '"list" all worktrees with locked annotation': 
-	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
-	git worktree add --detach locked main &&
-	git worktree add --detach unlocked main &&
-	git worktree lock locked &&
-	test_when_finished "git worktree unlock locked" &&
-	git worktree list >out &&
-	grep "/locked  *[0-9a-f].* locked$" out &&
-	! grep "/unlocked  *[0-9a-f].* locked$" out
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
-ok 9 - "list" all worktrees with locked annotation
-
-expecting success of 2402.10 '"list" all worktrees --porcelain with locked': 
-	test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
-	echo "locked" >expect &&
-	echo "locked with reason" >>expect &&
-	git worktree add --detach locked1 &&
-	git worktree add --detach locked2 &&
-	# unlocked worktree should not be annotated with "locked"
-	git worktree add --detach unlocked &&
-	git worktree lock locked1 &&
-	test_when_finished "git worktree unlock locked1" &&
-	git worktree lock locked2 --reason "with reason" &&
-	test_when_finished "git worktree unlock locked2" &&
-	git worktree list --porcelain >out &&
-	grep "^locked" out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 10 - "list" all worktrees --porcelain with locked
-
-expecting success of 2402.11 '"list" all worktrees --porcelain with locked reason newline escaped': 
-	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
-	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
-	printf "locked \"locked\\\\nreason\"\n" >>expect &&
-	git worktree add --detach locked_lf &&
-	git worktree add --detach locked_crlf &&
-	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
-	test_when_finished "git worktree unlock locked_lf" &&
-	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
-	test_when_finished "git worktree unlock locked_crlf" &&
-	git worktree list --porcelain >out &&
-	grep "^locked" out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 11 - "list" all worktrees --porcelain with locked reason newline escaped
-
-expecting success of 2402.12 '"list" all worktrees with prunable annotation': 
-	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	git worktree add --detach unprunable &&
-	rm -rf prunable &&
-	git worktree list >out &&
-	grep "/prunable  *[0-9a-f].* prunable$" out &&
-	! grep "/unprunable  *[0-9a-f].* prunable$"
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
-ok 12 - "list" all worktrees with prunable annotation
-
-expecting success of 2402.13 '"list" all worktrees --porcelain with prunable': 
-	test_when_finished "rm -rf prunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	rm -rf prunable &&
-	git worktree list --porcelain >out &&
-	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
-	test_grep "^prunable gitdir file points to non-existent location$" only_prunable
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-prunable gitdir file points to non-existent location
-ok 13 - "list" all worktrees --porcelain with prunable
-
-expecting success of 2402.14 '"list" all worktrees with prunable consistent with "prune"': 
-	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
-	git worktree add --detach prunable &&
-	git worktree add --detach unprunable &&
-	rm -rf prunable &&
-	git worktree list >out &&
-	grep "/prunable  *[0-9a-f].* prunable$" out &&
-	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
-	git worktree prune --verbose 2>out &&
-	test_grep "^Removing worktrees/prunable" out &&
-	test_grep ! "^Removing worktrees/unprunable" out
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
-Removing worktrees/prunable: gitdir file points to non-existent location
-ok 14 - "list" all worktrees with prunable consistent with "prune"
-
-expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
-	test_must_fail git worktree list --verbose --porcelain
-
-fatal: options '--verbose' and '--porcelain' cannot be used together
-ok 15 - "list" --verbose and --porcelain mutually exclusive
-
-expecting success of 2402.16 '"list" all worktrees --verbose with locked': 
-	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
-	git worktree add locked1 --detach &&
-	git worktree add locked2 --detach &&
-	git worktree lock locked1 &&
-	test_when_finished "git worktree unlock locked1" &&
-	git worktree lock locked2 --reason "with reason" &&
-	test_when_finished "git worktree unlock locked2" &&
-	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
-	printf "\tlocked: with reason\n" >>expect &&
-	git worktree list --verbose >out &&
-	grep "/locked1  *[0-9a-f].* locked$" out &&
-	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
-	test_cmp actual expect
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
-ok 16 - "list" all worktrees --verbose with locked
-
-expecting success of 2402.17 '"list" all worktrees --verbose with prunable': 
-	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
-	git worktree add prunable --detach &&
-	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
-	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
-	rm -rf prunable &&
-	git worktree list --verbose >out &&
-	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
-	test_cmp actual expect
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 17 - "list" all worktrees --verbose with prunable
-
-expecting success of 2402.18 'bare repo setup': 
-	git init --bare bare1 &&
-	echo "data" >file1 &&
-	git add file1 &&
-	git commit -m"File1: add data" &&
-	git push bare1 main &&
-	git reset --hard HEAD^
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/bare1/
-[main 7c81006] File1: add data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-To bare1
- * [new branch]      main -> main
-HEAD is now at 2519212 init
-ok 18 - bare repo setup
-
-expecting success of 2402.19 '"list" all worktrees from bare main': 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "$(pwd)/bare1 (bare)" >expect &&
-	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C bare1 worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 19 - "list" all worktrees from bare main
-
-expecting success of 2402.20 '"list" all worktrees --porcelain from bare main': 
-	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "worktree $(pwd)/bare1" >expect &&
-	echo "bare" >>expect &&
-	echo >>expect &&
-	echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
-	echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
-	echo "detached" >>expect &&
-	echo >>expect &&
-	git -C bare1 worktree list --porcelain >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 20 - "list" all worktrees --porcelain from bare main
-
-expecting success of 2402.21 '"list" all worktrees from linked with a bare main': 
-	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
-	echo "$(pwd)/bare1 (bare)" >expect &&
-	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C there worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 21 - "list" all worktrees from linked with a bare main
-
-expecting success of 2402.22 'bare repo cleanup': 
-	rm -rf bare1
-
-ok 22 - bare repo cleanup
-
-expecting success of 2402.23 'broken main worktree still at the top': 
-	git init broken-main &&
-	(
-		cd broken-main &&
-		test_commit new &&
-		git worktree add linked &&
-		cat >expected <<-EOF &&
-		worktree $(pwd)
-		HEAD $ZERO_OID
-
-		EOF
-		cd linked &&
-		echo "worktree $(pwd)" >expected &&
-		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
-		git worktree list --porcelain >out &&
-		head -n 3 out >actual &&
-		test_cmp ../expected actual &&
-		git worktree list >out &&
-		head -n 1 out >actual.2 &&
-		grep -F "(error)" actual.2
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/broken-main/.git/
-[main (root-commit) 3325ee1] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'linked')
-HEAD is now at 3325ee1 new
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
-ok 23 - broken main worktree still at the top
-
-expecting success of 2402.24 'linked worktrees are sorted': 
-	test_when_finished "rm -rf sorted" &&
-	mkdir sorted &&
-	git init sorted/main &&
-	(
-		cd sorted/main &&
-		test_tick &&
-		test_commit new &&
-		git worktree add ../first &&
-		git worktree add ../second &&
-		git worktree list --porcelain >out &&
-		grep ^worktree out >actual
-	) &&
-	cat >expected <<-EOF &&
-	worktree $(pwd)/sorted/main
-	worktree $(pwd)/sorted/first
-	worktree $(pwd)/sorted/second
-	EOF
-	test_cmp expected sorted/main/actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/sorted/main/.git/
-[main (root-commit) d8ef111] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'first')
-HEAD is now at d8ef111 new
-Preparing worktree (new branch 'second')
-HEAD is now at d8ef111 new
-ok 24 - linked worktrees are sorted
-
-expecting success of 2402.25 'linked worktrees with relative paths are shown with absolute paths': 
-	test_when_finished "rm -rf sorted" &&
-	mkdir sorted &&
-	git init sorted/main &&
-	(
-		cd sorted/main &&
-		test_tick &&
-		test_commit new &&
-		git worktree add --relative-paths ../first &&
-		git worktree add ../second &&
-		git worktree list --porcelain >out &&
-		grep ^worktree out >actual
-	) &&
-	cat >expected <<-EOF &&
-	worktree $(pwd)/sorted/main
-	worktree $(pwd)/sorted/first
-	worktree $(pwd)/sorted/second
-	EOF
-	test_cmp expected sorted/main/actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2402-worktree-list/sorted/main/.git/
-[main (root-commit) d8ef111] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Preparing worktree (new branch 'first')
-HEAD is now at d8ef111 new
-Preparing worktree (new branch 'second')
-HEAD is now at d8ef111 new
-ok 25 - linked worktrees with relative paths are shown with absolute paths
-
-expecting success of 2402.26 'worktree path when called in .git directory': 
-	git worktree list >list1 &&
-	git -C .git worktree list >list2 &&
-	test_cmp list1 list2
-
-ok 26 - worktree path when called in .git directory
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2407-worktree-heads.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/.git/
-expecting success of 2407.1 'setup': 
-	test_commit init &&
-
-	for i in 1 2 3 4
-	do
-		git checkout -b conflict-$i &&
-		echo "not I" >$i.t &&
-		git add $i.t &&
-		git commit -m "will conflict" &&
-
-		git checkout - &&
-		test_commit $i &&
-		git branch wt-$i &&
-		git branch fake-$i &&
-		git worktree add wt-$i wt-$i || return 1
-	done &&
-
-	# Create a server that updates each branch by one commit
-	git init server &&
-	test_commit -C server initial &&
-	git remote add server ./server &&
-	for i in 1 2 3 4
-	do
-		git -C server checkout -b wt-$i &&
-		test_commit -C server A-$i || return 1
-	done &&
-	for i in 1 2
-	do
-		git -C server checkout -b fake-$i &&
-		test_commit -C server f-$i || return 1
-	done
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to a new branch 'conflict-1'
-[conflict-1 0bd9076] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to branch 'master'
-[master dd232bf] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Preparing worktree (checking out 'wt-1')
-HEAD is now at dd232bf 1
-Switched to a new branch 'conflict-2'
-[conflict-2 881ff7f] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to branch 'master'
-[master 8f55bc3] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Preparing worktree (checking out 'wt-2')
-HEAD is now at 8f55bc3 2
-Switched to a new branch 'conflict-3'
-[conflict-3 016e7ca] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to branch 'master'
-[master 4c93b0a] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Preparing worktree (checking out 'wt-3')
-HEAD is now at 4c93b0a 3
-Switched to a new branch 'conflict-4'
-[conflict-4 11365f4] will conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to branch 'master'
-[master 3fbd4b0] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Preparing worktree (checking out 'wt-4')
-HEAD is now at 3fbd4b0 4
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/server/.git/
-[master (root-commit) 31243c6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'wt-1'
-[wt-1 4e3ca6d] A-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-1.t
-Switched to a new branch 'wt-2'
-[wt-2 3582f45] A-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-2.t
-Switched to a new branch 'wt-3'
-[wt-3 b62f76d] A-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-3.t
-Switched to a new branch 'wt-4'
-[wt-4 5e1557d] A-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A-4.t
-Switched to a new branch 'fake-1'
-[fake-1 ae0524d] f-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f-1.t
-Switched to a new branch 'fake-2'
-[fake-2 8b85f46] f-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f-2.t
-ok 1 - setup
-
-expecting success of 2407.2 'refuse to overwrite: checked out in worktree': 
-	for i in 1 2 3 4
-	do
-		test_must_fail git branch -f wt-$i HEAD 2>err &&
-		grep "cannot force update the branch" err &&
-
-		test_must_fail git branch -D wt-$i 2>err &&
-		grep "cannot delete branch" err || return 1
-	done
-
-fatal: cannot force update the branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
-error: cannot delete branch 'wt-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
-fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
-error: cannot delete branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
-fatal: cannot force update the branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-error: cannot delete branch 'wt-3' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
-error: cannot delete branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
-ok 2 - refuse to overwrite: checked out in worktree
-
-expecting success of 2407.3 'refuse to overwrite: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
-
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
-
-	test_must_fail git branch -f wt-4 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-4' used by worktree at.*wt-4" err
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
-fatal: cannot force update the branch 'wt-4' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
-Previous HEAD position was 4c93b0a 3
-Switched to branch 'wt-4'
-ok 3 - refuse to overwrite: worktree in bisect
-
-expecting success of 2407.4 'refuse to overwrite: worktree in rebase (apply)': 
-	test_when_finished git -C wt-2 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase --apply conflict-2 &&
-
-	test_must_fail git branch -f wt-2 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
-
-First, rewinding head to replay your work on top of it...
-Applying: 2
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-881ff7f will conflict
-virtual 2
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in 2.t
-Auto-merging 2.t
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 2
-fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
-ok 4 - refuse to overwrite: worktree in rebase (apply)
-
-expecting success of 2407.5 'refuse to overwrite: worktree in rebase (merge)': 
-	test_when_finished git -C wt-2 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-2 rebase conflict-2 &&
-
-	test_must_fail git branch -f wt-2 HEAD 2>err &&
-	grep "cannot force update the branch 'wt-2' used by worktree at.*wt-2" err
-
-Rebasing (1/1)
Auto-merging 2.t
-CONFLICT (add/add): Merge conflict in 2.t
-error: could not apply 8f55bc3... 2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 8f55bc3... 2
-fatal: cannot force update the branch 'wt-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-2'
-ok 5 - refuse to overwrite: worktree in rebase (merge)
-
-expecting success of 2407.6 'refuse to overwrite: worktree in rebase with --update-refs': 
-	test_when_finished git -C wt-3 rebase --abort &&
-
-	git branch -f can-be-updated wt-3 &&
-	test_must_fail git -C wt-3 rebase --update-refs conflict-3 &&
-
-	for i in 3 4
-	do
-		test_must_fail git branch -f can-be-updated HEAD 2>err &&
-		grep "cannot force update the branch 'can-be-updated' used by worktree at.*wt-3" err ||
-			return 1
-	done
-
-Rebasing (1/3)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4c93b0a... 3
-fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-fatal: cannot force update the branch 'can-be-updated' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-ok 6 - refuse to overwrite: worktree in rebase with --update-refs
-
-expecting success of 2407.7 'refuse to fetch over ref: checked out': 
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch 'refs/heads/wt-3'" err &&
-
-	# General fetch into refs/heads/ will fail on first ref,
-	# so use a generic error message check.
-	test_must_fail git fetch server +refs/heads/*:refs/heads/* 2>err &&
-	grep "refusing to fetch into branch" err
-
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-fatal: refusing to fetch into branch 'refs/heads/master' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads'
-ok 7 - refuse to fetch over ref: checked out
-
-expecting success of 2407.8 'refuse to fetch over ref: worktree in bisect': 
-	test_when_finished git -C wt-4 bisect reset &&
-
-	# Set up a bisect so HEAD no longer points to wt-4.
-	git -C wt-4 bisect start &&
-	git -C wt-4 bisect bad wt-4 &&
-	git -C wt-4 bisect good wt-1 &&
-
-	test_must_fail git fetch server +refs/heads/wt-4:refs/heads/wt-4 2>err &&
-	grep "refusing to fetch into branch" err
-
-status: waiting for both good and bad commits
-status: waiting for good commit(s), bad commit known
-Bisecting: 0 revisions left to test after this (roughly 1 step)
-[4c93b0a8594e03729f8d4346495db54cf8d767e9] 3
-fatal: refusing to fetch into branch 'refs/heads/wt-4' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
-Previous HEAD position was 4c93b0a 3
-Switched to branch 'wt-4'
-ok 8 - refuse to fetch over ref: worktree in bisect
-
-expecting success of 2407.9 'refuse to fetch over ref: worktree in rebase': 
-	test_when_finished git -C wt-3 rebase --abort &&
-
-	# This will fail part-way through due to a conflict.
-	test_must_fail git -C wt-3 rebase conflict-3 &&
-
-	test_must_fail git fetch server +refs/heads/wt-3:refs/heads/wt-3 2>err &&
-	grep "refusing to fetch into branch" err
-
-Rebasing (1/1)
Auto-merging 3.t
-CONFLICT (add/add): Merge conflict in 3.t
-error: could not apply 4c93b0a... 3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 4c93b0a... 3
-fatal: refusing to fetch into branch 'refs/heads/wt-3' checked out at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-3'
-ok 9 - refuse to fetch over ref: worktree in rebase
-
-expecting success of 2407.10 'refuse to overwrite when in error states': 
-	test_when_finished rm -rf .git/worktrees/wt-*/rebase-merge &&
-	test_when_finished rm -rf .git/worktrees/wt-*/BISECT_* &&
-
-	# Both branches are currently under rebase.
-	mkdir -p .git/worktrees/wt-3/rebase-merge &&
-	touch .git/worktrees/wt-3/rebase-merge/interactive &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-3/rebase-merge/head-name &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-3/rebase-merge/onto &&
-	mkdir -p .git/worktrees/wt-4/rebase-merge &&
-	touch .git/worktrees/wt-4/rebase-merge/interactive &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-4/rebase-merge/head-name &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-4/rebase-merge/onto &&
-
-	# Both branches are currently under bisect.
-	touch .git/worktrees/wt-4/BISECT_LOG &&
-	echo refs/heads/fake-2 >.git/worktrees/wt-4/BISECT_START &&
-	touch .git/worktrees/wt-1/BISECT_LOG &&
-	echo refs/heads/fake-1 >.git/worktrees/wt-1/BISECT_START &&
-
-	for i in 1 2
-	do
-		test_must_fail git branch -f fake-$i HEAD 2>err &&
-		grep "cannot force update the branch 'fake-$i' used by worktree at" err ||
-			return 1
-	done
-
-fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-1'
-fatal: cannot force update the branch 'fake-2' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2407-worktree-heads/wt-4'
-ok 10 - refuse to overwrite when in error states
-
-expecting success of 2407.11 'refuse to overwrite during rebase with --update-refs': 
-	git commit --fixup HEAD~2 --allow-empty &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
-		! grep "update-refs" todo
-	) &&
-	git branch -f allow-update HEAD~2 &&
-	(
-		set_cat_todo_editor &&
-		test_must_fail git rebase -i --update-refs HEAD~3 >todo &&
-		grep "update-ref refs/heads/allow-update" todo
-	)
-
-[master 3e1ca9c] fixup! 2
- Author: A U Thor <author@example.com>
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-update-ref refs/heads/allow-update
-ok 11 - refuse to overwrite during rebase with --update-refs
-
-expecting success of 2407.12 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 12 - $EDITOR and friends are unchanged
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2406-worktree-repair.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/
-expecting success of 2406.1 'setup': 
-	test_commit init
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
-
-expecting success of 2406.2 'skip missing worktree': 
-	test_when_finished "git worktree prune" &&
-	git worktree add --detach missing &&
-	rm -rf missing &&
-	git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 2 - skip missing worktree
-
-expecting success of 2406.3 'worktree path not directory': 
-	test_when_finished "git worktree prune" &&
-	git worktree add --detach notdir &&
-	rm -rf notdir &&
-	>notdir &&
-	test_must_fail git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a directory" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: not a directory: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/notdir
-ok 3 - worktree path not directory
-
-expecting success of 2406.4 'don't clobber .git repo': 
-	test_when_finished "rm -rf repo && git worktree prune" &&
-	git worktree add --detach repo &&
-	rm -rf repo &&
-	test_create_repo repo &&
-	test_must_fail git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git is not a file" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/repo/.git/
-error: .git is not a file: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/repo
-ok 4 - don't clobber .git repo
-
-expecting success of 2406.5 'repair missing .git file': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 5 - repair missing .git file
-
-expecting success of 2406.6 'repair bogus .git file': 
-	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
-		".git file broken"
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 6 - repair bogus .git file
-
-expecting success of 2406.7 'repair incorrect .git file': 
-	test_when_finished "rm -rf other && git worktree prune" &&
-	test_create_repo other &&
-	other=$(git -C other rev-parse --absolute-git-dir) &&
-	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
-		".git file incorrect"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/other/.git/
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 7 - repair incorrect .git file
-
-expecting success of 2406.8 'repair .git file from main/.git': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 8 - repair .git file from main/.git
-
-expecting success of 2406.9 'repair .git file from linked worktree': 
-	test_when_finished "rm -rf other && git worktree prune" &&
-	git worktree add --detach other &&
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 9 - repair .git file from linked worktree
-
-expecting success of 2406.10 'repair .git file from bare.git': 
-	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add --detach ../corrupt &&
-	git -C corrupt rev-parse --absolute-git-dir >expect &&
-	rm -f corrupt/.git &&
-	git -C bare.git worktree repair &&
-	git -C corrupt rev-parse --absolute-git-dir >actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/corrupt
-ok 10 - repair .git file from bare.git
-
-expecting success of 2406.11 'invalid worktree path': 
-	test_must_fail git worktree repair /notvalid >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a valid path" err
-
-error: not a valid path: /notvalid
-ok 11 - invalid worktree path
-
-expecting success of 2406.12 'repo not found; .git not file': 
-	test_when_finished "rm -rf not-a-worktree" &&
-	test_create_repo not-a-worktree &&
-	test_must_fail git worktree repair not-a-worktree >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git is not a file" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/not-a-worktree/.git/
-error: unable to locate repository; .git is not a file: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
-ok 12 - repo not found; .git not file
-
-expecting success of 2406.13 'repo not found; .git not referencing repo': 
-	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
-	git worktree add --detach side &&
-	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
-	mv side/.newgit side/.git &&
-	mkdir not-a-repo &&
-	test_must_fail git worktree repair side 2>err &&
-	test_grep ".git file does not reference a repository" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: unable to locate repository; .git file does not reference a repository: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/side/.git
-ok 13 - repo not found; .git not referencing repo
-
-expecting success of 2406.14 'repo not found; .git file broken': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	echo /invalid >orig/.git &&
-	mv orig moved &&
-	test_must_fail git worktree repair moved >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git file broken" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/moved/.git
-ok 14 - repo not found; .git file broken
-
-expecting success of 2406.15 'repair broken gitdir': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	rm .git/worktrees/orig/gitdir &&
-	mv orig moved &&
-	git worktree repair moved 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir unreadable" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir unreadable: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 15 - repair broken gitdir
-
-expecting success of 2406.16 'repair incorrect gitdir': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git worktree repair moved 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir incorrect" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 16 - repair incorrect gitdir
-
-expecting success of 2406.17 'repair gitdir (implicit) from linked worktree': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	sed s,orig/\.git$,moved/.git, .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git -C moved worktree repair 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_grep "gitdir incorrect" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 17 - repair gitdir (implicit) from linked worktree
-
-expecting success of 2406.18 'unable to repair gitdir (implicit) from main worktree': 
-	test_when_finished "rm -rf orig moved && git worktree prune" &&
-	git worktree add --detach orig &&
-	cat .git/worktrees/orig/gitdir >expect &&
-	mv orig moved &&
-	git worktree repair 2>err &&
-	test_cmp expect .git/worktrees/orig/gitdir &&
-	test_must_be_empty err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 18 - unable to repair gitdir (implicit) from main worktree
-
-expecting success of 2406.19 'repair multiple gitdir files': 
-	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
-		git worktree prune" &&
-	git worktree add --detach orig1 &&
-	git worktree add --detach orig2 &&
-	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
-	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
-	mv orig1 moved1 &&
-	mv orig2 moved2 &&
-	git worktree repair moved1 moved2 2>err &&
-	test_cmp expect1 .git/worktrees/orig1/gitdir &&
-	test_cmp expect2 .git/worktrees/orig2/gitdir &&
-	test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
-	test_grep "gitdir incorrect:.*orig2/gitdir$" err
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
-ok 19 - repair multiple gitdir files
-
-expecting success of 2406.20 'repair moved main and linked worktrees': 
-	test_when_finished "rm -rf main side mainmoved sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../side &&
-	sed "s,side/\.git$,sidemoved/.git," \
-		main/.git/worktrees/side/gitdir >expect-gitdir &&
-	sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
-		side/.git >expect-gitfile &&
-	mv main mainmoved &&
-	mv side sidemoved &&
-	git -C mainmoved worktree repair ../sidemoved &&
-	test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) f54694c] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD f54694c)
-HEAD is now at f54694c init
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/mainmoved/.git/worktrees/side/gitdir
-ok 20 - repair moved main and linked worktrees
-
-expecting success of 2406.21 'repair copied main and linked worktrees': 
-	test_when_finished "rm -rf orig dup" &&
-	mkdir -p orig &&
-	git -C orig init main &&
-	test_commit -C orig/main nothing &&
-	git -C orig/main worktree add ../linked &&
-	cp orig/main/.git/worktrees/linked/gitdir orig/main.expect &&
-	cp orig/linked/.git orig/linked.expect &&
-	cp -R orig dup &&
-	sed "s,orig/linked/\.git$,dup/linked/.git," orig/main.expect >dup/main.expect &&
-	sed "s,orig/main/\.git/worktrees/linked$,dup/main/.git/worktrees/linked," \
-		orig/linked.expect >dup/linked.expect &&
-	git -C dup/main worktree repair ../linked &&
-	test_cmp orig/main.expect orig/main/.git/worktrees/linked/gitdir &&
-	test_cmp orig/linked.expect orig/linked/.git &&
-	test_cmp dup/main.expect dup/main/.git/worktrees/linked/gitdir &&
-	test_cmp dup/linked.expect dup/linked/.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/orig/main/.git/
-[master (root-commit) a5c17d1] nothing
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nothing.t
-Preparing worktree (new branch 'linked')
-HEAD is now at a5c17d1 nothing
-repair: gitdir incorrect: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/dup/main/.git/worktrees/linked/gitdir
-ok 21 - repair copied main and linked worktrees
-
-expecting success of 2406.22 'repair worktree with relative path with missing gitfile': 
-	test_when_finished "rm -rf main wt" &&
-	test_create_repo main &&
-	git -C main config worktree.useRelativePaths true &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../wt &&
-	rm wt/.git &&
-	test_path_is_missing wt/.git &&
-	git -C main worktree repair &&
-	echo "gitdir: ../main/.git/worktrees/wt" >expect &&
-	test_cmp expect wt/.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 49cd008] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 49cd008)
-HEAD is now at 49cd008 init
-repair: .git file broken: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/wt
-ok 22 - repair worktree with relative path with missing gitfile
-
-expecting success of 2406.23 'repair absolute worktree to use relative paths': 
-	test_when_finished "rm -rf main side sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --detach ../side &&
-	echo "../../../../sidemoved/.git" >expect-gitdir &&
-	echo "gitdir: ../main/.git/worktrees/side" >expect-gitfile &&
-	mv side sidemoved &&
-	git -C main worktree repair --relative-paths ../sidemoved &&
-	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 7e6fdee] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 7e6fdee)
-HEAD is now at 7e6fdee init
-repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
-repair: .git file absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/sidemoved
-ok 23 - repair absolute worktree to use relative paths
-
-expecting success of 2406.24 'repair relative worktree to use absolute paths': 
-	test_when_finished "rm -rf main side sidemoved" &&
-	test_create_repo main &&
-	test_commit -C main init &&
-	git -C main worktree add --relative-paths --detach ../side &&
-	echo "$(pwd)/sidemoved/.git" >expect-gitdir &&
-	echo "gitdir: $(pwd)/main/.git/worktrees/side" >expect-gitfile &&
-	mv side sidemoved &&
-	git -C main worktree repair ../sidemoved &&
-	test_cmp expect-gitdir main/.git/worktrees/side/gitdir &&
-	test_cmp expect-gitfile sidemoved/.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) 6f4234e] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Preparing worktree (detached HEAD 6f4234e)
-HEAD is now at 6f4234e init
-repair: gitdir absolute/relative path mismatch: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2406-worktree-repair/main/.git/worktrees/side/gitdir
-ok 24 - repair relative worktree to use absolute paths
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3002-ls-files-dashpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3002-ls-files-dashpath/.git/
-expecting success of 3002.1 'setup': 
-	echo frotz >path0 &&
-	echo frotz >./-foo &&
-	echo frotz >./--
-
-ok 1 - setup
-
-expecting success of 3002.2 'git ls-files without path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others >output &&
-	cat >expect <<-\EOF &&
-	--
-	-foo
-	output
-	path0
-	EOF
-	test_cmp output expect
-
-ok 2 - git ls-files without path restriction.
-
-expecting success of 3002.3 'git ls-files with path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others path0 >output &&
-	cat >expect <<-\EOF &&
-	path0
-	EOF
-	test_cmp output expect
-
-ok 3 - git ls-files with path restriction.
-
-expecting success of 3002.4 'git ls-files with path restriction with --.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- path0 >output &&
-	cat >expect <<-\EOF &&
-	path0
-	EOF
-	test_cmp output expect
-
-ok 4 - git ls-files with path restriction with --.
-
-expecting success of 3002.5 'git ls-files with path restriction with -- --.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- -- >output &&
-	cat >expect <<-\EOF &&
-	--
-	EOF
-	test_cmp output expect
-
-ok 5 - git ls-files with path restriction with -- --.
-
-expecting success of 3002.6 'git ls-files with no path restriction.': 
-	test_when_finished "rm -f expect" &&
-	git ls-files --others -- >output &&
-	cat >expect <<-\EOF &&
-	--
-	-foo
-	output
-	path0
-	EOF
-	test_cmp output expect
-
-
-ok 6 - git ls-files with no path restriction.
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3001-ls-files-others-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3001-ls-files-others-exclude/.git/
-expecting success of 3001.1 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 1 - git ls-files --others with various exclude options.
-
-expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 2 - git ls-files --others with \r\n line endings.
-
-expecting success of 3001.3 'setup skip-worktree gitignore': 
-	git add $allignores &&
-	git update-index --skip-worktree $allignores &&
-	rm $allignores
-
-ok 3 - setup skip-worktree gitignore
-
-expecting success of 3001.4 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 4 - git ls-files --others with various exclude options.
-
-expecting success of 3001.5 'restore gitignore': 
-	git checkout --ignore-skip-worktree-bits $allignores &&
-	rm .git/index
-
-Updated 3 paths from the index
-ok 5 - restore gitignore
-
-expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
-ok 6 - git status honors core.excludesfile
-
-expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
-
-	git ls-files --others --exclude=one/ >output &&
-	if grep "^one/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
-
-
-ok 7 - trailing slash in exclude allows directory match(1)
-
-expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
-
-	git ls-files --others --exclude=one/two/ >output &&
-	if grep "^one/two/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
-
-
-ok 8 - trailing slash in exclude allows directory match (2)
-
-expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
-
-	>two &&
-	git ls-files --others --exclude=two/ >output &&
-	grep "^two" output
-
-
-two
-ok 9 - trailing slash in exclude forces directory match (1)
-
-expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
-
-	git ls-files --others --exclude=one/a.1/ >output &&
-	grep "^one/a.1" output
-
-
-one/a.1
-ok 10 - trailing slash in exclude forces directory match (2)
-
-expecting success of 3001.11 'negated exclude matches can override previous ones': 
-
-	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
-	grep "^a.1" output
-
-a.1
-ok 11 - negated exclude matches can override previous ones
-
-expecting success of 3001.12 'excluded directory overrides content patterns': 
-
-	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
-
-ok 12 - excluded directory overrides content patterns
-
-expecting success of 3001.13 'negated directory doesn't affect content patterns': 
-
-	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
-
-ok 13 - negated directory doesn't affect content patterns
-
-expecting success of 3001.14 'subdirectory ignore (setup)': 
-	mkdir -p top/l1/l2 &&
-	(
-		cd top &&
-		git init &&
-		echo /.gitignore >.gitignore &&
-		echo l1 >>.gitignore &&
-		echo l2 >l1/.gitignore &&
-		>l1/l2/l1
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3001-ls-files-others-exclude/top/.git/
-ok 14 - subdirectory ignore (setup)
-
-expecting success of 3001.15 'subdirectory ignore (toplevel)': 
-	(
-		cd top &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 15 - subdirectory ignore (toplevel)
-
-expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
-	(
-		cd top/l1/l2 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 16 - subdirectory ignore (l1/l2)
-
-expecting success of 3001.17 'subdirectory ignore (l1)': 
-	(
-		cd top/l1 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 17 - subdirectory ignore (l1)
-
-expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
-	rm top/l1/l2/l1 &&
-	rm top/l1/.gitignore
-
-ok 18 - show/hide empty ignored directory (setup)
-
-expecting success of 3001.19 'show empty ignored directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/ >expect &&
-	test_cmp expect actual
-
-ok 19 - show empty ignored directory with --directory
-
-expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
-
-ok 20 - hide empty ignored directory with --no-empty-directory
-
-expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
-	> top/l1/tracked &&
-	(
-		cd top &&
-		git add -f l1/tracked
-	)
-
-ok 21 - show/hide empty ignored sub-directory (setup)
-
-expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/l2/ >expect &&
-	test_cmp expect actual
-
-ok 22 - show empty ignored sub-directory with --directory
-
-expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
-
-ok 23 - hide empty ignored sub-directory with --no-empty-directory
-
-expecting success of 3001.24 'pattern matches prefix completely': 
-	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
-	test_must_be_empty actual
-
-ok 24 - pattern matches prefix completely
-
-expecting success of 3001.25 'ls-files with "**" patterns': 
-	cat <<-\EOF >expect &&
-	a.1
-	one/a.1
-	one/two/a.1
-	three/a.1
-	EOF
-	git ls-files -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 25 - ls-files with "**" patterns
-
-expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
-	# Expectation same as previous test
-	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 26 - ls-files with "**" patterns and --directory
-
-expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
-	git ls-files -o -i --exclude "one**a.1" >actual &&
-	test_must_be_empty actual
-
-ok 27 - ls-files with "**" patterns and no slashes
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3003-ls-files-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3003-ls-files-exclude/.git/
-expecting success of 3003.1 'create repo with file': 
-	echo content >file &&
-	git add file &&
-	git commit -m file &&
-	echo modification >file
-
-[master (root-commit) 39caa03] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - create repo with file
-
-expecting success of 3003.2 'ls-files output contains file (cached)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
-
-ok 2 - ls-files output contains file (cached)
-
-expecting success of 3003.3 'ls-files output contains file (modified)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
-
-ok 3 - ls-files output contains file (modified)
-
-expecting success of 3003.4 'add file to gitignore': 
-	echo file >.gitignore
-
-ok 4 - add file to gitignore
-
-expecting success of 3003.5 'ls-files output contains file (cached)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --cached >output &&
-	test_cmp expect output
-
-ok 5 - ls-files output contains file (cached)
-
-expecting success of 3003.6 'ls-files output contains file (modified)': 
-	echo 'file' >expect &&
-	git ls-files --exclude-standard --modified >output &&
-	test_cmp expect output
-
-ok 6 - ls-files output contains file (modified)
-
-expecting success of 3003.7 'ls-files -i -c lists only tracked-but-ignored files': 
-	echo content >other-file &&
-	git add other-file &&
-	echo file >expect &&
-	git ls-files -i -c --exclude-standard >output &&
-	test_cmp expect output
-
-ok 7 - ls-files -i -c lists only tracked-but-ignored files
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2500-untracked-overwriting.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/.git/
-expecting success of 2500.1 'reset --hard will nuke untracked files/dirs': 
-	test_setup_reset hard &&
-	(
-		cd reset_hard &&
-		git ls-tree -r stable &&
-		git log --all --name-status --oneline &&
-		git ls-tree -r work &&
-
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		echo foo >expect &&
-
-		git reset --hard work &&
-
-		# check that untracked directory foo.t/ was nuked
-		test_path_is_file foo.t &&
-		test_cmp expect foo.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/reset_hard/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to branch 'work'
-[work cb1b896] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Switched to branch 'stable'
-100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
-cb1b896 foo
-A	foo.t
-2519212 init
-A	init.t
-100644 blob 257cc5642cb1a054f08cc83f2d943e56fd3ebe99	foo.t
-100644 blob b1b716105590454bfc4c0247f193a04088f39c7f	init.t
-HEAD is now at cb1b896 foo
-ok 1 - reset --hard will nuke untracked files/dirs
-
-expecting success of 2500.2 'reset --merge will preserve untracked files/dirs': 
-	test_setup_reset merge &&
-	(
-		cd reset_merge &&
-
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		cp foo.t/file expect &&
-
-		test_must_fail git reset --merge work 2>error &&
-		test_cmp expect foo.t/file &&
-		grep "Updating .foo.t. would lose untracked files" error
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/reset_merge/.git/
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-Switched to branch 'work'
-[work cb1b896] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Switched to branch 'stable'
-error: Updating 'foo.t' would lose untracked files in it
-ok 2 - reset --merge will preserve untracked files/dirs
-
-expecting success of 2500.3 'reset --keep will preserve untracked files/dirs': 
-	test_setup_reset keep &&
-	(
-		cd reset_keep &&
-
-		mkdir foo.t &&
-		echo precious >foo.t/file &&
-		cp foo.t/file expect &&
-
-		test_must_fail git reset --merge work 2>error &&
-		test_cmp expect foo.t/file &&
-		grep "Updating.*foo.t.*would lose untracked files" error
+		test_must_fail git reset --merge work 2>error &&
+		test_cmp expect foo.t/file &&
+		grep "Updating.*foo.t.*would lose untracked files" error
 	)
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2500-untracked-overwriting/reset_keep/.git/
@@ -106366,334 +107112,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3000-ls-files-others.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/.git/
-expecting success of 3000.1 'setup ': 
-	date >path0 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s xyzzy path1
-	else
-		date >path1
-	fi &&
-	mkdir path2 path3 path4 &&
-	date >path2/file2 &&
-	date >path2-junk &&
-	date >path3/file3 &&
-	date >path3-junk &&
-	git update-index --add path3-junk path3/file3
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 1 - setup 
-
-expecting success of 3000.2 'setup: expected output': 
-	cat >expected1 <<-\EOF &&
-	expected1
-	expected2
-	expected3
-	output
-	path0
-	path1
-	path2-junk
-	path2/file2
-	EOF
-
-	sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
-	cp expected2 expected3 &&
-	echo path4/ >>expected2
-
-ok 2 - setup: expected output
-
-expecting success of 3000.3 'ls-files --others': 
-	git ls-files --others >output &&
-	test_cmp expected1 output
-
-ok 3 - ls-files --others
-
-expecting success of 3000.4 'ls-files --others --directory': 
-	git ls-files --others --directory >output &&
-	test_cmp expected2 output
-
-ok 4 - ls-files --others --directory
-
-expecting success of 3000.5 '--no-empty-directory hides empty directory': 
-	git ls-files --others --directory --no-empty-directory >output &&
-	test_cmp expected3 output
-
-ok 5 - --no-empty-directory hides empty directory
-
-expecting success of 3000.6 'ls-files --others handles non-submodule .git': 
-	mkdir not-a-submodule &&
-	echo foo >not-a-submodule/.git &&
-	git ls-files -o >output &&
-	test_cmp expected1 output
-
-ok 6 - ls-files --others handles non-submodule .git
-
-expecting success of 3000.7 'ls-files --others with symlinked submodule': 
-	git init super &&
-	git init sub &&
-	(
-		cd sub &&
-		>a &&
-		git add a &&
-		git commit -m sub &&
-		git pack-refs --all
-	) &&
-	(
-		cd super &&
-		"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
-		git ls-files --others --exclude-standard >../actual
-	) &&
-	echo sub/ >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/sub/.git/
-[master (root-commit) 8c0a349] sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 7 - ls-files --others with symlinked submodule
-
-expecting success of 3000.8 'setup nested pathspec search': 
-	test_create_repo nested &&
-	(
-		cd nested &&
-
-		mkdir -p partially_tracked/untracked_dir &&
-		> partially_tracked/content &&
-		> partially_tracked/untracked_dir/file &&
-
-		mkdir -p untracked/deep &&
-		> untracked/deep/path &&
-		> untracked/deep/foo.c &&
-
-		git add partially_tracked/content
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/nested/.git/
-ok 8 - setup nested pathspec search
-
-expecting success of 3000.9 'ls-files -o --directory with single deep dir pathspec': 
-	(
-		cd nested &&
-
-		git ls-files -o --directory untracked/deep/ >actual &&
-
-		cat <<-EOF >expect &&
-		untracked/deep/
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 9 - ls-files -o --directory with single deep dir pathspec
-
-expecting success of 3000.10 'ls-files -o --directory with multiple dir pathspecs': 
-	(
-		cd nested &&
-
-		git ls-files -o --directory partially_tracked/ untracked/ >actual &&
-
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 10 - ls-files -o --directory with multiple dir pathspecs
-
-expecting success of 3000.11 'ls-files -o --directory with mix dir/file pathspecs': 
-	(
-		cd nested &&
-
-		git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
-
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/path
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 11 - ls-files -o --directory with mix dir/file pathspecs
-
-expecting success of 3000.12 'ls-files -o --directory with glob filetype match': 
-	(
-		cd nested &&
-
-		# globs kinda defeat --directory, but only for that pathspec
-		git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
-
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/foo.c
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 12 - ls-files -o --directory with glob filetype match
-
-expecting success of 3000.13 'ls-files -o --directory with mix of tracked states': 
-	(
-		cd nested &&
-
-		# globs kinda defeat --directory, but only for that pathspec
-		git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
-
-		cat <<-EOF >expect &&
-		partially_tracked/untracked_dir/
-		untracked/deep/
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 13 - ls-files -o --directory with mix of tracked states
-
-expecting success of 3000.14 'ls-files -o --directory with glob filetype match only': 
-	(
-		cd nested &&
-
-		git ls-files --others --directory "untracked/*.c" >actual &&
-
-		cat <<-EOF >expect &&
-		untracked/deep/foo.c
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 14 - ls-files -o --directory with glob filetype match only
-
-expecting success of 3000.15 'ls-files -o --directory to get immediate paths under one dir only': 
-	(
-		cd nested &&
-
-		git ls-files --others --directory "untracked/?*" >actual &&
-
-		cat <<-EOF >expect &&
-		untracked/deep/
-		EOF
-
-		test_cmp expect actual
-	)
-
-ok 15 - ls-files -o --directory to get immediate paths under one dir only
-
-expecting success of 3000.16 'ls-files -o avoids listing untracked non-matching gitdir': 
-	test_when_finished "rm -rf nested/untracked/deep/empty" &&
-	(
-		cd nested &&
-
-		git init untracked/deep/empty &&
-		git ls-files --others "untracked/*.c" >actual &&
-
-		cat <<-EOF >expect &&
-		untracked/deep/foo.c
-		EOF
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3000-ls-files-others/nested/untracked/deep/empty/.git/
-ok 16 - ls-files -o avoids listing untracked non-matching gitdir
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3004-ls-files-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3004-ls-files-basic/.git/
-expecting success of 3004.1 'ls-files in empty repository': 
-	git ls-files >actual &&
-	test_must_be_empty actual
-
-ok 1 - ls-files in empty repository
-
-expecting success of 3004.2 'ls-files with nonexistent path': 
-	git ls-files doesnotexist >actual &&
-	test_must_be_empty actual
-
-ok 2 - ls-files with nonexistent path
-
-expecting success of 3004.3 'ls-files with nonsense option': 
-	test_expect_code 129 git ls-files --nonsense 2>actual &&
-	test_grep "[Uu]sage: git ls-files" actual
-
-usage: git ls-files [<options>] [<file>...]
-ok 3 - ls-files with nonsense option
-
-expecting success of 3004.4 'ls-files -h in corrupt repository': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init &&
-		>.git/index &&
-		test_expect_code 129 git ls-files -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage: git ls-files " broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3004-ls-files-basic/broken/.git/
-usage: git ls-files [<options>] [<file>...]
-ok 4 - ls-files -h in corrupt repository
-
-expecting success of 3004.5 'ls-files does not crash with -h': 
-	test_expect_code 129 git ls-files -h >usage &&
-	test_grep "[Uu]sage: git ls-files " usage &&
-	test_expect_code 129 nongit git ls-files -h >usage &&
-	test_grep "[Uu]sage: git ls-files " usage
-
-usage: git ls-files [<options>] [<file>...]
-usage: git ls-files [<options>] [<file>...]
-ok 5 - ls-files does not crash with -h
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 3004.6 'ls-files with absolute paths to symlinks': 
-	mkdir subs &&
-	ln -s nosuch link &&
-	ln -s ../nosuch subs/link &&
-	git add link subs/link &&
-	git ls-files -s link subs/link >expect &&
-	git ls-files -s "$(pwd)/link" "$(pwd)/subs/link" >actual &&
-	test_cmp expect actual &&
-
-	(
-		cd subs &&
-		git ls-files -s link >../expect &&
-		git ls-files -s "$(pwd)/link" >../actual
-	) &&
-	test_cmp expect actual
-
-ok 6 - ls-files with absolute paths to symlinks
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3005-ls-files-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3005-ls-files-relative/.git/
 expecting success of 3005.1 'prepare': 
@@ -106756,468 +107174,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2080-parallel-checkout-basics.sh ***
-expecting success of 2080.1 'setup repo for checkout with various types of changes': 
-	test_config_global protocol.file.allow always &&
-
-	git init sub &&
-	(
-		cd sub &&
-		git checkout -b B2 &&
-		echo B2 >file &&
-		git add file &&
-		git commit -m file &&
-
-		git checkout -b B1 &&
-		echo B1 >file &&
-		git add file &&
-		git commit -m file
-	) &&
-
-	git init various &&
-	(
-		cd various &&
-
-		git checkout -b B1 &&
-		mkdir a c e &&
-		echo a/a >a/a &&
-		echo b >b &&
-		echo c/c >c/c &&
-		test_ln_s_add c d &&
-		echo e/e >e/e &&
-		git submodule add ../sub f &&
-		git submodule add ../sub g &&
-		test_ln_s_add c h &&
-
-		echo "B1 i" >i &&
-		test_ln_s_add c j &&
-		git submodule add -b B1 ../sub k &&
-		mkdir l &&
-		echo l/l >l/l &&
-
-		git add . &&
-		git commit -m B1 &&
-
-		git checkout -b B2 &&
-		git rm -rf :^.gitmodules :^k &&
-		mkdir b d f &&
-		echo a >a &&
-		echo b/b >b/b &&
-		test_ln_s_add b c &&
-		echo d/d >d/d &&
-		git submodule add ../sub e &&
-		echo f/f >f/f &&
-		test_ln_s_add b g &&
-		git submodule add ../sub h &&
-
-		echo "B2 i" >i &&
-		test_ln_s_add b j &&
-		git -C k checkout B2 &&
-		mkdir m &&
-		echo m/m >m/m &&
-
-		git add . &&
-		git commit -m B2 &&
-
-		git checkout --recurse-submodules B1
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub/.git/
-Switched to a new branch 'B2'
-[B2 (root-commit) 880a0eb] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'B1'
-[B1 0f06b39] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/.git/
-Switched to a new branch 'B1'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/f'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/g'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/k'...
-done.
-[B1 (root-commit) 46a23ce] B1
- Author: A U Thor <author@example.com>
- 13 files changed, 22 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a/a
- create mode 100644 b
- create mode 100644 c/c
- create mode 120000 d
- create mode 100644 e/e
- create mode 160000 f
- create mode 160000 g
- create mode 120000 h
- create mode 100644 i
- create mode 120000 j
- create mode 160000 k
- create mode 100644 l/l
-Switched to a new branch 'B2'
-rm 'a/a'
-rm 'b'
-rm 'c/c'
-rm 'd'
-rm 'e/e'
-rm 'f'
-rm 'g'
-rm 'h'
-rm 'i'
-rm 'j'
-rm 'l/l'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various/h'...
-done.
-Switched to a new branch 'B2'
-branch 'B2' set up to track 'origin/B2'.
-[B2 176cae8] B2
- Author: A U Thor <author@example.com>
- 19 files changed, 17 insertions(+), 17 deletions(-)
- create mode 100644 a
- delete mode 100644 a/a
- delete mode 100644 b
- create mode 100644 b/b
- create mode 120000 c
- delete mode 100644 c/c
- delete mode 120000 d
- create mode 100644 d/d
- rename f => e (100%)
- delete mode 100644 e/e
- create mode 100644 f/f
- mode change 160000 => 120000 g
- mode change 120000 => 160000 h
- delete mode 100644 l/l
- create mode 100644 m/m
-Switched to branch 'B1'
-ok 1 - setup repo for checkout with various types of changes
-
-expecting success of 2080.2 'sequential checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
-
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
-
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 2 - sequential checkout
-
-expecting success of 2080.3 'parallel checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
-
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
-
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 3 - parallel checkout
-
-expecting success of 2080.4 'sequential-fallback checkout': 
-		repo=various_$mode &&
-		cp -R -P various $repo &&
-
-		# The just copied files have more recent timestamps than their
-		# associated index entries. So refresh the cached timestamps
-		# to avoid an "entry not up-to-date" error from `git checkout`.
-		# We only have to do this for the submodules as `git checkout`
-		# will already refresh the superproject index before performing
-		# the up-to-date check.
-		#
-		git -C $repo submodule foreach "git update-index --refresh" &&
-
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git -C $repo checkout --recurse-submodules B2 &&
-		verify_checkout $repo
-	
-Entering 'f'
-Entering 'g'
-Entering 'k'
-Switched to branch 'B2'
-ok 4 - sequential-fallback checkout
-
-expecting success of 2080.5 'parallel checkout on clone': 
-		test_config_global protocol.file.allow always &&
-		repo=various_${mode}_clone &&
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git clone --recurse-submodules --branch B2 various $repo &&
-		verify_checkout $repo
-	
-Cloning into 'various_parallel_clone'...
-done.
-Submodule 'e' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
-Submodule 'h' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
-Submodule 'k' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/h'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_parallel_clone/k'...
-done.
-Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
-ok 5 - parallel checkout on clone
-
-expecting success of 2080.6 'sequential-fallback checkout on clone': 
-		test_config_global protocol.file.allow always &&
-		repo=various_${mode}_clone &&
-		set_checkout_config $workers $threshold &&
-		test_checkout_workers $expected_workers \
-			git clone --recurse-submodules --branch B2 various $repo &&
-		verify_checkout $repo
-	
-Cloning into 'various_sequential-fallback_clone'...
-done.
-Submodule 'e' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'e'
-Submodule 'h' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'h'
-Submodule 'k' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/sub) registered for path 'k'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/e'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/h'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/various_sequential-fallback_clone/k'...
-done.
-Submodule path 'e': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'h': checked out '0f06b39781e370351121d9fbfe1aed95ed7794c8'
-Submodule path 'k': checked out '880a0ebc1b2c60184bf29ea8f144cd7c40ab60f8'
-ok 6 - sequential-fallback checkout on clone
-
-expecting success of 2080.7 'compare the working trees': 
-	rm -rf various_*/.git &&
-	rm -rf various_*/*/.git &&
-
-	# We use `git diff` instead of `diff -r` because the latter would
-	# follow symlinks, and not all `diff` implementations support the
-	# `--no-dereference` option.
-	#
-	git diff --no-index various_sequential various_parallel &&
-	git diff --no-index various_sequential various_parallel_clone &&
-	git diff --no-index various_sequential various_sequential-fallback &&
-	git diff --no-index various_sequential various_sequential-fallback_clone
-
-ok 7 - compare the working trees
-
-expecting success of 2080.8 'submodules can use parallel checkout': 
-	set_checkout_config 2 0 &&
-	git init super &&
-	(
-		cd super &&
-		git init sub &&
-		test_commit -C sub A &&
-		test_commit -C sub B &&
-		git submodule add ./sub &&
-		git commit -m sub &&
-		rm sub/* &&
-		test_checkout_workers 2 git checkout --recurse-submodules .
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git/
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Adding existing repo at 'sub' to the index
-[master (root-commit) 00b6c10] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-Migrating git directory of 'sub' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/sub/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/super/.git/modules/sub'
-Updated 0 paths from the index
-ok 8 - submodules can use parallel checkout
-
-expecting success of 2080.9 'parallel checkout respects --[no]-force': 
-	set_checkout_config 2 0 &&
-	git init dirty &&
-	(
-		cd dirty &&
-		mkdir D &&
-		test_commit D/F &&
-		test_commit F &&
-
-		rm -rf D &&
-		echo changed >D &&
-		echo changed >F.t &&
-
-		# We expect 0 workers because there is nothing to be done
-		test_checkout_workers 0 git checkout HEAD &&
-		test_path_is_file D &&
-		grep changed D &&
-		grep changed F.t &&
-
-		test_checkout_workers 2 git checkout --force HEAD &&
-		test_path_is_dir D &&
-		grep D/F D/F.t &&
-		grep F F.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/dirty/.git/
-[master (root-commit) e516e44] D/F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D/F.t
-[master a9126ab] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-D	D/F.t
-M	F.t
-changed
-changed
-D/F
-F
-ok 9 - parallel checkout respects --[no]-force
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 2080.10 'parallel checkout checks for symlinks in leading dirs': 
-	set_checkout_config 2 0 &&
-	git init symlinks &&
-	(
-		cd symlinks &&
-		mkdir D untracked &&
-		# Commit 2 files to have enough work for 2 parallel workers
-		test_commit D/A &&
-		test_commit D/B &&
-		rm -rf D &&
-		ln -s untracked D &&
-
-		test_checkout_workers 2 git checkout --force HEAD &&
-		! test -h D &&
-		grep D/A D/A.t &&
-		grep D/B D/B.t
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/symlinks/.git/
-[master (root-commit) dce6a14] D/A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D/A.t
-[master 59586d4] D/B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D/B.t
-D/A
-D/B
-ok 10 - parallel checkout checks for symlinks in leading dirs
-
-expecting success of 2080.11 '"git checkout ." report should not include failed entries': 
-	test_config_global filter.delay.process \
-		"test-tool rot13-filter --always-delay --log=delayed.log clean smudge delay" &&
-	test_config_global filter.delay.required true &&
-	test_config_global filter.cat.clean cat  &&
-	test_config_global filter.cat.smudge cat  &&
-	test_config_global filter.cat.required true  &&
-
-	set_checkout_config 2 0 &&
-	git init failed_entries &&
-	(
-		cd failed_entries &&
-		cat >.gitattributes <<-EOF &&
-		*delay*              filter=delay
-		parallel-ineligible* filter=cat
-		EOF
-		echo a >missing-delay.a &&
-		echo a >parallel-ineligible.a &&
-		echo a >parallel-eligible.a &&
-		echo b >success-delay.b &&
-		echo b >parallel-ineligible.b &&
-		echo b >parallel-eligible.b &&
-		git add -A &&
-		git commit -m files &&
-
-		a_blob="$(git rev-parse :parallel-ineligible.a)" &&
-		rm .git/objects/$(test_oid_to_path $a_blob) &&
-		rm *.a *.b &&
-
-		test_checkout_workers 2 test_must_fail git checkout . 2>err &&
-
-		# All *.b entries should succeed and all *.a entries should fail:
-		#  - missing-delay.a: the delay filter will drop this path
-		#  - parallel-*.a: the blob will be missing
-		#
-		grep "Updated 3 paths from the index" err &&
-		test_stdout_line_count = 3 ls *.b &&
-		! ls *.a
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2080-parallel-checkout-basics/failed_entries/.git/
-[master (root-commit) d1e22ca] files
- Author: A U Thor <author@example.com>
- 7 files changed, 8 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 missing-delay.a
- create mode 100644 parallel-eligible.a
- create mode 100644 parallel-eligible.b
- create mode 100644 parallel-ineligible.a
- create mode 100644 parallel-ineligible.b
- create mode 100644 success-delay.b
-Updated 3 paths from the index
-ls: cannot access '*.a': No such file or directory
-ok 11 - "git checkout ." report should not include failed entries
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3006-ls-files-long.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3006-ls-files-long/.git/
 expecting success of 3006.1 'setup': 
@@ -107273,7 +107229,7 @@
 	git update-index --index-info &&
 	test-tool lazy-init-name-hash -m
 
-0.000850 0.038650 4002 multi 2
+0.000804 0.032828 4002 multi 2
 ok 1 - no buffer overflow in lazy_init_name_hash
 
 # passed all 1 test(s)
@@ -107435,39 +107391,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3020-ls-files-error-unmatch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3020-ls-files-error-unmatch/.git/
-expecting success of 3020.1 'setup': 
-	touch foo bar &&
-	git update-index --add foo bar &&
-	git commit -m "add foo bar"
-
-[master (root-commit) 6c59e8c] add foo bar
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - setup
-
-expecting success of 3020.2 'git ls-files --error-unmatch should fail with unmatched path.': 
-	test_must_fail git ls-files --error-unmatch foo bar-does-not-match
-
-error: pathspec 'bar-does-not-match' did not match any file(s) known to git
-Did you forget to 'git add'?
-foo
-ok 2 - git ls-files --error-unmatch should fail with unmatched path.
-
-expecting success of 3020.3 'git ls-files --error-unmatch should succeed with matched paths.': 
-	git ls-files --error-unmatch foo bar
-
-bar
-foo
-ok 3 - git ls-files --error-unmatch should succeed with matched paths.
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3012-ls-files-dedup.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3012-ls-files-dedup/.git/
 expecting success of 3012.1 'setup': 
@@ -107556,6 +107479,39 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3020-ls-files-error-unmatch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3020-ls-files-error-unmatch/.git/
+expecting success of 3020.1 'setup': 
+	touch foo bar &&
+	git update-index --add foo bar &&
+	git commit -m "add foo bar"
+
+[master (root-commit) 6c59e8c] add foo bar
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - setup
+
+expecting success of 3020.2 'git ls-files --error-unmatch should fail with unmatched path.': 
+	test_must_fail git ls-files --error-unmatch foo bar-does-not-match
+
+error: pathspec 'bar-does-not-match' did not match any file(s) known to git
+Did you forget to 'git add'?
+foo
+ok 2 - git ls-files --error-unmatch should fail with unmatched path.
+
+expecting success of 3020.3 'git ls-files --error-unmatch should succeed with matched paths.': 
+	git ls-files --error-unmatch foo bar
+
+bar
+foo
+ok 3 - git ls-files --error-unmatch should succeed with matched paths.
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3011-common-prefixes-and-directory-traversal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3011-common-prefixes-and-directory-traversal/.git/
 expecting success of 3011.1 'setup': 
@@ -107754,8 +107710,8 @@
 	git ls-files -o "untracked_*/" >actual &&
 	test_cmp expect actual
 
---- expect	2026-04-19 19:17:00.343659440 +0000
-+++ actual	2026-04-19 19:17:00.343659440 +0000
+--- expect	2025-03-17 13:19:11.939893530 +0000
++++ actual	2025-03-17 13:19:11.951893606 +0000
 @@ -1,3 +1,2 @@
  untracked_*/empty
 -untracked_dir/empty
@@ -107809,439 +107765,6 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t2501-cwd-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/
-expecting success of 2501.1 'setup': 
-	test_commit init &&
-
-	git branch fd_conflict &&
-
-	mkdir -p foo/bar &&
-	test_commit foo/bar/baz &&
-
-	git revert HEAD &&
-	git tag reverted &&
-
-	git checkout fd_conflict &&
-	mkdir dirORfile &&
-	test_commit dirORfile/foo &&
-
-	git rm -r dirORfile &&
-	echo not-a-directory >dirORfile &&
-	git add dirORfile &&
-	git commit -m dirORfile &&
-
-	git switch -c df_conflict HEAD~1 &&
-	test_commit random_file &&
-
-	git switch -c undo_fd_conflict fd_conflict &&
-	git revert HEAD
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master f4c5aab] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-[master 968d1fe] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'fd_conflict'
-[fd_conflict d7f9e78] dirORfile/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dirORfile/foo.t
-rm 'dirORfile/foo.t'
-[fd_conflict 9658629] dirORfile
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 dirORfile
- delete mode 100644 dirORfile/foo.t
-Switched to a new branch 'df_conflict'
-[df_conflict d90d7a3] random_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 random_file.t
-Switched to a new branch 'undo_fd_conflict'
-[undo_fd_conflict 46c1835] Revert "dirORfile"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 dirORfile
- create mode 100644 dirORfile/foo.t
-ok 1 - setup
-
-expecting success of 2501.2 'checkout does not clean cwd incidentally': 
-	test_incidental_dir_removal git checkout init
-
-Note: switching to 'foo/bar/baz^{commit}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f4c5aab foo/bar/baz
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 2 - checkout does not clean cwd incidentally
-
-expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
-	test_required_dir_removal git checkout fd_conflict
-
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 3 - checkout fails if cwd needs to be removed
-
-expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
-	test_incidental_dir_removal git reset --hard init
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 4 - reset --hard does not clean cwd incidentally
-
-expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
-	test_required_dir_removal git reset --hard fd_conflict
-
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove 'dirORfile' since it is the current working directory.
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 5 - reset --hard fails if cwd needs to be removed
-
-expecting success of 2501.6 'merge does not clean cwd incidentally': 
-	test_incidental_dir_removal git merge reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-Updating f4c5aab..968d1fe
-Fast-forward
- foo/bar/baz.t | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 6 - merge does not clean cwd incidentally
-
-expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
-	git checkout foo/bar/baz &&
-	test_when_finished "git clean -fdx" &&
-
-	mkdir dirORfile &&
-	(
-		cd dirORfile &&
-
-		test_must_fail git merge fd_conflict 2>../error
-	) &&
-
-	test_path_is_dir dirORfile &&
-	grep "Refusing to remove the current working directory" error
-
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at f4c5aab foo/bar/baz
-error: Refusing to remove the current working directory:
-Removing dirORfile/
-Removing error
-ok 7 - merge fails if cwd needs to be removed; recursive friendly
-
-expecting success of 2501.8 'merge fails if cwd needs to be removed': 
-	test_required_dir_removal git merge fd_conflict
-
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-ok 8 - merge fails if cwd needs to be removed
-
-expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
-	test_incidental_dir_removal git cherry-pick reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD d0d1a1f] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at d0d1a1f Revert "foo/bar/baz"
-ok 9 - cherry-pick does not clean cwd incidentally
-
-expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
-	test_required_dir_removal git cherry-pick fd_conflict
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d0d1a1f Revert "foo/bar/baz"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> d0d1a1f
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 10 - cherry-pick fails if cwd needs to be removed
-
-expecting success of 2501.11 'rebase does not clean cwd incidentally': 
-	test_incidental_dir_removal git rebase reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-Successfully rebased and updated detached HEAD.
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 11 - rebase does not clean cwd incidentally
-
-expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
-	test_required_dir_removal git rebase fd_conflict
-
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 12 - rebase fails if cwd needs to be removed
-
-expecting success of 2501.13 'revert does not clean cwd incidentally': 
-	test_incidental_dir_removal git revert HEAD
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD f0f8756] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at f0f8756 Revert "foo/bar/baz"
-ok 13 - revert does not clean cwd incidentally
-
-expecting success of 2501.14 'revert fails if cwd needs to be removed': 
-	test_required_dir_removal git revert undo_fd_conflict
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  f0f8756 Revert "foo/bar/baz"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> f0f8756
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 14 - revert fails if cwd needs to be removed
-
-expecting success of 2501.15 'rm does not clean cwd incidentally': 
-	test_incidental_dir_removal git rm bar/baz.t
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-rm 'foo/bar/baz.t'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
-D  foo/bar/baz.t
-HEAD is now at f4c5aab foo/bar/baz
-ok 15 - rm does not clean cwd incidentally
-
-expecting success of 2501.16 'apply does not remove cwd incidentally': 
-	git diff HEAD HEAD~1 >patch &&
-	test_incidental_dir_removal git apply ../patch
-
-HEAD is now at f4c5aab foo/bar/baz
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
- D foo/bar/baz.t
-?? patch
-HEAD is now at f4c5aab foo/bar/baz
-ok 16 - apply does not remove cwd incidentally
-
-expecting success of 2501.17 'clean does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git -C .. clean -fd -e warnings . >warnings &&
-	grep "Refusing to remove current working directory" warnings
-
-HEAD is now at f4c5aab foo/bar/baz
-Refusing to remove current working directory
-HEAD is now at f4c5aab foo/bar/baz
-ok 17 - clean does not remove cwd incidentally
-
-expecting success of 2501.18 'stash does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git stash --include-untracked
-
-HEAD is now at f4c5aab foo/bar/baz
-Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
-Refusing to remove current working directory
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/untracked
-HEAD is now at f4c5aab foo/bar/baz
-ok 18 - stash does not remove cwd incidentally
-
-expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
-	test_when_finished "rm -rf a/" &&
-
-	mkdir -p a/b/c &&
-	>a/b/c/untracked &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
-
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
-
-	test_path_is_dir a/b &&
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_file a/b/c/untracked
-
-rm 'a/b/c/tracked'
-ok 19 - `rm -rf dir` only removes a subset of dir
-
-expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
-	test_when_finished "rm -rf a/" &&
-
-	mkdir -p a/b/c &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
-
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
-
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_missing a/b/c &&
-	test_path_is_dir a/b
-
-rm 'a/b/c/tracked'
-ok 20 - `rm -rf dir` even with only tracked files will remove something else
-
-expecting success of 2501.21 'git version continues working from a deleted dir': 
-	mkdir tmp &&
-	(
-		cd tmp &&
-		rm -rf ../tmp &&
-		git version
-	)
-
-sh: 0: getcwd() failed: No such file or directory
-git version 2.49.0.395.g12beb8f557c
-ok 21 - git version continues working from a deleted dir
-
-expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
-	test_submodule_removal dir git -C .. rm -r my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 22 - rm -r with -C leaves submodule if cwd inside
-
-expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
-	test_submodule_removal dir \
-		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 23 - rm -r leaves submodule if cwd inside
-
-expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
-	test_submodule_removal missing \
-		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
-[master (root-commit) f132c27] initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Adding existing repo at 'my_submodule' to the index
-[detached HEAD 629a5d0] Add the submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my_submodule
-Migrating git directory of 'my_submodule' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 24 - rm -rf removes submodule even if cwd inside
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3013-ls-files-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3013-ls-files-format/.git/
 expecting success of 3013.1 'usage: --format is incompatible with -s': 
@@ -108860,6 +108383,535 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3050-subprojects-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/.git/
+expecting success of 3050.1 'setup': 
+	test_tick &&
+	mkdir -p sub && (
+		cd sub &&
+		git init &&
+		>subfile &&
+		git add subfile &&
+		git commit -m "subproject commit #1"
+	) &&
+	>mainfile &&
+	git add sub mainfile &&
+	test_tick &&
+	git commit -m "superproject commit #1"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/sub/.git/
+[master (root-commit) 4c0c877] subproject commit #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subfile
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) 1226c2e] superproject commit #1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 mainfile
+ create mode 160000 sub
+ok 1 - setup
+
+expecting success of 3050.2 'clone': 
+	git clone "file://$(pwd)/.git" cloned &&
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
+
+Cloning into 'cloned'...
+ok 2 - clone
+
+expecting success of 3050.3 'advance': 
+	echo more >mainfile &&
+	git update-index --force-remove sub &&
+	mv sub/.git sub/.git-disabled &&
+	git add sub/subfile mainfile &&
+	mv sub/.git-disabled sub/.git &&
+	test_tick &&
+	git commit -m "superproject commit #2"
+
+[master 1548ecd] superproject commit #2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 3 - advance
+
+expecting success of 3050.4 'fetch': 
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		git pull &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
+
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/
+   1226c2e..1548ecd  master     -> origin/master
+Updating 1226c2e..1548ecd
+Fast-forward
+ mainfile    | 1 +
+ sub         | 1 -
+ sub/subfile | 0
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 4 - fetch
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t2501-cwd-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/
+expecting success of 2501.1 'setup': 
+	test_commit init &&
+
+	git branch fd_conflict &&
+
+	mkdir -p foo/bar &&
+	test_commit foo/bar/baz &&
+
+	git revert HEAD &&
+	git tag reverted &&
+
+	git checkout fd_conflict &&
+	mkdir dirORfile &&
+	test_commit dirORfile/foo &&
+
+	git rm -r dirORfile &&
+	echo not-a-directory >dirORfile &&
+	git add dirORfile &&
+	git commit -m dirORfile &&
+
+	git switch -c df_conflict HEAD~1 &&
+	test_commit random_file &&
+
+	git switch -c undo_fd_conflict fd_conflict &&
+	git revert HEAD
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master f4c5aab] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+[master 968d1fe] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'fd_conflict'
+[fd_conflict d7f9e78] dirORfile/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dirORfile/foo.t
+rm 'dirORfile/foo.t'
+[fd_conflict 9658629] dirORfile
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 dirORfile
+ delete mode 100644 dirORfile/foo.t
+Switched to a new branch 'df_conflict'
+[df_conflict d90d7a3] random_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random_file.t
+Switched to a new branch 'undo_fd_conflict'
+[undo_fd_conflict 46c1835] Revert "dirORfile"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 dirORfile
+ create mode 100644 dirORfile/foo.t
+ok 1 - setup
+
+expecting success of 2501.2 'checkout does not clean cwd incidentally': 
+	test_incidental_dir_removal git checkout init
+
+Note: switching to 'foo/bar/baz^{commit}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f4c5aab foo/bar/baz
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 2 - checkout does not clean cwd incidentally
+
+expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
+	test_required_dir_removal git checkout fd_conflict
+
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 3 - checkout fails if cwd needs to be removed
+
+expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
+	test_incidental_dir_removal git reset --hard init
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 4 - reset --hard does not clean cwd incidentally
+
+expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
+	test_required_dir_removal git reset --hard fd_conflict
+
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove 'dirORfile' since it is the current working directory.
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 5 - reset --hard fails if cwd needs to be removed
+
+expecting success of 2501.6 'merge does not clean cwd incidentally': 
+	test_incidental_dir_removal git merge reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+Updating f4c5aab..968d1fe
+Fast-forward
+ foo/bar/baz.t | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 6 - merge does not clean cwd incidentally
+
+expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
+	git checkout foo/bar/baz &&
+	test_when_finished "git clean -fdx" &&
+
+	mkdir dirORfile &&
+	(
+		cd dirORfile &&
+
+		test_must_fail git merge fd_conflict 2>../error
+	) &&
+
+	test_path_is_dir dirORfile &&
+	grep "Refusing to remove the current working directory" error
+
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at f4c5aab foo/bar/baz
+error: Refusing to remove the current working directory:
+Removing dirORfile/
+Removing error
+ok 7 - merge fails if cwd needs to be removed; recursive friendly
+
+expecting success of 2501.8 'merge fails if cwd needs to be removed': 
+	test_required_dir_removal git merge fd_conflict
+
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+ok 8 - merge fails if cwd needs to be removed
+
+expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
+	test_incidental_dir_removal git cherry-pick reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD d0d1a1f] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at d0d1a1f Revert "foo/bar/baz"
+ok 9 - cherry-pick does not clean cwd incidentally
+
+expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
+	test_required_dir_removal git cherry-pick fd_conflict
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  d0d1a1f Revert "foo/bar/baz"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> d0d1a1f
+
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 10 - cherry-pick fails if cwd needs to be removed
+
+expecting success of 2501.11 'rebase does not clean cwd incidentally': 
+	test_incidental_dir_removal git rebase reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+Successfully rebased and updated detached HEAD.
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 11 - rebase does not clean cwd incidentally
+
+expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
+	test_required_dir_removal git rebase fd_conflict
+
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 12 - rebase fails if cwd needs to be removed
+
+expecting success of 2501.13 'revert does not clean cwd incidentally': 
+	test_incidental_dir_removal git revert HEAD
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD f0f8756] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at f0f8756 Revert "foo/bar/baz"
+ok 13 - revert does not clean cwd incidentally
+
+expecting success of 2501.14 'revert fails if cwd needs to be removed': 
+	test_required_dir_removal git revert undo_fd_conflict
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  f0f8756 Revert "foo/bar/baz"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> f0f8756
+
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 14 - revert fails if cwd needs to be removed
+
+expecting success of 2501.15 'rm does not clean cwd incidentally': 
+	test_incidental_dir_removal git rm bar/baz.t
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+rm 'foo/bar/baz.t'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+D  foo/bar/baz.t
+HEAD is now at f4c5aab foo/bar/baz
+ok 15 - rm does not clean cwd incidentally
+
+expecting success of 2501.16 'apply does not remove cwd incidentally': 
+	git diff HEAD HEAD~1 >patch &&
+	test_incidental_dir_removal git apply ../patch
+
+HEAD is now at f4c5aab foo/bar/baz
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/foo
+ D foo/bar/baz.t
+?? patch
+HEAD is now at f4c5aab foo/bar/baz
+ok 16 - apply does not remove cwd incidentally
+
+expecting success of 2501.17 'clean does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git -C .. clean -fd -e warnings . >warnings &&
+	grep "Refusing to remove current working directory" warnings
+
+HEAD is now at f4c5aab foo/bar/baz
+Refusing to remove current working directory
+HEAD is now at f4c5aab foo/bar/baz
+ok 17 - clean does not remove cwd incidentally
+
+expecting success of 2501.18 'stash does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git stash --include-untracked
+
+HEAD is now at f4c5aab foo/bar/baz
+Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
+Refusing to remove current working directory
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/untracked
+HEAD is now at f4c5aab foo/bar/baz
+ok 18 - stash does not remove cwd incidentally
+
+expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/untracked &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_dir a/b &&
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_file a/b/c/untracked
+
+rm 'a/b/c/tracked'
+ok 19 - `rm -rf dir` only removes a subset of dir
+
+expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_missing a/b/c &&
+	test_path_is_dir a/b
+
+rm 'a/b/c/tracked'
+ok 20 - `rm -rf dir` even with only tracked files will remove something else
+
+expecting success of 2501.21 'git version continues working from a deleted dir': 
+	mkdir tmp &&
+	(
+		cd tmp &&
+		rm -rf ../tmp &&
+		git version
+	)
+
+shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory
+git version 2.49.0.395.g12beb8f557c
+ok 21 - git version continues working from a deleted dir
+
+expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
+	test_submodule_removal dir git -C .. rm -r my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 22 - rm -r with -C leaves submodule if cwd inside
+
+expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
+	test_submodule_removal dir \
+		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 23 - rm -r leaves submodule if cwd inside
+
+expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
+	test_submodule_removal missing \
+		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git/
+[master (root-commit) f132c27] initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Adding existing repo at 'my_submodule' to the index
+[detached HEAD 629a5d0] Add the submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my_submodule
+Migrating git directory of 'my_submodule' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 24 - rm -rf removes submodule even if cwd inside
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3060-ls-files-with-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3060-ls-files-with-tree/.git/
 expecting success of 3060.1 'setup': 
@@ -109110,402 +109162,519 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3050-subprojects-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/.git/
-expecting success of 3050.1 'setup': 
-	test_tick &&
-	mkdir -p sub && (
-		cd sub &&
-		git init &&
-		>subfile &&
-		git add subfile &&
-		git commit -m "subproject commit #1"
-	) &&
-	>mainfile &&
-	git add sub mainfile &&
-	test_tick &&
-	git commit -m "superproject commit #1"
+*** t3007-ls-files-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/
+expecting success of 3007.1 'setup directory structure and submodules': 
+	echo a >a &&
+	mkdir b &&
+	echo b >b/b &&
+	git add a b &&
+	git commit -m "add a and b" &&
+	git init submodule &&
+	echo c >submodule/c &&
+	git -C submodule add c &&
+	git -C submodule commit -m "add c" &&
+	git submodule add ./submodule &&
+	git commit -m "added submodule"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/sub/.git/
-[master (root-commit) 4c0c877] subproject commit #1
+[master (root-commit) f320cab] add a and b
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subfile
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) 1226c2e] superproject commit #1
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b/b
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
+[master (root-commit) 3281629] add c
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 mainfile
- create mode 160000 sub
-ok 1 - setup
-
-expecting success of 3050.2 'clone': 
-	git clone "file://$(pwd)/.git" cloned &&
-	(git rev-parse HEAD && git ls-files -s) >expected &&
-	(
-		cd cloned &&
-		(git rev-parse HEAD && git ls-files -s) >../actual
-	) &&
-	test_cmp expected actual
-
-Cloning into 'cloned'...
-ok 2 - clone
-
-expecting success of 3050.3 'advance': 
-	echo more >mainfile &&
-	git update-index --force-remove sub &&
-	mv sub/.git sub/.git-disabled &&
-	git add sub/subfile mainfile &&
-	mv sub/.git-disabled sub/.git &&
-	test_tick &&
-	git commit -m "superproject commit #2"
-
-[master 1548ecd] superproject commit #2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Adding existing repo at 'submodule' to the index
+[master 14616f7] added submodule
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 sub
- create mode 100644 sub/subfile
-ok 3 - advance
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 1 - setup directory structure and submodules
 
-expecting success of 3050.4 'fetch': 
-	(git rev-parse HEAD && git ls-files -s) >expected &&
-	(
-		cd cloned &&
-		git pull &&
-		(git rev-parse HEAD && git ls-files -s) >../actual
-	) &&
-	test_cmp expected actual
+expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
 
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3050-subprojects-fetch/
-   1226c2e..1548ecd  master     -> origin/master
-Updating 1226c2e..1548ecd
-Fast-forward
- mainfile    | 1 +
- sub         | 1 -
- sub/subfile | 0
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 sub
- create mode 100644 sub/subfile
-ok 4 - fetch
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3102-ls-tree-wildcards.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3102-ls-tree-wildcards/.git/
-expecting success of 3102.1 'setup': 
-	mkdir a aa "a[a]" &&
-	touch a/one aa/two "a[a]/three" &&
-	git add a/one aa/two "a[a]/three" &&
-	git commit -m test
+ok 2 - ls-files correctly outputs files in submodule
 
-[master (root-commit) a832b10] test
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/one
- create mode 100644 a[a]/three
- create mode 100644 aa/two
-ok 1 - setup
+expecting success of 3007.3 '--stage': 
+	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
+	A_HASH=$(git rev-parse HEAD:a) &&
+	B_HASH=$(git rev-parse HEAD:b/b) &&
+	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
 
-expecting success of 3102.2 'ls-tree a[a] matches literally': 
 	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	a[a]/three
+	100644 $GITMODULES_HASH 0	.gitmodules
+	100644 $A_HASH 0	a
+	100644 $B_HASH 0	b/b
+	100644 $C_HASH 0	submodule/c
 	EOF
-	git ls-tree -r HEAD "a[a]" >actual &&
+
+	git ls-files --stage --recurse-submodules >actual &&
 	test_cmp expect actual
 
-ok 2 - ls-tree a[a] matches literally
+ok 3 - --stage
 
-expecting success of 3102.3 'ls-tree outside prefix': 
-	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	../a[a]/three
+expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
+	lf_to_nul >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
 	EOF
-	( cd aa && git ls-tree -r HEAD "../a[a]" ) >actual &&
+
+	git ls-files --recurse-submodules -z >actual &&
 	test_cmp expect actual
 
-ok 3 - ls-tree outside prefix
+ok 4 - ls-files correctly outputs files in submodule with -z
 
-checking known breakage of 3102.4 'ls-tree does not yet support negated pathspec': 
-	git ls-files ":(exclude)a" "a*" >expect &&
-	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
+expecting success of 3007.5 'ls-files does not output files not added to a repo': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
+
+	echo a >not_added &&
+	echo b >b/not_added &&
+	echo c >submodule/not_added &&
+	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual
 
-fatal: :(exclude)a: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')
-not ok 4 - ls-tree does not yet support negated pathspec # TODO known breakage
+ok 5 - ls-files does not output files not added to a repo
 
-# still have 1 known breakage(s)
-# passed all remaining 3 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3101-ls-tree-dirname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3101-ls-tree-dirname/.git/
-expecting success of 3101.1 'setup': 
-	echo 111 >1.txt &&
-	echo 222 >2.txt &&
-	mkdir path0 path0/a path0/a/b path0/a/b/c &&
-	echo 111 >path0/a/b/c/1.txt &&
-	mkdir path1 path1/b path1/b/c &&
-	echo 111 >path1/b/c/1.txt &&
-	mkdir path2 &&
-	echo 111 >path2/1.txt &&
-	mkdir path3 &&
-	echo 111 >path3/1.txt &&
-	echo 222 >path3/2.txt &&
-	find *.txt path* \( -type f -o -type l \) -print |
-	xargs git update-index --add &&
-	tree=$(git write-tree) &&
-	echo $tree
+expecting success of 3007.6 'ls-files recurses more than 1 level': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/.gitmodules
+	submodule/c
+	submodule/subsub/d
+	EOF
 
-ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
-ok 1 - setup
+	git init submodule/subsub &&
+	echo d >submodule/subsub/d &&
+	git -C submodule/subsub add d &&
+	git -C submodule/subsub commit -m "add d" &&
+	git -C submodule submodule add ./subsub &&
+	git -C submodule commit -m "added subsub" &&
+	git submodule absorbgitdirs &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-expecting success of 3101.2 'ls-tree plain': 
-	git ls-tree $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git/
+[master (root-commit) 0cb03c9] add d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d
+Adding existing repo at 'subsub' to the index
+[master 83d4bc1] added subsub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsub
+Migrating git directory of 'submodule' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
+Migrating git directory of 'submodule/subsub' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
+ok 6 - ls-files recurses more than 1 level
 
-ok 2 - ls-tree plain
+expecting success of 3007.7 'ls-files works with GIT_DIR': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	c
+	subsub/d
+	EOF
 
-expecting success of 3101.3 'ls-tree recursive': 
-	git ls-tree -r $tree >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
+	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-ok 3 - ls-tree recursive
+ok 7 - ls-files works with GIT_DIR
 
-expecting success of 3101.4 'ls-tree filter 1.txt': 
-	git ls-tree $tree 1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-EOF
-	test_output
+expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
+	echo e >submodule/subsub/e.txt &&
+	git -C submodule/subsub add e.txt &&
+	git -C submodule/subsub commit -m "adding e.txt" &&
+	echo f >submodule/f.TXT &&
+	echo g >submodule/g.txt &&
+	git -C submodule add f.TXT g.txt &&
+	git -C submodule commit -m "add f and g" &&
+	echo h >h.txt &&
+	mkdir sib &&
+	echo sib >sib/file &&
+	git add h.txt sib/file &&
+	git commit -m "add h and sib/file" &&
+	git init sub &&
+	echo sub >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	git submodule add ./sub &&
+	git commit -m "added sub" &&
 
-ok 4 - ls-tree filter 1.txt
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/d
+	submodule/subsub/e.txt
+	EOF
 
-expecting success of 3101.5 'ls-tree filter path1/b/c/1.txt': 
-	git ls-tree $tree path1/b/c/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	path1/b/c/1.txt
-EOF
-	test_output
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "*" >actual &&
+	test_cmp expect actual
 
-ok 5 - ls-tree filter path1/b/c/1.txt
+[master 562fffb] adding e.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.txt
+[master f284b88] add f and g
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 f.TXT
+ create mode 100644 g.txt
+[master ad13f14] add h and sib/file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 h.txt
+ create mode 100644 sib/file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
+[master (root-commit) e443189] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[master 4a68fc6] added sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub
+ok 8 - --recurse-submodules and pathspecs setup
 
-expecting success of 3101.6 'ls-tree filter all 1.txt files': 
-	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
-		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-EOF
-	test_output
+expecting success of 3007.9 'inactive submodule': 
+	test_when_finished "git config --bool submodule.submodule.active true" &&
+	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
+	git config --bool submodule.submodule.active "false" &&
 
-ok 6 - ls-tree filter all 1.txt files
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule
+	EOF
 
-expecting success of 3101.7 'ls-tree filter directories': 
-	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a/b/c
-040000 tree X	path1/b/c
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
 
-ok 7 - ls-tree filter directories
+	git config --bool submodule.submodule.active "true" &&
+	git -C submodule config --bool submodule.subsub.active "false" &&
 
-expecting success of 3101.8 'ls-tree filter odd names': 
-	git ls-tree $tree 1.txt ./1.txt .//1.txt \
-		path3/1.txt path3/./1.txt path3 path3// >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub
+	EOF
 
-ok 8 - ls-tree filter odd names
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
 
-expecting success of 3101.9 'ls-tree filter missing files and extra slashes': 
-	git ls-tree $tree 1.txt/ abc.txt \
-		path3//23.txt path3/2.txt/// >current &&
-	>expected &&
-	test_output
+ok 9 - inactive submodule
 
-ok 9 - ls-tree filter missing files and extra slashes
+expecting success of 3007.10 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
 
-expecting success of 3101.10 'ls-tree filter is leading path match': 
-	git ls-tree $tree pa path3/a >current &&
-	>expected &&
-	test_output
+	git ls-files --recurse-submodules "*.txt" >actual &&
+	test_cmp expect actual
 
-ok 10 - ls-tree filter is leading path match
+ok 10 - --recurse-submodules and pathspecs
 
-expecting success of 3101.11 'ls-tree --full-name': 
-	(
-		cd path0 &&
-		git ls-tree --full-name $tree a
-	) >current &&
-	cat >expected <<\EOF &&
-040000 tree X	path0/a
-EOF
-	test_output
+expecting success of 3007.11 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
 
-ok 11 - ls-tree --full-name
+	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
+	test_cmp expect actual
 
-expecting success of 3101.12 'ls-tree --no-full-name': 
-	git -C path0 ls-tree --no-full-name $tree a >current &&
-	cat >expected <<-EOF &&
-	040000 tree X	a
+ok 11 - --recurse-submodules and pathspecs
+
+expecting success of 3007.12 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
 	EOF
-	test_output
 
-ok 12 - ls-tree --no-full-name
+	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
+	test_cmp expect actual
 
-expecting success of 3101.13 'ls-tree --full-tree': 
-	(
-		cd path1/b/c &&
-		git ls-tree --full-tree $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_output
+ok 12 - --recurse-submodules and pathspecs
 
-ok 13 - ls-tree --full-tree
+expecting success of 3007.13 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	sub/file
+	EOF
 
-expecting success of 3101.14 'ls-tree --full-tree -r': 
-	(
-		cd path3/ &&
-		git ls-tree --full-tree -r $tree
-	) >current &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-100644 blob X	path0/a/b/c/1.txt
-100644 blob X	path1/b/c/1.txt
-100644 blob X	path2/1.txt
-100644 blob X	path3/1.txt
-100644 blob X	path3/2.txt
-EOF
-	test_output
+	git ls-files --recurse-submodules "sub" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "sub/" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "sub/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su*/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su?/file" >actual &&
+	test_cmp expect actual
 
-ok 14 - ls-tree --full-tree -r
+ok 13 - --recurse-submodules and pathspecs
 
-expecting success of 3101.15 'ls-tree --abbrev=5': 
-	git ls-tree --abbrev=5 $tree >current &&
-	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
-	cat >expected <<\EOF &&
-100644 blob X	1.txt
-100644 blob X	2.txt
-040000 tree X	path0
-040000 tree X	path1
-040000 tree X	path2
-040000 tree X	path3
-EOF
-	test_cmp expected check
+expecting success of 3007.14 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	sib/file
+	sub/file
+	EOF
 
-ok 15 - ls-tree --abbrev=5
+	git ls-files --recurse-submodules "s??/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "s???file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "s*file" >actual &&
+	test_cmp expect actual
 
-expecting success of 3101.16 'ls-tree --name-only': 
-		git ls-tree $opt $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0
-		path1
-		path2
-		path3
-		EOF
-		test_output
+ok 14 - --recurse-submodules and pathspecs
+
+expecting success of 3007.15 '--recurse-submodules and relative paths': 
+	# From subdir
+	cat >expect <<-\EOF &&
+	b
+	EOF
+	git -C b ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to top
+	cat >expect <<-\EOF &&
+	../.gitmodules
+	../a
+	b
+	../h.txt
+	../sib/file
+	../sub/file
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- .. >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to submodule
+	cat >expect <<-\EOF &&
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
+	test_cmp expect actual
+
+ok 15 - --recurse-submodules and relative paths
+
+expecting success of 3007.16 '--recurse-submodules does not support --error-unmatch': 
+	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
+	test_grep "does not support --error-unmatch" actual
+
+fatal: ls-files --recurse-submodules does not support --error-unmatch
+ok 16 - --recurse-submodules does not support --error-unmatch
+
+expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
+	test_config -C submodule index.sparse "invalid non-boolean value" &&
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 17 - --recurse-submodules parses submodule repo config
+
+expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 18 - --recurse-submodules parses submodule worktree config
+
+expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
+	# Enable worktree config in both super project & submodule, set an
+	# invalid config in the submodule worktree config
+	test_config extensions.worktreeConfig true &&
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+
+	# Now, disable the worktree config in the submodule. Note that we need
+	# to manually re-enable extensions.worktreeConfig when the test is
+	# finished, otherwise the test_unconfig of index.sparse will not work.
+	test_unconfig -C submodule extensions.worktreeConfig &&
+	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
+
+	# With extensions.worktreeConfig disabled in the submodule, the invalid
+	# worktree config is not picked up.
+	git ls-files --recurse-submodules 2>err &&
+	! grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+submodule/.gitmodules
+submodule/c
+submodule/f.TXT
+submodule/g.txt
+submodule/subsub/d
+submodule/subsub/e.txt
+ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
+
+expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
+		test_grep 'unsupported mode' actual
 	
-ok 16 - ls-tree --name-only
+fatal: ls-files --recurse-submodules unsupported mode
+ok 20 - --recurse-submodules and --deleted are incompatible
 
-expecting success of 3101.17 'ls-tree --name-only -r': 
-		git ls-tree $opt -r $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0/a/b/c/1.txt
-		path1/b/c/1.txt
-		path2/1.txt
-		path3/1.txt
-		path3/2.txt
-		EOF
-		test_output
+expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
+		test_grep 'unsupported mode' actual
 	
-ok 17 - ls-tree --name-only -r
+fatal: ls-files --recurse-submodules unsupported mode
+ok 21 - --recurse-submodules and --modified are incompatible
 
-expecting success of 3101.18 'ls-tree --name-status': 
-		git ls-tree $opt $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0
-		path1
-		path2
-		path3
-		EOF
-		test_output
+expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
+		test_grep 'unsupported mode' actual
 	
-ok 18 - ls-tree --name-status
+fatal: ls-files --recurse-submodules unsupported mode
+ok 22 - --recurse-submodules and --others are incompatible
 
-expecting success of 3101.19 'ls-tree --name-status -r': 
-		git ls-tree $opt -r $tree >current &&
-		cat >expected <<-\EOF &&
-		1.txt
-		2.txt
-		path0/a/b/c/1.txt
-		path1/b/c/1.txt
-		path2/1.txt
-		path3/1.txt
-		path3/2.txt
-		EOF
-		test_output
+expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
+		test_grep 'unsupported mode' actual
 	
-ok 19 - ls-tree --name-status -r
+fatal: ls-files --recurse-submodules unsupported mode
+ok 23 - --recurse-submodules and --killed are incompatible
 
-# passed all 19 test(s)
-1..19
+expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 24 - --recurse-submodules and --unmerged are incompatible
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3102-ls-tree-wildcards.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3102-ls-tree-wildcards/.git/
+expecting success of 3102.1 'setup': 
+	mkdir a aa "a[a]" &&
+	touch a/one aa/two "a[a]/three" &&
+	git add a/one aa/two "a[a]/three" &&
+	git commit -m test
+
+[master (root-commit) a832b10] test
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/one
+ create mode 100644 a[a]/three
+ create mode 100644 aa/two
+ok 1 - setup
+
+expecting success of 3102.2 'ls-tree a[a] matches literally': 
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	a[a]/three
+	EOF
+	git ls-tree -r HEAD "a[a]" >actual &&
+	test_cmp expect actual
+
+ok 2 - ls-tree a[a] matches literally
+
+expecting success of 3102.3 'ls-tree outside prefix': 
+	cat >expect <<-EOF &&
+	100644 blob $EMPTY_BLOB	../a[a]/three
+	EOF
+	( cd aa && git ls-tree -r HEAD "../a[a]" ) >actual &&
+	test_cmp expect actual
+
+ok 3 - ls-tree outside prefix
+
+checking known breakage of 3102.4 'ls-tree does not yet support negated pathspec': 
+	git ls-files ":(exclude)a" "a*" >expect &&
+	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
+	test_cmp expect actual
+
+fatal: :(exclude)a: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')
+not ok 4 - ls-tree does not yet support negated pathspec # TODO known breakage
+
+# still have 1 known breakage(s)
+# passed all remaining 3 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3100-ls-tree-restrict.sh ***
@@ -109642,6 +109811,261 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3101-ls-tree-dirname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3101-ls-tree-dirname/.git/
+expecting success of 3101.1 'setup': 
+	echo 111 >1.txt &&
+	echo 222 >2.txt &&
+	mkdir path0 path0/a path0/a/b path0/a/b/c &&
+	echo 111 >path0/a/b/c/1.txt &&
+	mkdir path1 path1/b path1/b/c &&
+	echo 111 >path1/b/c/1.txt &&
+	mkdir path2 &&
+	echo 111 >path2/1.txt &&
+	mkdir path3 &&
+	echo 111 >path3/1.txt &&
+	echo 222 >path3/2.txt &&
+	find *.txt path* \( -type f -o -type l \) -print |
+	xargs git update-index --add &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+ef2ea4d6de8ec0863f430e4cad7468ce74f60aa7
+ok 1 - setup
+
+expecting success of 3101.2 'ls-tree plain': 
+	git ls-tree $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
+
+ok 2 - ls-tree plain
+
+expecting success of 3101.3 'ls-tree recursive': 
+	git ls-tree -r $tree >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
+
+ok 3 - ls-tree recursive
+
+expecting success of 3101.4 'ls-tree filter 1.txt': 
+	git ls-tree $tree 1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+EOF
+	test_output
+
+ok 4 - ls-tree filter 1.txt
+
+expecting success of 3101.5 'ls-tree filter path1/b/c/1.txt': 
+	git ls-tree $tree path1/b/c/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	path1/b/c/1.txt
+EOF
+	test_output
+
+ok 5 - ls-tree filter path1/b/c/1.txt
+
+expecting success of 3101.6 'ls-tree filter all 1.txt files': 
+	git ls-tree $tree 1.txt path0/a/b/c/1.txt \
+		path1/b/c/1.txt path2/1.txt path3/1.txt >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+EOF
+	test_output
+
+ok 6 - ls-tree filter all 1.txt files
+
+expecting success of 3101.7 'ls-tree filter directories': 
+	git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a/b/c
+040000 tree X	path1/b/c
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
+
+ok 7 - ls-tree filter directories
+
+expecting success of 3101.8 'ls-tree filter odd names': 
+	git ls-tree $tree 1.txt ./1.txt .//1.txt \
+		path3/1.txt path3/./1.txt path3 path3// >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
+
+ok 8 - ls-tree filter odd names
+
+expecting success of 3101.9 'ls-tree filter missing files and extra slashes': 
+	git ls-tree $tree 1.txt/ abc.txt \
+		path3//23.txt path3/2.txt/// >current &&
+	>expected &&
+	test_output
+
+ok 9 - ls-tree filter missing files and extra slashes
+
+expecting success of 3101.10 'ls-tree filter is leading path match': 
+	git ls-tree $tree pa path3/a >current &&
+	>expected &&
+	test_output
+
+ok 10 - ls-tree filter is leading path match
+
+expecting success of 3101.11 'ls-tree --full-name': 
+	(
+		cd path0 &&
+		git ls-tree --full-name $tree a
+	) >current &&
+	cat >expected <<\EOF &&
+040000 tree X	path0/a
+EOF
+	test_output
+
+ok 11 - ls-tree --full-name
+
+expecting success of 3101.12 'ls-tree --no-full-name': 
+	git -C path0 ls-tree --no-full-name $tree a >current &&
+	cat >expected <<-EOF &&
+	040000 tree X	a
+	EOF
+	test_output
+
+ok 12 - ls-tree --no-full-name
+
+expecting success of 3101.13 'ls-tree --full-tree': 
+	(
+		cd path1/b/c &&
+		git ls-tree --full-tree $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_output
+
+ok 13 - ls-tree --full-tree
+
+expecting success of 3101.14 'ls-tree --full-tree -r': 
+	(
+		cd path3/ &&
+		git ls-tree --full-tree -r $tree
+	) >current &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+100644 blob X	path0/a/b/c/1.txt
+100644 blob X	path1/b/c/1.txt
+100644 blob X	path2/1.txt
+100644 blob X	path3/1.txt
+100644 blob X	path3/2.txt
+EOF
+	test_output
+
+ok 14 - ls-tree --full-tree -r
+
+expecting success of 3101.15 'ls-tree --abbrev=5': 
+	git ls-tree --abbrev=5 $tree >current &&
+	sed -e "s/ $_x05[0-9a-f]*	/ X	/" <current >check &&
+	cat >expected <<\EOF &&
+100644 blob X	1.txt
+100644 blob X	2.txt
+040000 tree X	path0
+040000 tree X	path1
+040000 tree X	path2
+040000 tree X	path3
+EOF
+	test_cmp expected check
+
+ok 15 - ls-tree --abbrev=5
+
+expecting success of 3101.16 'ls-tree --name-only': 
+		git ls-tree $opt $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0
+		path1
+		path2
+		path3
+		EOF
+		test_output
+	
+ok 16 - ls-tree --name-only
+
+expecting success of 3101.17 'ls-tree --name-only -r': 
+		git ls-tree $opt -r $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0/a/b/c/1.txt
+		path1/b/c/1.txt
+		path2/1.txt
+		path3/1.txt
+		path3/2.txt
+		EOF
+		test_output
+	
+ok 17 - ls-tree --name-only -r
+
+expecting success of 3101.18 'ls-tree --name-status': 
+		git ls-tree $opt $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0
+		path1
+		path2
+		path3
+		EOF
+		test_output
+	
+ok 18 - ls-tree --name-status
+
+expecting success of 3101.19 'ls-tree --name-status -r': 
+		git ls-tree $opt -r $tree >current &&
+		cat >expected <<-\EOF &&
+		1.txt
+		2.txt
+		path0/a/b/c/1.txt
+		path1/b/c/1.txt
+		path2/1.txt
+		path3/1.txt
+		path3/2.txt
+		EOF
+		test_output
+	
+ok 19 - ls-tree --name-status -r
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3103-ls-tree-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3103-ls-tree-misc/.git/
 expecting success of 3103.1 'setup': 
@@ -109780,474 +110204,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3007-ls-files-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/
-expecting success of 3007.1 'setup directory structure and submodules': 
-	echo a >a &&
-	mkdir b &&
-	echo b >b/b &&
-	git add a b &&
-	git commit -m "add a and b" &&
-	git init submodule &&
-	echo c >submodule/c &&
-	git -C submodule add c &&
-	git -C submodule commit -m "add c" &&
-	git submodule add ./submodule &&
-	git commit -m "added submodule"
-
-[master (root-commit) f320cab] add a and b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b/b
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
-[master (root-commit) 3281629] add c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Adding existing repo at 'submodule' to the index
-[master 14616f7] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 1 - setup directory structure and submodules
-
-expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 2 - ls-files correctly outputs files in submodule
-
-expecting success of 3007.3 '--stage': 
-	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
-	A_HASH=$(git rev-parse HEAD:a) &&
-	B_HASH=$(git rev-parse HEAD:b/b) &&
-	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
-
-	cat >expect <<-EOF &&
-	100644 $GITMODULES_HASH 0	.gitmodules
-	100644 $A_HASH 0	a
-	100644 $B_HASH 0	b/b
-	100644 $C_HASH 0	submodule/c
-	EOF
-
-	git ls-files --stage --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 3 - --stage
-
-expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
-	lf_to_nul >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	git ls-files --recurse-submodules -z >actual &&
-	test_cmp expect actual
-
-ok 4 - ls-files correctly outputs files in submodule with -z
-
-expecting success of 3007.5 'ls-files does not output files not added to a repo': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	echo a >not_added &&
-	echo b >b/not_added &&
-	echo c >submodule/not_added &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 5 - ls-files does not output files not added to a repo
-
-expecting success of 3007.6 'ls-files recurses more than 1 level': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/.gitmodules
-	submodule/c
-	submodule/subsub/d
-	EOF
-
-	git init submodule/subsub &&
-	echo d >submodule/subsub/d &&
-	git -C submodule/subsub add d &&
-	git -C submodule/subsub commit -m "add d" &&
-	git -C submodule submodule add ./subsub &&
-	git -C submodule commit -m "added subsub" &&
-	git submodule absorbgitdirs &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git/
-[master (root-commit) 0cb03c9] add d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d
-Adding existing repo at 'subsub' to the index
-[master 83d4bc1] added subsub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsub
-Migrating git directory of 'submodule' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
-Migrating git directory of 'submodule/subsub' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
-ok 6 - ls-files recurses more than 1 level
-
-expecting success of 3007.7 'ls-files works with GIT_DIR': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	c
-	subsub/d
-	EOF
-
-	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 7 - ls-files works with GIT_DIR
-
-expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
-	echo e >submodule/subsub/e.txt &&
-	git -C submodule/subsub add e.txt &&
-	git -C submodule/subsub commit -m "adding e.txt" &&
-	echo f >submodule/f.TXT &&
-	echo g >submodule/g.txt &&
-	git -C submodule add f.TXT g.txt &&
-	git -C submodule commit -m "add f and g" &&
-	echo h >h.txt &&
-	mkdir sib &&
-	echo sib >sib/file &&
-	git add h.txt sib/file &&
-	git commit -m "add h and sib/file" &&
-	git init sub &&
-	echo sub >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	git submodule add ./sub &&
-	git commit -m "added sub" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/d
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "*" >actual &&
-	test_cmp expect actual
-
-[master 562fffb] adding e.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.txt
-[master f284b88] add f and g
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 f.TXT
- create mode 100644 g.txt
-[master ad13f14] add h and sib/file
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 h.txt
- create mode 100644 sib/file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
-[master (root-commit) e443189] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[master 4a68fc6] added sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub
-ok 8 - --recurse-submodules and pathspecs setup
-
-expecting success of 3007.9 'inactive submodule': 
-	test_when_finished "git config --bool submodule.submodule.active true" &&
-	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
-	git config --bool submodule.submodule.active "false" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	git config --bool submodule.submodule.active "true" &&
-	git -C submodule config --bool submodule.subsub.active "false" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 9 - inactive submodule
-
-expecting success of 3007.10 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules "*.txt" >actual &&
-	test_cmp expect actual
-
-ok 10 - --recurse-submodules and pathspecs
-
-expecting success of 3007.11 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
-	test_cmp expect actual
-
-ok 11 - --recurse-submodules and pathspecs
-
-expecting success of 3007.12 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	EOF
-
-	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
-	test_cmp expect actual
-
-ok 12 - --recurse-submodules and pathspecs
-
-expecting success of 3007.13 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sub/file
-	EOF
-
-	git ls-files --recurse-submodules "sub" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su*/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su?/file" >actual &&
-	test_cmp expect actual
-
-ok 13 - --recurse-submodules and pathspecs
-
-expecting success of 3007.14 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sib/file
-	sub/file
-	EOF
-
-	git ls-files --recurse-submodules "s??/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s???file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s*file" >actual &&
-	test_cmp expect actual
-
-ok 14 - --recurse-submodules and pathspecs
-
-expecting success of 3007.15 '--recurse-submodules and relative paths': 
-	# From subdir
-	cat >expect <<-\EOF &&
-	b
-	EOF
-	git -C b ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to top
-	cat >expect <<-\EOF &&
-	../.gitmodules
-	../a
-	b
-	../h.txt
-	../sib/file
-	../sub/file
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- .. >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to submodule
-	cat >expect <<-\EOF &&
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
-	test_cmp expect actual
-
-ok 15 - --recurse-submodules and relative paths
-
-expecting success of 3007.16 '--recurse-submodules does not support --error-unmatch': 
-	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
-	test_grep "does not support --error-unmatch" actual
-
-fatal: ls-files --recurse-submodules does not support --error-unmatch
-ok 16 - --recurse-submodules does not support --error-unmatch
-
-expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
-	test_config -C submodule index.sparse "invalid non-boolean value" &&
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 17 - --recurse-submodules parses submodule repo config
-
-expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
-
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 18 - --recurse-submodules parses submodule worktree config
-
-expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
-	# Enable worktree config in both super project & submodule, set an
-	# invalid config in the submodule worktree config
-	test_config extensions.worktreeConfig true &&
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
-
-	# Now, disable the worktree config in the submodule. Note that we need
-	# to manually re-enable extensions.worktreeConfig when the test is
-	# finished, otherwise the test_unconfig of index.sparse will not work.
-	test_unconfig -C submodule extensions.worktreeConfig &&
-	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
-
-	# With extensions.worktreeConfig disabled in the submodule, the invalid
-	# worktree config is not picked up.
-	git ls-files --recurse-submodules 2>err &&
-	! grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-submodule/.gitmodules
-submodule/c
-submodule/f.TXT
-submodule/g.txt
-submodule/subsub/d
-submodule/subsub/e.txt
-ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
-
-expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 20 - --recurse-submodules and --deleted are incompatible
-
-expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 21 - --recurse-submodules and --modified are incompatible
-
-expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 22 - --recurse-submodules and --others are incompatible
-
-expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 23 - --recurse-submodules and --killed are incompatible
-
-expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 24 - --recurse-submodules and --unmerged are incompatible
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3104-ls-tree-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3104-ls-tree-format/.git/
 expecting success of 3104.1 'ls-tree --format usage': 
@@ -110460,56 +110416,6 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3205-branch-color.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3205-branch-color/.git/
-expecting success of 3205.1 'set up some sample branches': 
-	test_commit foo &&
-	git branch -M main &&
-	git update-ref refs/remotes/origin/main HEAD &&
-	git update-ref refs/heads/other HEAD
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - set up some sample branches
-
-expecting success of 3205.2 'set up some color config': 
-	git config color.branch.local blue &&
-	git config color.branch.remote yellow &&
-	git config color.branch.current cyan
-
-ok 2 - set up some color config
-
-expecting success of 3205.3 'regular output shows colors': 
-	cat >expect <<-\EOF &&
-	* <CYAN>main<RESET>
-	  <BLUE>other<RESET>
-	  <YELLOW>remotes/origin/main<RESET>
-	EOF
-	git branch --color -a >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 3 - regular output shows colors
-
-expecting success of 3205.4 'verbose output shows colors': 
-	oid=$(git rev-parse --short HEAD) &&
-	cat >expect <<-EOF &&
-	* <CYAN>main               <RESET> $oid foo
-	  <BLUE>other              <RESET> $oid foo
-	  <YELLOW>remotes/origin/main<RESET> $oid foo
-	EOF
-	git branch --color -v -a >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 4 - verbose output shows colors
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3201-branch-contains.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3201-branch-contains/.git/
 expecting success of 3201.1 'setup': 
@@ -111045,6 +110951,284 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3204-branch-name-interpretation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3204-branch-name-interpretation/.git/
+expecting success of 3204.1 'set up repo': 
+	test_commit one &&
+	test_commit two &&
+	git remote add origin foo.git
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - set up repo
+
+expecting success of 3204.2 'update branch via @{-1}': 
+	git branch previous one &&
+
+	git checkout previous &&
+	git checkout main &&
+
+	git branch -f @{-1} two &&
+	expect_branch previous two
+
+Switched to branch 'previous'
+Switched to branch 'main'
+ok 2 - update branch via @{-1}
+
+expecting success of 3204.3 'update branch via local @{upstream}': 
+	git branch local one &&
+	git branch --set-upstream-to=local &&
+
+	git branch -f @{upstream} two &&
+	expect_branch local two
+
+branch 'main' set up to track 'local'.
+ok 3 - update branch via local @{upstream}
+
+expecting success of 3204.4 'disallow updating branch via remote @{upstream}': 
+	git update-ref refs/remotes/origin/remote one &&
+	git branch --set-upstream-to=origin/remote &&
+
+	test_must_fail git branch -f @{upstream} two
+
+branch 'main' set up to track 'origin/remote'.
+fatal: '@{upstream}' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 4 - disallow updating branch via remote @{upstream}
+
+expecting success of 3204.5 'create branch with pseudo-qualified name': 
+	git branch refs/heads/qualified two &&
+	expect_branch refs/heads/refs/heads/qualified two
+
+ok 5 - create branch with pseudo-qualified name
+
+expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
+	git branch -t copiable main &&
+	git checkout copiable &&
+	git checkout - &&
+	git branch -C @{-1} copiable &&
+	git config --get-all branch.copiable.merge >actual &&
+	echo refs/heads/main >expect &&
+	test_cmp expect actual
+
+branch 'copiable' set up to track 'main'.
+Switched to branch 'copiable'
+Your branch is up to date with 'main'.
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 6 - force-copy a branch to itself via @{-1} is no-op
+
+expecting success of 3204.7 'delete branch via @{-1}': 
+	git branch previous-del &&
+
+	git checkout previous-del &&
+	git checkout main &&
+
+	git branch -D @{-1} &&
+	expect_deleted previous-del
+
+Switched to branch 'previous-del'
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+Deleted branch previous-del (was 139b20d).
+fatal: Needed a single revision
+ok 7 - delete branch via @{-1}
+
+expecting success of 3204.8 'delete branch via local @{upstream}': 
+	git branch local-del &&
+	git branch --set-upstream-to=local-del &&
+
+	git branch -D @{upstream} &&
+	expect_deleted local-del
+
+branch 'main' set up to track 'local-del'.
+Deleted branch local-del (was 139b20d).
+fatal: Needed a single revision
+ok 8 - delete branch via local @{upstream}
+
+expecting success of 3204.9 'delete branch via remote @{upstream}': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
+
+	git branch -r -D @{upstream} &&
+	expect_deleted origin/remote-del
+
+branch 'main' set up to track 'origin/remote-del'.
+Deleted remote-tracking branch origin/remote-del (was 139b20d).
+fatal: Needed a single revision
+ok 9 - delete branch via remote @{upstream}
+
+expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
+	git update-ref refs/heads/origin/remote-del two &&
+	git update-ref refs/heads/remotes/origin/remote-del two &&
+
+	test_must_fail git branch -D @{upstream} &&
+	expect_branch refs/heads/origin/remote-del two &&
+	expect_branch refs/heads/remotes/origin/remote-del two
+
+branch 'main' set up to track 'origin/remote-del'.
+error: branch '@{upstream}' not found
+ok 10 - delete @{upstream} expansion matches -r option
+
+expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
+	git update-ref refs/remotes/origin/previous one &&
+
+	git checkout -b origin/previous two &&
+	git checkout main &&
+
+	test_must_fail git branch -r -D @{-1} &&
+	expect_branch refs/remotes/origin/previous one &&
+	expect_branch refs/heads/origin/previous two
+
+Switched to a new branch 'origin/previous'
+Switched to branch 'main'
+Your branch is up to date with 'remotes/origin/remote-del'.
+error: remote-tracking branch '@{-1}' not found
+ok 11 - disallow deleting remote branch via @{-1}
+
+expecting success of 3204.12 'create branch named "@"': 
+	git branch -f @ one &&
+	expect_branch refs/heads/@ one
+
+ok 12 - create branch named "@"
+
+expecting success of 3204.13 'delete branch named "@"': 
+	git update-ref refs/heads/@ two &&
+	git branch -D @ &&
+	expect_deleted refs/heads/@
+
+Deleted branch @ (was 139b20d).
+fatal: Needed a single revision
+ok 13 - delete branch named "@"
+
+expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
+	git update-ref refs/remotes/origin/checkout one &&
+	git branch --set-upstream-to=origin/checkout &&
+	git update-ref refs/heads/origin/checkout two &&
+	git update-ref refs/heads/remotes/origin/checkout two &&
+
+	git checkout @{upstream} &&
+	expect_branch HEAD one
+
+branch 'main' set up to track 'origin/checkout'.
+warning: refname '@{upstream}' is ambiguous.
+Note: switching to '@{upstream}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d79ce16 one
+ok 14 - checkout does not treat remote @{upstream} as a branch
+
+expecting success of 3204.15 'edit-description via @{-1}': 
+	git checkout -b desc-branch &&
+	git checkout -b non-desc-branch &&
+	write_script editor <<-\EOF &&
+		echo "Branch description" >"$1"
+	EOF
+	EDITOR=./editor git branch --edit-description @{-1} &&
+	test_must_fail git config branch.non-desc-branch.description &&
+	git config branch.desc-branch.description >actual &&
+	printf "Branch description\n\n" >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'desc-branch'
+Switched to a new branch 'non-desc-branch'
+ok 15 - edit-description via @{-1}
+
+expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
+	git checkout -b upstream-branch &&
+	git checkout -b upstream-other -t upstream-branch &&
+	git branch --set-upstream-to upstream-other @{-1} &&
+	git config branch.upstream-branch.merge >actual &&
+	echo "refs/heads/upstream-other" >expect &&
+	test_cmp expect actual &&
+	git branch --unset-upstream @{-1}@{upstream} &&
+	test_must_fail git config branch.upstream-other.merge
+
+Switched to a new branch 'upstream-branch'
+Switched to a new branch 'upstream-other'
+branch 'upstream-other' set up to track 'upstream-branch'.
+branch 'upstream-branch' set up to track 'upstream-other'.
+ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3205-branch-color.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3205-branch-color/.git/
+expecting success of 3205.1 'set up some sample branches': 
+	test_commit foo &&
+	git branch -M main &&
+	git update-ref refs/remotes/origin/main HEAD &&
+	git update-ref refs/heads/other HEAD
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - set up some sample branches
+
+expecting success of 3205.2 'set up some color config': 
+	git config color.branch.local blue &&
+	git config color.branch.remote yellow &&
+	git config color.branch.current cyan
+
+ok 2 - set up some color config
+
+expecting success of 3205.3 'regular output shows colors': 
+	cat >expect <<-\EOF &&
+	* <CYAN>main<RESET>
+	  <BLUE>other<RESET>
+	  <YELLOW>remotes/origin/main<RESET>
+	EOF
+	git branch --color -a >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 3 - regular output shows colors
+
+expecting success of 3205.4 'verbose output shows colors': 
+	oid=$(git rev-parse --short HEAD) &&
+	cat >expect <<-EOF &&
+	* <CYAN>main               <RESET> $oid foo
+	  <BLUE>other              <RESET> $oid foo
+	  <YELLOW>remotes/origin/main<RESET> $oid foo
+	EOF
+	git branch --color -v -a >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 4 - verbose output shows colors
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3105-ls-tree-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3105-ls-tree-output/.git/
 expecting success of 3105.1 'ls-tree --format usage': 
@@ -111484,234 +111668,6 @@
 1..60
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3204-branch-name-interpretation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3204-branch-name-interpretation/.git/
-expecting success of 3204.1 'set up repo': 
-	test_commit one &&
-	test_commit two &&
-	git remote add origin foo.git
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - set up repo
-
-expecting success of 3204.2 'update branch via @{-1}': 
-	git branch previous one &&
-
-	git checkout previous &&
-	git checkout main &&
-
-	git branch -f @{-1} two &&
-	expect_branch previous two
-
-Switched to branch 'previous'
-Switched to branch 'main'
-ok 2 - update branch via @{-1}
-
-expecting success of 3204.3 'update branch via local @{upstream}': 
-	git branch local one &&
-	git branch --set-upstream-to=local &&
-
-	git branch -f @{upstream} two &&
-	expect_branch local two
-
-branch 'main' set up to track 'local'.
-ok 3 - update branch via local @{upstream}
-
-expecting success of 3204.4 'disallow updating branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote one &&
-	git branch --set-upstream-to=origin/remote &&
-
-	test_must_fail git branch -f @{upstream} two
-
-branch 'main' set up to track 'origin/remote'.
-fatal: '@{upstream}' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 4 - disallow updating branch via remote @{upstream}
-
-expecting success of 3204.5 'create branch with pseudo-qualified name': 
-	git branch refs/heads/qualified two &&
-	expect_branch refs/heads/refs/heads/qualified two
-
-ok 5 - create branch with pseudo-qualified name
-
-expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
-	git branch -t copiable main &&
-	git checkout copiable &&
-	git checkout - &&
-	git branch -C @{-1} copiable &&
-	git config --get-all branch.copiable.merge >actual &&
-	echo refs/heads/main >expect &&
-	test_cmp expect actual
-
-branch 'copiable' set up to track 'main'.
-Switched to branch 'copiable'
-Your branch is up to date with 'main'.
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 6 - force-copy a branch to itself via @{-1} is no-op
-
-expecting success of 3204.7 'delete branch via @{-1}': 
-	git branch previous-del &&
-
-	git checkout previous-del &&
-	git checkout main &&
-
-	git branch -D @{-1} &&
-	expect_deleted previous-del
-
-Switched to branch 'previous-del'
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-Deleted branch previous-del (was 139b20d).
-fatal: Needed a single revision
-ok 7 - delete branch via @{-1}
-
-expecting success of 3204.8 'delete branch via local @{upstream}': 
-	git branch local-del &&
-	git branch --set-upstream-to=local-del &&
-
-	git branch -D @{upstream} &&
-	expect_deleted local-del
-
-branch 'main' set up to track 'local-del'.
-Deleted branch local-del (was 139b20d).
-fatal: Needed a single revision
-ok 8 - delete branch via local @{upstream}
-
-expecting success of 3204.9 'delete branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
-
-	git branch -r -D @{upstream} &&
-	expect_deleted origin/remote-del
-
-branch 'main' set up to track 'origin/remote-del'.
-Deleted remote-tracking branch origin/remote-del (was 139b20d).
-fatal: Needed a single revision
-ok 9 - delete branch via remote @{upstream}
-
-expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
-	git update-ref refs/heads/origin/remote-del two &&
-	git update-ref refs/heads/remotes/origin/remote-del two &&
-
-	test_must_fail git branch -D @{upstream} &&
-	expect_branch refs/heads/origin/remote-del two &&
-	expect_branch refs/heads/remotes/origin/remote-del two
-
-branch 'main' set up to track 'origin/remote-del'.
-error: branch '@{upstream}' not found
-ok 10 - delete @{upstream} expansion matches -r option
-
-expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
-	git update-ref refs/remotes/origin/previous one &&
-
-	git checkout -b origin/previous two &&
-	git checkout main &&
-
-	test_must_fail git branch -r -D @{-1} &&
-	expect_branch refs/remotes/origin/previous one &&
-	expect_branch refs/heads/origin/previous two
-
-Switched to a new branch 'origin/previous'
-Switched to branch 'main'
-Your branch is up to date with 'remotes/origin/remote-del'.
-error: remote-tracking branch '@{-1}' not found
-ok 11 - disallow deleting remote branch via @{-1}
-
-expecting success of 3204.12 'create branch named "@"': 
-	git branch -f @ one &&
-	expect_branch refs/heads/@ one
-
-ok 12 - create branch named "@"
-
-expecting success of 3204.13 'delete branch named "@"': 
-	git update-ref refs/heads/@ two &&
-	git branch -D @ &&
-	expect_deleted refs/heads/@
-
-Deleted branch @ (was 139b20d).
-fatal: Needed a single revision
-ok 13 - delete branch named "@"
-
-expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
-	git update-ref refs/remotes/origin/checkout one &&
-	git branch --set-upstream-to=origin/checkout &&
-	git update-ref refs/heads/origin/checkout two &&
-	git update-ref refs/heads/remotes/origin/checkout two &&
-
-	git checkout @{upstream} &&
-	expect_branch HEAD one
-
-branch 'main' set up to track 'origin/checkout'.
-warning: refname '@{upstream}' is ambiguous.
-Note: switching to '@{upstream}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d79ce16 one
-ok 14 - checkout does not treat remote @{upstream} as a branch
-
-expecting success of 3204.15 'edit-description via @{-1}': 
-	git checkout -b desc-branch &&
-	git checkout -b non-desc-branch &&
-	write_script editor <<-\EOF &&
-		echo "Branch description" >"$1"
-	EOF
-	EDITOR=./editor git branch --edit-description @{-1} &&
-	test_must_fail git config branch.non-desc-branch.description &&
-	git config branch.desc-branch.description >actual &&
-	printf "Branch description\n\n" >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'desc-branch'
-Switched to a new branch 'non-desc-branch'
-ok 15 - edit-description via @{-1}
-
-expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
-	git checkout -b upstream-branch &&
-	git checkout -b upstream-other -t upstream-branch &&
-	git branch --set-upstream-to upstream-other @{-1} &&
-	git config branch.upstream-branch.merge >actual &&
-	echo "refs/heads/upstream-other" >expect &&
-	test_cmp expect actual &&
-	git branch --unset-upstream @{-1}@{upstream} &&
-	test_must_fail git config branch.upstream-other.merge
-
-Switched to a new branch 'upstream-branch'
-Switched to a new branch 'upstream-other'
-branch 'upstream-other' set up to track 'upstream-branch'.
-branch 'upstream-branch' set up to track 'upstream-other'.
-ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3211-peel-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3211-peel-ref/.git/
 expecting success of 3211.1 'create annotated tag in refs/tags': 
@@ -111793,429 +111749,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3202-show-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3202-show-branch/.git/
-expecting success of 3202.1 'error descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	error: no commit on branch '$current' yet
-	EOF
-	test_must_fail git branch --edit-description 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch --edit-description $current 2>actual &&
-	test_cmp expect actual
-
-ok 1 - error descriptions on empty repository
-
-expecting success of 3202.2 'fatal descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	fatal: no commit on branch '$current' yet
-	EOF
-	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -c new-branch 2>actual &&
-	test_cmp expect actual
-
-ok 2 - fatal descriptions on empty repository
-
-expecting success of 3202.3 'setup': 
-	test_commit initial &&
-	for i in $(test_seq 1 10)
-	do
-		git checkout -b branch$i initial &&
-		test_commit --no-tag branch$i || return 1
-	done &&
-	git for-each-ref \
-		--sort=version:refname \
-		--format="%(refname:strip=2)" \
-		"refs/heads/branch*" >branches.sorted &&
-	sed "s/^> //" >expect <<-\EOF
-	> ! [branch1] branch1
-	>  ! [branch2] branch2
-	>   ! [branch3] branch3
-	>    ! [branch4] branch4
-	>     ! [branch5] branch5
-	>      ! [branch6] branch6
-	>       ! [branch7] branch7
-	>        ! [branch8] branch8
-	>         ! [branch9] branch9
-	>          * [branch10] branch10
-	> ----------
-	>          * [branch10] branch10
-	>         +  [branch9] branch9
-	>        +   [branch8] branch8
-	>       +    [branch7] branch7
-	>      +     [branch6] branch6
-	>     +      [branch5] branch5
-	>    +       [branch4] branch4
-	>   +        [branch3] branch3
-	>  +         [branch2] branch2
-	> +          [branch1] branch1
-	> +++++++++* [branch10^] initial
-	EOF
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'branch1'
-[branch1 39d0a3f] branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch1.t
-Switched to a new branch 'branch2'
-[branch2 bcd9857] branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch2.t
-Switched to a new branch 'branch3'
-[branch3 6401a40] branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch3.t
-Switched to a new branch 'branch4'
-[branch4 831d58d] branch4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch4.t
-Switched to a new branch 'branch5'
-[branch5 d4d852d] branch5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch5.t
-Switched to a new branch 'branch6'
-[branch6 3af5e35] branch6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch6.t
-Switched to a new branch 'branch7'
-[branch7 0cecb11] branch7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch7.t
-Switched to a new branch 'branch8'
-[branch8 48b5688] branch8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch8.t
-Switched to a new branch 'branch9'
-[branch9 b82e556] branch9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch9.t
-Switched to a new branch 'branch10'
-[branch10 3b327e0] branch10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch10.t
-ok 3 - setup
-
-expecting success of 3202.4 'show-branch with more than 8 branches': 
-	git show-branch $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 4 - show-branch with more than 8 branches
-
-expecting success of 3202.5 'show-branch with showbranch.default': 
-	for branch in $(cat branches.sorted)
-	do
-		test_config showbranch.default $branch --add || return 1
-	done &&
-	git show-branch >actual &&
-	test_cmp expect actual
-
-ok 5 - show-branch with showbranch.default
-
-expecting success of 3202.6 'show-branch --color output': 
-	sed "s/^> //" >expect <<-\EOF &&
-	> <RED>!<RESET> [branch1] branch1
-	>  <GREEN>!<RESET> [branch2] branch2
-	>   <YELLOW>!<RESET> [branch3] branch3
-	>    <BLUE>!<RESET> [branch4] branch4
-	>     <MAGENTA>!<RESET> [branch5] branch5
-	>      <CYAN>!<RESET> [branch6] branch6
-	>       <BOLD;RED>!<RESET> [branch7] branch7
-	>        <BOLD;GREEN>!<RESET> [branch8] branch8
-	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	> ----------
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
-	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
-	>       <BOLD;RED>+<RESET>    [branch7] branch7
-	>      <CYAN>+<RESET>     [branch6] branch6
-	>     <MAGENTA>+<RESET>      [branch5] branch5
-	>    <BLUE>+<RESET>       [branch4] branch4
-	>   <YELLOW>+<RESET>        [branch3] branch3
-	>  <GREEN>+<RESET>         [branch2] branch2
-	> <RED>+<RESET>          [branch1] branch1
-	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
-	EOF
-	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 6 - show-branch --color output
-
-expecting success of 3202.7 'show branch --remotes': 
-	cat >expect.err <<-\EOF &&
-	No revs to be shown.
-	EOF
-	git show-branch -r 2>actual.err >actual.out &&
-	test_cmp expect.err actual.err &&
-	test_must_be_empty actual.out
-
-ok 7 - show branch --remotes
-
-expecting success of 3202.8 'show-branch --sparse': 
-	test_when_finished "git checkout branch10 && git branch -D branchA" &&
-	git checkout -b branchA branch10 &&
-	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
-	git commit --allow-empty -m "another" &&
-
-	git show-branch --sparse >out &&
-	grep "merge 1 and 10 to make A" out &&
-
-	git show-branch >out &&
-	! grep "merge 1 and 10 to make A" out &&
-
-	git show-branch --no-sparse >out &&
-	! grep "merge 1 and 10 to make A" out
-
-Switched to a new branch 'branchA'
-Merge made by the 'ours' strategy.
-[branchA 711c132] another
- Author: A U Thor <author@example.com>
-          -  [branchA^] merge 1 and 10 to make A
-Switched to branch 'branch10'
-Deleted branch branchA (was 711c132).
-ok 8 - show-branch --sparse
-
-expecting success of 3202.9 'setup show branch --list': 
-	sed "s/^> //" >expect <<-\EOF
-	>   [branch1] branch1
-	>   [branch2] branch2
-	>   [branch3] branch3
-	>   [branch4] branch4
-	>   [branch5] branch5
-	>   [branch6] branch6
-	>   [branch7] branch7
-	>   [branch8] branch8
-	>   [branch9] branch9
-	> * [branch10] branch10
-	EOF
-
-ok 9 - setup show branch --list
-
-expecting success of 3202.10 'show branch --list': 
-	git show-branch --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 10 - show branch --list
-
-expecting success of 3202.11 'show branch --list has no --color output': 
-	git show-branch --color=always --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 11 - show branch --list has no --color output
-
-expecting success of 3202.12 'show branch --merge-base with one argument': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse $branch >expect &&
-		git show-branch --merge-base $branch >actual &&
-		test_cmp expect actual || return 1
-	done
-
-ok 12 - show branch --merge-base with one argument
-
-expecting success of 3202.13 'show branch --merge-base with two arguments': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse initial >expect &&
-		git show-branch --merge-base initial $branch >actual &&
-		test_cmp expect actual || return 1
-	done
-
-ok 13 - show branch --merge-base with two arguments
-
-expecting success of 3202.14 'show branch --merge-base with N arguments': 
-	git rev-parse initial >expect &&
-	git show-branch --merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual &&
-
-	git merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 14 - show branch --merge-base with N arguments
-
-expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
-ok 15 - show-branch --all --reflog (should fail)
-
-expecting success of 3202.16 'show-branch --merge-base --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 16 - show-branch --merge-base --reflog (should fail)
-
-expecting success of 3202.17 'show-branch --list --merge-base (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 17 - show-branch --list --merge-base (should fail)
-
-expecting success of 3202.18 'show-branch --reflog --current (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--current' cannot be used together
-ok 18 - show-branch --reflog --current (should fail)
-
-expecting success of 3202.19 'show-branch --no-topo-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-topo-order'
-ok 19 - show-branch --no-topo-order (should fail)
-
-expecting success of 3202.20 'show-branch --no-date-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-date-order'
-ok 20 - show-branch --no-date-order (should fail)
-
-expecting success of 3202.21 'show-branch --no-reflog (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-reflog'
-ok 21 - show-branch --no-reflog (should fail)
-
-expecting success of 3202.22 'error descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	error: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch --edit-description non-existent 2>actual &&
-	test_cmp expect actual
-
-ok 22 - error descriptions on non-existent branch
-
-expecting success of 3202.23 'fatal descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	fatal: branch 'non-existent' does not exist
-	EOF
-	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-EOF &&
-	fatal: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch -c non-existent new-branch 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -m non-existent new-branch 2>actual &&
-	test_cmp expect actual
-
-ok 23 - fatal descriptions on non-existent branch
-
-expecting success of 3202.24 'error descriptions on orphan branch': 
-	test_when_finished git worktree remove -f wt &&
-	git worktree add wt --detach &&
-	git -C wt checkout --orphan orphan-branch &&
-	test_branch_op_in_wt() {
-		test_orphan_error() {
-			test_must_fail git $* 2>actual &&
-			test_grep "no commit on branch .orphan-branch. yet$" actual
-		} &&
-		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
-		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
-		test_orphan_error branch $1 orphan-branch $2           # different worktree
-	} &&
-	test_branch_op_in_wt --edit-description &&
-	test_branch_op_in_wt --set-upstream-to=ne &&
-	test_branch_op_in_wt -c new-branch
-
-Preparing worktree (detached HEAD 3b327e0)
-HEAD is now at 3b327e0 branch10
-Switched to a new branch 'orphan-branch'
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-ok 24 - error descriptions on orphan branch
-
-expecting success of 3202.25 'setup reflogs': 
-	test_commit base &&
-	git checkout -b branch &&
-	test_commit one &&
-	git reset --hard HEAD^ &&
-	test_commit two &&
-	test_commit three
-
-[branch10 4c99dd1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'branch'
-[branch 6203781] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-HEAD is now at 4c99dd1 base
-[branch 9c7919e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[branch 0d1aba5] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 25 - setup reflogs
-
-expecting success of 3202.26 '--reflog shows reflog entries': 
-	cat >expect <<-\EOF &&
-	! [branch@{0}] (0 seconds ago) commit: three
-	 ! [branch@{1}] (60 seconds ago) commit: two
-	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
-	   ! [branch@{3}] (2 minutes ago) commit: one
-	----
-	+    [branch@{0}] three
-	++   [branch@{1}] two
-	   + [branch@{3}] one
-	++++ [branch@{2}] base
-	EOF
-	# the output always contains relative timestamps; use
-	# a known time to get deterministic results
-	GIT_TEST_DATE_NOW=$test_tick \
-	git show-branch --reflog branch >actual &&
-	test_cmp expect actual
-
-ok 26 - --reflog shows reflog entries
-
-expecting success of 3202.27 '--reflog handles missing reflog': 
-	git reflog expire --expire=now branch &&
-	git show-branch --reflog branch >actual &&
-	test_must_be_empty actual
-
-No revs to be shown.
-ok 27 - --reflog handles missing reflog
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3203-branch-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3203-branch-output/.git/
 expecting success of 3203.1 'make commits': 
@@ -112813,6 +112346,429 @@
 1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3202-show-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3202-show-branch/.git/
+expecting success of 3202.1 'error descriptions on empty repository': 
+	current=$(git branch --show-current) &&
+	cat >expect <<-EOF &&
+	error: no commit on branch '$current' yet
+	EOF
+	test_must_fail git branch --edit-description 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch --edit-description $current 2>actual &&
+	test_cmp expect actual
+
+ok 1 - error descriptions on empty repository
+
+expecting success of 3202.2 'fatal descriptions on empty repository': 
+	current=$(git branch --show-current) &&
+	cat >expect <<-EOF &&
+	fatal: no commit on branch '$current' yet
+	EOF
+	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -c new-branch 2>actual &&
+	test_cmp expect actual
+
+ok 2 - fatal descriptions on empty repository
+
+expecting success of 3202.3 'setup': 
+	test_commit initial &&
+	for i in $(test_seq 1 10)
+	do
+		git checkout -b branch$i initial &&
+		test_commit --no-tag branch$i || return 1
+	done &&
+	git for-each-ref \
+		--sort=version:refname \
+		--format="%(refname:strip=2)" \
+		"refs/heads/branch*" >branches.sorted &&
+	sed "s/^> //" >expect <<-\EOF
+	> ! [branch1] branch1
+	>  ! [branch2] branch2
+	>   ! [branch3] branch3
+	>    ! [branch4] branch4
+	>     ! [branch5] branch5
+	>      ! [branch6] branch6
+	>       ! [branch7] branch7
+	>        ! [branch8] branch8
+	>         ! [branch9] branch9
+	>          * [branch10] branch10
+	> ----------
+	>          * [branch10] branch10
+	>         +  [branch9] branch9
+	>        +   [branch8] branch8
+	>       +    [branch7] branch7
+	>      +     [branch6] branch6
+	>     +      [branch5] branch5
+	>    +       [branch4] branch4
+	>   +        [branch3] branch3
+	>  +         [branch2] branch2
+	> +          [branch1] branch1
+	> +++++++++* [branch10^] initial
+	EOF
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'branch1'
+[branch1 39d0a3f] branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch1.t
+Switched to a new branch 'branch2'
+[branch2 bcd9857] branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch2.t
+Switched to a new branch 'branch3'
+[branch3 6401a40] branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch3.t
+Switched to a new branch 'branch4'
+[branch4 831d58d] branch4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch4.t
+Switched to a new branch 'branch5'
+[branch5 d4d852d] branch5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch5.t
+Switched to a new branch 'branch6'
+[branch6 3af5e35] branch6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch6.t
+Switched to a new branch 'branch7'
+[branch7 0cecb11] branch7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch7.t
+Switched to a new branch 'branch8'
+[branch8 48b5688] branch8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch8.t
+Switched to a new branch 'branch9'
+[branch9 b82e556] branch9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch9.t
+Switched to a new branch 'branch10'
+[branch10 3b327e0] branch10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch10.t
+ok 3 - setup
+
+expecting success of 3202.4 'show-branch with more than 8 branches': 
+	git show-branch $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+
+ok 4 - show-branch with more than 8 branches
+
+expecting success of 3202.5 'show-branch with showbranch.default': 
+	for branch in $(cat branches.sorted)
+	do
+		test_config showbranch.default $branch --add || return 1
+	done &&
+	git show-branch >actual &&
+	test_cmp expect actual
+
+ok 5 - show-branch with showbranch.default
+
+expecting success of 3202.6 'show-branch --color output': 
+	sed "s/^> //" >expect <<-\EOF &&
+	> <RED>!<RESET> [branch1] branch1
+	>  <GREEN>!<RESET> [branch2] branch2
+	>   <YELLOW>!<RESET> [branch3] branch3
+	>    <BLUE>!<RESET> [branch4] branch4
+	>     <MAGENTA>!<RESET> [branch5] branch5
+	>      <CYAN>!<RESET> [branch6] branch6
+	>       <BOLD;RED>!<RESET> [branch7] branch7
+	>        <BOLD;GREEN>!<RESET> [branch8] branch8
+	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	> ----------
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
+	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
+	>       <BOLD;RED>+<RESET>    [branch7] branch7
+	>      <CYAN>+<RESET>     [branch6] branch6
+	>     <MAGENTA>+<RESET>      [branch5] branch5
+	>    <BLUE>+<RESET>       [branch4] branch4
+	>   <YELLOW>+<RESET>        [branch3] branch3
+	>  <GREEN>+<RESET>         [branch2] branch2
+	> <RED>+<RESET>          [branch1] branch1
+	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
+	EOF
+	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 6 - show-branch --color output
+
+expecting success of 3202.7 'show branch --remotes': 
+	cat >expect.err <<-\EOF &&
+	No revs to be shown.
+	EOF
+	git show-branch -r 2>actual.err >actual.out &&
+	test_cmp expect.err actual.err &&
+	test_must_be_empty actual.out
+
+ok 7 - show branch --remotes
+
+expecting success of 3202.8 'show-branch --sparse': 
+	test_when_finished "git checkout branch10 && git branch -D branchA" &&
+	git checkout -b branchA branch10 &&
+	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
+	git commit --allow-empty -m "another" &&
+
+	git show-branch --sparse >out &&
+	grep "merge 1 and 10 to make A" out &&
+
+	git show-branch >out &&
+	! grep "merge 1 and 10 to make A" out &&
+
+	git show-branch --no-sparse >out &&
+	! grep "merge 1 and 10 to make A" out
+
+Switched to a new branch 'branchA'
+Merge made by the 'ours' strategy.
+[branchA 711c132] another
+ Author: A U Thor <author@example.com>
+          -  [branchA^] merge 1 and 10 to make A
+Switched to branch 'branch10'
+Deleted branch branchA (was 711c132).
+ok 8 - show-branch --sparse
+
+expecting success of 3202.9 'setup show branch --list': 
+	sed "s/^> //" >expect <<-\EOF
+	>   [branch1] branch1
+	>   [branch2] branch2
+	>   [branch3] branch3
+	>   [branch4] branch4
+	>   [branch5] branch5
+	>   [branch6] branch6
+	>   [branch7] branch7
+	>   [branch8] branch8
+	>   [branch9] branch9
+	> * [branch10] branch10
+	EOF
+
+ok 9 - setup show branch --list
+
+expecting success of 3202.10 'show branch --list': 
+	git show-branch --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+
+ok 10 - show branch --list
+
+expecting success of 3202.11 'show branch --list has no --color output': 
+	git show-branch --color=always --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+
+ok 11 - show branch --list has no --color output
+
+expecting success of 3202.12 'show branch --merge-base with one argument': 
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse $branch >expect &&
+		git show-branch --merge-base $branch >actual &&
+		test_cmp expect actual || return 1
+	done
+
+ok 12 - show branch --merge-base with one argument
+
+expecting success of 3202.13 'show branch --merge-base with two arguments': 
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse initial >expect &&
+		git show-branch --merge-base initial $branch >actual &&
+		test_cmp expect actual || return 1
+	done
+
+ok 13 - show branch --merge-base with two arguments
+
+expecting success of 3202.14 'show branch --merge-base with N arguments': 
+	git rev-parse initial >expect &&
+	git show-branch --merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual &&
+
+	git merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+
+ok 14 - show branch --merge-base with N arguments
+
+expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
+ok 15 - show-branch --all --reflog (should fail)
+
+expecting success of 3202.16 'show-branch --merge-base --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
+ok 16 - show-branch --merge-base --reflog (should fail)
+
+expecting success of 3202.17 'show-branch --list --merge-base (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
+ok 17 - show-branch --list --merge-base (should fail)
+
+expecting success of 3202.18 'show-branch --reflog --current (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+fatal: options '--reflog' and '--current' cannot be used together
+ok 18 - show-branch --reflog --current (should fail)
+
+expecting success of 3202.19 'show-branch --no-topo-order (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-topo-order'
+ok 19 - show-branch --no-topo-order (should fail)
+
+expecting success of 3202.20 'show-branch --no-date-order (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-date-order'
+ok 20 - show-branch --no-date-order (should fail)
+
+expecting success of 3202.21 'show-branch --no-reflog (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-reflog'
+ok 21 - show-branch --no-reflog (should fail)
+
+expecting success of 3202.22 'error descriptions on non-existent branch': 
+	cat >expect <<-EOF &&
+	error: no branch named 'non-existent'
+	EOF
+	test_must_fail git branch --edit-description non-existent 2>actual &&
+	test_cmp expect actual
+
+ok 22 - error descriptions on non-existent branch
+
+expecting success of 3202.23 'fatal descriptions on non-existent branch': 
+	cat >expect <<-EOF &&
+	fatal: branch 'non-existent' does not exist
+	EOF
+	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-EOF &&
+	fatal: no branch named 'non-existent'
+	EOF
+	test_must_fail git branch -c non-existent new-branch 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -m non-existent new-branch 2>actual &&
+	test_cmp expect actual
+
+ok 23 - fatal descriptions on non-existent branch
+
+expecting success of 3202.24 'error descriptions on orphan branch': 
+	test_when_finished git worktree remove -f wt &&
+	git worktree add wt --detach &&
+	git -C wt checkout --orphan orphan-branch &&
+	test_branch_op_in_wt() {
+		test_orphan_error() {
+			test_must_fail git $* 2>actual &&
+			test_grep "no commit on branch .orphan-branch. yet$" actual
+		} &&
+		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
+		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
+		test_orphan_error branch $1 orphan-branch $2           # different worktree
+	} &&
+	test_branch_op_in_wt --edit-description &&
+	test_branch_op_in_wt --set-upstream-to=ne &&
+	test_branch_op_in_wt -c new-branch
+
+Preparing worktree (detached HEAD 3b327e0)
+HEAD is now at 3b327e0 branch10
+Switched to a new branch 'orphan-branch'
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+ok 24 - error descriptions on orphan branch
+
+expecting success of 3202.25 'setup reflogs': 
+	test_commit base &&
+	git checkout -b branch &&
+	test_commit one &&
+	git reset --hard HEAD^ &&
+	test_commit two &&
+	test_commit three
+
+[branch10 4c99dd1] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'branch'
+[branch 6203781] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+HEAD is now at 4c99dd1 base
+[branch 9c7919e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[branch 0d1aba5] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 25 - setup reflogs
+
+expecting success of 3202.26 '--reflog shows reflog entries': 
+	cat >expect <<-\EOF &&
+	! [branch@{0}] (0 seconds ago) commit: three
+	 ! [branch@{1}] (60 seconds ago) commit: two
+	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
+	   ! [branch@{3}] (2 minutes ago) commit: one
+	----
+	+    [branch@{0}] three
+	++   [branch@{1}] two
+	   + [branch@{3}] one
+	++++ [branch@{2}] base
+	EOF
+	# the output always contains relative timestamps; use
+	# a known time to get deterministic results
+	GIT_TEST_DATE_NOW=$test_tick \
+	git show-branch --reflog branch >actual &&
+	test_cmp expect actual
+
+ok 26 - --reflog shows reflog entries
+
+expecting success of 3202.27 '--reflog handles missing reflog': 
+	git reflog expire --expire=now branch &&
+	git show-branch --reflog branch >actual &&
+	test_must_be_empty actual
+
+No revs to be shown.
+ok 27 - --reflog handles missing reflog
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3300-funny-names.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3300-funny-names/.git/
 expecting success of 3300.1 'setup': 
@@ -113028,6 +112984,68 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3302-notes-index-expensive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3302-notes-index-expensive/.git/
+expecting success of 3302.1 'setup 10': 
+		mkdir "$count" &&
+		(
+			cd "$count" &&
+			create_repo "$count"
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3302-notes-index-expensive/10/.git/
+ok 1 - setup 10
+
+expecting success of 3302.2 'notes work': 
+		(
+			cd "$count" &&
+			test_notes "$count"
+		)
+	
+ok 2 - notes work
+
+checking prerequisite: USR_BIN_TIME
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+	test -x /usr/bin/time
+
+)
+prerequisite USR_BIN_TIME not satisfied
+ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 4 # skip setup 100 (missing EXPENSIVE)
+
+ok 5 # skip notes work (missing EXPENSIVE)
+
+ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+ok 7 # skip setup 1000 (missing EXPENSIVE)
+
+ok 8 # skip notes work (missing EXPENSIVE)
+
+ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+ok 10 # skip setup 10000 (missing EXPENSIVE)
+
+ok 11 # skip notes work (missing EXPENSIVE)
+
+ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3304-notes-mixed.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3304-notes-mixed/.git/
 expecting success of 3304.1 'setup: create a couple of commits': 
@@ -113192,68 +113210,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3302-notes-index-expensive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3302-notes-index-expensive/.git/
-expecting success of 3302.1 'setup 10': 
-		mkdir "$count" &&
-		(
-			cd "$count" &&
-			create_repo "$count"
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3302-notes-index-expensive/10/.git/
-ok 1 - setup 10
-
-expecting success of 3302.2 'notes work': 
-		(
-			cd "$count" &&
-			test_notes "$count"
-		)
-	
-ok 2 - notes work
-
-checking prerequisite: USR_BIN_TIME
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-	test -x /usr/bin/time
-
-)
-prerequisite USR_BIN_TIME not satisfied
-ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 4 # skip setup 100 (missing EXPENSIVE)
-
-ok 5 # skip notes work (missing EXPENSIVE)
-
-ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-ok 7 # skip setup 1000 (missing EXPENSIVE)
-
-ok 8 # skip notes work (missing EXPENSIVE)
-
-ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-ok 10 # skip setup 10000 (missing EXPENSIVE)
-
-ok 11 # skip notes work (missing EXPENSIVE)
-
-ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3306-notes-prune.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3306-notes-prune/.git/
 expecting success of 3306.1 'setup: create a few commits with notes': 
@@ -115089,8 +115045,8 @@
 submodule 'sub': creating branch 'branch-a'
 submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
 b8ff7e6f6c216c8d0cabea409b96c9ec58d579b2
---- expected	2026-04-19 19:17:14.243659440 +0000
-+++ actual-old-branch-a	2026-04-19 19:17:14.347659440 +0000
+--- expected	2025-03-17 13:19:25.947982078 +0000
++++ actual-old-branch-a	2025-03-17 13:19:26.103983064 +0000
 @@ -1 +1 @@
 -380acb505c68814bf9d5b3c5de08d118c79858c5
 +f91cb19d805aa6bede6ae137f8e426f6453a3ae4
@@ -115416,17 +115372,84 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3301-notes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3301-notes/.git/
-expecting success of 3301.1 'cannot annotate non-existing HEAD': 
-	test_must_fail env MSG=3 git notes add
+*** t3309-notes-merge-auto-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3309-notes-merge-auto-resolve/.git/
+expecting success of 3309.1 'setup commits': 
+	test_commit 1st &&
+	test_commit 2nd &&
+	test_commit 3rd &&
+	test_commit 4th &&
+	test_commit 5th &&
+	test_commit 6th &&
+	test_commit 7th &&
+	test_commit 8th &&
+	test_commit 9th &&
+	test_commit 10th &&
+	test_commit 11th &&
+	test_commit 12th &&
+	test_commit 13th &&
+	test_commit 14th &&
+	test_commit 15th &&
 
-fatal: failed to resolve 'HEAD' as a valid ref.
-ok 1 - cannot annotate non-existing HEAD
+	test_oid_cache <<-EOF
+	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
+	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
+	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
+	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
+	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
+	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
+	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
+	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
+	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
+	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
+	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
+	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
+	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
+	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
+	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
+	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
+	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
+	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
+	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
+	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
+	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
+	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
+	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
 
-expecting success of 3301.2 'setup': 
-	test_commit 1st &&
-	test_commit 2nd
+	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
+	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
+	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
+	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
+	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
+	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
+	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
+	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
+	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
+	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
+	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
+	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
+	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
+	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
+	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
+	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
+	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
+	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
+	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
+	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
+	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
+	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
+	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
+	EOF
 
 [master (root-commit) 04ed9a0] 1st
  Author: A U Thor <author@example.com>
@@ -115436,3680 +115459,906 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 2nd.t
-ok 2 - setup
+[master d07d62e] 3rd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3rd.t
+[master 0f7aa3e] 4th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+[master 2c12533] 6th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6th.t
+[master fb01e0c] 7th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7th.t
+[master 9a4c31c] 8th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8th.t
+[master 2e0db4b] 9th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9th.t
+[master 7c3b87a] 10th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10th.t
+[master a446fff] 11th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11th.t
+[master 65e263d] 12th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12th.t
+[master e871aa6] 13th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13th.t
+[master 07c85d7] 14th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14th.t
+[master 4acf42e] 15th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15th.t
+ok 1 - setup commits
 
-expecting success of 3301.3 'need valid notes ref': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
-	test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
+expecting success of 3309.2 'setup merge base (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on 6th commit" 6th &&
+	git notes add -m "x notes on 7th commit" 7th &&
+	git notes add -m "x notes on 8th commit" 8th &&
+	git notes add -m "x notes on 9th commit" 9th &&
+	git notes add -m "x notes on 10th commit" 10th &&
+	git notes add -m "x notes on 11th commit" 11th &&
+	git notes add -m "x notes on 12th commit" 12th &&
+	git notes add -m "x notes on 13th commit" 13th &&
+	git notes add -m "x notes on 14th commit" 14th &&
+	git notes add -m "x notes on 15th commit" 15th
 
-fatal: refusing to show notes in / (outside of refs/notes/)
-fatal: refusing to show notes in / (outside of refs/notes/)
-ok 3 - need valid notes ref
+ok 2 - setup merge base (x)
 
-expecting success of 3301.4 'refusing to add notes in refs/heads/': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
+expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
+ok 3 - verify state of merge base (x)
 
-fatal: refusing to add notes in refs/heads/bogus (outside of refs/notes/)
-ok 4 - refusing to add notes in refs/heads/
+expecting success of 3309.4 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes add -f -m "y notes on 3rd commit" 3rd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	git notes add -f -m "y notes on 5th commit" 5th &&
+	git notes remove 6th &&
+	git notes remove 7th &&
+	git notes remove 8th &&
+	git notes add -f -m "y notes on 12th commit" 12th &&
+	git notes add -f -m "y notes on 13th commit" 13th &&
+	git notes add -f -m "y notes on 14th commit" 14th &&
+	git notes add -f -m "y notes on 15th commit" 15th
 
-expecting success of 3301.5 'refusing to edit notes in refs/remotes/': 
-	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
+Removing note for object 6th
+Removing note for object 7th
+Removing note for object 8th
+Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
+Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ok 4 - setup local branch (y)
 
-fatal: refusing to edit notes in refs/heads/bogus (outside of refs/notes/)
-ok 5 - refusing to edit notes in refs/remotes/
+expecting success of 3309.5 'verify state of local branch (y)': verify_notes y y
+ok 5 - verify state of local branch (y)
 
-expecting success of 3301.6 'handle empty notes gracefully': 
-	test_expect_code 1 git notes show
+expecting success of 3309.6 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "z notes on 2nd commit" 2nd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	git notes add -f -m "z notes on 5th commit" 5th &&
+	git notes remove 6th &&
+	git notes add -f -m "z notes on 8th commit" 8th &&
+	git notes remove 9th &&
+	git notes add -f -m "z notes on 11th commit" 11th &&
+	git notes remove 12th &&
+	git notes add -f -m "y notes on 14th commit" 14th &&
+	git notes add -f -m "z notes on 15th commit" 15th
 
-error: no note found for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691.
-ok 6 - handle empty notes gracefully
+Removing note for object 6th
+Overwriting existing notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+Removing note for object 9th
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+Removing note for object 12th
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ok 6 - setup remote branch (z)
 
-expecting success of 3301.7 'show non-existent notes entry with %N': 
-	test_write_lines A B >expect &&
-	git show -s --format="A%n%NB" >actual &&
-	test_cmp expect actual
+expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
+ok 7 - verify state of remote branch (z)
 
-ok 7 - show non-existent notes entry with %N
+expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
+	git config core.notesRef refs/notes/y &&
+	test_must_fail git notes merge --strategy=foo z &&
+	# Verify no changes (y)
+	verify_notes y y
 
-expecting success of 3301.8 'create notes': 
-	MSG=b4 git notes add &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b4 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+error: unknown -s/--strategy: foo
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
 
-b4
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
 
-    1st
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 8 - create notes
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
 
-expecting success of 3301.9 'show notes entry with %N': 
-	test_write_lines A b4 B >expect &&
-	git show -s --format="A%n%NB" >actual &&
-	test_cmp expect actual
+Aborting notes merge resolution
+    --abort               abort notes merge
 
-ok 9 - show notes entry with %N
+ok 8 - merge z into y with invalid strategy => Fail/No changes
 
-expecting success of 3301.10 'create reflog entry': 
-	ref=$(git rev-parse --short refs/notes/commits) &&
-	cat <<-EOF >expect &&
-		$ref refs/notes/commits@{0}: notes: Notes added by 'git notes add'
+expecting success of 3309.9 'merge z into y with invalid configuration option => Fail/No changes': 
+	git config core.notesRef refs/notes/y &&
+	cat >expect <<-\EOF &&
+	error: unknown notes merge strategy foo
+	fatal: unable to parse 'notes.mergeStrategy' from command-line config
 	EOF
-	git reflog show refs/notes/commits >actual &&
-	test_cmp expect actual
-
-ok 10 - create reflog entry
-
-expecting success of 3301.11 'edit existing notes': 
-	MSG=b3 git notes edit &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b3 >expect &&
-	git notes show >actual &&
+	test_must_fail git -c notes.mergeStrategy="foo" notes merge z 2>actual &&
 	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+	# Verify no changes (y)
+	verify_notes y y
 
-b3
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+ok 9 - merge z into y with invalid configuration option => Fail/No changes
 
-    1st
+expecting success of 3309.10 'merge z into y with "ours" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=ours z &&
+	verify_notes y ours
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 11 - edit existing notes
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 10 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
 
-expecting success of 3301.12 'show notes from treeish': 
-	echo b3 >expect &&
-	git notes --ref commits^{tree} show >actual &&
-	test_cmp expect actual &&
+expecting success of 3309.11 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-	echo b4 >expect &&
-	git notes --ref commits@{1} show >actual &&
-	test_cmp expect actual
+ok 11 - reset to pre-merge state (y)
 
-ok 12 - show notes from treeish
+expecting success of 3309.12 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="ours" notes merge z &&
+	verify_notes y ours
 
-expecting success of 3301.13 'cannot edit notes from non-ref': 
-	test_must_fail git notes --ref commits^{tree} edit &&
-	test_must_fail git notes --ref commits@{1} edit
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 12 - merge z into y with "ours" configuration option => Non-conflicting 3-way merge
 
-fatal: Cannot use notes ref refs/notes/commits^{tree}
-fatal: Cannot use notes ref refs/notes/commits@{1}
-ok 13 - cannot edit notes from non-ref
+expecting success of 3309.13 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.14 'cannot "git notes add -m" where notes already exists': 
-	test_must_fail git notes add -m "b2" &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b3 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+ok 13 - reset to pre-merge state (y)
 
-error: Cannot add notes. Found existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691. Use '-f' to overwrite existing notes
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="ours" notes merge z &&
+	verify_notes y ours
 
-    1st
+Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 14 - merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 14 - cannot "git notes add -m" where notes already exists
+expecting success of 3309.15 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.15 'can overwrite existing note with "git notes add -f -m"': 
-	git notes add -f -m "b1" &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b1 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+ok 15 - reset to pre-merge state (y)
 
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 3309.16 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=theirs z &&
+	verify_notes y theirs
 
-    1st
+Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 16 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 15 - can overwrite existing note with "git notes add -f -m"
+expecting success of 3309.17 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.16 'add w/no options on existing note morphs into edit': 
-	MSG=b2 git notes add &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b2 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+ok 17 - reset to pre-merge state (y)
 
-b2
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 3309.18 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
+	verify_notes y theirs
 
-    1st
+Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 18 - merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 16 - add w/no options on existing note morphs into edit
+expecting success of 3309.19 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.17 'can overwrite existing note with "git notes add -f"': 
-	MSG=b1 git notes add -f &&
-	test_path_is_missing .git/NOTES_EDITMSG &&
-	git ls-tree -r refs/notes/commits >actual &&
-	test_line_count = 1 actual &&
-	echo b1 >expect &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git show HEAD^ &&
-	test_must_fail git notes show HEAD^
+ok 19 - reset to pre-merge state (y)
 
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-b1
-commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 3309.20 'merge z into y with "union" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=union z &&
+	verify_notes y union
 
-    1st
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 20 - merge z into y with "union" strategy => Non-conflicting 3-way merge
 
-diff --git a/1st.t b/1st.t
-new file mode 100644
-index 0000000..2a5d015
---- /dev/null
-+++ b/1st.t
-@@ -0,0 +1 @@
-+1st
-error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
-ok 17 - can overwrite existing note with "git notes add -f"
+expecting success of 3309.21 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.18 'show notes': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:14:13 2005 -0700
+ok 21 - reset to pre-merge state (y)
 
-		${indent}2nd
+expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
+	verify_notes y union
 
-		Notes:
-		${indent}b1
-	EOF
-	git cat-file commit HEAD >commits &&
-	! grep b1 commits &&
-	git log -1 >actual &&
-	test_cmp expect actual
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 22 - merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge
 
-ok 18 - show notes
+expecting success of 3309.23 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-expecting success of 3301.19 'show multi-line notes': 
-	test_commit 3rd &&
-	MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-multiline <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:15:13 2005 -0700
+ok 23 - reset to pre-merge state (y)
 
-		${indent}3rd
+expecting success of 3309.24 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
+	verify_notes y union
 
-		Notes:
-		${indent}b3
-		${indent}c3c3c3c3
-		${indent}d3d3d3
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 24 - merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge
 
-	EOF
-	cat expect >>expect-multiline &&
-	git log -2 >actual &&
-	test_cmp expect-multiline actual
+expecting success of 3309.25 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-b3
-c3c3c3c3
-d3d3d3
-ok 19 - show multi-line notes
+ok 25 - reset to pre-merge state (y)
 
-expecting success of 3301.20 'show -F notes': 
-	test_commit 4th &&
-	echo "xyzzy" >note5 &&
-	git notes add -F note5 &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-F <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
+expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
+	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
+	git notes merge --abort &&
+	verify_notes y y
 
-		${indent}4th
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+CONFLICT (content): Merge conflict in notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Auto-merging notes for 65e263ded02ae4e8839bc151095113737579dc12
+CONFLICT (delete/modify): Notes for object 65e263ded02ae4e8839bc151095113737579dc12 deleted in refs/notes/z and modified in refs/notes/y. Version from refs/notes/y left in tree.
+Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Auto-merging notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+CONFLICT (delete/modify): Notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+ok 26 - merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge
 
-		Notes:
-		${indent}xyzzy
+expecting success of 3309.27 'merge y into z with "union" strategy => Non-conflicting 3-way merge': 
+	git config core.notesRef refs/notes/z &&
+	git notes merge --strategy=union y &&
+	verify_notes z union2
 
-	EOF
-	cat expect-multiline >>expect-F &&
-	git log -3 >actual &&
-	test_cmp expect-F actual
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
 
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-ok 20 - show -F notes
+expecting success of 3309.28 'reset to pre-merge state (z)': 
+	git update-ref refs/notes/z refs/notes/z^1 &&
+	# Verify pre-merge state
+	verify_notes z z
 
-expecting success of 3301.21 'Re-adding -F notes without -f fails': 
-	echo "zyxxy" >note5 &&
-	test_must_fail git notes add -F note5 &&
-	git log -3 >actual &&
-	test_cmp expect-F actual
+ok 28 - reset to pre-merge state (z)
 
-error: Cannot add notes. Found existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11. Use '-f' to overwrite existing notes
-ok 21 - Re-adding -F notes without -f fails
+expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=cat_sort_uniq y &&
+	verify_notes z cat_sort_uniq
 
-expecting success of 3301.22 'git log --pretty=raw does not show notes': 
-	commit=$(git rev-parse HEAD) &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		tree $tree
-		parent $parent
-		author A U Thor <author@example.com> 1112912173 -0700
-		committer C O Mitter <committer@example.com> 1112912173 -0700
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
 
-		${indent}4th
-	EOF
-	git log -1 --pretty=raw >actual &&
-	test_cmp expect actual
+expecting success of 3309.30 'reset to pre-merge state (z)': 
+	git update-ref refs/notes/z refs/notes/z^1 &&
+	# Verify pre-merge state
+	verify_notes z z
 
-ok 22 - git log --pretty=raw does not show notes
+ok 30 - reset to pre-merge state (z)
 
-expecting success of 3301.23 'git log --show-notes': 
-	cat >>expect <<-EOF &&
+expecting success of 3309.31 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
+	verify_notes z cat_sort_uniq
 
-	Notes:
-	${indent}xyzzy
-	EOF
-	git log -1 --pretty=raw --show-notes >actual &&
-	test_cmp expect actual
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 31 - merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge
 
-ok 23 - git log --show-notes
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3200-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/
+expecting success of 3200.1 'prepare a trivial repository': 
+	echo Hello >A &&
+	git update-index --add A &&
+	git commit -m "Initial commit." &&
+	git branch -M main &&
+	echo World >>A &&
+	git update-index --add A &&
+	git commit -m "Second commit." &&
+	HEAD=$(git rev-parse --verify HEAD)
 
-expecting success of 3301.24 'git log --no-notes': 
-	git log -1 --no-notes >actual &&
-	! grep xyzzy actual
+[main (root-commit) 2daebe9] Initial commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+[main da664a6] Second commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - prepare a trivial repository
 
-ok 24 - git log --no-notes
+expecting success of 3200.2 'git branch --help should not have created a bogus branch': 
+	test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
+	test_ref_missing refs/heads/--help
 
-expecting success of 3301.25 'git format-patch does not show notes': 
-	git format-patch -1 --stdout >actual &&
-	! grep xyzzy actual
+error: reference does not exist
+ok 2 - git branch --help should not have created a bogus branch
 
-ok 25 - git format-patch does not show notes
+expecting success of 3200.3 'branch -h in broken repository': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init -b main &&
+		>.git/refs/heads/main &&
+		test_expect_code 129 git branch -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
 
-expecting success of 3301.26 'git format-patch --show-notes does show notes': 
-	git format-patch --show-notes -1 --stdout >actual &&
-	grep xyzzy actual
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/broken/.git/
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+ok 3 - branch -h in broken repository
 
-    xyzzy
-ok 26 - git format-patch --show-notes does show notes
+expecting success of 3200.4 'git branch abc should create a branch': 
+	git branch abc &&
+	test_ref_exists refs/heads/abc
 
-expecting success of 3301.27 'git show  does show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-    xyzzy
-ok 27 - git show  does show notes
+ok 4 - git branch abc should create a branch
 
-expecting success of 3301.28 'git show --pretty does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 28 - git show --pretty does not show notes
+expecting success of 3200.5 'git branch abc should fail when abc exists': 
+	test_must_fail git branch abc
 
-expecting success of 3301.29 'git show --pretty=raw does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 29 - git show --pretty=raw does not show notes
+fatal: a branch named 'abc' already exists
+ok 5 - git branch abc should fail when abc exists
 
-expecting success of 3301.30 'git show --pretty=short does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 30 - git show --pretty=short does not show notes
+expecting success of 3200.6 'git branch --force abc should fail when abc is checked out': 
+	test_when_finished git switch main &&
+	git switch abc &&
+	test_must_fail git branch --force abc HEAD~1
 
-expecting success of 3301.31 'git show --pretty=medium does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 31 - git show --pretty=medium does not show notes
+Switched to branch 'abc'
+fatal: cannot force update the branch 'abc' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch'
+Switched to branch 'main'
+ok 6 - git branch --force abc should fail when abc is checked out
 
-expecting success of 3301.32 'git show --pretty=full does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 32 - git show --pretty=full does not show notes
+expecting success of 3200.7 'git branch --force abc should succeed when abc exists': 
+	git rev-parse HEAD~1 >expect &&
+	git branch --force abc HEAD~1 &&
+	git rev-parse abc >actual &&
+	test_cmp expect actual
 
-expecting success of 3301.33 'git show --pretty=fuller does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 33 - git show --pretty=fuller does not show notes
+ok 7 - git branch --force abc should succeed when abc exists
 
-expecting success of 3301.34 'git show --pretty=format:%s does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 34 - git show --pretty=format:%s does not show notes
+expecting success of 3200.8 'git branch a/b/c should create a branch': 
+	git branch a/b/c &&
+	test_ref_exists refs/heads/a/b/c
 
-expecting success of 3301.35 'git show --oneline does not show notes': 
-		git show $p >actual &&
-		eval "$negate grep xyzzy actual"
-	
-ok 35 - git show --oneline does not show notes
+ok 8 - git branch a/b/c should create a branch
 
-expecting success of 3301.36 'setup alternate notes ref': 
-	git notes --ref=alternate add -m alternate
+expecting success of 3200.9 'git branch mb main... should create a branch': 
+	git branch mb main... &&
+	test_ref_exists refs/heads/mb
 
-ok 36 - setup alternate notes ref
+ok 9 - git branch mb main... should create a branch
 
-expecting success of 3301.37 'git log --notes shows default notes': 
-	git log -1 --notes >actual &&
-	grep xyzzy actual &&
-	! grep alternate actual
+expecting success of 3200.10 'git branch HEAD should fail': 
+	test_must_fail git branch HEAD
 
-    xyzzy
-ok 37 - git log --notes shows default notes
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config set advice.refSyntax false"
+ok 10 - git branch HEAD should fail
 
-expecting success of 3301.38 'git log --notes=X shows only X': 
-	git log -1 --notes=alternate >actual &&
-	! grep xyzzy actual &&
-	grep alternate actual
+expecting success of 3200.11 'git branch --create-reflog d/e/f should create a branch and a log': 
+	GIT_COMMITTER_DATE="2005-05-26 23:30" \
+	git -c core.logallrefupdates=false branch --create-reflog d/e/f &&
+	test_ref_exists refs/heads/d/e/f &&
+	cat >expect <<-EOF &&
+	$HEAD refs/heads/d/e/f@{0}: branch: Created from main
+	EOF
+	git reflog show --no-abbrev-commit refs/heads/d/e/f >actual &&
+	test_cmp expect actual
 
-Notes (alternate):
-    alternate
-ok 38 - git log --notes=X shows only X
+ok 11 - git branch --create-reflog d/e/f should create a branch and a log
 
-expecting success of 3301.39 'git log --notes --notes=X shows both': 
-	git log -1 --notes --notes=alternate >actual &&
-	grep xyzzy actual &&
-	grep alternate actual
+expecting success of 3200.12 'git branch -d d/e/f should delete a branch and a log': 
+	git branch -d d/e/f &&
+	test_ref_missing refs/heads/d/e/f &&
+	test_must_fail git reflog exists refs/heads/d/e/f
 
-    xyzzy
-Notes (alternate):
-    alternate
-ok 39 - git log --notes --notes=X shows both
+Deleted branch d/e/f (was da664a6).
+error: reference does not exist
+ok 12 - git branch -d d/e/f should delete a branch and a log
 
-expecting success of 3301.40 'git log --no-notes resets default state': 
-	git log -1 --notes --notes=alternate \
-		--no-notes --notes=alternate \
-		>actual &&
-	! grep xyzzy actual &&
-	grep alternate actual
+expecting success of 3200.13 'git branch j/k should work after branch j has been deleted': 
+	git branch j &&
+	git branch -d j &&
+	git branch j/k
 
-Notes (alternate):
-    alternate
-ok 40 - git log --no-notes resets default state
+Deleted branch j (was da664a6).
+ok 13 - git branch j/k should work after branch j has been deleted
 
-expecting success of 3301.41 'git log --no-notes resets ref list': 
-	git log -1 --notes --notes=alternate \
-		--no-notes --notes \
-		>actual &&
-	grep xyzzy actual &&
-	! grep alternate actual
+expecting success of 3200.14 'git branch l should work after branch l/m has been deleted': 
+	git branch l/m &&
+	git branch -d l/m &&
+	git branch l
 
-    xyzzy
-ok 41 - git log --no-notes resets ref list
+Deleted branch l/m (was da664a6).
+ok 14 - git branch l should work after branch l/m has been deleted
 
-expecting success of 3301.42 'show -m notes': 
-	test_commit 5th &&
-	git notes add -m spam -m "foo${LF}bar${LF}baz" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-m <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+expecting success of 3200.15 'git branch -m dumps usage': 
+	test_expect_code 128 git branch -m 2>err &&
+	test_grep "branch name required" err
 
-		${indent}5th
+fatal: branch name required
+ok 15 - git branch -m dumps usage
 
-		Notes:
-		${indent}spam
-		${indent}
-		${indent}foo
-		${indent}bar
-		${indent}baz
+expecting success of 3200.16 'git branch -m m broken_symref should work': 
+	test_when_finished "git branch -D broken_symref" &&
+	git branch --create-reflog m &&
+	git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
+	git branch -m m broken_symref &&
+	git reflog exists refs/heads/broken_symref &&
+	test_must_fail git reflog exists refs/heads/i_am_broken
 
-	EOF
-	cat expect-F >>expect-m &&
-	git log -4 >actual &&
-	test_cmp expect-m actual
+Deleted branch broken_symref (was da664a6).
+ok 16 - git branch -m m broken_symref should work
 
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-ok 42 - show -m notes
+expecting success of 3200.17 'git branch -m m m/m should work': 
+	git branch --create-reflog m &&
+	git branch -m m m/m &&
+	git reflog exists refs/heads/m/m
 
-expecting success of 3301.43 'remove note with add -f -F /dev/null': 
-	git notes add -f -F /dev/null &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-rm-F <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+ok 17 - git branch -m m m/m should work
 
-		${indent}5th
+expecting success of 3200.18 'git branch -m n/n n should work': 
+	git branch --create-reflog n/n &&
+	git branch -m n/n n &&
+	git reflog exists refs/heads/n
 
-	EOF
-	cat expect-F >>expect-rm-F &&
-	git log -4 >actual &&
-	test_cmp expect-rm-F actual &&
-	test_must_fail git notes show
+ok 18 - git branch -m n/n n should work
 
-Overwriting existing notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 43 - remove note with add -f -F /dev/null
+expecting success of 3200.19 'git branch -m bbb should rename checked out branch': 
+	test_when_finished git branch -D bbb &&
+	test_when_finished git checkout main &&
+	git checkout -b aaa &&
+	git commit --allow-empty -m "a new commit" &&
+	git rev-parse aaa@{0} >expect &&
+	git branch -m bbb &&
+	git rev-parse bbb@{1} >actual &&
+	test_cmp expect actual &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/bbb >expect &&
+	test_cmp expect actual
 
-expecting success of 3301.44 'do not create empty note with -m ""': 
-	git notes add -m "" &&
-	git log -4 >actual &&
-	test_cmp expect-rm-F actual &&
-	test_must_fail git notes show
+Switched to a new branch 'aaa'
+[aaa a533b01] a new commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+Deleted branch bbb (was a533b01).
+ok 19 - git branch -m bbb should rename checked out branch
 
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 44 - do not create empty note with -m ""
+expecting success of 3200.20 'renaming checked out branch works with d/f conflict': 
+	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
+	test_when_finished git checkout main &&
+	git checkout -b foo &&
+	git branch -m foo/bar &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/foo/bar >expect &&
+	test_cmp expect actual
 
-expecting success of 3301.45 'create note with combination of -m and -F': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-EOF &&
-		foo
+Switched to a new branch 'foo'
+Switched to branch 'main'
+Deleted branch foo/bar (was da664a6).
+ok 20 - renaming checked out branch works with d/f conflict
 
-		xyzzy
+expecting success of 3200.21 'git branch -m o/o o should fail when o/p exists': 
+	git branch o/o &&
+	git branch o/p &&
+	test_must_fail git branch -m o/o o
 
-		bar
+error: 'refs/heads/o/p' exists; cannot create 'refs/heads/o'
+fatal: branch rename failed
+ok 21 - git branch -m o/o o should fail when o/p exists
 
-		zyxxy
+expecting success of 3200.22 'git branch -m o/q o/p should fail when o/p exists': 
+	git branch o/q &&
+	test_must_fail git branch -m o/q o/p
 
-		baz
-	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+fatal: a branch named 'o/p' already exists
+ok 22 - git branch -m o/q o/p should fail when o/p exists
 
-Removing note for object HEAD
-ok 45 - create note with combination of -m and -F
+expecting success of 3200.23 'git branch -M o/q o/p should work when o/p exists': 
+	git branch -M o/q o/p
 
-expecting success of 3301.46 'create note with combination of -m and -F and --separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-\EOF &&
-	foo
-	-------
-	xyzzy
-	-------
-	bar
-	-------
-	zyxxy
-	-------
-	baz
-	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --separator="-------" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+ok 23 - git branch -M o/q o/p should work when o/p exists
 
-Removing note for object HEAD
-ok 46 - create note with combination of -m and -F and --separator
+expecting success of 3200.24 'git branch -m -f o/q o/p should work when o/p exists': 
+	git branch o/q &&
+	git branch -m -f o/q o/p
 
-expecting success of 3301.47 'create note with combination of -m and -F and --no-separator': 
-	cat >expect-combine_m_and_F <<-\EOF &&
-	foo
-	xyzzy
-	bar
-	zyxxy
-	baz
-	EOF
-	echo "xyzzy" >note_a &&
-	echo "zyxxy" >note_b &&
-	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --no-separator &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
+ok 24 - git branch -m -f o/q o/p should work when o/p exists
 
-ok 47 - create note with combination of -m and -F and --no-separator
+expecting success of 3200.25 'git branch -m q r/q should fail when r exists': 
+	git branch q &&
+	git branch r &&
+	test_must_fail git branch -m q r/q
 
-expecting success of 3301.48 'remove note with "git notes remove"': 
-	git notes remove HEAD^ &&
-	git notes remove &&
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-rm-remove <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
+error: 'refs/heads/r' exists; cannot create 'refs/heads/r/q'
+fatal: branch rename failed
+ok 25 - git branch -m q r/q should fail when r exists
 
-		${indent}5th
+expecting success of 3200.26 'git branch -M foo bar should fail when bar is checked out': 
+	git branch bar &&
+	git checkout -b foo &&
+	test_must_fail git branch -M bar foo
 
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
+Switched to a new branch 'foo'
+fatal: cannot force update the branch 'foo' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch'
+ok 26 - git branch -M foo bar should fail when bar is checked out
 
-		${indent}4th
+expecting success of 3200.27 'git branch -M foo bar should fail when bar is checked out in worktree': 
+	git branch -f bar &&
+	test_when_finished "git worktree remove wt && git branch -D wt" &&
+	git worktree add wt &&
+	test_must_fail git branch -M bar wt
 
-	EOF
-	cat expect-multiline >>expect-rm-remove &&
-	git log -4 >actual &&
-	test_cmp expect-rm-remove actual &&
-	test_must_fail git notes show HEAD^
+Preparing worktree (new branch 'wt')
+HEAD is now at da664a6 Second commit.
+fatal: cannot force update the branch 'wt' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/wt'
+Deleted branch wt (was da664a6).
+ok 27 - git branch -M foo bar should fail when bar is checked out in worktree
 
-Removing note for object HEAD^
-Removing note for object HEAD
-error: no note found for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11.
-ok 48 - remove note with "git notes remove"
+expecting success of 3200.28 'git branch -M baz bam should succeed when baz is checked out': 
+	git checkout -b baz &&
+	git branch bam &&
+	git branch -M baz bam &&
+	test $(git rev-parse --abbrev-ref HEAD) = bam
 
-expecting success of 3301.49 'removing non-existing note should not create new commit': 
-	git rev-parse --verify refs/notes/commits >before_commit &&
-	test_must_fail git notes remove HEAD^ &&
-	git rev-parse --verify refs/notes/commits >after_commit &&
-	test_cmp before_commit after_commit
+Switched to a new branch 'baz'
+ok 28 - git branch -M baz bam should succeed when baz is checked out
 
-Object HEAD^ has no note
-ok 49 - removing non-existing note should not create new commit
+expecting success of 3200.29 'git branch -M baz bam should add entries to HEAD reflog': 
+	git reflog show HEAD >actual &&
+	grep "HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam" actual
 
-expecting success of 3301.50 'removing more than one': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+da664a6 HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam
+ok 29 - git branch -M baz bam should add entries to HEAD reflog
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git notes remove HEAD^^ HEAD^^^ &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+expecting success of 3200.30 'git branch -M should leave orphaned HEAD alone': 
+	git init -b main orphan &&
+	(
+		cd orphan &&
+		test_commit initial &&
+		git checkout --orphan lonely &&
+		git symbolic-ref HEAD >expect &&
+		echo refs/heads/lonely >actual &&
+		test_cmp expect actual &&
+		test_ref_missing refs/head/lonely &&
+		git branch -M main mistress &&
+		git symbolic-ref HEAD >expect &&
+		test_cmp expect actual
+	)
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-ok 50 - removing more than one
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/orphan/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'lonely'
+error: reference does not exist
+ok 30 - git branch -M should leave orphaned HEAD alone
 
-expecting success of 3301.51 'removing is atomic': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+expecting success of 3200.31 'resulting reflog can be shown by log -g': 
+	oid=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	HEAD@{0} $oid Branch: renamed refs/heads/baz to refs/heads/bam
+	HEAD@{2} $oid checkout: moving from foo to baz
+	EOF
+	git log -g --format="%gd %H %gs" -2 HEAD >actual &&
+	test_cmp expect actual
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-Object HEAD^ has no note
-ok 51 - removing is atomic
+ok 31 - resulting reflog can be shown by log -g
 
-expecting success of 3301.52 'removing with --ignore-missing': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+expecting success of 3200.32 'git branch -M baz bam should succeed when baz is checked out as linked working tree': 
+	git checkout main &&
+	git worktree add -b baz bazdir &&
+	git worktree add -f bazdir2 baz &&
+	git branch -M baz bam &&
+	test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
+	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+	rm -r bazdir bazdir2 &&
+	git worktree prune
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git notes remove --ignore-missing HEAD^^ HEAD^^^ HEAD^ &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+Switched to branch 'main'
+Preparing worktree (new branch 'baz')
+HEAD is now at da664a6 Second commit.
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+ok 32 - git branch -M baz bam should succeed when baz is checked out as linked working tree
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-Object HEAD^ has no note
-ok 52 - removing with --ignore-missing
+expecting success of 3200.33 'git branch -M fails if updating any linked working tree fails': 
+	git worktree add -b baz bazdir1 &&
+	git worktree add -f bazdir2 baz &&
+	touch .git/worktrees/bazdir1/HEAD.lock &&
+	test_must_fail git branch -M baz bam &&
+	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
+	git branch -M bam baz &&
+	rm .git/worktrees/bazdir1/HEAD.lock &&
+	touch .git/worktrees/bazdir2/HEAD.lock &&
+	test_must_fail git branch -M baz bam &&
+	test $(git -C bazdir1 rev-parse --abbrev-ref HEAD) = bam &&
+	rm -rf bazdir1 bazdir2 &&
+	git worktree prune
 
-expecting success of 3301.53 'removing with --ignore-missing but bogus ref': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	test_must_fail git notes remove --ignore-missing HEAD^^ HEAD^^^ NO-SUCH-COMMIT &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+Preparing worktree (new branch 'baz')
+HEAD is now at da664a6 Second commit.
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/worktrees/bazdir1/HEAD.lock': File exists.
 
-Removing note for object HEAD^^
-Removing note for object HEAD^^^
-error: Failed to resolve 'NO-SUCH-COMMIT' as a valid ref.
-ok 53 - removing with --ignore-missing but bogus ref
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+error: HEAD of working tree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/bazdir1 is not updated
+fatal: branch renamed to bam, but HEAD is not updated
+error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/worktrees/bazdir2/HEAD.lock': File exists.
 
-expecting success of 3301.54 'remove reads from --stdin': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+error: HEAD of working tree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/bazdir2 is not updated
+fatal: branch renamed to bam, but HEAD is not updated
+ok 33 - git branch -M fails if updating any linked working tree fails
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git rev-parse HEAD^^ HEAD^^^ >input &&
-	git notes remove --stdin <input &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+expecting success of 3200.34 'git branch -M baz bam should succeed within a worktree in which baz is checked out': 
+	git checkout -b baz &&
+	git worktree add -f bazdir baz &&
+	(
+		cd bazdir &&
+		git branch -M baz bam &&
+		echo bam >expect &&
+		git rev-parse --abbrev-ref HEAD >actual &&
+		test_cmp expect actual
+	) &&
+	echo bam >expect &&
+	git rev-parse --abbrev-ref HEAD >actual &&
+	test_cmp expect actual &&
+	rm -r bazdir &&
+	git worktree prune
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-ok 54 - remove reads from --stdin
+Switched to a new branch 'baz'
+Preparing worktree (checking out 'baz')
+HEAD is now at da664a6 Second commit.
+ok 34 - git branch -M baz bam should succeed within a worktree in which baz is checked out
 
-expecting success of 3301.55 'remove --stdin is also atomic': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
-	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
-	test_must_fail git notes remove --stdin <input &&
-	after=$(git rev-parse --verify refs/notes/commits) &&
-	test "$before" = "$after"
+expecting success of 3200.35 'git branch -M main should work when main is checked out': 
+	git checkout main &&
+	git branch -M main
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
-ok 55 - remove --stdin is also atomic
+Switched to branch 'main'
+ok 35 - git branch -M main should work when main is checked out
 
-expecting success of 3301.56 'removing with --stdin --ignore-missing': 
-	before=$(git rev-parse --verify refs/notes/commits) &&
-	test_when_finished "git update-ref refs/notes/commits $before" &&
+expecting success of 3200.36 'git branch -M main main should work when main is checked out': 
+	git checkout main &&
+	git branch -M main main
 
-	# We have only two -- add another and make sure it stays
-	git notes add -m "extra" &&
-	git notes list HEAD >after-removal-expect &&
-	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
-	git notes remove --ignore-missing --stdin <input &&
-	git notes list | sed -e "s/ .*//" >actual &&
-	test_cmp after-removal-expect actual
+Already on 'main'
+ok 36 - git branch -M main main should work when main is checked out
 
-Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
-ok 56 - removing with --stdin --ignore-missing
+expecting success of 3200.37 'git branch -M topic topic should work when main is checked out': 
+	git checkout main &&
+	git branch topic &&
+	git branch -M topic topic
 
-expecting success of 3301.57 'list notes with "git notes list"': 
-	commit_2=$(git rev-parse 2nd) &&
-	commit_3=$(git rev-parse 3rd) &&
-	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
-	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
-	sort -t" " -k2 >expect <<-EOF &&
-		$note_2 $commit_2
-		$note_3 $commit_3
-	EOF
-	git notes list >actual &&
-	test_cmp expect actual
+Already on 'main'
+ok 37 - git branch -M topic topic should work when main is checked out
 
-ok 57 - list notes with "git notes list"
+expecting success of 3200.38 'git branch -M and -C fail on detached HEAD': 
+	git checkout HEAD^{} &&
+	test_when_finished git checkout - &&
+	echo "fatal: cannot rename the current branch while not on any" >expect &&
+	test_must_fail git branch -M must-fail 2>err &&
+	test_cmp expect err &&
+	echo "fatal: cannot copy the current branch while not on any" >expect &&
+	test_must_fail git branch -C must-fail 2>err &&
+	test_cmp expect err
 
-expecting success of 3301.58 'list notes with "git notes"': 
-	git notes >actual &&
-	test_cmp expect actual
+Note: switching to 'HEAD^{}'.
 
-ok 58 - list notes with "git notes"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3301.59 '"git notes" without subcommand does not take arguments': 
-	test_expect_code 129 git notes HEAD^^ 2>err &&
-	grep "^error: unknown subcommand" err
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-error: unknown subcommand: `HEAD^^'
-ok 59 - "git notes" without subcommand does not take arguments
+  git switch -c <new-branch-name>
 
-expecting success of 3301.60 'list specific note with "git notes list <object>"': 
-	git rev-parse refs/notes/commits:$commit_3 >expect &&
-	git notes list HEAD^^ >actual &&
-	test_cmp expect actual
+Or undo this operation with:
 
-ok 60 - list specific note with "git notes list <object>"
+  git switch -
 
-expecting success of 3301.61 'listing non-existing notes fails': 
-	test_must_fail git notes list HEAD >actual &&
-	test_must_be_empty actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 61 - listing non-existing notes fails
+HEAD is now at da664a6 Second commit.
+Switched to branch 'main'
+ok 38 - git branch -M and -C fail on detached HEAD
 
-expecting success of 3301.62 'append: specify a separator with an empty arg': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
+expecting success of 3200.39 'git branch -m should work with orphan branches': 
+	test_when_finished git checkout - &&
+	test_when_finished git worktree remove -f wt &&
+	git worktree add wt --detach &&
+	# rename orphan in another worktreee
+	git -C wt checkout --orphan orphan-foo-wt &&
+	git branch -m orphan-foo-wt orphan-bar-wt &&
+	test orphan-bar-wt=$(git -C orphan-worktree branch --show-current) &&
+	# rename orphan in the current worktree
+	git checkout --orphan orphan-foo &&
+	git branch -m orphan-foo orphan-bar &&
+	test orphan-bar=$(git branch --show-current)
 
-	notes-2
-	EOF
+Preparing worktree (detached HEAD da664a6)
+HEAD is now at da664a6 Second commit.
+Switched to a new branch 'orphan-foo-wt'
+fatal: cannot change to 'orphan-worktree': No such file or directory
+Switched to a new branch 'orphan-foo'
+Note: switching to 'da664a6b0bffeb0904609e9e14e1beeecfe55c4a'.
 
-	git notes add -m "notes-1" &&
-	git notes append --separator="" -m "notes-2" &&
-	git notes show >actual &&
-	test_cmp expect actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Removing note for object HEAD
-ok 62 - append: specify a separator with an empty arg
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3301.63 'append: specify a separator without arg': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
+  git switch -c <new-branch-name>
 
-	notes-2
-	EOF
+Or undo this operation with:
 
-	git notes add -m "notes-1" &&
-	git notes append --separator -m "notes-2" &&
-	git notes show >actual &&
-	test_cmp expect actual
+  git switch -
 
-Removing note for object HEAD
-ok 63 - append: specify a separator without arg
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3301.64 'append: specify as --no-separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	notes-2
-	EOF
+HEAD is now at da664a6 Second commit.
+ok 39 - git branch -m should work with orphan branches
 
-	git notes add -m "notes-1" &&
-	git notes append --no-separator -m "notes-2" &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3200.40 'git branch -d on orphan HEAD (merged)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "rm -rf .git/objects/commit-graph*" &&
+	git commit-graph write --reachable &&
+	git branch --track to-delete main &&
+	git branch -d to-delete
 
-Removing note for object HEAD
-ok 64 - append: specify as --no-separator
+Switched to a new branch 'orphan'
+branch 'to-delete' set up to track 'main'.
+warning: deleting branch 'to-delete' that has been merged to
+         'refs/heads/main', but not yet merged to HEAD
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 40 - git branch -d on orphan HEAD (merged)
 
-expecting success of 3301.65 'append: specify separator with line break': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
-	EOF
+expecting success of 3200.41 'git branch -d on orphan HEAD (merged, graph)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	git branch --track to-delete main &&
+	git branch -d to-delete
 
-	git notes add -m "notes-1" &&
-	git notes append --separator="-------$LF" -m "notes-2" &&
-	git notes show >actual &&
-	test_cmp expect actual
+Switched to a new branch 'orphan'
+branch 'to-delete' set up to track 'main'.
+warning: deleting branch 'to-delete' that has been merged to
+         'refs/heads/main', but not yet merged to HEAD
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 41 - git branch -d on orphan HEAD (merged, graph)
 
-Removing note for object HEAD
-ok 65 - append: specify separator with line break
+expecting success of 3200.42 'git branch -d on orphan HEAD (unmerged)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "git branch -D to-delete" &&
+	git branch to-delete main &&
+	test_must_fail git branch -d to-delete 2>err &&
+	grep "not fully merged" err
 
-expecting success of 3301.66 'append: specify separator without line break': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
-	EOF
+Switched to a new branch 'orphan'
+error: the branch 'to-delete' is not fully merged
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 42 - git branch -d on orphan HEAD (unmerged)
 
-	git notes add -m "notes-1" &&
-	git notes append --separator="-------" -m "notes-2" &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3200.43 'git branch -d on orphan HEAD (unmerged, graph)': 
+	test_when_finished git checkout main &&
+	git checkout --orphan orphan &&
+	test_when_finished "git branch -D to-delete" &&
+	git branch to-delete main &&
+	test_when_finished "rm -rf .git/objects/commit-graph*" &&
+	git commit-graph write --reachable &&
+	test_must_fail git branch -d to-delete 2>err &&
+	grep "not fully merged" err
 
-Removing note for object HEAD
-ok 66 - append: specify separator without line break
+Switched to a new branch 'orphan'
+error: the branch 'to-delete' is not fully merged
+Deleted branch to-delete (was da664a6).
+Switched to branch 'main'
+ok 43 - git branch -d on orphan HEAD (unmerged, graph)
 
-expecting success of 3301.67 'append: specify separator with multiple messages': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect <<-\EOF &&
-	notes-1
-	-------
-	notes-2
-	-------
-	notes-3
-	EOF
-
-	git notes add -m "notes-1" &&
-	git notes append --separator="-------" -m "notes-2" -m "notes-3" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-Removing note for object HEAD
-ok 67 - append: specify separator with multiple messages
-
-expecting success of 3301.68 'append note with combination of -m and -F and --separator': 
-	test_when_finished git notes remove HEAD &&
-	cat >expect-combine_m_and_F <<-\EOF &&
-	m-notes-1
-	-------
-	f-notes-1
-	-------
-	m-notes-2
-	-------
-	f-notes-2
-	-------
-	m-notes-3
-	EOF
-
-	echo "f-notes-1" >note_a &&
-	echo "f-notes-2" >note_b &&
-	git notes append -m "m-notes-1" -F note_a -m "m-notes-2" -F note_b -m "m-notes-3" --separator="-------" &&
-	git notes show >actual &&
-	test_cmp expect-combine_m_and_F actual
-
-Removing note for object HEAD
-ok 68 - append note with combination of -m and -F and --separator
-
-expecting success of 3301.69 'append to existing note with "git notes append"': 
-	cat >expect <<-EOF &&
-		Initial set of notes
-
-		More notes appended with git notes append
-	EOF
-	git notes add -m "Initial set of notes" &&
-	git notes append -m "More notes appended with git notes append" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-ok 69 - append to existing note with "git notes append"
-
-expecting success of 3301.70 '"git notes list" does not expand to "git notes list HEAD"': 
-	commit_5=$(git rev-parse 5th) &&
-	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
-	sort -t" " -k2 >expect_list <<-EOF &&
-		$note_2 $commit_2
-		$note_3 $commit_3
-		$note_5 $commit_5
-	EOF
-	git notes list >actual &&
-	test_cmp expect_list actual
-
-ok 70 - "git notes list" does not expand to "git notes list HEAD"
-
-expecting success of 3301.71 'appending empty string does not change existing note': 
-	git notes append -m "" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-ok 71 - appending empty string does not change existing note
-
-expecting success of 3301.72 'git notes append == add when there is no existing note': 
-	git notes remove HEAD &&
-	test_must_fail git notes list HEAD &&
-	git notes append -m "Initial set of notes${LF}${LF}More notes appended with git notes append" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-Removing note for object HEAD
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 72 - git notes append == add when there is no existing note
-
-expecting success of 3301.73 'appending empty string to non-existing note does not create note': 
-	git notes remove HEAD &&
-	test_must_fail git notes list HEAD &&
-	git notes append -m "" &&
-	test_must_fail git notes list HEAD
-
-Removing note for object HEAD
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
-ok 73 - appending empty string to non-existing note does not create note
-
-expecting success of 3301.74 'create other note on a different notes ref (setup)': 
-	test_commit 6th &&
-	GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-not-other <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
-
-		${indent}6th
-	EOF
-	cp expect-not-other expect-other &&
-	cat >>expect-other <<-EOF
-
-		Notes (other):
-		${indent}other note
-	EOF
-
-[master 2c12533] 6th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6th.t
-ok 74 - create other note on a different notes ref (setup)
-
-expecting success of 3301.75 'Do not show note on other ref by default': 
-	git log -1 >actual &&
-	test_cmp expect-not-other actual
-
-ok 75 - Do not show note on other ref by default
-
-expecting success of 3301.76 'Do show note when ref is given in GIT_NOTES_REF': 
-	GIT_NOTES_REF="refs/notes/other" git log -1 >actual &&
-	test_cmp expect-other actual
-
-ok 76 - Do show note when ref is given in GIT_NOTES_REF
-
-expecting success of 3301.77 'Do show note when ref is given in core.notesRef config': 
-	test_config core.notesRef "refs/notes/other" &&
-	git log -1 >actual &&
-	test_cmp expect-other actual
-
-ok 77 - Do show note when ref is given in core.notesRef config
-
-expecting success of 3301.78 'Do not show note when core.notesRef is overridden': 
-	test_config core.notesRef "refs/notes/other" &&
-	GIT_NOTES_REF="refs/notes/wrong" git log -1 >actual &&
-	test_cmp expect-not-other actual
-
-ok 78 - Do not show note when core.notesRef is overridden
-
-expecting success of 3301.79 'Show all notes when notes.displayRef=refs/notes/*': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-both <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
-
-		${indent}6th
-
-		Notes:
-		${indent}order test
-
-		Notes (other):
-		${indent}other note
-
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
-
-		${indent}5th
-
-		Notes:
-		${indent}replacement for deleted note
-	EOF
-	GIT_NOTES_REF=refs/notes/commits git notes add \
-		-m"replacement for deleted note" HEAD^ &&
-	GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
-	test_unconfig core.notesRef &&
-	test_config notes.displayRef "refs/notes/*" &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
-
-ok 79 - Show all notes when notes.displayRef=refs/notes/*
-
-expecting success of 3301.80 'core.notesRef is implicitly in notes.displayRef': 
-	test_config core.notesRef refs/notes/commits &&
-	test_config notes.displayRef refs/notes/other &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
-
-ok 80 - core.notesRef is implicitly in notes.displayRef
-
-expecting success of 3301.81 'notes.displayRef can be given more than once': 
-	test_unconfig core.notesRef &&
-	test_config notes.displayRef refs/notes/commits &&
-	git config --add notes.displayRef refs/notes/other &&
-	git log -2 >actual &&
-	test_cmp expect-both actual
-
-ok 81 - notes.displayRef can be given more than once
-
-expecting success of 3301.82 'notes.displayRef respects order': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-both-reversed <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
-
-		${indent}6th
-
-		Notes (other):
-		${indent}other note
-
-		Notes:
-		${indent}order test
-	EOF
-	test_config core.notesRef refs/notes/other &&
-	test_config notes.displayRef refs/notes/commits &&
-	git log -1 >actual &&
-	test_cmp expect-both-reversed actual
-
-ok 82 - notes.displayRef respects order
-
-expecting success of 3301.83 'notes.displayRef with no value handled gracefully': 
-	test_must_fail git -c notes.displayRef log -0 --notes &&
-	test_must_fail git -c notes.displayRef diff-tree --notes HEAD
-
-error: missing value for 'notes.displayref'
-fatal: unable to parse 'notes.displayref' from command-line config
-error: missing value for 'notes.displayref'
-fatal: unable to parse 'notes.displayref' from command-line config
-ok 83 - notes.displayRef with no value handled gracefully
-
-expecting success of 3301.84 'GIT_NOTES_DISPLAY_REF works': 
-	GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
-		git log -2 >actual &&
-	test_cmp expect-both actual
-
-ok 84 - GIT_NOTES_DISPLAY_REF works
-
-expecting success of 3301.85 'GIT_NOTES_DISPLAY_REF overrides config': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect-none <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
-
-		${indent}6th
-
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:17:13 2005 -0700
-
-		${indent}5th
-	EOF
-	test_config notes.displayRef "refs/notes/*" &&
-	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 >actual &&
-	test_cmp expect-none actual
-
-ok 85 - GIT_NOTES_DISPLAY_REF overrides config
-
-expecting success of 3301.86 '--show-notes=* adds to GIT_NOTES_DISPLAY_REF': 
-	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 >actual &&
-	test_cmp expect-both actual
-
-ok 86 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF
-
-expecting success of 3301.87 '--no-standard-notes': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect-commits <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:18:13 2005 -0700
-
-		${indent}6th
-
-		Notes:
-		${indent}order test
-	EOF
-	git log --no-standard-notes --show-notes=commits -1 >actual &&
-	test_cmp expect-commits actual
-
-ok 87 - --no-standard-notes
-
-expecting success of 3301.88 '--standard-notes': 
-	test_config notes.displayRef "refs/notes/*" &&
-	git log --no-standard-notes --show-notes=commits \
-		--standard-notes -2 >actual &&
-	test_cmp expect-both actual
-
-ok 88 - --standard-notes
-
-expecting success of 3301.89 '--show-notes=ref accumulates': 
-	git log --show-notes=other --show-notes=commits \
-		 --no-standard-notes -1 >actual &&
-	test_cmp expect-both-reversed actual
-
-ok 89 - --show-notes=ref accumulates
-
-expecting success of 3301.90 'Allow notes on non-commits (trees, blobs, tags)': 
-	test_config core.notesRef refs/notes/other &&
-	echo "Note on a tree" >expect &&
-	git notes add -m "Note on a tree" HEAD: &&
-	git notes show HEAD: >actual &&
-	test_cmp expect actual &&
-	echo "Note on a blob" >expect &&
-	git ls-tree --name-only HEAD >files &&
-	filename=$(head -n1 files) &&
-	git notes add -m "Note on a blob" HEAD:$filename &&
-	git notes show HEAD:$filename >actual &&
-	test_cmp expect actual &&
-	echo "Note on a tag" >expect &&
-	git tag -a -m "This is an annotated tag" foobar HEAD^ &&
-	git notes add -m "Note on a tag" foobar &&
-	git notes show foobar >actual &&
-	test_cmp expect actual
-
-ok 90 - Allow notes on non-commits (trees, blobs, tags)
-
-expecting success of 3301.91 'create note from other note with "git notes add -C"': 
-	test_commit 7th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:19:13 2005 -0700
-
-		${indent}7th
-
-		Notes:
-		${indent}order test
-	EOF
-	note=$(git notes list HEAD^) &&
-	git notes add -C $note &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
-
-[master fb01e0c] 7th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7th.t
-ok 91 - create note from other note with "git notes add -C"
-
-expecting success of 3301.92 'create note from non-existing note with "git notes add -C" fails': 
-	test_commit 8th &&
-	test_must_fail git notes add -C deadbeef &&
-	test_must_fail git notes list HEAD
-
-[master 9a4c31c] 8th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8th.t
-fatal: failed to resolve 'deadbeef' as a valid ref.
-error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
-ok 92 - create note from non-existing note with "git notes add -C" fails
-
-expecting success of 3301.93 'create note from non-blob with "git notes add -C" fails': 
-	commit=$(git rev-parse --verify HEAD) &&
-	tree=$(git rev-parse --verify HEAD:) &&
-	test_must_fail git notes add -C $commit &&
-	test_must_fail git notes add -C $tree &&
-	test_must_fail git notes list HEAD
-
-fatal: cannot read note data from non-blob object '9a4c31c7f722b5d517e92c64e932dd751e1413bf'.
-fatal: cannot read note data from non-blob object '37f6454412e4ed89ae47782f956ed0fb573892f6'.
-error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
-ok 93 - create note from non-blob with "git notes add -C" fails
-
-expecting success of 3301.94 'create note from blob with "git notes add -C" reuses blob id': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:20:13 2005 -0700
-
-		${indent}8th
-
-		Notes:
-		${indent}This is a blob object
-	EOF
-	echo "This is a blob object" | git hash-object -w --stdin >blob &&
-	git notes add -C $(cat blob) &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD >actual &&
-	test_cmp blob actual
-
-ok 94 - create note from blob with "git notes add -C" reuses blob id
-
-expecting success of 3301.95 'create note from blob with "-C", also specify "-m", "-F" and "--separator"': 
-	# 8th will be reuseed in following tests, so rollback when the test is done
-	test_when_finished "git notes remove && git notes add -C $(cat blob)" &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:20:13 2005 -0700
-
-		${indent}8th
-
-		Notes:
-		${indent}This is a blob object
-		${indent}-------
-		${indent}This is created by -m
-		${indent}-------
-		${indent}This is created by -F
-	EOF
-
-	git notes remove &&
-	echo "This is a blob object" | git hash-object -w --stdin >blob &&
-	echo "This is created by -F" >note_a &&
-	git notes add -C $(cat blob) -m "This is created by -m" -F note_a --separator="-------" &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Removing note for object HEAD
-Removing note for object HEAD
-ok 95 - create note from blob with "-C", also specify "-m", "-F" and "--separator"
-
-expecting success of 3301.96 'create note from other note with "git notes add -c"': 
-	test_commit 9th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:21:13 2005 -0700
-
-		${indent}9th
-
-		Notes:
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD^^) &&
-	MSG="yet another note" git notes add -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-[master 2e0db4b] 9th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9th.t
-yet another note
-ok 96 - create note from other note with "git notes add -c"
-
-expecting success of 3301.97 'create note from non-existing note with "git notes add -c" fails': 
-	test_commit 10th &&
-	test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
-	test_must_fail git notes list HEAD
-
-[master 7c3b87a] 10th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10th.t
-fatal: failed to resolve 'deadbeef' as a valid ref.
-error: no note found for object 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406.
-ok 97 - create note from non-existing note with "git notes add -c" fails
-
-expecting success of 3301.98 'append to note from other note with "git notes append -C"': 
-	commit=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:21:13 2005 -0700
-
-		${indent}9th
-
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD^) &&
-	git notes append -C $note HEAD^ &&
-	git log -1 HEAD^ >actual &&
-	test_cmp expect actual
-
-ok 98 - append to note from other note with "git notes append -C"
-
-expecting success of 3301.99 'create note from other note with "git notes append -c"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:22:13 2005 -0700
-
-		${indent}10th
-
-		Notes:
-		${indent}other note
-	EOF
-	note=$(git notes list HEAD^) &&
-	MSG="other note" git notes append -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-other note
-ok 99 - create note from other note with "git notes append -c"
-
-expecting success of 3301.100 'append to note from other note with "git notes append -c"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:22:13 2005 -0700
-
-		${indent}10th
-
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	note=$(git notes list HEAD) &&
-	MSG="yet another note" git notes append -c $note &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-yet another note
-ok 100 - append to note from other note with "git notes append -c"
-
-expecting success of 3301.101 'copy note with "git notes copy"': 
-	commit=$(git rev-parse 4th) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:16:13 2005 -0700
-
-		${indent}4th
-
-		Notes:
-		${indent}This is a blob object
-	EOF
-	git notes copy 8th 4th &&
-	git log 3rd..4th >actual &&
-	test_cmp expect actual &&
-	git notes list 4th >expect &&
-	git notes list 8th >actual &&
-	test_cmp expect actual
-
-ok 101 - copy note with "git notes copy"
-
-expecting success of 3301.102 'copy note with "git notes copy" with default': 
-	test_commit 11th &&
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
-
-		${indent}11th
-
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	git notes copy HEAD^ &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
-
-[master a446fff] 11th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11th.t
-ok 102 - copy note with "git notes copy" with default
-
-expecting success of 3301.103 'prevent overwrite with "git notes copy"': 
-	test_must_fail git notes copy HEAD~2 HEAD &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
-
-		${indent}11th
-
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD^ >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
-
-error: Cannot copy notes. Found existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5. Use '-f' to overwrite existing notes
-ok 103 - prevent overwrite with "git notes copy"
-
-expecting success of 3301.104 'allow overwrite with "git notes copy -f"': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
-
-		${indent}11th
-
-		Notes:
-		${indent}This is a blob object
-	EOF
-	git notes copy -f HEAD~3 HEAD &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~3 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-ok 104 - allow overwrite with "git notes copy -f"
-
-expecting success of 3301.105 'allow overwrite with "git notes copy -f" with default': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:23:13 2005 -0700
-
-		${indent}11th
-
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-	EOF
-	git notes copy -f HEAD~2 &&
-	git log -1 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~2 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-ok 105 - allow overwrite with "git notes copy -f" with default
-
-expecting success of 3301.106 'cannot copy note from object without notes': 
-	test_commit 12th &&
-	test_commit 13th &&
-	test_must_fail git notes copy HEAD^ HEAD
-
-[master 65e263d] 12th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12th.t
-[master e871aa6] 13th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13th.t
-error: missing notes on source object 65e263ded02ae4e8839bc151095113737579dc12. Cannot copy.
-ok 106 - cannot copy note from object without notes
-
-expecting success of 3301.107 'git notes copy --stdin': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:25:13 2005 -0700
-
-		${indent}13th
-
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:24:13 2005 -0700
-
-		${indent}12th
-
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --stdin <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~2 >expect &&
-	git notes list HEAD >actual &&
-	test_cmp expect actual &&
-	git notes list HEAD~3 >expect &&
-	git notes list HEAD^ >actual &&
-	test_cmp expect actual
-
-ok 107 - git notes copy --stdin
-
-expecting success of 3301.108 'git notes copy --for-rewrite (unconfigured)': 
-	test_commit 14th &&
-	test_commit 15th &&
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:26:13 2005 -0700
-
-		${indent}14th
-	EOF
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
-
-[master 07c85d7] 14th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14th.t
-[master 4acf42e] 15th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15th.t
-ok 108 - git notes copy --for-rewrite (unconfigured)
-
-expecting success of 3301.109 'git notes copy --for-rewrite (enabled)': 
-	commit=$(git rev-parse HEAD) &&
-	parent=$(git rev-parse HEAD^) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}yet another note
-		${indent}
-		${indent}yet another note
-
-		commit $parent
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:26:13 2005 -0700
-
-		${indent}14th
-
-		Notes:
-		${indent}other note
-		${indent}
-		${indent}yet another note
-	EOF
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD^) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD~2) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
-
-ok 109 - git notes copy --for-rewrite (enabled)
-
-expecting success of 3301.110 'git notes copy --for-rewrite (disabled)': 
-	test_config notes.rewrite.bar false &&
-	from=$(git rev-parse HEAD~3) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=bar <copy &&
-	git log -2 >actual &&
-	test_cmp expect actual
-
-ok 110 - git notes copy --for-rewrite (disabled)
-
-expecting success of 3301.111 'git notes copy --for-rewrite (overwrite)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}a fresh note
-	EOF
-	git notes add -f -m"a fresh note" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 111 - git notes copy --for-rewrite (overwrite)
-
-expecting success of 3301.112 'git notes copy --for-rewrite (ignore)': 
-	test_config notes.rewriteMode ignore &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-ok 112 - git notes copy --for-rewrite (ignore)
-
-expecting success of 3301.113 'git notes copy --for-rewrite (append)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}a fresh note
-		${indent}
-		${indent}another fresh note
-	EOF
-	git notes add -f -m"another fresh note" HEAD^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 113 - git notes copy --for-rewrite (append)
-
-expecting success of 3301.114 'git notes copy --for-rewrite (append two to one)': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}a fresh note
-		${indent}
-		${indent}another fresh note
-		${indent}
-		${indent}append 1
-		${indent}
-		${indent}append 2
-	EOF
-	git notes add -f -m"append 1" HEAD^ &&
-	git notes add -f -m"append 2" HEAD^^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	from=$(git rev-parse HEAD^^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >>copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
-ok 114 - git notes copy --for-rewrite (append two to one)
-
-expecting success of 3301.115 'git notes copy --for-rewrite (append empty)': 
-	git notes remove HEAD^ &&
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Removing note for object HEAD^
-ok 115 - git notes copy --for-rewrite (append empty)
-
-expecting success of 3301.116 'GIT_NOTES_REWRITE_MODE works': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}replacement note 1
-	EOF
-	test_config notes.rewriteMode concatenate &&
-	test_config notes.rewriteRef "refs/notes/*" &&
-	git notes add -f -m"replacement note 1" HEAD^ &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-ok 116 - GIT_NOTES_REWRITE_MODE works
-
-expecting success of 3301.117 'GIT_NOTES_REWRITE_REF works': 
-	commit=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-		commit $commit
-		Author: A U Thor <author@example.com>
-		Date:   Thu Apr 7 15:27:13 2005 -0700
-
-		${indent}15th
-
-		Notes:
-		${indent}replacement note 2
-	EOF
-	git notes add -f -m"replacement note 2" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_unconfig notes.rewriteRef &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
-		git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-ok 117 - GIT_NOTES_REWRITE_REF works
-
-expecting success of 3301.118 'GIT_NOTES_REWRITE_REF overrides config': 
-	git notes add -f -m"replacement note 3" HEAD^ &&
-	test_config notes.rewriteMode overwrite &&
-	test_config notes.rewriteRef refs/notes/other &&
-	from=$(git rev-parse HEAD^) &&
-	to=$(git rev-parse HEAD) &&
-	echo "$from" "$to" >copy &&
-	GIT_NOTES_REWRITE_REF=refs/notes/commits \
-		git notes copy --for-rewrite=foo <copy &&
-	git log -1 >actual &&
-	grep "replacement note 3" actual
-
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-    replacement note 3
-ok 118 - GIT_NOTES_REWRITE_REF overrides config
-
-expecting success of 3301.119 'git notes copy diagnoses too many or too few arguments': 
-	test_must_fail git notes copy 2>error &&
-	test_grep "too few arguments" error &&
-	test_must_fail git notes copy one two three 2>error &&
-	test_grep "too many arguments" error
-
-error: too few arguments
-error: too many arguments
-ok 119 - git notes copy diagnoses too many or too few arguments
-
-expecting success of 3301.120 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main': 
-	test_unconfig core.notesRef &&
-	sane_unset GIT_NOTES_REF &&
-	echo refs/notes/refs/heads/main >expect &&
-	git notes --ref=refs/heads/main get-ref >actual &&
-	test_cmp expect actual
-
-ok 120 - git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main
-
-expecting success of 3301.121 'git notes get-ref (no overrides)': 
-	test_unconfig core.notesRef &&
-	sane_unset GIT_NOTES_REF &&
-	echo refs/notes/commits >expect &&
-	git notes get-ref >actual &&
-	test_cmp expect actual
-
-ok 121 - git notes get-ref (no overrides)
-
-expecting success of 3301.122 'git notes get-ref (core.notesRef)': 
-	test_config core.notesRef refs/notes/foo &&
-	echo refs/notes/foo >expect &&
-	git notes get-ref >actual &&
-	test_cmp expect actual
-
-ok 122 - git notes get-ref (core.notesRef)
-
-expecting success of 3301.123 'git notes get-ref (GIT_NOTES_REF)': 
-	echo refs/notes/bar >expect &&
-	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
-	test_cmp expect actual
-
-ok 123 - git notes get-ref (GIT_NOTES_REF)
-
-expecting success of 3301.124 'git notes get-ref (--ref)': 
-	echo refs/notes/baz >expect &&
-	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
-	test_cmp expect actual
-
-ok 124 - git notes get-ref (--ref)
-
-expecting success of 3301.125 'setup testing of empty notes': 
-	test_unconfig core.notesRef &&
-	test_commit 16th &&
-	empty_blob=$(git hash-object -w /dev/null) &&
-	echo "$empty_blob" >expect_empty
-
-[master 21d0abc] 16th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16th.t
-ok 125 - setup testing of empty notes
-
-expecting success of 3301.126 ''git notes add' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add &&
-		test_must_fail git notes list HEAD
-	
-Object HEAD has no note
-
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 126 - 'git notes add' removes empty note
-
-expecting success of 3301.127 ''git notes add --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-
-ok 127 - 'git notes add --allow-empty' stores empty note
-
-expecting success of 3301.128 ''git notes add -F /dev/null' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -F /dev/null &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 128 - 'git notes add -F /dev/null' removes empty note
-
-expecting success of 3301.129 ''git notes add -F /dev/null --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -F /dev/null --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 129 - 'git notes add -F /dev/null --allow-empty' stores empty note
-
-expecting success of 3301.130 ''git notes add -m ""' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -m "" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 130 - 'git notes add -m ""' removes empty note
-
-expecting success of 3301.131 ''git notes add -m "" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -m "" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 131 - 'git notes add -m "" --allow-empty' stores empty note
-
-expecting success of 3301.132 ''git notes add -c "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -c "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 132 - 'git notes add -c "$empty_blob"' removes empty note
-
-expecting success of 3301.133 ''git notes add -c "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -c "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-
-ok 133 - 'git notes add -c "$empty_blob" --allow-empty' stores empty note
-
-expecting success of 3301.134 ''git notes add -C "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -C "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 134 - 'git notes add -C "$empty_blob"' removes empty note
-
-expecting success of 3301.135 ''git notes add -C "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes add -C "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 135 - 'git notes add -C "$empty_blob" --allow-empty' stores empty note
-
-expecting success of 3301.136 ''git notes append' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 136 - 'git notes append' removes empty note
-
-expecting success of 3301.137 ''git notes append --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-
-ok 137 - 'git notes append --allow-empty' stores empty note
-
-expecting success of 3301.138 ''git notes append -F /dev/null' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -F /dev/null &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 138 - 'git notes append -F /dev/null' removes empty note
-
-expecting success of 3301.139 ''git notes append -F /dev/null --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -F /dev/null --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 139 - 'git notes append -F /dev/null --allow-empty' stores empty note
-
-expecting success of 3301.140 ''git notes append -m ""' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -m "" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 140 - 'git notes append -m ""' removes empty note
-
-expecting success of 3301.141 ''git notes append -m "" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -m "" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 141 - 'git notes append -m "" --allow-empty' stores empty note
-
-expecting success of 3301.142 ''git notes append -c "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -c "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 142 - 'git notes append -c "$empty_blob"' removes empty note
-
-expecting success of 3301.143 ''git notes append -c "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -c "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-
-ok 143 - 'git notes append -c "$empty_blob" --allow-empty' stores empty note
-
-expecting success of 3301.144 ''git notes append -C "$empty_blob"' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -C "$empty_blob" &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 144 - 'git notes append -C "$empty_blob"' removes empty note
-
-expecting success of 3301.145 ''git notes append -C "$empty_blob" --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes append -C "$empty_blob" --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-ok 145 - 'git notes append -C "$empty_blob" --allow-empty' stores empty note
-
-expecting success of 3301.146 ''git notes edit' removes empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes edit &&
-		test_must_fail git notes list HEAD
-	
-Removing note for object HEAD
-
-Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
-error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
-ok 146 - 'git notes edit' removes empty note
-
-expecting success of 3301.147 ''git notes edit --allow-empty' stores empty note': 
-		test_might_fail git notes remove HEAD &&
-		MSG= git notes edit --allow-empty &&
-		git notes list HEAD >actual &&
-		test_cmp expect_empty actual
-	
-Object HEAD has no note
-
-ok 147 - 'git notes edit --allow-empty' stores empty note
-
-expecting success of 3301.148 'empty notes are displayed by git log': 
-	test_commit 17th &&
-	git log -1 >expect &&
-	cat >>expect <<-EOF &&
-
-		Notes:
-	EOF
-	git notes add -C "$empty_blob" --allow-empty &&
-	git log -1 >actual &&
-	test_cmp expect actual
-
-[master 27a79f3] 17th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 17th.t
-ok 148 - empty notes are displayed by git log
-
-expecting success of 3301.149 'empty notes do not invoke the editor': 
-	test_commit 18th &&
-	GIT_EDITOR="false" git notes add -C "$empty_blob" --allow-empty &&
-	git notes remove HEAD &&
-	GIT_EDITOR="false" git notes add -m "" --allow-empty &&
-	git notes remove HEAD &&
-	GIT_EDITOR="false" git notes add -F /dev/null --allow-empty &&
-	git notes remove HEAD
-
-[master 86b01a9] 18th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 18th.t
-Removing note for object HEAD
-Removing note for object HEAD
-Removing note for object HEAD
-ok 149 - empty notes do not invoke the editor
-
-expecting success of 3301.150 'git notes add with -m/-F invokes editor with -e': 
-	test_commit 19th &&
-	echo "edited" >expect &&
-	MSG="$(cat expect)" git notes add -m "initial" -e &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove HEAD &&
-
-	# Add a note using -F and edit it
-	echo "initial" >note_file &&
-	MSG="$(cat expect)" git notes add -F note_file -e &&
-	git notes show >actual &&
-	test_cmp expect actual
-
-[master d853ef2] 19th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 19th.t
-edited
-Removing note for object HEAD
-edited
-ok 150 - git notes add with -m/-F invokes editor with -e
-
-expecting success of 3301.151 'git notes append with -m/-F invokes the editor with -e': 
-	test_commit 20th &&
-	cat >expect <<-EOF &&
-		initial
-
-		edited
-	EOF
-	git notes add -m "initial" &&
-	MSG="edited" git notes append -m "appended" -e &&
-
-	# Verify the note content was appended and edited
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove HEAD &&
-
-	# Append a note using -F and edit it
-	echo "note from file" >note_file &&
-	git notes add -m "initial" &&
-	MSG="edited" git notes append -F note_file -e &&
-
-	# Verify notes from file has been edited in editor and appended
-	git notes show >actual &&
-	test_cmp expect actual
-
-[master 347e627] 20th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 20th.t
-edited
-Removing note for object HEAD
-edited
-ok 151 - git notes append with -m/-F invokes the editor with -e
-
-expecting success of 3301.152 'git notes with a combination of -m, -F and -e invokes editor': 
-	test_commit 21st &&
-	echo "foo-file-1" >note_1 &&
-	echo "foo-file-2" >note_2 &&
-	echo "edited" >expect &&
-
-	MSG=$(cat expect) git notes append -F note_1 -m "message-1" -F note_2 -e &&
-
-	# Verify that combined messages from file and -m have been edited
-	git notes show >actual &&
-	test_cmp expect actual
-
-[master 7917321] 21st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 21st.t
-edited
-ok 152 - git notes with a combination of -m, -F and -e invokes editor
-
-expecting success of 3301.153 'git notes append aborts when editor fails with -e': 
-	test_commit 22nd &&
-	echo "foo-file-1" >note_1 &&
-
-	# Try to append a note with -F and -e, but make the editor fail
-	test_env GIT_EDITOR="false" test_must_fail git notes append -F note_1 -e &&
-
-	# Verify that no note was added due to editor failure
-	test_must_fail git notes show
-
-[master 34adeb3] 22nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 22nd.t
-error: there was a problem with the editor 'false'
-fatal: please supply the note contents using either -m or -F option
-error: no note found for object 34adeb3f542c4316ca46ba3bfb3855cdbb83cb64.
-ok 153 - git notes append aborts when editor fails with -e
-
-# passed all 153 test(s)
-1..153
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3309-notes-merge-auto-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3309-notes-merge-auto-resolve/.git/
-expecting success of 3309.1 'setup commits': 
-	test_commit 1st &&
-	test_commit 2nd &&
-	test_commit 3rd &&
-	test_commit 4th &&
-	test_commit 5th &&
-	test_commit 6th &&
-	test_commit 7th &&
-	test_commit 8th &&
-	test_commit 9th &&
-	test_commit 10th &&
-	test_commit 11th &&
-	test_commit 12th &&
-	test_commit 13th &&
-	test_commit 14th &&
-	test_commit 15th &&
-
-	test_oid_cache <<-EOF
-	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
-	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
-	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
-	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
-	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
-	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
-	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
-	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
-	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
-	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
-	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
-	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
-	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
-	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
-	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
-	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
-	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
-	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
-	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
-	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
-	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
-	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
-	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
-	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
-	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
-	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
-	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
-	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
-
-	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
-	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
-	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
-	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
-	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
-	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
-	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
-	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
-	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
-	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
-	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
-	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
-	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
-	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
-	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
-	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
-	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
-	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
-	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
-	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
-	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
-	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
-	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
-	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
-	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
-	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
-	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
-	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
-	EOF
-
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-[master 2c12533] 6th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6th.t
-[master fb01e0c] 7th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7th.t
-[master 9a4c31c] 8th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8th.t
-[master 2e0db4b] 9th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9th.t
-[master 7c3b87a] 10th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10th.t
-[master a446fff] 11th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11th.t
-[master 65e263d] 12th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12th.t
-[master e871aa6] 13th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13th.t
-[master 07c85d7] 14th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14th.t
-[master 4acf42e] 15th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15th.t
-ok 1 - setup commits
-
-expecting success of 3309.2 'setup merge base (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on 6th commit" 6th &&
-	git notes add -m "x notes on 7th commit" 7th &&
-	git notes add -m "x notes on 8th commit" 8th &&
-	git notes add -m "x notes on 9th commit" 9th &&
-	git notes add -m "x notes on 10th commit" 10th &&
-	git notes add -m "x notes on 11th commit" 11th &&
-	git notes add -m "x notes on 12th commit" 12th &&
-	git notes add -m "x notes on 13th commit" 13th &&
-	git notes add -m "x notes on 14th commit" 14th &&
-	git notes add -m "x notes on 15th commit" 15th
-
-ok 2 - setup merge base (x)
-
-expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
-ok 3 - verify state of merge base (x)
-
-expecting success of 3309.4 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes add -f -m "y notes on 3rd commit" 3rd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "y notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes remove 7th &&
-	git notes remove 8th &&
-	git notes add -f -m "y notes on 12th commit" 12th &&
-	git notes add -f -m "y notes on 13th commit" 13th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "y notes on 15th commit" 15th
-
-Removing note for object 6th
-Removing note for object 7th
-Removing note for object 8th
-Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
-Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 4 - setup local branch (y)
-
-expecting success of 3309.5 'verify state of local branch (y)': verify_notes y y
-ok 5 - verify state of local branch (y)
-
-expecting success of 3309.6 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "z notes on 2nd commit" 2nd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "z notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes add -f -m "z notes on 8th commit" 8th &&
-	git notes remove 9th &&
-	git notes add -f -m "z notes on 11th commit" 11th &&
-	git notes remove 12th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "z notes on 15th commit" 15th
-
-Removing note for object 6th
-Overwriting existing notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-Removing note for object 9th
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-Removing note for object 12th
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 6 - setup remote branch (z)
-
-expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
-ok 7 - verify state of remote branch (z)
-
-expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge --strategy=foo z &&
-	# Verify no changes (y)
-	verify_notes y y
-
-error: unknown -s/--strategy: foo
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
-
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
-
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
-
-Aborting notes merge resolution
-    --abort               abort notes merge
-
-ok 8 - merge z into y with invalid strategy => Fail/No changes
-
-expecting success of 3309.9 'merge z into y with invalid configuration option => Fail/No changes': 
-	git config core.notesRef refs/notes/y &&
-	cat >expect <<-\EOF &&
-	error: unknown notes merge strategy foo
-	fatal: unable to parse 'notes.mergeStrategy' from command-line config
-	EOF
-	test_must_fail git -c notes.mergeStrategy="foo" notes merge z 2>actual &&
-	test_cmp expect actual &&
-	# Verify no changes (y)
-	verify_notes y y
-
-ok 9 - merge z into y with invalid configuration option => Fail/No changes
-
-expecting success of 3309.10 'merge z into y with "ours" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=ours z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 10 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.11 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 11 - reset to pre-merge state (y)
-
-expecting success of 3309.12 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 12 - merge z into y with "ours" configuration option => Non-conflicting 3-way merge
-
-expecting success of 3309.13 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 13 - reset to pre-merge state (y)
-
-expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 14 - merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge
-
-expecting success of 3309.15 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 15 - reset to pre-merge state (y)
-
-expecting success of 3309.16 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=theirs z &&
-	verify_notes y theirs
-
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 16 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.17 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 17 - reset to pre-merge state (y)
-
-expecting success of 3309.18 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
-	verify_notes y theirs
-
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 18 - merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge
-
-expecting success of 3309.19 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 19 - reset to pre-merge state (y)
-
-expecting success of 3309.20 'merge z into y with "union" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=union z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 20 - merge z into y with "union" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.21 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 21 - reset to pre-merge state (y)
-
-expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 22 - merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge
-
-expecting success of 3309.23 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 23 - reset to pre-merge state (y)
-
-expecting success of 3309.24 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 24 - merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge
-
-expecting success of 3309.25 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 25 - reset to pre-merge state (y)
-
-expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
-	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
-	git notes merge --abort &&
-	verify_notes y y
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-CONFLICT (content): Merge conflict in notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Auto-merging notes for 65e263ded02ae4e8839bc151095113737579dc12
-CONFLICT (delete/modify): Notes for object 65e263ded02ae4e8839bc151095113737579dc12 deleted in refs/notes/z and modified in refs/notes/y. Version from refs/notes/y left in tree.
-Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Auto-merging notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-CONFLICT (delete/modify): Notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 26 - merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge
-
-expecting success of 3309.27 'merge y into z with "union" strategy => Non-conflicting 3-way merge': 
-	git config core.notesRef refs/notes/z &&
-	git notes merge --strategy=union y &&
-	verify_notes z union2
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.28 'reset to pre-merge state (z)': 
-	git update-ref refs/notes/z refs/notes/z^1 &&
-	# Verify pre-merge state
-	verify_notes z z
-
-ok 28 - reset to pre-merge state (z)
-
-expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=cat_sort_uniq y &&
-	verify_notes z cat_sort_uniq
-
-Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.30 'reset to pre-merge state (z)': 
-	git update-ref refs/notes/z refs/notes/z^1 &&
-	# Verify pre-merge state
-	verify_notes z z
-
-ok 30 - reset to pre-merge state (z)
-
-expecting success of 3309.31 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
-	verify_notes z cat_sort_uniq
-
-Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 31 - merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3310-notes-merge-manual-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3310-notes-merge-manual-resolve/.git/
-expecting success of 3310.1 'setup commits': 
-	test_commit 1st &&
-	test_commit 2nd &&
-	test_commit 3rd &&
-	test_commit 4th &&
-	test_commit 5th &&
-
-	test_oid_cache <<-EOF
-	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
-	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
-	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
-	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
-	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
-	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
-	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
-	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
-	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
-	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
-	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
-	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
-	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
-	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
-
-	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
-	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
-	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
-	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
-	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
-	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
-	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
-	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
-	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
-	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
-	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
-	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
-	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
-	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
-	EOF
-
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-[master 7a4ca6e] 2nd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2nd.t
-[master d07d62e] 3rd
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3rd.t
-[master 0f7aa3e] 4th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4th.t
-[master 7f9ad88] 5th
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5th.t
-ok 1 - setup commits
-
-expecting success of 3310.2 'setup merge base (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on 2nd commit" 2nd &&
-	git notes add -m "x notes on 3rd commit" 3rd &&
-	git notes add -m "x notes on 4th commit" 4th &&
-	verify_notes x
-
-ok 2 - setup merge base (x)
-
-expecting success of 3310.3 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes add -f -m "y notes on 1st commit" 1st &&
-	git notes remove 2nd &&
-	git notes add -f -m "y notes on 3rd commit" 3rd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	verify_notes y
-
-Removing note for object 2nd
-Overwriting existing notes for object d07d62e5208f22eb5695e7eb47667dc8b9860290
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 3 - setup local branch (y)
-
-expecting success of 3310.4 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "z notes on 1st commit" 1st &&
-	git notes add -f -m "z notes on 2nd commit" 2nd &&
-	git notes remove 3rd &&
-	git notes add -f -m "z notes on 4th commit" 4th &&
-	verify_notes z
-
-Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
-Removing note for object 3rd
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 4 - setup remote branch (z)
-
-expecting success of 3310.5 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	git config core.notesRef refs/notes/m &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
-
-expecting success of 3310.6 'change notes in z': 
-	git notes --ref z append -m "More z notes on 4th commit" 4th &&
-	verify_notes z
-
-ok 6 - change notes in z
-
-expecting success of 3310.7 'cannot do merge w/conflicts when previous merge is unfinished': 
-	test -d .git/NOTES_MERGE_WORKTREE &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should indicate what is wrong
-	test_grep -q "\\.git/NOTES_MERGE_\\* exists" output
-
-ok 7 - cannot do merge w/conflicts when previous merge is unfinished
-
-expecting success of 3310.8 'setup unrelated notes ref (w)': 
-	git config core.notesRef refs/notes/w &&
-	git notes add -m "w notes on 1st commit" 1st &&
-	git notes add -m "x notes on 2nd commit" 2nd &&
-	verify_notes w
-
-ok 8 - setup unrelated notes ref (w)
-
-expecting success of 3310.9 'can do merge without conflicts even if previous merge is unfinished (x => w)': 
-	test -d .git/NOTES_MERGE_WORKTREE &&
-	git notes merge x &&
-	verify_notes w &&
-	# Verify that other notes refs has not changed (x and y)
-	verify_notes x &&
-	verify_notes y
-
-ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w)
-
-expecting success of 3310.10 'do not allow mixing --commit and --abort': 
-	test_must_fail git notes merge --commit --abort
-
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
-
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
-
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
-
-Aborting notes merge resolution
-    --abort               abort notes merge
-
-ok 10 - do not allow mixing --commit and --abort
-
-expecting success of 3310.11 'do not allow mixing --commit and --strategy': 
-	test_must_fail git notes merge --commit --strategy theirs
-
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
-
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
-
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
-
-Aborting notes merge resolution
-    --abort               abort notes merge
-
-ok 11 - do not allow mixing --commit and --strategy
-
-expecting success of 3310.12 'do not allow mixing --abort and --strategy': 
-	test_must_fail git notes merge --abort --strategy theirs
-
-error: cannot mix --commit, --abort or -s/--strategy
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
-
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
-
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
-
-Aborting notes merge resolution
-    --abort               abort notes merge
-
-ok 12 - do not allow mixing --abort and --strategy
-
-expecting success of 3310.13 'finalize conflicting merge (z => m)': 
-	# Resolve conflicts and finalize merge
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
-y and z notes on 4th commit
-EOF
-	git notes merge --commit &&
-	notes_merge_files_gone &&
-	# Merge commit has pre-merge y and pre-merge z as parents
-	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
-	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
-	# Merge commit mentions the notes refs merged
-	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
-	grep -q refs/notes/m merge_commit_msg &&
-	grep -q refs/notes/z merge_commit_msg &&
-	# Merge commit mentions conflicting notes
-	grep -q "Conflicts" merge_commit_msg &&
-	( for sha1 in $(cat expect_conflicts); do
-		grep -q "$sha1" merge_commit_msg ||
-		exit 1
-	done ) &&
-	# Verify contents of merge result
-	verify_notes m &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
-
-ok 13 - finalize conflicting merge (z => m)
-
-expecting success of 3310.14 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	git config core.notesRef refs/notes/m &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 14 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
-
-expecting success of 3310.15 'abort notes merge': 
-	git notes merge --abort &&
-	notes_merge_files_gone &&
-	# m has not moved (still == y)
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
-
-ok 15 - abort notes merge
-
-expecting success of 3310.16 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 16 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
-
-expecting success of 3310.17 'add + remove notes in finalized merge (z => m)': 
-	# Resolve one conflict
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	# Remove another conflict
-	rm .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
-	# Remove a D/F conflict
-	rm .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
-	# Add a new note
-	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
-	# Finalize merge
-	git notes merge --commit &&
-	notes_merge_files_gone &&
-	# Merge commit has pre-merge y and pre-merge z as parents
-	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
-	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
-	# Merge commit mentions the notes refs merged
-	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
-	grep -q refs/notes/m merge_commit_msg &&
-	grep -q refs/notes/z merge_commit_msg &&
-	# Merge commit mentions conflicting notes
-	grep -q "Conflicts" merge_commit_msg &&
-	( for sha1 in $(cat expect_conflicts); do
-		grep -q "$sha1" merge_commit_msg ||
-		exit 1
-	done ) &&
-	# Verify contents of merge result
-	verify_notes m &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
-
-ok 17 - add + remove notes in finalized merge (z => m)
-
-expecting success of 3310.18 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
-	git update-ref refs/notes/m refs/notes/y &&
-	test_must_fail git notes merge z >output 2>&1 &&
-	# Output should point to where to resolve conflicts
-	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
-	# Inspect merge conflicts
-	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
-	test_cmp expect_conflicts output_conflicts &&
-	( for f in $(cat expect_conflicts); do
-		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
-		exit 1
-	done ) &&
-	# Verify that current notes tree (pre-merge) has not changed (m == y)
-	verify_notes y &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-ok 18 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
-
-expecting success of 3310.19 'reset notes ref m to somewhere else (w)': 
-	git update-ref refs/notes/m refs/notes/w &&
-	verify_notes m &&
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
-
-ok 19 - reset notes ref m to somewhere else (w)
-
-expecting success of 3310.20 'fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)': 
-	# Resolve conflicts
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
-y and z notes on 1st commit
-EOF
-	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
-y and z notes on 4th commit
-EOF
-	# Fail to finalize merge
-	test_must_fail git notes merge --commit >output 2>&1 &&
-	# NOTES_MERGE_* refs and .git/NOTES_MERGE_* state files must remain
-	git rev-parse --verify NOTES_MERGE_PARTIAL &&
-	git rev-parse --verify NOTES_MERGE_REF &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha1 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha2 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
-	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
-	# Refs are unchanged
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
-	test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
-	test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
-	# Mention refs/notes/m, and its current and expected value in output
-	test_grep -q "refs/notes/m" output &&
-	test_grep -q "$(git rev-parse refs/notes/m)" output &&
-	test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
-
-26a551f04a7c1221699c120a3d0130f81d636003
-3147754abc2b58919a2c41c371fc0af47d45e199
-ok 20 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)
-
-expecting success of 3310.21 'resolve situation by aborting the notes merge': 
-	git notes merge --abort &&
-	notes_merge_files_gone &&
-	# m has not moved (still == w)
-	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
-	# Verify that other notes refs has not changed (w, x, y and z)
-	verify_notes w &&
-	verify_notes x &&
-	verify_notes y &&
-	verify_notes z
-
-ok 21 - resolve situation by aborting the notes merge
-
-expecting success of 3310.22 'switch cwd before committing notes merge': 
-	git notes add -m foo HEAD &&
-	git notes --ref=other add -m bar HEAD &&
-	test_must_fail git notes merge refs/notes/other &&
-	(
-		cd .git/NOTES_MERGE_WORKTREE &&
-		echo "foo" > $(git rev-parse HEAD) &&
-		echo "bar" >> $(git rev-parse HEAD) &&
-		git notes merge --commit
-	) &&
-	git notes show HEAD > actual_notes &&
-	test_cmp expect_notes actual_notes
-
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-ok 22 - switch cwd before committing notes merge
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3200-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/
-expecting success of 3200.1 'prepare a trivial repository': 
-	echo Hello >A &&
-	git update-index --add A &&
-	git commit -m "Initial commit." &&
-	git branch -M main &&
-	echo World >>A &&
-	git update-index --add A &&
-	git commit -m "Second commit." &&
-	HEAD=$(git rev-parse --verify HEAD)
-
-[main (root-commit) 2daebe9] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[main da664a6] Second commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - prepare a trivial repository
-
-expecting success of 3200.2 'git branch --help should not have created a bogus branch': 
-	test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
-	test_ref_missing refs/heads/--help
-
-error: reference does not exist
-ok 2 - git branch --help should not have created a bogus branch
-
-expecting success of 3200.3 'branch -h in broken repository': 
-	mkdir broken &&
-	(
-		cd broken &&
-		git init -b main &&
-		>.git/refs/heads/main &&
-		test_expect_code 129 git branch -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/broken/.git/
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-ok 3 - branch -h in broken repository
-
-expecting success of 3200.4 'git branch abc should create a branch': 
-	git branch abc &&
-	test_ref_exists refs/heads/abc
-
-ok 4 - git branch abc should create a branch
-
-expecting success of 3200.5 'git branch abc should fail when abc exists': 
-	test_must_fail git branch abc
-
-fatal: a branch named 'abc' already exists
-ok 5 - git branch abc should fail when abc exists
-
-expecting success of 3200.6 'git branch --force abc should fail when abc is checked out': 
-	test_when_finished git switch main &&
-	git switch abc &&
-	test_must_fail git branch --force abc HEAD~1
-
-Switched to branch 'abc'
-fatal: cannot force update the branch 'abc' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch'
-Switched to branch 'main'
-ok 6 - git branch --force abc should fail when abc is checked out
-
-expecting success of 3200.7 'git branch --force abc should succeed when abc exists': 
-	git rev-parse HEAD~1 >expect &&
-	git branch --force abc HEAD~1 &&
-	git rev-parse abc >actual &&
-	test_cmp expect actual
-
-ok 7 - git branch --force abc should succeed when abc exists
-
-expecting success of 3200.8 'git branch a/b/c should create a branch': 
-	git branch a/b/c &&
-	test_ref_exists refs/heads/a/b/c
-
-ok 8 - git branch a/b/c should create a branch
-
-expecting success of 3200.9 'git branch mb main... should create a branch': 
-	git branch mb main... &&
-	test_ref_exists refs/heads/mb
-
-ok 9 - git branch mb main... should create a branch
-
-expecting success of 3200.10 'git branch HEAD should fail': 
-	test_must_fail git branch HEAD
-
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config set advice.refSyntax false"
-ok 10 - git branch HEAD should fail
-
-expecting success of 3200.11 'git branch --create-reflog d/e/f should create a branch and a log': 
-	GIT_COMMITTER_DATE="2005-05-26 23:30" \
-	git -c core.logallrefupdates=false branch --create-reflog d/e/f &&
-	test_ref_exists refs/heads/d/e/f &&
-	cat >expect <<-EOF &&
-	$HEAD refs/heads/d/e/f@{0}: branch: Created from main
-	EOF
-	git reflog show --no-abbrev-commit refs/heads/d/e/f >actual &&
-	test_cmp expect actual
-
-ok 11 - git branch --create-reflog d/e/f should create a branch and a log
-
-expecting success of 3200.12 'git branch -d d/e/f should delete a branch and a log': 
-	git branch -d d/e/f &&
-	test_ref_missing refs/heads/d/e/f &&
-	test_must_fail git reflog exists refs/heads/d/e/f
-
-Deleted branch d/e/f (was da664a6).
-error: reference does not exist
-ok 12 - git branch -d d/e/f should delete a branch and a log
-
-expecting success of 3200.13 'git branch j/k should work after branch j has been deleted': 
-	git branch j &&
-	git branch -d j &&
-	git branch j/k
-
-Deleted branch j (was da664a6).
-ok 13 - git branch j/k should work after branch j has been deleted
-
-expecting success of 3200.14 'git branch l should work after branch l/m has been deleted': 
-	git branch l/m &&
-	git branch -d l/m &&
-	git branch l
-
-Deleted branch l/m (was da664a6).
-ok 14 - git branch l should work after branch l/m has been deleted
-
-expecting success of 3200.15 'git branch -m dumps usage': 
-	test_expect_code 128 git branch -m 2>err &&
-	test_grep "branch name required" err
-
-fatal: branch name required
-ok 15 - git branch -m dumps usage
-
-expecting success of 3200.16 'git branch -m m broken_symref should work': 
-	test_when_finished "git branch -D broken_symref" &&
-	git branch --create-reflog m &&
-	git symbolic-ref refs/heads/broken_symref refs/heads/i_am_broken &&
-	git branch -m m broken_symref &&
-	git reflog exists refs/heads/broken_symref &&
-	test_must_fail git reflog exists refs/heads/i_am_broken
-
-Deleted branch broken_symref (was da664a6).
-ok 16 - git branch -m m broken_symref should work
-
-expecting success of 3200.17 'git branch -m m m/m should work': 
-	git branch --create-reflog m &&
-	git branch -m m m/m &&
-	git reflog exists refs/heads/m/m
-
-ok 17 - git branch -m m m/m should work
-
-expecting success of 3200.18 'git branch -m n/n n should work': 
-	git branch --create-reflog n/n &&
-	git branch -m n/n n &&
-	git reflog exists refs/heads/n
-
-ok 18 - git branch -m n/n n should work
-
-expecting success of 3200.19 'git branch -m bbb should rename checked out branch': 
-	test_when_finished git branch -D bbb &&
-	test_when_finished git checkout main &&
-	git checkout -b aaa &&
-	git commit --allow-empty -m "a new commit" &&
-	git rev-parse aaa@{0} >expect &&
-	git branch -m bbb &&
-	git rev-parse bbb@{1} >actual &&
-	test_cmp expect actual &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/bbb >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'aaa'
-[aaa a533b01] a new commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-Deleted branch bbb (was a533b01).
-ok 19 - git branch -m bbb should rename checked out branch
-
-expecting success of 3200.20 'renaming checked out branch works with d/f conflict': 
-	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
-	test_when_finished git checkout main &&
-	git checkout -b foo &&
-	git branch -m foo/bar &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/foo/bar >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'foo'
-Switched to branch 'main'
-Deleted branch foo/bar (was da664a6).
-ok 20 - renaming checked out branch works with d/f conflict
-
-expecting success of 3200.21 'git branch -m o/o o should fail when o/p exists': 
-	git branch o/o &&
-	git branch o/p &&
-	test_must_fail git branch -m o/o o
-
-error: 'refs/heads/o/p' exists; cannot create 'refs/heads/o'
-fatal: branch rename failed
-ok 21 - git branch -m o/o o should fail when o/p exists
-
-expecting success of 3200.22 'git branch -m o/q o/p should fail when o/p exists': 
-	git branch o/q &&
-	test_must_fail git branch -m o/q o/p
-
-fatal: a branch named 'o/p' already exists
-ok 22 - git branch -m o/q o/p should fail when o/p exists
-
-expecting success of 3200.23 'git branch -M o/q o/p should work when o/p exists': 
-	git branch -M o/q o/p
-
-ok 23 - git branch -M o/q o/p should work when o/p exists
-
-expecting success of 3200.24 'git branch -m -f o/q o/p should work when o/p exists': 
-	git branch o/q &&
-	git branch -m -f o/q o/p
-
-ok 24 - git branch -m -f o/q o/p should work when o/p exists
-
-expecting success of 3200.25 'git branch -m q r/q should fail when r exists': 
-	git branch q &&
-	git branch r &&
-	test_must_fail git branch -m q r/q
-
-error: 'refs/heads/r' exists; cannot create 'refs/heads/r/q'
-fatal: branch rename failed
-ok 25 - git branch -m q r/q should fail when r exists
-
-expecting success of 3200.26 'git branch -M foo bar should fail when bar is checked out': 
-	git branch bar &&
-	git checkout -b foo &&
-	test_must_fail git branch -M bar foo
-
-Switched to a new branch 'foo'
-fatal: cannot force update the branch 'foo' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch'
-ok 26 - git branch -M foo bar should fail when bar is checked out
-
-expecting success of 3200.27 'git branch -M foo bar should fail when bar is checked out in worktree': 
-	git branch -f bar &&
-	test_when_finished "git worktree remove wt && git branch -D wt" &&
-	git worktree add wt &&
-	test_must_fail git branch -M bar wt
-
-Preparing worktree (new branch 'wt')
-HEAD is now at da664a6 Second commit.
-fatal: cannot force update the branch 'wt' used by worktree at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/wt'
-Deleted branch wt (was da664a6).
-ok 27 - git branch -M foo bar should fail when bar is checked out in worktree
-
-expecting success of 3200.28 'git branch -M baz bam should succeed when baz is checked out': 
-	git checkout -b baz &&
-	git branch bam &&
-	git branch -M baz bam &&
-	test $(git rev-parse --abbrev-ref HEAD) = bam
-
-Switched to a new branch 'baz'
-ok 28 - git branch -M baz bam should succeed when baz is checked out
-
-expecting success of 3200.29 'git branch -M baz bam should add entries to HEAD reflog': 
-	git reflog show HEAD >actual &&
-	grep "HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam" actual
-
-da664a6 HEAD@{0}: Branch: renamed refs/heads/baz to refs/heads/bam
-ok 29 - git branch -M baz bam should add entries to HEAD reflog
-
-expecting success of 3200.30 'git branch -M should leave orphaned HEAD alone': 
-	git init -b main orphan &&
-	(
-		cd orphan &&
-		test_commit initial &&
-		git checkout --orphan lonely &&
-		git symbolic-ref HEAD >expect &&
-		echo refs/heads/lonely >actual &&
-		test_cmp expect actual &&
-		test_ref_missing refs/head/lonely &&
-		git branch -M main mistress &&
-		git symbolic-ref HEAD >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/orphan/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'lonely'
-error: reference does not exist
-ok 30 - git branch -M should leave orphaned HEAD alone
-
-expecting success of 3200.31 'resulting reflog can be shown by log -g': 
-	oid=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	HEAD@{0} $oid Branch: renamed refs/heads/baz to refs/heads/bam
-	HEAD@{2} $oid checkout: moving from foo to baz
-	EOF
-	git log -g --format="%gd %H %gs" -2 HEAD >actual &&
-	test_cmp expect actual
-
-ok 31 - resulting reflog can be shown by log -g
-
-expecting success of 3200.32 'git branch -M baz bam should succeed when baz is checked out as linked working tree': 
-	git checkout main &&
-	git worktree add -b baz bazdir &&
-	git worktree add -f bazdir2 baz &&
-	git branch -M baz bam &&
-	test $(git -C bazdir rev-parse --abbrev-ref HEAD) = bam &&
-	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
-	rm -r bazdir bazdir2 &&
-	git worktree prune
-
-Switched to branch 'main'
-Preparing worktree (new branch 'baz')
-HEAD is now at da664a6 Second commit.
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-ok 32 - git branch -M baz bam should succeed when baz is checked out as linked working tree
-
-expecting success of 3200.33 'git branch -M fails if updating any linked working tree fails': 
-	git worktree add -b baz bazdir1 &&
-	git worktree add -f bazdir2 baz &&
-	touch .git/worktrees/bazdir1/HEAD.lock &&
-	test_must_fail git branch -M baz bam &&
-	test $(git -C bazdir2 rev-parse --abbrev-ref HEAD) = bam &&
-	git branch -M bam baz &&
-	rm .git/worktrees/bazdir1/HEAD.lock &&
-	touch .git/worktrees/bazdir2/HEAD.lock &&
-	test_must_fail git branch -M baz bam &&
-	test $(git -C bazdir1 rev-parse --abbrev-ref HEAD) = bam &&
-	rm -rf bazdir1 bazdir2 &&
-	git worktree prune
-
-Preparing worktree (new branch 'baz')
-HEAD is now at da664a6 Second commit.
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/worktrees/bazdir1/HEAD.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-error: HEAD of working tree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/bazdir1 is not updated
-fatal: branch renamed to bam, but HEAD is not updated
-error: cannot lock ref 'HEAD': Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/.git/worktrees/bazdir2/HEAD.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-error: HEAD of working tree /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3200-branch/bazdir2 is not updated
-fatal: branch renamed to bam, but HEAD is not updated
-ok 33 - git branch -M fails if updating any linked working tree fails
-
-expecting success of 3200.34 'git branch -M baz bam should succeed within a worktree in which baz is checked out': 
-	git checkout -b baz &&
-	git worktree add -f bazdir baz &&
-	(
-		cd bazdir &&
-		git branch -M baz bam &&
-		echo bam >expect &&
-		git rev-parse --abbrev-ref HEAD >actual &&
-		test_cmp expect actual
-	) &&
-	echo bam >expect &&
-	git rev-parse --abbrev-ref HEAD >actual &&
-	test_cmp expect actual &&
-	rm -r bazdir &&
-	git worktree prune
-
-Switched to a new branch 'baz'
-Preparing worktree (checking out 'baz')
-HEAD is now at da664a6 Second commit.
-ok 34 - git branch -M baz bam should succeed within a worktree in which baz is checked out
-
-expecting success of 3200.35 'git branch -M main should work when main is checked out': 
-	git checkout main &&
-	git branch -M main
-
-Switched to branch 'main'
-ok 35 - git branch -M main should work when main is checked out
-
-expecting success of 3200.36 'git branch -M main main should work when main is checked out': 
-	git checkout main &&
-	git branch -M main main
-
-Already on 'main'
-ok 36 - git branch -M main main should work when main is checked out
-
-expecting success of 3200.37 'git branch -M topic topic should work when main is checked out': 
-	git checkout main &&
-	git branch topic &&
-	git branch -M topic topic
-
-Already on 'main'
-ok 37 - git branch -M topic topic should work when main is checked out
-
-expecting success of 3200.38 'git branch -M and -C fail on detached HEAD': 
-	git checkout HEAD^{} &&
-	test_when_finished git checkout - &&
-	echo "fatal: cannot rename the current branch while not on any" >expect &&
-	test_must_fail git branch -M must-fail 2>err &&
-	test_cmp expect err &&
-	echo "fatal: cannot copy the current branch while not on any" >expect &&
-	test_must_fail git branch -C must-fail 2>err &&
-	test_cmp expect err
-
-Note: switching to 'HEAD^{}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at da664a6 Second commit.
-Switched to branch 'main'
-ok 38 - git branch -M and -C fail on detached HEAD
-
-expecting success of 3200.39 'git branch -m should work with orphan branches': 
-	test_when_finished git checkout - &&
-	test_when_finished git worktree remove -f wt &&
-	git worktree add wt --detach &&
-	# rename orphan in another worktreee
-	git -C wt checkout --orphan orphan-foo-wt &&
-	git branch -m orphan-foo-wt orphan-bar-wt &&
-	test orphan-bar-wt=$(git -C orphan-worktree branch --show-current) &&
-	# rename orphan in the current worktree
-	git checkout --orphan orphan-foo &&
-	git branch -m orphan-foo orphan-bar &&
-	test orphan-bar=$(git branch --show-current)
-
-Preparing worktree (detached HEAD da664a6)
-HEAD is now at da664a6 Second commit.
-Switched to a new branch 'orphan-foo-wt'
-fatal: cannot change to 'orphan-worktree': No such file or directory
-Switched to a new branch 'orphan-foo'
-Note: switching to 'da664a6b0bffeb0904609e9e14e1beeecfe55c4a'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at da664a6 Second commit.
-ok 39 - git branch -m should work with orphan branches
-
-expecting success of 3200.40 'git branch -d on orphan HEAD (merged)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "rm -rf .git/objects/commit-graph*" &&
-	git commit-graph write --reachable &&
-	git branch --track to-delete main &&
-	git branch -d to-delete
-
-Switched to a new branch 'orphan'
-branch 'to-delete' set up to track 'main'.
-warning: deleting branch 'to-delete' that has been merged to
-         'refs/heads/main', but not yet merged to HEAD
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 40 - git branch -d on orphan HEAD (merged)
-
-expecting success of 3200.41 'git branch -d on orphan HEAD (merged, graph)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	git branch --track to-delete main &&
-	git branch -d to-delete
-
-Switched to a new branch 'orphan'
-branch 'to-delete' set up to track 'main'.
-warning: deleting branch 'to-delete' that has been merged to
-         'refs/heads/main', but not yet merged to HEAD
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 41 - git branch -d on orphan HEAD (merged, graph)
-
-expecting success of 3200.42 'git branch -d on orphan HEAD (unmerged)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "git branch -D to-delete" &&
-	git branch to-delete main &&
-	test_must_fail git branch -d to-delete 2>err &&
-	grep "not fully merged" err
-
-Switched to a new branch 'orphan'
-error: the branch 'to-delete' is not fully merged
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 42 - git branch -d on orphan HEAD (unmerged)
-
-expecting success of 3200.43 'git branch -d on orphan HEAD (unmerged, graph)': 
-	test_when_finished git checkout main &&
-	git checkout --orphan orphan &&
-	test_when_finished "git branch -D to-delete" &&
-	git branch to-delete main &&
-	test_when_finished "rm -rf .git/objects/commit-graph*" &&
-	git commit-graph write --reachable &&
-	test_must_fail git branch -d to-delete 2>err &&
-	grep "not fully merged" err
-
-Switched to a new branch 'orphan'
-error: the branch 'to-delete' is not fully merged
-Deleted branch to-delete (was da664a6).
-Switched to branch 'main'
-ok 43 - git branch -d on orphan HEAD (unmerged, graph)
-
-expecting success of 3200.44 'git branch -v -d t should work': 
-	git branch t &&
-	git rev-parse --verify refs/heads/t &&
-	git branch -v -d t &&
-	test_must_fail git rev-parse --verify refs/heads/t
+expecting success of 3200.44 'git branch -v -d t should work': 
+	git branch t &&
+	git rev-parse --verify refs/heads/t &&
+	git branch -v -d t &&
+	test_must_fail git rev-parse --verify refs/heads/t
 
 da664a6b0bffeb0904609e9e14e1beeecfe55c4a
 Deleted branch t (was da664a6).
@@ -121187,813 +118436,3520 @@
 1..167
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3320-notes-merge-worktrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/
-expecting success of 3320.1 'setup commit': 
-	test_commit tantrum
+*** t3301-notes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3301-notes/.git/
+expecting success of 3301.1 'cannot annotate non-existing HEAD': 
+	test_must_fail env MSG=3 git notes add
 
-[main (root-commit) 02f8a63] tantrum
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tantrum.t
-ok 1 - setup commit
+fatal: failed to resolve 'HEAD' as a valid ref.
+ok 1 - cannot annotate non-existing HEAD
 
-expecting success of 3320.2 'setup notes ref (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on tantrum" tantrum
+expecting success of 3301.2 'setup': 
+	test_commit 1st &&
+	test_commit 2nd
 
-ok 2 - setup notes ref (x)
+[master (root-commit) 04ed9a0] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+ok 2 - setup
 
-expecting success of 3320.3 'setup local branch (y)': 
-	git update-ref refs/notes/y refs/notes/x &&
-	git config core.notesRef refs/notes/y &&
-	git notes remove tantrum
+expecting success of 3301.3 'need valid notes ref': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
+	test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
 
-Removing note for object tantrum
-ok 3 - setup local branch (y)
+fatal: refusing to show notes in / (outside of refs/notes/)
+fatal: refusing to show notes in / (outside of refs/notes/)
+ok 3 - need valid notes ref
 
-expecting success of 3320.4 'setup remote branch (z)': 
-	git update-ref refs/notes/z refs/notes/x &&
-	git config core.notesRef refs/notes/z &&
-	git notes add -f -m "conflicting notes on tantrum" tantrum
+expecting success of 3301.4 'refusing to add notes in refs/heads/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
 
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 4 - setup remote branch (z)
+fatal: refusing to add notes in refs/heads/bogus (outside of refs/notes/)
+ok 4 - refusing to add notes in refs/heads/
 
-expecting success of 3320.5 'modify notes ref ourselves (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -f -m "more conflicting notes on tantrum" tantrum
+expecting success of 3301.5 'refusing to edit notes in refs/remotes/': 
+	test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
 
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 5 - modify notes ref ourselves (x)
+fatal: refusing to edit notes in refs/heads/bogus (outside of refs/notes/)
+ok 5 - refusing to edit notes in refs/remotes/
 
-expecting success of 3320.6 'create some new worktrees': 
-	git worktree add -b newbranch worktree main &&
-	git worktree add -b newbranch2 worktree2 main
+expecting success of 3301.6 'handle empty notes gracefully': 
+	test_expect_code 1 git notes show
 
-Preparing worktree (new branch 'newbranch')
-HEAD is now at 02f8a63 tantrum
-Preparing worktree (new branch 'newbranch2')
-HEAD is now at 02f8a63 tantrum
-ok 6 - create some new worktrees
+error: no note found for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691.
+ok 6 - handle empty notes gracefully
 
-expecting success of 3320.7 'merge z into y fails and sets NOTES_MERGE_REF': 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge z &&
-	echo "refs/notes/y" >expect &&
-	git symbolic-ref NOTES_MERGE_REF >actual &&
+expecting success of 3301.7 'show non-existent notes entry with %N': 
+	test_write_lines A B >expect &&
+	git show -s --format="A%n%NB" >actual &&
 	test_cmp expect actual
 
-Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 7 - merge z into y fails and sets NOTES_MERGE_REF
+ok 7 - show non-existent notes entry with %N
 
-expecting success of 3320.8 'merge z into y while mid-merge in another workdir fails': 
-	(
-		cd worktree &&
-		git config core.notesRef refs/notes/y &&
-		test_must_fail git notes merge z 2>err &&
-		test_grep "a notes merge into refs/notes/y is already in-progress at" err
-	) &&
-	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
+expecting success of 3301.8 'create notes': 
+	MSG=b4 git notes add &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b4 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-fatal: a notes merge into refs/notes/y is already in-progress at /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees
-fatal: ref NOTES_MERGE_REF is not a symbolic ref
-ok 8 - merge z into y while mid-merge in another workdir fails
+b4
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3320.9 'merge z into x while mid-merge on y succeeds': 
-	(
-		cd worktree2 &&
-		git config core.notesRef refs/notes/x &&
-		test_must_fail git notes merge z >out 2>&1 &&
-		test_grep "Automatic notes merge failed" out &&
-		grep -v "A notes merge into refs/notes/x is already in-progress in" out
-	) &&
-	echo "refs/notes/x" >expect &&
-	git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
-	test_cmp expect actual
+    1st
 
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 9 - merge z into x while mid-merge on y succeeds
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 8 - create notes
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3401-rebase-and-am-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/.git/
-expecting success of 3401.1 'setup testcase where directory rename should be detected': 
-	test_create_repo dir-rename &&
-	(
-		cd dir-rename &&
+expecting success of 3301.9 'show notes entry with %N': 
+	test_write_lines A b4 B >expect &&
+	git show -s --format="A%n%NB" >actual &&
+	test_cmp expect actual
 
-		mkdir x &&
-		test_seq  1 10 >x/a &&
-		test_seq 11 20 >x/b &&
-		test_seq 21 30 >x/c &&
-		test_write_lines a b c d e f g h i >l &&
-		git add x l &&
-		git commit -m "Initial" &&
+ok 9 - show notes entry with %N
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success of 3301.10 'create reflog entry': 
+	ref=$(git rev-parse --short refs/notes/commits) &&
+	cat <<-EOF >expect &&
+		$ref refs/notes/commits@{0}: notes: Notes added by 'git notes add'
+	EOF
+	git reflog show refs/notes/commits >actual &&
+	test_cmp expect actual
 
-		git checkout A &&
-		git mv x y &&
-		git mv l letters &&
-		git commit -m "Rename x to y, l to letters" &&
+ok 10 - create reflog entry
 
-		git checkout B &&
-		echo j >>l &&
-		test_seq 31 40 >x/d &&
-		git add l x/d &&
-		git commit -m "Modify l, add x/d"
-	)
+expecting success of 3301.11 'edit existing notes': 
+	MSG=b3 git notes edit &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
-[master (root-commit) 79c153a] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 39 insertions(+)
- create mode 100644 l
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 x/c
-Switched to branch 'A'
-[A cc01e42] Rename x to y, l to letters
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename l => letters (100%)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {x => y}/c (100%)
-Switched to branch 'B'
-[B 6c5e67f] Modify l, add x/d
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 x/d
-ok 1 - setup testcase where directory rename should be detected
+b3
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-expecting success of 3401.2 'rebase --interactive: directory rename detected': 
-	(
-		cd dir-rename &&
+    1st
 
-		git checkout B^0 &&
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 11 - edit existing notes
 
-		set_fake_editor &&
-		FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
+expecting success of 3301.12 'show notes from treeish': 
+	echo b3 >expect &&
+	git notes --ref commits^{tree} show >actual &&
+	test_cmp expect actual &&
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+	echo b4 >expect &&
+	git notes --ref commits@{1} show >actual &&
+	test_cmp expect actual
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+ok 12 - show notes from treeish
 
-Note: switching to 'B^0'.
+expecting success of 3301.13 'cannot edit notes from non-ref': 
+	test_must_fail git notes --ref commits^{tree} edit &&
+	test_must_fail git notes --ref commits@{1} edit
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+fatal: Cannot use notes ref refs/notes/commits^{tree}
+fatal: Cannot use notes ref refs/notes/commits@{1}
+ok 13 - cannot edit notes from non-ref
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3301.14 'cannot "git notes add -m" where notes already exists': 
+	test_must_fail git notes add -m "b2" &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-  git switch -c <new-branch-name>
+error: Cannot add notes. Found existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691. Use '-f' to overwrite existing notes
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Or undo this operation with:
+    1st
 
-  git switch -
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 14 - cannot "git notes add -m" where notes already exists
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3301.15 'can overwrite existing note with "git notes add -f -m"': 
+	git notes add -f -m "b1" &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-HEAD is now at 6c5e67f Modify l, add x/d
-rebase -i script before editing:
-pick 6c5e67f Modify l, add x/d
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-rebase -i script after editing:
-pick 6c5e67f Modify l, add x/d
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 2 - rebase --interactive: directory rename detected
+    1st
 
-checking known breakage of 3401.3 'rebase --apply: directory rename detected': 
-	(
-		cd dir-rename &&
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 15 - can overwrite existing note with "git notes add -f -m"
 
-		git checkout B^0 &&
+expecting success of 3301.16 'add w/no options on existing note morphs into edit': 
+	MSG=b2 git notes add &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b2 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-		git -c merge.directoryRenames=true rebase --apply A &&
+b2
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+    1st
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 16 - add w/no options on existing note morphs into edit
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 3301.17 'can overwrite existing note with "git notes add -f"': 
+	MSG=b1 git notes add -f &&
+	test_path_is_missing .git/NOTES_EDITMSG &&
+	git ls-tree -r refs/notes/commits >actual &&
+	test_line_count = 1 actual &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git show HEAD^ &&
+	test_must_fail git notes show HEAD^
 
-  2e986bc Modify l, add x/d
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+b1
+commit 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+    1st
 
- git branch <new-branch-name> 2e986bc
+diff --git a/1st.t b/1st.t
+new file mode 100644
+index 0000000..2a5d015
+--- /dev/null
++++ b/1st.t
+@@ -0,0 +1 @@
++1st
+error: no note found for object 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6.
+ok 17 - can overwrite existing note with "git notes add -f"
 
-HEAD is now at 6c5e67f Modify l, add x/d
-First, rewinding head to replay your work on top of it...
-Applying: Modify l, add x/d
-Using index info to reconstruct a base tree...
-A	l
-Falling back to patching base and 3-way merge...
-Merging:
-cc01e42 Rename x to y, l to letters
-virtual Modify l, add x/d
-found 1 common ancestor:
-virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
-File y/d doesn't exist
-not ok 3 - rebase --apply: directory rename detected # TODO known breakage
+expecting success of 3301.18 'show notes': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:14:13 2005 -0700
 
-expecting success of 3401.4 'rebase --merge: directory rename detected': 
-	(
-		cd dir-rename &&
+		${indent}2nd
 
-		git checkout B^0 &&
+		Notes:
+		${indent}b1
+	EOF
+	git cat-file commit HEAD >commits &&
+	! grep b1 commits &&
+	git log -1 >actual &&
+	test_cmp expect actual
 
-		git -c merge.directoryRenames=true rebase --merge A &&
+ok 18 - show notes
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+expecting success of 3301.19 'show multi-line notes': 
+	test_commit 3rd &&
+	MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-multiline <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:15:13 2005 -0700
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+		${indent}3rd
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		Notes:
+		${indent}b3
+		${indent}c3c3c3c3
+		${indent}d3d3d3
 
-  7f699cd Modify l, add x/d
+	EOF
+	cat expect >>expect-multiline &&
+	git log -2 >actual &&
+	test_cmp expect-multiline actual
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+[master d07d62e] 3rd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3rd.t
+b3
+c3c3c3c3
+d3d3d3
+ok 19 - show multi-line notes
 
- git branch <new-branch-name> 7f699cd
+expecting success of 3301.20 'show -F notes': 
+	test_commit 4th &&
+	echo "xyzzy" >note5 &&
+	git notes add -F note5 &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-F <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
 
-HEAD is now at 6c5e67f Modify l, add x/d
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 4 - rebase --merge: directory rename detected
+		${indent}4th
 
-checking known breakage of 3401.5 'am: directory rename detected': 
-	(
-		cd dir-rename &&
+		Notes:
+		${indent}xyzzy
 
-		git checkout A^0 &&
+	EOF
+	cat expect-multiline >>expect-F &&
+	git log -3 >actual &&
+	test_cmp expect-F actual
 
-		git format-patch -1 B &&
+[master 0f7aa3e] 4th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+ok 20 - show -F notes
 
-		git -c merge.directoryRenames=true am --3way 0001*.patch &&
+expecting success of 3301.21 'Re-adding -F notes without -f fails': 
+	echo "zyxxy" >note5 &&
+	test_must_fail git notes add -F note5 &&
+	git log -3 >actual &&
+	test_cmp expect-F actual
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
+error: Cannot add notes. Found existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11. Use '-f' to overwrite existing notes
+ok 21 - Re-adding -F notes without -f fails
 
-		test_path_is_file y/d &&
-		test_path_is_missing x/d
-	)
+expecting success of 3301.22 'git log --pretty=raw does not show notes': 
+	commit=$(git rev-parse HEAD) &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		tree $tree
+		parent $parent
+		author A U Thor <author@example.com> 1112912173 -0700
+		committer C O Mitter <committer@example.com> 1112912173 -0700
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+		${indent}4th
+	EOF
+	git log -1 --pretty=raw >actual &&
+	test_cmp expect actual
 
-  2e986bc Modify l, add x/d
+ok 22 - git log --pretty=raw does not show notes
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3301.23 'git log --show-notes': 
+	cat >>expect <<-EOF &&
 
- git branch <new-branch-name> 2e986bc
+	Notes:
+	${indent}xyzzy
+	EOF
+	git log -1 --pretty=raw --show-notes >actual &&
+	test_cmp expect actual
 
-HEAD is now at cc01e42 Rename x to y, l to letters
-0001-Modify-l-add-x-d.patch
-Applying: Modify l, add x/d
-Using index info to reconstruct a base tree...
-A	l
-Falling back to patching base and 3-way merge...
-Merging:
-cc01e42 Rename x to y, l to letters
-virtual Modify l, add x/d
-found 1 common ancestor:
-virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
-File y/d doesn't exist
-not ok 5 - am: directory rename detected # TODO known breakage
+ok 23 - git log --show-notes
 
-expecting success of 3401.6 'setup testcase where directory rename should NOT be detected': 
-	test_create_repo no-dir-rename &&
-	(
-		cd no-dir-rename &&
+expecting success of 3301.24 'git log --no-notes': 
+	git log -1 --no-notes >actual &&
+	! grep xyzzy actual
 
-		mkdir x &&
-		test_seq  1 10 >x/a &&
-		test_seq 11 20 >x/b &&
-		test_seq 21 30 >x/c &&
-		echo original >project_info &&
-		git add x project_info &&
-		git commit -m "Initial" &&
+ok 24 - git log --no-notes
 
-		git branch O &&
-		git branch A &&
-		git branch B &&
+expecting success of 3301.25 'git format-patch does not show notes': 
+	git format-patch -1 --stdout >actual &&
+	! grep xyzzy actual
 
-		git checkout A &&
-		echo v2 >project_info &&
-		git add project_info &&
-		git commit -m "Modify project_info" &&
+ok 25 - git format-patch does not show notes
 
-		git checkout B &&
-		mkdir y &&
-		git mv x/c y/c &&
-		echo v1 >project_info &&
-		git add project_info &&
-		git commit -m "Rename x/c to y/c, modify project_info"
-	)
+expecting success of 3301.26 'git format-patch --show-notes does show notes': 
+	git format-patch --show-notes -1 --stdout >actual &&
+	grep xyzzy actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
-[master (root-commit) 229b7b2] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 31 insertions(+)
- create mode 100644 project_info
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 x/c
-Switched to branch 'A'
-[A 5e95ce3] Modify project_info
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 1f2a3f5] Rename x/c to y/c, modify project_info
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename {x => y}/c (100%)
-ok 6 - setup testcase where directory rename should NOT be detected
+    xyzzy
+ok 26 - git format-patch --show-notes does show notes
 
-expecting success of 3401.7 'rebase --interactive: NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3301.27 'git show  does show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+    xyzzy
+ok 27 - git show  does show notes
 
-		git checkout B^0 &&
+expecting success of 3301.28 'git show --pretty does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 28 - git show --pretty does not show notes
 
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
+expecting success of 3301.29 'git show --pretty=raw does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 29 - git show --pretty=raw does not show notes
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3301.30 'git show --pretty=short does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 30 - git show --pretty=short does not show notes
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+expecting success of 3301.31 'git show --pretty=medium does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 31 - git show --pretty=medium does not show notes
 
-Note: switching to 'B^0'.
+expecting success of 3301.32 'git show --pretty=full does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 32 - git show --pretty=full does not show notes
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3301.33 'git show --pretty=fuller does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 33 - git show --pretty=fuller does not show notes
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3301.34 'git show --pretty=format:%s does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 34 - git show --pretty=format:%s does not show notes
 
-  git switch -c <new-branch-name>
+expecting success of 3301.35 'git show --oneline does not show notes': 
+		git show $p >actual &&
+		eval "$negate grep xyzzy actual"
+	
+ok 35 - git show --oneline does not show notes
 
-Or undo this operation with:
+expecting success of 3301.36 'setup alternate notes ref': 
+	git notes --ref=alternate add -m alternate
 
-  git switch -
+ok 36 - setup alternate notes ref
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3301.37 'git log --notes shows default notes': 
+	git log -1 --notes >actual &&
+	grep xyzzy actual &&
+	! grep alternate actual
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-rebase -i script before editing:
-pick 1f2a3f5 Rename x/c to y/c, modify project_info
+    xyzzy
+ok 37 - git log --notes shows default notes
 
-rebase -i script after editing:
-pick 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 7 - rebase --interactive: NO directory rename
+expecting success of 3301.38 'git log --notes=X shows only X': 
+	git log -1 --notes=alternate >actual &&
+	! grep xyzzy actual &&
+	grep alternate actual
 
-expecting success of 3401.8 'rebase (am): NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+Notes (alternate):
+    alternate
+ok 38 - git log --notes=X shows only X
 
-		git checkout B^0 &&
+expecting success of 3301.39 'git log --notes --notes=X shows both': 
+	git log -1 --notes --notes=alternate >actual &&
+	grep xyzzy actual &&
+	grep alternate actual
 
-		set_fake_editor &&
-		test_must_fail git rebase A &&
+    xyzzy
+Notes (alternate):
+    alternate
+ok 39 - git log --notes --notes=X shows both
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3301.40 'git log --no-notes resets default state': 
+	git log -1 --notes --notes=alternate \
+		--no-notes --notes=alternate \
+		>actual &&
+	! grep xyzzy actual &&
+	grep alternate actual
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+Notes (alternate):
+    alternate
+ok 40 - git log --no-notes resets default state
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 8 - rebase (am): NO directory rename
+expecting success of 3301.41 'git log --no-notes resets ref list': 
+	git log -1 --notes --notes=alternate \
+		--no-notes --notes \
+		>actual &&
+	grep xyzzy actual &&
+	! grep alternate actual
 
-expecting success of 3401.9 'rebase --merge: NO directory rename': 
-	test_when_finished "git -C no-dir-rename rebase --abort" &&
-	(
-		cd no-dir-rename &&
+    xyzzy
+ok 41 - git log --no-notes resets ref list
 
-		git checkout B^0 &&
+expecting success of 3301.42 'show -m notes': 
+	test_commit 5th &&
+	git notes add -m spam -m "foo${LF}bar${LF}baz" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-m <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-		set_fake_editor &&
-		test_must_fail git rebase --merge A &&
+		${indent}5th
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+		Notes:
+		${indent}spam
+		${indent}
+		${indent}foo
+		${indent}bar
+		${indent}baz
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+	EOF
+	cat expect-F >>expect-m &&
+	git log -4 >actual &&
+	test_cmp expect-m actual
 
-HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
-Rebasing (1/1)
Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
-ok 9 - rebase --merge: NO directory rename
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+ok 42 - show -m notes
 
-expecting success of 3401.10 'am: NO directory rename': 
-	test_when_finished "git -C no-dir-rename am --abort" &&
-	(
-		cd no-dir-rename &&
+expecting success of 3301.43 'remove note with add -f -F /dev/null': 
+	git notes add -f -F /dev/null &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-rm-F <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-		git checkout A^0 &&
+		${indent}5th
 
-		git format-patch -1 B &&
+	EOF
+	cat expect-F >>expect-rm-F &&
+	git log -4 >actual &&
+	test_cmp expect-rm-F actual &&
+	test_must_fail git notes show
 
-		test_must_fail git am --3way 0001*.patch &&
+Overwriting existing notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 43 - remove note with add -f -F /dev/null
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+expecting success of 3301.44 'do not create empty note with -m ""': 
+	git notes add -m "" &&
+	git log -4 >actual &&
+	test_cmp expect-rm-F actual &&
+	test_must_fail git notes show
 
-		test_path_is_file x/a &&
-		test_path_is_file x/b &&
-		test_path_is_missing x/c
-	)
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 44 - do not create empty note with -m ""
 
-Previous HEAD position was 1f2a3f5 Rename x/c to y/c, modify project_info
-HEAD is now at 5e95ce3 Modify project_info
-0001-Rename-x-c-to-y-c-modify-project_info.patch
-Applying: Rename x/c to y/c, modify project_info
-Using index info to reconstruct a base tree...
-M	project_info
-Falling back to patching base and 3-way merge...
-Merging:
-5e95ce3 Modify project_info
-virtual Rename x/c to y/c, modify project_info
-found 1 common ancestor:
-virtual 70041a03917eeabc905137ab5853aed716a92bc6
-Auto-merging project_info
-CONFLICT (content): Merge conflict in project_info
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Rename x/c to y/c, modify project_info
-ok 10 - am: NO directory rename
+expecting success of 3301.45 'create note with combination of -m and -F': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-EOF &&
+		foo
 
-# still have 2 known breakage(s)
-# passed all remaining 8 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3321-notes-stripspace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3321-notes-stripspace/.git/
-expecting success of 3321.1 'setup the commit': 
-	test_commit 1st
+		xyzzy
 
-[master (root-commit) 04ed9a0] 1st
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1st.t
-ok 1 - setup the commit
+		bar
 
-expecting success of 3321.2 'add note by editor': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+		zyxxy
 
-	second-line
+		baz
 	EOF
-
-	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add  &&
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" &&
 	git notes show >actual &&
-	test_cmp expect actual
-
-
-first-line
-
-
-second-line
+	test_cmp expect-combine_m_and_F actual
 
 Removing note for object HEAD
-ok 2 - add note by editor
-
-expecting success of 3321.3 'add note by specifying single "-m", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+ok 45 - create note with combination of -m and -F
 
-	second-line
+expecting success of 3301.46 'create note with combination of -m and -F and --separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-\EOF &&
+	foo
+	-------
+	xyzzy
+	-------
+	bar
+	-------
+	zyxxy
+	-------
+	baz
 	EOF
-
-	git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --separator="-------" &&
 	git notes show >actual &&
-	test_cmp expect actual
+	test_cmp expect-combine_m_and_F actual
 
 Removing note for object HEAD
-Removing note for object HEAD
-ok 3 - add note by specifying single "-m", "--stripspace" is the default behavior
+ok 46 - create note with combination of -m and -F and --separator
 
-expecting success of 3321.4 'add note by specifying single "-m" and "--no-stripspace" ': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}first-line${MULTI_LF}second-line
+expecting success of 3301.47 'create note with combination of -m and -F and --no-separator': 
+	cat >expect-combine_m_and_F <<-\EOF &&
+	foo
+	xyzzy
+	bar
+	zyxxy
+	baz
 	EOF
-
-	git notes add --no-stripspace \
-		      -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	echo "xyzzy" >note_a &&
+	echo "zyxxy" >note_b &&
+	git notes add -m "foo" -F note_a -m "bar" -F note_b -m "baz" --no-separator &&
 	git notes show >actual &&
-	test_cmp expect actual
+	test_cmp expect-combine_m_and_F actual
 
-Removing note for object HEAD
-ok 4 - add note by specifying single "-m" and "--no-stripspace" 
+ok 47 - create note with combination of -m and -F and --no-separator
 
-expecting success of 3321.5 'add note by specifying multiple "-m", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3301.48 'remove note with "git notes remove"': 
+	git notes remove HEAD^ &&
+	git notes remove &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-rm-remove <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
 
-	second-line
-	EOF
+		${indent}5th
 
-	git notes add -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 5 - add note by specifying multiple "-m", "--stripspace" is the default behavior
+		${indent}4th
 
-expecting success of 3321.6 'add notes by specifying multiple "-m" and "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line${LF}
 	EOF
+	cat expect-multiline >>expect-rm-remove &&
+	git log -4 >actual &&
+	test_cmp expect-rm-remove actual &&
+	test_must_fail git notes show HEAD^
 
-	git notes add --no-stripspace \
-		      -m "${LF}" \
-		      -m "first-line" \
-		      -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
-	git notes show >actual &&
-	test_cmp expect actual
-
+Removing note for object HEAD^
 Removing note for object HEAD
-ok 6 - add notes by specifying multiple "-m" and "--no-stripspace"
+error: no note found for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11.
+ok 48 - remove note with "git notes remove"
 
-expecting success of 3321.7 'add note by specifying single "-F", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3301.49 'removing non-existing note should not create new commit': 
+	git rev-parse --verify refs/notes/commits >before_commit &&
+	test_must_fail git notes remove HEAD^ &&
+	git rev-parse --verify refs/notes/commits >after_commit &&
+	test_cmp before_commit after_commit
 
-	second-line
-	EOF
+Object HEAD^ has no note
+ok 49 - removing non-existing note should not create new commit
 
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
-	EOF
+expecting success of 3301.50 'removing more than one': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-	git notes add -F note-file &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -F note-file &&
-	git notes show >actual
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git notes remove HEAD^^ HEAD^^^ &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 7 - add note by specifying single "-F", "--stripspace" is the default behavior
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+ok 50 - removing more than one
 
-expecting success of 3321.8 'add note by specifying single "-F" and "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
-	EOF
+expecting success of 3301.51 'removing is atomic': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	test_must_fail git notes remove HEAD^^ HEAD^^^ HEAD^ &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-	cat >note-file <<-EOF &&
-	${LF}
-	first-line
-	${MULTI_LF}
-	second-line
-	${LF}
-	EOF
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+Object HEAD^ has no note
+ok 51 - removing is atomic
 
-	git notes add --no-stripspace -F note-file &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3301.52 'removing with --ignore-missing': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-Removing note for object HEAD
-ok 8 - add note by specifying single "-F" and "--no-stripspace"
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git notes remove --ignore-missing HEAD^^ HEAD^^^ HEAD^ &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-expecting success of 3321.9 'add note by specifying multiple "-F", "--stripspace" is the default behavior': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	file-1-first-line
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+Object HEAD^ has no note
+ok 52 - removing with --ignore-missing
 
-	file-1-second-line
+expecting success of 3301.53 'removing with --ignore-missing but bogus ref': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	test_must_fail git notes remove --ignore-missing HEAD^^ HEAD^^^ NO-SUCH-COMMIT &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-	file-2-first-line
+Removing note for object HEAD^^
+Removing note for object HEAD^^^
+error: Failed to resolve 'NO-SUCH-COMMIT' as a valid ref.
+ok 53 - removing with --ignore-missing but bogus ref
 
-	file-2-second-line
-	EOF
+expecting success of 3301.54 'remove reads from --stdin': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git rev-parse HEAD^^ HEAD^^^ >input &&
+	git notes remove --stdin <input &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+ok 54 - remove reads from --stdin
 
-	git notes add -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
-	test_cmp expect actual &&
-	git notes remove &&
-	git notes add --stripspace -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
-	test_cmp expect actual
+expecting success of 3301.55 'remove --stdin is also atomic': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
+	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
+	test_must_fail git notes remove --stdin <input &&
+	after=$(git rev-parse --verify refs/notes/commits) &&
+	test "$before" = "$after"
 
-Removing note for object HEAD
-Removing note for object HEAD
-ok 9 - add note by specifying multiple "-F", "--stripspace" is the default behavior
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
+ok 55 - remove --stdin is also atomic
 
-expecting success of 3321.10 'add note by specifying multiple "-F" with "--no-stripspace"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
+expecting success of 3301.56 'removing with --stdin --ignore-missing': 
+	before=$(git rev-parse --verify refs/notes/commits) &&
+	test_when_finished "git update-ref refs/notes/commits $before" &&
 
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
-	EOF
+	# We have only two -- add another and make sure it stays
+	git notes add -m "extra" &&
+	git notes list HEAD >after-removal-expect &&
+	git rev-parse HEAD^^ HEAD^^^ HEAD^ >input &&
+	git notes remove --ignore-missing --stdin <input &&
+	git notes list | sed -e "s/ .*//" >actual &&
+	test_cmp after-removal-expect actual
 
-	cat >note-file-1 <<-EOF &&
-	${LF}
-	file-1-first-line
-	${MULTI_LF}
-	file-1-second-line
-	${LF}
-	EOF
+Removing note for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Removing note for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 has no note
+ok 56 - removing with --stdin --ignore-missing
 
-	cat >note-file-2 <<-EOF &&
-	${LF}
-	file-2-first-line
-	${MULTI_LF}
-	file-2-second-line
-	${LF}
+expecting success of 3301.57 'list notes with "git notes list"': 
+	commit_2=$(git rev-parse 2nd) &&
+	commit_3=$(git rev-parse 3rd) &&
+	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
+	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
+	sort -t" " -k2 >expect <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
 	EOF
+	git notes list >actual &&
+	test_cmp expect actual
 
-	git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
-	git notes show >actual &&
+ok 57 - list notes with "git notes list"
+
+expecting success of 3301.58 'list notes with "git notes"': 
+	git notes >actual &&
 	test_cmp expect actual
 
-Removing note for object HEAD
-ok 10 - add note by specifying multiple "-F" with "--no-stripspace"
+ok 58 - list notes with "git notes"
 
-expecting success of 3321.11 'append note by editor': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3301.59 '"git notes" without subcommand does not take arguments': 
+	test_expect_code 129 git notes HEAD^^ 2>err &&
+	grep "^error: unknown subcommand" err
 
-	second-line
-	EOF
+error: unknown subcommand: `HEAD^^'
+ok 59 - "git notes" without subcommand does not take arguments
 
-	git notes add -m "first-line" &&
-	MSG="${MULTI_LF}second-line${LF}" git notes append  &&
-	git notes show >actual &&
+expecting success of 3301.60 'list specific note with "git notes list <object>"': 
+	git rev-parse refs/notes/commits:$commit_3 >expect &&
+	git notes list HEAD^^ >actual &&
 	test_cmp expect actual
 
+ok 60 - list specific note with "git notes list <object>"
+
+expecting success of 3301.61 'listing non-existing notes fails': 
+	test_must_fail git notes list HEAD >actual &&
+	test_must_be_empty actual
+
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 61 - listing non-existing notes fails
 
+expecting success of 3301.62 'append: specify a separator with an empty arg': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
 
+	notes-2
+	EOF
 
-second-line
+	git notes add -m "notes-1" &&
+	git notes append --separator="" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
 
 Removing note for object HEAD
-ok 11 - append note by editor
+ok 62 - append: specify a separator with an empty arg
 
-expecting success of 3321.12 'append note by specifying single "-m"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+expecting success of 3301.63 'append: specify a separator without arg': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
 
-	second-line
+	notes-2
 	EOF
 
-	git notes add -m "${LF}first-line" &&
-	git notes append -m "${MULTI_LF}second-line${LF}" &&
+	git notes add -m "notes-1" &&
+	git notes append --separator -m "notes-2" &&
 	git notes show >actual &&
 	test_cmp expect actual
 
 Removing note for object HEAD
-ok 12 - append note by specifying single "-m"
-
-expecting success of 3321.13 'append note by specifying multiple "-m"': 
-	test_when_finished "git notes remove" &&
-	cat >expect <<-EOF &&
-	first-line
+ok 63 - append: specify a separator without arg
 
-	second-line
+expecting success of 3301.64 'append: specify as --no-separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	notes-2
 	EOF
 
-	git notes add -m "${LF}first-line" &&
-	git notes append -m "${MULTI_LF}" \
-		      -m "second-line" \
-		      -m "${LF}" &&
+	git notes add -m "notes-1" &&
+	git notes append --no-separator -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 64 - append: specify as --no-separator
+
+expecting success of 3301.65 'append: specify separator with line break': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	EOF
+
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------$LF" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 65 - append: specify separator with line break
+
+expecting success of 3301.66 'append: specify separator without line break': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	EOF
+
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------" -m "notes-2" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 66 - append: specify separator without line break
+
+expecting success of 3301.67 'append: specify separator with multiple messages': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect <<-\EOF &&
+	notes-1
+	-------
+	notes-2
+	-------
+	notes-3
+	EOF
+
+	git notes add -m "notes-1" &&
+	git notes append --separator="-------" -m "notes-2" -m "notes-3" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 67 - append: specify separator with multiple messages
+
+expecting success of 3301.68 'append note with combination of -m and -F and --separator': 
+	test_when_finished git notes remove HEAD &&
+	cat >expect-combine_m_and_F <<-\EOF &&
+	m-notes-1
+	-------
+	f-notes-1
+	-------
+	m-notes-2
+	-------
+	f-notes-2
+	-------
+	m-notes-3
+	EOF
+
+	echo "f-notes-1" >note_a &&
+	echo "f-notes-2" >note_b &&
+	git notes append -m "m-notes-1" -F note_a -m "m-notes-2" -F note_b -m "m-notes-3" --separator="-------" &&
+	git notes show >actual &&
+	test_cmp expect-combine_m_and_F actual
+
+Removing note for object HEAD
+ok 68 - append note with combination of -m and -F and --separator
+
+expecting success of 3301.69 'append to existing note with "git notes append"': 
+	cat >expect <<-EOF &&
+		Initial set of notes
+
+		More notes appended with git notes append
+	EOF
+	git notes add -m "Initial set of notes" &&
+	git notes append -m "More notes appended with git notes append" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+ok 69 - append to existing note with "git notes append"
+
+expecting success of 3301.70 '"git notes list" does not expand to "git notes list HEAD"': 
+	commit_5=$(git rev-parse 5th) &&
+	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
+	sort -t" " -k2 >expect_list <<-EOF &&
+		$note_2 $commit_2
+		$note_3 $commit_3
+		$note_5 $commit_5
+	EOF
+	git notes list >actual &&
+	test_cmp expect_list actual
+
+ok 70 - "git notes list" does not expand to "git notes list HEAD"
+
+expecting success of 3301.71 'appending empty string does not change existing note': 
+	git notes append -m "" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+ok 71 - appending empty string does not change existing note
+
+expecting success of 3301.72 'git notes append == add when there is no existing note': 
+	git notes remove HEAD &&
+	test_must_fail git notes list HEAD &&
+	git notes append -m "Initial set of notes${LF}${LF}More notes appended with git notes append" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 72 - git notes append == add when there is no existing note
+
+expecting success of 3301.73 'appending empty string to non-existing note does not create note': 
+	git notes remove HEAD &&
+	test_must_fail git notes list HEAD &&
+	git notes append -m "" &&
+	test_must_fail git notes list HEAD
+
+Removing note for object HEAD
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+Removing note for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+error: no note found for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361.
+ok 73 - appending empty string to non-existing note does not create note
+
+expecting success of 3301.74 'create other note on a different notes ref (setup)': 
+	test_commit 6th &&
+	GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-not-other <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
+
+		${indent}6th
+	EOF
+	cp expect-not-other expect-other &&
+	cat >>expect-other <<-EOF
+
+		Notes (other):
+		${indent}other note
+	EOF
+
+[master 2c12533] 6th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6th.t
+ok 74 - create other note on a different notes ref (setup)
+
+expecting success of 3301.75 'Do not show note on other ref by default': 
+	git log -1 >actual &&
+	test_cmp expect-not-other actual
+
+ok 75 - Do not show note on other ref by default
+
+expecting success of 3301.76 'Do show note when ref is given in GIT_NOTES_REF': 
+	GIT_NOTES_REF="refs/notes/other" git log -1 >actual &&
+	test_cmp expect-other actual
+
+ok 76 - Do show note when ref is given in GIT_NOTES_REF
+
+expecting success of 3301.77 'Do show note when ref is given in core.notesRef config': 
+	test_config core.notesRef "refs/notes/other" &&
+	git log -1 >actual &&
+	test_cmp expect-other actual
+
+ok 77 - Do show note when ref is given in core.notesRef config
+
+expecting success of 3301.78 'Do not show note when core.notesRef is overridden': 
+	test_config core.notesRef "refs/notes/other" &&
+	GIT_NOTES_REF="refs/notes/wrong" git log -1 >actual &&
+	test_cmp expect-not-other actual
+
+ok 78 - Do not show note when core.notesRef is overridden
+
+expecting success of 3301.79 'Show all notes when notes.displayRef=refs/notes/*': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-both <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
+
+		${indent}6th
+
+		Notes:
+		${indent}order test
+
+		Notes (other):
+		${indent}other note
+
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
+
+		${indent}5th
+
+		Notes:
+		${indent}replacement for deleted note
+	EOF
+	GIT_NOTES_REF=refs/notes/commits git notes add \
+		-m"replacement for deleted note" HEAD^ &&
+	GIT_NOTES_REF=refs/notes/commits git notes add -m"order test" &&
+	test_unconfig core.notesRef &&
+	test_config notes.displayRef "refs/notes/*" &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
+
+ok 79 - Show all notes when notes.displayRef=refs/notes/*
+
+expecting success of 3301.80 'core.notesRef is implicitly in notes.displayRef': 
+	test_config core.notesRef refs/notes/commits &&
+	test_config notes.displayRef refs/notes/other &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
+
+ok 80 - core.notesRef is implicitly in notes.displayRef
+
+expecting success of 3301.81 'notes.displayRef can be given more than once': 
+	test_unconfig core.notesRef &&
+	test_config notes.displayRef refs/notes/commits &&
+	git config --add notes.displayRef refs/notes/other &&
+	git log -2 >actual &&
+	test_cmp expect-both actual
+
+ok 81 - notes.displayRef can be given more than once
+
+expecting success of 3301.82 'notes.displayRef respects order': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-both-reversed <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
+
+		${indent}6th
+
+		Notes (other):
+		${indent}other note
+
+		Notes:
+		${indent}order test
+	EOF
+	test_config core.notesRef refs/notes/other &&
+	test_config notes.displayRef refs/notes/commits &&
+	git log -1 >actual &&
+	test_cmp expect-both-reversed actual
+
+ok 82 - notes.displayRef respects order
+
+expecting success of 3301.83 'notes.displayRef with no value handled gracefully': 
+	test_must_fail git -c notes.displayRef log -0 --notes &&
+	test_must_fail git -c notes.displayRef diff-tree --notes HEAD
+
+error: missing value for 'notes.displayref'
+fatal: unable to parse 'notes.displayref' from command-line config
+error: missing value for 'notes.displayref'
+fatal: unable to parse 'notes.displayref' from command-line config
+ok 83 - notes.displayRef with no value handled gracefully
+
+expecting success of 3301.84 'GIT_NOTES_DISPLAY_REF works': 
+	GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
+		git log -2 >actual &&
+	test_cmp expect-both actual
+
+ok 84 - GIT_NOTES_DISPLAY_REF works
+
+expecting success of 3301.85 'GIT_NOTES_DISPLAY_REF overrides config': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect-none <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
+
+		${indent}6th
+
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:17:13 2005 -0700
+
+		${indent}5th
+	EOF
+	test_config notes.displayRef "refs/notes/*" &&
+	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log -2 >actual &&
+	test_cmp expect-none actual
+
+ok 85 - GIT_NOTES_DISPLAY_REF overrides config
+
+expecting success of 3301.86 '--show-notes=* adds to GIT_NOTES_DISPLAY_REF': 
+	GIT_NOTES_REF= GIT_NOTES_DISPLAY_REF= git log --show-notes=* -2 >actual &&
+	test_cmp expect-both actual
+
+ok 86 - --show-notes=* adds to GIT_NOTES_DISPLAY_REF
+
+expecting success of 3301.87 '--no-standard-notes': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect-commits <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:18:13 2005 -0700
+
+		${indent}6th
+
+		Notes:
+		${indent}order test
+	EOF
+	git log --no-standard-notes --show-notes=commits -1 >actual &&
+	test_cmp expect-commits actual
+
+ok 87 - --no-standard-notes
+
+expecting success of 3301.88 '--standard-notes': 
+	test_config notes.displayRef "refs/notes/*" &&
+	git log --no-standard-notes --show-notes=commits \
+		--standard-notes -2 >actual &&
+	test_cmp expect-both actual
+
+ok 88 - --standard-notes
+
+expecting success of 3301.89 '--show-notes=ref accumulates': 
+	git log --show-notes=other --show-notes=commits \
+		 --no-standard-notes -1 >actual &&
+	test_cmp expect-both-reversed actual
+
+ok 89 - --show-notes=ref accumulates
+
+expecting success of 3301.90 'Allow notes on non-commits (trees, blobs, tags)': 
+	test_config core.notesRef refs/notes/other &&
+	echo "Note on a tree" >expect &&
+	git notes add -m "Note on a tree" HEAD: &&
+	git notes show HEAD: >actual &&
+	test_cmp expect actual &&
+	echo "Note on a blob" >expect &&
+	git ls-tree --name-only HEAD >files &&
+	filename=$(head -n1 files) &&
+	git notes add -m "Note on a blob" HEAD:$filename &&
+	git notes show HEAD:$filename >actual &&
+	test_cmp expect actual &&
+	echo "Note on a tag" >expect &&
+	git tag -a -m "This is an annotated tag" foobar HEAD^ &&
+	git notes add -m "Note on a tag" foobar &&
+	git notes show foobar >actual &&
+	test_cmp expect actual
+
+ok 90 - Allow notes on non-commits (trees, blobs, tags)
+
+expecting success of 3301.91 'create note from other note with "git notes add -C"': 
+	test_commit 7th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:19:13 2005 -0700
+
+		${indent}7th
+
+		Notes:
+		${indent}order test
+	EOF
+	note=$(git notes list HEAD^) &&
+	git notes add -C $note &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+
+[master fb01e0c] 7th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7th.t
+ok 91 - create note from other note with "git notes add -C"
+
+expecting success of 3301.92 'create note from non-existing note with "git notes add -C" fails': 
+	test_commit 8th &&
+	test_must_fail git notes add -C deadbeef &&
+	test_must_fail git notes list HEAD
+
+[master 9a4c31c] 8th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8th.t
+fatal: failed to resolve 'deadbeef' as a valid ref.
+error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
+ok 92 - create note from non-existing note with "git notes add -C" fails
+
+expecting success of 3301.93 'create note from non-blob with "git notes add -C" fails': 
+	commit=$(git rev-parse --verify HEAD) &&
+	tree=$(git rev-parse --verify HEAD:) &&
+	test_must_fail git notes add -C $commit &&
+	test_must_fail git notes add -C $tree &&
+	test_must_fail git notes list HEAD
+
+fatal: cannot read note data from non-blob object '9a4c31c7f722b5d517e92c64e932dd751e1413bf'.
+fatal: cannot read note data from non-blob object '37f6454412e4ed89ae47782f956ed0fb573892f6'.
+error: no note found for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf.
+ok 93 - create note from non-blob with "git notes add -C" fails
+
+expecting success of 3301.94 'create note from blob with "git notes add -C" reuses blob id': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:20:13 2005 -0700
+
+		${indent}8th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	git notes add -C $(cat blob) &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD >actual &&
+	test_cmp blob actual
+
+ok 94 - create note from blob with "git notes add -C" reuses blob id
+
+expecting success of 3301.95 'create note from blob with "-C", also specify "-m", "-F" and "--separator"': 
+	# 8th will be reuseed in following tests, so rollback when the test is done
+	test_when_finished "git notes remove && git notes add -C $(cat blob)" &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:20:13 2005 -0700
+
+		${indent}8th
+
+		Notes:
+		${indent}This is a blob object
+		${indent}-------
+		${indent}This is created by -m
+		${indent}-------
+		${indent}This is created by -F
+	EOF
+
+	git notes remove &&
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	echo "This is created by -F" >note_a &&
+	git notes add -C $(cat blob) -m "This is created by -m" -F note_a --separator="-------" &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 95 - create note from blob with "-C", also specify "-m", "-F" and "--separator"
+
+expecting success of 3301.96 'create note from other note with "git notes add -c"': 
+	test_commit 9th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:21:13 2005 -0700
+
+		${indent}9th
+
+		Notes:
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD^^) &&
+	MSG="yet another note" git notes add -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+[master 2e0db4b] 9th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9th.t
+yet another note
+ok 96 - create note from other note with "git notes add -c"
+
+expecting success of 3301.97 'create note from non-existing note with "git notes add -c" fails': 
+	test_commit 10th &&
+	test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
+	test_must_fail git notes list HEAD
+
+[master 7c3b87a] 10th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10th.t
+fatal: failed to resolve 'deadbeef' as a valid ref.
+error: no note found for object 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406.
+ok 97 - create note from non-existing note with "git notes add -c" fails
+
+expecting success of 3301.98 'append to note from other note with "git notes append -C"': 
+	commit=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:21:13 2005 -0700
+
+		${indent}9th
+
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD^) &&
+	git notes append -C $note HEAD^ &&
+	git log -1 HEAD^ >actual &&
+	test_cmp expect actual
+
+ok 98 - append to note from other note with "git notes append -C"
+
+expecting success of 3301.99 'create note from other note with "git notes append -c"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:22:13 2005 -0700
+
+		${indent}10th
+
+		Notes:
+		${indent}other note
+	EOF
+	note=$(git notes list HEAD^) &&
+	MSG="other note" git notes append -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+other note
+ok 99 - create note from other note with "git notes append -c"
+
+expecting success of 3301.100 'append to note from other note with "git notes append -c"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:22:13 2005 -0700
+
+		${indent}10th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	note=$(git notes list HEAD) &&
+	MSG="yet another note" git notes append -c $note &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+yet another note
+ok 100 - append to note from other note with "git notes append -c"
+
+expecting success of 3301.101 'copy note with "git notes copy"': 
+	commit=$(git rev-parse 4th) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
+
+		${indent}4th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy 8th 4th &&
+	git log 3rd..4th >actual &&
+	test_cmp expect actual &&
+	git notes list 4th >expect &&
+	git notes list 8th >actual &&
+	test_cmp expect actual
+
+ok 101 - copy note with "git notes copy"
+
+expecting success of 3301.102 'copy note with "git notes copy" with default': 
+	test_commit 11th &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	git notes copy HEAD^ &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+
+[master a446fff] 11th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11th.t
+ok 102 - copy note with "git notes copy" with default
+
+expecting success of 3301.103 'prevent overwrite with "git notes copy"': 
+	test_must_fail git notes copy HEAD~2 HEAD &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+
+error: Cannot copy notes. Found existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5. Use '-f' to overwrite existing notes
+ok 103 - prevent overwrite with "git notes copy"
+
+expecting success of 3301.104 'allow overwrite with "git notes copy -f"': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy -f HEAD~3 HEAD &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ok 104 - allow overwrite with "git notes copy -f"
+
+expecting success of 3301.105 'allow overwrite with "git notes copy -f" with default': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+	EOF
+	git notes copy -f HEAD~2 &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
+ok 105 - allow overwrite with "git notes copy -f" with default
+
+expecting success of 3301.106 'cannot copy note from object without notes': 
+	test_commit 12th &&
+	test_commit 13th &&
+	test_must_fail git notes copy HEAD^ HEAD
+
+[master 65e263d] 12th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12th.t
+[master e871aa6] 13th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13th.t
+error: missing notes on source object 65e263ded02ae4e8839bc151095113737579dc12. Cannot copy.
+ok 106 - cannot copy note from object without notes
+
+expecting success of 3301.107 'git notes copy --stdin': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:25:13 2005 -0700
+
+		${indent}13th
+
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:24:13 2005 -0700
+
+		${indent}12th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --stdin <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD^ >actual &&
+	test_cmp expect actual
+
+ok 107 - git notes copy --stdin
+
+expecting success of 3301.108 'git notes copy --for-rewrite (unconfigured)': 
+	test_commit 14th &&
+	test_commit 15th &&
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:26:13 2005 -0700
+
+		${indent}14th
+	EOF
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
+
+[master 07c85d7] 14th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14th.t
+[master 4acf42e] 15th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15th.t
+ok 108 - git notes copy --for-rewrite (unconfigured)
+
+expecting success of 3301.109 'git notes copy --for-rewrite (enabled)': 
+	commit=$(git rev-parse HEAD) &&
+	parent=$(git rev-parse HEAD^) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}yet another note
+		${indent}
+		${indent}yet another note
+
+		commit $parent
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:26:13 2005 -0700
+
+		${indent}14th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
+
+ok 109 - git notes copy --for-rewrite (enabled)
+
+expecting success of 3301.110 'git notes copy --for-rewrite (disabled)': 
+	test_config notes.rewrite.bar false &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=bar <copy &&
+	git log -2 >actual &&
+	test_cmp expect actual
+
+ok 110 - git notes copy --for-rewrite (disabled)
+
+expecting success of 3301.111 'git notes copy --for-rewrite (overwrite)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}a fresh note
+	EOF
+	git notes add -f -m"a fresh note" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 111 - git notes copy --for-rewrite (overwrite)
+
+expecting success of 3301.112 'git notes copy --for-rewrite (ignore)': 
+	test_config notes.rewriteMode ignore &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+ok 112 - git notes copy --for-rewrite (ignore)
+
+expecting success of 3301.113 'git notes copy --for-rewrite (append)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}a fresh note
+		${indent}
+		${indent}another fresh note
+	EOF
+	git notes add -f -m"another fresh note" HEAD^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 113 - git notes copy --for-rewrite (append)
+
+expecting success of 3301.114 'git notes copy --for-rewrite (append two to one)': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}a fresh note
+		${indent}
+		${indent}another fresh note
+		${indent}
+		${indent}append 1
+		${indent}
+		${indent}append 2
+	EOF
+	git notes add -f -m"append 1" HEAD^ &&
+	git notes add -f -m"append 2" HEAD^^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD^^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
+ok 114 - git notes copy --for-rewrite (append two to one)
+
+expecting success of 3301.115 'git notes copy --for-rewrite (append empty)': 
+	git notes remove HEAD^ &&
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD^
+ok 115 - git notes copy --for-rewrite (append empty)
+
+expecting success of 3301.116 'GIT_NOTES_REWRITE_MODE works': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}replacement note 1
+	EOF
+	test_config notes.rewriteMode concatenate &&
+	test_config notes.rewriteRef "refs/notes/*" &&
+	git notes add -f -m"replacement note 1" HEAD^ &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+ok 116 - GIT_NOTES_REWRITE_MODE works
+
+expecting success of 3301.117 'GIT_NOTES_REWRITE_REF works': 
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:27:13 2005 -0700
+
+		${indent}15th
+
+		Notes:
+		${indent}replacement note 2
+	EOF
+	git notes add -f -m"replacement note 2" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_unconfig notes.rewriteRef &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
+		git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+ok 117 - GIT_NOTES_REWRITE_REF works
+
+expecting success of 3301.118 'GIT_NOTES_REWRITE_REF overrides config': 
+	git notes add -f -m"replacement note 3" HEAD^ &&
+	test_config notes.rewriteMode overwrite &&
+	test_config notes.rewriteRef refs/notes/other &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_REF=refs/notes/commits \
+		git notes copy --for-rewrite=foo <copy &&
+	git log -1 >actual &&
+	grep "replacement note 3" actual
+
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+    replacement note 3
+ok 118 - GIT_NOTES_REWRITE_REF overrides config
+
+expecting success of 3301.119 'git notes copy diagnoses too many or too few arguments': 
+	test_must_fail git notes copy 2>error &&
+	test_grep "too few arguments" error &&
+	test_must_fail git notes copy one two three 2>error &&
+	test_grep "too many arguments" error
+
+error: too few arguments
+error: too many arguments
+ok 119 - git notes copy diagnoses too many or too few arguments
+
+expecting success of 3301.120 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main': 
+	test_unconfig core.notesRef &&
+	sane_unset GIT_NOTES_REF &&
+	echo refs/notes/refs/heads/main >expect &&
+	git notes --ref=refs/heads/main get-ref >actual &&
+	test_cmp expect actual
+
+ok 120 - git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main
+
+expecting success of 3301.121 'git notes get-ref (no overrides)': 
+	test_unconfig core.notesRef &&
+	sane_unset GIT_NOTES_REF &&
+	echo refs/notes/commits >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
+
+ok 121 - git notes get-ref (no overrides)
+
+expecting success of 3301.122 'git notes get-ref (core.notesRef)': 
+	test_config core.notesRef refs/notes/foo &&
+	echo refs/notes/foo >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
+
+ok 122 - git notes get-ref (core.notesRef)
+
+expecting success of 3301.123 'git notes get-ref (GIT_NOTES_REF)': 
+	echo refs/notes/bar >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
+	test_cmp expect actual
+
+ok 123 - git notes get-ref (GIT_NOTES_REF)
+
+expecting success of 3301.124 'git notes get-ref (--ref)': 
+	echo refs/notes/baz >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
+	test_cmp expect actual
+
+ok 124 - git notes get-ref (--ref)
+
+expecting success of 3301.125 'setup testing of empty notes': 
+	test_unconfig core.notesRef &&
+	test_commit 16th &&
+	empty_blob=$(git hash-object -w /dev/null) &&
+	echo "$empty_blob" >expect_empty
+
+[master 21d0abc] 16th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16th.t
+ok 125 - setup testing of empty notes
+
+expecting success of 3301.126 ''git notes add' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add &&
+		test_must_fail git notes list HEAD
+	
+Object HEAD has no note
+
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 126 - 'git notes add' removes empty note
+
+expecting success of 3301.127 ''git notes add --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+
+ok 127 - 'git notes add --allow-empty' stores empty note
+
+expecting success of 3301.128 ''git notes add -F /dev/null' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -F /dev/null &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 128 - 'git notes add -F /dev/null' removes empty note
+
+expecting success of 3301.129 ''git notes add -F /dev/null --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -F /dev/null --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 129 - 'git notes add -F /dev/null --allow-empty' stores empty note
+
+expecting success of 3301.130 ''git notes add -m ""' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -m "" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 130 - 'git notes add -m ""' removes empty note
+
+expecting success of 3301.131 ''git notes add -m "" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -m "" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 131 - 'git notes add -m "" --allow-empty' stores empty note
+
+expecting success of 3301.132 ''git notes add -c "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -c "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 132 - 'git notes add -c "$empty_blob"' removes empty note
+
+expecting success of 3301.133 ''git notes add -c "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -c "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+
+ok 133 - 'git notes add -c "$empty_blob" --allow-empty' stores empty note
+
+expecting success of 3301.134 ''git notes add -C "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -C "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 134 - 'git notes add -C "$empty_blob"' removes empty note
+
+expecting success of 3301.135 ''git notes add -C "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes add -C "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 135 - 'git notes add -C "$empty_blob" --allow-empty' stores empty note
+
+expecting success of 3301.136 ''git notes append' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 136 - 'git notes append' removes empty note
+
+expecting success of 3301.137 ''git notes append --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+
+ok 137 - 'git notes append --allow-empty' stores empty note
+
+expecting success of 3301.138 ''git notes append -F /dev/null' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -F /dev/null &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 138 - 'git notes append -F /dev/null' removes empty note
+
+expecting success of 3301.139 ''git notes append -F /dev/null --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -F /dev/null --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 139 - 'git notes append -F /dev/null --allow-empty' stores empty note
+
+expecting success of 3301.140 ''git notes append -m ""' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -m "" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 140 - 'git notes append -m ""' removes empty note
+
+expecting success of 3301.141 ''git notes append -m "" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -m "" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 141 - 'git notes append -m "" --allow-empty' stores empty note
+
+expecting success of 3301.142 ''git notes append -c "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -c "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 142 - 'git notes append -c "$empty_blob"' removes empty note
+
+expecting success of 3301.143 ''git notes append -c "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -c "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+
+ok 143 - 'git notes append -c "$empty_blob" --allow-empty' stores empty note
+
+expecting success of 3301.144 ''git notes append -C "$empty_blob"' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -C "$empty_blob" &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 144 - 'git notes append -C "$empty_blob"' removes empty note
+
+expecting success of 3301.145 ''git notes append -C "$empty_blob" --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes append -C "$empty_blob" --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+ok 145 - 'git notes append -C "$empty_blob" --allow-empty' stores empty note
+
+expecting success of 3301.146 ''git notes edit' removes empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes edit &&
+		test_must_fail git notes list HEAD
+	
+Removing note for object HEAD
+
+Removing note for object 21d0abcd10f591529d5148ae8bc7703fc1f73398
+error: no note found for object 21d0abcd10f591529d5148ae8bc7703fc1f73398.
+ok 146 - 'git notes edit' removes empty note
+
+expecting success of 3301.147 ''git notes edit --allow-empty' stores empty note': 
+		test_might_fail git notes remove HEAD &&
+		MSG= git notes edit --allow-empty &&
+		git notes list HEAD >actual &&
+		test_cmp expect_empty actual
+	
+Object HEAD has no note
+
+ok 147 - 'git notes edit --allow-empty' stores empty note
+
+expecting success of 3301.148 'empty notes are displayed by git log': 
+	test_commit 17th &&
+	git log -1 >expect &&
+	cat >>expect <<-EOF &&
+
+		Notes:
+	EOF
+	git notes add -C "$empty_blob" --allow-empty &&
+	git log -1 >actual &&
+	test_cmp expect actual
+
+[master 27a79f3] 17th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 17th.t
+ok 148 - empty notes are displayed by git log
+
+expecting success of 3301.149 'empty notes do not invoke the editor': 
+	test_commit 18th &&
+	GIT_EDITOR="false" git notes add -C "$empty_blob" --allow-empty &&
+	git notes remove HEAD &&
+	GIT_EDITOR="false" git notes add -m "" --allow-empty &&
+	git notes remove HEAD &&
+	GIT_EDITOR="false" git notes add -F /dev/null --allow-empty &&
+	git notes remove HEAD
+
+[master 86b01a9] 18th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 18th.t
+Removing note for object HEAD
+Removing note for object HEAD
+Removing note for object HEAD
+ok 149 - empty notes do not invoke the editor
+
+expecting success of 3301.150 'git notes add with -m/-F invokes editor with -e': 
+	test_commit 19th &&
+	echo "edited" >expect &&
+	MSG="$(cat expect)" git notes add -m "initial" -e &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove HEAD &&
+
+	# Add a note using -F and edit it
+	echo "initial" >note_file &&
+	MSG="$(cat expect)" git notes add -F note_file -e &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+[master d853ef2] 19th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 19th.t
+edited
+Removing note for object HEAD
+edited
+ok 150 - git notes add with -m/-F invokes editor with -e
+
+expecting success of 3301.151 'git notes append with -m/-F invokes the editor with -e': 
+	test_commit 20th &&
+	cat >expect <<-EOF &&
+		initial
+
+		edited
+	EOF
+	git notes add -m "initial" &&
+	MSG="edited" git notes append -m "appended" -e &&
+
+	# Verify the note content was appended and edited
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove HEAD &&
+
+	# Append a note using -F and edit it
+	echo "note from file" >note_file &&
+	git notes add -m "initial" &&
+	MSG="edited" git notes append -F note_file -e &&
+
+	# Verify notes from file has been edited in editor and appended
+	git notes show >actual &&
+	test_cmp expect actual
+
+[master 347e627] 20th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 20th.t
+edited
+Removing note for object HEAD
+edited
+ok 151 - git notes append with -m/-F invokes the editor with -e
+
+expecting success of 3301.152 'git notes with a combination of -m, -F and -e invokes editor': 
+	test_commit 21st &&
+	echo "foo-file-1" >note_1 &&
+	echo "foo-file-2" >note_2 &&
+	echo "edited" >expect &&
+
+	MSG=$(cat expect) git notes append -F note_1 -m "message-1" -F note_2 -e &&
+
+	# Verify that combined messages from file and -m have been edited
+	git notes show >actual &&
+	test_cmp expect actual
+
+[master 7917321] 21st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 21st.t
+edited
+ok 152 - git notes with a combination of -m, -F and -e invokes editor
+
+expecting success of 3301.153 'git notes append aborts when editor fails with -e': 
+	test_commit 22nd &&
+	echo "foo-file-1" >note_1 &&
+
+	# Try to append a note with -F and -e, but make the editor fail
+	test_env GIT_EDITOR="false" test_must_fail git notes append -F note_1 -e &&
+
+	# Verify that no note was added due to editor failure
+	test_must_fail git notes show
+
+[master 34adeb3] 22nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 22nd.t
+error: there was a problem with the editor 'false'
+fatal: please supply the note contents using either -m or -F option
+error: no note found for object 34adeb3f542c4316ca46ba3bfb3855cdbb83cb64.
+ok 153 - git notes append aborts when editor fails with -e
+
+# passed all 153 test(s)
+1..153
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3310-notes-merge-manual-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3310-notes-merge-manual-resolve/.git/
+expecting success of 3310.1 'setup commits': 
+	test_commit 1st &&
+	test_commit 2nd &&
+	test_commit 3rd &&
+	test_commit 4th &&
+	test_commit 5th &&
+
+	test_oid_cache <<-EOF
+	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
+	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
+	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
+	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
+	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
+	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
+	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
+	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
+	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
+
+	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
+	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
+	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
+	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
+	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
+	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
+	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
+	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
+	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
+	EOF
+
+[master (root-commit) 04ed9a0] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+[master d07d62e] 3rd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3rd.t
+[master 0f7aa3e] 4th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4th.t
+[master 7f9ad88] 5th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5th.t
+ok 1 - setup commits
+
+expecting success of 3310.2 'setup merge base (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on 2nd commit" 2nd &&
+	git notes add -m "x notes on 3rd commit" 3rd &&
+	git notes add -m "x notes on 4th commit" 4th &&
+	verify_notes x
+
+ok 2 - setup merge base (x)
+
+expecting success of 3310.3 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes add -f -m "y notes on 1st commit" 1st &&
+	git notes remove 2nd &&
+	git notes add -f -m "y notes on 3rd commit" 3rd &&
+	git notes add -f -m "y notes on 4th commit" 4th &&
+	verify_notes y
+
+Removing note for object 2nd
+Overwriting existing notes for object d07d62e5208f22eb5695e7eb47667dc8b9860290
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 3 - setup local branch (y)
+
+expecting success of 3310.4 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "z notes on 1st commit" 1st &&
+	git notes add -f -m "z notes on 2nd commit" 2nd &&
+	git notes remove 3rd &&
+	git notes add -f -m "z notes on 4th commit" 4th &&
+	verify_notes z
+
+Overwriting existing notes for object 7a4ca6ee52a974a66cbaa78e33214535dff1d691
+Removing note for object 3rd
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 4 - setup remote branch (z)
+
+expecting success of 3310.5 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	git config core.notesRef refs/notes/m &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 5 - merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.6 'change notes in z': 
+	git notes --ref z append -m "More z notes on 4th commit" 4th &&
+	verify_notes z
+
+ok 6 - change notes in z
+
+expecting success of 3310.7 'cannot do merge w/conflicts when previous merge is unfinished': 
+	test -d .git/NOTES_MERGE_WORKTREE &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should indicate what is wrong
+	test_grep -q "\\.git/NOTES_MERGE_\\* exists" output
+
+ok 7 - cannot do merge w/conflicts when previous merge is unfinished
+
+expecting success of 3310.8 'setup unrelated notes ref (w)': 
+	git config core.notesRef refs/notes/w &&
+	git notes add -m "w notes on 1st commit" 1st &&
+	git notes add -m "x notes on 2nd commit" 2nd &&
+	verify_notes w
+
+ok 8 - setup unrelated notes ref (w)
+
+expecting success of 3310.9 'can do merge without conflicts even if previous merge is unfinished (x => w)': 
+	test -d .git/NOTES_MERGE_WORKTREE &&
+	git notes merge x &&
+	verify_notes w &&
+	# Verify that other notes refs has not changed (x and y)
+	verify_notes x &&
+	verify_notes y
+
+ok 9 - can do merge without conflicts even if previous merge is unfinished (x => w)
+
+expecting success of 3310.10 'do not allow mixing --commit and --abort': 
+	test_must_fail git notes merge --commit --abort
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 10 - do not allow mixing --commit and --abort
+
+expecting success of 3310.11 'do not allow mixing --commit and --strategy': 
+	test_must_fail git notes merge --commit --strategy theirs
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 11 - do not allow mixing --commit and --strategy
+
+expecting success of 3310.12 'do not allow mixing --abort and --strategy': 
+	test_must_fail git notes merge --abort --strategy theirs
+
+error: cannot mix --commit, --abort or -s/--strategy
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
+
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
+
+Aborting notes merge resolution
+    --abort               abort notes merge
+
+ok 12 - do not allow mixing --abort and --strategy
+
+expecting success of 3310.13 'finalize conflicting merge (z => m)': 
+	# Resolve conflicts and finalize merge
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
+y and z notes on 4th commit
+EOF
+	git notes merge --commit &&
+	notes_merge_files_gone &&
+	# Merge commit has pre-merge y and pre-merge z as parents
+	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
+	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
+	# Merge commit mentions the notes refs merged
+	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
+	grep -q refs/notes/m merge_commit_msg &&
+	grep -q refs/notes/z merge_commit_msg &&
+	# Merge commit mentions conflicting notes
+	grep -q "Conflicts" merge_commit_msg &&
+	( for sha1 in $(cat expect_conflicts); do
+		grep -q "$sha1" merge_commit_msg ||
+		exit 1
+	done ) &&
+	# Verify contents of merge result
+	verify_notes m &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 13 - finalize conflicting merge (z => m)
+
+expecting success of 3310.14 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	git config core.notesRef refs/notes/m &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 14 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.15 'abort notes merge': 
+	git notes merge --abort &&
+	notes_merge_files_gone &&
+	# m has not moved (still == y)
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 15 - abort notes merge
+
+expecting success of 3310.16 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 16 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.17 'add + remove notes in finalized merge (z => m)': 
+	# Resolve one conflict
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	# Remove another conflict
+	rm .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
+	# Remove a D/F conflict
+	rm .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
+	# Add a new note
+	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
+	# Finalize merge
+	git notes merge --commit &&
+	notes_merge_files_gone &&
+	# Merge commit has pre-merge y and pre-merge z as parents
+	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
+	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
+	# Merge commit mentions the notes refs merged
+	git log -1 --format=%B refs/notes/m > merge_commit_msg &&
+	grep -q refs/notes/m merge_commit_msg &&
+	grep -q refs/notes/z merge_commit_msg &&
+	# Merge commit mentions conflicting notes
+	grep -q "Conflicts" merge_commit_msg &&
+	( for sha1 in $(cat expect_conflicts); do
+		grep -q "$sha1" merge_commit_msg ||
+		exit 1
+	done ) &&
+	# Verify contents of merge result
+	verify_notes m &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 17 - add + remove notes in finalized merge (z => m)
+
+expecting success of 3310.18 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge': 
+	git update-ref refs/notes/m refs/notes/y &&
+	test_must_fail git notes merge z >output 2>&1 &&
+	# Output should point to where to resolve conflicts
+	test_grep "\\.git/NOTES_MERGE_WORKTREE" output &&
+	# Inspect merge conflicts
+	ls .git/NOTES_MERGE_WORKTREE >output_conflicts &&
+	test_cmp expect_conflicts output_conflicts &&
+	( for f in $(cat expect_conflicts); do
+		test_cmp "expect_conflict_$f" ".git/NOTES_MERGE_WORKTREE/$f" ||
+		exit 1
+	done ) &&
+	# Verify that current notes tree (pre-merge) has not changed (m == y)
+	verify_notes y &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)"
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+ok 18 - redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge
+
+expecting success of 3310.19 'reset notes ref m to somewhere else (w)': 
+	git update-ref refs/notes/m refs/notes/w &&
+	verify_notes m &&
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)"
+
+ok 19 - reset notes ref m to somewhere else (w)
+
+expecting success of 3310.20 'fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)': 
+	# Resolve conflicts
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha1 <<EOF &&
+y and z notes on 1st commit
+EOF
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha4 <<EOF &&
+y and z notes on 4th commit
+EOF
+	# Fail to finalize merge
+	test_must_fail git notes merge --commit >output 2>&1 &&
+	# NOTES_MERGE_* refs and .git/NOTES_MERGE_* state files must remain
+	git rev-parse --verify NOTES_MERGE_PARTIAL &&
+	git rev-parse --verify NOTES_MERGE_REF &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha1 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha2 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
+	test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
+	# Refs are unchanged
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
+	test "$(git rev-parse refs/notes/y)" = "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
+	test "$(git rev-parse refs/notes/m)" != "$(git rev-parse NOTES_MERGE_PARTIAL^1)" &&
+	# Mention refs/notes/m, and its current and expected value in output
+	test_grep -q "refs/notes/m" output &&
+	test_grep -q "$(git rev-parse refs/notes/m)" output &&
+	test_grep -q "$(git rev-parse NOTES_MERGE_PARTIAL^1)" output &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+26a551f04a7c1221699c120a3d0130f81d636003
+3147754abc2b58919a2c41c371fc0af47d45e199
+ok 20 - fail to finalize conflicting merge if underlying ref has moved in the meantime (m != NOTES_MERGE_PARTIAL^1)
+
+expecting success of 3310.21 'resolve situation by aborting the notes merge': 
+	git notes merge --abort &&
+	notes_merge_files_gone &&
+	# m has not moved (still == w)
+	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
+	# Verify that other notes refs has not changed (w, x, y and z)
+	verify_notes w &&
+	verify_notes x &&
+	verify_notes y &&
+	verify_notes z
+
+ok 21 - resolve situation by aborting the notes merge
+
+expecting success of 3310.22 'switch cwd before committing notes merge': 
+	git notes add -m foo HEAD &&
+	git notes --ref=other add -m bar HEAD &&
+	test_must_fail git notes merge refs/notes/other &&
+	(
+		cd .git/NOTES_MERGE_WORKTREE &&
+		echo "foo" > $(git rev-parse HEAD) &&
+		echo "bar" >> $(git rev-parse HEAD) &&
+		git notes merge --commit
+	) &&
+	git notes show HEAD > actual_notes &&
+	test_cmp expect_notes actual_notes
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+ok 22 - switch cwd before committing notes merge
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3320-notes-merge-worktrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/
+expecting success of 3320.1 'setup commit': 
+	test_commit tantrum
+
+[main (root-commit) 02f8a63] tantrum
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tantrum.t
+ok 1 - setup commit
+
+expecting success of 3320.2 'setup notes ref (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -m "x notes on tantrum" tantrum
+
+ok 2 - setup notes ref (x)
+
+expecting success of 3320.3 'setup local branch (y)': 
+	git update-ref refs/notes/y refs/notes/x &&
+	git config core.notesRef refs/notes/y &&
+	git notes remove tantrum
+
+Removing note for object tantrum
+ok 3 - setup local branch (y)
+
+expecting success of 3320.4 'setup remote branch (z)': 
+	git update-ref refs/notes/z refs/notes/x &&
+	git config core.notesRef refs/notes/z &&
+	git notes add -f -m "conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 4 - setup remote branch (z)
+
+expecting success of 3320.5 'modify notes ref ourselves (x)': 
+	git config core.notesRef refs/notes/x &&
+	git notes add -f -m "more conflicting notes on tantrum" tantrum
+
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 5 - modify notes ref ourselves (x)
+
+expecting success of 3320.6 'create some new worktrees': 
+	git worktree add -b newbranch worktree main &&
+	git worktree add -b newbranch2 worktree2 main
+
+Preparing worktree (new branch 'newbranch')
+HEAD is now at 02f8a63 tantrum
+Preparing worktree (new branch 'newbranch2')
+HEAD is now at 02f8a63 tantrum
+ok 6 - create some new worktrees
+
+expecting success of 3320.7 'merge z into y fails and sets NOTES_MERGE_REF': 
+	git config core.notesRef refs/notes/y &&
+	test_must_fail git notes merge z &&
+	echo "refs/notes/y" >expect &&
+	git symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
+
+Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+ok 7 - merge z into y fails and sets NOTES_MERGE_REF
+
+expecting success of 3320.8 'merge z into y while mid-merge in another workdir fails': 
+	(
+		cd worktree &&
+		git config core.notesRef refs/notes/y &&
+		test_must_fail git notes merge z 2>err &&
+		test_grep "a notes merge into refs/notes/y is already in-progress at" err
+	) &&
+	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
+
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (delete/modify): Notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
+fatal: a notes merge into refs/notes/y is already in-progress at /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees
+fatal: ref NOTES_MERGE_REF is not a symbolic ref
+ok 8 - merge z into y while mid-merge in another workdir fails
+
+expecting success of 3320.9 'merge z into x while mid-merge on y succeeds': 
+	(
+		cd worktree2 &&
+		git config core.notesRef refs/notes/x &&
+		test_must_fail git notes merge z >out 2>&1 &&
+		test_grep "Automatic notes merge failed" out &&
+		grep -v "A notes merge into refs/notes/x is already in-progress in" out
+	) &&
+	echo "refs/notes/x" >expect &&
+	git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual &&
+	test_cmp expect actual
+
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 9 - merge z into x while mid-merge on y succeeds
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3401-rebase-and-am-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/.git/
+expecting success of 3401.1 'setup testcase where directory rename should be detected': 
+	test_create_repo dir-rename &&
+	(
+		cd dir-rename &&
+
+		mkdir x &&
+		test_seq  1 10 >x/a &&
+		test_seq 11 20 >x/b &&
+		test_seq 21 30 >x/c &&
+		test_write_lines a b c d e f g h i >l &&
+		git add x l &&
+		git commit -m "Initial" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv x y &&
+		git mv l letters &&
+		git commit -m "Rename x to y, l to letters" &&
+
+		git checkout B &&
+		echo j >>l &&
+		test_seq 31 40 >x/d &&
+		git add l x/d &&
+		git commit -m "Modify l, add x/d"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/dir-rename/.git/
+[master (root-commit) 79c153a] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 39 insertions(+)
+ create mode 100644 l
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 x/c
+Switched to branch 'A'
+[A cc01e42] Rename x to y, l to letters
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename l => letters (100%)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {x => y}/c (100%)
+Switched to branch 'B'
+[B 6c5e67f] Modify l, add x/d
+ Author: A U Thor <author@example.com>
+ 2 files changed, 11 insertions(+)
+ create mode 100644 x/d
+ok 1 - setup testcase where directory rename should be detected
+
+expecting success of 3401.2 'rebase --interactive: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		FAKE_LINES="1" git -c merge.directoryRenames=true rebase --interactive A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6c5e67f Modify l, add x/d
+rebase -i script before editing:
+pick 6c5e67f Modify l, add x/d
+
+rebase -i script after editing:
+pick 6c5e67f Modify l, add x/d
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 2 - rebase --interactive: directory rename detected
+
+checking known breakage of 3401.3 'rebase --apply: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		git -c merge.directoryRenames=true rebase --apply A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2e986bc Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 2e986bc
+
+HEAD is now at 6c5e67f Modify l, add x/d
+First, rewinding head to replay your work on top of it...
+Applying: Modify l, add x/d
+Using index info to reconstruct a base tree...
+A	l
+Falling back to patching base and 3-way merge...
+Merging:
+cc01e42 Rename x to y, l to letters
+virtual Modify l, add x/d
+found 1 common ancestor:
+virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
+File y/d doesn't exist
+not ok 3 - rebase --apply: directory rename detected # TODO known breakage
+
+expecting success of 3401.4 'rebase --merge: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout B^0 &&
+
+		git -c merge.directoryRenames=true rebase --merge A &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7f699cd Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 7f699cd
+
+HEAD is now at 6c5e67f Modify l, add x/d
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 4 - rebase --merge: directory rename detected
+
+checking known breakage of 3401.5 'am: directory rename detected': 
+	(
+		cd dir-rename &&
+
+		git checkout A^0 &&
+
+		git format-patch -1 B &&
+
+		git -c merge.directoryRenames=true am --3way 0001*.patch &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+
+		test_path_is_file y/d &&
+		test_path_is_missing x/d
+	)
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2e986bc Modify l, add x/d
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 2e986bc
+
+HEAD is now at cc01e42 Rename x to y, l to letters
+0001-Modify-l-add-x-d.patch
+Applying: Modify l, add x/d
+Using index info to reconstruct a base tree...
+A	l
+Falling back to patching base and 3-way merge...
+Merging:
+cc01e42 Rename x to y, l to letters
+virtual Modify l, add x/d
+found 1 common ancestor:
+virtual 4f45812d96b9febe1d7595b91de345b0a05fb0d4
+File y/d doesn't exist
+not ok 5 - am: directory rename detected # TODO known breakage
+
+expecting success of 3401.6 'setup testcase where directory rename should NOT be detected': 
+	test_create_repo no-dir-rename &&
+	(
+		cd no-dir-rename &&
+
+		mkdir x &&
+		test_seq  1 10 >x/a &&
+		test_seq 11 20 >x/b &&
+		test_seq 21 30 >x/c &&
+		echo original >project_info &&
+		git add x project_info &&
+		git commit -m "Initial" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		echo v2 >project_info &&
+		git add project_info &&
+		git commit -m "Modify project_info" &&
+
+		git checkout B &&
+		mkdir y &&
+		git mv x/c y/c &&
+		echo v1 >project_info &&
+		git add project_info &&
+		git commit -m "Rename x/c to y/c, modify project_info"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3401-rebase-and-am-rename/no-dir-rename/.git/
+[master (root-commit) 229b7b2] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 31 insertions(+)
+ create mode 100644 project_info
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 x/c
+Switched to branch 'A'
+[A 5e95ce3] Modify project_info
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'B'
+[B 1f2a3f5] Rename x/c to y/c, modify project_info
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename {x => y}/c (100%)
+ok 6 - setup testcase where directory rename should NOT be detected
+
+expecting success of 3401.7 'rebase --interactive: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1" git rebase --interactive A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+rebase -i script before editing:
+pick 1f2a3f5 Rename x/c to y/c, modify project_info
+
+rebase -i script after editing:
+pick 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 7 - rebase --interactive: NO directory rename
+
+expecting success of 3401.8 'rebase (am): NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail git rebase A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 8 - rebase (am): NO directory rename
+
+expecting success of 3401.9 'rebase --merge: NO directory rename': 
+	test_when_finished "git -C no-dir-rename rebase --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout B^0 &&
+
+		set_fake_editor &&
+		test_must_fail git rebase --merge A &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+HEAD is now at 1f2a3f5 Rename x/c to y/c, modify project_info
+Rebasing (1/1)
Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 1f2a3f5... Rename x/c to y/c, modify project_info
+ok 9 - rebase --merge: NO directory rename
+
+expecting success of 3401.10 'am: NO directory rename': 
+	test_when_finished "git -C no-dir-rename am --abort" &&
+	(
+		cd no-dir-rename &&
+
+		git checkout A^0 &&
+
+		git format-patch -1 B &&
+
+		test_must_fail git am --3way 0001*.patch &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		test_path_is_file x/a &&
+		test_path_is_file x/b &&
+		test_path_is_missing x/c
+	)
+
+Previous HEAD position was 1f2a3f5 Rename x/c to y/c, modify project_info
+HEAD is now at 5e95ce3 Modify project_info
+0001-Rename-x-c-to-y-c-modify-project_info.patch
+Applying: Rename x/c to y/c, modify project_info
+Using index info to reconstruct a base tree...
+M	project_info
+Falling back to patching base and 3-way merge...
+Merging:
+5e95ce3 Modify project_info
+virtual Rename x/c to y/c, modify project_info
+found 1 common ancestor:
+virtual 70041a03917eeabc905137ab5853aed716a92bc6
+Auto-merging project_info
+CONFLICT (content): Merge conflict in project_info
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Rename x/c to y/c, modify project_info
+ok 10 - am: NO directory rename
+
+# still have 2 known breakage(s)
+# passed all remaining 8 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3321-notes-stripspace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3321-notes-stripspace/.git/
+expecting success of 3321.1 'setup the commit': 
+	test_commit 1st
+
+[master (root-commit) 04ed9a0] 1st
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+ok 1 - setup the commit
+
+expecting success of 3321.2 'add note by editor': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	MSG="${LF}first-line${MULTI_LF}second-line${LF}" git notes add  &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+first-line
+
+
+second-line
+
+Removing note for object HEAD
+ok 2 - add note by editor
+
+expecting success of 3321.3 'add note by specifying single "-m", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 3 - add note by specifying single "-m", "--stripspace" is the default behavior
+
+expecting success of 3321.4 'add note by specifying single "-m" and "--no-stripspace" ': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}first-line${MULTI_LF}second-line
+	EOF
+
+	git notes add --no-stripspace \
+		      -m "${LF}first-line${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 4 - add note by specifying single "-m" and "--no-stripspace" 
+
+expecting success of 3321.5 'add note by specifying multiple "-m", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 5 - add note by specifying multiple "-m", "--stripspace" is the default behavior
+
+expecting success of 3321.6 'add notes by specifying multiple "-m" and "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line${LF}
+	EOF
+
+	git notes add --no-stripspace \
+		      -m "${LF}" \
+		      -m "first-line" \
+		      -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 6 - add notes by specifying multiple "-m" and "--no-stripspace"
+
+expecting success of 3321.7 'add note by specifying single "-F", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -F note-file &&
+	git notes show >actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 7 - add note by specifying single "-F", "--stripspace" is the default behavior
+
+expecting success of 3321.8 'add note by specifying single "-F" and "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	cat >note-file <<-EOF &&
+	${LF}
+	first-line
+	${MULTI_LF}
+	second-line
+	${LF}
+	EOF
+
+	git notes add --no-stripspace -F note-file &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 8 - add note by specifying single "-F" and "--no-stripspace"
+
+expecting success of 3321.9 'add note by specifying multiple "-F", "--stripspace" is the default behavior': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	file-1-first-line
+
+	file-1-second-line
+
+	file-2-first-line
+
+	file-2-second-line
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual &&
+	git notes remove &&
+	git notes add --stripspace -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+Removing note for object HEAD
+ok 9 - add note by specifying multiple "-F", "--stripspace" is the default behavior
+
+expecting success of 3321.10 'add note by specifying multiple "-F" with "--no-stripspace"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	cat >note-file-1 <<-EOF &&
+	${LF}
+	file-1-first-line
+	${MULTI_LF}
+	file-1-second-line
+	${LF}
+	EOF
+
+	cat >note-file-2 <<-EOF &&
+	${LF}
+	file-2-first-line
+	${MULTI_LF}
+	file-2-second-line
+	${LF}
+	EOF
+
+	git notes add --no-stripspace -F note-file-1 -F note-file-2 &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 10 - add note by specifying multiple "-F" with "--no-stripspace"
+
+expecting success of 3321.11 'append note by editor': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "first-line" &&
+	MSG="${MULTI_LF}second-line${LF}" git notes append  &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+
+
+
+second-line
+
+Removing note for object HEAD
+ok 11 - append note by editor
+
+expecting success of 3321.12 'append note by specifying single "-m"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line" &&
+	git notes append -m "${MULTI_LF}second-line${LF}" &&
+	git notes show >actual &&
+	test_cmp expect actual
+
+Removing note for object HEAD
+ok 12 - append note by specifying single "-m"
+
+expecting success of 3321.13 'append note by specifying multiple "-m"': 
+	test_when_finished "git notes remove" &&
+	cat >expect <<-EOF &&
+	first-line
+
+	second-line
+	EOF
+
+	git notes add -m "${LF}first-line" &&
+	git notes append -m "${MULTI_LF}" \
+		      -m "second-line" \
+		      -m "${LF}" &&
 	git notes show >actual &&
 	test_cmp expect actual
 
@@ -128804,214 +128760,6 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3413-rebase-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3413-rebase-hook/.git/
-expecting success of 3413.1 'setup': 
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo goodbye >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git checkout -b side HEAD^ &&
-	echo world >git &&
-	git add git &&
-	test_tick &&
-	git commit -m side &&
-	git checkout main &&
-	git log --pretty=oneline --abbrev-commit --graph --all &&
-	git branch test side
-
-[main (root-commit) 6637599] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 20a11a4] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side c847452] side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 git
-Switched to branch 'main'
-* c847452 side
-| * 20a11a4 second
-|/  
-* 6637599 initial
-ok 1 - setup
-
-expecting success of 3413.2 'rebase': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld
-
-Switched to branch 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 2 - rebase
-
-expecting success of 3413.3 'rebase -i': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 3 - rebase -i
-
-expecting success of 3413.4 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
-
-ok 4 - setup pre-rebase hook
-
-expecting success of 3413.5 'pre-rebase hook gets correct input (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
-
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 5 - pre-rebase hook gets correct input (1)
-
-expecting success of 3413.6 'pre-rebase hook gets correct input (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 6 - pre-rebase hook gets correct input (2)
-
-expecting success of 3413.7 'pre-rebase hook gets correct input (3)': 
-	git checkout test &&
-	git reset --hard side &&
-	git checkout main &&
-	git rebase main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Switched to branch 'main'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 7 - pre-rebase hook gets correct input (3)
-
-expecting success of 3413.8 'pre-rebase hook gets correct input (4)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
-
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 8 - pre-rebase hook gets correct input (4)
-
-expecting success of 3413.9 'pre-rebase hook gets correct input (5)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase -i main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 9 - pre-rebase hook gets correct input (5)
-
-expecting success of 3413.10 'pre-rebase hook gets correct input (6)': 
-	git checkout test &&
-	git reset --hard side &&
-	git checkout main &&
-	EDITOR=true git rebase -i main test &&
-	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
-
-Already on 'test'
-HEAD is now at c847452 side
-Switched to branch 'main'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 10 - pre-rebase hook gets correct input (6)
-
-expecting success of 3413.11 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
-
-ok 11 - setup pre-rebase hook that fails
-
-expecting success of 3413.12 'pre-rebase hook stops rebase (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail git rebase main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l) &&
-	test_must_fail git rebase --quit 2>err &&
-	test_grep "no rebase in progress" err
-
-Already on 'test'
-HEAD is now at c847452 side
-error: The pre-rebase hook refused to rebase.
-fatal: no rebase in progress
-ok 12 - pre-rebase hook stops rebase (1)
-
-expecting success of 3413.13 'pre-rebase hook stops rebase (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	test_must_fail env EDITOR=: git rebase -i main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test 0 = $(git rev-list HEAD...side | wc -l)
-
-Already on 'test'
-HEAD is now at c847452 side
-error: The pre-rebase hook refused to rebase.
-ok 13 - pre-rebase hook stops rebase (2)
-
-expecting success of 3413.14 'rebase --no-verify overrides pre-rebase (1)': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase --no-verify main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 14 - rebase --no-verify overrides pre-rebase (1)
-
-expecting success of 3413.15 'rebase --no-verify overrides pre-rebase (2)': 
-	git checkout test &&
-	git reset --hard side &&
-	EDITOR=true git rebase --no-verify -i main &&
-	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
-	test "z$(cat git)" = zworld
-
-Already on 'test'
-HEAD is now at c847452 side
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
-ok 15 - rebase --no-verify overrides pre-rebase (2)
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3412-rebase-root.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3412-rebase-root/.git/
 expecting success of 3412.1 'prepare repository': 
@@ -129376,6 +129124,214 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3413-rebase-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3413-rebase-hook/.git/
+expecting success of 3413.1 'setup': 
+	echo hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo goodbye >file &&
+	git add file &&
+	test_tick &&
+	git commit -m second &&
+	git checkout -b side HEAD^ &&
+	echo world >git &&
+	git add git &&
+	test_tick &&
+	git commit -m side &&
+	git checkout main &&
+	git log --pretty=oneline --abbrev-commit --graph --all &&
+	git branch test side
+
+[main (root-commit) 6637599] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 20a11a4] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side c847452] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git
+Switched to branch 'main'
+* c847452 side
+| * 20a11a4 second
+|/  
+* 6637599 initial
+ok 1 - setup
+
+expecting success of 3413.2 'rebase': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld
+
+Switched to branch 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 2 - rebase
+
+expecting success of 3413.3 'rebase -i': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 3 - rebase -i
+
+expecting success of 3413.4 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
+	EOF
+
+ok 4 - setup pre-rebase hook
+
+expecting success of 3413.5 'pre-rebase hook gets correct input (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
+
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 5 - pre-rebase hook gets correct input (1)
+
+expecting success of 3413.6 'pre-rebase hook gets correct input (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 6 - pre-rebase hook gets correct input (2)
+
+expecting success of 3413.7 'pre-rebase hook gets correct input (3)': 
+	git checkout test &&
+	git reset --hard side &&
+	git checkout main &&
+	git rebase main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Switched to branch 'main'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 7 - pre-rebase hook gets correct input (3)
+
+expecting success of 3413.8 'pre-rebase hook gets correct input (4)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
+
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 8 - pre-rebase hook gets correct input (4)
+
+expecting success of 3413.9 'pre-rebase hook gets correct input (5)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 9 - pre-rebase hook gets correct input (5)
+
+expecting success of 3413.10 'pre-rebase hook gets correct input (6)': 
+	git checkout test &&
+	git reset --hard side &&
+	git checkout main &&
+	EDITOR=true git rebase -i main test &&
+	test "z$(cat git)" = zworld &&
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
+
+Already on 'test'
+HEAD is now at c847452 side
+Switched to branch 'main'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 10 - pre-rebase hook gets correct input (6)
+
+expecting success of 3413.11 'setup pre-rebase hook that fails': 
+	test_hook --setup --clobber pre-rebase <<-\EOF
+	false
+	EOF
+
+ok 11 - setup pre-rebase hook that fails
+
+expecting success of 3413.12 'pre-rebase hook stops rebase (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	test_must_fail git rebase main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test 0 = $(git rev-list HEAD...side | wc -l) &&
+	test_must_fail git rebase --quit 2>err &&
+	test_grep "no rebase in progress" err
+
+Already on 'test'
+HEAD is now at c847452 side
+error: The pre-rebase hook refused to rebase.
+fatal: no rebase in progress
+ok 12 - pre-rebase hook stops rebase (1)
+
+expecting success of 3413.13 'pre-rebase hook stops rebase (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	test_must_fail env EDITOR=: git rebase -i main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test 0 = $(git rev-list HEAD...side | wc -l)
+
+Already on 'test'
+HEAD is now at c847452 side
+error: The pre-rebase hook refused to rebase.
+ok 13 - pre-rebase hook stops rebase (2)
+
+expecting success of 3413.14 'rebase --no-verify overrides pre-rebase (1)': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase --no-verify main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 14 - rebase --no-verify overrides pre-rebase (1)
+
+expecting success of 3413.15 'rebase --no-verify overrides pre-rebase (2)': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase --no-verify -i main &&
+	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test.
+ok 15 - rebase --no-verify overrides pre-rebase (2)
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3417-rebase-whitespace-fix.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3417-rebase-whitespace-fix/.git/
 expecting success of 3417.1 'blank line at end of file; extend at end of file': 
@@ -129456,488 +129412,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3419-rebase-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3419-rebase-patch-id/.git/
-expecting success of 3419.1 'setup': 
-	git commit --allow-empty -m initial &&
-	git tag root
-
-[main (root-commit) 8b2b4f6] initial
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 3419.2 'setup: 500 lines': 
-	rm -f .gitattributes &&
-	git checkout -q -f main &&
-	git reset --hard root &&
-	test_seq 500 >file &&
-	git add file &&
-	git commit -q -m initial &&
-	git branch -f other &&
-
-	scramble file &&
-	git add file &&
-	git commit -q -m "change big file" &&
-
-	git checkout -q other &&
-	: >newfile &&
-	git add newfile &&
-	git commit -q -m "add small file" &&
-
-	git cherry-pick main >/dev/null 2>&1 &&
-
-	git branch -f squashed main &&
-	git checkout -q -f squashed &&
-	git reset -q --soft HEAD~2 &&
-	git commit -q -m squashed &&
-
-	git branch -f mode main &&
-	git checkout -q -f mode &&
-	test_chmod +x file &&
-	git commit -q -a --amend &&
-
-	git branch -f modeother other &&
-	git checkout -q -f modeother &&
-	test_chmod +x file &&
-	git commit -q -a --amend
-
-HEAD is now at 8b2b4f6 initial
-ok 2 - setup: 500 lines
-
-expecting success of 3419.3 'detect upstream patch': 
-	git checkout -q main^{} &&
-	scramble file &&
-	git add file &&
-	git commit -q -m "change big file again" &&
-	git checkout -q other^{} &&
-	git rebase main &&
-	git rev-list main...HEAD~ >revs &&
-	test_must_be_empty revs
-
-warning: skipped previously applied commit 463cec6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 3 - detect upstream patch
-
-expecting success of 3419.4 'detect upstream patch binary': 
-	echo "file binary" >.gitattributes &&
-	git checkout -q other^{} &&
-	git rebase main &&
-	git rev-list main...HEAD~ >revs &&
-	test_must_be_empty revs &&
-	test_when_finished "rm .gitattributes"
-
-warning: skipped previously applied commit 463cec6
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 4 - detect upstream patch binary
-
-expecting success of 3419.5 'detect upstream patch modechange': 
-	git checkout -q modeother^{} &&
-	git rebase mode &&
-	git rev-list mode...HEAD~ >revs &&
-	test_must_be_empty revs
-
-warning: skipped previously applied commit 471e427
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 5 - detect upstream patch modechange
-
-expecting success of 3419.6 'do not drop patch': 
-	git checkout -q other^{} &&
-	test_must_fail git rebase squashed &&
-	test_when_finished "git rebase --abort"
-
-Rebasing (1/3)
Auto-merging file
-CONFLICT (add/add): Merge conflict in file
-error: could not apply bb8cb29... initial
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bb8cb29... initial
-ok 6 - do not drop patch
-
-expecting success of 3419.7 'do not drop patch binary': 
-	echo "file binary" >.gitattributes &&
-	git checkout -q other^{} &&
-	test_must_fail git rebase squashed &&
-	test_when_finished "git rebase --abort" &&
-	test_when_finished "rm .gitattributes"
-
-Rebasing (1/3)
warning: Cannot merge binary files: file (HEAD vs. bb8cb29 (initial))
-Auto-merging file
-CONFLICT (add/add): Merge conflict in file
-error: could not apply bb8cb29... initial
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bb8cb29... initial
-ok 7 - do not drop patch binary
-
-expecting success of 3419.8 'do not drop patch modechange': 
-	git checkout -q modeother^{} &&
-	git rebase other &&
-	cat >expected <<-\EOF &&
-	diff --git a/file b/file
-	old mode 100644
-	new mode 100755
-	EOF
-	git diff HEAD~ >modediff &&
-	test_cmp expected modediff
-
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 8 - do not drop patch modechange
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3416-rebase-onto-threedots.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3416-rebase-onto-threedots/.git/
-expecting success of 3416.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	git branch side &&
-	test_commit C &&
-	git branch topic &&
-	git checkout side &&
-	test_commit H &&
-	git checkout main &&
-	test_tick &&
-	git merge H &&
-	git tag D &&
-	test_commit E &&
-	git checkout topic &&
-	test_commit F &&
-	test_commit G &&
-	git checkout side &&
-	test_tick &&
-	git merge C &&
-	git tag I &&
-	test_commit J &&
-	test_commit K
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'side'
-[side e9f30f6] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- H.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-[main 0cd72fb] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'topic'
-[topic 0fb828b] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[topic a08c965] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[side 9eed7bf] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[side 4d3c411] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 K.t
-ok 1 - setup
-
-expecting success of 3416.2 'rebase --onto main...topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --onto main...topic F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 2 - rebase --onto main...topic
-
-expecting success of 3416.3 'rebase --onto main...': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --onto main... F &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 3 - rebase --onto main...
-
-expecting success of 3416.4 'rebase --onto main...side': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase --onto main...side J
-
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main...side': need exactly one merge base
-ok 4 - rebase --onto main...side
-
-expecting success of 3416.5 'rebase -i --onto main...topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --onto main...topic F
-	) &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 5 - rebase -i --onto main...topic
-
-expecting success of 3416.6 'rebase -i --onto main...': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --onto main... F
-	) &&
-	git rev-parse HEAD^1 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at f576ef2 G
-Already on 'topic'
-HEAD is now at a08c965 G
-Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
-ok 6 - rebase -i --onto main...
-
-expecting success of 3416.7 'rebase --onto main...side requires a single merge-base': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase -i --onto main...side J 2>err &&
-	grep "need exactly one merge base" err
-
-HEAD is now at f576ef2 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main...side': need exactly one merge base
-ok 7 - rebase --onto main...side requires a single merge-base
-
-expecting success of 3416.8 'rebase --keep-base --onto incompatible': 
-	test_must_fail git rebase --keep-base --onto main...
-
-fatal: options '--keep-base' and '--onto' cannot be used together
-ok 8 - rebase --keep-base --onto incompatible
-
-expecting success of 3416.9 'rebase --keep-base --root incompatible': 
-	test_must_fail git rebase --keep-base --root
-
-fatal: options '--keep-base' and '--root' cannot be used together
-ok 9 - rebase --keep-base --root incompatible
-
-expecting success of 3416.10 'rebase --keep-base main from topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	git rebase --keep-base main &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Current branch topic is up to date.
-ok 10 - rebase --keep-base main from topic
-
-expecting success of 3416.11 'rebase --keep-base main topic from main': 
-	git checkout main &&
-	git branch -f topic G &&
-
-	git rebase --keep-base main topic &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-Switched to branch 'main'
-Current branch topic is up to date.
-ok 11 - rebase --keep-base main topic from main
-
-expecting success of 3416.12 'rebase --keep-base main from side': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase --keep-base main
-
-HEAD is now at a08c965 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main': need exactly one merge base with branch
-ok 12 - rebase --keep-base main from side
-
-expecting success of 3416.13 'rebase -i --keep-base main from topic': 
-	git reset --hard &&
-	git checkout topic &&
-	git reset --hard G &&
-
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base main
-	) &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-HEAD is now at 4d3c411 K
-Switched to branch 'topic'
-HEAD is now at a08c965 G
-Successfully rebased and updated refs/heads/topic.
-ok 13 - rebase -i --keep-base main from topic
-
-expecting success of 3416.14 'rebase -i --keep-base main topic from main': 
-	git checkout main &&
-	git branch -f topic G &&
-
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base main topic
-	) &&
-	git rev-parse C >base.expect &&
-	git merge-base main HEAD >base.actual &&
-	test_cmp base.expect base.actual &&
-
-	git rev-parse HEAD~2 >actual &&
-	git rev-parse C^0 >expect &&
-	test_cmp expect actual
-
-Switched to branch 'main'
-Successfully rebased and updated refs/heads/topic.
-ok 14 - rebase -i --keep-base main topic from main
-
-expecting success of 3416.15 'rebase --keep-base requires a single merge base': 
-	git reset --hard &&
-	git checkout side &&
-	git reset --hard K &&
-
-	test_must_fail git rebase -i --keep-base main 2>err &&
-	grep "need exactly one merge base with branch" err
-
-HEAD is now at a08c965 G
-Switched to branch 'side'
-HEAD is now at 4d3c411 K
-fatal: 'main': need exactly one merge base with branch
-ok 15 - rebase --keep-base requires a single merge base
-
-expecting success of 3416.16 'rebase --keep-base keeps cherry picks': 
-	git checkout -f -B main E &&
-	git cherry-pick F &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=2 git rebase -i --keep-base HEAD G
-	) &&
-	test_cmp_rev HEAD G
-
-Switched to and reset branch 'main'
-[main 3dacdd2] F
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-Successfully rebased and updated detached HEAD.
-ok 16 - rebase --keep-base keeps cherry picks
-
-expecting success of 3416.17 'rebase --keep-base --no-reapply-cherry-picks': 
-	git checkout -f -B main E &&
-	git cherry-pick F &&
-	(
-		set_fake_editor &&
-		EXPECT_COUNT=1 git rebase -i --keep-base \
-					--no-reapply-cherry-picks HEAD G
-	) &&
-	test_cmp_rev HEAD^ C
-
-Previous HEAD position was a08c965 G
-Switched to and reset branch 'main'
-[main 3dacdd2] F
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-warning: skipped previously applied commit 0fb828b
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 17 - rebase --keep-base --no-reapply-cherry-picks
-
-expecting success of 3416.18 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 18 - $EDITOR and friends are unchanged
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t2400-worktree-add.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t2400-worktree-add/.git/
 expecting success of 2400.1 'setup': 
@@ -147154,6 +146628,488 @@
 1..232
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3419-rebase-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3419-rebase-patch-id/.git/
+expecting success of 3419.1 'setup': 
+	git commit --allow-empty -m initial &&
+	git tag root
+
+[main (root-commit) 8b2b4f6] initial
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 3419.2 'setup: 500 lines': 
+	rm -f .gitattributes &&
+	git checkout -q -f main &&
+	git reset --hard root &&
+	test_seq 500 >file &&
+	git add file &&
+	git commit -q -m initial &&
+	git branch -f other &&
+
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file" &&
+
+	git checkout -q other &&
+	: >newfile &&
+	git add newfile &&
+	git commit -q -m "add small file" &&
+
+	git cherry-pick main >/dev/null 2>&1 &&
+
+	git branch -f squashed main &&
+	git checkout -q -f squashed &&
+	git reset -q --soft HEAD~2 &&
+	git commit -q -m squashed &&
+
+	git branch -f mode main &&
+	git checkout -q -f mode &&
+	test_chmod +x file &&
+	git commit -q -a --amend &&
+
+	git branch -f modeother other &&
+	git checkout -q -f modeother &&
+	test_chmod +x file &&
+	git commit -q -a --amend
+
+HEAD is now at 8b2b4f6 initial
+ok 2 - setup: 500 lines
+
+expecting success of 3419.3 'detect upstream patch': 
+	git checkout -q main^{} &&
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file again" &&
+	git checkout -q other^{} &&
+	git rebase main &&
+	git rev-list main...HEAD~ >revs &&
+	test_must_be_empty revs
+
+warning: skipped previously applied commit 463cec6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 3 - detect upstream patch
+
+expecting success of 3419.4 'detect upstream patch binary': 
+	echo "file binary" >.gitattributes &&
+	git checkout -q other^{} &&
+	git rebase main &&
+	git rev-list main...HEAD~ >revs &&
+	test_must_be_empty revs &&
+	test_when_finished "rm .gitattributes"
+
+warning: skipped previously applied commit 463cec6
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 4 - detect upstream patch binary
+
+expecting success of 3419.5 'detect upstream patch modechange': 
+	git checkout -q modeother^{} &&
+	git rebase mode &&
+	git rev-list mode...HEAD~ >revs &&
+	test_must_be_empty revs
+
+warning: skipped previously applied commit 471e427
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 5 - detect upstream patch modechange
+
+expecting success of 3419.6 'do not drop patch': 
+	git checkout -q other^{} &&
+	test_must_fail git rebase squashed &&
+	test_when_finished "git rebase --abort"
+
+Rebasing (1/3)
Auto-merging file
+CONFLICT (add/add): Merge conflict in file
+error: could not apply bb8cb29... initial
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bb8cb29... initial
+ok 6 - do not drop patch
+
+expecting success of 3419.7 'do not drop patch binary': 
+	echo "file binary" >.gitattributes &&
+	git checkout -q other^{} &&
+	test_must_fail git rebase squashed &&
+	test_when_finished "git rebase --abort" &&
+	test_when_finished "rm .gitattributes"
+
+Rebasing (1/3)
warning: Cannot merge binary files: file (HEAD vs. bb8cb29 (initial))
+Auto-merging file
+CONFLICT (add/add): Merge conflict in file
+error: could not apply bb8cb29... initial
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bb8cb29... initial
+ok 7 - do not drop patch binary
+
+expecting success of 3419.8 'do not drop patch modechange': 
+	git checkout -q modeother^{} &&
+	git rebase other &&
+	cat >expected <<-\EOF &&
+	diff --git a/file b/file
+	old mode 100644
+	new mode 100755
+	EOF
+	git diff HEAD~ >modediff &&
+	test_cmp expected modediff
+
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 8 - do not drop patch modechange
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3416-rebase-onto-threedots.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3416-rebase-onto-threedots/.git/
+expecting success of 3416.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	git branch side &&
+	test_commit C &&
+	git branch topic &&
+	git checkout side &&
+	test_commit H &&
+	git checkout main &&
+	test_tick &&
+	git merge H &&
+	git tag D &&
+	test_commit E &&
+	git checkout topic &&
+	test_commit F &&
+	test_commit G &&
+	git checkout side &&
+	test_tick &&
+	git merge C &&
+	git tag I &&
+	test_commit J &&
+	test_commit K
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'side'
+[side e9f30f6] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ H.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+[main 0cd72fb] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'topic'
+[topic 0fb828b] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[topic a08c965] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[side 9eed7bf] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+[side 4d3c411] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+ok 1 - setup
+
+expecting success of 3416.2 'rebase --onto main...topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --onto main...topic F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 2 - rebase --onto main...topic
+
+expecting success of 3416.3 'rebase --onto main...': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --onto main... F &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 3 - rebase --onto main...
+
+expecting success of 3416.4 'rebase --onto main...side': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase --onto main...side J
+
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main...side': need exactly one merge base
+ok 4 - rebase --onto main...side
+
+expecting success of 3416.5 'rebase -i --onto main...topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --onto main...topic F
+	) &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 5 - rebase -i --onto main...topic
+
+expecting success of 3416.6 'rebase -i --onto main...': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --onto main... F
+	) &&
+	git rev-parse HEAD^1 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at f576ef2 G
+Already on 'topic'
+HEAD is now at a08c965 G
+Rebasing (1/1)
Successfully rebased and updated refs/heads/topic.
+ok 6 - rebase -i --onto main...
+
+expecting success of 3416.7 'rebase --onto main...side requires a single merge-base': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase -i --onto main...side J 2>err &&
+	grep "need exactly one merge base" err
+
+HEAD is now at f576ef2 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main...side': need exactly one merge base
+ok 7 - rebase --onto main...side requires a single merge-base
+
+expecting success of 3416.8 'rebase --keep-base --onto incompatible': 
+	test_must_fail git rebase --keep-base --onto main...
+
+fatal: options '--keep-base' and '--onto' cannot be used together
+ok 8 - rebase --keep-base --onto incompatible
+
+expecting success of 3416.9 'rebase --keep-base --root incompatible': 
+	test_must_fail git rebase --keep-base --root
+
+fatal: options '--keep-base' and '--root' cannot be used together
+ok 9 - rebase --keep-base --root incompatible
+
+expecting success of 3416.10 'rebase --keep-base main from topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	git rebase --keep-base main &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Current branch topic is up to date.
+ok 10 - rebase --keep-base main from topic
+
+expecting success of 3416.11 'rebase --keep-base main topic from main': 
+	git checkout main &&
+	git branch -f topic G &&
+
+	git rebase --keep-base main topic &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+Switched to branch 'main'
+Current branch topic is up to date.
+ok 11 - rebase --keep-base main topic from main
+
+expecting success of 3416.12 'rebase --keep-base main from side': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase --keep-base main
+
+HEAD is now at a08c965 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main': need exactly one merge base with branch
+ok 12 - rebase --keep-base main from side
+
+expecting success of 3416.13 'rebase -i --keep-base main from topic': 
+	git reset --hard &&
+	git checkout topic &&
+	git reset --hard G &&
+
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base main
+	) &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+HEAD is now at 4d3c411 K
+Switched to branch 'topic'
+HEAD is now at a08c965 G
+Successfully rebased and updated refs/heads/topic.
+ok 13 - rebase -i --keep-base main from topic
+
+expecting success of 3416.14 'rebase -i --keep-base main topic from main': 
+	git checkout main &&
+	git branch -f topic G &&
+
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base main topic
+	) &&
+	git rev-parse C >base.expect &&
+	git merge-base main HEAD >base.actual &&
+	test_cmp base.expect base.actual &&
+
+	git rev-parse HEAD~2 >actual &&
+	git rev-parse C^0 >expect &&
+	test_cmp expect actual
+
+Switched to branch 'main'
+Successfully rebased and updated refs/heads/topic.
+ok 14 - rebase -i --keep-base main topic from main
+
+expecting success of 3416.15 'rebase --keep-base requires a single merge base': 
+	git reset --hard &&
+	git checkout side &&
+	git reset --hard K &&
+
+	test_must_fail git rebase -i --keep-base main 2>err &&
+	grep "need exactly one merge base with branch" err
+
+HEAD is now at a08c965 G
+Switched to branch 'side'
+HEAD is now at 4d3c411 K
+fatal: 'main': need exactly one merge base with branch
+ok 15 - rebase --keep-base requires a single merge base
+
+expecting success of 3416.16 'rebase --keep-base keeps cherry picks': 
+	git checkout -f -B main E &&
+	git cherry-pick F &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=2 git rebase -i --keep-base HEAD G
+	) &&
+	test_cmp_rev HEAD G
+
+Switched to and reset branch 'main'
+[main 3dacdd2] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+Successfully rebased and updated detached HEAD.
+ok 16 - rebase --keep-base keeps cherry picks
+
+expecting success of 3416.17 'rebase --keep-base --no-reapply-cherry-picks': 
+	git checkout -f -B main E &&
+	git cherry-pick F &&
+	(
+		set_fake_editor &&
+		EXPECT_COUNT=1 git rebase -i --keep-base \
+					--no-reapply-cherry-picks HEAD G
+	) &&
+	test_cmp_rev HEAD^ C
+
+Previous HEAD position was a08c965 G
+Switched to and reset branch 'main'
+[main 3dacdd2] F
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+warning: skipped previously applied commit 0fb828b
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 17 - rebase --keep-base --no-reapply-cherry-picks
+
+expecting success of 3416.18 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 18 - $EDITOR and friends are unchanged
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3422-rebase-incompatible-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3422-rebase-incompatible-options/.git/
 expecting success of 3422.1 'setup': 
@@ -147644,172 +147600,41 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3423-rebase-reword/.git/
-expecting success of 3423.1 'setup': 
-	test_commit main file-1 test &&
+*** t3418-rebase-continue.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3418-rebase-continue/.git/
+expecting success of 3418.1 'setup': 
+	test_commit "commit-new-file-F1" F1 1 &&
+	test_commit "commit-new-file-F2" F2 2 &&
 
-	git checkout -b stuff &&
+	git checkout -b topic HEAD^ &&
+	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
 
-	test_commit feature_a file-2 aaa &&
-	test_commit feature_b file-2 ddd
+	git checkout main
 
-[master (root-commit) 2fc88f2] main
+[main (root-commit) dac1376] commit-new-file-F1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file-1
-Switched to a new branch 'stuff'
-[stuff bfc518c] feature_a
+ create mode 100644 F1
+[main 953b3db] commit-new-file-F2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file-2
-[stuff 6975fa1] feature_b
+ create mode 100644 F2
+Switched to a new branch 'topic'
+[topic 24c5d85] commit-new-file-F2-on-topic-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F2
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 3423.2 'reword without issues functions as intended': 
-	test_when_finished "reset_rebase" &&
+expecting success of 3418.2 'merge based rebase --continue with works with touched file': 
+	rm -fr .git/rebase-* &&
+	git reset --hard &&
+	git checkout main &&
 
-	git checkout stuff^0 &&
-
-	set_fake_editor &&
-	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
-		git rebase -i -v main &&
-
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 3
-
-Note: switching to 'stuff^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6975fa1 feature_b
-Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
-rebase -i script before editing:
-pick bfc518c feature_a
-pick 6975fa1 feature_b
-
-rebase -i script after editing:
-pick bfc518c feature_a
-reword 6975fa1 feature_b
-Rebasing (2/2)
-[detached HEAD 7179cda] feature_b_reworded
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-HEAD is now at 7179cda feature_b_reworded
-Removing fake-editor.sh
-ok 2 - reword without issues functions as intended
-
-expecting success of 3423.3 'reword after a conflict preserves commit': 
-	test_when_finished "reset_rebase" &&
-
-	git checkout stuff^0 &&
-
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 2" \
-		git rebase -i -v main &&
-
-	git checkout --theirs file-2 &&
-	git add file-2 &&
-	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
-
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 2
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7179cda feature_b_reworded
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 7179cda
-
-HEAD is now at 6975fa1 feature_b
-Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
-rebase -i script before editing:
-pick bfc518c feature_a
-pick 6975fa1 feature_b
-
-rebase -i script after editing:
-reword 6975fa1 feature_b
-Rebasing (1/1)
-CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
-error: could not apply 6975fa1... feature_b
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 6975fa1... feature_b
-Updated 1 path from the index
-[detached HEAD 2e9e381] feature_b_reworded
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-2
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-HEAD is now at 2e9e381 feature_b_reworded
-Removing fake-editor.sh
-ok 3 - reword after a conflict preserves commit
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3418-rebase-continue.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3418-rebase-continue/.git/
-expecting success of 3418.1 'setup': 
-	test_commit "commit-new-file-F1" F1 1 &&
-	test_commit "commit-new-file-F2" F2 2 &&
-
-	git checkout -b topic HEAD^ &&
-	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
-
-	git checkout main
-
-[main (root-commit) dac1376] commit-new-file-F1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F1
-[main 953b3db] commit-new-file-F2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F2
-Switched to a new branch 'topic'
-[topic 24c5d85] commit-new-file-F2-on-topic-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F2
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 3418.2 'merge based rebase --continue with works with touched file': 
-	rm -fr .git/rebase-* &&
-	git reset --hard &&
-	git checkout main &&
-
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	test-tool chmtime =-60 F1 &&
-	git rebase --continue
+	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+	test-tool chmtime =-60 F1 &&
+	git rebase --continue
 
 HEAD is now at 953b3db commit-new-file-F2
 Already on 'main'
@@ -148825,10 +148650,11 @@
 hint: Disable this message with "git config set advice.mergeConflict false"
 Resolved 'F2' using previous resolution.
 Could not apply 24c5d85... 
-[detached HEAD cf7125b] commit-new-file-F2-on-topic-branch
+
+[detached HEAD da61d7a] commit-new-file-F2-on-topic-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)
Stopped at cf7125b (commit-new-file-F2-on-topic-branch)
+ 1 file changed, 1 deletion(-)
+Rebasing (2/2)
Stopped at da61d7a (commit-new-file-F2-on-topic-branch)
 ok 20 - patch file is removed before break command
 
 expecting success of 3418.21 '--reschedule-failed-exec': 
@@ -149160,6 +148986,137 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3423-rebase-reword/.git/
+expecting success of 3423.1 'setup': 
+	test_commit main file-1 test &&
+
+	git checkout -b stuff &&
+
+	test_commit feature_a file-2 aaa &&
+	test_commit feature_b file-2 ddd
+
+[master (root-commit) 2fc88f2] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-1
+Switched to a new branch 'stuff'
+[stuff bfc518c] feature_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+[stuff 6975fa1] feature_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3423.2 'reword without issues functions as intended': 
+	test_when_finished "reset_rebase" &&
+
+	git checkout stuff^0 &&
+
+	set_fake_editor &&
+	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
+		git rebase -i -v main &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 3
+
+Note: switching to 'stuff^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6975fa1 feature_b
+Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
+rebase -i script before editing:
+pick bfc518c feature_a
+pick 6975fa1 feature_b
+
+rebase -i script after editing:
+pick bfc518c feature_a
+reword 6975fa1 feature_b
+Rebasing (2/2)
+[detached HEAD 7179cda] feature_b_reworded
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+HEAD is now at 7179cda feature_b_reworded
+Removing fake-editor.sh
+ok 2 - reword without issues functions as intended
+
+expecting success of 3423.3 'reword after a conflict preserves commit': 
+	test_when_finished "reset_rebase" &&
+
+	git checkout stuff^0 &&
+
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="reword 2" \
+		git rebase -i -v main &&
+
+	git checkout --theirs file-2 &&
+	git add file-2 &&
+	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
+
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 2
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7179cda feature_b_reworded
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 7179cda
+
+HEAD is now at 6975fa1 feature_b
+Changes from 2fc88f2741a214c6daa29c1ac97d0376c9cd858d to 2fc88f2741a214c6daa29c1ac97d0376c9cd858d:
+rebase -i script before editing:
+pick bfc518c feature_a
+pick 6975fa1 feature_b
+
+rebase -i script after editing:
+reword 6975fa1 feature_b
+Rebasing (1/1)
+CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
+error: could not apply 6975fa1... feature_b
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 6975fa1... feature_b
+Updated 1 path from the index
+[detached HEAD 2e9e381] feature_b_reworded
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+HEAD is now at 2e9e381 feature_b_reworded
+Removing fake-editor.sh
+ok 3 - reword after a conflict preserves commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3415-rebase-autosquash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3415-rebase-autosquash/.git/
 expecting success of 3415.1 'setup': 
@@ -149744,7 +149701,7 @@
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 fixup
 Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Successfully rebased and updated refs/heads/main.
-pick 26ba9f6 [A U Thor @ 21 years ago] empty2 # empty
+pick 26ba9f6 [A U Thor @ 20 years ago] empty2 # empty
 ok 22 - autosquash with multiple empty patches
 
 expecting success of 3415.23 'extra spaces after fixup!': 
@@ -149815,7 +149772,7 @@
  Author: A U Thor <author@example.com>
 Rebasing (2/4)
error: there was a problem with the editor 'grep -q ^pick'
 Please supply the message using either -m or -F option.
-Could not apply 6d29458... [A U Thor @ 21 years ago] squash! first # empty
+Could not apply 6d29458... [A U Thor @ 20 years ago] squash! first # empty
 [detached HEAD 96a770e] edited-first
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 16:33:13 2005 -0700
@@ -150789,1313 +150746,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3421-rebase-topology-linear.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3421-rebase-topology-linear/.git/
-expecting success of 3421.1 'setup': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e
-
-[master (root-commit) ce450c7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 020ea9b] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master d9ea348] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Note: switching to 'b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 020ea9b b
-[detached HEAD 1bd0260] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-[detached HEAD 67a7211] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-ok 1 - setup
-
-expecting success of 3421.2 'simple rebase --apply': 
-		reset_rebase &&
-		git rebase --apply c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 2 - simple rebase --apply
-
-expecting success of 3421.3 'simple rebase -m': 
-		reset_rebase &&
-		git rebase -m c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 3 - simple rebase -m
-
-expecting success of 3421.4 'simple rebase -i': 
-		reset_rebase &&
-		git rebase -i c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - simple rebase -i
-
-expecting success of 3421.5 'setup branches and remote tracking': 
-	git tag -l >tags &&
-	for tag in $(cat tags)
-	do
-		git branch branch-$tag $tag || return 1
-	done &&
-	git remote add origin "file://$PWD" &&
-	git fetch origin
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3421-rebase-topology-linear
- * [new branch]      branch-a   -> origin/branch-a
- * [new branch]      branch-b   -> origin/branch-b
- * [new branch]      branch-c   -> origin/branch-c
- * [new branch]      branch-d   -> origin/branch-d
- * [new branch]      branch-e   -> origin/branch-e
- * [new branch]      master     -> origin/master
-ok 5 - setup branches and remote tracking
-
-expecting success of 3421.6 'rebase --apply is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Removing tags
-Current branch e is up to date.
-ok 6 - rebase --apply is no-op if upstream is an ancestor
-
-expecting success of 3421.7 'rebase -m is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Current branch e is up to date.
-ok 7 - rebase -m is no-op if upstream is an ancestor
-
-expecting success of 3421.8 'rebase -i is no-op if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i b e &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 8 - rebase -i is no-op if upstream is an ancestor
-
-expecting success of 3421.9 'rebase --apply -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Current branch e is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 9 - rebase --apply -f rewrites even if upstream is an ancestor
-
-expecting success of 3421.10 'rebase --fork-point -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --fork-point -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 10 - rebase --fork-point -f rewrites even if upstream is an ancestor
-
-expecting success of 3421.11 'rebase -m -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 11 - rebase -m -f rewrites even if upstream is an ancestor
-
-expecting success of 3421.12 'rebase -i -f rewrites even if upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i -f b e &&
-		test_cmp_rev ! e HEAD &&
-		test_cmp_rev b HEAD~2 &&
-		test_linear_range 'd e' b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 12 - rebase -i -f rewrites even if upstream is an ancestor
-
-expecting success of 3421.13 'rebase --apply -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --apply -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 13 - rebase --apply -f rewrites even if remote upstream is an ancestor
-
-expecting success of 3421.14 'rebase --fork-point -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase --fork-point -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 14 - rebase --fork-point -f rewrites even if remote upstream is an ancestor
-
-expecting success of 3421.15 'rebase -m -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -m -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Current branch branch-e is up to date, rebase forced.
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 15 - rebase -m -f rewrites even if remote upstream is an ancestor
-
-expecting success of 3421.16 'rebase -i -f rewrites even if remote upstream is an ancestor': 
-		reset_rebase &&
-		git rebase -i -f branch-b branch-e &&
-		test_cmp_rev ! branch-e origin/branch-e &&
-		test_cmp_rev branch-b HEAD~2 &&
-		test_linear_range 'd e' branch-b..
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
-ok 16 - rebase -i -f rewrites even if remote upstream is an ancestor
-
-expecting success of 3421.17 'rebase --apply fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase --apply e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 354afb0 e
-First, rewinding head to replay your work on top of it...
-Fast-forwarded b to e.
-ok 17 - rebase --apply fast-forwards from ancestor of upstream
-
-expecting success of 3421.18 'rebase --fork-point fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase --fork-point e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 18 - rebase --fork-point fast-forwards from ancestor of upstream
-
-expecting success of 3421.19 'rebase -m fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase -m e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 19 - rebase -m fast-forwards from ancestor of upstream
-
-expecting success of 3421.20 'rebase -i fast-forwards from ancestor of upstream': 
-		reset_rebase &&
-		git rebase -i e b &&
-		test_cmp_rev e HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-Successfully rebased and updated detached HEAD.
-ok 20 - rebase -i fast-forwards from ancestor of upstream
-
-expecting success of 3421.21 'setup of linear history for range selection tests': 
-	git checkout c &&
-	test_commit g &&
-	revert h g &&
-	git checkout d &&
-	cherry_pick gp g &&
-	test_commit i &&
-	git checkout b &&
-	test_commit f
-
-Previous HEAD position was 67a7211 e
-HEAD is now at d9ea348 c
-[detached HEAD 5573dba] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 09e6546] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 g.t
-Previous HEAD position was 09e6546 h
-HEAD is now at 1bd0260 d
-[detached HEAD 00eccdb] gp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 3317c29] i
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Previous HEAD position was 3317c29 i
-HEAD is now at 020ea9b b
-[detached HEAD 09e072f] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f.t
-ok 21 - setup of linear history for range selection tests
-
-expecting success of 3421.22 'rebase --apply drops patches in upstream': 
-		reset_rebase &&
-		git rebase --apply h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 09e072f f
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: i
-ok 22 - rebase --apply drops patches in upstream
-
-expecting success of 3421.23 'rebase -m drops patches in upstream': 
-		reset_rebase &&
-		git rebase -m h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 23 - rebase -m drops patches in upstream
-
-expecting success of 3421.24 'rebase -i drops patches in upstream': 
-		reset_rebase &&
-		git rebase -i h i &&
-		test_cmp_rev h HEAD~2 &&
-		test_linear_range 'd i' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 24 - rebase -i drops patches in upstream
-
-expecting success of 3421.25 'rebase --apply can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase --apply h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at 5c158e9 i
-First, rewinding head to replay your work on top of it...
-Applying: d
-ok 25 - rebase --apply can drop last patch if in upstream
-
-expecting success of 3421.26 'rebase -m can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase -m h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 26 - rebase -m can drop last patch if in upstream
-
-expecting success of 3421.27 'rebase -i can drop last patch if in upstream': 
-		reset_rebase &&
-		git rebase -i h gp &&
-		test_cmp_rev h HEAD^ &&
-		test_linear_range 'd' h..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 27 - rebase -i can drop last patch if in upstream
-
-expecting success of 3421.28 'rebase --apply --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase --apply --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at e937a8e d
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: i
-ok 28 - rebase --apply --onto drops patches in upstream
-
-expecting success of 3421.29 'rebase -m --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase -m --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 29 - rebase -m --onto drops patches in upstream
-
-expecting success of 3421.30 'rebase -i --onto drops patches in upstream': 
-		reset_rebase &&
-		git rebase -i --onto f h i &&
-		test_cmp_rev f HEAD~2 &&
-		test_linear_range 'd i' f..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 30 - rebase -i --onto drops patches in upstream
-
-expecting success of 3421.31 'rebase --apply --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase --apply --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bcc98eb i
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: gp
-Applying: i
-ok 31 - rebase --apply --onto does not drop patches in onto
-
-expecting success of 3421.32 'rebase -m --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase -m --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bbe8f41 i
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 32 - rebase -m --onto does not drop patches in onto
-
-expecting success of 3421.33 'rebase -i --onto does not drop patches in onto': 
-		reset_rebase &&
-		git rebase -i --onto h f i &&
-		test_cmp_rev h HEAD~3 &&
-		test_linear_range 'd gp i' h..
-	
-fatal: no rebase in progress
-HEAD is now at bbe8f41 i
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 33 - rebase -i --onto does not drop patches in onto
-
-expecting success of 3421.34 'setup of linear history for empty commit tests': 
-	git checkout c &&
-	make_empty j &&
-	git checkout d &&
-	make_empty k &&
-	test_commit l
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  bbe8f41 i
-  4a12efe gp
-  e937a8e d
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> bbe8f41
-
-HEAD is now at d9ea348 c
-[detached HEAD 5b67321] j
- Author: A U Thor <author@example.com>
-Previous HEAD position was 5b67321 j
-HEAD is now at 1bd0260 d
-[detached HEAD 753370d] k
- Author: A U Thor <author@example.com>
-[detached HEAD 49cf309] l
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 l.t
-ok 34 - setup of linear history for empty commit tests
-
-checking known breakage of 3421.35 'rebase --apply keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase --apply j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 49cf309 l
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: l
-error: two revisions point to different objects:
-  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-  'HEAD~4': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
-not ok 35 - rebase --apply keeps begin-empty commits # TODO known breakage
-
-expecting success of 3421.36 'rebase -m keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -m j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 1612308 l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 36 - rebase -m keeps begin-empty commits
-
-expecting success of 3421.37 'rebase -i keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -i j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 37 - rebase -i keeps begin-empty commits
-
-expecting success of 3421.38 'rebase -m --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -m --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 38 - rebase -m --no-keep-empty drops begin-empty commits
-
-expecting success of 3421.39 'rebase -i --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -i --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 39 - rebase -i --no-keep-empty drops begin-empty commits
-
-expecting success of 3421.40 'rebase -m --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -m --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 40 - rebase -m --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.41 'rebase -i --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -i --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 41 - rebase -i --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.42 'rebase --rebase-merges --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase --rebase-merges --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
-ok 42 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.43 'setup of linear history for test involving root': 
-	git checkout b &&
-	revert m b &&
-	git checkout --orphan disjoint &&
-	git rm -rf . &&
-	test_commit x &&
-	test_commit y &&
-	cherry_pick bp b
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  5395ede l
-  9a731c2 k
-  60768b3 d
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5395ede
-
-HEAD is now at 020ea9b b
-[detached HEAD 6db5543] m
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 b.t
-Switched to a new branch 'disjoint'
-rm 'a.t'
-[disjoint (root-commit) 059091f] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-[disjoint be1e399] y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 y.t
-[disjoint b7cb922] bp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-ok 43 - setup of linear history for test involving root
-
-expecting success of 3421.44 'rebase --apply --onto --root': 
-		reset_rebase &&
-		git rebase --apply --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at b7cb922 bp
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 44 - rebase --apply --onto --root
-
-expecting success of 3421.45 'rebase -m --onto --root': 
-		reset_rebase &&
-		git rebase -m --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 45 - rebase -m --onto --root
-
-expecting success of 3421.46 'rebase -i --onto --root': 
-		reset_rebase &&
-		git rebase -i --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 46 - rebase -i --onto --root
-
-expecting success of 3421.47 'rebase --apply without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase --apply c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 47 - rebase --apply without --onto --root with disjoint history
-
-expecting success of 3421.48 'rebase -m without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -m c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 48 - rebase -m without --onto --root with disjoint history
-
-expecting success of 3421.49 'rebase -i without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -i c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 49 - rebase -i without --onto --root with disjoint history
-
-expecting success of 3421.50 'rebase --apply --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 50 - rebase --apply --onto --root drops patch in onto
-
-expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -m --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 51 - rebase -m --onto --root drops patch in onto
-
-expecting success of 3421.52 'rebase -i --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -i --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 52 - rebase -i --onto --root drops patch in onto
-
-expecting success of 3421.53 'rebase --apply --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase --apply --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-First, rewinding head to replay your work on top of it...
-Applying: c
-Applying: g
-ok 53 - rebase --apply --onto --root with merge-base does not go to root
-
-expecting success of 3421.54 'rebase -m --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -m --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 54 - rebase -m --onto --root with merge-base does not go to root
-
-expecting success of 3421.55 'rebase -i --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -i --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 55 - rebase -i --onto --root with merge-base does not go to root
-
-expecting success of 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -m m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -i m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase  --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 59 - rebase  --root on linear history is a no-op
-
-expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -m --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 60 - rebase -m --root on linear history is a no-op
-
-expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -i --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 61 - rebase -i --root on linear history is a no-op
-
-expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase  -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 62 - rebase  -f --root on linear history causes re-write
-
-expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -m -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 63 - rebase -m -f --root on linear history causes re-write
-
-expecting success of 3421.64 'rebase -i -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -i -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 64 - rebase -i -f --root on linear history causes re-write
-
-# still have 1 known breakage(s)
-# passed all remaining 63 test(s)
-1..64
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3428-rebase-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3428-rebase-signoff/.git/
-expecting success of 3428.1 'setup': 
-	git commit --allow-empty -m "Initial empty commit" &&
-	test_commit first file a &&
-	test_commit second file &&
-	git checkout -b conflict-branch first &&
-	test_commit file-2 file-2 &&
-	test_commit conflict file &&
-	test_commit third file &&
-
-	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
-
-	# Expected commit message for initial commit after rebase --signoff
-	cat >expected-initial-signed <<-EOF &&
-	Initial empty commit
-
-	Signed-off-by: $ident
-	EOF
-
-	# Expected commit message after rebase --signoff
-	cat >expected-signed <<-EOF &&
-	first
-
-	Signed-off-by: $ident
-	EOF
-
-	# Expected commit message after conflict resolution for rebase --signoff
-	cat >expected-signed-conflict <<-EOF &&
-	third
-
-	Signed-off-by: $ident
-
-	conflict
-
-	Signed-off-by: $ident
-
-	file-2
-
-	Signed-off-by: $ident
-
-	EOF
-
-	# Expected commit message after rebase without --signoff (or with --no-signoff)
-	cat >expected-unsigned <<-EOF &&
-	first
-	EOF
-
-	git config alias.rbs "rebase --signoff"
-
-[master (root-commit) 6c54391] Initial empty commit
- Author: A U Thor <author@example.com>
-[master 626aa63] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master cee64ce] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflict-branch'
-[conflict-branch 3c3ba6d] file-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-2
-[conflict-branch b53cad1] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch c062584] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3428.2 'rebase --apply --signoff adds a sign-off line': 
-	test_must_fail git rbs --apply second third &&
-	git checkout --theirs file &&
-	git add file &&
-	git rebase --continue &&
-	git log --format=%B -n3 >actual &&
-	test_cmp expected-signed-conflict actual
-
-First, rewinding head to replay your work on top of it...
-Applying: file-2
-Applying: conflict
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-84c676d file-2
-virtual conflict
-found 1 common ancestor:
-virtual 848740929e99bda0e1a9783e7daa314c5a9732d5
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0002 conflict
-Updated 1 path from the index
-Applying: conflict
-Applying: third
-ok 2 - rebase --apply --signoff adds a sign-off line
-
-expecting success of 3428.3 'rebase --no-signoff does not add a sign-off line': 
-	git commit --amend -m "first" &&
-	git rbs --no-signoff HEAD^ &&
-	test_commit_message HEAD expected-unsigned
-
-[detached HEAD 56522f9] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date.
-ok 3 - rebase --no-signoff does not add a sign-off line
-
-expecting success of 3428.4 'rebase --exec --signoff adds a sign-off line': 
-	test_when_finished "rm exec" &&
-	git rebase --exec "touch exec" --signoff first^ first &&
-	test_path_is_file exec &&
-	test_commit_message HEAD expected-signed
-
-Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
-Successfully rebased and updated detached HEAD.
-ok 4 - rebase --exec --signoff adds a sign-off line
-
-expecting success of 3428.5 'rebase --root --signoff adds a sign-off line': 
-	git checkout first &&
-	git rebase --root --keep-empty --signoff &&
-	test_commit_message HEAD^ expected-initial-signed &&
-	test_commit_message HEAD expected-signed
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d43d5c6 first
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> d43d5c6
-
-HEAD is now at 626aa63 first
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 5 - rebase --root --signoff adds a sign-off line
-
-expecting success of 3428.6 'rebase -m --signoff adds a sign-off line': 
-	test_must_fail git rebase -m --signoff second third &&
-	git checkout --theirs file &&
-	git add file &&
-	GIT_EDITOR="sed -n /Conflicts:/,/^\\\$/p >actual" \
-		git rebase --continue &&
-	cat >expect <<-\EOF &&
-	# Conflicts:
-	#	file
-
-	EOF
-	test_cmp expect actual &&
-	git log --format=%B -n3 >actual &&
-	test_cmp expected-signed-conflict actual
-
-Rebasing (1/3)
Rebasing (2/3)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply b53cad1... conflict
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply b53cad1... conflict
-Updated 1 path from the index
-[detached HEAD 613a669] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Successfully rebased and updated detached HEAD.
-ok 6 - rebase -m --signoff adds a sign-off line
-
-expecting success of 3428.7 'rebase -i --signoff adds a sign-off line when editing commit': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="edit 1 edit 3 edit 2" \
-			git rebase -i --signoff first third
-	) &&
-	echo a >a &&
-	git add a &&
-	test_must_fail git rebase --continue &&
-	git checkout --ours file &&
-	echo b >a &&
-	git add a file &&
-	git rebase --continue &&
-	echo c >a &&
-	git add a &&
-	git log --format=%B -n3 >actual &&
-	cat >expect <<-EOF &&
-	conflict
-
-	Signed-off-by: $ident
-
-	third
-
-	Signed-off-by: $ident
-
-	file-2
-
-	Signed-off-by: $ident
-
-	EOF
-	test_cmp expect actual
-
-rebase -i script before editing:
-pick 3c3ba6d file-2
-pick b53cad1 conflict
-pick c062584 third
-
-rebase -i script after editing:
-edit 3c3ba6d file-2
-edit c062584 third
-edit b53cad1 conflict
-Rebasing (1/3)
Stopped at 3c3ba6d...  file-2
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-[detached HEAD 22331a7] file-2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 file-2
-Rebasing (2/3)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply c062584... third
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply c062584... third
-Updated 1 path from the index
-[detached HEAD 8033101] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (3/3)
Stopped at b53cad1...  conflict
-You can amend the commit now, with
-
-  git commit --amend 
-
-Once you are satisfied with your changes, run
-
-  git rebase --continue
-ok 7 - rebase -i --signoff adds a sign-off line when editing commit
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3429-rebase-edit-todo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3429-rebase-edit-todo/.git/
-expecting success of 3429.1 'setup': 
-	test_commit first file &&
-	test_commit second file &&
-	test_commit third file
-
-[master (root-commit) 07e65e0] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master fa10d42] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master ba0a06e] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3429.2 'rebase exec modifies rebase-todo': 
-	todo=.git/rebase-merge/git-rebase-todo &&
-	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
-	test -e F
-
-Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
-Rebasing (3/3)
Executing: touch F
-Successfully rebased and updated refs/heads/master.
-ok 2 - rebase exec modifies rebase-todo
-
-expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
-	git rebase HEAD -x "true" 2>output &&
-	! grep "Executing: true" output
-
-ok 3 - rebase exec with an empty list does not exec anything
-
-expecting success of 3429.4 'loose object cache vs re-reading todo list': 
-	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
-	export GIT_REBASE_TODO &&
-	write_script append-todo.sh <<-\EOS &&
-	# For values 5 and 6, this yields SHA-1s with the same first two digits
-	echo "pick $(git rev-parse --short \
-		$(printf "%s\\n" \
-			"tree $EMPTY_TREE" \
-			"author A U Thor <author@example.org> $1 +0000" \
-			"committer A U Thor <author@example.org> $1 +0000" \
-			"" \
-			"$1" |
-		  git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
-
-	shift
-	test -z "$*" ||
-	echo "exec $0 $*" >>$GIT_REBASE_TODO
-	EOS
-
-	git rebase HEAD -x "./append-todo.sh 5 6"
-
-Successfully rebased and updated refs/heads/master.
-ok 4 - loose object cache vs re-reading todo list
-
-expecting success of 3429.5 'todo is re-read after reword and squash': 
-	write_script reword-editor.sh <<-\EOS &&
-	GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \
-		git rebase --edit-todo
-	EOS
-
-	test_write_lines first third >expected &&
-	set_fake_editor &&
-	GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \
-		GIT_EDITOR=./reword-editor.sh git rebase -i --root third &&
-	test_cmp expected actual
-
-rebase -i script before editing:
-pick 07e65e0 first
-pick fa10d42 second
-pick ba0a06e third
-
-rebase -i script after editing:
-reword 07e65e0 first
-squash fa10d42 second
-fixup ba0a06e third
-Rebasing (1/3)
[detached HEAD 67746ec] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 15dd5e0] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Rebasing (4/5)
Executing: echo first >>actual
-Rebasing (5/5)
Executing: echo third >>actual
-Successfully rebased and updated detached HEAD.
-ok 5 - todo is re-read after reword and squash
-
-expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
-	git reset --hard third &&
-
-	git revert --edit third second &&
-
-	cat >expect <<-\EOF &&
-	Revert "second"
-	Revert "third"
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
-
-HEAD is now at ba0a06e third
-[detached HEAD 2d8e437] Revert "third"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 60853ee] Revert "second"
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - re-reading todo doesnt interfere with revert --edit
-
-expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
-	git reset --hard first &&
-
-	git cherry-pick --edit second third &&
-
-	cat >expect <<-\EOF &&
-	third
-	second
-	first
-	EOF
-	git log --format="%s" >actual &&
-	test_cmp expect actual
-
-HEAD is now at 07e65e0 first
-[detached HEAD e619899] second
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD c9a7b60] third
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - re-reading todo doesnt interfere with cherry-pick --edit
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3420-rebase-autostash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3420-rebase-autostash/.git/
 expecting success of 3420.1 'setup': 
@@ -153513,3075 +152163,1733 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t1092-sparse-checkout-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1092-sparse-checkout-compatibility/.git/
-expecting success of 1092.1 'setup': 
-	git init initial-repo &&
-	(
-		GIT_TEST_SPARSE_INDEX=0 &&
-		cd initial-repo &&
-		echo a >a &&
-		echo "after deep" >e &&
-		echo "after folder1" >g &&
-		echo "after x" >z &&
-		mkdir folder1 folder2 deep before x &&
-		echo "before deep" >before/a &&
-		echo "before deep again" >before/b &&
-		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
-		mkdir deep/deeper1/deepest &&
-		mkdir deep/deeper1/deepest2 &&
-		mkdir deep/deeper1/deepest3 &&
-		echo "after deeper1" >deep/e &&
-		echo "after deepest" >deep/deeper1/e &&
-		cp a folder1 &&
-		cp a folder2 &&
-		cp a x &&
-		cp a deep &&
-		cp a deep/before &&
-		cp a deep/deeper1 &&
-		cp a deep/deeper2 &&
-		cp a deep/later &&
-		cp a deep/deeper1/deepest &&
-		cp a deep/deeper1/deepest2 &&
-		cp a deep/deeper1/deepest3 &&
-		cp -r deep/deeper1/ deep/deeper2 &&
-		mkdir deep/deeper1/0 &&
-		mkdir deep/deeper1/0/0 &&
-		touch deep/deeper1/0/1 &&
-		touch deep/deeper1/0/0/0 &&
-		>folder1- &&
-		>folder1.x &&
-		>folder10 &&
-		cp -r deep/deeper1/0 folder1 &&
-		cp -r deep/deeper1/0 folder2 &&
-		echo >>folder1/0/0/0 &&
-		echo >>folder2/0/1 &&
-		git add . &&
-		git commit -m "initial commit" &&
-		git checkout -b base &&
-		for dir in folder1 folder2 deep
-		do
-			git checkout -b update-$dir base &&
-			echo "updated $dir" >$dir/a &&
-			git commit -a -m "update $dir" || return 1
-		done &&
+*** t3428-rebase-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3428-rebase-signoff/.git/
+expecting success of 3428.1 'setup': 
+	git commit --allow-empty -m "Initial empty commit" &&
+	test_commit first file a &&
+	test_commit second file &&
+	git checkout -b conflict-branch first &&
+	test_commit file-2 file-2 &&
+	test_commit conflict file &&
+	test_commit third file &&
 
-		git checkout -b rename-base base &&
-		cat >folder1/larger-content <<-\EOF &&
-		matching
-		lines
-		help
-		inexact
-		renames
-		EOF
-		cp folder1/larger-content folder2/ &&
-		cp folder1/larger-content deep/deeper1/ &&
-		git add . &&
-		git commit -m "add interesting rename content" &&
+	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
 
-		git checkout -b rename-out-to-out rename-base &&
-		mv folder1/a folder2/b &&
-		mv folder1/larger-content folder2/edited-content &&
-		echo >>folder2/edited-content &&
-		echo >>folder2/0/1 &&
-		echo stuff >>deep/deeper1/a &&
-		git add . &&
-		git commit -m "rename folder1/... to folder2/..." &&
+	# Expected commit message for initial commit after rebase --signoff
+	cat >expected-initial-signed <<-EOF &&
+	Initial empty commit
 
-		git checkout -b rename-out-to-in rename-base &&
-		mv folder1/a deep/deeper1/b &&
-		echo more stuff >>deep/deeper1/a &&
-		rm folder2/0/1 &&
-		mkdir folder2/0/1 &&
-		echo >>folder2/0/1/1 &&
-		mv folder1/larger-content deep/deeper1/edited-content &&
-		echo >>deep/deeper1/edited-content &&
-		git add . &&
-		git commit -m "rename folder1/... to deep/deeper1/..." &&
+	Signed-off-by: $ident
+	EOF
 
-		git checkout -b rename-in-to-out rename-base &&
-		mv deep/deeper1/a folder1/b &&
-		echo >>folder2/0/1 &&
-		rm -rf folder1/0/0 &&
-		echo >>folder1/0/0 &&
-		mv deep/deeper1/larger-content folder1/edited-content &&
-		echo >>folder1/edited-content &&
-		git add . &&
-		git commit -m "rename deep/deeper1/... to folder1/..." &&
+	# Expected commit message after rebase --signoff
+	cat >expected-signed <<-EOF &&
+	first
 
-		git checkout -b df-conflict-1 base &&
-		rm -rf folder1 &&
-		echo content >folder1 &&
-		git add . &&
-		git commit -m "dir to file" &&
+	Signed-off-by: $ident
+	EOF
 
-		git checkout -b df-conflict-2 base &&
-		rm -rf folder2 &&
-		echo content >folder2 &&
-		git add . &&
-		git commit -m "dir to file" &&
+	# Expected commit message after conflict resolution for rebase --signoff
+	cat >expected-signed-conflict <<-EOF &&
+	third
 
-		git checkout -b fd-conflict base &&
-		rm a &&
-		mkdir a &&
-		echo content >a/a &&
-		git add . &&
-		git commit -m "file to dir" &&
+	Signed-off-by: $ident
 
-		for side in left right
-		do
-			git checkout -b merge-$side base &&
-			echo $side >>deep/deeper2/a &&
-			echo $side >>folder1/a &&
-			echo $side >>folder2/a &&
-			git add . &&
-			git commit -m "$side" || return 1
-		done &&
+	conflict
 
-		git checkout -b deepest base &&
-		echo "updated deepest" >deep/deeper1/deepest/a &&
-		echo "updated deepest2" >deep/deeper1/deepest2/a &&
-		echo "updated deepest3" >deep/deeper1/deepest3/a &&
-		git commit -a -m "update deepest" &&
+	Signed-off-by: $ident
 
-		git checkout -f base &&
-		git reset --hard
-	)
+	file-2
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
-[master (root-commit) 703fd3e] initial commit
- Author: A U Thor <author@example.com>
- 33 files changed, 26 insertions(+)
- create mode 100644 a
- create mode 100644 before/a
- create mode 100644 before/b
- create mode 100644 deep/a
- create mode 100644 deep/before/a
- create mode 100644 deep/deeper1/0/0/0
- create mode 100644 deep/deeper1/0/1
- create mode 100644 deep/deeper1/a
- create mode 100644 deep/deeper1/deepest/a
- create mode 100644 deep/deeper1/deepest2/a
- create mode 100644 deep/deeper1/deepest3/a
- create mode 100644 deep/deeper1/e
- create mode 100644 deep/deeper2/a
- create mode 100644 deep/deeper2/deeper1/a
- create mode 100644 deep/deeper2/deeper1/deepest/a
- create mode 100644 deep/deeper2/deeper1/deepest2/a
- create mode 100644 deep/deeper2/deeper1/deepest3/a
- create mode 100644 deep/deeper2/deeper1/e
- create mode 100644 deep/e
- create mode 100644 deep/later/a
- create mode 100644 e
- create mode 100644 folder1-
- create mode 100644 folder1.x
- create mode 100644 folder1/0/0/0
- create mode 100644 folder1/0/1
- create mode 100644 folder1/a
- create mode 100644 folder10
- create mode 100644 folder2/0/0/0
- create mode 100644 folder2/0/1
- create mode 100644 folder2/a
- create mode 100644 g
- create mode 100644 x/a
- create mode 100644 z
-Switched to a new branch 'base'
-Switched to a new branch 'update-folder1'
-[update-folder1 fa14324] update folder1
+	Signed-off-by: $ident
+
+	EOF
+
+	# Expected commit message after rebase without --signoff (or with --no-signoff)
+	cat >expected-unsigned <<-EOF &&
+	first
+	EOF
+
+	git config alias.rbs "rebase --signoff"
+
+[master (root-commit) 6c54391] Initial empty commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-folder2'
-[update-folder2 2805da4] update folder2
+[master 626aa63] first
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-deep'
-[update-deep ac61adf] update deep
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master cee64ce] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'rename-base'
-[rename-base 5914bd8] add interesting rename content
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 deep/deeper1/larger-content
- create mode 100644 folder1/larger-content
- create mode 100644 folder2/larger-content
-Switched to a new branch 'rename-out-to-out'
-[rename-out-to-out 4a04e79] rename folder1/... to folder2/...
- Author: A U Thor <author@example.com>
- 4 files changed, 3 insertions(+)
- rename folder1/a => folder2/b (100%)
- rename folder1/larger-content => folder2/edited-content (97%)
-Switched to a new branch 'rename-out-to-in'
-[rename-out-to-in d11c5fe] rename folder1/... to deep/deeper1/...
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename folder1/a => deep/deeper1/b (100%)
- rename folder1/larger-content => deep/deeper1/edited-content (97%)
- rename folder2/0/{ => 1}/1 (100%)
-Switched to a new branch 'rename-in-to-out'
-[rename-in-to-out e5d0f8e] rename deep/deeper1/... to folder1/...
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename folder1/0/{0 => }/0 (100%)
- rename deep/deeper1/a => folder1/b (100%)
- rename deep/deeper1/larger-content => folder1/edited-content (97%)
-Switched to a new branch 'df-conflict-1'
-[df-conflict-1 974b58d] dir to file
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 folder1
- delete mode 100644 folder1/0/0/0
- delete mode 100644 folder1/0/1
- delete mode 100644 folder1/a
-Switched to a new branch 'df-conflict-2'
-[df-conflict-2 bef3412] dir to file
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 2 deletions(-)
- create mode 100644 folder2
- delete mode 100644 folder2/0/0/0
- delete mode 100644 folder2/0/1
- delete mode 100644 folder2/a
-Switched to a new branch 'fd-conflict'
-[fd-conflict 40c717f] file to dir
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 a
- create mode 100644 a/a
-Switched to a new branch 'merge-left'
-[merge-left 9721a77] left
+Switched to a new branch 'conflict-branch'
+[conflict-branch 3c3ba6d] file-2
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'merge-right'
-[merge-right 4f73b62] right
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-2
+[conflict-branch b53cad1] conflict
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Switched to a new branch 'deepest'
-[deepest cb037bf] update deepest
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch c062584] third
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 3 deletions(-)
-Switched to branch 'base'
-HEAD is now at 703fd3e initial commit
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 1092.2 'sparse-index contents': 
-	init_repos &&
+expecting success of 3428.2 'rebase --apply --signoff adds a sign-off line': 
+	test_must_fail git rbs --apply second third &&
+	git checkout --theirs file &&
+	git add file &&
+	git rebase --continue &&
+	git log --format=%B -n3 >actual &&
+	test_cmp expected-signed-conflict actual
 
-	# Remove deep, add three other directories.
-	test_sparse_checkout_set \
-		"folder1 folder2 x" \
-		"before deep" &&
+First, rewinding head to replay your work on top of it...
+Applying: file-2
+Applying: conflict
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+84c676d file-2
+virtual conflict
+found 1 common ancestor:
+virtual 848740929e99bda0e1a9783e7daa314c5a9732d5
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0002 conflict
+Updated 1 path from the index
+Applying: conflict
+Applying: third
+ok 2 - rebase --apply --signoff adds a sign-off line
 
-	# Remove folder1, add deep
-	test_sparse_checkout_set \
-		"deep folder2 x" \
-		"before folder1" &&
+expecting success of 3428.3 'rebase --no-signoff does not add a sign-off line': 
+	git commit --amend -m "first" &&
+	git rbs --no-signoff HEAD^ &&
+	test_commit_message HEAD expected-unsigned
 
-	# Replace deep with deep/deeper2 (dropping deep/deeper1)
-	# Add folder1
-	test_sparse_checkout_set \
-		"deep/deeper2 folder1 folder2 x" \
-		"before deep/deeper1" &&
+[detached HEAD 56522f9] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date.
+ok 3 - rebase --no-signoff does not add a sign-off line
 
-	# Replace deep/deeper2 with deep/deeper1
-	# Replace folder1 with folder1/0/0
-	# Replace folder2 with non-existent folder2/2/3
-	# Add non-existent "bogus"
-	test_sparse_checkout_set \
-		"bogus deep/deeper1 folder1/0/0 folder2/2/3 x" \
-		"before deep/deeper2 folder2/0" &&
+expecting success of 3428.4 'rebase --exec --signoff adds a sign-off line': 
+	test_when_finished "rm exec" &&
+	git rebase --exec "touch exec" --signoff first^ first &&
+	test_path_is_file exec &&
+	test_commit_message HEAD expected-signed
 
-	# Drop down to only files at root
-	test_sparse_checkout_set \
-		"" \
-		"before deep folder1 folder2 x" &&
+Rebasing (1/2)
Rebasing (2/2)
Executing: touch exec
+Successfully rebased and updated detached HEAD.
+ok 4 - rebase --exec --signoff adds a sign-off line
 
-	# Disabling the sparse-index replaces tree entries with full ones
-	git -C sparse-index sparse-checkout init --no-sparse-index &&
-	test_sparse_match git ls-files --stage --sparse
+expecting success of 3428.5 'rebase --root --signoff adds a sign-off line': 
+	git checkout first &&
+	git rebase --root --keep-empty --signoff &&
+	test_commit_message HEAD^ expected-initial-signed &&
+	test_commit_message HEAD expected-signed
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 10c8564bace86d48e22963bebe92e40ba8cfd937 0	deep/deeper1/
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ca1fa788550e1b7b99256573687bd1dd7994e072 0	deep/deeper2/
-040000 cb4007891397aa2a451037d1c69e57f0cf498c24 0	folder2/0/
-fatal: path 'bogus' does not exist in 'HEAD'
-fatal: path 'folder2/2/3' does not exist in 'HEAD'
-040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
-040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
-040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
-040000 123706f6fc38949628eaf0483edbf97ba21123ae 0	folder2/
-040000 aaff74984cccd156a469afa7d9ab10e4777beb24 0	x/
-ok 2 - sparse-index contents
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 1092.3 'expanded in-memory index matches full index': 
-	init_repos &&
-	test_sparse_match git ls-files --stage
+  d43d5c6 first
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 3 - expanded in-memory index matches full index
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 1092.4 'root directory cannot be sparse': 
-	init_repos &&
+ git branch <new-branch-name> d43d5c6
 
-	# Remove all in-cone files and directories from the index, collapse index
-	# with `git sparse-checkout reapply`
-	git -C sparse-index rm -r . &&
-	git -C sparse-index sparse-checkout reapply &&
+HEAD is now at 626aa63 first
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 5 - rebase --root --signoff adds a sign-off line
 
-	# Verify sparse directories still present, root directory is not sparse
-	cat >expect <<-EOF &&
-	before/
-	folder1/
-	folder2/
-	x/
-	EOF
-	git -C sparse-index ls-files --sparse >actual &&
-	test_cmp expect actual
+expecting success of 3428.6 'rebase -m --signoff adds a sign-off line': 
+	test_must_fail git rebase -m --signoff second third &&
+	git checkout --theirs file &&
+	git add file &&
+	GIT_EDITOR="sed -n /Conflicts:/,/^\\\$/p >actual" \
+		git rebase --continue &&
+	cat >expect <<-\EOF &&
+	# Conflicts:
+	#	file
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-rm 'a'
-rm 'deep/a'
-rm 'deep/before/a'
-rm 'deep/deeper1/0/0/0'
-rm 'deep/deeper1/0/1'
-rm 'deep/deeper1/a'
-rm 'deep/deeper1/deepest/a'
-rm 'deep/deeper1/deepest2/a'
-rm 'deep/deeper1/deepest3/a'
-rm 'deep/deeper1/e'
-rm 'deep/deeper2/a'
-rm 'deep/deeper2/deeper1/a'
-rm 'deep/deeper2/deeper1/deepest/a'
-rm 'deep/deeper2/deeper1/deepest2/a'
-rm 'deep/deeper2/deeper1/deepest3/a'
-rm 'deep/deeper2/deeper1/e'
-rm 'deep/e'
-rm 'deep/later/a'
-rm 'e'
-rm 'folder1-'
-rm 'folder1.x'
-rm 'folder10'
-rm 'g'
-rm 'z'
-ok 4 - root directory cannot be sparse
+	EOF
+	test_cmp expect actual &&
+	git log --format=%B -n3 >actual &&
+	test_cmp expected-signed-conflict actual
 
-expecting success of 1092.5 'status with options': 
-	init_repos &&
-	test_sparse_match ls &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno &&
-	run_on_all touch README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno &&
-	test_all_match git add README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git status --porcelain=v2 -z -u &&
-	test_all_match git status --porcelain=v2 -uno
+Rebasing (1/3)
Rebasing (2/3)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply b53cad1... conflict
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply b53cad1... conflict
+Updated 1 path from the index
+[detached HEAD 613a669] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 6 - rebase -m --signoff adds a sign-off line
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 5 - status with options
+expecting success of 3428.7 'rebase -i --signoff adds a sign-off line when editing commit': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 edit 3 edit 2" \
+			git rebase -i --signoff first third
+	) &&
+	echo a >a &&
+	git add a &&
+	test_must_fail git rebase --continue &&
+	git checkout --ours file &&
+	echo b >a &&
+	git add a file &&
+	git rebase --continue &&
+	echo c >a &&
+	git add a &&
+	git log --format=%B -n3 >actual &&
+	cat >expect <<-EOF &&
+	conflict
 
-expecting success of 1092.6 'status with diff in unexpanded sparse directory': 
-	init_repos &&
-	test_all_match git checkout rename-base &&
-	test_all_match git reset --soft rename-out-to-out &&
-	test_all_match git status --porcelain=v2
+	Signed-off-by: $ident
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 6 - status with diff in unexpanded sparse directory
+	third
 
-expecting success of 1092.7 'status reports sparse-checkout': 
-	init_repos &&
-	git -C sparse-checkout status >full &&
-	git -C sparse-index status >sparse &&
-	test_grep "You are in a sparse checkout with " full &&
-	test_grep "You are in a sparse checkout." sparse
+	Signed-off-by: $ident
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-You are in a sparse checkout with 73% of tracked files present.
-You are in a sparse checkout.
-ok 7 - status reports sparse-checkout
+	file-2
 
-expecting success of 1092.8 'add, commit, checkout': 
-	init_repos &&
+	Signed-off-by: $ident
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
 	EOF
-	run_on_all ../edit-contents README.md &&
-
-	test_all_match git add README.md &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Add README.md" &&
-
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+	test_cmp expect actual
 
-	run_on_all ../edit-contents README.md &&
+rebase -i script before editing:
+pick 3c3ba6d file-2
+pick b53cad1 conflict
+pick c062584 third
 
-	test_all_match git add -A &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "Extend README.md" &&
+rebase -i script after editing:
+edit 3c3ba6d file-2
+edit c062584 third
+edit b53cad1 conflict
+Rebasing (1/3)
Stopped at 3c3ba6d...  file-2
+You can amend the commit now, with
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout - &&
+  git commit --amend 
 
-	run_on_all ../edit-contents deep/newfile &&
+Once you are satisfied with your changes, run
 
-	test_all_match git status --porcelain=v2 -uno &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git add . &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "add deep/newfile" &&
+  git rebase --continue
+[detached HEAD 22331a7] file-2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 file-2
+Rebasing (2/3)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply c062584... third
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply c062584... third
+Updated 1 path from the index
+[detached HEAD 8033101] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (3/3)
Stopped at b53cad1...  conflict
+You can amend the commit now, with
 
-	test_all_match git checkout HEAD~1 &&
-	test_all_match git checkout -
+  git commit --amend 
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 8 - add, commit, checkout
+Once you are satisfied with your changes, run
 
-expecting success of 1092.9 'deep changes during checkout': 
-	init_repos &&
+  git rebase --continue
+ok 7 - rebase -i --signoff adds a sign-off line when editing commit
 
-	test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
-	test_all_match git checkout deepest &&
-	test_all_match git checkout base
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3421-rebase-topology-linear.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3421-rebase-topology-linear/.git/
+expecting success of 3421.1 'setup': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 9 - deep changes during checkout
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 020ea9b] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master d9ea348] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Note: switching to 'b'.
 
-expecting success of 1092.10 'checkout with modified sparse directory': 
-	init_repos &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	test_all_match git checkout rename-in-to-out -- . &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git checkout base
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 10 - checkout with modified sparse directory
+  git switch -c <new-branch-name>
 
-expecting success of 1092.11 'checkout orphan then non-orphan': 
-	init_repos &&
+Or undo this operation with:
 
-	test_all_match git checkout --orphan test-orphan &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git checkout base &&
-	test_all_match git status --porcelain=v2
+  git switch -
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 11 - checkout orphan then non-orphan
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1092.12 'add outside sparse cone': 
-	init_repos &&
+HEAD is now at 020ea9b b
+[detached HEAD 1bd0260] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+ok 1 - setup
 
-	run_on_sparse mkdir folder1 &&
-	run_on_sparse ../edit-contents folder1/a &&
-	run_on_sparse ../edit-contents folder1/newfile &&
-	test_sparse_match test_must_fail git add folder1/a &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_sparse_match test_must_fail git add folder1/newfile &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/newfile
+expecting success of 3421.2 'simple rebase --apply': 
+		reset_rebase &&
+		git rebase --apply c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 2 - simple rebase --apply
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 12 - add outside sparse cone
+expecting success of 3421.3 'simple rebase -m': 
+		reset_rebase &&
+		git rebase -m c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 3 - simple rebase -m
 
-expecting success of 1092.13 'commit including unstaged changes': 
-	init_repos &&
+expecting success of 3421.4 'simple rebase -i': 
+		reset_rebase &&
+		git rebase -i c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - simple rebase -i
 
-	write_script edit-file <<-\EOF &&
-	echo $1 >$2
-	EOF
+expecting success of 3421.5 'setup branches and remote tracking': 
+	git tag -l >tags &&
+	for tag in $(cat tags)
+	do
+		git branch branch-$tag $tag || return 1
+	done &&
+	git remote add origin "file://$PWD" &&
+	git fetch origin
 
-	run_on_all ../edit-file 1 a &&
-	run_on_all ../edit-file 1 deep/a &&
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3421-rebase-topology-linear
+ * [new branch]      branch-a   -> origin/branch-a
+ * [new branch]      branch-b   -> origin/branch-b
+ * [new branch]      branch-c   -> origin/branch-c
+ * [new branch]      branch-d   -> origin/branch-d
+ * [new branch]      branch-e   -> origin/branch-e
+ * [new branch]      master     -> origin/master
+ok 5 - setup branches and remote tracking
 
-	test_all_match git commit -m "-a" -a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.6 'rebase --apply is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Removing tags
+Current branch e is up to date.
+ok 6 - rebase --apply is no-op if upstream is an ancestor
 
-	run_on_all ../edit-file 2 a &&
-	run_on_all ../edit-file 2 deep/a &&
+expecting success of 3421.7 'rebase -m is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Current branch e is up to date.
+ok 7 - rebase -m is no-op if upstream is an ancestor
 
-	test_all_match git commit -m "--include" --include deep/a &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m "--include" --include a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.8 'rebase -i is no-op if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i b e &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 8 - rebase -i is no-op if upstream is an ancestor
 
-	run_on_all ../edit-file 3 a &&
-	run_on_all ../edit-file 3 deep/a &&
+expecting success of 3421.9 'rebase --apply -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Current branch e is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 9 - rebase --apply -f rewrites even if upstream is an ancestor
 
-	test_all_match git commit -m "--amend" -a --amend &&
-	test_all_match git status --porcelain=v2
+expecting success of 3421.10 'rebase --fork-point -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --fork-point -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 10 - rebase --fork-point -f rewrites even if upstream is an ancestor
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 13 - commit including unstaged changes
+expecting success of 3421.11 'rebase -m -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 11 - rebase -m -f rewrites even if upstream is an ancestor
 
-expecting success of 1092.14 'status/add: outside sparse cone': 
-	init_repos &&
+expecting success of 3421.12 'rebase -i -f rewrites even if upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i -f b e &&
+		test_cmp_rev ! e HEAD &&
+		test_cmp_rev b HEAD~2 &&
+		test_linear_range 'd e' b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 12 - rebase -i -f rewrites even if upstream is an ancestor
 
-	# folder1 is at HEAD, but outside the sparse cone
-	run_on_sparse mkdir folder1 &&
-	cp initial-repo/folder1/a sparse-checkout/folder1/a &&
-	cp initial-repo/folder1/a sparse-index/folder1/a &&
+expecting success of 3421.13 'rebase --apply -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --apply -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 13 - rebase --apply -f rewrites even if remote upstream is an ancestor
 
-	test_sparse_match git status &&
+expecting success of 3421.14 'rebase --fork-point -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase --fork-point -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 14 - rebase --fork-point -f rewrites even if remote upstream is an ancestor
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-	run_on_all ../edit-contents folder1/a &&
-	run_on_all ../edit-contents folder1/new &&
+expecting success of 3421.15 'rebase -m -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -m -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Current branch branch-e is up to date, rebase forced.
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 15 - rebase -m -f rewrites even if remote upstream is an ancestor
 
-	test_sparse_match git status --porcelain=v2 &&
+expecting success of 3421.16 'rebase -i -f rewrites even if remote upstream is an ancestor': 
+		reset_rebase &&
+		git rebase -i -f branch-b branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
+		test_cmp_rev branch-b HEAD~2 &&
+		test_linear_range 'd e' branch-b..
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch-e.
+ok 16 - rebase -i -f rewrites even if remote upstream is an ancestor
 
-	# Adding the path outside of the sparse-checkout cone should fail.
-	test_sparse_match test_must_fail git add folder1/a &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_all_match git add --refresh folder1/a &&
-	test_must_be_empty sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_sparse_match test_must_fail git add folder1/new &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/new &&
-	test_sparse_match git add --sparse folder1/a &&
-	test_sparse_match git add --sparse folder1/new &&
+expecting success of 3421.17 'rebase --apply fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase --apply e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 354afb0 e
+First, rewinding head to replay your work on top of it...
+Fast-forwarded b to e.
+ok 17 - rebase --apply fast-forwards from ancestor of upstream
 
-	test_all_match git add --sparse . &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m folder1/new &&
-	test_all_match git rev-parse HEAD^{tree} &&
+expecting success of 3421.18 'rebase --fork-point fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase --fork-point e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 18 - rebase --fork-point fast-forwards from ancestor of upstream
 
-	run_on_all ../edit-contents folder1/newer &&
-	test_all_match git add --sparse folder1/ &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git commit -m folder1/newer &&
-	test_all_match git rev-parse HEAD^{tree}
+expecting success of 3421.19 'rebase -m fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase -m e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 19 - rebase -m fast-forwards from ancestor of upstream
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 14 - status/add: outside sparse cone
+expecting success of 3421.20 'rebase -i fast-forwards from ancestor of upstream': 
+		reset_rebase &&
+		git rebase -i e b &&
+		test_cmp_rev e HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+Successfully rebased and updated detached HEAD.
+ok 20 - rebase -i fast-forwards from ancestor of upstream
 
-expecting success of 1092.15 'checkout and reset --hard': 
-	init_repos &&
+expecting success of 3421.21 'setup of linear history for range selection tests': 
+	git checkout c &&
+	test_commit g &&
+	revert h g &&
+	git checkout d &&
+	cherry_pick gp g &&
+	test_commit i &&
+	git checkout b &&
+	test_commit f
 
-	test_all_match git checkout update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
+Previous HEAD position was 67a7211 e
+HEAD is now at d9ea348 c
+[detached HEAD 5573dba] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 09e6546] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 g.t
+Previous HEAD position was 09e6546 h
+HEAD is now at 1bd0260 d
+[detached HEAD 00eccdb] gp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 3317c29] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Previous HEAD position was 3317c29 i
+HEAD is now at 020ea9b b
+[detached HEAD 09e072f] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+ok 21 - setup of linear history for range selection tests
 
-	test_all_match git checkout update-deep &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.22 'rebase --apply drops patches in upstream': 
+		reset_rebase &&
+		git rebase --apply h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 09e072f f
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: i
+ok 22 - rebase --apply drops patches in upstream
 
-	test_all_match git checkout -b reset-test &&
-	test_all_match git reset --hard deepest &&
-	test_all_match git reset --hard update-folder1 &&
-	test_all_match git reset --hard update-folder2
+expecting success of 3421.23 'rebase -m drops patches in upstream': 
+		reset_rebase &&
+		git rebase -m h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 23 - rebase -m drops patches in upstream
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 15 - checkout and reset --hard
+expecting success of 3421.24 'rebase -i drops patches in upstream': 
+		reset_rebase &&
+		git rebase -i h i &&
+		test_cmp_rev h HEAD~2 &&
+		test_linear_range 'd i' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 24 - rebase -i drops patches in upstream
 
-expecting success of 1092.16 'diff --cached': 
-	init_repos &&
+expecting success of 3421.25 'rebase --apply can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase --apply h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at 5c158e9 i
+First, rewinding head to replay your work on top of it...
+Applying: d
+ok 25 - rebase --apply can drop last patch if in upstream
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>README.md
-	EOF
-	run_on_all ../edit-contents &&
+expecting success of 3421.26 'rebase -m can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase -m h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 26 - rebase -m can drop last patch if in upstream
 
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	test_all_match git add README.md &&
-	test_all_match git diff &&
-	test_all_match git diff --cached
+expecting success of 3421.27 'rebase -i can drop last patch if in upstream': 
+		reset_rebase &&
+		git rebase -i h gp &&
+		test_cmp_rev h HEAD^ &&
+		test_linear_range 'd' h..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 27 - rebase -i can drop last patch if in upstream
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 16 - diff --cached
+expecting success of 3421.28 'rebase --apply --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase --apply --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at e937a8e d
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: i
+ok 28 - rebase --apply --onto drops patches in upstream
 
-expecting success of 1092.17 'diff with renames and conflicts': 
-	init_repos &&
+expecting success of 3421.29 'rebase -m --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase -m --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 29 - rebase -m --onto drops patches in upstream
 
-	for branch in rename-out-to-out \
-		      rename-out-to-in \
-		      rename-in-to-out \
-		      df-conflict-1 \
-		      fd-conflict
-	do
-		test_all_match git checkout rename-base &&
-		test_all_match git checkout $branch -- . &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git diff --cached --no-renames &&
-		test_all_match git diff --cached --find-renames || return 1
-	done
+expecting success of 3421.30 'rebase -i --onto drops patches in upstream': 
+		reset_rebase &&
+		git rebase -i --onto f h i &&
+		test_cmp_rev f HEAD~2 &&
+		test_linear_range 'd i' f..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+warning: skipped previously applied commit 00eccdb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 30 - rebase -i --onto drops patches in upstream
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 17 - diff with renames and conflicts
+expecting success of 3421.31 'rebase --apply --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase --apply --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bcc98eb i
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: gp
+Applying: i
+ok 31 - rebase --apply --onto does not drop patches in onto
 
-expecting success of 1092.18 'diff with directory/file conflicts': 
-	init_repos &&
+expecting success of 3421.32 'rebase -m --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase -m --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bbe8f41 i
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 32 - rebase -m --onto does not drop patches in onto
 
-	for branch in rename-out-to-out \
-		      rename-out-to-in \
-		      rename-in-to-out \
-		      df-conflict-1 \
-		      df-conflict-2 \
-		      fd-conflict
-	do
-		git -C full-checkout reset --hard &&
-		test_sparse_match git reset --hard &&
-		test_all_match git checkout $branch &&
-		test_all_match git checkout rename-base -- . &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git diff --cached --no-renames &&
-		test_all_match git diff --cached --find-renames || return 1
-	done
+expecting success of 3421.33 'rebase -i --onto does not drop patches in onto': 
+		reset_rebase &&
+		git rebase -i --onto h f i &&
+		test_cmp_rev h HEAD~3 &&
+		test_linear_range 'd gp i' h..
+	
+fatal: no rebase in progress
+HEAD is now at bbe8f41 i
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 33 - rebase -i --onto does not drop patches in onto
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 4a04e79 rename folder1/... to folder2/...
-HEAD is now at d11c5fe rename folder1/... to deep/deeper1/...
-HEAD is now at e5d0f8e rename deep/deeper1/... to folder1/...
-HEAD is now at 974b58d dir to file
-HEAD is now at bef3412 dir to file
-ok 18 - diff with directory/file conflicts
+expecting success of 3421.34 'setup of linear history for empty commit tests': 
+	git checkout c &&
+	make_empty j &&
+	git checkout d &&
+	make_empty k &&
+	test_commit l
 
-expecting success of 1092.19 'log with pathspec outside sparse definition': 
-	init_repos &&
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-	test_all_match git log -- a &&
-	test_all_match git log -- folder1/a &&
-	test_all_match git log -- folder2/a &&
-	test_all_match git log -- deep/a &&
-	test_all_match git log -- deep/deeper1/a &&
-	test_all_match git log -- deep/deeper1/deepest/a &&
+  bbe8f41 i
+  4a12efe gp
+  e937a8e d
 
-	test_all_match git checkout update-folder1 &&
-	test_all_match git log -- folder1/a
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 19 - log with pathspec outside sparse definition
+ git branch <new-branch-name> bbe8f41
 
-expecting success of 1092.20 'blame with pathspec inside sparse definition': 
-	init_repos &&
+HEAD is now at d9ea348 c
+[detached HEAD 5b67321] j
+ Author: A U Thor <author@example.com>
+Previous HEAD position was 5b67321 j
+HEAD is now at 1bd0260 d
+[detached HEAD 753370d] k
+ Author: A U Thor <author@example.com>
+[detached HEAD 49cf309] l
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 l.t
+ok 34 - setup of linear history for empty commit tests
 
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		test_all_match git blame $file || return 1
-	done
+checking known breakage of 3421.35 'rebase --apply keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase --apply j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 49cf309 l
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: l
+error: two revisions point to different objects:
+  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
+  'HEAD~4': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
+not ok 35 - rebase --apply keeps begin-empty commits # TODO known breakage
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 20 - blame with pathspec inside sparse definition
+expecting success of 3421.36 'rebase -m keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase -m j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 1612308 l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 36 - rebase -m keeps begin-empty commits
 
-expecting success of 1092.21 'blame with pathspec outside sparse definition': 
-	init_repos &&
-	test_sparse_match git sparse-checkout set &&
+expecting success of 3421.37 'rebase -i keeps begin-empty commits': 
+		reset_rebase &&
+		git rebase -i j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 37 - rebase -i keeps begin-empty commits
 
-	for file in \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		test_sparse_match test_must_fail git blame $file &&
-		cat >expect <<-EOF &&
-		fatal: Cannot lstat '$file': No such file or directory
-		EOF
-		# We compare sparse-checkout-err and sparse-index-err in
-		# `test_sparse_match`. Given we know they are the same, we
-		# only check the content of sparse-index-err here.
-		test_cmp expect sparse-index-err || return 1
-	done
+expecting success of 3421.38 'rebase -m --no-keep-empty drops begin-empty commits': 
+		reset_rebase &&
+		git rebase -m --no-keep-empty c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd l' c..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 38 - rebase -m --no-keep-empty drops begin-empty commits
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 21 - blame with pathspec outside sparse definition
+expecting success of 3421.39 'rebase -i --no-keep-empty drops begin-empty commits': 
+		reset_rebase &&
+		git rebase -i --no-keep-empty c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd l' c..
+	
+fatal: no rebase in progress
+HEAD is now at ef60b8d l
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 39 - rebase -i --no-keep-empty drops begin-empty commits
 
-expecting success of 1092.22 'checkout and reset (mixed)': 
-	init_repos &&
+expecting success of 3421.40 'rebase -m --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase -m --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at ef60b8d l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 40 - rebase -m --keep-empty keeps empty even if already in upstream
 
-	test_all_match git checkout -b reset-test update-deep &&
-	test_all_match git reset deepest &&
+expecting success of 3421.41 'rebase -i --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase -i --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 41 - rebase -i --keep-empty keeps empty even if already in upstream
 
-	# Because skip-worktree is preserved, resetting to update-folder1
-	# will show worktree changes for folder1/a in full-checkout, but not
-	# in sparse-checkout or sparse-index.
-	git -C full-checkout reset update-folder1 >full-checkout-out &&
-	test_sparse_match git reset update-folder1 &&
-	grep "M	folder1/a" full-checkout-out &&
-	! grep "M	folder1/a" sparse-checkout-out &&
-	run_on_sparse test_path_is_missing folder1
+expecting success of 3421.42 'rebase --rebase-merges --keep-empty keeps empty even if already in upstream': 
+		reset_rebase &&
+		git rebase --rebase-merges --keep-empty j l &&
+		test_cmp_rev j HEAD~3 &&
+		test_linear_range 'd k l' j..
+	
+fatal: no rebase in progress
+HEAD is now at 5395ede l
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Successfully rebased and updated detached HEAD.
+ok 42 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-M	folder1/a
-ok 22 - checkout and reset (mixed)
+expecting success of 3421.43 'setup of linear history for test involving root': 
+	git checkout b &&
+	revert m b &&
+	git checkout --orphan disjoint &&
+	git rm -rf . &&
+	test_commit x &&
+	test_commit y &&
+	cherry_pick bp b
 
-expecting success of 1092.23 'checkout and reset (merge)': 
-	init_repos &&
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+  5395ede l
+  9a731c2 k
+  60768b3 d
 
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents a &&
-	test_all_match git reset --merge deepest &&
-	test_all_match git status --porcelain=v2 &&
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-	test_all_match git reset --hard update-deep &&
-	run_on_all ../edit-contents deep/a &&
-	test_all_match test_must_fail git reset --merge deepest
+ git branch <new-branch-name> 5395ede
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 23 - checkout and reset (merge)
+HEAD is now at 020ea9b b
+[detached HEAD 6db5543] m
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b.t
+Switched to a new branch 'disjoint'
+rm 'a.t'
+[disjoint (root-commit) 059091f] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+[disjoint be1e399] y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y.t
+[disjoint b7cb922] bp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+ok 43 - setup of linear history for test involving root
 
-expecting success of 1092.24 'checkout and reset (keep)': 
-	init_repos &&
+expecting success of 3421.44 'rebase --apply --onto --root': 
+		reset_rebase &&
+		git rebase --apply --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at b7cb922 bp
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 44 - rebase --apply --onto --root
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3421.45 'rebase -m --onto --root': 
+		reset_rebase &&
+		git rebase -m --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 45 - rebase -m --onto --root
 
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents a &&
-	test_all_match git reset --keep deepest &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.46 'rebase -i --onto --root': 
+		reset_rebase &&
+		git rebase -i --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 46 - rebase -i --onto --root
 
-	test_all_match git reset --hard update-deep &&
-	run_on_all ../edit-contents deep/a &&
-	test_all_match test_must_fail git reset --keep deepest
+expecting success of 3421.47 'rebase --apply without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase --apply c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 47 - rebase --apply without --onto --root with disjoint history
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 24 - checkout and reset (keep)
+expecting success of 3421.48 'rebase -m without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase -m c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 48 - rebase -m without --onto --root with disjoint history
 
-expecting success of 1092.25 'reset with pathspecs inside sparse definition': 
-	init_repos &&
+expecting success of 3421.49 'rebase -i without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase -i c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 49 - rebase -i without --onto --root with disjoint history
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3421.50 'rebase --apply --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 50 - rebase --apply --onto --root drops patch in onto
 
-	test_all_match git checkout -b reset-test update-deep &&
-	run_on_all ../edit-contents deep/a &&
+expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase -m --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 51 - rebase -m --onto --root drops patch in onto
 
-	test_all_match git reset base -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.52 'rebase -i --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase -i --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 52 - rebase -i --onto --root drops patch in onto
 
-	test_all_match git reset base -- nonexistent-file &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3421.53 'rebase --apply --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase --apply --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+First, rewinding head to replay your work on top of it...
+Applying: c
+Applying: g
+ok 53 - rebase --apply --onto --root with merge-base does not go to root
 
-	test_all_match git reset deepest -- deep &&
-	test_all_match git status --porcelain=v2
+expecting success of 3421.54 'rebase -m --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase -m --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 54 - rebase -m --onto --root with merge-base does not go to root
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 25 - reset with pathspecs inside sparse definition
+expecting success of 3421.55 'rebase -i --onto --root with merge-base does not go to root': 
+		reset_rebase &&
+		git rebase -i --onto m --root g &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'c g' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 55 - rebase -i --onto --root with merge-base does not go to root
 
-expecting success of 1092.26 'reset with pathspecs outside sparse definition': 
-	init_repos &&
-	test_all_match git checkout -b reset-test base &&
+expecting success of 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
 
-	test_sparse_match git reset update-folder1 -- folder1 &&
-	git -C full-checkout reset update-folder1 -- folder1 &&
-	test_all_match git ls-files -s -- folder1 &&
+expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -m m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
 
-	test_sparse_match git reset update-folder2 -- folder2/a &&
-	git -C full-checkout reset update-folder2 -- folder2/a &&
-	test_all_match git ls-files -s -- folder2/a
+expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -i m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder1/a
-M	folder2/a
-ok 26 - reset with pathspecs outside sparse definition
+expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase  --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 59 - rebase  --root on linear history is a no-op
 
-expecting success of 1092.27 'reset with wildcard pathspec': 
-	init_repos &&
+expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -m --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 60 - rebase -m --root on linear history is a no-op
 
-	test_all_match git reset update-deep -- deep\* &&
-	test_all_match git ls-files -s -- deep &&
+expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -i --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 61 - rebase -i --root on linear history is a no-op
 
-	test_all_match git reset deepest -- deep\*\*\* &&
-	test_all_match git ls-files -s -- deep &&
+expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase  -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 62 - rebase  -f --root on linear history causes re-write
 
-	# The following `git reset`s result in updating the index on files with
-	# `skip-worktree` enabled. To avoid failing due to discrepancies in reported
-	# "modified" files, `test_sparse_match` reset is performed separately from
-	# "full-checkout" reset, then the index contents of all repos are verified.
+expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -m -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 63 - rebase -m -f --root on linear history causes re-write
 
-	test_sparse_match git reset update-folder1 -- \*/a &&
-	git -C full-checkout reset update-folder1 -- \*/a &&
-	test_all_match git ls-files -s -- deep/a folder1/a &&
+expecting success of 3421.64 'rebase -i -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -i -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated detached HEAD.
+ok 64 - rebase -i -f --root on linear history causes re-write
 
-	test_sparse_match git reset update-folder2 -- folder\* &&
-	git -C full-checkout reset update-folder2 -- folder\* &&
-	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
+# still have 1 known breakage(s)
+# passed all remaining 63 test(s)
+1..64
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3429-rebase-edit-todo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3429-rebase-edit-todo/.git/
+expecting success of 3429.1 'setup': 
+	test_commit first file &&
+	test_commit second file &&
+	test_commit third file
 
-	test_sparse_match git reset base -- folder1/\* &&
-	git -C full-checkout reset base -- folder1/\* &&
-	test_all_match git ls-files -s -- folder1
+[master (root-commit) 07e65e0] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master fa10d42] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master ba0a06e] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder2/a
-Unstaged changes after reset:
-M	folder2/a
-ok 27 - reset with wildcard pathspec
+expecting success of 3429.2 'rebase exec modifies rebase-todo': 
+	todo=.git/rebase-merge/git-rebase-todo &&
+	git rebase HEAD~1 -x "echo exec touch F >>$todo" &&
+	test -e F
 
-expecting success of 1092.28 'reset hard with removed sparse dir': 
-	init_repos &&
+Rebasing (2/2)
Executing: echo exec touch F >>.git/rebase-merge/git-rebase-todo
+Rebasing (3/3)
Executing: touch F
+Successfully rebased and updated refs/heads/master.
+ok 2 - rebase exec modifies rebase-todo
 
-	run_on_all git rm -r --sparse folder1 &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3429.3 'rebase exec with an empty list does not exec anything': 
+	git rebase HEAD -x "true" 2>output &&
+	! grep "Executing: true" output
 
-	test_all_match git reset --hard &&
-	test_all_match git status --porcelain=v2 &&
+ok 3 - rebase exec with an empty list does not exec anything
 
-	cat >expect <<-\EOF &&
-	folder1/
-	EOF
+expecting success of 3429.4 'loose object cache vs re-reading todo list': 
+	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
+	export GIT_REBASE_TODO &&
+	write_script append-todo.sh <<-\EOS &&
+	# For values 5 and 6, this yields SHA-1s with the same first two digits
+	echo "pick $(git rev-parse --short \
+		$(printf "%s\\n" \
+			"tree $EMPTY_TREE" \
+			"author A U Thor <author@example.org> $1 +0000" \
+			"committer A U Thor <author@example.org> $1 +0000" \
+			"" \
+			"$1" |
+		  git hash-object -t commit -w --stdin))" >>$GIT_REBASE_TODO
 
-	git -C sparse-index ls-files --sparse folder1 >out &&
-	test_cmp expect out
+	shift
+	test -z "$*" ||
+	echo "exec $0 $*" >>$GIT_REBASE_TODO
+	EOS
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 28 - reset hard with removed sparse dir
+	git rebase HEAD -x "./append-todo.sh 5 6"
 
-expecting success of 1092.29 'update-index modify outside sparse definition': 
-	init_repos &&
+Successfully rebased and updated refs/heads/master.
+ok 4 - loose object cache vs re-reading todo list
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
+expecting success of 3429.5 'todo is re-read after reword and squash': 
+	write_script reword-editor.sh <<-\EOS &&
+	GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \
+		git rebase --edit-todo
+	EOS
 
-	# Create & modify folder1/a
-	# Note that this setup is a manual way of reaching the erroneous
-	# condition in which a `skip-worktree` enabled, outside-of-cone file
-	# exists on disk. It is used here to ensure `update-index` is stable
-	# and behaves predictably if such a condition occurs.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
+	test_write_lines first third >expected &&
+	set_fake_editor &&
+	GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \
+		GIT_EDITOR=./reword-editor.sh git rebase -i --root third &&
+	test_cmp expected actual
 
-	# If file has skip-worktree enabled, but the file is present, it is
-	# treated the same as if skip-worktree is disabled
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2 &&
+rebase -i script before editing:
+pick 07e65e0 first
+pick fa10d42 second
+pick ba0a06e third
 
-	# When skip-worktree is disabled (even on files outside sparse cone), file
-	# is updated in the index
-	test_sparse_match git update-index --no-skip-worktree folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2
+rebase -i script after editing:
+reword 07e65e0 first
+squash fa10d42 second
+fixup ba0a06e third
+Rebasing (1/3)
[detached HEAD 67746ec] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Rebasing (2/4)
Rebasing (3/4)
[detached HEAD 15dd5e0] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Rebasing (4/5)
Executing: echo first >>actual
+Rebasing (5/5)
Executing: echo third >>actual
+Successfully rebased and updated detached HEAD.
+ok 5 - todo is re-read after reword and squash
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 29 - update-index modify outside sparse definition
+expecting success of 3429.6 're-reading todo doesnt interfere with revert --edit': 
+	git reset --hard third &&
 
-expecting success of 1092.30 'update-index --add outside sparse definition': 
-	init_repos &&
+	git revert --edit third second &&
 
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
+	cat >expect <<-\EOF &&
+	Revert "second"
+	Revert "third"
+	third
+	second
+	first
 	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
 
-	# Create folder1, add new file
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/b &&
-
-	# The *untracked* out-of-cone file is added to the index because it does
-	# not have a `skip-worktree` bit to signal that it should be ignored
-	# (unlike in `git add`, which will fail due to the file being outside
-	# the sparse checkout definition).
-	test_all_match git update-index --add folder1/b &&
-	test_all_match git status --porcelain=v2
+HEAD is now at ba0a06e third
+[detached HEAD 2d8e437] Revert "third"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 60853ee] Revert "second"
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - re-reading todo doesnt interfere with revert --edit
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 30 - update-index --add outside sparse definition
+expecting success of 3429.7 're-reading todo doesnt interfere with cherry-pick --edit': 
+	git reset --hard first &&
 
-expecting success of 1092.31 'update-index --remove outside sparse definition': 
-	init_repos &&
+	git cherry-pick --edit second third &&
 
-	# When --ignore-skip-worktree-entries is _not_ specified:
-	# out-of-cone, not-on-disk files are removed from the index
-	test_sparse_match git update-index --remove folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
+	cat >expect <<-\EOF &&
+	third
+	second
+	first
 	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	test_sparse_match git diff-index --cached HEAD &&
+	git log --format="%s" >actual &&
+	test_cmp expect actual
 
-	# Reset the state
-	test_all_match git reset --hard &&
+HEAD is now at 07e65e0 first
+[detached HEAD e619899] second
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD c9a7b60] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - re-reading todo doesnt interfere with cherry-pick --edit
 
-	# When --ignore-skip-worktree-entries is specified, out-of-cone
-	# (skip-worktree) files are ignored
-	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
-	test_sparse_match git diff --cached --name-status &&
-	test_must_be_empty sparse-checkout-out &&
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3433-rebase-across-mode-change.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3433-rebase-across-mode-change/.git/
+expecting success of 3433.1 'setup': 
+	mkdir DS &&
+	>DS/whatever &&
+	git add DS &&
+	git commit -m base &&
 
-	test_sparse_match git diff-index --cached HEAD &&
+	git branch side1 &&
+	git branch side2 &&
 
-	# Reset the state
-	test_all_match git reset --hard &&
+	git checkout side1 &&
+	git rm -rf DS &&
+	test_ln_s_add unrelated DS &&
+	git commit -m side1 &&
 
-	# --force-remove supersedes --ignore-skip-worktree-entries, removing
-	# a skip-worktree file from the index (and disk) when both are specified
-	# with --remove
-	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
+	git checkout side2 &&
+	>unrelated &&
+	git add unrelated &&
+	git commit -m commit1 &&
 
-	test_sparse_match git diff-index --cached HEAD
+	echo >>unrelated &&
+	git commit -am commit2
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 31 - update-index --remove outside sparse definition
+[master (root-commit) ba9279b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 DS/whatever
+Switched to branch 'side1'
+rm 'DS/whatever'
+checking prerequisite: SYMLINKS
 
-expecting success of 1092.32 'update-index with directories': 
-	init_repos &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	# update-index will exit silently when provided with a directory name
-	# containing a trailing slash
-	test_all_match git update-index deep/ folder1/ &&
-	grep "Ignoring path deep/" sparse-checkout-err &&
-	grep "Ignoring path folder1/" sparse-checkout-err &&
+)
+prerequisite SYMLINKS ok
+[side1 0a05486] side1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 DS
+ delete mode 100644 DS/whatever
+Switched to branch 'side2'
+[side2 e75512e] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated
+[side2 e22f82a] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-	# When update-index is given a directory name WITHOUT a trailing slash, it will
-	# behave in different ways depending on the status of the directory on disk:
-	# * if it exists, the command exits with an error ("add individual files instead")
-	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
-	#   file and either triggers an error ("does not exist  and --remove not passed")
-	#   or is ignored completely (when using --remove)
-	test_all_match test_must_fail git update-index deep &&
-	run_on_all test_must_fail git update-index folder1 &&
-	test_must_fail git -C full-checkout update-index --remove folder1 &&
-	test_sparse_match git update-index --remove folder1 &&
-	test_all_match git status --porcelain=v2
+expecting success of 3433.2 'rebase changes with the apply backend': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b apply-backend side2 &&
+	git rebase side1
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Ignoring path deep/
-Ignoring path folder1/
-error: folder1: is a directory - add individual files instead
-fatal: Unable to process path folder1
-ok 32 - update-index with directories
+Switched to a new branch 'apply-backend'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/apply-backend.
+fatal: no rebase in progress
+ok 2 - rebase changes with the apply backend
 
-expecting success of 1092.33 'update-index --again file outside sparse definition': 
-	init_repos &&
+expecting success of 3433.3 'rebase changes with the merge backend': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-backend side2 &&
+	git rebase -m side1
 
-	test_all_match git checkout -b test-reupdate &&
+Switched to a new branch 'merge-backend'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/merge-backend.
+fatal: no rebase in progress
+ok 3 - rebase changes with the merge backend
 
-	# Update HEAD without modifying the index to introduce a difference in
-	# folder1/a
-	test_sparse_match git reset --soft update-folder1 &&
+expecting success of 3433.4 'rebase changes with the merge backend with a delay': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-delay-backend side2 &&
+	git rebase -m --exec "sleep 1" side1
 
-	# Because folder1/a differs in the index vs HEAD,
-	# `git update-index --no-skip-worktree --again` will effectively perform
-	# `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
-	# flag from folder1/a
-	test_sparse_match git update-index --no-skip-worktree --again &&
-	test_sparse_match git status --porcelain=v2 &&
+Switched to a new branch 'merge-delay-backend'
+Rebasing (1/4)
Rebasing (2/4)
Executing: sleep 1
+Rebasing (3/4)
Rebasing (4/4)
Executing: sleep 1
+Successfully rebased and updated refs/heads/merge-delay-backend.
+fatal: no rebase in progress
+ok 4 - rebase changes with the merge backend with a delay
 
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --name-status &&
-	test_cmp expect sparse-checkout-out
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3431-rebase-fork-point.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3431-rebase-fork-point/.git/
+expecting success of 3431.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git branch -t side &&
+	git reset --hard HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git checkout side &&
+	test_commit F &&
+	test_commit G
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 33 - update-index --again file outside sparse definition
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+branch 'side' set up to track 'main'.
+HEAD is now at d9df450 B
+[main 3e6e33e] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[main dc25130] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+[side f231f7a] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[side d8775ba] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+ok 1 - setup
 
-expecting success of 1092.34 'update-index --cacheinfo': 
-	init_repos &&
+expecting success of 3431.2 'git rebase ': do_test_rebase 'G F E D B A' 
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 2 - git rebase 
 
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
-	folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
+expecting success of 3431.3 'git rebase --onto D': do_test_rebase 'G F D B A' --onto D
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 3 - git rebase --onto D
 
-	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-	test_all_match git status --porcelain=v2 &&
+expecting success of 3431.4 'git rebase --keep-base': do_test_rebase 'G F C B A' --keep-base
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 4 - git rebase --keep-base
 
-	# Cannot add sparse directory, even in sparse index case
-	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
+expecting success of 3431.5 'git rebase --no-fork-point': do_test_rebase 'G F C E D B A' --no-fork-point
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 5 - git rebase --no-fork-point
 
-	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
-	# so `git status` reports it as "deleted" in the worktree
-	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
-	test_sparse_match git status --porcelain=v2 &&
-	cat >expect <<-EOF &&
-	MD folder1/a
-	EOF
-	test_sparse_match git status --short -- folder1/a &&
-	test_cmp expect sparse-checkout-out &&
+expecting success of 3431.6 'git rebase --no-fork-point --onto D': do_test_rebase 'G F C D B A' --no-fork-point --onto D
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 6 - git rebase --no-fork-point --onto D
 
-	# To return folder1/a to "normal" for a sparse checkout (ignored &
-	# outside-of-cone), add the skip-worktree flag.
-	test_sparse_match git update-index --skip-worktree folder1/a &&
-	cat >expect <<-EOF &&
-	S folder1/a
-	EOF
-	test_sparse_match git ls-files -t -- folder1/a &&
-	test_cmp expect sparse-checkout-out
+expecting success of 3431.7 'git rebase --no-fork-point --keep-base': do_test_rebase 'G F C B A' --no-fork-point --keep-base
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 7 - git rebase --no-fork-point --keep-base
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 34 - update-index --cacheinfo
+expecting success of 3431.8 'git rebase --fork-point refs/heads/main': do_test_rebase 'G F E D B A' --fork-point refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 8 - git rebase --fork-point refs/heads/main
 
-expecting success of 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3431.9 'git rebase --fork-point main': do_test_rebase 'G F E D B A' --fork-point main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 9 - git rebase --fork-point main
 
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
+expecting success of 3431.10 'git rebase --fork-point --onto D refs/heads/main': do_test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 10 - git rebase --fork-point --onto D refs/heads/main
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+expecting success of 3431.11 'git rebase --fork-point --onto D main': do_test_rebase 'G F D B A' --fork-point --onto D main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 11 - git rebase --fork-point --onto D main
 
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+expecting success of 3431.12 'git rebase --fork-point --keep-base refs/heads/main': do_test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 12 - git rebase --fork-point --keep-base refs/heads/main
 
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 35 - 'read-tree -mu base HEAD update-folder2' with files outside sparse definition
+expecting success of 3431.13 'git rebase --fork-point --keep-base main': do_test_rebase 'G F B A' --fork-point --keep-base main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 13 - git rebase --fork-point --keep-base main
 
-expecting success of 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3431.14 'git rebase refs/heads/main': do_test_rebase 'G F C E D B A' refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 14 - git rebase refs/heads/main
 
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
+expecting success of 3431.15 'git rebase main': do_test_rebase 'G F C E D B A' main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 15 - git rebase main
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+expecting success of 3431.16 'git rebase --onto D refs/heads/main': do_test_rebase 'G F C D B A' --onto D refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 16 - git rebase --onto D refs/heads/main
 
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+expecting success of 3431.17 'git rebase --onto D main': do_test_rebase 'G F C D B A' --onto D main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 17 - git rebase --onto D main
 
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 36 - 'read-tree -mu update-folder1 update-folder2' with files outside sparse definition
+expecting success of 3431.18 'git rebase --keep-base refs/heads/main': do_test_rebase 'G F C B A' --keep-base refs/heads/main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 18 - git rebase --keep-base refs/heads/main
 
-expecting success of 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
-		init_repos &&
+expecting success of 3431.19 'git rebase --keep-base main': do_test_rebase 'G F C B A' --keep-base main
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Current branch side is up to date.
+ok 19 - git rebase --keep-base main
 
-		# Although the index matches, without --no-sparse-checkout, outside-of-
-		# definition files will not exist on disk for sparse checkouts
-		test_all_match git read-tree -mu $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_path_is_missing sparse-checkout/folder2 &&
-		test_path_is_missing sparse-index/folder2 &&
+expecting success of 3431.20 'git rebase --fork-point with ambiguous refname': 
+	git checkout main &&
+	git checkout -b one &&
+	git checkout side &&
+	git tag one &&
+	test_must_fail git rebase --fork-point --onto D one
 
-		test_all_match git read-tree --reset -u HEAD &&
-		test_all_match git status --porcelain=v2 &&
+Switched to branch 'main'
+Switched to a new branch 'one'
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+warning: refname 'one' is ambiguous.
+fatal: Ambiguous refname: 'one'
+ok 20 - git rebase --fork-point with ambiguous refname
 
-		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
-		test_all_match git status --porcelain=v2 &&
-		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
-		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+expecting success of 3431.21 '--fork-point and --root both given': 
+	test_must_fail git rebase --fork-point --root 2>err &&
+	test_grep "cannot be used together" err
 
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 37 - 'read-tree -mu update-folder2' with files outside sparse definition
+fatal: options '--root' and '--fork-point' cannot be used together
+ok 21 - --fork-point and --root both given
 
-expecting success of 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
-	init_repos &&
+expecting success of 3431.22 'rebase.forkPoint set to false': 
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F C E D B A"
 
-	# Merge of multiple changes to same directory (but not same files) should
-	# succeed
-	test_all_match git read-tree -mu base rename-base update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch and 'main' have diverged,
+and have 3 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 22 - rebase.forkPoint set to false
 
-	test_all_match git reset --hard &&
+expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
+	test_config_global rebase.forkPoint false &&
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F E D B A"
 
-	test_all_match git read-tree -mu rename-base update-folder2 &&
-	test_all_match git status --porcelain=v2 &&
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 3 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 23 - rebase.forkPoint set to false and then to true
 
-	test_all_match git reset --hard &&
+expecting success of 3431.24 'rebase.forkPoint set to false and command line says --fork-point': 
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F E D B A" --fork-point
 
-	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
-	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
+ok 24 - rebase.forkPoint set to false and command line says --fork-point
 
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 38 - read-tree --merge with edit/edit conflicts in sparse directories
+expecting success of 3431.25 'rebase.forkPoint set to true and command line says --no-fork-point': 
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F C E D B A" --no-fork-point
 
-expecting success of 1092.39 'read-tree --prefix': 
-	init_repos &&
+Switched to branch 'main'
+HEAD is now at dc25130 E
+Switched to branch 'side'
+Your branch is ahead of 'main' by 2 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at d8775ba G
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
+ok 25 - rebase.forkPoint set to true and command line says --no-fork-point
 
-	# If files differing between the index and target <commit-ish> exist
-	# inside the prefix, `read-tree --prefix` should fail
-	test_all_match test_must_fail git read-tree --prefix=deep/ deepest &&
-	test_all_match test_must_fail git read-tree --prefix=folder1/ update-folder1 &&
+expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
+	test_config rebase.forkPoint true &&
+	git rebase --root
 
-	# If no differing index entries exist matching the prefix,
-	# `read-tree --prefix` updates the index successfully
-	test_all_match git rm -rf deep/deeper1/deepest/ &&
-	test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
-	test_all_match git status --porcelain=v2 &&
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/side.
+ok 26 - rebase.forkPoint set to true and --root given
 
-	run_on_all git rm -rf --sparse folder1/ &&
-	test_all_match git read-tree --prefix=folder1/ -u update-folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git rm -rf --sparse folder2/0 &&
-	test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 39 - read-tree --prefix
-
-expecting success of 1092.40 'read-tree --merge with directory-file conflicts': 
-	init_repos &&
-
-	test_all_match git checkout -b test-branch rename-base &&
-
-	# Although the index matches, without --no-sparse-checkout, outside-of-
-	# definition files will not exist on disk for sparse checkouts
-	test_sparse_match git read-tree -mu rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_path_is_missing sparse-checkout/folder2 &&
-	test_path_is_missing sparse-index/folder2 &&
-
-	test_sparse_match git read-tree --reset -u HEAD &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 40 - read-tree --merge with directory-file conflicts
-
-expecting success of 1092.41 'merge, cherry-pick, and rebase': 
-	init_repos &&
-
-	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
-	do
-		test_all_match git checkout -B temp update-deep &&
-		test_all_match git $OPERATION update-folder1 &&
-		test_all_match git rev-parse HEAD^{tree} &&
-		test_all_match git $OPERATION update-folder2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 41 - merge, cherry-pick, and rebase
-
-expecting success of 1092.42 'merge with conflict outside cone': 
-	init_repos &&
-
-	test_all_match git checkout -b merge-tip merge-left &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match test_must_fail git merge -m merge merge-right &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Resolve the conflict in different ways:
-	# 1. Revert to the base
-	test_all_match git checkout base -- deep/deeper2/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 2. Add the file with conflict markers
-	test_sparse_match test_must_fail git add folder1/a &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# 3. Rename the file to another sparse filename and
-	#    accept conflict markers as resolved content.
-	run_on_all mv folder2/a folder2/z &&
-	test_sparse_match test_must_fail git add folder2 &&
-	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-	test_sparse_unstaged folder2/z &&
-	test_all_match git add --sparse folder2 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git merge --continue &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git rev-parse HEAD^{tree}
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 42 - merge with conflict outside cone
-
-expecting success of 1092.43 'cherry-pick/rebase with conflict outside cone': 
-	init_repos &&
-
-	for OPERATION in cherry-pick rebase
-	do
-		test_all_match git checkout -B tip &&
-		test_all_match git reset --hard merge-left &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match test_must_fail git $OPERATION merge-right &&
-		test_all_match git status --porcelain=v2 &&
-
-		# Resolve the conflict in different ways:
-		# 1. Revert to the base
-		test_all_match git checkout base -- deep/deeper2/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 2. Add the file with conflict markers
-		# NEEDSWORK: Even though the merge conflict removed the
-		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
-		# warn that this is a problematic add.
-		test_sparse_match test_must_fail git add folder1/a &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder1/a &&
-		test_all_match git add --sparse folder1/a &&
-		test_all_match git status --porcelain=v2 &&
-
-		# 3. Rename the file to another sparse filename and
-		#    accept conflict markers as resolved content.
-		# NEEDSWORK: This mode now fails, because folder2/z is
-		# outside of the sparse-checkout cone and does not match an
-		# existing index entry with the SKIP_WORKTREE bit cleared.
-		run_on_all mv folder2/a folder2/z &&
-		test_sparse_match test_must_fail git add folder2 &&
-		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
-		test_sparse_unstaged folder2/z &&
-		test_all_match git add --sparse folder2 &&
-		test_all_match git status --porcelain=v2 &&
-
-		test_all_match git $OPERATION --continue &&
-		test_all_match git status --porcelain=v2 &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-hint: * Disable or modify the sparsity rules.
-ok 43 - cherry-pick/rebase with conflict outside cone
-
-expecting success of 1092.44 'merge with outside renames': 
-	init_repos &&
-
-	for type in out-to-out out-to-in in-to-out
-	do
-		test_all_match git reset --hard &&
-		test_all_match git checkout -f -b merge-$type update-deep &&
-		test_all_match git merge -m "$type" rename-$type &&
-		test_all_match git rev-parse HEAD^{tree} || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 44 - merge with outside renames
-
-expecting success of 1092.45 'cherry-pick with conflicts': 
-	init_repos &&
-
-	write_script edit-conflict <<-\EOF &&
-	echo $1 >conflict
-	EOF
-
-	test_all_match git checkout -b to-cherry-pick &&
-	run_on_all ../edit-conflict ABC &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict to pick" &&
-
-	test_all_match git checkout -B base HEAD~1 &&
-	run_on_all ../edit-conflict DEF &&
-	test_all_match git add conflict &&
-	test_all_match git commit -m "conflict in base" &&
-
-	test_all_match test_must_fail git cherry-pick to-cherry-pick
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 45 - cherry-pick with conflicts
-
-expecting success of 1092.46 'stash': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Stash a sparse directory (folder1)
-	test_all_match git checkout -b test-branch rename-base &&
-	test_all_match git reset --soft rename-out-to-out &&
-	test_all_match git stash &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Apply the sparse directory stash without reinstating the index
-	test_all_match git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where stash can be applied
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard rename-out-to-out &&
-
-	# Apply the sparse directory stash *with* reinstating the index
-	test_all_match git stash apply --index -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to state where we will get a conflict applying the stash
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard update-folder1 &&
-
-	# Apply the sparse directory stash with conflicts
-	test_all_match test_must_fail git stash apply --index -q &&
-	test_all_match test_must_fail git stash apply -q &&
-	test_all_match git status --porcelain=v2 &&
-
-	# Reset to base branch
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git reset --hard base &&
-
-	# Stash & unstash an untracked file outside of the sparse checkout
-	# definition.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/new &&
-	test_all_match git stash -u &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git stash pop -q &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 46 - stash
-
-expecting success of 1092.47 'checkout-index inside sparse definition': 
-	init_repos &&
-
-	run_on_all rm -f deep/a &&
-	test_all_match git checkout-index -- deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	echo test >>new-a &&
-	run_on_all cp ../new-a a &&
-	test_all_match test_must_fail git checkout-index -- a &&
-	test_all_match git checkout-index -f -- a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 47 - checkout-index inside sparse definition
-
-expecting success of 1092.48 'checkout-index outside sparse definition': 
-	init_repos &&
-
-	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
-	# an error
-	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
-	test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
-	test_path_is_missing folder1/a &&
-
-	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
-	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
-
-	run_on_sparse rm -rf folder1 &&
-	echo test >new-a &&
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all cp ../new-a folder1/a &&
-
-	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
-	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
-	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
-	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-git checkout-index: folder1/a has skip-worktree enabled; use '--ignore-skip-worktree-bits' to checkout
-ok 48 - checkout-index outside sparse definition
-
-expecting success of 1092.49 'checkout-index with folders': 
-	init_repos &&
-
-	# Inside checkout definition
-	test_all_match test_must_fail git checkout-index -f -- deep/ &&
-
-	# Outside checkout definition
-	# Note: although all tests fail (as expected), the messaging differs. For
-	# non-sparse index checkouts, the error is that the "file" does not appear
-	# in the index; for sparse checkouts, the error is explicitly that the
-	# entry is a sparse directory.
-	run_on_all test_must_fail git checkout-index -f -- folder1/ &&
-	test_cmp full-checkout-err sparse-checkout-err &&
-	! test_cmp full-checkout-err sparse-index-err &&
-	grep "is a sparse directory" sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
---- full-checkout-err	2026-04-19 19:17:07.295659440 +0000
-+++ sparse-index-err	2026-04-19 19:17:07.387659440 +0000
-@@ -1 +1 @@
--git checkout-index: folder1/ is not in the cache
-+git checkout-index: folder1/ is a sparse directory
-git checkout-index: folder1/ is a sparse directory
-ok 49 - checkout-index with folders
-
-expecting success of 1092.50 'checkout-index --all': 
-	init_repos &&
-
-	test_all_match git checkout-index --all &&
-	test_sparse_match test_path_is_missing folder1 &&
-
-	# --ignore-skip-worktree-bits will cause `skip-worktree` files to be
-	# checked out, causing the outside-of-cone `folder1` to exist on-disk
-	test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
-	test_all_match test_path_exists folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 50 - checkout-index --all
-
-expecting success of 1092.51 'clean': 
-	init_repos &&
-
-	echo bogus >>.gitignore &&
-	run_on_all cp ../.gitignore . &&
-	test_all_match git add .gitignore &&
-	test_all_match git commit -m "ignore bogus files" &&
-
-	run_on_sparse mkdir folder1 &&
-	run_on_all mkdir -p deep/untracked-deep &&
-	run_on_all touch folder1/bogus &&
-	run_on_all touch folder1/untracked &&
-	run_on_all touch deep/untracked-deep/bogus &&
-	run_on_all touch deep/untracked-deep/untracked &&
-
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git clean -f &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_is_missing folder1/untracked &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/untracked &&
-
-	test_all_match git clean -fd &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_exists folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
-
-	test_all_match git clean -xf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing folder1/bogus &&
-	run_on_all test_path_exists deep/untracked-deep/bogus &&
-
-	test_all_match git clean -xdf &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match ls &&
-	test_sparse_match ls folder1 &&
-	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
-
-	test_sparse_match test_path_is_dir folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 51 - clean
-
-expecting success of 1092.52 'show (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git show :a &&
-		test_all_match git show :deep/a &&
-		test_sparse_match git show :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git show :deep/ &&
-		test_must_fail git -C full-checkout show :folder1/ &&
-		test_sparse_match test_must_fail git show :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git show :deep/deeper2/ &&
-
-		# deep/deeper2/deepest is not in the sparse index, but
-		# will trigger an index expansion.
-		test_sparse_match test_must_fail git show :deep/deeper2/deepest/
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-ok 52 - show (cached blobs/trees)
-
-expecting success of 1092.53 'rev-parse (cached blobs/trees)': 
-		init_repos &&
-
-		test_all_match git rev-parse :a &&
-		test_all_match git rev-parse :deep/a &&
-		test_sparse_match git rev-parse :folder1/a &&
-
-		# The error message differs depending on whether
-		# the directory exists in the worktree.
-		test_all_match test_must_fail git rev-parse :deep/ &&
-		test_must_fail git -C full-checkout rev-parse :folder1/ &&
-		test_sparse_match test_must_fail git rev-parse :folder1/ &&
-
-		# Change the sparse cone for an extra case:
-		run_on_sparse git sparse-checkout set deep/deeper1 &&
-
-		# deep/deeper2 is a sparse directory in the sparse index.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
-
-		# deep/deeper2/deepest is not in the sparse index, but
-		# will trigger an index expansion.
-		test_sparse_match test_must_fail git rev-parse :deep/deeper2/deepest/
-	
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-fatal: path 'folder1/' exists on disk, but not in the index
-:folder1/
-ok 53 - rev-parse (cached blobs/trees)
-
-expecting success of 1092.54 'submodule handling': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout add modules &&
-	test_all_match mkdir modules &&
-	test_all_match touch modules/a &&
-	test_all_match git add modules &&
-	test_all_match git commit -m "add modules directory" &&
-
-	test_config_global protocol.file.allow always &&
-
-	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
-	test_all_match git commit -m "add submodule" &&
-
-	# having a submodule prevents "modules" from collapse
-	test_sparse_match git sparse-checkout set deep/deeper1 &&
-	git -C sparse-index ls-files --sparse --stage >cache &&
-	grep "100644 .*	modules/a" cache &&
-	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	modules/a
-160000 703fd3e56687611d5c0264e6f007e18e96f794bf 0	modules/sub
-ok 54 - submodule handling
-
-expecting success of 1092.55 'sparse-index is expanded and converted back': 
-	init_repos &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-		git -C sparse-index reset -- folder1/a &&
-	test_region index convert_to_sparse trace2.txt &&
-	test_region index ensure_full_index trace2.txt &&
-
-	# ls-files expands on read, but does not write.
-	rm trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index ls-files &&
-	test_region index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.883134Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.883287Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000153,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_enter","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.861756Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.883601Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.862493Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000737,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191720.860299Z-H8d819085-P001c2752","thread":"main","time":"2026-04-19T19:17:20.883776Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000175,"nesting":1,"category":"index","label":"ensure_full_index"}
-a
-before/a
-before/b
-deep/a
-deep/before/a
-deep/deeper1/0/0/0
-deep/deeper1/0/1
-deep/deeper1/a
-deep/deeper1/deepest/a
-deep/deeper1/deepest2/a
-deep/deeper1/deepest3/a
-deep/deeper1/e
-deep/deeper2/a
-deep/deeper2/deeper1/a
-deep/deeper2/deeper1/deepest/a
-deep/deeper2/deeper1/deepest2/a
-deep/deeper2/deeper1/deepest3/a
-deep/deeper2/deeper1/e
-deep/e
-deep/later/a
-e
-folder1-
-folder1.x
-folder1/0/0/0
-folder1/0/1
-folder1/a
-folder10
-folder2/0/0/0
-folder2/0/1
-folder2/a
-g
-x/a
-z
-{"event":"region_enter","sid":"20260419T191721.034349Z-H8d819085-P001c27d0","thread":"main","time":"2026-04-19T19:17:21.039450Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191721.034349Z-H8d819085-P001c27d0","thread":"main","time":"2026-04-19T19:17:21.040289Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000839,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 55 - sparse-index is expanded and converted back
-
-expecting success of 1092.56 'index.sparse disabled inline uses full index': 
-	init_repos &&
-
-	# When index.sparse is disabled inline with `git status`, the
-	# index is expanded at the beginning of the execution then never
-	# converted back to sparse. It is then written to disk as a full index.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index -c index.sparse=false status &&
-	! test_region index convert_to_sparse trace2.txt &&
-	test_region index ensure_full_index trace2.txt &&
-
-	# Since index.sparse is set to true at a repo level, the index
-	# is converted from full to sparse when read, then never expanded
-	# over the course of `git status`. It is written to disk as a sparse
-	# index.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index status &&
-	test_region index convert_to_sparse trace2.txt &&
-	! test_region index ensure_full_index trace2.txt &&
-
-	# Now that the index has been written to disk as sparse, it is not
-	# converted to sparse (or expanded to full) when read by `git status`.
-	rm -f trace2.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
-		git -C sparse-index status &&
-	! test_region index convert_to_sparse trace2.txt &&
-	! test_region index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-On branch base
-You are in a sparse checkout with 73% of tracked files present.
-
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20260419T191721.653403Z-H8d819085-P001c2957","thread":"main","time":"2026-04-19T19:17:21.654350Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191721.653403Z-H8d819085-P001c2957","thread":"main","time":"2026-04-19T19:17:21.663322Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.008972,"nesting":2,"category":"index","label":"ensure_full_index"}
-On branch base
-You are in a sparse checkout.
-
-nothing to commit, working tree clean
-{"event":"region_enter","sid":"20260419T191721.760337Z-H8d819085-P001c29a2","thread":"main","time":"2026-04-19T19:17:21.761105Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20260419T191721.760337Z-H8d819085-P001c29a2","thread":"main","time":"2026-04-19T19:17:21.761261Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000156,"nesting":2,"category":"index","label":"convert_to_sparse"}
-On branch base
-You are in a sparse checkout.
-
-nothing to commit, working tree clean
-ok 56 - index.sparse disabled inline uses full index
-
-expecting success of 1092.57 'sparse-index is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded status &&
-	ensure_not_expanded ls-files --sparse &&
-	ensure_not_expanded commit --allow-empty -m empty &&
-	echo >>sparse-index/a &&
-	ensure_not_expanded commit -a -m a &&
-	echo >>sparse-index/a &&
-	ensure_not_expanded commit --include a -m a &&
-	echo >>sparse-index/deep/deeper1/a &&
-	ensure_not_expanded commit --include deep/deeper1/a -m deeper &&
-	ensure_not_expanded checkout rename-out-to-out &&
-	ensure_not_expanded checkout - &&
-	ensure_not_expanded switch rename-out-to-out &&
-	ensure_not_expanded switch - &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
-
-	echo >>sparse-index/README.md &&
-	ensure_not_expanded add -A &&
-	echo >>sparse-index/extra.txt &&
-	ensure_not_expanded add extra.txt &&
-	echo >>sparse-index/untracked.txt &&
-	ensure_not_expanded add . &&
-
-	ensure_not_expanded checkout-index -f a &&
-	ensure_not_expanded checkout-index -f --all &&
-	for ref in update-deep update-folder1 update-folder2 update-deep
-	do
-		echo >>sparse-index/README.md &&
-		ensure_not_expanded reset --hard $ref || return 1
-	done &&
-
-	ensure_not_expanded reset --mixed base &&
-	ensure_not_expanded reset --hard update-deep &&
-	ensure_not_expanded reset --keep base &&
-	ensure_not_expanded reset --merge update-deep &&
-	ensure_not_expanded reset --hard &&
-
-	ensure_not_expanded reset base -- deep/a &&
-	ensure_not_expanded reset base -- nonexistent-file &&
-	ensure_not_expanded reset deepest -- deep &&
-
-	# Although folder1 is outside the sparse definition, it exists as a
-	# directory entry in the index, so the pathspec will not force the
-	# index to be expanded.
-	ensure_not_expanded reset deepest -- folder1 &&
-	ensure_not_expanded reset deepest -- folder1/ &&
-
-	# Wildcard identifies only in-cone files, no index expansion
-	ensure_not_expanded reset deepest -- deep/\* &&
-
-	# Wildcard identifies only full sparse directories, no index expansion
-	ensure_not_expanded reset deepest -- folder\* &&
-
-	ensure_not_expanded clean -fd &&
-
-	ensure_not_expanded checkout -f update-deep &&
-	test_config -C sparse-index pull.twohead ort &&
-	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		for OPERATION in "merge -m merge" cherry-pick rebase
-		do
-			ensure_not_expanded merge -m merge update-folder1 &&
-			ensure_not_expanded merge -m merge update-folder2 || return 1
-		done
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 57 - sparse-index is not expanded
-
-expecting success of 1092.58 'sparse-index is not expanded: merge conflict in cone': 
-	init_repos &&
-
-	for side in right left
-	do
-		git -C sparse-index checkout -b expand-$side base &&
-		echo $side >sparse-index/deep/a &&
-		git -C sparse-index commit -a -m "$side" || return 1
-	done &&
-
-	(
-		sane_unset GIT_TEST_MERGE_ALGORITHM &&
-		git -C sparse-index config pull.twohead ort &&
-		ensure_not_expanded ! merge -m merged expand-right
-	)
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Switched to a new branch 'expand-right'
-[expand-right 5ebbff9] right
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'expand-left'
-[expand-left 9bcd6b8] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 58 - sparse-index is not expanded: merge conflict in cone
-
-expecting success of 1092.59 'sparse-index is not expanded: stash': 
-	init_repos &&
-
-	echo >>sparse-index/a &&
-	ensure_not_expanded stash &&
-	ensure_not_expanded stash list &&
-	ensure_not_expanded stash show stash@{0} &&
-	ensure_not_expanded stash apply stash@{0} &&
-	ensure_not_expanded stash drop stash@{0} &&
-
-	echo >>sparse-index/deep/new &&
-	ensure_not_expanded stash -u &&
-	(
-		WITHOUT_UNTRACKED_TXT=1 &&
-		ensure_not_expanded stash pop
-	) &&
-
-	ensure_not_expanded stash create &&
-	oid=$(git -C sparse-index stash create) &&
-	ensure_not_expanded stash store -m "test" $oid &&
-	ensure_not_expanded reset --hard &&
-	ensure_not_expanded stash pop
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 59 - sparse-index is not expanded: stash
-
-expecting success of 1092.60 'describe tested on all': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	run_on_all git tag -a v1.0 -m "Version 1" &&
-	test_all_match git describe --dirty &&
-	run_on_all rm g &&
-	test_all_match git describe --dirty
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 60 - describe tested on all
-
-expecting success of 1092.61 'sparse-index is not expanded: describe': 
-	init_repos &&
-
-	# Add tag to be read by describe
-
-	git -C sparse-index tag -a v1.0 -m "Version 1" &&
-
-	ensure_not_expanded describe --dirty &&
-	echo "test" >>sparse-index/g &&
-	ensure_not_expanded describe --dirty &&
-	ensure_not_expanded describe
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 61 - sparse-index is not expanded: describe
-
-expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Add file within cone
-	test_sparse_match git sparse-checkout set deep &&
-	run_on_all ../edit-contents deep/testfile &&
-	test_all_match git add deep/testfile &&
-	run_on_all ../edit-contents deep/testfile &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Add file outside cone
-	test_all_match git reset --hard &&
-	run_on_all mkdir newdirectory &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set newdirectory &&
-	test_all_match git add newdirectory/testfile &&
-	run_on_all ../edit-contents newdirectory/testfile &&
-	test_sparse_match git sparse-checkout set &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD &&
-
-	# Merge conflict outside cone
-	# The sparse checkout will report a warning that is not in the
-	# full checkout, so we use `run_on_all` instead of
-	# `test_all_match`
-	run_on_all git reset --hard &&
-	test_all_match git checkout merge-left &&
-	test_all_match test_must_fail git merge merge-right &&
-
-	test_all_match git diff &&
-	test_all_match git diff --cached &&
-	ensure_not_expanded diff &&
-	ensure_not_expanded diff --cached &&
-	ensure_not_expanded diff-index --cached HEAD
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 62 - sparse index is not expanded: diff and diff-index
-
-expecting success of 1092.63 'sparse index is not expanded: show and rev-parse': 
-	init_repos &&
-
-	ensure_not_expanded show :a &&
-	ensure_not_expanded show :deep/a &&
-	ensure_not_expanded rev-parse :a &&
-	ensure_not_expanded rev-parse :deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 63 - sparse index is not expanded: show and rev-parse
-
-expecting success of 1092.64 'sparse index is not expanded: update-index': 
-	init_repos &&
-
-	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
-	ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
-
-	echo "test" >sparse-index/README.md &&
-	echo "test2" >sparse-index/a &&
-	rm -f sparse-index/deep/a &&
-
-	ensure_not_expanded update-index --add README.md &&
-	ensure_not_expanded update-index a &&
-	ensure_not_expanded update-index --remove deep/a &&
-
-	ensure_not_expanded reset --soft update-deep &&
-	ensure_not_expanded update-index --add --remove --again
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 64 - sparse index is not expanded: update-index
-
-expecting success of 1092.65 'sparse index is not expanded: blame': 
-	init_repos &&
-
-	for file in a \
-			deep/a \
-			deep/deeper1/a \
-			deep/deeper1/deepest/a
-	do
-		ensure_not_expanded blame $file || return 1
-	done
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 65 - sparse index is not expanded: blame
-
-expecting success of 1092.66 'sparse index is not expanded: fetch/pull': 
-	init_repos &&
-
-	git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
-	ensure_not_expanded fetch full &&
-	git -C full-checkout commit --allow-empty -m "for pull merge" &&
-	git -C sparse-index commit --allow-empty -m "for pull merge" &&
-	ensure_not_expanded pull full base
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-[base f236285] for pull merge
- Author: A U Thor <author@example.com>
-ok 66 - sparse index is not expanded: fetch/pull
-
-expecting success of 1092.67 'sparse index is not expanded: read-tree': 
-	init_repos &&
-
-	ensure_not_expanded checkout -b test-branch update-folder1 &&
-	for MERGE_TREES in "base HEAD update-folder2" \
-			   "base HEAD rename-base" \
-			   "base update-folder2" \
-			   "base rename-base" \
-			   "update-folder2"
-	do
-		ensure_not_expanded read-tree -mu $MERGE_TREES &&
-		ensure_not_expanded reset --hard || return 1
-	done &&
-
-	rm -rf sparse-index/deep/deeper2 &&
-	ensure_not_expanded add . &&
-	ensure_not_expanded commit -m "test" &&
-
-	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 67 - sparse index is not expanded: read-tree
-
-expecting success of 1092.68 'ls-files': 
-	init_repos &&
-
-	# Use a smaller sparse-checkout for reduced output
-	test_sparse_match git sparse-checkout set &&
-
-	# Behavior agrees by default. Sparse index is expanded.
-	test_all_match git ls-files &&
-
-	# With --sparse, the sparse index data changes behavior.
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# With --sparse and no sparse index, nothing changes.
-	git -C sparse-checkout ls-files >dense &&
-	git -C sparse-checkout ls-files --sparse >sparse &&
-	test_cmp dense sparse &&
-
-	# Set up a strange condition of having a file edit
-	# outside of the sparse-checkout cone. We want to verify
-	# that all modes handle this the same, and detect the
-	# modification.
-	write_script edit-content <<-\EOF &&
-	mkdir -p folder1 &&
-	echo content >>folder1/a
-	EOF
-	run_on_all ../edit-content &&
-
-	test_all_match git ls-files --modified &&
-
-	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
-	cat >expect <<-\EOF &&
-	folder1/a
-	EOF
-	test_cmp expect sparse-index-out &&
-
-	# Add folder1 to the sparse-checkout cone and
-	# check that ls-files shows the expanded files.
-	test_sparse_match git sparse-checkout add folder1 &&
-	test_all_match git ls-files --modified &&
-
-	test_all_match git ls-files &&
-	git -C sparse-index ls-files --sparse >actual &&
-
-	cat >expect <<-\EOF &&
-	a
-	before/
-	deep/
-	e
-	folder1-
-	folder1.x
-	folder1/0/0/0
-	folder1/0/1
-	folder1/a
-	folder10
-	folder2/
-	g
-	x/
-	z
-	EOF
-
-	test_cmp expect actual &&
-
-	# Double-check index expansion is avoided
-	ensure_not_expanded ls-files --sparse
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 68 - ls-files
-
-expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
-	init_repos &&
-
-	ensure_not_expanded sparse-checkout set deep/deeper2 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set deep &&
-	ensure_not_expanded sparse-checkout add folder1 &&
-	ensure_not_expanded sparse-checkout set deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set folder2 &&
-
-	# Demonstrate that the checks that "folder1/a" is a file
-	# do not cause a sparse-index expansion (since it is in the
-	# sparse-checkout cone).
-	echo >>sparse-index/folder2/a &&
-	git -C sparse-index add folder2/a &&
-
-	ensure_not_expanded sparse-checkout add folder1 &&
-
-	# Skip checks here, since deep/deeper1 is inside a sparse directory
-	# that must be expanded to check whether `deep/deeper1` is a file
-	# or not.
-	ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
-	ensure_not_expanded sparse-checkout set
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 69 - sparse index is not expanded: sparse-checkout
-
-expecting success of 1092.70 'reset mixed and checkout orphan': 
-	init_repos &&
-
-	test_all_match git checkout rename-out-to-in &&
-
-	# Sparse checkouts do not agree with full checkouts about
-	# how to report a directory/file conflict during a reset.
-	# This command would fail with test_all_match because the
-	# full checkout reports "T folder1/0/1" while a sparse
-	# checkout reports "D folder1/0/1". This matches because
-	# the sparse checkouts skip "adding" the other side of
-	# the conflict.
-	test_sparse_match git reset --mixed HEAD~1 &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# At this point, sparse-checkouts behave differently
-	# from the full-checkout.
-	test_sparse_match git checkout --orphan new-branch &&
-	test_sparse_match git ls-files --stage &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 70 - reset mixed and checkout orphan
-
-expecting success of 1092.71 'add everything with deep new file': 
-	init_repos &&
-
-	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
-
-	run_on_all touch deep/deeper1/x &&
-	test_all_match git add . &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 71 - add everything with deep new file
-
-expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder1/larger-content
-	git add folder1
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-1 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-1 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-1 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# Instead, the checkout deletes the folder1 file and adds the
-	# folder1/larger-content file, leaving all other paths that were
-	# in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder1
-	A	folder1/larger-content
-	EOF
-	test_cmp expect full-checkout-out &&
-	test_cmp expect sparse-checkout-out &&
-
-	# The sparse-index reports no output
-	test_must_be_empty sparse-index-out &&
-
-	# stderr: Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-checkout-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 72 - checkout behaves oddly with df-conflict-1
-
-expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
-	init_repos &&
-
-	test_sparse_match git sparse-checkout disable &&
-
-	write_script edit-content <<-\EOF &&
-	echo content >>folder2/larger-content
-	git add folder2
-	EOF
-
-	run_on_all ../edit-content &&
-	test_all_match git status --porcelain=v2 &&
-
-	git -C sparse-checkout sparse-checkout init --cone &&
-	git -C sparse-index sparse-checkout init --cone --sparse-index &&
-
-	test_all_match git status --porcelain=v2 &&
-
-	# This checkout command should fail, because we have a staged
-	# change to folder1/larger-content, but the destination changes
-	# folder1 to a file.
-	git -C full-checkout checkout df-conflict-2 \
-		1>full-checkout-out \
-		2>full-checkout-err &&
-	git -C sparse-checkout checkout df-conflict-2 \
-		1>sparse-checkout-out \
-		2>sparse-checkout-err &&
-	git -C sparse-index checkout df-conflict-2 \
-		1>sparse-index-out \
-		2>sparse-index-err &&
-
-	# The full checkout deviates from the df-conflict-1 case here!
-	# It drops the change to folder1/larger-content and leaves the
-	# folder1 path as-is on disk. The sparse-index behaves the same.
-	test_must_be_empty full-checkout-out &&
-	test_must_be_empty sparse-index-out &&
-
-	# In the sparse-checkout case, the checkout deletes the folder1
-	# file and adds the folder1/larger-content file, leaving all other
-	# paths that were in folder1/ as deleted (without any warning).
-	cat >expect <<-EOF &&
-	D	folder2
-	A	folder2/larger-content
-	EOF
-	test_cmp expect sparse-checkout-out &&
-
-	# Switched to branch df-conflict-1
-	test_cmp full-checkout-err sparse-checkout-err &&
-	test_cmp full-checkout-err sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 73 - checkout behaves oddly with df-conflict-2
-
-expecting success of 1092.74 'mv directory from out-of-cone to in-cone': 
-	init_repos &&
-
-	# <source> as a sparse directory (or SKIP_WORKTREE_DIR without enabling
-	# sparse index).
-	test_all_match git mv --sparse folder1 deep &&
-	test_all_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/folder1/0/0/0" actual &&
-	grep -e "H deep/folder1/0/1" actual &&
-	grep -e "H deep/folder1/a" actual &&
-
-	test_all_match git reset --hard &&
-
-	# <source> as a directory deeper than sparse index boundary (where
-	# sparse index will expand).
-	test_sparse_match git mv --sparse folder1/0 deep &&
-	test_sparse_match git status --porcelain=v2 &&
-	test_sparse_match git ls-files -t &&
-	git -C sparse-checkout ls-files -t >actual &&
-	grep -e "H deep/0/0/0" actual &&
-	grep -e "H deep/0/1" actual
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-H deep/folder1/0/0/0
-H deep/folder1/0/1
-H deep/folder1/a
-H deep/0/0/0
-H deep/0/1
-ok 74 - mv directory from out-of-cone to in-cone
-
-expecting success of 1092.75 'rm pathspec inside sparse definition': 
-	init_repos &&
-
-	test_all_match git rm deep/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test wildcard
-	run_on_all git reset --hard &&
-	test_all_match git rm deep/* &&
-	test_all_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_all git reset --hard &&
-	test_all_match git rm -r deep &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 75 - rm pathspec inside sparse definition
-
-expecting success of 1092.76 'rm pathspec outside sparse definition': 
-	init_repos &&
-
-	for file in folder1/a folder1/0/1
-	do
-		test_sparse_match test_must_fail git rm $file &&
-		test_sparse_match test_must_fail git rm --cached $file &&
-		test_sparse_match git rm --sparse $file &&
-		test_sparse_match git status --porcelain=v2 || return 1
-	done &&
-
-	cat >folder1-full <<-EOF &&
-	rm ${SQ}folder1/0/0/0${SQ}
-	rm ${SQ}folder1/0/1${SQ}
-	rm ${SQ}folder1/a${SQ}
-	EOF
-
-	cat >folder1-sparse <<-EOF &&
-	rm ${SQ}folder1/${SQ}
-	EOF
-
-	# test wildcard
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm folder1/* &&
-	run_on_sparse git rm --sparse folder1/* &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2 &&
-
-	# test recursive rm
-	run_on_sparse git reset --hard &&
-	run_on_sparse git sparse-checkout reapply &&
-	test_sparse_match test_must_fail git rm --sparse folder1 &&
-	run_on_sparse git rm --sparse -r folder1 &&
-	test_cmp folder1-full sparse-checkout-out &&
-	test_cmp folder1-sparse sparse-index-out &&
-	test_sparse_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 76 - rm pathspec outside sparse definition
-
-expecting success of 1092.77 'rm pathspec expands index when necessary': 
-	init_repos &&
-
-	# in-cone pathspec (do not expand)
-	ensure_not_expanded rm "deep/deep*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# out-of-cone pathspec (expand)
-	! ensure_not_expanded rm --sparse "folder1/a*" &&
-	test_must_be_empty sparse-index-err &&
-
-	# pathspec that should expand index
-	! ensure_not_expanded rm "*/a" &&
-	test_must_be_empty sparse-index-err &&
-
-	! ensure_not_expanded rm "**a" &&
-	test_must_be_empty sparse-index-err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260419T191757.783521Z-H8d819085-P001c9297","thread":"main","time":"2026-04-19T19:17:57.784793Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191757.783521Z-H8d819085-P001c9297","thread":"main","time":"2026-04-19T19:17:57.786097Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191757.856305Z-H8d819085-P001c92cf","thread":"main","time":"2026-04-19T19:17:57.857235Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191757.856305Z-H8d819085-P001c92cf","thread":"main","time":"2026-04-19T19:17:57.871092Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191757.929119Z-H8d819085-P001c9315","thread":"main","time":"2026-04-19T19:17:57.930026Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191757.929119Z-H8d819085-P001c9315","thread":"main","time":"2026-04-19T19:17:57.955578Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 77 - rm pathspec expands index when necessary
-
-expecting success of 1092.78 'sparse index is not expanded: rm': 
-	init_repos &&
-
-	ensure_not_expanded rm deep/a &&
-
-	# test in-cone wildcard
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm deep/* &&
-
-	# test recursive rm
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm -r deep
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 78 - sparse index is not expanded: rm
-
-expecting success of 1092.79 'grep with and --cached': 
-	init_repos &&
-
-	test_all_match git grep --cached a &&
-	test_all_match git grep --cached a -- "folder1/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 79 - grep with and --cached
-
-expecting success of 1092.80 'grep is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded grep a &&
-	ensure_not_expanded grep a -- deep/* &&
-
-	# All files within the folder1/* pathspec are sparse,
-	# so this command does not find any matches
-	ensure_not_expanded ! grep a -- folder1/* &&
-
-	# test out-of-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "folder1/a" &&
-	ensure_not_expanded grep --cached a -- "folder1/*" &&
-
-	# test in-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "deep/a" &&
-	ensure_not_expanded grep --cached a -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 80 - grep is not expanded
-
-checking known breakage of 1092.81 'grep within submodules is not expanded': 
-	init_repos_as_submodules &&
-
-	# do not use ensure_not_expanded() here, because `grep` should be
-	# run in the superproject, not in "./sparse-index"
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
-	test_region ! index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-full-checkout/folder1/a:a
-sparse-checkout/folder1/a:a
-sparse-index/folder1/a:a
-{"event":"region_enter","sid":"20260419T191803.612537Z-H8d819085-P001ca48c","thread":"main","time":"2026-04-19T19:18:03.631543Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
-not ok 81 - grep within submodules is not expanded # TODO known breakage
-
-expecting success of 1092.82 'grep sparse directory within submodules': 
-	init_repos_as_submodules &&
-
-	cat >expect <<-\EOF &&
-	full-checkout/folder1/a:a
-	sparse-checkout/folder1/a:a
-	sparse-index/folder1/a:a
-	EOF
-	git grep --cached --recurse-submodules a -- "*/folder1/*" >actual &&
-	test_cmp actual expect
-
-warning: unable to rmdir 'full-checkout': Directory not empty
-warning: unable to rmdir 'sparse-checkout': Directory not empty
-warning: unable to rmdir 'sparse-index': Directory not empty
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-hint: The sparse index is expanding to a full index, a slow operation.
-hint: Your working directory likely has contents that are outside of
-hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
-hint: see your sparse-checkout definition and compare it to your working
-hint: directory contents. Running 'git clean' may assist in this cleanup.
-hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-ok 82 - grep sparse directory within submodules
-
-expecting success of 1092.83 'write-tree': 
-	init_repos &&
-
-	test_all_match git write-tree &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# make a change inside the sparse cone
-	run_on_all ../edit-contents deep/a &&
-	test_all_match git update-index deep/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# make a change outside the sparse cone
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git write-tree &&
-	test_all_match git status --porcelain=v2 &&
-
-	# check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 83 - write-tree
-
-expecting success of 1092.84 'sparse-index is not expanded: write-tree': 
-	init_repos &&
-
-	ensure_not_expanded write-tree &&
-
-	echo "test1" >>sparse-index/a &&
-	git -C sparse-index update-index a &&
-	ensure_not_expanded write-tree
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 84 - sparse-index is not expanded: write-tree
-
-expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	test_all_match git diff-files &&
-
-	test_all_match git diff-files -- deep/a &&
-
-	# test wildcard
-	test_all_match git diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 85 - diff-files with pathspec inside sparse definition
-
-expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
-	init_repos &&
-
-	test_sparse_match git diff-files -- folder2/a &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	# The directory "folder1" is outside the cone of interest
-	# and will not exist in the sparse checkout repositories.
-	# Create it as needed, add file "folder1/a" there with
-	# contents that is different from the staged version.
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp a folder1/a &&
-
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git diff-files &&
-	test_all_match git diff-files -- folder1/a &&
-	test_all_match git diff-files -- "folder*/a"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 86 - diff-files with pathspec outside sparse definition
-
-expecting success of 1092.87 'sparse index is not expanded: diff-files': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	run_on_all ../edit-contents deep/a &&
-
-	ensure_not_expanded diff-files &&
-	ensure_not_expanded diff-files -- deep/a &&
-	ensure_not_expanded diff-files -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 87 - sparse index is not expanded: diff-files
-
-expecting success of 1092.88 'diff-tree': 
-	init_repos &&
-
-	# Test change inside sparse cone
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree2 &&
-	test_all_match git diff-tree $tree1 $tree2 -- deep/a &&
-	test_all_match git diff-tree HEAD update-deep &&
-	test_all_match git diff-tree HEAD update-deep -- deep/a &&
-
-	# Test change outside sparse cone
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-	test_all_match git diff-tree $tree1 $tree3 &&
-	test_all_match git diff-tree $tree1 $tree3 -- folder1/a &&
-	test_all_match git diff-tree HEAD update-folder1 &&
-	test_all_match git diff-tree HEAD update-folder1 -- folder1/a &&
-
-	# Check that SKIP_WORKTREE files are not materialized
-	test_path_is_missing sparse-checkout/folder1/a &&
-	test_path_is_missing sparse-index/folder1/a &&
-	test_path_is_missing sparse-checkout/folder2/a &&
-	test_path_is_missing sparse-index/folder2/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 88 - diff-tree
-
-expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
-	init_repos &&
-
-	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
-	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
-	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
-
-	ensure_not_expanded diff-tree $tree1 $tree2 &&
-	ensure_not_expanded diff-tree $tree1 $tree2 -- deep/a &&
-	ensure_not_expanded diff-tree HEAD update-deep &&
-	ensure_not_expanded diff-tree HEAD update-deep -- deep/a &&
-	ensure_not_expanded diff-tree $tree1 $tree3 &&
-	ensure_not_expanded diff-tree $tree1 $tree3 -- folder1/a &&
-	ensure_not_expanded diff-tree HEAD update-folder1 &&
-	ensure_not_expanded diff-tree HEAD update-folder1 -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 89 - sparse-index is not expanded: diff-tree
-
-expecting success of 1092.90 'worktree': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>"$1"
-	EOF
-
-	for repo in full-checkout sparse-checkout sparse-index
-	do
-		worktree=${repo}-wt &&
-		git -C $repo worktree add ../$worktree &&
-
-		# Compare worktree content with "ls"
-		(cd $repo && ls) >worktree_contents &&
-		(cd $worktree && ls) >new_worktree_contents &&
-		test_cmp worktree_contents new_worktree_contents &&
-
-		# Compare index content with "ls-files --sparse"
-		git -C $repo ls-files --sparse >index_contents &&
-		git -C $worktree ls-files --sparse >new_index_contents &&
-		test_cmp index_contents new_index_contents &&
-
-		git -C $repo worktree remove ../$worktree || return 1
-	done &&
-
-	test_all_match git worktree add .worktrees/hotfix &&
-	run_on_all ../edit-contents .worktrees/hotfix/deep/a &&
-	test_all_match test_must_fail git worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'full-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-checkout-wt')
-HEAD is now at 703fd3e initial commit
-Preparing worktree (new branch 'sparse-index-wt')
-HEAD is now at 703fd3e initial commit
-ok 90 - worktree
-
-expecting success of 1092.91 'worktree is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded worktree add .worktrees/hotfix &&
-	ensure_not_expanded worktree remove .worktrees/hotfix
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 91 - worktree is not expanded
-
-expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_all cp ../.gitattributes ./deep &&
-
-	test_all_match git check-attr -a -- deep/a &&
-
-	test_all_match git add deep/.gitattributes &&
-	test_all_match git check-attr -a --cached -- deep/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 92 - check-attr with pathspec inside sparse definition
-
-expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	run_on_sparse mkdir folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	run_on_all cp a folder1/a &&
-
-	test_all_match git check-attr -a -- folder1/a &&
-
-	git -C full-checkout add folder1/.gitattributes &&
-	test_sparse_match git add --sparse folder1/.gitattributes &&
-	test_all_match git commit -m "add .gitattributes" &&
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match git check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 93 - check-attr with pathspec outside sparse definition
-
-checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo "a " >"$1"
-	EOF
-
-	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
-
-	echo "a whitespace=trailing-space,space-before-tab" >>.gitattributes &&
-	run_on_all mkdir -p folder1 &&
-	run_on_all cp ../.gitattributes ./folder1 &&
-	test_all_match git add --sparse folder1/.gitattributes &&
-	run_on_all ../edit-contents folder1/a &&
-	test_all_match git add --sparse folder1/a &&
-
-	test_sparse_match git sparse-checkout reapply &&
-	test_all_match test_must_fail git diff --check --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-test_must_fail: command succeeded: git diff --check --cached -- folder1/a
-not ok 94 - diff --check with pathspec outside sparse definition # TODO known breakage
-
-expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
-	init_repos &&
-
-	echo "a -crlf myAttr" >>.gitattributes &&
-	mkdir ./sparse-index/folder1 &&
-	cp ./sparse-index/a ./sparse-index/folder1/a &&
-	cp .gitattributes ./sparse-index/deep &&
-	cp .gitattributes ./sparse-index/folder1 &&
-
-	git -C sparse-index add deep/.gitattributes &&
-	git -C sparse-index add --sparse folder1/.gitattributes &&
-	ensure_not_expanded check-attr -a --cached -- deep/a &&
-	ensure_not_expanded check-attr -a --cached -- folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 95 - sparse-index is not expanded: check-attr
-
-expecting success of 1092.96 'advice.sparseIndexExpanded': 
-	init_repos &&
-
-	git -C sparse-index config --unset advice.sparseIndexExpanded &&
-	git -C sparse-index sparse-checkout set deep/deeper1 &&
-	mkdir -p sparse-index/deep/deeper2/deepest &&
-	touch sparse-index/deep/deeper2/deepest/bogus &&
-	git -C sparse-index status 2>err &&
-	grep "The sparse index is expanding to a full index" err &&
-
-	git -C sparse-index sparse-checkout disable 2>err &&
-	test_line_count = 0 err
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-On branch base
-You are in a sparse checkout with 49% of tracked files present.
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	deep/deeper2/deepest/
-
-nothing added to commit but untracked files present (use "git add" to track)
-hint: The sparse index is expanding to a full index, a slow operation.
-ok 96 - advice.sparseIndexExpanded
-
-expecting success of 1092.97 'cat-file -p': 
-	init_repos &&
-	echo "new content" >>full-checkout/deep/a &&
-	echo "new content" >>sparse-checkout/deep/a &&
-	echo "new content" >>sparse-index/deep/a &&
-	run_on_all git add deep/a &&
-
-	test_all_match git cat-file -p :deep/a &&
-	ensure_not_expanded cat-file -p :deep/a &&
-	test_all_match git cat-file -p :folder1/a &&
-	ensure_expanded cat-file -p :folder1/a
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260419T191823.424359Z-H8d819085-P001ce8f2","thread":"main","time":"2026-04-19T19:18:23.425278Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191823.424359Z-H8d819085-P001ce8f2","thread":"main","time":"2026-04-19T19:18:23.426082Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000804,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 97 - cat-file -p
-
-expecting success of 1092.98 'cat-file --batch': 
-	init_repos &&
-	echo "new content" >>full-checkout/deep/a &&
-	echo "new content" >>sparse-checkout/deep/a &&
-	echo "new content" >>sparse-index/deep/a &&
-	run_on_all git add deep/a &&
-
-	echo ":deep/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_not_expanded cat-file --batch <in &&
-
-	echo ":folder1/a" >in &&
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in &&
-
-	cat >in <<-\EOF &&
-	:deep/a
-	:folder1/a
-	EOF
-	test_all_match git cat-file --batch <in &&
-	ensure_expanded cat-file --batch <in
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-{"event":"region_enter","sid":"20260419T191824.284590Z-H8d819085-P001cebb7","thread":"main","time":"2026-04-19T19:18:24.285511Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191824.284590Z-H8d819085-P001cebb7","thread":"main","time":"2026-04-19T19:18:24.286351Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000840,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T191824.524042Z-H8d819085-P001cec77","thread":"main","time":"2026-04-19T19:18:24.525062Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T191824.524042Z-H8d819085-P001cec77","thread":"main","time":"2026-04-19T19:18:24.525858Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000797,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 98 - cat-file --batch
-
-# still have 2 known breakage(s)
-# passed all remaining 96 test(s)
-1..98
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3433-rebase-across-mode-change.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3433-rebase-across-mode-change/.git/
-expecting success of 3433.1 'setup': 
-	mkdir DS &&
-	>DS/whatever &&
-	git add DS &&
-	git commit -m base &&
-
-	git branch side1 &&
-	git branch side2 &&
-
-	git checkout side1 &&
-	git rm -rf DS &&
-	test_ln_s_add unrelated DS &&
-	git commit -m side1 &&
-
-	git checkout side2 &&
-	>unrelated &&
-	git add unrelated &&
-	git commit -m commit1 &&
-
-	echo >>unrelated &&
-	git commit -am commit2
-
-[master (root-commit) ba9279b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 DS/whatever
-Switched to branch 'side1'
-rm 'DS/whatever'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[side1 0a05486] side1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 DS
- delete mode 100644 DS/whatever
-Switched to branch 'side2'
-[side2 e75512e] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated
-[side2 e22f82a] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3433.2 'rebase changes with the apply backend': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b apply-backend side2 &&
-	git rebase side1
-
-Switched to a new branch 'apply-backend'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/apply-backend.
-fatal: no rebase in progress
-ok 2 - rebase changes with the apply backend
-
-expecting success of 3433.3 'rebase changes with the merge backend': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-backend side2 &&
-	git rebase -m side1
-
-Switched to a new branch 'merge-backend'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/merge-backend.
-fatal: no rebase in progress
-ok 3 - rebase changes with the merge backend
-
-expecting success of 3433.4 'rebase changes with the merge backend with a delay': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-delay-backend side2 &&
-	git rebase -m --exec "sleep 1" side1
-
-Switched to a new branch 'merge-delay-backend'
-Rebasing (1/4)
Rebasing (2/4)
Executing: sleep 1
-Rebasing (3/4)
Rebasing (4/4)
Executing: sleep 1
-Successfully rebased and updated refs/heads/merge-delay-backend.
-fatal: no rebase in progress
-ok 4 - rebase changes with the merge backend with a delay
-
-# passed all 4 test(s)
-1..4
+# passed all 26 test(s)
+1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3435-rebase-gpg-sign.sh ***
@@ -156637,337 +153945,6 @@
 1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3431-rebase-fork-point.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3431-rebase-fork-point/.git/
-expecting success of 3431.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git branch -t side &&
-	git reset --hard HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git checkout side &&
-	test_commit F &&
-	test_commit G
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-branch 'side' set up to track 'main'.
-HEAD is now at d9df450 B
-[main 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main dc25130] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-[side f231f7a] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[side d8775ba] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-ok 1 - setup
-
-expecting success of 3431.2 'git rebase ': do_test_rebase 'G F E D B A' 
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 2 - git rebase 
-
-expecting success of 3431.3 'git rebase --onto D': do_test_rebase 'G F D B A' --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 3 - git rebase --onto D
-
-expecting success of 3431.4 'git rebase --keep-base': do_test_rebase 'G F C B A' --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 4 - git rebase --keep-base
-
-expecting success of 3431.5 'git rebase --no-fork-point': do_test_rebase 'G F C E D B A' --no-fork-point
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 5 - git rebase --no-fork-point
-
-expecting success of 3431.6 'git rebase --no-fork-point --onto D': do_test_rebase 'G F C D B A' --no-fork-point --onto D
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 6 - git rebase --no-fork-point --onto D
-
-expecting success of 3431.7 'git rebase --no-fork-point --keep-base': do_test_rebase 'G F C B A' --no-fork-point --keep-base
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 7 - git rebase --no-fork-point --keep-base
-
-expecting success of 3431.8 'git rebase --fork-point refs/heads/main': do_test_rebase 'G F E D B A' --fork-point refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 8 - git rebase --fork-point refs/heads/main
-
-expecting success of 3431.9 'git rebase --fork-point main': do_test_rebase 'G F E D B A' --fork-point main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 9 - git rebase --fork-point main
-
-expecting success of 3431.10 'git rebase --fork-point --onto D refs/heads/main': do_test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 10 - git rebase --fork-point --onto D refs/heads/main
-
-expecting success of 3431.11 'git rebase --fork-point --onto D main': do_test_rebase 'G F D B A' --fork-point --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 11 - git rebase --fork-point --onto D main
-
-expecting success of 3431.12 'git rebase --fork-point --keep-base refs/heads/main': do_test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 12 - git rebase --fork-point --keep-base refs/heads/main
-
-expecting success of 3431.13 'git rebase --fork-point --keep-base main': do_test_rebase 'G F B A' --fork-point --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 13 - git rebase --fork-point --keep-base main
-
-expecting success of 3431.14 'git rebase refs/heads/main': do_test_rebase 'G F C E D B A' refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 14 - git rebase refs/heads/main
-
-expecting success of 3431.15 'git rebase main': do_test_rebase 'G F C E D B A' main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 15 - git rebase main
-
-expecting success of 3431.16 'git rebase --onto D refs/heads/main': do_test_rebase 'G F C D B A' --onto D refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 16 - git rebase --onto D refs/heads/main
-
-expecting success of 3431.17 'git rebase --onto D main': do_test_rebase 'G F C D B A' --onto D main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 17 - git rebase --onto D main
-
-expecting success of 3431.18 'git rebase --keep-base refs/heads/main': do_test_rebase 'G F C B A' --keep-base refs/heads/main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 1 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 18 - git rebase --keep-base refs/heads/main
-
-expecting success of 3431.19 'git rebase --keep-base main': do_test_rebase 'G F C B A' --keep-base main
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Current branch side is up to date.
-ok 19 - git rebase --keep-base main
-
-expecting success of 3431.20 'git rebase --fork-point with ambiguous refname': 
-	git checkout main &&
-	git checkout -b one &&
-	git checkout side &&
-	git tag one &&
-	test_must_fail git rebase --fork-point --onto D one
-
-Switched to branch 'main'
-Switched to a new branch 'one'
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-warning: refname 'one' is ambiguous.
-fatal: Ambiguous refname: 'one'
-ok 20 - git rebase --fork-point with ambiguous refname
-
-expecting success of 3431.21 '--fork-point and --root both given': 
-	test_must_fail git rebase --fork-point --root 2>err &&
-	test_grep "cannot be used together" err
-
-fatal: options '--root' and '--fork-point' cannot be used together
-ok 21 - --fork-point and --root both given
-
-expecting success of 3431.22 'rebase.forkPoint set to false': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F C E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch and 'main' have diverged,
-and have 3 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 22 - rebase.forkPoint set to false
-
-expecting success of 3431.23 'rebase.forkPoint set to false and then to true': 
-	test_config_global rebase.forkPoint false &&
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F E D B A"
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 3 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 23 - rebase.forkPoint set to false and then to true
-
-expecting success of 3431.24 'rebase.forkPoint set to false and command line says --fork-point': 
-	test_config rebase.forkPoint false &&
-	do_test_rebase "G F E D B A" --fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/side.
-ok 24 - rebase.forkPoint set to false and command line says --fork-point
-
-expecting success of 3431.25 'rebase.forkPoint set to true and command line says --no-fork-point': 
-	test_config rebase.forkPoint true &&
-	do_test_rebase "G F C E D B A" --no-fork-point
-
-Switched to branch 'main'
-HEAD is now at dc25130 E
-Switched to branch 'side'
-Your branch is ahead of 'main' by 2 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at d8775ba G
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Successfully rebased and updated refs/heads/side.
-ok 25 - rebase.forkPoint set to true and command line says --no-fork-point
-
-expecting success of 3431.26 'rebase.forkPoint set to true and --root given': 
-	test_config rebase.forkPoint true &&
-	git rebase --root
-
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/side.
-ok 26 - rebase.forkPoint set to true and --root given
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3434-rebase-i18n.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3434-rebase-i18n/.git/
 expecting success of 3434.1 'setup': 
@@ -157164,821 +154141,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3438-rebase-broken-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3438-rebase-broken-files/.git/
-expecting success of 3438.1 'set up conflicting branches': 
-	test_commit base file &&
-	git checkout -b branch1 &&
-	test_commit one file &&
-	git checkout -b branch2 HEAD^ &&
-	test_commit two file
-
-[master (root-commit) 215235d] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'branch1'
-[branch1 92a1cb8] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch2'
-[branch2 638f6ad] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up conflicting branches
-
-expecting success of 3438.2 'detect missing GIT_AUTHOR_NAME': 
-		create_conflict &&
-
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Switched to a new branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_NAME'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 2 - detect missing GIT_AUTHOR_NAME
-
-expecting success of 3438.3 'detect missing GIT_AUTHOR_EMAIL': 
-		create_conflict &&
-
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_EMAIL'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 3 - detect missing GIT_AUTHOR_EMAIL
-
-expecting success of 3438.4 'detect missing GIT_AUTHOR_DATE': 
-		create_conflict &&
-
-		grep -v $item .git/rebase-merge/author-script >tmp &&
-		mv tmp .git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: missing 'GIT_AUTHOR_DATE'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 4 - detect missing GIT_AUTHOR_DATE
-
-expecting success of 3438.5 'detect duplicate GIT_AUTHOR_NAME': 
-		create_conflict &&
-
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_NAME' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 5 - detect duplicate GIT_AUTHOR_NAME
-
-expecting success of 3438.6 'detect duplicate GIT_AUTHOR_EMAIL': 
-		create_conflict &&
-
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_EMAIL' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 6 - detect duplicate GIT_AUTHOR_EMAIL
-
-expecting success of 3438.7 'detect duplicate GIT_AUTHOR_DATE': 
-		create_conflict &&
-
-		grep -i $item .git/rebase-merge/author-script >tmp &&
-		cat tmp >>.git/rebase-merge/author-script &&
-
-		check_resolve_fails
-	
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: 'GIT_AUTHOR_DATE' already given
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 7 - detect duplicate GIT_AUTHOR_DATE
-
-expecting success of 3438.8 'unknown key in author-script': 
-	create_conflict &&
-
-	echo "GIT_AUTHOR_BOGUS=${SQ}whatever${SQ}" \
-		>>.git/rebase-merge/author-script &&
-
-	check_resolve_fails
-
-Reset branch 'tmp'
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 638f6ad... two
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 638f6ad... two
-error: unknown variable 'GIT_AUTHOR_BOGUS'
-error: you have staged changes in your working tree
-If these changes are meant to be squashed into the previous commit, run:
-
-  git commit --amend 
-
-If they are meant to go into a new commit, run:
-
-  git commit 
-
-In both cases, once you're done, continue with:
-
-  git rebase --continue
-
-error: could not commit staged changes.
-ok 8 - unknown key in author-script
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 3438.9 'unwritable rebased-patches does not leak': 
-	>.git/rebased-patches &&
-	chmod a-w .git/rebased-patches &&
-
-	git checkout -b side HEAD^ &&
-	test_commit unrelated &&
-	test_must_fail git rebase --apply --onto tmp HEAD^
-
-Switched to a new branch 'side'
-[side c21b839] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated.t
-error: could not open '.git/rebased-patches' for writing: Permission denied
-First, rewinding head to replay your work on top of it...
-ok 9 - unwritable rebased-patches does not leak
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3436-rebase-more-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3436-rebase-more-options/.git/
-expecting success of 3436.1 'setup': 
-	git checkout -b topic &&
-	test_write_lines "line 1" "	line 2" "line 3" >file &&
-	git add file &&
-	git commit -m "add file" &&
-
-	test_write_lines "line 1" "new line 2" "line 3" >file &&
-	git commit -am "update file" &&
-	git tag side &&
-	test_commit commit1 foo foo1 &&
-	test_commit commit2 foo foo2 &&
-	test_commit commit3 foo foo3 &&
-
-	git checkout --orphan main &&
-	rm foo &&
-	test_write_lines "line 1" "        line 2" "line 3" >file &&
-	git commit -am "add file" &&
-	git tag main &&
-
-	mkdir test-bin &&
-	write_script test-bin/git-merge-test <<-\EOF
-	exec git merge-recursive "$@"
-	EOF
-
-Switched to a new branch 'topic'
-[topic (root-commit) c24e627] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[topic 139b464] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic 7c57c40] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[topic bd08fd4] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic eda6f49] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'main'
-[main (root-commit) 3ada4af] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 3436.2 '--ignore-whitespace works with apply backend': 
-	test_must_fail git rebase --apply main side &&
-	git rebase --abort &&
-	git rebase --apply --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-3ada4af add file
-virtual update file
-found 1 common ancestor:
-virtual cea075e2ce716201e60e4bbadc9a40706c56c362
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 2 - --ignore-whitespace works with apply backend
-
-expecting success of 3436.3 '--ignore-whitespace works with merge backend': 
-	test_must_fail git rebase --merge main side &&
-	git rebase --abort &&
-	git rebase --merge --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 139b464... update file
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 139b464... update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 3 - --ignore-whitespace works with merge backend
-
-expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
-			main side &&
-		git rebase --continue
-	) &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-rebase -i script before editing:
-pick 139b464 update file
-
-rebase -i script after editing:
-break
-pick 139b464 update file
-Rebasing (1/2)
Stopped at 3ada4af (add file)
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 4 - --ignore-whitespace is remembered when continuing
-
-expecting success of 3436.5 '--committer-date-is-author-date works with apply backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase --apply --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 5 - --committer-date-is-author-date works with apply backend
-
-expecting success of 3436.6 '--committer-date-is-author-date works with merge backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase -m --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 6 - --committer-date-is-author-date works with merge backend
-
-expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 6184e8b update file
-
-rebase -i script after editing:
-reword 6184e8b update file
-Rebasing (1/1)
[detached HEAD 5c38296] edited
- Author: A U Thor <author@example.com>
- Date: Thu Jan 1 03:20:34 1970 +0300
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 7 - --committer-date-is-author-date works when rewording
-
-expecting success of 3436.8 '--committer-date-is-author-date works with rebase -r': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	git rebase -r --root --committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  5c38296 edited
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5c38296
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
-ok 8 - --committer-date-is-author-date works with rebase -r
-
-expecting success of 3436.9 '--committer-date-is-author-date works when forking merge': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
-					--committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Merging 2a85097a58eecaad11df374857a87fbc0e47e389 with c24e62700f83d7b12297f45d1ce1e9689ebb2b1f
-Merging:
-2a85097 c24e627 add file
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Rebasing (4/11)
Merging eaa553d7eb7c0d13b95960e348a77332601bbc3e with 139b46443e355afd5f438ac2849d41f3a53b8c77
-Merging:
-eaa553d add file
-139b464 update file
-found 1 common ancestor:
-c24e627 add file
-Rebasing (5/11)
Rebasing (6/11)
Merging 34dfd6c233143884ddd9180be88112657b590d86 with 7c57c40ccd2483ccea76831595c0e232d40560c7
-Merging:
-34dfd6c update file
-7c57c40 commit1
-found 1 common ancestor:
-139b464 update file
-Rebasing (7/11)
Merging 8251e18d67ff84cb7aa93676b4cb93be15ef6810 with bd08fd48eeadc218177587a9f467f39ac4b51d49
-Merging:
-8251e18 commit1
-bd08fd4 commit2
-found 1 common ancestor:
-7c57c40 commit1
-Rebasing (8/11)
Merging a2d9c2ebb6808fff81a49a500b865fbf8f4fcbf5 with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-a2d9c2e commit2
-eda6f49 commit3
-found 1 common ancestor:
-bd08fd4 commit2
-Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Merging HEAD with 54193ebc0e463528ab8c3f723f89752960c98304
-Merging:
-34dfd6c update file
-54193eb commit3
-found 1 common ancestor:
-34dfd6c update file
-Merge made by the 'test' strategy.
-Successfully rebased and updated detached HEAD.
-ok 9 - --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.10 '--committer-date-is-author-date works when committing conflict resolution': 
-	git checkout commit2 &&
-	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--onto HEAD^^ HEAD^ &&
-	echo resolved > foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -1
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at bd08fd4 commit2
-[detached HEAD 832d950] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
-error: could not apply 832d950... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 832d950... commit2
-[detached HEAD 3bf7cf9] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Successfully rebased and updated detached HEAD.
-ok 10 - --committer-date-is-author-date works when committing conflict resolution
-
-expecting success of 3436.11 '--reset-author-date works with apply backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --reset-author-date HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: commit2
-ok 11 - --reset-author-date works with apply backend
-
-expecting success of 3436.12 '--reset-author-date works with merge backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --reset-author-date -m HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 12 - --reset-author-date works with merge backend
-
-expecting success of 3436.13 '--reset-author-date works after conflict resolution': 
-	test_must_fail git rebase --reset-author-date -m \
-		--onto commit2^^ commit2^ commit2 &&
-	echo resolved >foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_atime_is_ignored -1
-
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-[detached HEAD a6226c1] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Successfully rebased and updated detached HEAD.
-ok 13 - --reset-author-date works after conflict resolution
-
-expecting success of 3436.14 '--reset-author-date works with rebase -r': 
-	git checkout side &&
-	git merge --no-ff commit3 &&
-	git rebase -r --root --reset-author-date &&
-	test_atime_is_ignored
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a6226c1 commit2
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> a6226c1
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
-ok 14 - --reset-author-date works with rebase -r
-
-expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--reset-author-date --onto commit2^^ commit2^ commit3 &&
-	git checkout --theirs foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -2 &&
-	test_atime_is_ignored -2
-
-Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-Updated 1 path from the index
-[detached HEAD 826953d] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (2/2)
Successfully rebased and updated detached HEAD.
-ok 15 - --reset-author-date with --committer-date-is-author-date works
-
-expecting success of 3436.16 'reset-author-date with --committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date \
-				--reset-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_atime_is_ignored -1
-
-[detached HEAD 0f626ac] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 0f626ac commit3
-
-rebase -i script after editing:
-reword 0f626ac commit3
-Rebasing (1/1)
[detached HEAD 808c575] edited
- Author: A U Thor <author@example.com>
- Date: Sun Apr 19 19:18:31 2026 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated detached HEAD.
-ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
-
-expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
-	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
-		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
-				--reset-author-date \
-				--committer-date-is-author-date side side &&
-	test_ctime_is_atime -1 &&
-	test_atime_is_ignored -1
- 
-Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-139b464 update file
-eda6f49 commit3
-found 1 common ancestor:
-139b464 update file
-Merge made by the 'test' strategy.
-Successfully rebased and updated detached HEAD.
-ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --ignore-date HEAD^ &&
-	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
-	git rebase -m --ignore-date HEAD^ &&
-	test_atime_is_ignored -2
-
-[detached HEAD 09e9cd3] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-First, rewinding head to replay your work on top of it...
-Applying: commit1
-Applying: commit2
-Applying: commit3
-[detached HEAD 63d3fe5] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-HEAD is up to date, rebase forced.
-Rebasing (1/1)
Successfully rebased and updated detached HEAD.
-ok 18 - --ignore-date is an alias for --reset-author-date
-
-expecting success of 3436.19 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 19 - $EDITOR and friends are unchanged
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3311-notes-merge-fanout.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3311-notes-merge-fanout/.git/
 expecting success of 3311.1 'setup a few initial commits with notes (notes ref: x)': 
@@ -160650,6 +156812,821 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3438-rebase-broken-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3438-rebase-broken-files/.git/
+expecting success of 3438.1 'set up conflicting branches': 
+	test_commit base file &&
+	git checkout -b branch1 &&
+	test_commit one file &&
+	git checkout -b branch2 HEAD^ &&
+	test_commit two file
+
+[master (root-commit) 215235d] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'branch1'
+[branch1 92a1cb8] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch2'
+[branch2 638f6ad] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up conflicting branches
+
+expecting success of 3438.2 'detect missing GIT_AUTHOR_NAME': 
+		create_conflict &&
+
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Switched to a new branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: missing 'GIT_AUTHOR_NAME'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 2 - detect missing GIT_AUTHOR_NAME
+
+expecting success of 3438.3 'detect missing GIT_AUTHOR_EMAIL': 
+		create_conflict &&
+
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: missing 'GIT_AUTHOR_EMAIL'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 3 - detect missing GIT_AUTHOR_EMAIL
+
+expecting success of 3438.4 'detect missing GIT_AUTHOR_DATE': 
+		create_conflict &&
+
+		grep -v $item .git/rebase-merge/author-script >tmp &&
+		mv tmp .git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: missing 'GIT_AUTHOR_DATE'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 4 - detect missing GIT_AUTHOR_DATE
+
+expecting success of 3438.5 'detect duplicate GIT_AUTHOR_NAME': 
+		create_conflict &&
+
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: 'GIT_AUTHOR_NAME' already given
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 5 - detect duplicate GIT_AUTHOR_NAME
+
+expecting success of 3438.6 'detect duplicate GIT_AUTHOR_EMAIL': 
+		create_conflict &&
+
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: 'GIT_AUTHOR_EMAIL' already given
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 6 - detect duplicate GIT_AUTHOR_EMAIL
+
+expecting success of 3438.7 'detect duplicate GIT_AUTHOR_DATE': 
+		create_conflict &&
+
+		grep -i $item .git/rebase-merge/author-script >tmp &&
+		cat tmp >>.git/rebase-merge/author-script &&
+
+		check_resolve_fails
+	
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: 'GIT_AUTHOR_DATE' already given
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 7 - detect duplicate GIT_AUTHOR_DATE
+
+expecting success of 3438.8 'unknown key in author-script': 
+	create_conflict &&
+
+	echo "GIT_AUTHOR_BOGUS=${SQ}whatever${SQ}" \
+		>>.git/rebase-merge/author-script &&
+
+	check_resolve_fails
+
+Reset branch 'tmp'
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 638f6ad... two
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 638f6ad... two
+error: unknown variable 'GIT_AUTHOR_BOGUS'
+error: you have staged changes in your working tree
+If these changes are meant to be squashed into the previous commit, run:
+
+  git commit --amend 
+
+If they are meant to go into a new commit, run:
+
+  git commit 
+
+In both cases, once you're done, continue with:
+
+  git rebase --continue
+
+error: could not commit staged changes.
+ok 8 - unknown key in author-script
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
+
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
+
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
+
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
+
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 3438.9 'unwritable rebased-patches does not leak': 
+	>.git/rebased-patches &&
+	chmod a-w .git/rebased-patches &&
+
+	git checkout -b side HEAD^ &&
+	test_commit unrelated &&
+	test_must_fail git rebase --apply --onto tmp HEAD^
+
+Switched to a new branch 'side'
+[side c21b839] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated.t
+error: could not open '.git/rebased-patches' for writing: Permission denied
+First, rewinding head to replay your work on top of it...
+ok 9 - unwritable rebased-patches does not leak
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3436-rebase-more-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3436-rebase-more-options/.git/
+expecting success of 3436.1 'setup': 
+	git checkout -b topic &&
+	test_write_lines "line 1" "	line 2" "line 3" >file &&
+	git add file &&
+	git commit -m "add file" &&
+
+	test_write_lines "line 1" "new line 2" "line 3" >file &&
+	git commit -am "update file" &&
+	git tag side &&
+	test_commit commit1 foo foo1 &&
+	test_commit commit2 foo foo2 &&
+	test_commit commit3 foo foo3 &&
+
+	git checkout --orphan main &&
+	rm foo &&
+	test_write_lines "line 1" "        line 2" "line 3" >file &&
+	git commit -am "add file" &&
+	git tag main &&
+
+	mkdir test-bin &&
+	write_script test-bin/git-merge-test <<-\EOF
+	exec git merge-recursive "$@"
+	EOF
+
+Switched to a new branch 'topic'
+[topic (root-commit) c24e627] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+[topic 139b464] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic 7c57c40] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[topic bd08fd4] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[topic eda6f49] commit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'main'
+[main (root-commit) 3ada4af] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 3436.2 '--ignore-whitespace works with apply backend': 
+	test_must_fail git rebase --apply main side &&
+	git rebase --abort &&
+	git rebase --apply --ignore-whitespace main side &&
+	git diff --exit-code side
+
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+3ada4af add file
+virtual update file
+found 1 common ancestor:
+virtual cea075e2ce716201e60e4bbadc9a40706c56c362
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 2 - --ignore-whitespace works with apply backend
+
+expecting success of 3436.3 '--ignore-whitespace works with merge backend': 
+	test_must_fail git rebase --merge main side &&
+	git rebase --abort &&
+	git rebase --merge --ignore-whitespace main side &&
+	git diff --exit-code side
+
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 139b464... update file
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 139b464... update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 3 - --ignore-whitespace works with merge backend
+
+expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
+			main side &&
+		git rebase --continue
+	) &&
+	git diff --exit-code side
+
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+rebase -i script before editing:
+pick 139b464 update file
+
+rebase -i script after editing:
+break
+pick 139b464 update file
+Rebasing (1/2)
Stopped at 3ada4af (add file)
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 4 - --ignore-whitespace is remembered when continuing
+
+expecting success of 3436.5 '--committer-date-is-author-date works with apply backend': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase --apply --committer-date-is-author-date HEAD^ &&
+	test_ctime_is_atime -1
+
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 5 - --committer-date-is-author-date works with apply backend
+
+expecting success of 3436.6 '--committer-date-is-author-date works with merge backend': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase -m --committer-date-is-author-date HEAD^ &&
+	test_ctime_is_atime -1
+
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 6 - --committer-date-is-author-date works with merge backend
+
+expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_ctime_is_atime -1
+
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 6184e8b update file
+
+rebase -i script after editing:
+reword 6184e8b update file
+Rebasing (1/1)
[detached HEAD 5c38296] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Jan 1 03:20:34 1970 +0300
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 7 - --committer-date-is-author-date works when rewording
+
+expecting success of 3436.8 '--committer-date-is-author-date works with rebase -r': 
+	git checkout side &&
+	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
+	git rebase -r --root --committer-date-is-author-date &&
+	test_ctime_is_atime
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  5c38296 edited
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 5c38296
+
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 8 - --committer-date-is-author-date works with rebase -r
+
+expecting success of 3436.9 '--committer-date-is-author-date works when forking merge': 
+	git checkout side &&
+	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
+	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
+					--committer-date-is-author-date &&
+	test_ctime_is_atime
+
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
+
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> aa07736
+
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Merging 2a85097a58eecaad11df374857a87fbc0e47e389 with c24e62700f83d7b12297f45d1ce1e9689ebb2b1f
+Merging:
+2a85097 c24e627 add file
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+Rebasing (4/11)
Merging eaa553d7eb7c0d13b95960e348a77332601bbc3e with 139b46443e355afd5f438ac2849d41f3a53b8c77
+Merging:
+eaa553d add file
+139b464 update file
+found 1 common ancestor:
+c24e627 add file
+Rebasing (5/11)
Rebasing (6/11)
Merging 34dfd6c233143884ddd9180be88112657b590d86 with 7c57c40ccd2483ccea76831595c0e232d40560c7
+Merging:
+34dfd6c update file
+7c57c40 commit1
+found 1 common ancestor:
+139b464 update file
+Rebasing (7/11)
Merging 8251e18d67ff84cb7aa93676b4cb93be15ef6810 with bd08fd48eeadc218177587a9f467f39ac4b51d49
+Merging:
+8251e18 commit1
+bd08fd4 commit2
+found 1 common ancestor:
+7c57c40 commit1
+Rebasing (8/11)
Merging a2d9c2ebb6808fff81a49a500b865fbf8f4fcbf5 with eda6f49c7ee63a956ad612b98a03b92c19face55
+Merging:
+a2d9c2e commit2
+eda6f49 commit3
+found 1 common ancestor:
+bd08fd4 commit2
+Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Merging HEAD with 54193ebc0e463528ab8c3f723f89752960c98304
+Merging:
+34dfd6c update file
+54193eb commit3
+found 1 common ancestor:
+34dfd6c update file
+Merge made by the 'test' strategy.
+Successfully rebased and updated detached HEAD.
+ok 9 - --committer-date-is-author-date works when forking merge
+
+expecting success of 3436.10 '--committer-date-is-author-date works when committing conflict resolution': 
+	git checkout commit2 &&
+	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--onto HEAD^^ HEAD^ &&
+	echo resolved > foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -1
+
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
+
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> aa07736
+
+HEAD is now at bd08fd4 commit2
+[detached HEAD 832d950] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
+error: could not apply 832d950... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 832d950... commit2
+[detached HEAD 3bf7cf9] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Successfully rebased and updated detached HEAD.
+ok 10 - --committer-date-is-author-date works when committing conflict resolution
+
+expecting success of 3436.11 '--reset-author-date works with apply backend': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --reset-author-date HEAD^ &&
+	test_atime_is_ignored -1
+
+[detached HEAD 70e7180] commit2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+HEAD is up to date, rebase forced.
+First, rewinding head to replay your work on top of it...
+Applying: commit2
+ok 11 - --reset-author-date works with apply backend
+
+expecting success of 3436.12 '--reset-author-date works with merge backend': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --reset-author-date -m HEAD^ &&
+	test_atime_is_ignored -1
+
+[detached HEAD 70e7180] commit2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 12 - --reset-author-date works with merge backend
+
+expecting success of 3436.13 '--reset-author-date works after conflict resolution': 
+	test_must_fail git rebase --reset-author-date -m \
+		--onto commit2^^ commit2^ commit2 &&
+	echo resolved >foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_atime_is_ignored -1
+
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+[detached HEAD 021de28] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Successfully rebased and updated detached HEAD.
+ok 13 - --reset-author-date works after conflict resolution
+
+expecting success of 3436.14 '--reset-author-date works with rebase -r': 
+	git checkout side &&
+	git merge --no-ff commit3 &&
+	git rebase -r --root --reset-author-date &&
+	test_atime_is_ignored
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  021de28 commit2
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 021de28
+
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Successfully rebased and updated detached HEAD.
+ok 14 - --reset-author-date works with rebase -r
+
+expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--reset-author-date --onto commit2^^ commit2^ commit3 &&
+	git checkout --theirs foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -2 &&
+	test_atime_is_ignored -2
+
+Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+Updated 1 path from the index
+[detached HEAD 63c9571] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Rebasing (2/2)
Successfully rebased and updated detached HEAD.
+ok 15 - --reset-author-date with --committer-date-is-author-date works
+
+expecting success of 3436.16 'reset-author-date with --committer-date-is-author-date works when rewording': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE=edited \
+			FAKE_LINES="reword 1" \
+			git rebase -i --committer-date-is-author-date \
+				--reset-author-date HEAD^
+	) &&
+	test_write_lines edited "" >expect &&
+	git log --format="%B" -1 >actual &&
+	test_cmp expect actual &&
+	test_atime_is_ignored -1
+
+[detached HEAD 38a2213] commit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 38a2213 commit3
+
+rebase -i script after editing:
+reword 38a2213 commit3
+Rebasing (1/1)
[detached HEAD 2c8e913] edited
+ Author: A U Thor <author@example.com>
+ Date: Mon Mar 17 13:20:47 2025 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated detached HEAD.
+ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
+
+expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
+	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
+		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
+				--reset-author-date \
+				--committer-date-is-author-date side side &&
+	test_ctime_is_atime -1 &&
+	test_atime_is_ignored -1
+ 
+Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
+Merging:
+139b464 update file
+eda6f49 commit3
+found 1 common ancestor:
+139b464 update file
+Merge made by the 'test' strategy.
+Successfully rebased and updated detached HEAD.
+ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
+
+expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --ignore-date HEAD^ &&
+	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
+	git rebase -m --ignore-date HEAD^ &&
+	test_atime_is_ignored -2
+
+[detached HEAD 09e9cd3] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+First, rewinding head to replay your work on top of it...
+Applying: commit1
+Applying: commit2
+Applying: commit3
+[detached HEAD 6397595] empty
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+HEAD is up to date, rebase forced.
+Rebasing (1/1)
Successfully rebased and updated detached HEAD.
+ok 18 - --ignore-date is an alias for --reset-author-date
+
+expecting success of 3436.19 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 19 - $EDITOR and friends are unchanged
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3500-cherry.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3500-cherry/.git/
 expecting success of 3500.1 'prepare repository with topic branch, and check cherry finds the 2 patches from there': 
@@ -160764,70 +157741,77 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3502-cherry-pick-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3502-cherry-pick-merge/.git/
-expecting success of 3502.1 'setup': 
+*** t3430-rebase-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3430-rebase-merges/.git/
+expecting success of 3430.1 'setup': 
+	write_script replace-editor.sh <<-\EOF &&
+	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
+	cp script-from-scratch "$1"
+	EOF
 
-	>A &&
-	>B &&
-	git add A B &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-	echo new line >A &&
-	git commit -m "add line to A" A &&
-	git tag a &&
-	git checkout side &&
-	echo new line >B &&
-	git commit -m "add line to B" B &&
-	git tag b &&
+	test_commit A &&
+	git checkout -b first &&
+	test_commit B &&
+	b=$(git rev-parse --short HEAD) &&
 	git checkout main &&
-	git merge side &&
-	git tag c
-
+	test_commit C &&
+	c=$(git rev-parse --short HEAD) &&
+	test_commit D &&
+	d=$(git rev-parse --short HEAD) &&
+	git merge --no-commit B &&
+	test_tick &&
+	git commit -m E &&
+	git tag -m E E &&
+	e=$(git rev-parse --short HEAD) &&
+	git checkout -b second C &&
+	test_commit F &&
+	f=$(git rev-parse --short HEAD) &&
+	test_commit G &&
+	g=$(git rev-parse --short HEAD) &&
+	git checkout main &&
+	git merge --no-commit G &&
+	test_tick &&
+	git commit -m H &&
+	h=$(git rev-parse --short HEAD) &&
+	git tag -m H H &&
+	git checkout A &&
+	test_commit conflicting-G G.t
 
-[main (root-commit) 5c8827d] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 A
- create mode 100644 B
-[main 6e41539] add line to A
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'side'
-[side 4fb21f2] add line to B
+ create mode 100644 A.t
+Switched to a new branch 'first'
+[first d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
+ create mode 100644 B.t
 Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B | 1 +
+[main 5dee784] C
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3502.2 'cherry-pick -m complains of bogus numbers': 
-	# expect 129 here to distinguish between cases where
-	# there was nothing to cherry-pick
-	test_expect_code 129 git cherry-pick -m &&
-	test_expect_code 129 git cherry-pick -m foo b &&
-	test_expect_code 129 git cherry-pick -m -1 b &&
-	test_expect_code 129 git cherry-pick -m 0 b
-
-error: switch `m' requires a value
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-error: option `mainline' expects a number greater than zero
-ok 2 - cherry-pick -m complains of bogus numbers
-
-expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
-
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 b &&
-	git diff --exit-code c --
-
-
-HEAD is now at c81ef52 Merge branch 'side'
-Note: switching to 'a^0'.
+ create mode 100644 C.t
+[main 12bd07b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Automatic merge went well; stopped before committing as requested
+[main 2051b56] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'second'
+[second ca2c861] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[second 088b00a] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main 233d48a] H
+ Author: A U Thor <author@example.com>
+Note: switching to 'A'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -160844,372 +157828,1010 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 6e41539 add line to A
-[detached HEAD 99ce4f9] add line to B
+HEAD is now at 0ddfaf1 A
+[detached HEAD 82776a5] conflicting-G
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 3 - cherry-pick explicit first parent of a non-merge
+ create mode 100644 G.t
+ok 1 - setup
 
-expecting success of 3502.4 'cherry pick a merge without -m should fail': 
+expecting success of 3430.2 'create completely different structure': 
+	cat >script-from-scratch <<-\EOF &&
+	label onto
 
-	git reset --hard &&
-	git checkout a^0 &&
-	test_must_fail git cherry-pick c &&
-	git diff --exit-code a --
+	# onebranch
+	pick G
+	pick D
+	label onebranch
 
+	# second
+	reset onto
+	pick B
+	label second
 
-HEAD is now at 99ce4f9 add line to B
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	reset onto
+	merge -C H second
+	merge onebranch # Merge the topic branch 'onebranch'
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r A main &&
+	test_cmp_graph <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	* |   H
+	|\ \
+	| |/
+	|/|
+	| * B
+	|/
+	* A
+	EOF
 
-  99ce4f9 add line to B
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+Successfully rebased and updated refs/heads/main.
+ok 2 - create completely different structure
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3430.3 'generate correct todo list': 
+	cat >expect <<-EOF &&
+	label onto
 
- git branch <new-branch-name> 99ce4f9
+	reset onto
+	pick $b B
+	label first
 
-HEAD is now at 6e41539 add line to A
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
-fatal: cherry-pick failed
-ok 4 - cherry pick a merge without -m should fail
+	reset onto
+	pick $c C
+	label branch-point
+	pick $f F
+	pick $g G
+	label second
 
-expecting success of 3502.5 'cherry pick a merge (1)': 
+	reset branch-point # C
+	pick $d D
+	merge -C $e first # E
+	merge -C $h second # H
 
-	git reset --hard &&
-	git checkout a^0 &&
-	git cherry-pick -m 1 c &&
-	git diff --exit-code c
+	EOF
 
+	grep -v "^#" <.git/ORIGINAL-TODO >output &&
+	test_cmp expect output
 
-HEAD is now at 6e41539 add line to A
-HEAD is now at 6e41539 add line to A
-[detached HEAD 9d31cba] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 5 - cherry pick a merge (1)
+ok 3 - generate correct todo list
 
-expecting success of 3502.6 'cherry pick a merge (2)': 
+expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
+	git checkout B &&
+	test_commit dont-overwrite-untracked &&
+	cat >script-from-scratch <<-EOF &&
+	exec >dont-overwrite-untracked.t
+	pick $(git rev-parse B) B
+	reset refs/tags/dont-overwrite-untracked
+	pick $(git rev-parse C) C
+	exec cat .git/rebase-merge/done >actual
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_must_fail git rebase -ir A &&
+	test_cmp_rev HEAD B &&
+	head -n3 script-from-scratch >expect &&
+	test_cmp expect .git/rebase-merge/done &&
+	rm dont-overwrite-untracked.t &&
+	git rebase --continue &&
+	tail -n3 script-from-scratch >>expect &&
+	test_cmp expect actual
 
-	git reset --hard &&
-	git checkout b^0 &&
-	git cherry-pick -m 2 c &&
-	git diff --exit-code c
+Note: switching to 'B'.
 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-HEAD is now at 9d31cba Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-  9d31cba Merge branch 'side'
+  git switch -c <new-branch-name>
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Or undo this operation with:
 
- git branch <new-branch-name> 9d31cba
+  git switch -
 
-HEAD is now at 4fb21f2 add line to B
-[detached HEAD 9554515] Merge branch 'side'
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d9df450 B
+[detached HEAD 8acd0a8] dont-overwrite-untracked
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
-ok 6 - cherry pick a merge (2)
+ create mode 100644 dont-overwrite-untracked.t
+Rebasing (1/5)
Executing: >dont-overwrite-untracked.t
+Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
+	dont-overwrite-untracked.t
+Please move or remove them before you reset.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     reset refs/tags/dont-overwrite-untracked
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
+Successfully rebased and updated detached HEAD.
+ok 4 - `reset` refuses to overwrite untracked files
 
-expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
+expecting success of 3430.5 '`reset` rejects trees': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
+		git rebase -i B C >out 2>err &&
+	grep "object .* is a tree" err &&
+	test_must_be_empty out
 
-	git reset --hard &&
-	git checkout b^0 &&
-	test_must_fail git cherry-pick -m 3 c
+Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
+ok 5 - `reset` rejects trees
 
+expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git branch refs/rewritten/my-label A &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
+		git rebase -i B C >out 2>err &&
+	grep "could not resolve ${SQ}my-label${SQ}" err &&
+	test_must_be_empty out
 
-HEAD is now at 9554515 Merge branch 'side'
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Rebasing (1/1)
error: could not resolve 'my-label'
+ok 6 - `reset` only looks for labels under refs/rewritten/
 
-  9554515 Merge branch 'side'
+expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b conflicting-merge A &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	: fail because of conflicting untracked file &&
+	>G.t &&
+	echo "merge -C H G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	test_must_fail git rebase -ir HEAD &&
+	test_cmp_rev REBASE_HEAD H^0 &&
+	grep "^merge -C .* G$" .git/rebase-merge/done &&
+	grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
+	test_path_is_missing .git/rebase-merge/patch &&
+	echo changed >file1 &&
+	git add file1 &&
+	test_must_fail git rebase --continue 2>err &&
+	grep "error: you have staged changes in your working tree" err &&
 
- git branch <new-branch-name> 9554515
+	: fail because of merge conflict &&
+	git reset --hard conflicting-G &&
+	test_must_fail git rebase --continue &&
+	! grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
+	test_path_is_file .git/rebase-merge/patch
 
-HEAD is now at 4fb21f2 add line to B
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
-fatal: cherry-pick failed
-ok 7 - cherry pick a merge relative to nonexistent parent should fail
+Previous HEAD position was 5dee784 C
+Switched to a new branch 'conflicting-merge'
+Rebasing (1/1)
error: The following untracked working tree files would be overwritten by merge:
+	G.t
+Please move or remove them before you merge.
+Aborting
+error: could not even attempt to merge 'G'
+hint: Could not execute the todo command
+hint:
+hint:     merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
+error: you have staged changes in your working tree
+HEAD is now at 82776a5 conflicting-G
+Rebasing (2/2)
Auto-merging G.t
+CONFLICT (add/add): Merge conflict in G.t
+Could not apply 233d48a... G
+ok 7 - failed `merge -C` writes patch (may be rescheduled, too)
 
-expecting success of 3502.8 'revert explicit first parent of a non-merge': 
+expecting success of 3430.8 'failed `merge <branch>` does not crash': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout conflicting-G &&
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 b &&
-	git diff --exit-code a --
+	echo "merge G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	test_must_fail git rebase -ir HEAD &&
+	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
+	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
 
+Note: switching to 'conflicting-G'.
 
-HEAD is now at 4fb21f2 add line to B
-Previous HEAD position was 4fb21f2 add line to B
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD 1b3e5cc] Revert "add line to B"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 8 - revert explicit first parent of a non-merge
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3502.9 'revert a merge without -m should fail': 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert c &&
-	git diff --exit-code c
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-HEAD is now at 1b3e5cc Revert "add line to B"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+  git switch -
 
-  1b3e5cc Revert "add line to B"
+Turn off this advice by setting config variable advice.detachedHead to false
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+HEAD is now at 82776a5 conflicting-G
+Rebasing (1/1)
Auto-merging G.t
+CONFLICT (add/add): Merge conflict in G.t
+Could not merge G
+Merge branch 'G'
+ok 8 - failed `merge <branch>` does not crash
 
- git branch <new-branch-name> 1b3e5cc
+expecting success of 3430.9 'merge -c commits before rewording and reloads todo-list': 
+	cat >script-from-scratch <<-\EOF &&
+	merge -c E B
+	merge -c H G
+	EOF
 
-HEAD is now at c81ef52 Merge branch 'side'
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
-fatal: revert failed
-ok 9 - revert a merge without -m should fail
+	git checkout -b merge-c H &&
+	(
+		set_reword_editor &&
+		GIT_SEQUENCE_EDITOR="\"$PWD/replace-editor.sh\"" \
+			git rebase -i -r D
+	) &&
+	check_reworded_commits E H
 
-expecting success of 3502.10 'revert a merge (1)': 
+Previous HEAD position was 82776a5 conflicting-G
+Switched to a new branch 'merge-c'
+Rebasing (1/2)
[detached HEAD 3d66115] E
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Rebasing (3/3)
[detached HEAD 790085d] H
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Successfully rebased and updated refs/heads/merge-c.
+ok 9 - merge -c commits before rewording and reloads todo-list
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 1 c &&
-	git diff --exit-code a --
+expecting success of 3430.10 'merge -c rewords when a strategy is given': 
+	git checkout -b merge-c-with-strategy H &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >G.t
+	git add G.t
+	EOF
+
+	PATH="$PWD:$PATH" \
+	GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
+	GIT_EDITOR="echo edited >>" \
+		git rebase --no-ff -ir -s override -Xxopt E &&
+	test_write_lines overridden--xopt >expect &&
+	test_cmp expect G.t &&
+	test_write_lines H "" edited "" >expect &&
+	git log --format=%B -1 >actual &&
+	test_cmp expect actual
 
 
-HEAD is now at c81ef52 Merge branch 'side'
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD ab594ec] Revert "Merge branch 'side'"
+Switched to a new branch 'merge-c-with-strategy'
+Rebasing (1/1)
Merge made by the 'override' strategy.
+Successfully rebased and updated refs/heads/merge-c-with-strategy.
+ok 10 - merge -c rewords when a strategy is given
+
+expecting success of 3430.11 'with a branch tip that was cherry-picked already': 
+	git checkout -b already-upstream main &&
+	base="$(git rev-parse --verify HEAD)" &&
+
+	test_commit A1 &&
+	test_commit A2 &&
+	git reset --hard $base &&
+	test_commit B1 &&
+	test_tick &&
+	git merge -m "Merge branch A" A2 &&
+
+	git checkout -b upstream-with-a2 $base &&
+	test_tick &&
+	git cherry-pick A2 &&
+
+	git checkout already-upstream &&
+	test_tick &&
+	git rebase -i -r upstream-with-a2 &&
+	test_cmp_graph upstream-with-a2.. <<-\EOF
+	*   Merge branch A
+	|\
+	| * A1
+	* | B1
+	|/
+	o A2
+	EOF
+
+Switched to a new branch 'already-upstream'
+[already-upstream cac3b13] A1
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 10 - revert a merge (1)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+[already-upstream 0466126] A2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A2.t
+HEAD is now at c2c3fe3 Merge the topic branch 'onebranch'
+[already-upstream fa07690] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B1.t
+Merge made by the 'ort' strategy.
+ A1.t | 1 +
+ A2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 A1.t
+ create mode 100644 A2.t
+Switched to a new branch 'upstream-with-a2'
+[upstream-with-a2 071ab27] A2
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:27:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A2.t
+Switched to branch 'already-upstream'
+warning: skipped previously applied commit 0466126
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/already-upstream.
+ok 11 - with a branch tip that was cherry-picked already
 
-expecting success of 3502.11 'revert a merge (2)': 
+expecting success of 3430.12 '--no-rebase-merges countermands --rebase-merges': 
+	git checkout -b no-rebase-merges E &&
+	git rebase --rebase-merges --no-rebase-merges C &&
+	test_cmp_graph C.. <<-\EOF
+	* B
+	* D
+	o C
+	EOF
 
-	git reset --hard &&
-	git checkout c^0 &&
-	git revert -m 2 c &&
-	git diff --exit-code b --
+Switched to a new branch 'no-rebase-merges'
+Rebasing (2/2)
Successfully rebased and updated refs/heads/no-rebase-merges.
+ok 12 - --no-rebase-merges countermands --rebase-merges
 
+expecting success of 3430.13 'do not rebase cousins unless asked for': 
+	git checkout -b cousins main &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -r HEAD^ &&
+	test_cmp_rev HEAD $before &&
+	test_tick &&
+	git rebase --rebase-merges=rebase-cousins HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	|/
+	o H
+	EOF
 
-HEAD is now at ab594ec Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+Switched to a new branch 'cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
+ok 13 - do not rebase cousins unless asked for
 
-  ab594ec Revert "Merge branch 'side'"
+expecting success of 3430.14 'rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins': 
+	test_config rebase.rebaseMerges rebase-cousins &&
+	git checkout -b config-rebase-cousins main &&
+	git rebase HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	|/
+	o H
+	EOF
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+Switched to a new branch 'config-rebase-cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/config-rebase-cousins.
+ok 14 - rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins
 
- git branch <new-branch-name> ab594ec
+expecting success of 3430.15 '--no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins': 
+	test_config rebase.rebaseMerges no-rebase-cousins &&
+	git checkout -b override-config-no-rebase-cousins E &&
+	git rebase --no-rebase-merges C &&
+	test_cmp_graph C.. <<-\EOF
+	* B
+	* D
+	o C
+	EOF
 
-HEAD is now at c81ef52 Merge branch 'side'
-[detached HEAD 3f41b61] Revert "Merge branch 'side'"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-ok 11 - revert a merge (2)
+Switched to a new branch 'override-config-no-rebase-cousins'
+Rebasing (2/2)
Successfully rebased and updated refs/heads/override-config-no-rebase-cousins.
+ok 15 - --no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins
 
-expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
+expecting success of 3430.16 '--rebase-merges overrides rebase.rebaseMerges=rebase-cousins': 
+	test_config rebase.rebaseMerges rebase-cousins &&
+	git checkout -b override-config-rebase-cousins E &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase --rebase-merges C &&
+	test_cmp_rev HEAD $before
 
-	git reset --hard &&
-	git checkout c^0 &&
-	test_must_fail git revert -m 3 c &&
-	git diff --exit-code c
+Switched to a new branch 'override-config-rebase-cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
+ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
 
+expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
+	git worktree add wt &&
+	cat >wt/script-from-scratch <<-\EOF &&
+	label xyz
+	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
+	exec git rev-parse --verify refs/rewritten/xyz >b
+	EOF
 
-HEAD is now at 3f41b61 Revert "Merge branch 'side'"
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
+	git -C wt rebase -i HEAD &&
+	test_must_be_empty wt/a &&
+	test_cmp_rev HEAD "$(cat wt/b)"
 
-  3f41b61 Revert "Merge branch 'side'"
+Preparing worktree (new branch 'wt')
+HEAD is now at 2051b56 E
+Rebasing (1/3)
Rebasing (2/3)
Executing: GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
+fatal: Needed a single revision
+Rebasing (3/3)
Executing: git rev-parse --verify refs/rewritten/xyz >b
+Successfully rebased and updated refs/heads/wt.
+ok 17 - refs/rewritten/* is worktree-local
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3430.18 '--abort cleans up refs/rewritten': 
+	git checkout -b abort-cleans-refs-rewritten H &&
+	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+	git rev-parse --verify refs/rewritten/onto &&
+	git rebase --abort &&
+	test_must_fail git rev-parse --verify refs/rewritten/onto
 
- git branch <new-branch-name> 3f41b61
+Switched to a new branch 'abort-cleans-refs-rewritten'
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
+2051b561a3f30f5455d33a5269d3851790a86f42
+fatal: Needed a single revision
+ok 18 - --abort cleans up refs/rewritten
 
-HEAD is now at c81ef52 Merge branch 'side'
-error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
-fatal: revert failed
-ok 12 - revert a merge relative to nonexistent parent should fail
+expecting success of 3430.19 '--quit cleans up refs/rewritten': 
+	git checkout -b quit-cleans-refs-rewritten H &&
+	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+	git rev-parse --verify refs/rewritten/onto &&
+	git rebase --quit &&
+	test_must_fail git rev-parse --verify refs/rewritten/onto
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3503-cherry-pick-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3503-cherry-pick-root/.git/
-expecting success of 3503.1 'setup': 
+Switched to a new branch 'quit-cleans-refs-rewritten'
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
+2051b561a3f30f5455d33a5269d3851790a86f42
+fatal: Needed a single revision
+ok 19 - --quit cleans up refs/rewritten
 
-	echo first > file1 &&
-	git add file1 &&
+expecting success of 3430.20 'post-rewrite hook and fixups work for merges': 
+	git checkout -b post-rewrite H &&
+	test_commit same1 &&
+	git reset --hard HEAD^ &&
+	test_commit same2 &&
+	git merge -m "to fix up" same1 &&
+	echo same old same old >same2.t &&
 	test_tick &&
-	git commit -m "first" &&
+	git commit --fixup HEAD same2.t &&
+	fixup="$(git rev-parse HEAD)" &&
 
-	git symbolic-ref HEAD refs/heads/second &&
-	rm .git/index file1 &&
-	echo second > file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m "second" &&
+	test_hook post-rewrite <<-\EOF &&
+	cat >actual
+	EOF
 
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index file2 &&
-	echo third > file3 &&
-	git add file3 &&
 	test_tick &&
-	git commit -m "third"
-
+	git rebase -i --autosquash -r HEAD^^^ &&
+	printf "%s %s\n%s %s\n%s %s\n%s %s\n" >expect $(git rev-parse \
+		$fixup^^2 HEAD^2 \
+		$fixup^^ HEAD^ \
+		$fixup^ HEAD \
+		$fixup HEAD) &&
+	test_cmp expect actual
 
-[main (root-commit) 0c72e4f] first
+Switched to a new branch 'post-rewrite'
+[post-rewrite 7b22597] same1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-[second (root-commit) bbcd39a] second
+ create mode 100644 same1.t
+HEAD is now at 233d48a H
+[post-rewrite 60bad05] same2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-[third (root-commit) 4911fa6] third
- Author: A U Thor <author@example.com>
+ create mode 100644 same2.t
+Merge made by the 'ort' strategy.
+ same1.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 1 - setup
+ create mode 100644 same1.t
+[post-rewrite 621ea5d] fixup! to fix up
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Successfully rebased and updated refs/heads/post-rewrite.
+ok 20 - post-rewrite hook and fixups work for merges
 
-expecting success of 3503.2 'cherry-pick a root commit': 
+expecting success of 3430.21 'refuse to merge ancestors of HEAD': 
+	echo "merge HEAD^" >script-from-scratch &&
+	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
+	before="$(git rev-parse HEAD)" &&
+	git rebase -i HEAD &&
+	test_cmp_rev HEAD $before
 
-	git checkout second^0 &&
-	git cherry-pick main &&
-	echo first >expect &&
-	test_cmp expect file1
+Rebasing (1/1)
Successfully rebased and updated refs/heads/post-rewrite.
+ok 21 - refuse to merge ancestors of HEAD
 
+expecting success of 3430.22 'root commits': 
+	git checkout --orphan unrelated &&
+	test_commit --author "Parsnip <root@example.com>" second-root &&
+	test_commit third-root &&
+	cat >script-from-scratch <<-\EOF &&
+	pick third-root
+	label first-branch
+	reset [new root]
+	pick second-root
+	merge first-branch # Merge the 3rd root
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i --force-rebase --root -r &&
+	test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
+	test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
+	test $(git rev-parse second-root:second-root.t) = \
+		$(git rev-parse HEAD^:second-root.t) &&
+	test_cmp_graph HEAD <<-\EOF &&
+	*   Merge the 3rd root
+	|\
+	| * third-root
+	* second-root
+	EOF
 
-Note: switching to 'second^0'.
+	: fast forward if possible &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_might_fail git config --unset sequence.editor &&
+	test_tick &&
+	git rebase -i --root -r &&
+	test_cmp_rev HEAD $before
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Switched to a new branch 'unrelated'
+[unrelated (root-commit) b54e30e] second-root
+ Author: Parsnip <root@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 A.t
+ create mode 100644 B.t
+ create mode 100644 C.t
+ create mode 100644 D.t
+ create mode 100644 F.t
+ create mode 100644 G.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+[unrelated d18eb0b] third-root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third-root.t
+Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 94a1433] Merge the 3rd root
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:41:13 2005 -0700
+Successfully rebased and updated refs/heads/unrelated.
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/unrelated.
+ok 22 - root commits
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3430.23 'a "merge" into a root commit is a fast-forward': 
+	head=$(git rev-parse HEAD) &&
+	cat >script-from-scratch <<-EOF &&
+	reset [new root]
+	merge $head
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r HEAD^ &&
+	test_cmp_rev HEAD $head
 
-  git switch -c <new-branch-name>
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/unrelated.
+ok 23 - a "merge" into a root commit is a fast-forward
 
-Or undo this operation with:
+expecting success of 3430.24 'A root commit can be a cousin, treat it that way': 
+	git checkout --orphan khnum &&
+	test_commit yama &&
+	git checkout -b asherah main &&
+	test_commit shamkat &&
+	git merge --allow-unrelated-histories khnum &&
+	test_tick &&
+	git rebase -f -r HEAD^ &&
+	test_cmp_rev ! HEAD^2 khnum &&
+	test_cmp_graph HEAD^.. <<-\EOF &&
+	*   Merge branch 'khnum' into asherah
+	|\
+	| * yama
+	o shamkat
+	EOF
+	test_tick &&
+	git rebase --rebase-merges=rebase-cousins HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge branch 'khnum' into asherah
+	|\
+	| * yama
+	|/
+	o shamkat
+	EOF
 
-  git switch -
+Switched to a new branch 'khnum'
+[khnum (root-commit) 467d393] yama
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+)
+ create mode 100644 A.t
+ create mode 100644 B.t
+ create mode 100644 C.t
+ create mode 100644 D.t
+ create mode 100644 F.t
+ create mode 100644 G.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+ create mode 100644 third-root.t
+ create mode 100644 yama.t
+Switched to a new branch 'asherah'
+[asherah 1bf96fb] shamkat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shamkat.t
+Merge made by the 'ort' strategy.
+ C.t           | 1 +
+ F.t           | 1 +
+ same1.t       | 1 +
+ same2.t       | 1 +
+ second-root.t | 1 +
+ third-root.t  | 1 +
+ yama.t        | 1 +
+ 7 files changed, 7 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 F.t
+ create mode 100644 same1.t
+ create mode 100644 same2.t
+ create mode 100644 second-root.t
+ create mode 100644 third-root.t
+ create mode 100644 yama.t
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
+ok 24 - A root commit can be a cousin, treat it that way
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3430.25 'labels that are object IDs are rewritten': 
+	git checkout --detach B &&
+	test_commit I &&
+	third=$(git rev-parse HEAD) &&
+	git checkout -b labels main &&
+	git merge --no-commit $third &&
+	test_tick &&
+	git commit -m "Merge commit '$third' into labels" &&
+	echo noop >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r A &&
+	grep "^label $third-" .git/ORIGINAL-TODO &&
+	! grep "^label $third$" .git/ORIGINAL-TODO
 
-HEAD is now at bbcd39a second
-[detached HEAD 3e6f574] first
+HEAD is now at d9df450 B
+[detached HEAD fe616a2] I
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 2 - cherry-pick a root commit
+ create mode 100644 I.t
+Previous HEAD position was fe616a2 I
+Switched to a new branch 'labels'
+Automatic merge went well; stopped before committing as requested
+[labels c2d3038] Merge commit 'fe616a237dd65b590ca6e0198de60da220f3d650' into labels
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/labels.
+label fe616a237dd65b590ca6e0198de60da220f3d650-2
+ok 25 - labels that are object IDs are rewritten
 
-expecting success of 3503.3 'revert a root commit': 
+expecting success of 3430.26 'octopus merges': 
+	git checkout -b three &&
+	test_commit before-octopus &&
+	test_commit three &&
+	git checkout -b two HEAD^ &&
+	test_commit two &&
+	git checkout -b one HEAD^ &&
+	test_commit one &&
+	test_tick &&
+	(GIT_AUTHOR_NAME="Hank" GIT_AUTHOR_EMAIL="hank@sea.world" \
+	 git merge -m "Tüntenfüsch" two three) &&
 
-	git revert main &&
-	test_path_is_missing file1
+	: fast forward if possible &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -i -r HEAD^^ &&
+	test_cmp_rev HEAD $before &&
 
+	test_tick &&
+	git rebase -i --force-rebase -r HEAD^^ &&
+	test "Hank" = "$(git show -s --format=%an HEAD)" &&
+	test "$before" != $(git rev-parse HEAD) &&
+	test_cmp_graph HEAD^^.. <<-\EOF
+	*-.   Tüntenfüsch
+	|\ \
+	| | * three
+	| * | two
+	| |/
+	* / one
+	|/
+	o before-octopus
+	EOF
 
-[detached HEAD 3eb7e0d] Revert "first"
+Switched to a new branch 'three'
+[three 470fcca] before-octopus
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 3 - revert a root commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 before-octopus.t
+[three e66d291] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to a new branch 'two'
+[two a4936a4] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Switched to a new branch 'one'
+[one 05ee3b8] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: refname 'two' is ambiguous.
+warning: refname 'three' is ambiguous.
+Trying simple merge with two
+Trying simple merge with three
+Merge made by the 'octopus' strategy.
+ three.t | 1 +
+ two.t   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 three.t
+ create mode 100644 two.t
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/one.
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Trying simple merge with 0f6eed9023c4e296d1c0ee55e03ff8df76f0000a
+Trying simple merge with 890212b565584e3c1fab7e2e887b673178afac2b
+Merge made by the 'octopus' strategy.
+Successfully rebased and updated refs/heads/one.
+ok 26 - octopus merges
 
-expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
+expecting success of 3430.27 'with --autosquash and --exec': 
+	git checkout -b with-exec H &&
+	echo Booh >B.t &&
+	test_tick &&
+	git commit --fixup B B.t &&
+	write_script show.sh <<-\EOF &&
+	subject="$(git show -s --format=%s HEAD)"
+	content="$(git diff HEAD^ HEAD | tail -n 1)"
+	echo "$subject: $content"
+	EOF
+	test_tick &&
+	git rebase -ir --autosquash --exec ./show.sh A >actual &&
+	grep "B: +Booh" actual &&
+	grep "E: +Booh" actual &&
+	grep "G: +G" actual
 
-	git cherry-pick --strategy=resolve main &&
-	echo first >expect &&
-	test_cmp expect file1
+Switched to a new branch 'with-exec'
+[with-exec 63df3da] fixup! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)
Executing: ./show.sh
+Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)
Executing: ./show.sh
+Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)
Executing: ./show.sh
+Rebasing (13/22)
Rebasing (14/22)
Executing: ./show.sh
+Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)
Executing: ./show.sh
+Rebasing (19/22)
Rebasing (20/22)
Executing: ./show.sh
+Rebasing (21/22)
Rebasing (22/22)
Executing: ./show.sh
+Successfully rebased and updated refs/heads/with-exec.
+B: +Booh
+E: +Booh
+G: +G
+ok 27 - with --autosquash and --exec
 
+expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
+	git checkout -b already-has-g E &&
+	git cherry-pick E..G &&
+	test_commit H2 &&
 
-Trying simple merge.
-[detached HEAD 54587e2] first
+	git checkout -b conflicts-in-merge H &&
+	test_commit H2 H2.t conflicts H2-conflict &&
+	test_must_fail git rebase -r already-has-g &&
+	grep conflicts H2.t &&
+	echo resolved >H2.t &&
+	git add -u &&
+	git rebase --continue &&
+	test_must_fail git rev-parse --verify HEAD^2 &&
+	test_path_is_missing .git/MERGE_HEAD
+
+Switched to a new branch 'already-has-g'
+[already-has-g b1594c7] F
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
+ Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 4 - cherry-pick a root commit with an external strategy
+ create mode 100644 F.t
+[already-has-g 0944233] G
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[already-has-g 7148914] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H2.t
+Switched to a new branch 'conflicts-in-merge'
+[conflicts-in-merge 43d4486] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H2.t
+warning: skipped previously applied commit ca2c861
+warning: skipped previously applied commit 088b00a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging H2.t
+CONFLICT (add/add): Merge conflict in H2.t
+error: could not apply 43d4486... H2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 43d4486... H2
+conflicts
+[detached HEAD a4aa1f0] H2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/conflicts-in-merge.
+fatal: Needed a single revision
+ok 28 - --continue after resolving conflicts after a merge
 
-expecting success of 3503.5 'revert a root commit with an external strategy': 
+expecting success of 3430.29 '--rebase-merges with strategies': 
+	git checkout -b with-a-strategy F &&
+	test_tick &&
+	git merge -m "Merge conflicting-G" conflicting-G &&
 
-	git revert --strategy=resolve main &&
-	test_path_is_missing file1
+	: first, test with a merge strategy option &&
+	git rebase -ir -Xtheirs G &&
+	echo conflicting-G >expect &&
+	test_cmp expect G.t &&
+
+	: now, try with a merge strategy other than recursive &&
+	git reset --hard @{1} &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >>G.t
+	git add G.t
+	EOF
+	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
+	test_write_lines G overridden--xopt >expect &&
+	test_cmp expect G.t
 
+Switched to a new branch 'with-a-strategy'
+Merge made by the 'ort' strategy.
+ G.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging G.t
+Merge made by the 'ort' strategy.
+Successfully rebased and updated refs/heads/with-a-strategy.
+HEAD is now at 00d6684 Merge conflicting-G
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Merge made by the 'override' strategy.
+Successfully rebased and updated refs/heads/with-a-strategy.
+ok 29 - --rebase-merges with strategies
 
-Removing file1
-[detached HEAD a457399] Revert "first"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 5 - revert a root commit with an external strategy
+expecting success of 3430.30 '--rebase-merges with commit that can generate bad characters for filename': 
+	git checkout -b colon-in-label E &&
+	git merge -m "colon: this should work" G &&
+	git rebase --rebase-merges --force-rebase E
 
-expecting success of 3503.6 'cherry-pick two root commits': 
+Switched to a new branch 'colon-in-label'
+Merge made by the 'ort' strategy.
+ F.t | 1 +
+ G.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 F.t
+ create mode 100644 G.t
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/colon-in-label.
+ok 30 - --rebase-merges with commit that can generate bad characters for filename
 
-	echo first >expect.file1 &&
-	echo second >expect.file2 &&
-	echo third >expect.file3 &&
+expecting success of 3430.31 '--rebase-merges with message matched with onto label': 
+	git checkout -b onto-label E &&
+	git merge -m onto G &&
+	git rebase --rebase-merges --force-rebase E &&
+	test_cmp_graph <<-\EOF
+	*   onto
+	|\
+	| * G
+	| * F
+	* |   E
+	|\ \
+	| * | B
+	* | | D
+	| |/
+	|/|
+	* | C
+	|/
+	* A
+	EOF
 
-	git checkout second^0 &&
-	git cherry-pick main third &&
+Switched to a new branch 'onto-label'
+Merge made by the 'ort' strategy.
+ F.t | 1 +
+ G.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 F.t
+ create mode 100644 G.t
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/onto-label.
+ok 31 - --rebase-merges with message matched with onto label
 
-	test_cmp expect.file1 file1 &&
-	test_cmp expect.file2 file2 &&
-	test_cmp expect.file3 file3 &&
-	git rev-parse --verify HEAD^^ &&
-	test_must_fail git rev-parse --verify HEAD^^^
+expecting success of 3430.32 'progress shows the correct total': 
+	git checkout -b progress H &&
+	git rebase --rebase-merges --force-rebase --verbose A 2> err &&
+	# Expecting "Rebasing (N/14)" here, no bogus total number
+	grep "^Rebasing.*/14.$" err >progress &&
+	test_line_count = 14 progress
 
+Switched to a new branch 'progress'
+Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
+ok 32 - progress shows the correct total
 
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
+expecting success of 3430.33 'truncate label names': 
+	commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) &&
+	git merge --ff-only $commit &&
 
-  a457399 Revert "first"
-  54587e2 first
-  3eb7e0d Revert "first"
-  3e6f574 first
+	done="$(git rev-parse --git-path rebase-merge/done)" &&
+	git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+	grep "label 0123456789-我$" out &&
+	git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root &&
+	grep "label 0123456789-$" out
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+Updating f13795a..96fcf0c
+Fast-forward
+Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
+Successfully rebased and updated refs/heads/progress.
+label 0123456789-我
+Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
+Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
+Successfully rebased and updated refs/heads/progress.
+label 0123456789-
+ok 33 - truncate label names
 
- git branch <new-branch-name> a457399
+expecting success of 3430.34 'reword fast-forwarded empty merge commit': 
+	oid="$(git commit-tree -m "D1" -p A D^{tree})" &&
+	oid="$(git commit-tree -m "empty merge" -p D -p $oid D^{tree})" &&
 
-HEAD is now at bbcd39a second
-[detached HEAD 3e6f574] first
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[detached HEAD 2069bd1] third
+	write_script sequence-editor.sh <<-\EOF &&
+	sed /^merge/s/-C/-c/ "$1" >"$1.tmp"
+	mv "$1.tmp" "$1"
+	EOF
+
+	(
+		test_set_sequence_editor "$(pwd)/sequence-editor.sh" &&
+		GIT_EDITOR="echo edited >>" git rebase -i -r D $oid
+	) &&
+	test_commit_message HEAD <<-\EOF
+	empty merge
+
+	edited
+	EOF
+
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 7457575] empty merge
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-bbcd39af5b7918b8e79c884f958eeddbace1fd46
-fatal: Needed a single revision
-ok 6 - cherry-pick two root commits
+ Date: Thu Apr 7 16:02:13 2005 -0700
+Successfully rebased and updated detached HEAD.
+ok 34 - reword fast-forwarded empty merge commit
 
-# passed all 6 test(s)
-1..6
+# passed all 34 test(s)
+1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3437-rebase-fixup-options.sh ***
@@ -161810,77 +159432,53 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3430-rebase-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3430-rebase-merges/.git/
-expecting success of 3430.1 'setup': 
-	write_script replace-editor.sh <<-\EOF &&
-	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
-	cp script-from-scratch "$1"
-	EOF
+*** t3503-cherry-pick-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3503-cherry-pick-root/.git/
+expecting success of 3503.1 'setup': 
 
-	test_commit A &&
-	git checkout -b first &&
-	test_commit B &&
-	b=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	test_commit C &&
-	c=$(git rev-parse --short HEAD) &&
-	test_commit D &&
-	d=$(git rev-parse --short HEAD) &&
-	git merge --no-commit B &&
+	echo first > file1 &&
+	git add file1 &&
 	test_tick &&
-	git commit -m E &&
-	git tag -m E E &&
-	e=$(git rev-parse --short HEAD) &&
-	git checkout -b second C &&
-	test_commit F &&
-	f=$(git rev-parse --short HEAD) &&
-	test_commit G &&
-	g=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	git merge --no-commit G &&
+	git commit -m "first" &&
+
+	git symbolic-ref HEAD refs/heads/second &&
+	rm .git/index file1 &&
+	echo second > file2 &&
+	git add file2 &&
 	test_tick &&
-	git commit -m H &&
-	h=$(git rev-parse --short HEAD) &&
-	git tag -m H H &&
-	git checkout A &&
-	test_commit conflicting-G G.t
+	git commit -m "second" &&
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'first'
-[first d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-[main 5dee784] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 12bd07b] D
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index file2 &&
+	echo third > file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m "third"
+
+
+[main (root-commit) 0c72e4f] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Automatic merge went well; stopped before committing as requested
-[main 2051b56] E
- Author: A U Thor <author@example.com>
-Switched to a new branch 'second'
-[second ca2c861] F
+ create mode 100644 file1
+[second (root-commit) bbcd39a] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[second 088b00a] G
+ create mode 100644 file2
+[third (root-commit) 4911fa6] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main 233d48a] H
- Author: A U Thor <author@example.com>
-Note: switching to 'A'.
+ create mode 100644 file3
+ok 1 - setup
+
+expecting success of 3503.2 'cherry-pick a root commit': 
+
+	git checkout second^0 &&
+	git cherry-pick main &&
+	echo first >expect &&
+	test_cmp expect file1
+
+
+Note: switching to 'second^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -161897,224 +159495,168 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 0ddfaf1 A
-[detached HEAD 82776a5] conflicting-G
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-ok 1 - setup
-
-expecting success of 3430.2 'create completely different structure': 
-	cat >script-from-scratch <<-\EOF &&
-	label onto
+ create mode 100644 file1
+ok 2 - cherry-pick a root commit
 
-	# onebranch
-	pick G
-	pick D
-	label onebranch
+expecting success of 3503.3 'revert a root commit': 
 
-	# second
-	reset onto
-	pick B
-	label second
+	git revert main &&
+	test_path_is_missing file1
 
-	reset onto
-	merge -C H second
-	merge onebranch # Merge the topic branch 'onebranch'
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r A main &&
-	test_cmp_graph <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	* |   H
-	|\ \
-	| |/
-	|/|
-	| * B
-	|/
-	* A
-	EOF
 
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
+[detached HEAD 3eb7e0d] Revert "first"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
-Successfully rebased and updated refs/heads/main.
-ok 2 - create completely different structure
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+ok 3 - revert a root commit
 
-expecting success of 3430.3 'generate correct todo list': 
-	cat >expect <<-EOF &&
-	label onto
+expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
 
-	reset onto
-	pick $b B
-	label first
+	git cherry-pick --strategy=resolve main &&
+	echo first >expect &&
+	test_cmp expect file1
 
-	reset onto
-	pick $c C
-	label branch-point
-	pick $f F
-	pick $g G
-	label second
 
-	reset branch-point # C
-	pick $d D
-	merge -C $e first # E
-	merge -C $h second # H
+Trying simple merge.
+[detached HEAD 54587e2] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 4 - cherry-pick a root commit with an external strategy
 
-	EOF
+expecting success of 3503.5 'revert a root commit with an external strategy': 
 
-	grep -v "^#" <.git/ORIGINAL-TODO >output &&
-	test_cmp expect output
+	git revert --strategy=resolve main &&
+	test_path_is_missing file1
 
-ok 3 - generate correct todo list
 
-expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
-	git checkout B &&
-	test_commit dont-overwrite-untracked &&
-	cat >script-from-scratch <<-EOF &&
-	exec >dont-overwrite-untracked.t
-	pick $(git rev-parse B) B
-	reset refs/tags/dont-overwrite-untracked
-	pick $(git rev-parse C) C
-	exec cat .git/rebase-merge/done >actual
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_must_fail git rebase -ir A &&
-	test_cmp_rev HEAD B &&
-	head -n3 script-from-scratch >expect &&
-	test_cmp expect .git/rebase-merge/done &&
-	rm dont-overwrite-untracked.t &&
-	git rebase --continue &&
-	tail -n3 script-from-scratch >>expect &&
-	test_cmp expect actual
+Removing file1
+[detached HEAD a457399] Revert "first"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+ok 5 - revert a root commit with an external strategy
 
-Note: switching to 'B'.
+expecting success of 3503.6 'cherry-pick two root commits': 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	echo first >expect.file1 &&
+	echo second >expect.file2 &&
+	echo third >expect.file3 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git checkout second^0 &&
+	git cherry-pick main third &&
 
-  git switch -c <new-branch-name>
+	test_cmp expect.file1 file1 &&
+	test_cmp expect.file2 file2 &&
+	test_cmp expect.file3 file3 &&
+	git rev-parse --verify HEAD^^ &&
+	test_must_fail git rev-parse --verify HEAD^^^
 
-Or undo this operation with:
 
-  git switch -
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-Turn off this advice by setting config variable advice.detachedHead to false
+  a457399 Revert "first"
+  54587e2 first
+  3eb7e0d Revert "first"
+  3e6f574 first
 
-HEAD is now at d9df450 B
-[detached HEAD 8acd0a8] dont-overwrite-untracked
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> a457399
+
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 dont-overwrite-untracked.t
-Rebasing (1/5)
Executing: >dont-overwrite-untracked.t
-Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
-	dont-overwrite-untracked.t
-Please move or remove them before you reset.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     reset refs/tags/dont-overwrite-untracked
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Executing: cat .git/rebase-merge/done >actual
-Successfully rebased and updated detached HEAD.
-ok 4 - `reset` refuses to overwrite untracked files
-
-expecting success of 3430.5 '`reset` rejects trees': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
-		git rebase -i B C >out 2>err &&
-	grep "object .* is a tree" err &&
-	test_must_be_empty out
+ create mode 100644 file1
+[detached HEAD 2069bd1] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+bbcd39af5b7918b8e79c884f958eeddbace1fd46
+fatal: Needed a single revision
+ok 6 - cherry-pick two root commits
 
-Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
-ok 5 - `reset` rejects trees
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3502-cherry-pick-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3502-cherry-pick-merge/.git/
+expecting success of 3502.1 'setup': 
 
-expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git branch refs/rewritten/my-label A &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
-		git rebase -i B C >out 2>err &&
-	grep "could not resolve ${SQ}my-label${SQ}" err &&
-	test_must_be_empty out
+	>A &&
+	>B &&
+	git add A B &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+	echo new line >A &&
+	git commit -m "add line to A" A &&
+	git tag a &&
+	git checkout side &&
+	echo new line >B &&
+	git commit -m "add line to B" B &&
+	git tag b &&
+	git checkout main &&
+	git merge side &&
+	git tag c
 
-Rebasing (1/1)
error: could not resolve 'my-label'
-ok 6 - `reset` only looks for labels under refs/rewritten/
 
-expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b conflicting-merge A &&
+[main (root-commit) 5c8827d] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 A
+ create mode 100644 B
+[main 6e41539] add line to A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'side'
+[side 4fb21f2] add line to B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B | 1 +
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-	: fail because of conflicting untracked file &&
-	>G.t &&
-	echo "merge -C H G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	test_must_fail git rebase -ir HEAD &&
-	test_cmp_rev REBASE_HEAD H^0 &&
-	grep "^merge -C .* G$" .git/rebase-merge/done &&
-	grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
-	test_path_is_missing .git/rebase-merge/patch &&
-	echo changed >file1 &&
-	git add file1 &&
-	test_must_fail git rebase --continue 2>err &&
-	grep "error: you have staged changes in your working tree" err &&
+expecting success of 3502.2 'cherry-pick -m complains of bogus numbers': 
+	# expect 129 here to distinguish between cases where
+	# there was nothing to cherry-pick
+	test_expect_code 129 git cherry-pick -m &&
+	test_expect_code 129 git cherry-pick -m foo b &&
+	test_expect_code 129 git cherry-pick -m -1 b &&
+	test_expect_code 129 git cherry-pick -m 0 b
 
-	: fail because of merge conflict &&
-	git reset --hard conflicting-G &&
-	test_must_fail git rebase --continue &&
-	! grep "^merge -C .* G$" .git/rebase-merge/git-rebase-todo &&
-	test_path_is_file .git/rebase-merge/patch
+error: switch `m' requires a value
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+error: option `mainline' expects a number greater than zero
+ok 2 - cherry-pick -m complains of bogus numbers
 
-Previous HEAD position was 5dee784 C
-Switched to a new branch 'conflicting-merge'
-Rebasing (1/1)
error: The following untracked working tree files would be overwritten by merge:
-	G.t
-Please move or remove them before you merge.
-Aborting
-error: could not even attempt to merge 'G'
-hint: Could not execute the todo command
-hint:
-hint:     merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-merge -C 233d48a5caa0e14494fac2553a0b1179ff65b118 G
-error: you have staged changes in your working tree
-HEAD is now at 82776a5 conflicting-G
-Rebasing (2/2)
Auto-merging G.t
-CONFLICT (add/add): Merge conflict in G.t
-Could not apply 233d48a... G
-ok 7 - failed `merge -C` writes patch (may be rescheduled, too)
+expecting success of 3502.3 'cherry-pick explicit first parent of a non-merge': 
 
-expecting success of 3430.8 'failed `merge <branch>` does not crash': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout conflicting-G &&
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 b &&
+	git diff --exit-code c --
 
-	echo "merge G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	test_must_fail git rebase -ir HEAD &&
-	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
-	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
 
-Note: switching to 'conflicting-G'.
+HEAD is now at c81ef52 Merge branch 'side'
+Note: switching to 'a^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -162131,776 +159673,506 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 82776a5 conflicting-G
-Rebasing (1/1)
Auto-merging G.t
-CONFLICT (add/add): Merge conflict in G.t
-Could not merge G
-Merge branch 'G'
-ok 8 - failed `merge <branch>` does not crash
+HEAD is now at 6e41539 add line to A
+[detached HEAD 99ce4f9] add line to B
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 3 - cherry-pick explicit first parent of a non-merge
 
-expecting success of 3430.9 'merge -c commits before rewording and reloads todo-list': 
-	cat >script-from-scratch <<-\EOF &&
-	merge -c E B
-	merge -c H G
-	EOF
+expecting success of 3502.4 'cherry pick a merge without -m should fail': 
 
-	git checkout -b merge-c H &&
-	(
-		set_reword_editor &&
-		GIT_SEQUENCE_EDITOR="\"$PWD/replace-editor.sh\"" \
-			git rebase -i -r D
-	) &&
-	check_reworded_commits E H
+	git reset --hard &&
+	git checkout a^0 &&
+	test_must_fail git cherry-pick c &&
+	git diff --exit-code a --
 
-Previous HEAD position was 82776a5 conflicting-G
-Switched to a new branch 'merge-c'
-Rebasing (1/2)
[detached HEAD 3d66115] E
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-Rebasing (2/3)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Rebasing (3/3)
[detached HEAD 790085d] H
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
-Rebasing (4/4)
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Successfully rebased and updated refs/heads/merge-c.
-ok 9 - merge -c commits before rewording and reloads todo-list
 
-expecting success of 3430.10 'merge -c rewords when a strategy is given': 
-	git checkout -b merge-c-with-strategy H &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >G.t
-	git add G.t
-	EOF
+HEAD is now at 99ce4f9 add line to B
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	PATH="$PWD:$PATH" \
-	GIT_SEQUENCE_EDITOR="echo merge -c H G >" \
-	GIT_EDITOR="echo edited >>" \
-		git rebase --no-ff -ir -s override -Xxopt E &&
-	test_write_lines overridden--xopt >expect &&
-	test_cmp expect G.t &&
-	test_write_lines H "" edited "" >expect &&
-	git log --format=%B -1 >actual &&
-	test_cmp expect actual
+  99ce4f9 add line to B
 
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Switched to a new branch 'merge-c-with-strategy'
-Rebasing (1/1)
Merge made by the 'override' strategy.
-Successfully rebased and updated refs/heads/merge-c-with-strategy.
-ok 10 - merge -c rewords when a strategy is given
+ git branch <new-branch-name> 99ce4f9
 
-expecting success of 3430.11 'with a branch tip that was cherry-picked already': 
-	git checkout -b already-upstream main &&
-	base="$(git rev-parse --verify HEAD)" &&
+HEAD is now at 6e41539 add line to A
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
+fatal: cherry-pick failed
+ok 4 - cherry pick a merge without -m should fail
 
-	test_commit A1 &&
-	test_commit A2 &&
-	git reset --hard $base &&
-	test_commit B1 &&
-	test_tick &&
-	git merge -m "Merge branch A" A2 &&
+expecting success of 3502.5 'cherry pick a merge (1)': 
 
-	git checkout -b upstream-with-a2 $base &&
-	test_tick &&
-	git cherry-pick A2 &&
+	git reset --hard &&
+	git checkout a^0 &&
+	git cherry-pick -m 1 c &&
+	git diff --exit-code c
 
-	git checkout already-upstream &&
-	test_tick &&
-	git rebase -i -r upstream-with-a2 &&
-	test_cmp_graph upstream-with-a2.. <<-\EOF
-	*   Merge branch A
-	|\
-	| * A1
-	* | B1
-	|/
-	o A2
-	EOF
 
-Switched to a new branch 'already-upstream'
-[already-upstream cac3b13] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-[already-upstream 0466126] A2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A2.t
-HEAD is now at c2c3fe3 Merge the topic branch 'onebranch'
-[already-upstream fa07690] B1
+HEAD is now at 6e41539 add line to A
+HEAD is now at 6e41539 add line to A
+[detached HEAD 9d31cba] Merge branch 'side'
  Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-Merge made by the 'ort' strategy.
- A1.t | 1 +
- A2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 A1.t
- create mode 100644 A2.t
-Switched to a new branch 'upstream-with-a2'
-[upstream-with-a2 071ab27] A2
+ok 5 - cherry pick a merge (1)
+
+expecting success of 3502.6 'cherry pick a merge (2)': 
+
+	git reset --hard &&
+	git checkout b^0 &&
+	git cherry-pick -m 2 c &&
+	git diff --exit-code c
+
+
+HEAD is now at 9d31cba Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9d31cba Merge branch 'side'
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 9d31cba
+
+HEAD is now at 4fb21f2 add line to B
+[detached HEAD 9554515] Merge branch 'side'
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:27:13 2005 -0700
+ Date: Fri Apr 1 13:14:15 2005 +0200
  1 file changed, 1 insertion(+)
- create mode 100644 A2.t
-Switched to branch 'already-upstream'
-warning: skipped previously applied commit 0466126
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/already-upstream.
-ok 11 - with a branch tip that was cherry-picked already
+ok 6 - cherry pick a merge (2)
 
-expecting success of 3430.12 '--no-rebase-merges countermands --rebase-merges': 
-	git checkout -b no-rebase-merges E &&
-	git rebase --rebase-merges --no-rebase-merges C &&
-	test_cmp_graph C.. <<-\EOF
-	* B
-	* D
-	o C
-	EOF
+expecting success of 3502.7 'cherry pick a merge relative to nonexistent parent should fail': 
 
-Switched to a new branch 'no-rebase-merges'
-Rebasing (2/2)
Successfully rebased and updated refs/heads/no-rebase-merges.
-ok 12 - --no-rebase-merges countermands --rebase-merges
+	git reset --hard &&
+	git checkout b^0 &&
+	test_must_fail git cherry-pick -m 3 c
 
-expecting success of 3430.13 'do not rebase cousins unless asked for': 
-	git checkout -b cousins main &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -r HEAD^ &&
-	test_cmp_rev HEAD $before &&
-	test_tick &&
-	git rebase --rebase-merges=rebase-cousins HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	|/
-	o H
-	EOF
 
-Switched to a new branch 'cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/cousins.
-ok 13 - do not rebase cousins unless asked for
+HEAD is now at 9554515 Merge branch 'side'
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3430.14 'rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins': 
-	test_config rebase.rebaseMerges rebase-cousins &&
-	git checkout -b config-rebase-cousins main &&
-	git rebase HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	|/
-	o H
-	EOF
+  9554515 Merge branch 'side'
 
-Switched to a new branch 'config-rebase-cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/config-rebase-cousins.
-ok 14 - rebase.rebaseMerges=rebase-cousins is equivalent to --rebase-merges=rebase-cousins
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3430.15 '--no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins': 
-	test_config rebase.rebaseMerges no-rebase-cousins &&
-	git checkout -b override-config-no-rebase-cousins E &&
-	git rebase --no-rebase-merges C &&
-	test_cmp_graph C.. <<-\EOF
-	* B
-	* D
-	o C
-	EOF
+ git branch <new-branch-name> 9554515
 
-Switched to a new branch 'override-config-no-rebase-cousins'
-Rebasing (2/2)
Successfully rebased and updated refs/heads/override-config-no-rebase-cousins.
-ok 15 - --no-rebase-merges overrides rebase.rebaseMerges=no-rebase-cousins
+HEAD is now at 4fb21f2 add line to B
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
+fatal: cherry-pick failed
+ok 7 - cherry pick a merge relative to nonexistent parent should fail
 
-expecting success of 3430.16 '--rebase-merges overrides rebase.rebaseMerges=rebase-cousins': 
-	test_config rebase.rebaseMerges rebase-cousins &&
-	git checkout -b override-config-rebase-cousins E &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase --rebase-merges C &&
-	test_cmp_rev HEAD $before
+expecting success of 3502.8 'revert explicit first parent of a non-merge': 
 
-Switched to a new branch 'override-config-rebase-cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
-ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 b &&
+	git diff --exit-code a --
 
-expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
-	git worktree add wt &&
-	cat >wt/script-from-scratch <<-\EOF &&
-	label xyz
-	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
-	exec git rev-parse --verify refs/rewritten/xyz >b
-	EOF
 
-	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
-	git -C wt rebase -i HEAD &&
-	test_must_be_empty wt/a &&
-	test_cmp_rev HEAD "$(cat wt/b)"
+HEAD is now at 4fb21f2 add line to B
+Previous HEAD position was 4fb21f2 add line to B
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD 1b3e5cc] Revert "add line to B"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 8 - revert explicit first parent of a non-merge
 
-Preparing worktree (new branch 'wt')
-HEAD is now at 2051b56 E
-Rebasing (1/3)
Rebasing (2/3)
Executing: GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
-fatal: Needed a single revision
-Rebasing (3/3)
Executing: git rev-parse --verify refs/rewritten/xyz >b
-Successfully rebased and updated refs/heads/wt.
-ok 17 - refs/rewritten/* is worktree-local
+expecting success of 3502.9 'revert a merge without -m should fail': 
 
-expecting success of 3430.18 '--abort cleans up refs/rewritten': 
-	git checkout -b abort-cleans-refs-rewritten H &&
-	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
-	git rev-parse --verify refs/rewritten/onto &&
-	git rebase --abort &&
-	test_must_fail git rev-parse --verify refs/rewritten/onto
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert c &&
+	git diff --exit-code c
 
-Switched to a new branch 'abort-cleans-refs-rewritten'
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
-2051b561a3f30f5455d33a5269d3851790a86f42
-fatal: Needed a single revision
-ok 18 - --abort cleans up refs/rewritten
 
-expecting success of 3430.19 '--quit cleans up refs/rewritten': 
-	git checkout -b quit-cleans-refs-rewritten H &&
-	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
-	git rev-parse --verify refs/rewritten/onto &&
-	git rebase --quit &&
-	test_must_fail git rev-parse --verify refs/rewritten/onto
+HEAD is now at 1b3e5cc Revert "add line to B"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-Switched to a new branch 'quit-cleans-refs-rewritten'
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Stopped at 233d48a (H)
-2051b561a3f30f5455d33a5269d3851790a86f42
-fatal: Needed a single revision
-ok 19 - --quit cleans up refs/rewritten
+  1b3e5cc Revert "add line to B"
 
-expecting success of 3430.20 'post-rewrite hook and fixups work for merges': 
-	git checkout -b post-rewrite H &&
-	test_commit same1 &&
-	git reset --hard HEAD^ &&
-	test_commit same2 &&
-	git merge -m "to fix up" same1 &&
-	echo same old same old >same2.t &&
-	test_tick &&
-	git commit --fixup HEAD same2.t &&
-	fixup="$(git rev-parse HEAD)" &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	test_hook post-rewrite <<-\EOF &&
-	cat >actual
-	EOF
+ git branch <new-branch-name> 1b3e5cc
 
-	test_tick &&
-	git rebase -i --autosquash -r HEAD^^^ &&
-	printf "%s %s\n%s %s\n%s %s\n%s %s\n" >expect $(git rev-parse \
-		$fixup^^2 HEAD^2 \
-		$fixup^^ HEAD^ \
-		$fixup^ HEAD \
-		$fixup HEAD) &&
-	test_cmp expect actual
+HEAD is now at c81ef52 Merge branch 'side'
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 is a merge but no -m option was given.
+fatal: revert failed
+ok 9 - revert a merge without -m should fail
 
-Switched to a new branch 'post-rewrite'
-[post-rewrite 7b22597] same1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 same1.t
-HEAD is now at 233d48a H
-[post-rewrite 60bad05] same2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 same2.t
-Merge made by the 'ort' strategy.
- same1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 same1.t
-[post-rewrite 621ea5d] fixup! to fix up
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)
Successfully rebased and updated refs/heads/post-rewrite.
-ok 20 - post-rewrite hook and fixups work for merges
+expecting success of 3502.10 'revert a merge (1)': 
 
-expecting success of 3430.21 'refuse to merge ancestors of HEAD': 
-	echo "merge HEAD^" >script-from-scratch &&
-	test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" &&
-	before="$(git rev-parse HEAD)" &&
-	git rebase -i HEAD &&
-	test_cmp_rev HEAD $before
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 1 c &&
+	git diff --exit-code a --
 
-Rebasing (1/1)
Successfully rebased and updated refs/heads/post-rewrite.
-ok 21 - refuse to merge ancestors of HEAD
 
-expecting success of 3430.22 'root commits': 
-	git checkout --orphan unrelated &&
-	test_commit --author "Parsnip <root@example.com>" second-root &&
-	test_commit third-root &&
-	cat >script-from-scratch <<-\EOF &&
-	pick third-root
-	label first-branch
-	reset [new root]
-	pick second-root
-	merge first-branch # Merge the 3rd root
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i --force-rebase --root -r &&
-	test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
-	test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
-	test $(git rev-parse second-root:second-root.t) = \
-		$(git rev-parse HEAD^:second-root.t) &&
-	test_cmp_graph HEAD <<-\EOF &&
-	*   Merge the 3rd root
-	|\
-	| * third-root
-	* second-root
-	EOF
+HEAD is now at c81ef52 Merge branch 'side'
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD ab594ec] Revert "Merge branch 'side'"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 10 - revert a merge (1)
 
-	: fast forward if possible &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_might_fail git config --unset sequence.editor &&
-	test_tick &&
-	git rebase -i --root -r &&
-	test_cmp_rev HEAD $before
+expecting success of 3502.11 'revert a merge (2)': 
 
-Switched to a new branch 'unrelated'
-[unrelated (root-commit) b54e30e] second-root
- Author: Parsnip <root@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 A.t
- create mode 100644 B.t
- create mode 100644 C.t
- create mode 100644 D.t
- create mode 100644 F.t
- create mode 100644 G.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
-[unrelated d18eb0b] third-root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third-root.t
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
[detached HEAD 94a1433] Merge the 3rd root
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:41:13 2005 -0700
-Successfully rebased and updated refs/heads/unrelated.
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/unrelated.
-ok 22 - root commits
+	git reset --hard &&
+	git checkout c^0 &&
+	git revert -m 2 c &&
+	git diff --exit-code b --
 
-expecting success of 3430.23 'a "merge" into a root commit is a fast-forward': 
-	head=$(git rev-parse HEAD) &&
-	cat >script-from-scratch <<-EOF &&
-	reset [new root]
-	merge $head
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r HEAD^ &&
-	test_cmp_rev HEAD $head
 
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/unrelated.
-ok 23 - a "merge" into a root commit is a fast-forward
+HEAD is now at ab594ec Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3430.24 'A root commit can be a cousin, treat it that way': 
-	git checkout --orphan khnum &&
-	test_commit yama &&
-	git checkout -b asherah main &&
-	test_commit shamkat &&
-	git merge --allow-unrelated-histories khnum &&
-	test_tick &&
-	git rebase -f -r HEAD^ &&
-	test_cmp_rev ! HEAD^2 khnum &&
-	test_cmp_graph HEAD^.. <<-\EOF &&
-	*   Merge branch 'khnum' into asherah
-	|\
-	| * yama
-	o shamkat
-	EOF
-	test_tick &&
-	git rebase --rebase-merges=rebase-cousins HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge branch 'khnum' into asherah
-	|\
-	| * yama
-	|/
-	o shamkat
-	EOF
+  ab594ec Revert "Merge branch 'side'"
 
-Switched to a new branch 'khnum'
-[khnum (root-commit) 467d393] yama
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+)
- create mode 100644 A.t
- create mode 100644 B.t
- create mode 100644 C.t
- create mode 100644 D.t
- create mode 100644 F.t
- create mode 100644 G.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
- create mode 100644 third-root.t
- create mode 100644 yama.t
-Switched to a new branch 'asherah'
-[asherah 1bf96fb] shamkat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shamkat.t
-Merge made by the 'ort' strategy.
- C.t           | 1 +
- F.t           | 1 +
- same1.t       | 1 +
- same2.t       | 1 +
- second-root.t | 1 +
- third-root.t  | 1 +
- yama.t        | 1 +
- 7 files changed, 7 insertions(+)
- create mode 100644 C.t
- create mode 100644 F.t
- create mode 100644 same1.t
- create mode 100644 same2.t
- create mode 100644 second-root.t
- create mode 100644 third-root.t
- create mode 100644 yama.t
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Successfully rebased and updated refs/heads/asherah.
-ok 24 - A root commit can be a cousin, treat it that way
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3430.25 'labels that are object IDs are rewritten': 
-	git checkout --detach B &&
-	test_commit I &&
-	third=$(git rev-parse HEAD) &&
-	git checkout -b labels main &&
-	git merge --no-commit $third &&
-	test_tick &&
-	git commit -m "Merge commit '$third' into labels" &&
-	echo noop >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r A &&
-	grep "^label $third-" .git/ORIGINAL-TODO &&
-	! grep "^label $third$" .git/ORIGINAL-TODO
+ git branch <new-branch-name> ab594ec
 
-HEAD is now at d9df450 B
-[detached HEAD fe616a2] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Previous HEAD position was fe616a2 I
-Switched to a new branch 'labels'
-Automatic merge went well; stopped before committing as requested
-[labels c2d3038] Merge commit 'fe616a237dd65b590ca6e0198de60da220f3d650' into labels
+HEAD is now at c81ef52 Merge branch 'side'
+[detached HEAD 3f41b61] Revert "Merge branch 'side'"
  Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/labels.
-label fe616a237dd65b590ca6e0198de60da220f3d650-2
-ok 25 - labels that are object IDs are rewritten
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ok 11 - revert a merge (2)
 
-expecting success of 3430.26 'octopus merges': 
-	git checkout -b three &&
-	test_commit before-octopus &&
-	test_commit three &&
-	git checkout -b two HEAD^ &&
-	test_commit two &&
-	git checkout -b one HEAD^ &&
-	test_commit one &&
-	test_tick &&
-	(GIT_AUTHOR_NAME="Hank" GIT_AUTHOR_EMAIL="hank@sea.world" \
-	 git merge -m "Tüntenfüsch" two three) &&
+expecting success of 3502.12 'revert a merge relative to nonexistent parent should fail': 
 
-	: fast forward if possible &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -i -r HEAD^^ &&
-	test_cmp_rev HEAD $before &&
+	git reset --hard &&
+	git checkout c^0 &&
+	test_must_fail git revert -m 3 c &&
+	git diff --exit-code c
 
-	test_tick &&
-	git rebase -i --force-rebase -r HEAD^^ &&
-	test "Hank" = "$(git show -s --format=%an HEAD)" &&
-	test "$before" != $(git rev-parse HEAD) &&
-	test_cmp_graph HEAD^^.. <<-\EOF
-	*-.   Tüntenfüsch
-	|\ \
-	| | * three
-	| * | two
-	| |/
-	* / one
-	|/
-	o before-octopus
-	EOF
 
-Switched to a new branch 'three'
-[three 470fcca] before-octopus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 before-octopus.t
-[three e66d291] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to a new branch 'two'
-[two a4936a4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to a new branch 'one'
-[one 05ee3b8] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: refname 'two' is ambiguous.
-warning: refname 'three' is ambiguous.
-Trying simple merge with two
-Trying simple merge with three
-Merge made by the 'octopus' strategy.
- three.t | 1 +
- two.t   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 three.t
- create mode 100644 two.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Successfully rebased and updated refs/heads/one.
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
Trying simple merge with 0f6eed9023c4e296d1c0ee55e03ff8df76f0000a
-Trying simple merge with 890212b565584e3c1fab7e2e887b673178afac2b
-Merge made by the 'octopus' strategy.
-Successfully rebased and updated refs/heads/one.
-ok 26 - octopus merges
+HEAD is now at 3f41b61 Revert "Merge branch 'side'"
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 3430.27 'with --autosquash and --exec': 
-	git checkout -b with-exec H &&
-	echo Booh >B.t &&
-	test_tick &&
-	git commit --fixup B B.t &&
-	write_script show.sh <<-\EOF &&
-	subject="$(git show -s --format=%s HEAD)"
-	content="$(git diff HEAD^ HEAD | tail -n 1)"
-	echo "$subject: $content"
-	EOF
-	test_tick &&
-	git rebase -ir --autosquash --exec ./show.sh A >actual &&
-	grep "B: +Booh" actual &&
-	grep "E: +Booh" actual &&
-	grep "G: +G" actual
+  3f41b61 Revert "Merge branch 'side'"
 
-Switched to a new branch 'with-exec'
-[with-exec 63df3da] fixup! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)
Executing: ./show.sh
-Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)
Executing: ./show.sh
-Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)
Executing: ./show.sh
-Rebasing (13/22)
Rebasing (14/22)
Executing: ./show.sh
-Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)
Executing: ./show.sh
-Rebasing (19/22)
Rebasing (20/22)
Executing: ./show.sh
-Rebasing (21/22)
Rebasing (22/22)
Executing: ./show.sh
-Successfully rebased and updated refs/heads/with-exec.
-B: +Booh
-E: +Booh
-G: +G
-ok 27 - with --autosquash and --exec
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
-	git checkout -b already-has-g E &&
-	git cherry-pick E..G &&
-	test_commit H2 &&
+ git branch <new-branch-name> 3f41b61
 
-	git checkout -b conflicts-in-merge H &&
-	test_commit H2 H2.t conflicts H2-conflict &&
-	test_must_fail git rebase -r already-has-g &&
-	grep conflicts H2.t &&
-	echo resolved >H2.t &&
-	git add -u &&
-	git rebase --continue &&
-	test_must_fail git rev-parse --verify HEAD^2 &&
-	test_path_is_missing .git/MERGE_HEAD
+HEAD is now at c81ef52 Merge branch 'side'
+error: commit c81ef52706f2522fbbe43a852f8cf2995e7bd8a1 does not have parent 3
+fatal: revert failed
+ok 12 - revert a merge relative to nonexistent parent should fail
 
-Switched to a new branch 'already-has-g'
-[already-has-g b1594c7] F
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3504-cherry-pick-rerere.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3504-cherry-pick-rerere/.git/
+expecting success of 3504.1 'setup': 
+	test_commit foo &&
+	test_commit foo-main foo &&
+	test_commit bar-main bar &&
+
+	git checkout -b dev foo &&
+	test_commit foo-dev foo &&
+	test_commit bar-dev bar &&
+	git config rerere.enabled true
+
+[main (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[already-has-g 0944233] G
+ create mode 100644 foo.t
+[main b0605b8] foo-main
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[already-has-g 7148914] H2
+ create mode 100644 foo
+[main f55d303] bar-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H2.t
-Switched to a new branch 'conflicts-in-merge'
-[conflicts-in-merge 43d4486] H2
+ create mode 100644 bar
+Switched to a new branch 'dev'
+[dev 1d8ba7e] foo-dev
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H2.t
-warning: skipped previously applied commit ca2c861
-warning: skipped previously applied commit 088b00a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging H2.t
-CONFLICT (add/add): Merge conflict in H2.t
-error: could not apply 43d4486... H2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 43d4486... H2
-conflicts
-[detached HEAD a4aa1f0] H2
+ create mode 100644 foo
+[dev 5392a79] bar-dev
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Successfully rebased and updated refs/heads/conflicts-in-merge.
-fatal: Needed a single revision
-ok 28 - --continue after resolving conflicts after a merge
-
-expecting success of 3430.29 '--rebase-merges with strategies': 
-	git checkout -b with-a-strategy F &&
-	test_tick &&
-	git merge -m "Merge conflicting-G" conflicting-G &&
-
-	: first, test with a merge strategy option &&
-	git rebase -ir -Xtheirs G &&
-	echo conflicting-G >expect &&
-	test_cmp expect G.t &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+ok 1 - setup
 
-	: now, try with a merge strategy other than recursive &&
-	git reset --hard @{1} &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >>G.t
-	git add G.t
-	EOF
-	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
-	test_write_lines G overridden--xopt >expect &&
-	test_cmp expect G.t
+expecting success of 3504.2 'conflicting merge': 
+	test_must_fail git merge main
 
-Switched to a new branch 'with-a-strategy'
-Merge made by the 'ort' strategy.
- G.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging G.t
-Merge made by the 'ort' strategy.
-Successfully rebased and updated refs/heads/with-a-strategy.
-HEAD is now at 00d6684 Merge conflicting-G
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Merge made by the 'override' strategy.
-Successfully rebased and updated refs/heads/with-a-strategy.
-ok 29 - --rebase-merges with strategies
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+Recorded preimage for 'bar'
+Recorded preimage for 'foo'
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - conflicting merge
 
-expecting success of 3430.30 '--rebase-merges with commit that can generate bad characters for filename': 
-	git checkout -b colon-in-label E &&
-	git merge -m "colon: this should work" G &&
-	git rebase --rebase-merges --force-rebase E
+expecting success of 3504.3 'fixup': 
+	echo foo-resolved >foo &&
+	echo bar-resolved >bar &&
+	git commit -am resolved &&
+	cp foo foo-expect &&
+	cp bar bar-expect &&
+	git reset --hard HEAD^
 
-Switched to a new branch 'colon-in-label'
-Merge made by the 'ort' strategy.
- F.t | 1 +
- G.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 F.t
- create mode 100644 G.t
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/colon-in-label.
-ok 30 - --rebase-merges with commit that can generate bad characters for filename
+Recorded resolution for 'bar'.
+Recorded resolution for 'foo'.
+[dev 85492e3] resolved
+ Author: A U Thor <author@example.com>
+HEAD is now at 5392a79 bar-dev
+ok 3 - fixup
 
-expecting success of 3430.31 '--rebase-merges with message matched with onto label': 
-	git checkout -b onto-label E &&
-	git merge -m onto G &&
-	git rebase --rebase-merges --force-rebase E &&
-	test_cmp_graph <<-\EOF
-	*   onto
-	|\
-	| * G
-	| * F
-	* |   E
-	|\ \
-	| * | B
-	* | | D
-	| |/
-	|/|
-	* | C
-	|/
-	* A
-	EOF
+expecting success of 3504.4 'cherry-pick conflict with --rerere-autoupdate': 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-Switched to a new branch 'onto-label'
-Merge made by the 'ort' strategy.
- F.t | 1 +
- G.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 F.t
- create mode 100644 G.t
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)
Successfully rebased and updated refs/heads/onto-label.
-ok 31 - --rebase-merges with message matched with onto label
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+[dev 41ff336] foo-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'bar' using previous resolution.
+[dev c0de054] bar-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 4 - cherry-pick conflict with --rerere-autoupdate
 
-expecting success of 3430.32 'progress shows the correct total': 
-	git checkout -b progress H &&
-	git rebase --rebase-merges --force-rebase --verbose A 2> err &&
-	# Expecting "Rebasing (N/14)" here, no bogus total number
-	grep "^Rebasing.*/14.$" err >progress &&
-	test_line_count = 14 progress
+expecting success of 3504.5 'cherry-pick conflict respects rerere.autoUpdate': 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	git diff-files --quiet &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-Switched to a new branch 'progress'
-Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
-ok 32 - progress shows the correct total
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+[dev 41ff336] foo-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'bar' using previous resolution.
+[dev c0de054] bar-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 5 - cherry-pick conflict respects rerere.autoUpdate
 
-expecting success of 3430.33 'truncate label names': 
-	commit=$(git commit-tree -p HEAD^ -p HEAD -m "0123456789 我 123" HEAD^{tree}) &&
-	git merge --ff-only $commit &&
+expecting success of 3504.6 'cherry-pick conflict with --no-rerere-autoupdate': 
+	test_config rerere.autoUpdate true &&
+	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	test_must_fail git diff-files --quiet &&
+	git add foo &&
+	test_must_fail git cherry-pick --continue &&
+	test_cmp bar-expect bar &&
+	test_must_fail git diff-files --quiet &&
+	git add bar &&
+	git cherry-pick --continue &&
+	git reset --hard bar-dev
 
-	done="$(git rev-parse --git-path rebase-merge/done)" &&
-	git -c rebase.maxLabelLength=14 rebase --rebase-merges -x "cp \"$done\" out" --root &&
-	grep "label 0123456789-我$" out &&
-	git -c rebase.maxLabelLength=13 rebase --rebase-merges -x "cp \"$done\" out" --root &&
-	grep "label 0123456789-$" out
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'foo' using previous resolution.
+[dev 41ff336] foo-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging bar
+CONFLICT (add/add): Merge conflict in bar
+error: could not apply f55d303... bar-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'bar' using previous resolution.
+[dev c0de054] bar-main
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392a79 bar-dev
+ok 6 - cherry-pick conflict with --no-rerere-autoupdate
 
-Updating f13795a..96fcf0c
-Fast-forward
-Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
-Successfully rebased and updated refs/heads/progress.
-label 0123456789-我
-Rebasing (1/29)
Rebasing (2/29)
Rebasing (3/29)
Rebasing (4/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (5/29)
Rebasing (6/29)
Rebasing (7/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (8/29)
Rebasing (9/29)
Rebasing (10/29)
Rebasing (11/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (12/29)
Rebasing (13/29)
Rebasing (14/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (15/29)
Rebasing (16/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (17/29)
Rebasing (18/29)
Rebasing (19/29)
Rebasing (20/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (21/29)
Rebasing (22/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (23/29)
Rebasing (24/29)
Rebasing (25/29)
Executing: cp ".git/rebase-merge/done" out
-Rebasing (26/29)
Rebasing (27/29)
Rebasing (28/29)
Rebasing (29/29)
Executing: cp ".git/rebase-merge/done" out
-Successfully rebased and updated refs/heads/progress.
-label 0123456789-
-ok 33 - truncate label names
+expecting success of 3504.7 'cherry-pick --continue rejects --rerere-autoupdate': 
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
+	test_cmp expect actual &&
+	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
+	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
+	test_cmp expect actual &&
+	git cherry-pick --abort
 
-expecting success of 3430.34 'reword fast-forwarded empty merge commit': 
-	oid="$(git commit-tree -m "D1" -p A D^{tree})" &&
-	oid="$(git commit-tree -m "empty merge" -p D -p $oid D^{tree})" &&
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+ok 7 - cherry-pick --continue rejects --rerere-autoupdate
 
-	write_script sequence-editor.sh <<-\EOF &&
-	sed /^merge/s/-C/-c/ "$1" >"$1.tmp"
-	mv "$1.tmp" "$1"
-	EOF
+expecting success of 3504.8 'cherry-pick --rerere-autoupdate more than once': 
+	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
+	test_cmp foo-expect foo &&
+	git diff-files --quiet &&
+	git cherry-pick --abort &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
+	test_must_fail git diff-files --quiet &&
+	git cherry-pick --abort
 
-	(
-		test_set_sequence_editor "$(pwd)/sequence-editor.sh" &&
-		GIT_EDITOR="echo edited >>" git rebase -i -r D $oid
-	) &&
-	test_commit_message HEAD <<-\EOF
-	empty merge
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Staged 'foo' using previous resolution.
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Resolved 'foo' using previous resolution.
+ok 8 - cherry-pick --rerere-autoupdate more than once
 
-	edited
-	EOF
+expecting success of 3504.9 'cherry-pick conflict without rerere': 
+	test_config rerere.enabled false &&
+	test_must_fail git cherry-pick foo-main &&
+	grep ===== foo &&
+	grep foo-dev foo &&
+	grep foo-main foo
 
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 7457575] empty merge
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 16:02:13 2005 -0700
-Successfully rebased and updated detached HEAD.
-ok 34 - reword fast-forwarded empty merge commit
+Auto-merging foo
+CONFLICT (add/add): Merge conflict in foo
+error: could not apply b0605b8... foo-main
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+=======
+foo-dev
+foo-main
+>>>>>>> b0605b8 (foo-main)
+ok 9 - cherry-pick conflict without rerere
 
-# passed all 34 test(s)
-1..34
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3501-revert-cherry-pick.sh ***
@@ -163607,301 +160879,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3504-cherry-pick-rerere.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3504-cherry-pick-rerere/.git/
-expecting success of 3504.1 'setup': 
-	test_commit foo &&
-	test_commit foo-main foo &&
-	test_commit bar-main bar &&
-
-	git checkout -b dev foo &&
-	test_commit foo-dev foo &&
-	test_commit bar-dev bar &&
-	git config rerere.enabled true
-
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main b0605b8] foo-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main f55d303] bar-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-Switched to a new branch 'dev'
-[dev 1d8ba7e] foo-dev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[dev 5392a79] bar-dev
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-ok 1 - setup
-
-expecting success of 3504.2 'conflicting merge': 
-	test_must_fail git merge main
-
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-Recorded preimage for 'bar'
-Recorded preimage for 'foo'
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - conflicting merge
-
-expecting success of 3504.3 'fixup': 
-	echo foo-resolved >foo &&
-	echo bar-resolved >bar &&
-	git commit -am resolved &&
-	cp foo foo-expect &&
-	cp bar bar-expect &&
-	git reset --hard HEAD^
-
-Recorded resolution for 'bar'.
-Recorded resolution for 'foo'.
-[dev 85492e3] resolved
- Author: A U Thor <author@example.com>
-HEAD is now at 5392a79 bar-dev
-ok 3 - fixup
-
-expecting success of 3504.4 'cherry-pick conflict with --rerere-autoupdate': 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 4 - cherry-pick conflict with --rerere-autoupdate
-
-expecting success of 3504.5 'cherry-pick conflict respects rerere.autoUpdate': 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	git diff-files --quiet &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 5 - cherry-pick conflict respects rerere.autoUpdate
-
-expecting success of 3504.6 'cherry-pick conflict with --no-rerere-autoupdate': 
-	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	test_must_fail git diff-files --quiet &&
-	git add foo &&
-	test_must_fail git cherry-pick --continue &&
-	test_cmp bar-expect bar &&
-	test_must_fail git diff-files --quiet &&
-	git add bar &&
-	git cherry-pick --continue &&
-	git reset --hard bar-dev
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'foo' using previous resolution.
-[dev 41ff336] foo-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging bar
-CONFLICT (add/add): Merge conflict in bar
-error: could not apply f55d303... bar-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'bar' using previous resolution.
-[dev c0de054] bar-main
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392a79 bar-dev
-ok 6 - cherry-pick conflict with --no-rerere-autoupdate
-
-expecting success of 3504.7 'cherry-pick --continue rejects --rerere-autoupdate': 
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
-	test_cmp expect actual &&
-	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
-	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
-	test_cmp expect actual &&
-	git cherry-pick --abort
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-ok 7 - cherry-pick --continue rejects --rerere-autoupdate
-
-expecting success of 3504.8 'cherry-pick --rerere-autoupdate more than once': 
-	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
-	test_cmp foo-expect foo &&
-	git diff-files --quiet &&
-	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
-	test_must_fail git diff-files --quiet &&
-	git cherry-pick --abort
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Staged 'foo' using previous resolution.
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Resolved 'foo' using previous resolution.
-ok 8 - cherry-pick --rerere-autoupdate more than once
-
-expecting success of 3504.9 'cherry-pick conflict without rerere': 
-	test_config rerere.enabled false &&
-	test_must_fail git cherry-pick foo-main &&
-	grep ===== foo &&
-	grep foo-dev foo &&
-	grep foo-main foo
-
-Auto-merging foo
-CONFLICT (add/add): Merge conflict in foo
-error: could not apply b0605b8... foo-main
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-=======
-foo-dev
-foo-main
->>>>>>> b0605b8 (foo-main)
-ok 9 - cherry-pick conflict without rerere
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3505-cherry-pick-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3505-cherry-pick-empty/.git/
 expecting success of 3505.1 'setup': 
@@ -164246,803 +161223,3550 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3509-cherry-pick-merge-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3509-cherry-pick-merge-df/.git/
-expecting success of 3509.1 'Initialize repository': 
-	mkdir a &&
-	>a/f &&
-	git add a &&
-	git commit -m a
+*** t1092-sparse-checkout-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1092-sparse-checkout-compatibility/.git/
+expecting success of 1092.1 'setup': 
+	git init initial-repo &&
+	(
+		GIT_TEST_SPARSE_INDEX=0 &&
+		cd initial-repo &&
+		echo a >a &&
+		echo "after deep" >e &&
+		echo "after folder1" >g &&
+		echo "after x" >z &&
+		mkdir folder1 folder2 deep before x &&
+		echo "before deep" >before/a &&
+		echo "before deep again" >before/b &&
+		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
+		mkdir deep/deeper1/deepest &&
+		mkdir deep/deeper1/deepest2 &&
+		mkdir deep/deeper1/deepest3 &&
+		echo "after deeper1" >deep/e &&
+		echo "after deepest" >deep/deeper1/e &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a x &&
+		cp a deep &&
+		cp a deep/before &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/later &&
+		cp a deep/deeper1/deepest &&
+		cp a deep/deeper1/deepest2 &&
+		cp a deep/deeper1/deepest3 &&
+		cp -r deep/deeper1/ deep/deeper2 &&
+		mkdir deep/deeper1/0 &&
+		mkdir deep/deeper1/0/0 &&
+		touch deep/deeper1/0/1 &&
+		touch deep/deeper1/0/0/0 &&
+		>folder1- &&
+		>folder1.x &&
+		>folder10 &&
+		cp -r deep/deeper1/0 folder1 &&
+		cp -r deep/deeper1/0 folder2 &&
+		echo >>folder1/0/0/0 &&
+		echo >>folder2/0/1 &&
+		git add . &&
+		git commit -m "initial commit" &&
+		git checkout -b base &&
+		for dir in folder1 folder2 deep
+		do
+			git checkout -b update-$dir base &&
+			echo "updated $dir" >$dir/a &&
+			git commit -a -m "update $dir" || return 1
+		done &&
 
-[main (root-commit) 8938fef] a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/f
-ok 1 - Initialize repository
+		git checkout -b rename-base base &&
+		cat >folder1/larger-content <<-\EOF &&
+		matching
+		lines
+		help
+		inexact
+		renames
+		EOF
+		cp folder1/larger-content folder2/ &&
+		cp folder1/larger-content deep/deeper1/ &&
+		git add . &&
+		git commit -m "add interesting rename content" &&
 
-expecting success of 3509.2 'Setup rename across paths each below D/F conflicts': 
-	mkdir b &&
-	test_ln_s_add ../a b/a &&
-	git commit -m b &&
+		git checkout -b rename-out-to-out rename-base &&
+		mv folder1/a folder2/b &&
+		mv folder1/larger-content folder2/edited-content &&
+		echo >>folder2/edited-content &&
+		echo >>folder2/0/1 &&
+		echo stuff >>deep/deeper1/a &&
+		git add . &&
+		git commit -m "rename folder1/... to folder2/..." &&
 
-	git checkout -b branch &&
-	rm b/a &&
-	git mv a b/a &&
-	test_ln_s_add b/a a &&
-	git commit -m swap &&
+		git checkout -b rename-out-to-in rename-base &&
+		mv folder1/a deep/deeper1/b &&
+		echo more stuff >>deep/deeper1/a &&
+		rm folder2/0/1 &&
+		mkdir folder2/0/1 &&
+		echo >>folder2/0/1/1 &&
+		mv folder1/larger-content deep/deeper1/edited-content &&
+		echo >>deep/deeper1/edited-content &&
+		git add . &&
+		git commit -m "rename folder1/... to deep/deeper1/..." &&
 
-	>f1 &&
-	git add f1 &&
-	git commit -m f1
+		git checkout -b rename-in-to-out rename-base &&
+		mv deep/deeper1/a folder1/b &&
+		echo >>folder2/0/1 &&
+		rm -rf folder1/0/0 &&
+		echo >>folder1/0/0 &&
+		mv deep/deeper1/larger-content folder1/edited-content &&
+		echo >>folder1/edited-content &&
+		git add . &&
+		git commit -m "rename deep/deeper1/... to folder1/..." &&
 
-checking prerequisite: SYMLINKS
+		git checkout -b df-conflict-1 base &&
+		rm -rf folder1 &&
+		echo content >folder1 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+		git checkout -b df-conflict-2 base &&
+		rm -rf folder2 &&
+		echo content >folder2 &&
+		git add . &&
+		git commit -m "dir to file" &&
 
-)
-prerequisite SYMLINKS ok
-[main 6c20241] b
+		git checkout -b fd-conflict base &&
+		rm a &&
+		mkdir a &&
+		echo content >a/a &&
+		git add . &&
+		git commit -m "file to dir" &&
+
+		for side in left right
+		do
+			git checkout -b merge-$side base &&
+			echo $side >>deep/deeper2/a &&
+			echo $side >>folder1/a &&
+			echo $side >>folder2/a &&
+			git add . &&
+			git commit -m "$side" || return 1
+		done &&
+
+		git checkout -b deepest base &&
+		echo "updated deepest" >deep/deeper1/deepest/a &&
+		echo "updated deepest2" >deep/deeper1/deepest2/a &&
+		echo "updated deepest3" >deep/deeper1/deepest3/a &&
+		git commit -a -m "update deepest" &&
+
+		git checkout -f base &&
+		git reset --hard
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
+[master (root-commit) 703fd3e] initial commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 b/a
-Switched to a new branch 'branch'
-[branch 138a745] swap
+ 33 files changed, 26 insertions(+)
+ create mode 100644 a
+ create mode 100644 before/a
+ create mode 100644 before/b
+ create mode 100644 deep/a
+ create mode 100644 deep/before/a
+ create mode 100644 deep/deeper1/0/0/0
+ create mode 100644 deep/deeper1/0/1
+ create mode 100644 deep/deeper1/a
+ create mode 100644 deep/deeper1/deepest/a
+ create mode 100644 deep/deeper1/deepest2/a
+ create mode 100644 deep/deeper1/deepest3/a
+ create mode 100644 deep/deeper1/e
+ create mode 100644 deep/deeper2/a
+ create mode 100644 deep/deeper2/deeper1/a
+ create mode 100644 deep/deeper2/deeper1/deepest/a
+ create mode 100644 deep/deeper2/deeper1/deepest2/a
+ create mode 100644 deep/deeper2/deeper1/deepest3/a
+ create mode 100644 deep/deeper2/deeper1/e
+ create mode 100644 deep/e
+ create mode 100644 deep/later/a
+ create mode 100644 e
+ create mode 100644 folder1-
+ create mode 100644 folder1.x
+ create mode 100644 folder1/0/0/0
+ create mode 100644 folder1/0/1
+ create mode 100644 folder1/a
+ create mode 100644 folder10
+ create mode 100644 folder2/0/0/0
+ create mode 100644 folder2/0/1
+ create mode 100644 folder2/a
+ create mode 100644 g
+ create mode 100644 x/a
+ create mode 100644 z
+Switched to a new branch 'base'
+Switched to a new branch 'update-folder1'
+[update-folder1 fa14324] update folder1
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- create mode 120000 a
- delete mode 120000 b/a
- rename {a => b/a}/f (100%)
-[branch b71b76f] f1
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'update-folder2'
+[update-folder2 2805da4] update folder2
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 2 - Setup rename across paths each below D/F conflicts
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'update-deep'
+[update-deep ac61adf] update deep
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'rename-base'
+[rename-base 5914bd8] add interesting rename content
+ Author: A U Thor <author@example.com>
+ 3 files changed, 15 insertions(+)
+ create mode 100644 deep/deeper1/larger-content
+ create mode 100644 folder1/larger-content
+ create mode 100644 folder2/larger-content
+Switched to a new branch 'rename-out-to-out'
+[rename-out-to-out 4a04e79] rename folder1/... to folder2/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 3 insertions(+)
+ rename folder1/a => folder2/b (100%)
+ rename folder1/larger-content => folder2/edited-content (97%)
+Switched to a new branch 'rename-out-to-in'
+[rename-out-to-in d11c5fe] rename folder1/... to deep/deeper1/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename folder1/a => deep/deeper1/b (100%)
+ rename folder1/larger-content => deep/deeper1/edited-content (97%)
+ rename folder2/0/{ => 1}/1 (100%)
+Switched to a new branch 'rename-in-to-out'
+[rename-in-to-out e5d0f8e] rename deep/deeper1/... to folder1/...
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename folder1/0/{0 => }/0 (100%)
+ rename deep/deeper1/a => folder1/b (100%)
+ rename deep/deeper1/larger-content => folder1/edited-content (97%)
+Switched to a new branch 'df-conflict-1'
+[df-conflict-1 974b58d] dir to file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 folder1
+ delete mode 100644 folder1/0/0/0
+ delete mode 100644 folder1/0/1
+ delete mode 100644 folder1/a
+Switched to a new branch 'df-conflict-2'
+[df-conflict-2 bef3412] dir to file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 2 deletions(-)
+ create mode 100644 folder2
+ delete mode 100644 folder2/0/0/0
+ delete mode 100644 folder2/0/1
+ delete mode 100644 folder2/a
+Switched to a new branch 'fd-conflict'
+[fd-conflict 40c717f] file to dir
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a
+ create mode 100644 a/a
+Switched to a new branch 'merge-left'
+[merge-left 9721a77] left
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Switched to a new branch 'merge-right'
+[merge-right 4f73b62] right
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Switched to a new branch 'deepest'
+[deepest cb037bf] update deepest
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+Switched to branch 'base'
+HEAD is now at 703fd3e initial commit
+ok 1 - setup
 
-expecting success of 3509.3 'Cherry-pick succeeds with rename across D/F conflicts': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git cherry-pick branch
+expecting success of 1092.2 'sparse-index contents': 
+	init_repos &&
 
-HEAD is now at b71b76f f1
-Note: switching to 'main^0'.
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	# Replace deep with deep/deeper2 (dropping deep/deeper1)
+	# Add folder1
+	test_sparse_checkout_set \
+		"deep/deeper2 folder1 folder2 x" \
+		"before deep/deeper1" &&
 
-  git switch -c <new-branch-name>
+	# Replace deep/deeper2 with deep/deeper1
+	# Replace folder1 with folder1/0/0
+	# Replace folder2 with non-existent folder2/2/3
+	# Add non-existent "bogus"
+	test_sparse_checkout_set \
+		"bogus deep/deeper1 folder1/0/0 folder2/2/3 x" \
+		"before deep/deeper2 folder2/0" &&
 
-Or undo this operation with:
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
-  git switch -
+	# Disabling the sparse-index replaces tree entries with full ones
+	git -C sparse-index sparse-checkout init --no-sparse-index &&
+	test_sparse_match git ls-files --stage --sparse
 
-Turn off this advice by setting config variable advice.detachedHead to false
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 10c8564bace86d48e22963bebe92e40ba8cfd937 0	deep/deeper1/
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ca1fa788550e1b7b99256573687bd1dd7994e072 0	deep/deeper2/
+040000 cb4007891397aa2a451037d1c69e57f0cf498c24 0	folder2/0/
+fatal: path 'bogus' does not exist in 'HEAD'
+fatal: path 'folder2/2/3' does not exist in 'HEAD'
+040000 4499610892bdc57d5ebd35ebf695a57cd82ffe0e 0	before/
+040000 ce536cb5137cec414526564049b9b175d835cde1 0	deep/
+040000 e0f2d30b633eb781d675fedd78808135103fe1a0 0	folder1/
+040000 123706f6fc38949628eaf0483edbf97ba21123ae 0	folder2/
+040000 aaff74984cccd156a469afa7d9ab10e4777beb24 0	x/
+ok 2 - sparse-index contents
 
-HEAD is now at 6c20241 b
-[detached HEAD 1b1aec6] f1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 f1
-ok 3 - Cherry-pick succeeds with rename across D/F conflicts
+expecting success of 1092.3 'expanded in-memory index matches full index': 
+	init_repos &&
+	test_sparse_match git ls-files --stage
 
-expecting success of 3509.4 'Setup rename with file on one side matching directory name on other': 
-	git checkout --orphan nick-testcase &&
-	git rm -rf . &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 3 - expanded in-memory index matches full index
 
-	>empty &&
-	git add empty &&
-	git commit -m "Empty file" &&
+expecting success of 1092.4 'root directory cannot be sparse': 
+	init_repos &&
 
-	git checkout -b simple &&
-	mv empty file &&
-	mkdir empty &&
-	mv file empty &&
-	git add empty/file &&
-	git commit -m "Empty file under empty dir" &&
+	# Remove all in-cone files and directories from the index, collapse index
+	# with `git sparse-checkout reapply`
+	git -C sparse-index rm -r . &&
+	git -C sparse-index sparse-checkout reapply &&
 
-	echo content >newfile &&
-	git add newfile &&
-	git commit -m "New file"
+	# Verify sparse directories still present, root directory is not sparse
+	cat >expect <<-EOF &&
+	before/
+	folder1/
+	folder2/
+	x/
+	EOF
+	git -C sparse-index ls-files --sparse >actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'nick-testcase'
-rm 'a/f'
-rm 'b/a'
-rm 'f1'
-[nick-testcase (root-commit) f619bd8] Empty file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-Switched to a new branch 'simple'
-[simple 735003f] Empty file under empty dir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename empty => empty/file (100%)
-[simple 2eb2ba1] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 4 - Setup rename with file on one side matching directory name on other
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+rm 'a'
+rm 'deep/a'
+rm 'deep/before/a'
+rm 'deep/deeper1/0/0/0'
+rm 'deep/deeper1/0/1'
+rm 'deep/deeper1/a'
+rm 'deep/deeper1/deepest/a'
+rm 'deep/deeper1/deepest2/a'
+rm 'deep/deeper1/deepest3/a'
+rm 'deep/deeper1/e'
+rm 'deep/deeper2/a'
+rm 'deep/deeper2/deeper1/a'
+rm 'deep/deeper2/deeper1/deepest/a'
+rm 'deep/deeper2/deeper1/deepest2/a'
+rm 'deep/deeper2/deeper1/deepest3/a'
+rm 'deep/deeper2/deeper1/e'
+rm 'deep/e'
+rm 'deep/later/a'
+rm 'e'
+rm 'folder1-'
+rm 'folder1.x'
+rm 'folder10'
+rm 'g'
+rm 'z'
+ok 4 - root directory cannot be sparse
 
-expecting success of 3509.5 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)': 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=resolve simple
+expecting success of 1092.5 'status with options': 
+	init_repos &&
+	test_sparse_match ls &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	test_all_match git status --porcelain=v2 -uno &&
+	run_on_all touch README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	test_all_match git status --porcelain=v2 -uno &&
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	test_all_match git status --porcelain=v2 -uno
 
-HEAD is now at 2eb2ba1 New file
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-[detached HEAD 072269c] New file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 5 - status with options
 
-expecting success of 3509.6 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)': 
-	git reset --hard &&
-	git checkout -q nick-testcase^0 &&
-	git cherry-pick --strategy=recursive simple
+expecting success of 1092.6 'status with diff in unexpanded sparse directory': 
+	init_repos &&
+	test_all_match git checkout rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git status --porcelain=v2
 
-HEAD is now at 072269c New file
-Adding empty
-[detached HEAD 072269c] New file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 6 - status with diff in unexpanded sparse directory
 
-expecting success of 3509.7 'Setup rename with file on one side matching different dirname on other': 
-	git reset --hard &&
-	git checkout --orphan mergeme &&
-	git rm -rf . &&
+expecting success of 1092.7 'status reports sparse-checkout': 
+	init_repos &&
+	git -C sparse-checkout status >full &&
+	git -C sparse-index status >sparse &&
+	test_grep "You are in a sparse checkout with " full &&
+	test_grep "You are in a sparse checkout." sparse
 
-	mkdir sub &&
-	mkdir othersub &&
-	echo content > sub/file &&
-	echo foo > othersub/whatever &&
-	git add -A &&
-	git commit -m "Common commit" &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+You are in a sparse checkout with 73% of tracked files present.
+You are in a sparse checkout.
+ok 7 - status reports sparse-checkout
 
-	git rm -rf othersub &&
-	git mv sub/file othersub &&
-	git commit -m "Commit to merge" &&
+expecting success of 1092.8 'add, commit, checkout': 
+	init_repos &&
 
-	git checkout -b newhead mergeme~1 &&
-	>independent-change &&
-	git add independent-change &&
-	git commit -m "Completely unrelated change"
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
 
-HEAD is now at 072269c New file
-Switched to a new branch 'mergeme'
-rm 'empty'
-rm 'newfile'
-[mergeme (root-commit) 220cb6a] Common commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 othersub/whatever
- create mode 100644 sub/file
-rm 'othersub/whatever'
-[mergeme 73ee5a0] Commit to merge
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-Switched to a new branch 'newhead'
-[newhead dec5ebc] Completely unrelated change
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 independent-change
-ok 7 - Setup rename with file on one side matching different dirname on other
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Add README.md" &&
 
-expecting success of 3509.8 'Cherry-pick with rename to different D/F conflict succeeds (resolve)': 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=resolve mergeme
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-HEAD is now at dec5ebc Completely unrelated change
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Adding othersub
-[detached HEAD 8d9f455] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
+	run_on_all ../edit-contents README.md &&
 
-expecting success of 3509.9 'Cherry-pick with rename to different D/F conflict succeeds (recursive)': 
-	git reset --hard &&
-	git checkout -q newhead^0 &&
-	git cherry-pick --strategy=recursive mergeme
+	test_all_match git add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
 
-HEAD is now at 8d9f455 Commit to merge
-Removing othersub/whatever
-[detached HEAD 8d9f455] Commit to merge
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 deletion(-)
- rename sub/file => othersub (100%)
- delete mode 100644 othersub/whatever
-ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3404-rebase-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3404-rebase-interactive/.git/
-expecting success of 3404.1 'setup': 
-	git switch -C primary &&
-	test_commit A file1 &&
-	test_commit B file1 &&
-	test_commit C file2 &&
-	test_commit D file1 &&
-	test_commit E file3 &&
-	git checkout -b branch1 A &&
-	test_commit F file4 &&
-	test_commit G file1 &&
-	test_commit H file5 &&
-	git checkout -b branch2 F &&
-	test_commit I file6 &&
-	git checkout -b conflict-branch A &&
-	test_commit one conflict &&
-	test_commit two conflict &&
-	test_commit three conflict &&
-	test_commit four conflict &&
-	git checkout -b no-conflict-branch A &&
-	test_commit J fileJ &&
-	test_commit K fileK &&
-	test_commit L fileL &&
-	test_commit M fileM &&
-	git checkout -b no-ff-branch A &&
-	test_commit N fileN &&
-	test_commit O fileO &&
-	test_commit P fileP
+	run_on_all ../edit-contents deep/newfile &&
 
-Switched to a new branch 'primary'
-[primary (root-commit) 6e62bf8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[primary 313fe96] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[primary d0f65f2] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[primary 0547e3f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[primary 8f99a4f] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-Switched to a new branch 'branch1'
-[branch1 cfefd94] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[branch1 83751a6] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch1 4373208] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-Switched to a new branch 'branch2'
-[branch2 615be62] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-Switched to a new branch 'conflict-branch'
-[conflict-branch b895952] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict
-[conflict-branch 766a798] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch 1eadf03] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict-branch f91a2b3] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'no-conflict-branch'
-[no-conflict-branch 808874f] J
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileJ
-[no-conflict-branch 265b89e] K
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileK
-[no-conflict-branch 6b0f5e6] L
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileL
-[no-conflict-branch 3389558] M
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileM
-Switched to a new branch 'no-ff-branch'
-[no-ff-branch 53b4423] N
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileN
-[no-ff-branch cc47714] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileO
-[no-ff-branch faef1a5] P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileP
-ok 1 - setup
+	test_all_match git status --porcelain=v2 -uno &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "add deep/newfile" &&
 
-expecting success of 3404.2 'rebase --keep-empty': 
-	git checkout -b emptybranch primary &&
-	git commit --allow-empty -m "empty" &&
-	git rebase --keep-empty -i HEAD~2 &&
-	git log --oneline >actual &&
-	test_line_count = 6 actual
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
 
-Switched to a new branch 'emptybranch'
-[emptybranch da33401] empty
- Author: A U Thor <author@example.com>
-Successfully rebased and updated refs/heads/emptybranch.
-ok 2 - rebase --keep-empty
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 8 - add, commit, checkout
 
-expecting success of 3404.3 'rebase -i with empty todo list': 
-	cat >expect <<-\EOF &&
-	error: nothing to do
-	EOF
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="#" \
-			git rebase -i HEAD^ >output 2>&1
-	) &&
-	tail -n 1 output >actual &&  # Ignore output about changing todo list
-	test_cmp expect actual
+expecting success of 1092.9 'deep changes during checkout': 
+	init_repos &&
 
-ok 3 - rebase -i with empty todo list
+	test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
+	test_all_match git checkout deepest &&
+	test_all_match git checkout base
 
-expecting success of 3404.4 'rebase -i with the exec command': 
-	git checkout primary &&
-	(
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-one
-		2 exec_>touch-two exec_false exec_>touch-three
-		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
-	export FAKE_LINES &&
-	test_must_fail git rebase -i A
-	) &&
-	test_path_is_file touch-one &&
-	test_path_is_file touch-two &&
-	# Missing because we should have stopped by now.
-	test_path_is_missing touch-three &&
-	test_cmp_rev C HEAD &&
-	git rebase --continue &&
-	test_path_is_file touch-three &&
-	test_path_is_file "touch-file  name with spaces" &&
-	test_path_is_file touch-after-semicolon &&
-	test_cmp_rev primary HEAD &&
-	rm -f touch-*
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 9 - deep changes during checkout
 
-Switched to branch 'primary'
-rebase -i script before editing:
-pick 313fe96 B
-pick d0f65f2 C
-pick 0547e3f D
-pick 8f99a4f E
+expecting success of 1092.10 'checkout with modified sparse directory': 
+	init_repos &&
 
-rebase -i script after editing:
-pick 313fe96 B
-exec >touch-one
-pick d0f65f2 C
-exec >touch-two
-exec false
-exec >touch-three
-pick 0547e3f D
-pick 8f99a4f E
-exec >"touch-file  name with spaces"; >touch-after-semicolon
-Rebasing (2/9)
Executing: >touch-one
-Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
-Rebasing (5/9)
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
 
-  git rebase --continue
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 10 - checkout with modified sparse directory
 
+expecting success of 1092.11 'checkout orphan then non-orphan': 
+	init_repos &&
 
-Rebasing (6/9)
Executing: >touch-three
-Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
-Successfully rebased and updated refs/heads/primary.
-ok 4 - rebase -i with the exec command
+	test_all_match git checkout --orphan test-orphan &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git checkout base &&
+	test_all_match git status --porcelain=v2
 
-expecting success of 3404.5 'rebase -i with the exec command runs from tree root': 
-	git checkout primary &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 exec_>touch-subdir" \
-		git rebase -i HEAD^
-	) &&
-	test_path_is_file touch-subdir &&
-	rm -fr subdir
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 11 - checkout orphan then non-orphan
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+expecting success of 1092.12 'add outside sparse cone': 
+	init_repos &&
 
-rebase -i script after editing:
-pick 8f99a4f E
-exec >touch-subdir
-Rebasing (2/2)
Executing: >touch-subdir
-Successfully rebased and updated refs/heads/primary.
-ok 5 - rebase -i with the exec command runs from tree root
+	run_on_sparse mkdir folder1 &&
+	run_on_sparse ../edit-contents folder1/a &&
+	run_on_sparse ../edit-contents folder1/newfile &&
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add folder1/newfile &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/newfile
 
-expecting success of 3404.6 'rebase -i with exec allows git commands in subdirs': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "git rebase --abort ||:" &&
-	git checkout primary &&
-	mkdir subdir && (cd subdir &&
-	set_fake_editor &&
-	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
-		git rebase -i HEAD^
-	)
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 12 - add outside sparse cone
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+expecting success of 1092.13 'commit including unstaged changes': 
+	init_repos &&
 
-rebase -i script after editing:
-pick 8f99a4f E
-x cd subdir && git rev-parse --is-inside-work-tree
-Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
-true
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 6 - rebase -i with exec allows git commands in subdirs
+	write_script edit-file <<-\EOF &&
+	echo $1 >$2
+	EOF
 
-expecting success of 3404.7 'rebase -i sets work tree properly': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "test_might_fail git rebase --abort" &&
-	mkdir subdir &&
-	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
-		>actual &&
-	! grep "/subdir$" actual
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/a &&
 
-Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 7 - rebase -i sets work tree properly
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3404.8 'rebase -i with the exec command checks tree cleanness': 
-	git checkout primary &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
-			git rebase -i HEAD^
-	) &&
-	test_cmp_rev primary^ HEAD &&
-	git reset --hard &&
-	git rebase --continue
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/a &&
 
-Already on 'primary'
-rebase -i script before editing:
-pick 8f99a4f E
+	test_all_match git commit -m "--include" --include deep/a &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "--include" --include a &&
+	test_all_match git status --porcelain=v2 &&
 
-rebase -i script after editing:
-exec echo foo >file1
-pick 8f99a4f E
-Rebasing (1/2)
Executing: echo foo >file1
-error: cannot rebase: You have unstaged changes.
-warning: execution succeeded: echo foo >file1
-but left changes to the index and/or the working tree.
-Commit or stash your changes, and then run
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/a &&
 
-  git rebase --continue
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
 
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 13 - commit including unstaged changes
 
-HEAD is now at 0547e3f D
-Rebasing (2/2)
Successfully rebased and updated refs/heads/primary.
-ok 8 - rebase -i with the exec command checks tree cleanness
+expecting success of 1092.14 'status/add: outside sparse cone': 
+	init_repos &&
 
-expecting success of 3404.9 'cherry-pick works with rebase --exec': 
-	test_when_finished "git cherry-pick --abort; \
-			    git rebase --abort; \
-			    git checkout primary" &&
-	echo "exec git cherry-pick G" >todo &&
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i D D
-	) &&
-	test_cmp_rev G CHERRY_PICK_HEAD
+	# folder1 is at HEAD, but outside the sparse cone
+	run_on_sparse mkdir folder1 &&
+	cp initial-repo/folder1/a sparse-checkout/folder1/a &&
+	cp initial-repo/folder1/a sparse-index/folder1/a &&
 
-rebase -i script after editing:
-exec git cherry-pick G
-Rebasing (1/1)
Executing: git cherry-pick G
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 83751a6... G
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-file1: needs merge
-error: cannot rebase: You have unstaged changes.
-error: additionally, your index contains uncommitted changes.
-warning: execution failed: git cherry-pick G
-and made changes to the index and/or the working tree.
-You can fix the problem, and then run
+	test_sparse_match git status &&
 
-  git rebase --continue
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents folder1/a &&
+	run_on_all ../edit-contents folder1/new &&
 
+	test_sparse_match git status --porcelain=v2 &&
 
-Previous HEAD position was 0547e3f D
-Switched to branch 'primary'
-ok 9 - cherry-pick works with rebase --exec
+	# Adding the path outside of the sparse-checkout cone should fail.
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_all_match git add --refresh folder1/a &&
+	test_must_be_empty sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_sparse_match test_must_fail git add folder1/new &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/new &&
+	test_sparse_match git add --sparse folder1/a &&
+	test_sparse_match git add --sparse folder1/new &&
 
-expecting success of 3404.10 'rebase -x with empty command fails': 
-	test_when_finished "git rebase --abort ||:" &&
-	test_must_fail env git rebase -x "" @ 2>actual &&
-	test_write_lines "error: empty exec command" >expected &&
-	test_cmp expected actual &&
-	test_must_fail env git rebase -x " " @ 2>actual &&
-	test_cmp expected actual
+	test_all_match git add --sparse . &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/new &&
+	test_all_match git rev-parse HEAD^{tree} &&
 
-fatal: no rebase in progress
-ok 10 - rebase -x with empty command fails
+	run_on_all ../edit-contents folder1/newer &&
+	test_all_match git add --sparse folder1/ &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m folder1/newer &&
+	test_all_match git rev-parse HEAD^{tree}
 
-expecting success of 3404.11 'rebase -x with newline in command fails': 
-	test_when_finished "git rebase --abort ||:" &&
-	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
-	test_write_lines "error: exec commands cannot contain newlines" \
-			 >expected &&
-	test_cmp expected actual
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 14 - status/add: outside sparse cone
 
-fatal: no rebase in progress
-ok 11 - rebase -x with newline in command fails
+expecting success of 1092.15 'checkout and reset --hard': 
+	init_repos &&
 
-expecting success of 3404.12 'rebase -i with exec of inexistent command': 
-	git checkout primary &&
-	test_when_finished "git rebase --abort" &&
-	(
-		set_fake_editor &&
-		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
-			git rebase -i HEAD^ >actual 2>&1
-	) &&
-	! grep "Maybe git-rebase is broken" actual
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-Already on 'primary'
-ok 12 - rebase -i with exec of inexistent command
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 3404.13 'implicit interactive rebase does not invoke sequence editor': 
-	test_when_finished "git rebase --abort ||:" &&
-	GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
+	test_all_match git checkout -b reset-test &&
+	test_all_match git reset --hard deepest &&
+	test_all_match git reset --hard update-folder1 &&
+	test_all_match git reset --hard update-folder2
 
-Rebasing (2/2)
Executing: echo one
-one
-Successfully rebased and updated refs/heads/primary.
-fatal: no rebase in progress
-ok 13 - implicit interactive rebase does not invoke sequence editor
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 15 - checkout and reset --hard
 
-expecting success of 3404.14 'no changes are a nop': 
-	git checkout branch2 &&
-	git rebase -i F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test_cmp_rev I HEAD
+expecting success of 1092.16 'diff --cached': 
+	init_repos &&
 
-Switched to branch 'branch2'
-Successfully rebased and updated refs/heads/branch2.
-ok 14 - no changes are a nop
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
 
-expecting success of 3404.15 'test the [branch] option': 
-	git checkout -b dead-end &&
-	git rm file6 &&
-	git commit -m "stop here" &&
-	git rebase -i F branch2 &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test_cmp_rev I branch2 &&
-	test_cmp_rev I HEAD
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	test_all_match git add README.md &&
+	test_all_match git diff &&
+	test_all_match git diff --cached
 
-Switched to a new branch 'dead-end'
-rm 'file6'
-[dead-end f814f58] stop here
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file6
-Successfully rebased and updated refs/heads/branch2.
-ok 15 - test the [branch] option
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 16 - diff --cached
 
-expecting success of 3404.16 'test --onto <branch>': 
-	git checkout -b test-onto branch2 &&
-	git rebase -i --onto branch1 F &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
-	test_cmp_rev HEAD^ branch1 &&
-	test_cmp_rev I branch2
+expecting success of 1092.17 'diff with renames and conflicts': 
+	init_repos &&
 
-Switched to a new branch 'test-onto'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
-ok 16 - test --onto <branch>
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      fd-conflict
+	do
+		test_all_match git checkout rename-base &&
+		test_all_match git checkout $branch -- . &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
+	done
 
-expecting success of 3404.17 'rebase on top of a non-conflicting commit': 
-	git checkout branch1 &&
-	git tag original-branch1 &&
-	git rebase -i branch2 &&
-	test file6 = $(git diff --name-only original-branch1) &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test_cmp_rev I branch2 &&
-	test_cmp_rev I HEAD~2
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 17 - diff with renames and conflicts
 
-Switched to branch 'branch1'
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 17 - rebase on top of a non-conflicting commit
+expecting success of 1092.18 'diff with directory/file conflicts': 
+	init_repos &&
 
-expecting success of 3404.18 'reflog for the branch shows state before rebase': 
-	test_cmp_rev branch1@{1} original-branch1
+	for branch in rename-out-to-out \
+		      rename-out-to-in \
+		      rename-in-to-out \
+		      df-conflict-1 \
+		      df-conflict-2 \
+		      fd-conflict
+	do
+		git -C full-checkout reset --hard &&
+		test_sparse_match git reset --hard &&
+		test_all_match git checkout $branch &&
+		test_all_match git checkout rename-base -- . &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git diff --cached --no-renames &&
+		test_all_match git diff --cached --find-renames || return 1
+	done
 
-ok 18 - reflog for the branch shows state before rebase
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 4a04e79 rename folder1/... to folder2/...
+HEAD is now at d11c5fe rename folder1/... to deep/deeper1/...
+HEAD is now at e5d0f8e rename deep/deeper1/... to folder1/...
+HEAD is now at 974b58d dir to file
+HEAD is now at bef3412 dir to file
+ok 18 - diff with directory/file conflicts
 
-expecting success of 3404.19 'reflog for the branch shows correct finish message': 
-	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
-		"$(git rev-parse branch2)" >expected &&
-	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
-	test_cmp expected actual
+expecting success of 1092.19 'log with pathspec outside sparse definition': 
+	init_repos &&
 
-ok 19 - reflog for the branch shows correct finish message
+	test_all_match git log -- a &&
+	test_all_match git log -- folder1/a &&
+	test_all_match git log -- folder2/a &&
+	test_all_match git log -- deep/a &&
+	test_all_match git log -- deep/deeper1/a &&
+	test_all_match git log -- deep/deeper1/deepest/a &&
 
-expecting success of 3404.20 'exchange two commits': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="2 1" git rebase -i HEAD~2
-	) &&
-	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
-	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
-	blob1=$(git rev-parse --short HEAD^:file1) &&
-	blob2=$(git rev-parse --short HEAD:file1) &&
-	commit=$(git rev-parse --short HEAD)
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
 
-rebase -i script before editing:
-pick ae8f65e G
-pick f5f5249 H
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 19 - log with pathspec outside sparse definition
 
-rebase -i script after editing:
-pick f5f5249 H
-pick ae8f65e G
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
-ok 20 - exchange two commits
+expecting success of 1092.20 'blame with pathspec inside sparse definition': 
+	init_repos &&
 
-expecting success of 3404.21 'stop on conflicting pick': 
-	cat >expect <<-EOF &&
-	diff --git a/file1 b/file1
-	index $blob1..$blob2 100644
-	--- a/file1
-	+++ b/file1
-	@@ -1 +1 @@
-	-A
-	+G
-	EOF
-	cat >expect2 <<-EOF &&
-	<<<<<<< HEAD
-	D
-	=======
-	G
-	>>>>>>> $commit (G)
-	EOF
-	git tag new-branch1 &&
-	test_must_fail git rebase -i primary &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
-	test_cmp expect .git/rebase-merge/patch &&
-	test_cmp expect2 file1 &&
-	test "$(git diff --name-status |
-		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
-	grep -v "^#" <.git/rebase-merge/done >actual &&
-	test_line_count = 4 actual &&
-	test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_all_match git blame $file || return 1
+	done
 
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-error: could not apply 5d18e54... G
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 5d18e54... G
-ok 21 - stop on conflicting pick
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 20 - blame with pathspec inside sparse definition
 
-expecting success of 3404.22 'show conflicted patch': 
-	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
-	grep "show.*REBASE_HEAD" stderr &&
-	# the original stopped-sha1 is abbreviated
-	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
-	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
+expecting success of 1092.21 'blame with pathspec outside sparse definition': 
+	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-trace: run_command: git show REBASE_HEAD --
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git show REBASE_HEAD --
-trace: built-in: git show REBASE_HEAD --
-ok 22 - show conflicted patch
+	for file in \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_sparse_match test_must_fail git blame $file &&
+		cat >expect <<-EOF &&
+		fatal: Cannot lstat '$file': No such file or directory
+		EOF
+		# We compare sparse-checkout-err and sparse-index-err in
+		# `test_sparse_match`. Given we know they are the same, we
+		# only check the content of sparse-index-err here.
+		test_cmp expect sparse-index-err || return 1
+	done
 
-expecting success of 3404.23 'abort': 
-	git rebase --abort &&
-	test_cmp_rev new-branch1 HEAD &&
-	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test_path_is_missing .git/rebase-merge
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 21 - blame with pathspec outside sparse definition
 
-ok 23 - abort
+expecting success of 1092.22 'checkout and reset (mixed)': 
+	init_repos &&
 
-expecting success of 3404.24 'abort with error when new base cannot be checked out': 
-	git rm --cached file1 &&
-	git commit -m "remove file in base" &&
-	test_must_fail git rebase -i primary > output 2>&1 &&
-	test_grep "The following untracked working tree files would be overwritten by checkout:" \
-		output &&
-	test_grep "file1" output &&
-	test_path_is_missing .git/rebase-merge &&
-	rm file1 &&
-	git reset --hard HEAD^
+	test_all_match git checkout -b reset-test update-deep &&
+	test_all_match git reset deepest &&
 
-rm 'file1'
-[branch1 2dd5570] remove file in base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-error: The following untracked working tree files would be overwritten by checkout:
-	file1
-HEAD is now at 5d18e54 G
-ok 24 - abort with error when new base cannot be checked out
+	# Because skip-worktree is preserved, resetting to update-folder1
+	# will show worktree changes for folder1/a in full-checkout, but not
+	# in sparse-checkout or sparse-index.
+	git -C full-checkout reset update-folder1 >full-checkout-out &&
+	test_sparse_match git reset update-folder1 &&
+	grep "M	folder1/a" full-checkout-out &&
+	! grep "M	folder1/a" sparse-checkout-out &&
+	run_on_sparse test_path_is_missing folder1
 
-expecting success of 3404.25 'retain authorship': 
-	echo A > file7 &&
-	git add file7 &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	git tag twerp &&
-	git rebase -i --onto primary HEAD^ &&
-	git show HEAD >actual &&
-	grep "^Author: Twerp Snog" actual
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+M	folder1/a
+ok 22 - checkout and reset (mixed)
 
-[branch1 2596307] different author
- Author: Twerp Snog <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file7
-Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
-Author: Twerp Snog <author@example.com>
-ok 25 - retain authorship
+expecting success of 1092.23 'checkout and reset (merge)': 
+	init_repos &&
 
-expecting success of 3404.26 'retain authorship w/ conflicts': 
-	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
-	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-	git reset --hard twerp &&
-	test_commit a conflict a conflict-a &&
-	git reset --hard twerp &&
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents a &&
+	test_all_match git reset --merge deepest &&
+	test_all_match git status --porcelain=v2 &&
 
-	GIT_AUTHOR_NAME=AttributeMe &&
-	export GIT_AUTHOR_NAME &&
-	test_commit b conflict b conflict-b &&
-	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
+	test_all_match git reset --hard update-deep &&
+	run_on_all ../edit-contents deep/a &&
+	test_all_match test_must_fail git reset --merge deepest
 
-	test_must_fail git rebase -i conflict-a &&
-	echo resolved >conflict &&
-	git add conflict &&
-	git rebase --continue &&
-	test_cmp_rev conflict-a^0 HEAD^ &&
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 23 - checkout and reset (merge)
+
+expecting success of 1092.24 'checkout and reset (keep)': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents a &&
+	test_all_match git reset --keep deepest &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard update-deep &&
+	run_on_all ../edit-contents deep/a &&
+	test_all_match test_must_fail git reset --keep deepest
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 24 - checkout and reset (keep)
+
+expecting success of 1092.25 'reset with pathspecs inside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents deep/a &&
+
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 25 - reset with pathspecs inside sparse definition
+
+expecting success of 1092.26 'reset with pathspecs outside sparse definition': 
+	init_repos &&
+	test_all_match git checkout -b reset-test base &&
+
+	test_sparse_match git reset update-folder1 -- folder1 &&
+	git -C full-checkout reset update-folder1 -- folder1 &&
+	test_all_match git ls-files -s -- folder1 &&
+
+	test_sparse_match git reset update-folder2 -- folder2/a &&
+	git -C full-checkout reset update-folder2 -- folder2/a &&
+	test_all_match git ls-files -s -- folder2/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Unstaged changes after reset:
+M	folder1/a
+Unstaged changes after reset:
+M	folder1/a
+M	folder2/a
+ok 26 - reset with pathspecs outside sparse definition
+
+expecting success of 1092.27 'reset with wildcard pathspec': 
+	init_repos &&
+
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
+
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
+
+	# The following `git reset`s result in updating the index on files with
+	# `skip-worktree` enabled. To avoid failing due to discrepancies in reported
+	# "modified" files, `test_sparse_match` reset is performed separately from
+	# "full-checkout" reset, then the index contents of all repos are verified.
+
+	test_sparse_match git reset update-folder1 -- \*/a &&
+	git -C full-checkout reset update-folder1 -- \*/a &&
+	test_all_match git ls-files -s -- deep/a folder1/a &&
+
+	test_sparse_match git reset update-folder2 -- folder\* &&
+	git -C full-checkout reset update-folder2 -- folder\* &&
+	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
+
+	test_sparse_match git reset base -- folder1/\* &&
+	git -C full-checkout reset base -- folder1/\* &&
+	test_all_match git ls-files -s -- folder1
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Unstaged changes after reset:
+M	folder1/a
+Unstaged changes after reset:
+M	folder2/a
+Unstaged changes after reset:
+M	folder2/a
+ok 27 - reset with wildcard pathspec
+
+expecting success of 1092.28 'reset hard with removed sparse dir': 
+	init_repos &&
+
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
+
+	cat >expect <<-\EOF &&
+	folder1/
+	EOF
+
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 28 - reset hard with removed sparse dir
+
+expecting success of 1092.29 'update-index modify outside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Create & modify folder1/a
+	# Note that this setup is a manual way of reaching the erroneous
+	# condition in which a `skip-worktree` enabled, outside-of-cone file
+	# exists on disk. It is used here to ensure `update-index` is stable
+	# and behaves predictably if such a condition occurs.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
+	run_on_all ../edit-contents folder1/a &&
+
+	# If file has skip-worktree enabled, but the file is present, it is
+	# treated the same as if skip-worktree is disabled
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git update-index folder1/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# When skip-worktree is disabled (even on files outside sparse cone), file
+	# is updated in the index
+	test_sparse_match git update-index --no-skip-worktree folder1/a &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git update-index folder1/a &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 29 - update-index modify outside sparse definition
+
+expecting success of 1092.30 'update-index --add outside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
+
+	# The *untracked* out-of-cone file is added to the index because it does
+	# not have a `skip-worktree` bit to signal that it should be ignored
+	# (unlike in `git add`, which will fail due to the file being outside
+	# the sparse checkout definition).
+	test_all_match git update-index --add folder1/b &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 30 - update-index --add outside sparse definition
+
+expecting success of 1092.31 'update-index --remove outside sparse definition': 
+	init_repos &&
+
+	# When --ignore-skip-worktree-entries is _not_ specified:
+	# out-of-cone, not-on-disk files are removed from the index
+	test_sparse_match git update-index --remove folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out &&
+
+	test_sparse_match git diff-index --cached HEAD &&
+
+	# Reset the state
+	test_all_match git reset --hard &&
+
+	# When --ignore-skip-worktree-entries is specified, out-of-cone
+	# (skip-worktree) files are ignored
+	test_sparse_match git update-index --remove --ignore-skip-worktree-entries folder1/a &&
+	test_sparse_match git diff --cached --name-status &&
+	test_must_be_empty sparse-checkout-out &&
+
+	test_sparse_match git diff-index --cached HEAD &&
+
+	# Reset the state
+	test_all_match git reset --hard &&
+
+	# --force-remove supersedes --ignore-skip-worktree-entries, removing
+	# a skip-worktree file from the index (and disk) when both are specified
+	# with --remove
+	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out &&
+
+	test_sparse_match git diff-index --cached HEAD
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 31 - update-index --remove outside sparse definition
+
+expecting success of 1092.32 'update-index with directories': 
+	init_repos &&
+
+	# update-index will exit silently when provided with a directory name
+	# containing a trailing slash
+	test_all_match git update-index deep/ folder1/ &&
+	grep "Ignoring path deep/" sparse-checkout-err &&
+	grep "Ignoring path folder1/" sparse-checkout-err &&
+
+	# When update-index is given a directory name WITHOUT a trailing slash, it will
+	# behave in different ways depending on the status of the directory on disk:
+	# * if it exists, the command exits with an error ("add individual files instead")
+	# * if it does NOT exist (e.g., in a sparse-checkout), it is assumed to be a
+	#   file and either triggers an error ("does not exist  and --remove not passed")
+	#   or is ignored completely (when using --remove)
+	test_all_match test_must_fail git update-index deep &&
+	run_on_all test_must_fail git update-index folder1 &&
+	test_must_fail git -C full-checkout update-index --remove folder1 &&
+	test_sparse_match git update-index --remove folder1 &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Ignoring path deep/
+Ignoring path folder1/
+error: folder1: is a directory - add individual files instead
+fatal: Unable to process path folder1
+ok 32 - update-index with directories
+
+expecting success of 1092.33 'update-index --again file outside sparse definition': 
+	init_repos &&
+
+	test_all_match git checkout -b test-reupdate &&
+
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
+
+	# Because folder1/a differs in the index vs HEAD,
+	# `git update-index --no-skip-worktree --again` will effectively perform
+	# `git update-index --no-skip-worktree folder1/a` and remove the skip-worktree
+	# flag from folder1/a
+	test_sparse_match git update-index --no-skip-worktree --again &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	cat >expect <<-EOF &&
+	D	folder1/a
+	EOF
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 33 - update-index --again file outside sparse definition
+
+expecting success of 1092.34 'update-index --cacheinfo': 
+	init_repos &&
+
+	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+	folder2_oid=$(git -C full-checkout rev-parse update-folder2:folder2) &&
+	folder1_a_oid=$(git -C full-checkout rev-parse update-folder1:folder1/a) &&
+
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Cannot add sparse directory, even in sparse index case
+	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
+
+	# Sparse match only: the new outside-of-cone entry is added *without* skip-worktree,
+	# so `git status` reports it as "deleted" in the worktree
+	test_sparse_match git update-index --add --cacheinfo 100644 $folder1_a_oid folder1/a &&
+	test_sparse_match git status --porcelain=v2 &&
+	cat >expect <<-EOF &&
+	MD folder1/a
+	EOF
+	test_sparse_match git status --short -- folder1/a &&
+	test_cmp expect sparse-checkout-out &&
+
+	# To return folder1/a to "normal" for a sparse checkout (ignored &
+	# outside-of-cone), add the skip-worktree flag.
+	test_sparse_match git update-index --skip-worktree folder1/a &&
+	cat >expect <<-EOF &&
+	S folder1/a
+	EOF
+	test_sparse_match git ls-files -t -- folder1/a &&
+	test_cmp expect sparse-checkout-out
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 34 - update-index --cacheinfo
+
+expecting success of 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
+		init_repos &&
+
+		# Although the index matches, without --no-sparse-checkout, outside-of-
+		# definition files will not exist on disk for sparse checkouts
+		test_all_match git read-tree -mu $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_path_is_missing sparse-checkout/folder2 &&
+		test_path_is_missing sparse-index/folder2 &&
+
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
+
+		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
+		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 35 - 'read-tree -mu base HEAD update-folder2' with files outside sparse definition
+
+expecting success of 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
+		init_repos &&
+
+		# Although the index matches, without --no-sparse-checkout, outside-of-
+		# definition files will not exist on disk for sparse checkouts
+		test_all_match git read-tree -mu $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_path_is_missing sparse-checkout/folder2 &&
+		test_path_is_missing sparse-index/folder2 &&
+
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
+
+		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
+		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 36 - 'read-tree -mu update-folder1 update-folder2' with files outside sparse definition
+
+expecting success of 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
+		init_repos &&
+
+		# Although the index matches, without --no-sparse-checkout, outside-of-
+		# definition files will not exist on disk for sparse checkouts
+		test_all_match git read-tree -mu $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_path_is_missing sparse-checkout/folder2 &&
+		test_path_is_missing sparse-index/folder2 &&
+
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
+
+		test_all_match git read-tree -mu --no-sparse-checkout $MERGE_TREES &&
+		test_all_match git status --porcelain=v2 &&
+		test_cmp sparse-checkout/folder2/a sparse-index/folder2/a &&
+		test_cmp sparse-checkout/folder2/a full-checkout/folder2/a
+
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 37 - 'read-tree -mu update-folder2' with files outside sparse definition
+
+expecting success of 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
+	init_repos &&
+
+	# Merge of multiple changes to same directory (but not same files) should
+	# succeed
+	test_all_match git read-tree -mu base rename-base update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard &&
+
+	test_all_match git read-tree -mu rename-base update-folder2 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git reset --hard &&
+
+	test_all_match test_must_fail git read-tree -mu base update-folder1 rename-out-to-in &&
+	test_all_match test_must_fail git read-tree -mu rename-out-to-in update-folder1
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 38 - read-tree --merge with edit/edit conflicts in sparse directories
+
+expecting success of 1092.39 'read-tree --prefix': 
+	init_repos &&
+
+	# If files differing between the index and target <commit-ish> exist
+	# inside the prefix, `read-tree --prefix` should fail
+	test_all_match test_must_fail git read-tree --prefix=deep/ deepest &&
+	test_all_match test_must_fail git read-tree --prefix=folder1/ update-folder1 &&
+
+	# If no differing index entries exist matching the prefix,
+	# `read-tree --prefix` updates the index successfully
+	test_all_match git rm -rf deep/deeper1/deepest/ &&
+	test_all_match git read-tree --prefix=deep/deeper1/deepest -u deepest &&
+	test_all_match git status --porcelain=v2 &&
+
+	run_on_all git rm -rf --sparse folder1/ &&
+	test_all_match git read-tree --prefix=folder1/ -u update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git rm -rf --sparse folder2/0 &&
+	test_all_match git read-tree --prefix=folder2/0/ -u rename-out-to-out &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 39 - read-tree --prefix
+
+expecting success of 1092.40 'read-tree --merge with directory-file conflicts': 
+	init_repos &&
+
+	test_all_match git checkout -b test-branch rename-base &&
+
+	# Although the index matches, without --no-sparse-checkout, outside-of-
+	# definition files will not exist on disk for sparse checkouts
+	test_sparse_match git read-tree -mu rename-out-to-out &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_path_is_missing sparse-checkout/folder2 &&
+	test_path_is_missing sparse-index/folder2 &&
+
+	test_sparse_match git read-tree --reset -u HEAD &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	test_sparse_match git read-tree -mu --no-sparse-checkout rename-out-to-out &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_cmp sparse-checkout/folder2/0/1 sparse-index/folder2/0/1
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 40 - read-tree --merge with directory-file conflicts
+
+expecting success of 1092.41 'merge, cherry-pick, and rebase': 
+	init_repos &&
+
+	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
+	do
+		test_all_match git checkout -B temp update-deep &&
+		test_all_match git $OPERATION update-folder1 &&
+		test_all_match git rev-parse HEAD^{tree} &&
+		test_all_match git $OPERATION update-folder2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 41 - merge, cherry-pick, and rebase
+
+expecting success of 1092.42 'merge with conflict outside cone': 
+	init_repos &&
+
+	test_all_match git checkout -b merge-tip merge-left &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match test_must_fail git merge -m merge merge-right &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Resolve the conflict in different ways:
+	# 1. Revert to the base
+	test_all_match git checkout base -- deep/deeper2/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# 2. Add the file with conflict markers
+	test_sparse_match test_must_fail git add folder1/a &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder1/a &&
+	test_all_match git add --sparse folder1/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# 3. Rename the file to another sparse filename and
+	#    accept conflict markers as resolved content.
+	run_on_all mv folder2/a folder2/z &&
+	test_sparse_match test_must_fail git add folder2 &&
+	grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+	test_sparse_unstaged folder2/z &&
+	test_all_match git add --sparse folder2 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git merge --continue &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git rev-parse HEAD^{tree}
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 42 - merge with conflict outside cone
+
+expecting success of 1092.43 'cherry-pick/rebase with conflict outside cone': 
+	init_repos &&
+
+	for OPERATION in cherry-pick rebase
+	do
+		test_all_match git checkout -B tip &&
+		test_all_match git reset --hard merge-left &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match test_must_fail git $OPERATION merge-right &&
+		test_all_match git status --porcelain=v2 &&
+
+		# Resolve the conflict in different ways:
+		# 1. Revert to the base
+		test_all_match git checkout base -- deep/deeper2/a &&
+		test_all_match git status --porcelain=v2 &&
+
+		# 2. Add the file with conflict markers
+		# NEEDSWORK: Even though the merge conflict removed the
+		# SKIP_WORKTREE bit from the index entry for folder1/a, we should
+		# warn that this is a problematic add.
+		test_sparse_match test_must_fail git add folder1/a &&
+		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+		test_sparse_unstaged folder1/a &&
+		test_all_match git add --sparse folder1/a &&
+		test_all_match git status --porcelain=v2 &&
+
+		# 3. Rename the file to another sparse filename and
+		#    accept conflict markers as resolved content.
+		# NEEDSWORK: This mode now fails, because folder2/z is
+		# outside of the sparse-checkout cone and does not match an
+		# existing index entry with the SKIP_WORKTREE bit cleared.
+		run_on_all mv folder2/a folder2/z &&
+		test_sparse_match test_must_fail git add folder2 &&
+		grep "Disable or modify the sparsity rules" sparse-checkout-err &&
+		test_sparse_unstaged folder2/z &&
+		test_all_match git add --sparse folder2 &&
+		test_all_match git status --porcelain=v2 &&
+
+		test_all_match git $OPERATION --continue &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 43 - cherry-pick/rebase with conflict outside cone
+
+expecting success of 1092.44 'merge with outside renames': 
+	init_repos &&
+
+	for type in out-to-out out-to-in in-to-out
+	do
+		test_all_match git reset --hard &&
+		test_all_match git checkout -f -b merge-$type update-deep &&
+		test_all_match git merge -m "$type" rename-$type &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	done
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 44 - merge with outside renames
+
+expecting success of 1092.45 'cherry-pick with conflicts': 
+	init_repos &&
+
+	write_script edit-conflict <<-\EOF &&
+	echo $1 >conflict
+	EOF
+
+	test_all_match git checkout -b to-cherry-pick &&
+	run_on_all ../edit-conflict ABC &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict to pick" &&
+
+	test_all_match git checkout -B base HEAD~1 &&
+	run_on_all ../edit-conflict DEF &&
+	test_all_match git add conflict &&
+	test_all_match git commit -m "conflict in base" &&
+
+	test_all_match test_must_fail git cherry-pick to-cherry-pick
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 45 - cherry-pick with conflicts
+
+expecting success of 1092.46 'stash': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Stash a sparse directory (folder1)
+	test_all_match git checkout -b test-branch rename-base &&
+	test_all_match git reset --soft rename-out-to-out &&
+	test_all_match git stash &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Apply the sparse directory stash without reinstating the index
+	test_all_match git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to state where stash can be applied
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard rename-out-to-out &&
+
+	# Apply the sparse directory stash *with* reinstating the index
+	test_all_match git stash apply --index -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to state where we will get a conflict applying the stash
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard update-folder1 &&
+
+	# Apply the sparse directory stash with conflicts
+	test_all_match test_must_fail git stash apply --index -q &&
+	test_all_match test_must_fail git stash apply -q &&
+	test_all_match git status --porcelain=v2 &&
+
+	# Reset to base branch
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git reset --hard base &&
+
+	# Stash & unstash an untracked file outside of the sparse checkout
+	# definition.
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/new &&
+	test_all_match git stash -u &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git stash pop -q &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 46 - stash
+
+expecting success of 1092.47 'checkout-index inside sparse definition': 
+	init_repos &&
+
+	run_on_all rm -f deep/a &&
+	test_all_match git checkout-index -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	echo test >>new-a &&
+	run_on_all cp ../new-a a &&
+	test_all_match test_must_fail git checkout-index -- a &&
+	test_all_match git checkout-index -f -- a &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 47 - checkout-index inside sparse definition
+
+expecting success of 1092.48 'checkout-index outside sparse definition': 
+	init_repos &&
+
+	# Without --ignore-skip-worktree-bits, outside-of-cone files will trigger
+	# an error
+	test_sparse_match test_must_fail git checkout-index -- folder1/a &&
+	test_grep "folder1/a has skip-worktree enabled" sparse-checkout-err &&
+	test_path_is_missing folder1/a &&
+
+	# With --ignore-skip-worktree-bits, outside-of-cone files are checked out
+	test_sparse_match git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a &&
+
+	run_on_sparse rm -rf folder1 &&
+	echo test >new-a &&
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all cp ../new-a folder1/a &&
+
+	test_all_match test_must_fail git checkout-index --ignore-skip-worktree-bits -- folder1/a &&
+	test_all_match git checkout-index -f --ignore-skip-worktree-bits -- folder1/a &&
+	test_cmp sparse-checkout/folder1/a sparse-index/folder1/a &&
+	test_cmp sparse-checkout/folder1/a full-checkout/folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+git checkout-index: folder1/a has skip-worktree enabled; use '--ignore-skip-worktree-bits' to checkout
+ok 48 - checkout-index outside sparse definition
+
+expecting success of 1092.49 'checkout-index with folders': 
+	init_repos &&
+
+	# Inside checkout definition
+	test_all_match test_must_fail git checkout-index -f -- deep/ &&
+
+	# Outside checkout definition
+	# Note: although all tests fail (as expected), the messaging differs. For
+	# non-sparse index checkouts, the error is that the "file" does not appear
+	# in the index; for sparse checkouts, the error is explicitly that the
+	# entry is a sparse directory.
+	run_on_all test_must_fail git checkout-index -f -- folder1/ &&
+	test_cmp full-checkout-err sparse-checkout-err &&
+	! test_cmp full-checkout-err sparse-index-err &&
+	grep "is a sparse directory" sparse-index-err
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+--- full-checkout-err	2025-03-17 13:19:33.768031509 +0000
++++ sparse-index-err	2025-03-17 13:19:33.868032141 +0000
+@@ -1 +1 @@
+-git checkout-index: folder1/ is not in the cache
++git checkout-index: folder1/ is a sparse directory
+git checkout-index: folder1/ is a sparse directory
+ok 49 - checkout-index with folders
+
+expecting success of 1092.50 'checkout-index --all': 
+	init_repos &&
+
+	test_all_match git checkout-index --all &&
+	test_sparse_match test_path_is_missing folder1 &&
+
+	# --ignore-skip-worktree-bits will cause `skip-worktree` files to be
+	# checked out, causing the outside-of-cone `folder1` to exist on-disk
+	test_all_match git checkout-index --ignore-skip-worktree-bits --all &&
+	test_all_match test_path_exists folder1
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 50 - checkout-index --all
+
+expecting success of 1092.51 'clean': 
+	init_repos &&
+
+	echo bogus >>.gitignore &&
+	run_on_all cp ../.gitignore . &&
+	test_all_match git add .gitignore &&
+	test_all_match git commit -m "ignore bogus files" &&
+
+	run_on_sparse mkdir folder1 &&
+	run_on_all mkdir -p deep/untracked-deep &&
+	run_on_all touch folder1/bogus &&
+	run_on_all touch folder1/untracked &&
+	run_on_all touch deep/untracked-deep/bogus &&
+	run_on_all touch deep/untracked-deep/untracked &&
+
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git clean -f &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_is_missing folder1/untracked &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/untracked &&
+
+	test_all_match git clean -fd &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_exists folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+	run_on_all test_path_is_missing deep/untracked-deep/untracked &&
+
+	test_all_match git clean -xf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing folder1/bogus &&
+	run_on_all test_path_exists deep/untracked-deep/bogus &&
+
+	test_all_match git clean -xdf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+	run_on_all test_path_is_missing deep/untracked-deep/bogus &&
+
+	test_sparse_match test_path_is_dir folder1
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 51 - clean
+
+expecting success of 1092.52 'show (cached blobs/trees)': 
+		init_repos &&
+
+		test_all_match git show :a &&
+		test_all_match git show :deep/a &&
+		test_sparse_match git show :folder1/a &&
+
+		# The error message differs depending on whether
+		# the directory exists in the worktree.
+		test_all_match test_must_fail git show :deep/ &&
+		test_must_fail git -C full-checkout show :folder1/ &&
+		test_sparse_match test_must_fail git show :folder1/ &&
+
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
+
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git show :deep/deeper2/ &&
+
+		# deep/deeper2/deepest is not in the sparse index, but
+		# will trigger an index expansion.
+		test_sparse_match test_must_fail git show :deep/deeper2/deepest/
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+fatal: path 'folder1/' exists on disk, but not in the index
+ok 52 - show (cached blobs/trees)
+
+expecting success of 1092.53 'rev-parse (cached blobs/trees)': 
+		init_repos &&
+
+		test_all_match git rev-parse :a &&
+		test_all_match git rev-parse :deep/a &&
+		test_sparse_match git rev-parse :folder1/a &&
+
+		# The error message differs depending on whether
+		# the directory exists in the worktree.
+		test_all_match test_must_fail git rev-parse :deep/ &&
+		test_must_fail git -C full-checkout rev-parse :folder1/ &&
+		test_sparse_match test_must_fail git rev-parse :folder1/ &&
+
+		# Change the sparse cone for an extra case:
+		run_on_sparse git sparse-checkout set deep/deeper1 &&
+
+		# deep/deeper2 is a sparse directory in the sparse index.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/ &&
+
+		# deep/deeper2/deepest is not in the sparse index, but
+		# will trigger an index expansion.
+		test_sparse_match test_must_fail git rev-parse :deep/deeper2/deepest/
+	
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+fatal: path 'folder1/' exists on disk, but not in the index
+:folder1/
+ok 53 - rev-parse (cached blobs/trees)
+
+expecting success of 1092.54 'submodule handling': 
+	init_repos &&
+
+	test_sparse_match git sparse-checkout add modules &&
+	test_all_match mkdir modules &&
+	test_all_match touch modules/a &&
+	test_all_match git add modules &&
+	test_all_match git commit -m "add modules directory" &&
+
+	test_config_global protocol.file.allow always &&
+
+	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
+	test_all_match git commit -m "add submodule" &&
+
+	# having a submodule prevents "modules" from collapse
+	test_sparse_match git sparse-checkout set deep/deeper1 &&
+	git -C sparse-index ls-files --sparse --stage >cache &&
+	grep "100644 .*	modules/a" cache &&
+	grep "160000 $(git -C initial-repo rev-parse HEAD) 0	modules/sub" cache
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	modules/a
+160000 703fd3e56687611d5c0264e6f007e18e96f794bf 0	modules/sub
+ok 54 - submodule handling
+
+expecting success of 1092.55 'sparse-index is expanded and converted back': 
+	init_repos &&
+
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+		git -C sparse-index reset -- folder1/a &&
+	test_region index convert_to_sparse trace2.txt &&
+	test_region index ensure_full_index trace2.txt &&
+
+	# ls-files expands on read, but does not write.
+	rm trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index ls-files &&
+	test_region index ensure_full_index trace2.txt
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.947224Z","file":"sparse-index.c","line":237,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.947354Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000130,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_enter","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.946133Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.947635Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.946817Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000685,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T131949.944703Z-H5c947e1c-P002ed689","thread":"main","time":"2025-03-17T13:19:49.947799Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000164,"nesting":1,"category":"index","label":"ensure_full_index"}
+a
+before/a
+before/b
+deep/a
+deep/before/a
+deep/deeper1/0/0/0
+deep/deeper1/0/1
+deep/deeper1/a
+deep/deeper1/deepest/a
+deep/deeper1/deepest2/a
+deep/deeper1/deepest3/a
+deep/deeper1/e
+deep/deeper2/a
+deep/deeper2/deeper1/a
+deep/deeper2/deeper1/deepest/a
+deep/deeper2/deeper1/deepest2/a
+deep/deeper2/deeper1/deepest3/a
+deep/deeper2/deeper1/e
+deep/e
+deep/later/a
+e
+folder1-
+folder1.x
+folder1/0/0/0
+folder1/0/1
+folder1/a
+folder10
+folder2/0/0/0
+folder2/0/1
+folder2/a
+g
+x/a
+z
+{"event":"region_enter","sid":"20250317T131950.067302Z-H5c947e1c-P002ed6cf","thread":"main","time":"2025-03-17T13:19:50.068190Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T131950.067302Z-H5c947e1c-P002ed6cf","thread":"main","time":"2025-03-17T13:19:50.069049Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000859,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 55 - sparse-index is expanded and converted back
+
+expecting success of 1092.56 'index.sparse disabled inline uses full index': 
+	init_repos &&
+
+	# When index.sparse is disabled inline with `git status`, the
+	# index is expanded at the beginning of the execution then never
+	# converted back to sparse. It is then written to disk as a full index.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index -c index.sparse=false status &&
+	! test_region index convert_to_sparse trace2.txt &&
+	test_region index ensure_full_index trace2.txt &&
+
+	# Since index.sparse is set to true at a repo level, the index
+	# is converted from full to sparse when read, then never expanded
+	# over the course of `git status`. It is written to disk as a sparse
+	# index.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index status &&
+	test_region index convert_to_sparse trace2.txt &&
+	! test_region index ensure_full_index trace2.txt &&
+
+	# Now that the index has been written to disk as sparse, it is not
+	# converted to sparse (or expanded to full) when read by `git status`.
+	rm -f trace2.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index status &&
+	! test_region index convert_to_sparse trace2.txt &&
+	! test_region index ensure_full_index trace2.txt
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+On branch base
+You are in a sparse checkout with 73% of tracked files present.
+
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20250317T131950.602681Z-H5c947e1c-P002ed837","thread":"main","time":"2025-03-17T13:19:50.603598Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T131950.602681Z-H5c947e1c-P002ed837","thread":"main","time":"2025-03-17T13:19:50.604419Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000822,"nesting":2,"category":"index","label":"ensure_full_index"}
+On branch base
+You are in a sparse checkout.
+
+nothing to commit, working tree clean
+{"event":"region_enter","sid":"20250317T131950.728111Z-H5c947e1c-P002ed89e","thread":"main","time":"2025-03-17T13:19:50.728858Z","file":"sparse-index.c","line":237,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20250317T131950.728111Z-H5c947e1c-P002ed89e","thread":"main","time":"2025-03-17T13:19:50.729020Z","file":"sparse-index.c","line":252,"repo":1,"t_rel":0.000162,"nesting":2,"category":"index","label":"convert_to_sparse"}
+On branch base
+You are in a sparse checkout.
+
+nothing to commit, working tree clean
+ok 56 - index.sparse disabled inline uses full index
+
+expecting success of 1092.57 'sparse-index is not expanded': 
+	init_repos &&
+
+	ensure_not_expanded status &&
+	ensure_not_expanded ls-files --sparse &&
+	ensure_not_expanded commit --allow-empty -m empty &&
+	echo >>sparse-index/a &&
+	ensure_not_expanded commit -a -m a &&
+	echo >>sparse-index/a &&
+	ensure_not_expanded commit --include a -m a &&
+	echo >>sparse-index/deep/deeper1/a &&
+	ensure_not_expanded commit --include deep/deeper1/a -m deeper &&
+	ensure_not_expanded checkout rename-out-to-out &&
+	ensure_not_expanded checkout - &&
+	ensure_not_expanded switch rename-out-to-out &&
+	ensure_not_expanded switch - &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
+
+	echo >>sparse-index/README.md &&
+	ensure_not_expanded add -A &&
+	echo >>sparse-index/extra.txt &&
+	ensure_not_expanded add extra.txt &&
+	echo >>sparse-index/untracked.txt &&
+	ensure_not_expanded add . &&
+
+	ensure_not_expanded checkout-index -f a &&
+	ensure_not_expanded checkout-index -f --all &&
+	for ref in update-deep update-folder1 update-folder2 update-deep
+	do
+		echo >>sparse-index/README.md &&
+		ensure_not_expanded reset --hard $ref || return 1
+	done &&
+
+	ensure_not_expanded reset --mixed base &&
+	ensure_not_expanded reset --hard update-deep &&
+	ensure_not_expanded reset --keep base &&
+	ensure_not_expanded reset --merge update-deep &&
+	ensure_not_expanded reset --hard &&
+
+	ensure_not_expanded reset base -- deep/a &&
+	ensure_not_expanded reset base -- nonexistent-file &&
+	ensure_not_expanded reset deepest -- deep &&
+
+	# Although folder1 is outside the sparse definition, it exists as a
+	# directory entry in the index, so the pathspec will not force the
+	# index to be expanded.
+	ensure_not_expanded reset deepest -- folder1 &&
+	ensure_not_expanded reset deepest -- folder1/ &&
+
+	# Wildcard identifies only in-cone files, no index expansion
+	ensure_not_expanded reset deepest -- deep/\* &&
+
+	# Wildcard identifies only full sparse directories, no index expansion
+	ensure_not_expanded reset deepest -- folder\* &&
+
+	ensure_not_expanded clean -fd &&
+
+	ensure_not_expanded checkout -f update-deep &&
+	test_config -C sparse-index pull.twohead ort &&
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		for OPERATION in "merge -m merge" cherry-pick rebase
+		do
+			ensure_not_expanded merge -m merge update-folder1 &&
+			ensure_not_expanded merge -m merge update-folder2 || return 1
+		done
+	)
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 57 - sparse-index is not expanded
+
+expecting success of 1092.58 'sparse-index is not expanded: merge conflict in cone': 
+	init_repos &&
+
+	for side in right left
+	do
+		git -C sparse-index checkout -b expand-$side base &&
+		echo $side >sparse-index/deep/a &&
+		git -C sparse-index commit -a -m "$side" || return 1
+	done &&
+
+	(
+		sane_unset GIT_TEST_MERGE_ALGORITHM &&
+		git -C sparse-index config pull.twohead ort &&
+		ensure_not_expanded ! merge -m merged expand-right
+	)
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Switched to a new branch 'expand-right'
+[expand-right 5ebbff9] right
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'expand-left'
+[expand-left 9bcd6b8] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 58 - sparse-index is not expanded: merge conflict in cone
+
+expecting success of 1092.59 'sparse-index is not expanded: stash': 
+	init_repos &&
+
+	echo >>sparse-index/a &&
+	ensure_not_expanded stash &&
+	ensure_not_expanded stash list &&
+	ensure_not_expanded stash show stash@{0} &&
+	ensure_not_expanded stash apply stash@{0} &&
+	ensure_not_expanded stash drop stash@{0} &&
+
+	echo >>sparse-index/deep/new &&
+	ensure_not_expanded stash -u &&
+	(
+		WITHOUT_UNTRACKED_TXT=1 &&
+		ensure_not_expanded stash pop
+	) &&
+
+	ensure_not_expanded stash create &&
+	oid=$(git -C sparse-index stash create) &&
+	ensure_not_expanded stash store -m "test" $oid &&
+	ensure_not_expanded reset --hard &&
+	ensure_not_expanded stash pop
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 59 - sparse-index is not expanded: stash
+
+expecting success of 1092.60 'describe tested on all': 
+	init_repos &&
+
+	# Add tag to be read by describe
+
+	run_on_all git tag -a v1.0 -m "Version 1" &&
+	test_all_match git describe --dirty &&
+	run_on_all rm g &&
+	test_all_match git describe --dirty
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 60 - describe tested on all
+
+expecting success of 1092.61 'sparse-index is not expanded: describe': 
+	init_repos &&
+
+	# Add tag to be read by describe
+
+	git -C sparse-index tag -a v1.0 -m "Version 1" &&
+
+	ensure_not_expanded describe --dirty &&
+	echo "test" >>sparse-index/g &&
+	ensure_not_expanded describe --dirty &&
+	ensure_not_expanded describe
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 61 - sparse-index is not expanded: describe
+
+expecting success of 1092.62 'sparse index is not expanded: diff and diff-index': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+
+	# Add file within cone
+	test_sparse_match git sparse-checkout set deep &&
+	run_on_all ../edit-contents deep/testfile &&
+	test_all_match git add deep/testfile &&
+	run_on_all ../edit-contents deep/testfile &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached &&
+	ensure_not_expanded diff-index --cached HEAD &&
+
+	# Add file outside cone
+	test_all_match git reset --hard &&
+	run_on_all mkdir newdirectory &&
+	run_on_all ../edit-contents newdirectory/testfile &&
+	test_sparse_match git sparse-checkout set newdirectory &&
+	test_all_match git add newdirectory/testfile &&
+	run_on_all ../edit-contents newdirectory/testfile &&
+	test_sparse_match git sparse-checkout set &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached &&
+	ensure_not_expanded diff-index --cached HEAD &&
+
+	# Merge conflict outside cone
+	# The sparse checkout will report a warning that is not in the
+	# full checkout, so we use `run_on_all` instead of
+	# `test_all_match`
+	run_on_all git reset --hard &&
+	test_all_match git checkout merge-left &&
+	test_all_match test_must_fail git merge merge-right &&
+
+	test_all_match git diff &&
+	test_all_match git diff --cached &&
+	ensure_not_expanded diff &&
+	ensure_not_expanded diff --cached &&
+	ensure_not_expanded diff-index --cached HEAD
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 62 - sparse index is not expanded: diff and diff-index
+
+expecting success of 1092.63 'sparse index is not expanded: show and rev-parse': 
+	init_repos &&
+
+	ensure_not_expanded show :a &&
+	ensure_not_expanded show :deep/a &&
+	ensure_not_expanded rev-parse :a &&
+	ensure_not_expanded rev-parse :deep/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 63 - sparse index is not expanded: show and rev-parse
+
+expecting success of 1092.64 'sparse index is not expanded: update-index': 
+	init_repos &&
+
+	deep_a_oid=$(git -C full-checkout rev-parse update-deep:deep/a) &&
+	ensure_not_expanded update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+
+	echo "test" >sparse-index/README.md &&
+	echo "test2" >sparse-index/a &&
+	rm -f sparse-index/deep/a &&
+
+	ensure_not_expanded update-index --add README.md &&
+	ensure_not_expanded update-index a &&
+	ensure_not_expanded update-index --remove deep/a &&
+
+	ensure_not_expanded reset --soft update-deep &&
+	ensure_not_expanded update-index --add --remove --again
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 64 - sparse index is not expanded: update-index
+
+expecting success of 1092.65 'sparse index is not expanded: blame': 
+	init_repos &&
+
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		ensure_not_expanded blame $file || return 1
+	done
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 65 - sparse index is not expanded: blame
+
+expecting success of 1092.66 'sparse index is not expanded: fetch/pull': 
+	init_repos &&
+
+	git -C sparse-index remote add full "file://$(pwd)/full-checkout" &&
+	ensure_not_expanded fetch full &&
+	git -C full-checkout commit --allow-empty -m "for pull merge" &&
+	git -C sparse-index commit --allow-empty -m "for pull merge" &&
+	ensure_not_expanded pull full base
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+[base f236285] for pull merge
+ Author: A U Thor <author@example.com>
+[base f236285] for pull merge
+ Author: A U Thor <author@example.com>
+ok 66 - sparse index is not expanded: fetch/pull
+
+expecting success of 1092.67 'sparse index is not expanded: read-tree': 
+	init_repos &&
+
+	ensure_not_expanded checkout -b test-branch update-folder1 &&
+	for MERGE_TREES in "base HEAD update-folder2" \
+			   "base HEAD rename-base" \
+			   "base update-folder2" \
+			   "base rename-base" \
+			   "update-folder2"
+	do
+		ensure_not_expanded read-tree -mu $MERGE_TREES &&
+		ensure_not_expanded reset --hard || return 1
+	done &&
+
+	rm -rf sparse-index/deep/deeper2 &&
+	ensure_not_expanded add . &&
+	ensure_not_expanded commit -m "test" &&
+
+	ensure_not_expanded read-tree --prefix=deep/deeper2 -u deepest
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 67 - sparse index is not expanded: read-tree
+
+expecting success of 1092.68 'ls-files': 
+	init_repos &&
+
+	# Use a smaller sparse-checkout for reduced output
+	test_sparse_match git sparse-checkout set &&
+
+	# Behavior agrees by default. Sparse index is expanded.
+	test_all_match git ls-files &&
+
+	# With --sparse, the sparse index data changes behavior.
+	git -C sparse-index ls-files --sparse >actual &&
+
+	cat >expect <<-\EOF &&
+	a
+	before/
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
+
+	test_cmp expect actual &&
+
+	# With --sparse and no sparse index, nothing changes.
+	git -C sparse-checkout ls-files >dense &&
+	git -C sparse-checkout ls-files --sparse >sparse &&
+	test_cmp dense sparse &&
+
+	# Set up a strange condition of having a file edit
+	# outside of the sparse-checkout cone. We want to verify
+	# that all modes handle this the same, and detect the
+	# modification.
+	write_script edit-content <<-\EOF &&
+	mkdir -p folder1 &&
+	echo content >>folder1/a
+	EOF
+	run_on_all ../edit-content &&
+
+	test_all_match git ls-files --modified &&
+
+	git -C sparse-index ls-files --sparse --modified >sparse-index-out &&
+	cat >expect <<-\EOF &&
+	folder1/a
+	EOF
+	test_cmp expect sparse-index-out &&
+
+	# Add folder1 to the sparse-checkout cone and
+	# check that ls-files shows the expanded files.
+	test_sparse_match git sparse-checkout add folder1 &&
+	test_all_match git ls-files --modified &&
+
+	test_all_match git ls-files &&
+	git -C sparse-index ls-files --sparse >actual &&
+
+	cat >expect <<-\EOF &&
+	a
+	before/
+	deep/
+	e
+	folder1-
+	folder1.x
+	folder1/0/0/0
+	folder1/0/1
+	folder1/a
+	folder10
+	folder2/
+	g
+	x/
+	z
+	EOF
+
+	test_cmp expect actual &&
+
+	# Double-check index expansion is avoided
+	ensure_not_expanded ls-files --sparse
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 68 - ls-files
+
+expecting success of 1092.69 'sparse index is not expanded: sparse-checkout': 
+	init_repos &&
+
+	ensure_not_expanded sparse-checkout set deep/deeper2 &&
+	ensure_not_expanded sparse-checkout set deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set deep &&
+	ensure_not_expanded sparse-checkout add folder1 &&
+	ensure_not_expanded sparse-checkout set deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set folder2 &&
+
+	# Demonstrate that the checks that "folder1/a" is a file
+	# do not cause a sparse-index expansion (since it is in the
+	# sparse-checkout cone).
+	echo >>sparse-index/folder2/a &&
+	git -C sparse-index add folder2/a &&
+
+	ensure_not_expanded sparse-checkout add folder1 &&
+
+	# Skip checks here, since deep/deeper1 is inside a sparse directory
+	# that must be expanded to check whether `deep/deeper1` is a file
+	# or not.
+	ensure_not_expanded sparse-checkout set --skip-checks deep/deeper1 &&
+	ensure_not_expanded sparse-checkout set
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 69 - sparse index is not expanded: sparse-checkout
+
+expecting success of 1092.70 'reset mixed and checkout orphan': 
+	init_repos &&
+
+	test_all_match git checkout rename-out-to-in &&
+
+	# Sparse checkouts do not agree with full checkouts about
+	# how to report a directory/file conflict during a reset.
+	# This command would fail with test_all_match because the
+	# full checkout reports "T folder1/0/1" while a sparse
+	# checkout reports "D folder1/0/1". This matches because
+	# the sparse checkouts skip "adding" the other side of
+	# the conflict.
+	test_sparse_match git reset --mixed HEAD~1 &&
+	test_sparse_match git ls-files --stage &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	# At this point, sparse-checkouts behave differently
+	# from the full-checkout.
+	test_sparse_match git checkout --orphan new-branch &&
+	test_sparse_match git ls-files --stage &&
+	test_sparse_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 70 - reset mixed and checkout orphan
+
+expecting success of 1092.71 'add everything with deep new file': 
+	init_repos &&
+
+	run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
+
+	run_on_all touch deep/deeper1/x &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 71 - add everything with deep new file
+
+expecting success of 1092.72 'checkout behaves oddly with df-conflict-1': 
+	init_repos &&
+
+	test_sparse_match git sparse-checkout disable &&
+
+	write_script edit-content <<-\EOF &&
+	echo content >>folder1/larger-content
+	git add folder1
+	EOF
+
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
+
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+
+	test_all_match git status --porcelain=v2 &&
+
+	# This checkout command should fail, because we have a staged
+	# change to folder1/larger-content, but the destination changes
+	# folder1 to a file.
+	git -C full-checkout checkout df-conflict-1 \
+		1>full-checkout-out \
+		2>full-checkout-err &&
+	git -C sparse-checkout checkout df-conflict-1 \
+		1>sparse-checkout-out \
+		2>sparse-checkout-err &&
+	git -C sparse-index checkout df-conflict-1 \
+		1>sparse-index-out \
+		2>sparse-index-err &&
+
+	# Instead, the checkout deletes the folder1 file and adds the
+	# folder1/larger-content file, leaving all other paths that were
+	# in folder1/ as deleted (without any warning).
+	cat >expect <<-EOF &&
+	D	folder1
+	A	folder1/larger-content
+	EOF
+	test_cmp expect full-checkout-out &&
+	test_cmp expect sparse-checkout-out &&
+
+	# The sparse-index reports no output
+	test_must_be_empty sparse-index-out &&
+
+	# stderr: Switched to branch df-conflict-1
+	test_cmp full-checkout-err sparse-checkout-err &&
+	test_cmp full-checkout-err sparse-checkout-err
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 72 - checkout behaves oddly with df-conflict-1
+
+expecting success of 1092.73 'checkout behaves oddly with df-conflict-2': 
+	init_repos &&
+
+	test_sparse_match git sparse-checkout disable &&
+
+	write_script edit-content <<-\EOF &&
+	echo content >>folder2/larger-content
+	git add folder2
+	EOF
+
+	run_on_all ../edit-content &&
+	test_all_match git status --porcelain=v2 &&
+
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+
+	test_all_match git status --porcelain=v2 &&
+
+	# This checkout command should fail, because we have a staged
+	# change to folder1/larger-content, but the destination changes
+	# folder1 to a file.
+	git -C full-checkout checkout df-conflict-2 \
+		1>full-checkout-out \
+		2>full-checkout-err &&
+	git -C sparse-checkout checkout df-conflict-2 \
+		1>sparse-checkout-out \
+		2>sparse-checkout-err &&
+	git -C sparse-index checkout df-conflict-2 \
+		1>sparse-index-out \
+		2>sparse-index-err &&
+
+	# The full checkout deviates from the df-conflict-1 case here!
+	# It drops the change to folder1/larger-content and leaves the
+	# folder1 path as-is on disk. The sparse-index behaves the same.
+	test_must_be_empty full-checkout-out &&
+	test_must_be_empty sparse-index-out &&
+
+	# In the sparse-checkout case, the checkout deletes the folder1
+	# file and adds the folder1/larger-content file, leaving all other
+	# paths that were in folder1/ as deleted (without any warning).
+	cat >expect <<-EOF &&
+	D	folder2
+	A	folder2/larger-content
+	EOF
+	test_cmp expect sparse-checkout-out &&
+
+	# Switched to branch df-conflict-1
+	test_cmp full-checkout-err sparse-checkout-err &&
+	test_cmp full-checkout-err sparse-index-err
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 73 - checkout behaves oddly with df-conflict-2
+
+expecting success of 1092.74 'mv directory from out-of-cone to in-cone': 
+	init_repos &&
+
+	# <source> as a sparse directory (or SKIP_WORKTREE_DIR without enabling
+	# sparse index).
+	test_all_match git mv --sparse folder1 deep &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match git ls-files -t &&
+	git -C sparse-checkout ls-files -t >actual &&
+	grep -e "H deep/folder1/0/0/0" actual &&
+	grep -e "H deep/folder1/0/1" actual &&
+	grep -e "H deep/folder1/a" actual &&
+
+	test_all_match git reset --hard &&
+
+	# <source> as a directory deeper than sparse index boundary (where
+	# sparse index will expand).
+	test_sparse_match git mv --sparse folder1/0 deep &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_sparse_match git ls-files -t &&
+	git -C sparse-checkout ls-files -t >actual &&
+	grep -e "H deep/0/0/0" actual &&
+	grep -e "H deep/0/1" actual
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+H deep/folder1/0/0/0
+H deep/folder1/0/1
+H deep/folder1/a
+H deep/0/0/0
+H deep/0/1
+ok 74 - mv directory from out-of-cone to in-cone
+
+expecting success of 1092.75 'rm pathspec inside sparse definition': 
+	init_repos &&
+
+	test_all_match git rm deep/a &&
+	test_all_match git status --porcelain=v2 &&
+
+	# test wildcard
+	run_on_all git reset --hard &&
+	test_all_match git rm deep/* &&
+	test_all_match git status --porcelain=v2 &&
+
+	# test recursive rm
+	run_on_all git reset --hard &&
+	test_all_match git rm -r deep &&
+	test_all_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 75 - rm pathspec inside sparse definition
+
+expecting success of 1092.76 'rm pathspec outside sparse definition': 
+	init_repos &&
+
+	for file in folder1/a folder1/0/1
+	do
+		test_sparse_match test_must_fail git rm $file &&
+		test_sparse_match test_must_fail git rm --cached $file &&
+		test_sparse_match git rm --sparse $file &&
+		test_sparse_match git status --porcelain=v2 || return 1
+	done &&
+
+	cat >folder1-full <<-EOF &&
+	rm ${SQ}folder1/0/0/0${SQ}
+	rm ${SQ}folder1/0/1${SQ}
+	rm ${SQ}folder1/a${SQ}
+	EOF
+
+	cat >folder1-sparse <<-EOF &&
+	rm ${SQ}folder1/${SQ}
+	EOF
+
+	# test wildcard
+	run_on_sparse git reset --hard &&
+	run_on_sparse git sparse-checkout reapply &&
+	test_sparse_match test_must_fail git rm folder1/* &&
+	run_on_sparse git rm --sparse folder1/* &&
+	test_cmp folder1-full sparse-checkout-out &&
+	test_cmp folder1-sparse sparse-index-out &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	# test recursive rm
+	run_on_sparse git reset --hard &&
+	run_on_sparse git sparse-checkout reapply &&
+	test_sparse_match test_must_fail git rm --sparse folder1 &&
+	run_on_sparse git rm --sparse -r folder1 &&
+	test_cmp folder1-full sparse-checkout-out &&
+	test_cmp folder1-sparse sparse-index-out &&
+	test_sparse_match git status --porcelain=v2
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 76 - rm pathspec outside sparse definition
+
+expecting success of 1092.77 'rm pathspec expands index when necessary': 
+	init_repos &&
+
+	# in-cone pathspec (do not expand)
+	ensure_not_expanded rm "deep/deep*" &&
+	test_must_be_empty sparse-index-err &&
+
+	# out-of-cone pathspec (expand)
+	! ensure_not_expanded rm --sparse "folder1/a*" &&
+	test_must_be_empty sparse-index-err &&
+
+	# pathspec that should expand index
+	! ensure_not_expanded rm "*/a" &&
+	test_must_be_empty sparse-index-err &&
+
+	! ensure_not_expanded rm "**a" &&
+	test_must_be_empty sparse-index-err
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20250317T132027.562010Z-H5c947e1c-P002f4323","thread":"main","time":"2025-03-17T13:20:27.563251Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132027.562010Z-H5c947e1c-P002f4323","thread":"main","time":"2025-03-17T13:20:27.564580Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132027.654642Z-H5c947e1c-P002f4361","thread":"main","time":"2025-03-17T13:20:27.655535Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132027.654642Z-H5c947e1c-P002f4361","thread":"main","time":"2025-03-17T13:20:27.665821Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132027.734599Z-H5c947e1c-P002f4398","thread":"main","time":"2025-03-17T13:20:27.735427Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132027.734599Z-H5c947e1c-P002f4398","thread":"main","time":"2025-03-17T13:20:27.736739Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 77 - rm pathspec expands index when necessary
+
+expecting success of 1092.78 'sparse index is not expanded: rm': 
+	init_repos &&
+
+	ensure_not_expanded rm deep/a &&
+
+	# test in-cone wildcard
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm deep/* &&
+
+	# test recursive rm
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm -r deep
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 78 - sparse index is not expanded: rm
+
+expecting success of 1092.79 'grep with and --cached': 
+	init_repos &&
+
+	test_all_match git grep --cached a &&
+	test_all_match git grep --cached a -- "folder1/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 79 - grep with and --cached
+
+expecting success of 1092.80 'grep is not expanded': 
+	init_repos &&
+
+	ensure_not_expanded grep a &&
+	ensure_not_expanded grep a -- deep/* &&
+
+	# All files within the folder1/* pathspec are sparse,
+	# so this command does not find any matches
+	ensure_not_expanded ! grep a -- folder1/* &&
+
+	# test out-of-cone pathspec with or without wildcard
+	ensure_not_expanded grep --cached a -- "folder1/a" &&
+	ensure_not_expanded grep --cached a -- "folder1/*" &&
+
+	# test in-cone pathspec with or without wildcard
+	ensure_not_expanded grep --cached a -- "deep/a" &&
+	ensure_not_expanded grep --cached a -- "deep/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 80 - grep is not expanded
+
+checking known breakage of 1092.81 'grep within submodules is not expanded': 
+	init_repos_as_submodules &&
+
+	# do not use ensure_not_expanded() here, because `grep` should be
+	# run in the superproject, not in "./sparse-index"
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
+	test_region ! index ensure_full_index trace2.txt
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Adding existing repo at 'full-checkout' to the index
+Adding existing repo at 'sparse-checkout' to the index
+Adding existing repo at 'sparse-index' to the index
+ 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
+hint: The sparse index is expanding to a full index, a slow operation.
+hint: Your working directory likely has contents that are outside of
+hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
+hint: see your sparse-checkout definition and compare it to your working
+hint: directory contents. Running 'git clean' may assist in this cleanup.
+hint: Disable this message with "git config set advice.sparseIndexExpanded false"
+full-checkout/folder1/a:a
+sparse-checkout/folder1/a:a
+sparse-index/folder1/a:a
+{"event":"region_enter","sid":"20250317T132032.860034Z-H5c947e1c-P002f543b","thread":"main","time":"2025-03-17T13:20:32.878992Z","file":"sparse-index.c","line":372,"repo":4,"nesting":2,"category":"index","label":"ensure_full_index"}
+not ok 81 - grep within submodules is not expanded # TODO known breakage
+
+expecting success of 1092.82 'grep sparse directory within submodules': 
+	init_repos_as_submodules &&
+
+	cat >expect <<-\EOF &&
+	full-checkout/folder1/a:a
+	sparse-checkout/folder1/a:a
+	sparse-index/folder1/a:a
+	EOF
+	git grep --cached --recurse-submodules a -- "*/folder1/*" >actual &&
+	test_cmp actual expect
+
+warning: unable to rmdir 'full-checkout': Directory not empty
+warning: unable to rmdir 'sparse-checkout': Directory not empty
+warning: unable to rmdir 'sparse-index': Directory not empty
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Adding existing repo at 'full-checkout' to the index
+Adding existing repo at 'sparse-checkout' to the index
+Adding existing repo at 'sparse-index' to the index
+ 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
+hint: The sparse index is expanding to a full index, a slow operation.
+hint: Your working directory likely has contents that are outside of
+hint: your sparse-checkout patterns. Use 'git sparse-checkout list' to
+hint: see your sparse-checkout definition and compare it to your working
+hint: directory contents. Running 'git clean' may assist in this cleanup.
+hint: Disable this message with "git config set advice.sparseIndexExpanded false"
+ok 82 - grep sparse directory within submodules
+
+expecting success of 1092.83 'write-tree': 
+	init_repos &&
+
+	test_all_match git write-tree &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
+
+	# make a change inside the sparse cone
+	run_on_all ../edit-contents deep/a &&
+	test_all_match git update-index deep/a &&
+	test_all_match git write-tree &&
+	test_all_match git status --porcelain=v2 &&
+
+	# make a change outside the sparse cone
+	run_on_all mkdir -p folder1 &&
+	run_on_all cp a folder1/a &&
+	run_on_all ../edit-contents folder1/a &&
+	test_all_match git update-index folder1/a &&
+	test_all_match git write-tree &&
+	test_all_match git status --porcelain=v2 &&
+
+	# check that SKIP_WORKTREE files are not materialized
+	test_path_is_missing sparse-checkout/folder2/a &&
+	test_path_is_missing sparse-index/folder2/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 83 - write-tree
+
+expecting success of 1092.84 'sparse-index is not expanded: write-tree': 
+	init_repos &&
+
+	ensure_not_expanded write-tree &&
+
+	echo "test1" >>sparse-index/a &&
+	git -C sparse-index update-index a &&
+	ensure_not_expanded write-tree
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 84 - sparse-index is not expanded: write-tree
+
+expecting success of 1092.85 'diff-files with pathspec inside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
+
+	run_on_all ../edit-contents deep/a &&
+
+	test_all_match git diff-files &&
+
+	test_all_match git diff-files -- deep/a &&
+
+	# test wildcard
+	test_all_match git diff-files -- "deep/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 85 - diff-files with pathspec inside sparse definition
+
+expecting success of 1092.86 'diff-files with pathspec outside sparse definition': 
+	init_repos &&
+
+	test_sparse_match git diff-files -- folder2/a &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
+
+	# The directory "folder1" is outside the cone of interest
+	# and will not exist in the sparse checkout repositories.
+	# Create it as needed, add file "folder1/a" there with
+	# contents that is different from the staged version.
+	run_on_all mkdir -p folder1 &&
+	run_on_all cp a folder1/a &&
+
+	run_on_all ../edit-contents folder1/a &&
+	test_all_match git diff-files &&
+	test_all_match git diff-files -- folder1/a &&
+	test_all_match git diff-files -- "folder*/a"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 86 - diff-files with pathspec outside sparse definition
+
+expecting success of 1092.87 'sparse index is not expanded: diff-files': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
+
+	run_on_all ../edit-contents deep/a &&
+
+	ensure_not_expanded diff-files &&
+	ensure_not_expanded diff-files -- deep/a &&
+	ensure_not_expanded diff-files -- "deep/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 87 - sparse index is not expanded: diff-files
+
+expecting success of 1092.88 'diff-tree': 
+	init_repos &&
+
+	# Test change inside sparse cone
+	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
+	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
+	test_all_match git diff-tree $tree1 $tree2 &&
+	test_all_match git diff-tree $tree1 $tree2 -- deep/a &&
+	test_all_match git diff-tree HEAD update-deep &&
+	test_all_match git diff-tree HEAD update-deep -- deep/a &&
+
+	# Test change outside sparse cone
+	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
+	test_all_match git diff-tree $tree1 $tree3 &&
+	test_all_match git diff-tree $tree1 $tree3 -- folder1/a &&
+	test_all_match git diff-tree HEAD update-folder1 &&
+	test_all_match git diff-tree HEAD update-folder1 -- folder1/a &&
+
+	# Check that SKIP_WORKTREE files are not materialized
+	test_path_is_missing sparse-checkout/folder1/a &&
+	test_path_is_missing sparse-index/folder1/a &&
+	test_path_is_missing sparse-checkout/folder2/a &&
+	test_path_is_missing sparse-index/folder2/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 88 - diff-tree
+
+expecting success of 1092.89 'sparse-index is not expanded: diff-tree': 
+	init_repos &&
+
+	tree1=$(git -C sparse-index rev-parse HEAD^{tree}) &&
+	tree2=$(git -C sparse-index rev-parse update-deep^{tree}) &&
+	tree3=$(git -C sparse-index rev-parse update-folder1^{tree}) &&
+
+	ensure_not_expanded diff-tree $tree1 $tree2 &&
+	ensure_not_expanded diff-tree $tree1 $tree2 -- deep/a &&
+	ensure_not_expanded diff-tree HEAD update-deep &&
+	ensure_not_expanded diff-tree HEAD update-deep -- deep/a &&
+	ensure_not_expanded diff-tree $tree1 $tree3 &&
+	ensure_not_expanded diff-tree $tree1 $tree3 -- folder1/a &&
+	ensure_not_expanded diff-tree HEAD update-folder1 &&
+	ensure_not_expanded diff-tree HEAD update-folder1 -- folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 89 - sparse-index is not expanded: diff-tree
+
+expecting success of 1092.90 'worktree': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>"$1"
+	EOF
+
+	for repo in full-checkout sparse-checkout sparse-index
+	do
+		worktree=${repo}-wt &&
+		git -C $repo worktree add ../$worktree &&
+
+		# Compare worktree content with "ls"
+		(cd $repo && ls) >worktree_contents &&
+		(cd $worktree && ls) >new_worktree_contents &&
+		test_cmp worktree_contents new_worktree_contents &&
+
+		# Compare index content with "ls-files --sparse"
+		git -C $repo ls-files --sparse >index_contents &&
+		git -C $worktree ls-files --sparse >new_index_contents &&
+		test_cmp index_contents new_index_contents &&
+
+		git -C $repo worktree remove ../$worktree || return 1
+	done &&
+
+	test_all_match git worktree add .worktrees/hotfix &&
+	run_on_all ../edit-contents .worktrees/hotfix/deep/a &&
+	test_all_match test_must_fail git worktree remove .worktrees/hotfix
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'full-checkout-wt')
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'sparse-checkout-wt')
+HEAD is now at 703fd3e initial commit
+Preparing worktree (new branch 'sparse-index-wt')
+HEAD is now at 703fd3e initial commit
+ok 90 - worktree
+
+expecting success of 1092.91 'worktree is not expanded': 
+	init_repos &&
+
+	ensure_not_expanded worktree add .worktrees/hotfix &&
+	ensure_not_expanded worktree remove .worktrees/hotfix
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 91 - worktree is not expanded
+
+expecting success of 1092.92 'check-attr with pathspec inside sparse definition': 
+	init_repos &&
+
+	echo "a -crlf myAttr" >>.gitattributes &&
+	run_on_all cp ../.gitattributes ./deep &&
+
+	test_all_match git check-attr -a -- deep/a &&
+
+	test_all_match git add deep/.gitattributes &&
+	test_all_match git check-attr -a --cached -- deep/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 92 - check-attr with pathspec inside sparse definition
+
+expecting success of 1092.93 'check-attr with pathspec outside sparse definition': 
+	init_repos &&
+
+	echo "a -crlf myAttr" >>.gitattributes &&
+	run_on_sparse mkdir folder1 &&
+	run_on_all cp ../.gitattributes ./folder1 &&
+	run_on_all cp a folder1/a &&
+
+	test_all_match git check-attr -a -- folder1/a &&
+
+	git -C full-checkout add folder1/.gitattributes &&
+	test_sparse_match git add --sparse folder1/.gitattributes &&
+	test_all_match git commit -m "add .gitattributes" &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git check-attr -a --cached -- folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 93 - check-attr with pathspec outside sparse definition
+
+checking known breakage of 1092.94 'diff --check with pathspec outside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo "a " >"$1"
+	EOF
+
+	test_all_match git config core.whitespace -trailing-space,-space-before-tab &&
+
+	echo "a whitespace=trailing-space,space-before-tab" >>.gitattributes &&
+	run_on_all mkdir -p folder1 &&
+	run_on_all cp ../.gitattributes ./folder1 &&
+	test_all_match git add --sparse folder1/.gitattributes &&
+	run_on_all ../edit-contents folder1/a &&
+	test_all_match git add --sparse folder1/a &&
+
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match test_must_fail git diff --check --cached -- folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+test_must_fail: command succeeded: git diff --check --cached -- folder1/a
+not ok 94 - diff --check with pathspec outside sparse definition # TODO known breakage
+
+expecting success of 1092.95 'sparse-index is not expanded: check-attr': 
+	init_repos &&
+
+	echo "a -crlf myAttr" >>.gitattributes &&
+	mkdir ./sparse-index/folder1 &&
+	cp ./sparse-index/a ./sparse-index/folder1/a &&
+	cp .gitattributes ./sparse-index/deep &&
+	cp .gitattributes ./sparse-index/folder1 &&
+
+	git -C sparse-index add deep/.gitattributes &&
+	git -C sparse-index add --sparse folder1/.gitattributes &&
+	ensure_not_expanded check-attr -a --cached -- deep/a &&
+	ensure_not_expanded check-attr -a --cached -- folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 95 - sparse-index is not expanded: check-attr
+
+expecting success of 1092.96 'advice.sparseIndexExpanded': 
+	init_repos &&
+
+	git -C sparse-index config --unset advice.sparseIndexExpanded &&
+	git -C sparse-index sparse-checkout set deep/deeper1 &&
+	mkdir -p sparse-index/deep/deeper2/deepest &&
+	touch sparse-index/deep/deeper2/deepest/bogus &&
+	git -C sparse-index status 2>err &&
+	grep "The sparse index is expanding to a full index" err &&
+
+	git -C sparse-index sparse-checkout disable 2>err &&
+	test_line_count = 0 err
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+On branch base
+You are in a sparse checkout with 49% of tracked files present.
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	deep/deeper2/deepest/
+
+nothing added to commit but untracked files present (use "git add" to track)
+hint: The sparse index is expanding to a full index, a slow operation.
+ok 96 - advice.sparseIndexExpanded
+
+expecting success of 1092.97 'cat-file -p': 
+	init_repos &&
+	echo "new content" >>full-checkout/deep/a &&
+	echo "new content" >>sparse-checkout/deep/a &&
+	echo "new content" >>sparse-index/deep/a &&
+	run_on_all git add deep/a &&
+
+	test_all_match git cat-file -p :deep/a &&
+	ensure_not_expanded cat-file -p :deep/a &&
+	test_all_match git cat-file -p :folder1/a &&
+	ensure_expanded cat-file -p :folder1/a
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20250317T132055.401518Z-H5c947e1c-P002f97c1","thread":"main","time":"2025-03-17T13:20:55.402435Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T132055.401518Z-H5c947e1c-P002f97c1","thread":"main","time":"2025-03-17T13:20:55.403201Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000766,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 97 - cat-file -p
+
+expecting success of 1092.98 'cat-file --batch': 
+	init_repos &&
+	echo "new content" >>full-checkout/deep/a &&
+	echo "new content" >>sparse-checkout/deep/a &&
+	echo "new content" >>sparse-index/deep/a &&
+	run_on_all git add deep/a &&
+
+	echo ":deep/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_not_expanded cat-file --batch <in &&
+
+	echo ":folder1/a" >in &&
+	test_all_match git cat-file --batch <in &&
+	ensure_expanded cat-file --batch <in &&
+
+	cat >in <<-\EOF &&
+	:deep/a
+	:folder1/a
+	EOF
+	test_all_match git cat-file --batch <in &&
+	ensure_expanded cat-file --batch <in
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+{"event":"region_enter","sid":"20250317T132056.688355Z-H5c947e1c-P002f9ad3","thread":"main","time":"2025-03-17T13:20:56.693831Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T132056.688355Z-H5c947e1c-P002f9ad3","thread":"main","time":"2025-03-17T13:20:56.694574Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000743,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132057.065541Z-H5c947e1c-P002f9bad","thread":"main","time":"2025-03-17T13:20:57.066555Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T132057.065541Z-H5c947e1c-P002f9bad","thread":"main","time":"2025-03-17T13:20:57.067257Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000702,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 98 - cat-file --batch
+
+# still have 2 known breakage(s)
+# passed all remaining 96 test(s)
+1..98
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3404-rebase-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3404-rebase-interactive/.git/
+expecting success of 3404.1 'setup': 
+	git switch -C primary &&
+	test_commit A file1 &&
+	test_commit B file1 &&
+	test_commit C file2 &&
+	test_commit D file1 &&
+	test_commit E file3 &&
+	git checkout -b branch1 A &&
+	test_commit F file4 &&
+	test_commit G file1 &&
+	test_commit H file5 &&
+	git checkout -b branch2 F &&
+	test_commit I file6 &&
+	git checkout -b conflict-branch A &&
+	test_commit one conflict &&
+	test_commit two conflict &&
+	test_commit three conflict &&
+	test_commit four conflict &&
+	git checkout -b no-conflict-branch A &&
+	test_commit J fileJ &&
+	test_commit K fileK &&
+	test_commit L fileL &&
+	test_commit M fileM &&
+	git checkout -b no-ff-branch A &&
+	test_commit N fileN &&
+	test_commit O fileO &&
+	test_commit P fileP
+
+Switched to a new branch 'primary'
+[primary (root-commit) 6e62bf8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[primary 313fe96] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[primary d0f65f2] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[primary 0547e3f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[primary 8f99a4f] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+Switched to a new branch 'branch1'
+[branch1 cfefd94] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[branch1 83751a6] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch1 4373208] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+Switched to a new branch 'branch2'
+[branch2 615be62] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+Switched to a new branch 'conflict-branch'
+[conflict-branch b895952] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict
+[conflict-branch 766a798] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch 1eadf03] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict-branch f91a2b3] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'no-conflict-branch'
+[no-conflict-branch 808874f] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileJ
+[no-conflict-branch 265b89e] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileK
+[no-conflict-branch 6b0f5e6] L
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileL
+[no-conflict-branch 3389558] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileM
+Switched to a new branch 'no-ff-branch'
+[no-ff-branch 53b4423] N
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileN
+[no-ff-branch cc47714] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileO
+[no-ff-branch faef1a5] P
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileP
+ok 1 - setup
+
+expecting success of 3404.2 'rebase --keep-empty': 
+	git checkout -b emptybranch primary &&
+	git commit --allow-empty -m "empty" &&
+	git rebase --keep-empty -i HEAD~2 &&
+	git log --oneline >actual &&
+	test_line_count = 6 actual
+
+Switched to a new branch 'emptybranch'
+[emptybranch da33401] empty
+ Author: A U Thor <author@example.com>
+Successfully rebased and updated refs/heads/emptybranch.
+ok 2 - rebase --keep-empty
+
+expecting success of 3404.3 'rebase -i with empty todo list': 
+	cat >expect <<-\EOF &&
+	error: nothing to do
+	EOF
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="#" \
+			git rebase -i HEAD^ >output 2>&1
+	) &&
+	tail -n 1 output >actual &&  # Ignore output about changing todo list
+	test_cmp expect actual
+
+ok 3 - rebase -i with empty todo list
+
+expecting success of 3404.4 'rebase -i with the exec command': 
+	git checkout primary &&
+	(
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-one
+		2 exec_>touch-two exec_false exec_>touch-three
+		3 4 exec_>\"touch-file__name_with_spaces\";_>touch-after-semicolon 5" &&
+	export FAKE_LINES &&
+	test_must_fail git rebase -i A
+	) &&
+	test_path_is_file touch-one &&
+	test_path_is_file touch-two &&
+	# Missing because we should have stopped by now.
+	test_path_is_missing touch-three &&
+	test_cmp_rev C HEAD &&
+	git rebase --continue &&
+	test_path_is_file touch-three &&
+	test_path_is_file "touch-file  name with spaces" &&
+	test_path_is_file touch-after-semicolon &&
+	test_cmp_rev primary HEAD &&
+	rm -f touch-*
+
+Switched to branch 'primary'
+rebase -i script before editing:
+pick 313fe96 B
+pick d0f65f2 C
+pick 0547e3f D
+pick 8f99a4f E
+
+rebase -i script after editing:
+pick 313fe96 B
+exec >touch-one
+pick d0f65f2 C
+exec >touch-two
+exec false
+exec >touch-three
+pick 0547e3f D
+pick 8f99a4f E
+exec >"touch-file  name with spaces"; >touch-after-semicolon
+Rebasing (2/9)
Executing: >touch-one
+Rebasing (3/9)
Rebasing (4/9)
Executing: >touch-two
+Rebasing (5/9)
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+Rebasing (6/9)
Executing: >touch-three
+Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Executing: >"touch-file  name with spaces"; >touch-after-semicolon
+Successfully rebased and updated refs/heads/primary.
+ok 4 - rebase -i with the exec command
+
+expecting success of 3404.5 'rebase -i with the exec command runs from tree root': 
+	git checkout primary &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 exec_>touch-subdir" \
+		git rebase -i HEAD^
+	) &&
+	test_path_is_file touch-subdir &&
+	rm -fr subdir
+
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
+
+rebase -i script after editing:
+pick 8f99a4f E
+exec >touch-subdir
+Rebasing (2/2)
Executing: >touch-subdir
+Successfully rebased and updated refs/heads/primary.
+ok 5 - rebase -i with the exec command runs from tree root
+
+expecting success of 3404.6 'rebase -i with exec allows git commands in subdirs': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "git rebase --abort ||:" &&
+	git checkout primary &&
+	mkdir subdir && (cd subdir &&
+	set_fake_editor &&
+	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
+		git rebase -i HEAD^
+	)
+
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
+
+rebase -i script after editing:
+pick 8f99a4f E
+x cd subdir && git rev-parse --is-inside-work-tree
+Rebasing (2/2)
Executing: cd subdir && git rev-parse --is-inside-work-tree
+true
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 6 - rebase -i with exec allows git commands in subdirs
+
+expecting success of 3404.7 'rebase -i sets work tree properly': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "test_might_fail git rebase --abort" &&
+	mkdir subdir &&
+	git rebase -x "(cd subdir && git rev-parse --show-toplevel)" HEAD^ \
+		>actual &&
+	! grep "/subdir$" actual
+
+Rebasing (2/2)
Executing: (cd subdir && git rev-parse --show-toplevel)
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 7 - rebase -i sets work tree properly
+
+expecting success of 3404.8 'rebase -i with the exec command checks tree cleanness': 
+	git checkout primary &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
+			git rebase -i HEAD^
+	) &&
+	test_cmp_rev primary^ HEAD &&
+	git reset --hard &&
+	git rebase --continue
+
+Already on 'primary'
+rebase -i script before editing:
+pick 8f99a4f E
+
+rebase -i script after editing:
+exec echo foo >file1
+pick 8f99a4f E
+Rebasing (1/2)
Executing: echo foo >file1
+error: cannot rebase: You have unstaged changes.
+warning: execution succeeded: echo foo >file1
+but left changes to the index and/or the working tree.
+Commit or stash your changes, and then run
+
+  git rebase --continue
+
+
+HEAD is now at 0547e3f D
+Rebasing (2/2)
Successfully rebased and updated refs/heads/primary.
+ok 8 - rebase -i with the exec command checks tree cleanness
+
+expecting success of 3404.9 'cherry-pick works with rebase --exec': 
+	test_when_finished "git cherry-pick --abort; \
+			    git rebase --abort; \
+			    git checkout primary" &&
+	echo "exec git cherry-pick G" >todo &&
+	(
+		set_replace_editor todo &&
+		test_must_fail git rebase -i D D
+	) &&
+	test_cmp_rev G CHERRY_PICK_HEAD
+
+rebase -i script after editing:
+exec git cherry-pick G
+Rebasing (1/1)
Executing: git cherry-pick G
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 83751a6... G
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+file1: needs merge
+error: cannot rebase: You have unstaged changes.
+error: additionally, your index contains uncommitted changes.
+warning: execution failed: git cherry-pick G
+and made changes to the index and/or the working tree.
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+Previous HEAD position was 0547e3f D
+Switched to branch 'primary'
+ok 9 - cherry-pick works with rebase --exec
+
+expecting success of 3404.10 'rebase -x with empty command fails': 
+	test_when_finished "git rebase --abort ||:" &&
+	test_must_fail env git rebase -x "" @ 2>actual &&
+	test_write_lines "error: empty exec command" >expected &&
+	test_cmp expected actual &&
+	test_must_fail env git rebase -x " " @ 2>actual &&
+	test_cmp expected actual
+
+fatal: no rebase in progress
+ok 10 - rebase -x with empty command fails
+
+expecting success of 3404.11 'rebase -x with newline in command fails': 
+	test_when_finished "git rebase --abort ||:" &&
+	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
+	test_write_lines "error: exec commands cannot contain newlines" \
+			 >expected &&
+	test_cmp expected actual
+
+fatal: no rebase in progress
+ok 11 - rebase -x with newline in command fails
+
+expecting success of 3404.12 'rebase -i with exec of inexistent command': 
+	git checkout primary &&
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
+			git rebase -i HEAD^ >actual 2>&1
+	) &&
+	! grep "Maybe git-rebase is broken" actual
+
+Already on 'primary'
+ok 12 - rebase -i with exec of inexistent command
+
+expecting success of 3404.13 'implicit interactive rebase does not invoke sequence editor': 
+	test_when_finished "git rebase --abort ||:" &&
+	GIT_SEQUENCE_EDITOR="echo bad >" git rebase -x"echo one" @^
+
+Rebasing (2/2)
Executing: echo one
+one
+Successfully rebased and updated refs/heads/primary.
+fatal: no rebase in progress
+ok 13 - implicit interactive rebase does not invoke sequence editor
+
+expecting success of 3404.14 'no changes are a nop': 
+	git checkout branch2 &&
+	git rebase -i F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test_cmp_rev I HEAD
+
+Switched to branch 'branch2'
+Successfully rebased and updated refs/heads/branch2.
+ok 14 - no changes are a nop
+
+expecting success of 3404.15 'test the [branch] option': 
+	git checkout -b dead-end &&
+	git rm file6 &&
+	git commit -m "stop here" &&
+	git rebase -i F branch2 &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD
+
+Switched to a new branch 'dead-end'
+rm 'file6'
+[dead-end f814f58] stop here
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file6
+Successfully rebased and updated refs/heads/branch2.
+ok 15 - test the [branch] option
+
+expecting success of 3404.16 'test --onto <branch>': 
+	git checkout -b test-onto branch2 &&
+	git rebase -i --onto branch1 F &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
+	test_cmp_rev HEAD^ branch1 &&
+	test_cmp_rev I branch2
+
+Switched to a new branch 'test-onto'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/test-onto.
+ok 16 - test --onto <branch>
+
+expecting success of 3404.17 'rebase on top of a non-conflicting commit': 
+	git checkout branch1 &&
+	git tag original-branch1 &&
+	git rebase -i branch2 &&
+	test file6 = $(git diff --name-only original-branch1) &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD~2
+
+Switched to branch 'branch1'
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 17 - rebase on top of a non-conflicting commit
+
+expecting success of 3404.18 'reflog for the branch shows state before rebase': 
+	test_cmp_rev branch1@{1} original-branch1
+
+ok 18 - reflog for the branch shows state before rebase
+
+expecting success of 3404.19 'reflog for the branch shows correct finish message': 
+	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
+		"$(git rev-parse branch2)" >expected &&
+	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
+	test_cmp expected actual
+
+ok 19 - reflog for the branch shows correct finish message
+
+expecting success of 3404.20 'exchange two commits': 
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
+	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
+	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
+	blob1=$(git rev-parse --short HEAD^:file1) &&
+	blob2=$(git rev-parse --short HEAD:file1) &&
+	commit=$(git rev-parse --short HEAD)
+
+rebase -i script before editing:
+pick ae8f65e G
+pick f5f5249 H
+
+rebase -i script after editing:
+pick f5f5249 H
+pick ae8f65e G
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/branch1.
+ok 20 - exchange two commits
+
+expecting success of 3404.21 'stop on conflicting pick': 
+	cat >expect <<-EOF &&
+	diff --git a/file1 b/file1
+	index $blob1..$blob2 100644
+	--- a/file1
+	+++ b/file1
+	@@ -1 +1 @@
+	-A
+	+G
+	EOF
+	cat >expect2 <<-EOF &&
+	<<<<<<< HEAD
+	D
+	=======
+	G
+	>>>>>>> $commit (G)
+	EOF
+	git tag new-branch1 &&
+	test_must_fail git rebase -i primary &&
+	test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
+	test_cmp expect .git/rebase-merge/patch &&
+	test_cmp expect2 file1 &&
+	test "$(git diff --name-status |
+		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
+	grep -v "^#" <.git/rebase-merge/done >actual &&
+	test_line_count = 4 actual &&
+	test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
+
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+error: could not apply 5d18e54... G
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 5d18e54... G
+ok 21 - stop on conflicting pick
+
+expecting success of 3404.22 'show conflicted patch': 
+	GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
+	grep "show.*REBASE_HEAD" stderr &&
+	# the original stopped-sha1 is abbreviated
+	stopped_sha1="$(git rev-parse $(cat ".git/rebase-merge/stopped-sha"))" &&
+	test "$(git rev-parse REBASE_HEAD)" = "$stopped_sha1"
+
+trace: run_command: git show REBASE_HEAD --
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 22 - show conflicted patch
+
+expecting success of 3404.23 'abort': 
+	git rebase --abort &&
+	test_cmp_rev new-branch1 HEAD &&
+	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
+	test_path_is_missing .git/rebase-merge
+
+ok 23 - abort
+
+expecting success of 3404.24 'abort with error when new base cannot be checked out': 
+	git rm --cached file1 &&
+	git commit -m "remove file in base" &&
+	test_must_fail git rebase -i primary > output 2>&1 &&
+	test_grep "The following untracked working tree files would be overwritten by checkout:" \
+		output &&
+	test_grep "file1" output &&
+	test_path_is_missing .git/rebase-merge &&
+	rm file1 &&
+	git reset --hard HEAD^
+
+rm 'file1'
+[branch1 2dd5570] remove file in base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+error: The following untracked working tree files would be overwritten by checkout:
+	file1
+HEAD is now at 5d18e54 G
+ok 24 - abort with error when new base cannot be checked out
+
+expecting success of 3404.25 'retain authorship': 
+	echo A > file7 &&
+	git add file7 &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
+	git tag twerp &&
+	git rebase -i --onto primary HEAD^ &&
+	git show HEAD >actual &&
+	grep "^Author: Twerp Snog" actual
+
+[branch1 2596307] different author
+ Author: Twerp Snog <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file7
+Rebasing (1/1)
Successfully rebased and updated refs/heads/branch1.
+Author: Twerp Snog <author@example.com>
+ok 25 - retain authorship
+
+expecting success of 3404.26 'retain authorship w/ conflicts': 
+	oGIT_AUTHOR_NAME=$GIT_AUTHOR_NAME &&
+	test_when_finished "GIT_AUTHOR_NAME=\$oGIT_AUTHOR_NAME" &&
+
+	git reset --hard twerp &&
+	test_commit a conflict a conflict-a &&
+	git reset --hard twerp &&
+
+	GIT_AUTHOR_NAME=AttributeMe &&
+	export GIT_AUTHOR_NAME &&
+	test_commit b conflict b conflict-b &&
+	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
+
+	test_must_fail git rebase -i conflict-a &&
+	echo resolved >conflict &&
+	git add conflict &&
+	git rebase --continue &&
+	test_cmp_rev conflict-a^0 HEAD^ &&
 	git show >out &&
 	grep AttributeMe out
 
@@ -169372,6 +169096,351 @@
 1..132
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3303-notes-subtrees/.git/
+expecting success of 3303.1 'setup: create 100 commits': 
+
+	(
+		nr=0 &&
+		while [ $nr -lt $number_of_commits ]; do
+			nr=$(($nr+1)) &&
+			test_tick &&
+			cat <<INPUT_END || return 1
+commit refs/heads/main
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+commit #$nr
+COMMIT
+
+M 644 inline file
+data <<EOF
+file in commit #$nr
+EOF
+
+INPUT_END
+
+		done &&
+		test_tick &&
+		cat <<INPUT_END
+commit refs/notes/commits
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+no notes
+COMMIT
+
+deleteall
+
+INPUT_END
+
+	) |
+	git fast-import --quiet &&
+	git config core.notesRef refs/notes/commits
+
+ok 1 - setup: create 100 commits
+
+expecting success of 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
+ok 2 - test notes in 2/38-fanout
+
+expecting success of 3303.3 'verify notes in 2/38-fanout': verify_notes
+ok 3 - verify notes in 2/38-fanout
+
+expecting success of 3303.4 'test notes in 2/2/36-fanout': test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
+ok 4 - test notes in 2/2/36-fanout
+
+expecting success of 3303.5 'verify notes in 2/2/36-fanout': verify_notes
+ok 5 - verify notes in 2/2/36-fanout
+
+expecting success of 3303.6 'test notes in 2/2/2/34-fanout': test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
+ok 6 - test notes in 2/2/2/34-fanout
+
+expecting success of 3303.7 'verify notes in 2/2/2/34-fanout': verify_notes
+ok 7 - verify notes in 2/2/2/34-fanout
+
+expecting success of 3303.8 'test same notes in no fanout and 2/38-fanout': test_same_notes "s|^..|&/|" ""
+ok 8 - test same notes in no fanout and 2/38-fanout
+
+expecting success of 3303.9 'verify same notes in no fanout and 2/38-fanout': verify_notes
+ok 9 - verify same notes in no fanout and 2/38-fanout
+
+expecting success of 3303.10 'test same notes in no fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 10 - test same notes in no fanout and 2/2/36-fanout
+
+expecting success of 3303.11 'verify same notes in no fanout and 2/2/36-fanout': verify_notes
+ok 11 - verify same notes in no fanout and 2/2/36-fanout
+
+expecting success of 3303.12 'test same notes in 2/38-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success of 3303.13 'verify same notes in 2/38-fanout and 2/2/36-fanout': verify_notes
+ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success of 3303.14 'test same notes in 2/2/2/34-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
+ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout
+
+expecting success of 3303.15 'verify same notes in 2/2/2/34-fanout and 2/2/36-fanout': verify_notes
+ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
+
+expecting success of 3303.16 'test notes in no fanout concatenated with 2/38-fanout': test_concatenated_notes "s|^..|&/|" ""
+ok 16 - test notes in no fanout concatenated with 2/38-fanout
+
+expecting success of 3303.17 'verify notes in no fanout concatenated with 2/38-fanout': verify_concatenated_notes
+ok 17 - verify notes in no fanout concatenated with 2/38-fanout
+
+expecting success of 3303.18 'test notes in no fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.19 'verify notes in no fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
+ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.20 'test notes in 2/38-fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.21 'verify notes in 2/38-fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
+ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.22 'test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': test_concatenated_notes "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|" "s|^\(..\)\(..\)|\1/\2/|"
+ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
+
+expecting success of 3303.23 'verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': verify_concatenated_notes
+ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3509-cherry-pick-merge-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3509-cherry-pick-merge-df/.git/
+expecting success of 3509.1 'Initialize repository': 
+	mkdir a &&
+	>a/f &&
+	git add a &&
+	git commit -m a
+
+[main (root-commit) 8938fef] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/f
+ok 1 - Initialize repository
+
+expecting success of 3509.2 'Setup rename across paths each below D/F conflicts': 
+	mkdir b &&
+	test_ln_s_add ../a b/a &&
+	git commit -m b &&
+
+	git checkout -b branch &&
+	rm b/a &&
+	git mv a b/a &&
+	test_ln_s_add b/a a &&
+	git commit -m swap &&
+
+	>f1 &&
+	git add f1 &&
+	git commit -m f1
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[main 6c20241] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 b/a
+Switched to a new branch 'branch'
+[branch 138a745] swap
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 120000 a
+ delete mode 120000 b/a
+ rename {a => b/a}/f (100%)
+[branch b71b76f] f1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 2 - Setup rename across paths each below D/F conflicts
+
+expecting success of 3509.3 'Cherry-pick succeeds with rename across D/F conflicts': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git cherry-pick branch
+
+HEAD is now at b71b76f f1
+Note: switching to 'main^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6c20241 b
+[detached HEAD 1b1aec6] f1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 f1
+ok 3 - Cherry-pick succeeds with rename across D/F conflicts
+
+expecting success of 3509.4 'Setup rename with file on one side matching directory name on other': 
+	git checkout --orphan nick-testcase &&
+	git rm -rf . &&
+
+	>empty &&
+	git add empty &&
+	git commit -m "Empty file" &&
+
+	git checkout -b simple &&
+	mv empty file &&
+	mkdir empty &&
+	mv file empty &&
+	git add empty/file &&
+	git commit -m "Empty file under empty dir" &&
+
+	echo content >newfile &&
+	git add newfile &&
+	git commit -m "New file"
+
+Switched to a new branch 'nick-testcase'
+rm 'a/f'
+rm 'b/a'
+rm 'f1'
+[nick-testcase (root-commit) f619bd8] Empty file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+Switched to a new branch 'simple'
+[simple 735003f] Empty file under empty dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename empty => empty/file (100%)
+[simple 2eb2ba1] New file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 4 - Setup rename with file on one side matching directory name on other
+
+expecting success of 3509.5 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)': 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=resolve simple
+
+HEAD is now at 2eb2ba1 New file
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+[detached HEAD 072269c] New file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 5 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (resolve)
+
+expecting success of 3509.6 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)': 
+	git reset --hard &&
+	git checkout -q nick-testcase^0 &&
+	git cherry-pick --strategy=recursive simple
+
+HEAD is now at 072269c New file
+Adding empty
+[detached HEAD 072269c] New file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 6 - Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)
+
+expecting success of 3509.7 'Setup rename with file on one side matching different dirname on other': 
+	git reset --hard &&
+	git checkout --orphan mergeme &&
+	git rm -rf . &&
+
+	mkdir sub &&
+	mkdir othersub &&
+	echo content > sub/file &&
+	echo foo > othersub/whatever &&
+	git add -A &&
+	git commit -m "Common commit" &&
+
+	git rm -rf othersub &&
+	git mv sub/file othersub &&
+	git commit -m "Commit to merge" &&
+
+	git checkout -b newhead mergeme~1 &&
+	>independent-change &&
+	git add independent-change &&
+	git commit -m "Completely unrelated change"
+
+HEAD is now at 072269c New file
+Switched to a new branch 'mergeme'
+rm 'empty'
+rm 'newfile'
+[mergeme (root-commit) 220cb6a] Common commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 othersub/whatever
+ create mode 100644 sub/file
+rm 'othersub/whatever'
+[mergeme 73ee5a0] Commit to merge
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+Switched to a new branch 'newhead'
+[newhead dec5ebc] Completely unrelated change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 independent-change
+ok 7 - Setup rename with file on one side matching different dirname on other
+
+expecting success of 3509.8 'Cherry-pick with rename to different D/F conflict succeeds (resolve)': 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=resolve mergeme
+
+HEAD is now at dec5ebc Completely unrelated change
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Adding othersub
+[detached HEAD 8d9f455] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 8 - Cherry-pick with rename to different D/F conflict succeeds (resolve)
+
+expecting success of 3509.9 'Cherry-pick with rename to different D/F conflict succeeds (recursive)': 
+	git reset --hard &&
+	git checkout -q newhead^0 &&
+	git cherry-pick --strategy=recursive mergeme
+
+HEAD is now at 8d9f455 Commit to merge
+Removing othersub/whatever
+[detached HEAD 8d9f455] Commit to merge
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 deletion(-)
+ rename sub/file => othersub (100%)
+ delete mode 100644 othersub/whatever
+ok 9 - Cherry-pick with rename to different D/F conflict succeeds (recursive)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3508-cherry-pick-many-commits.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3508-cherry-pick-many-commits/.git/
 expecting success of 3508.1 'setup': 
@@ -169748,6 +169817,150 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3514-cherry-pick-revert-gpg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+1..0 # SKIP skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3601-rm-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3601-rm-pathspec-file/.git/
+expecting success of 3601.1 'setup': 
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files" &&
+
+	git tag checkpoint
+
+[master (root-commit) d32ab08] files
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+ok 1 - setup
+
+expecting success of 3601.2 'simplest': 
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
+
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
+
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+ok 2 - simplest
+
+expecting success of 3601.3 '--pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+
+HEAD is now at d32ab08 files
+rm 'fileA.t'
+rm 'fileB.t'
+ok 3 - --pathspec-file-nul
+
+expecting success of 3601.4 'only touches what was listed': 
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
+
+HEAD is now at d32ab08 files
+rm 'fileB.t'
+rm 'fileC.t'
+ok 4 - only touches what was listed
+
+expecting success of 3601.5 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+
+	test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git rm --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	>empty_list &&
+	test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
+	test_grep -e "No pathspec was given. Which files should I remove?" err
+
+HEAD is now at d32ab08 files
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: No pathspec was given. Which files should I remove?
+ok 5 - error conditions
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3511-cherry-pick-x.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3511-cherry-pick-x/.git/
 expecting success of 3511.1 'setup': 
@@ -170286,59 +170499,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3514-cherry-pick-revert-gpg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3507-cherry-pick-conflict.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3507-cherry-pick-conflict/.git/
 expecting success of 3507.1 'setup': 
@@ -171551,95 +171711,526 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3601-rm-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3601-rm-pathspec-file/.git/
-expecting success of 3601.1 'setup': 
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
-	git add fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "files" &&
+*** t3602-rm-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3602-rm-sparse-checkout/.git/
+expecting success of 3602.1 'setup': 
+	mkdir -p sub/dir &&
+	touch a b c sub/d sub/dir/e &&
+	git add -A &&
+	git commit -m files &&
 
-	git tag checkpoint
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
+	EOF
 
-[master (root-commit) d32ab08] files
+	cat >sparse_hint <<-EOF &&
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with "git config set advice.updateSparsePath false"
+	EOF
+
+	echo b | cat sparse_error_header - >sparse_entry_b_error &&
+	cat sparse_entry_b_error sparse_hint >b_error_and_hint
+
+[master (root-commit) ff99497] files
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 sub/d
+ create mode 100644 sub/dir/e
 ok 1 - setup
 
-expecting success of 3601.2 'simplest': 
-	restore_checkpoint &&
+expecting success of 3602.2 'rm does not remove sparse entries': 
+		git sparse-checkout set --no-cone a &&
+		test_must_fail git rm $opt b 2>stderr &&
+		test_cmp b_error_and_hint stderr &&
+		git ls-files --error-unmatch b
+	
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+b
+ok 2 - rm does not remove sparse entries
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	EOF
+expecting success of 3602.3 'rm -f does not remove sparse entries': 
+		git sparse-checkout set --no-cone a &&
+		test_must_fail git rm $opt b 2>stderr &&
+		test_cmp b_error_and_hint stderr &&
+		git ls-files --error-unmatch b
+	
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+b
+ok 3 - rm -f does not remove sparse entries
 
-	echo fileA.t | git rm --pathspec-from-file=- &&
-	verify_expect
+expecting success of 3602.4 'rm --dry-run does not remove sparse entries': 
+		git sparse-checkout set --no-cone a &&
+		test_must_fail git rm $opt b 2>stderr &&
+		test_cmp b_error_and_hint stderr &&
+		git ls-files --error-unmatch b
+	
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+b
+ok 4 - rm --dry-run does not remove sparse entries
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-ok 2 - simplest
+expecting success of 3602.5 'recursive rm does not remove sparse entries': 
+	git reset --hard &&
+	git sparse-checkout set sub/dir &&
+	git rm -r sub &&
+	git status --porcelain -uno >actual &&
+	cat >expected <<-\EOF &&
+	D  sub/dir/e
+	EOF
+	test_cmp expected actual &&
 
-expecting success of 3601.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
+	git rm --sparse -r sub &&
+	git status --porcelain -uno >actual2 &&
+	cat >expected2 <<-\EOF &&
+	D  sub/d
+	D  sub/dir/e
+	EOF
+	test_cmp expected2 actual2
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	D  fileB.t
+HEAD is now at ff99497 files
+rm 'sub/dir/e'
+rm 'sub/d'
+ok 5 - recursive rm does not remove sparse entries
+
+expecting success of 3602.6 'recursive rm --sparse removes sparse entries': 
+	git reset --hard &&
+	git sparse-checkout set "sub/dir" &&
+	git rm --sparse -r sub &&
+	git status --porcelain -uno >actual &&
+	cat >expected <<-\EOF &&
+	D  sub/d
+	D  sub/dir/e
 	EOF
+	test_cmp expected actual
 
-	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
+HEAD is now at ff99497 files
+rm 'sub/d'
+rm 'sub/dir/e'
+ok 6 - recursive rm --sparse removes sparse entries
 
-HEAD is now at d32ab08 files
-rm 'fileA.t'
-rm 'fileB.t'
-ok 3 - --pathspec-file-nul
+expecting success of 3602.7 'rm obeys advice.updateSparsePath': 
+	git reset --hard &&
+	git sparse-checkout set a &&
+	test_must_fail git -c advice.updateSparsePath=false rm b 2>stderr &&
+	test_cmp sparse_entry_b_error stderr
 
-expecting success of 3601.4 'only touches what was listed': 
-	restore_checkpoint &&
+HEAD is now at ff99497 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 7 - rm obeys advice.updateSparsePath
 
-	cat >expect <<-\EOF &&
-	D  fileB.t
-	D  fileC.t
-	EOF
+expecting success of 3602.8 'do not advice about sparse entries when they do not match the pathspec': 
+	git reset --hard &&
+	git sparse-checkout set a &&
+	test_must_fail git rm nonexistent 2>stderr &&
+	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
+	! grep -F -f sparse_error_header stderr
 
-	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
-	verify_expect
+HEAD is now at ff99497 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+fatal: pathspec 'nonexistent' did not match any files
+ok 8 - do not advice about sparse entries when they do not match the pathspec
 
-HEAD is now at d32ab08 files
-rm 'fileB.t'
-rm 'fileC.t'
-ok 4 - only touches what was listed
+expecting success of 3602.9 'do not warn about sparse entries when pathspec matches dense entries': 
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git rm "[ba]" 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --error-unmatch b &&
+	test_must_fail git ls-files --error-unmatch a
 
-expecting success of 3601.5 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
+HEAD is now at ff99497 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+rm 'a'
+b
+error: pathspec 'a' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 9 - do not warn about sparse entries when pathspec matches dense entries
 
-	test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+expecting success of 3602.10 'do not warn about sparse entries with --ignore-unmatch': 
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git rm --ignore-unmatch b 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --error-unmatch b
 
-	test_must_fail git rm --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+HEAD is now at ff99497 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+b
+ok 10 - do not warn about sparse entries with --ignore-unmatch
 
-	>empty_list &&
-	test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
-	test_grep -e "No pathspec was given. Which files should I remove?" err
+expecting success of 3602.11 'refuse to rm a non-skip-worktree path outside sparse cone': 
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git update-index --no-skip-worktree b &&
+	test_must_fail git rm b 2>stderr &&
+	test_cmp b_error_and_hint stderr &&
+	git rm --sparse b 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b
 
-HEAD is now at d32ab08 files
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: No pathspec was given. Which files should I remove?
-ok 5 - error conditions
+HEAD is now at ff99497 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+rm 'b'
+ok 11 - refuse to rm a non-skip-worktree path outside sparse cone
 
-# passed all 5 test(s)
-1..5
+expecting success of 3602.12 'can remove files from non-sparse dir': 
+	git reset --hard &&
+	git sparse-checkout disable &&
+	mkdir -p w x/y &&
+	test_commit w/f &&
+	test_commit x/y/f &&
+
+	git sparse-checkout set --no-cone w !/x y/ &&
+	git rm w/f.t x/y/f.t 2>stderr &&
+	test_must_be_empty stderr
+
+HEAD is now at ff99497 files
+[master 8effd50] w/f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 w/f.t
+[master d038d72] x/y/f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x/y/f.t
+rm 'w/f.t'
+rm 'x/y/f.t'
+ok 12 - can remove files from non-sparse dir
+
+expecting success of 3602.13 'refuse to remove non-skip-worktree file from sparse dir': 
+	git reset --hard &&
+	git sparse-checkout disable &&
+	mkdir -p x/y/z &&
+	test_commit x/y/z/f &&
+	git sparse-checkout set --no-cone !/x y/ !x/y/z &&
+
+	git update-index --no-skip-worktree x/y/z/f.t &&
+	test_must_fail git rm x/y/z/f.t 2>stderr &&
+	echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+
+HEAD is now at d038d72 x/y/f
+[master 9387e98] x/y/z/f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x/y/z/f.t
+ok 13 - refuse to remove non-skip-worktree file from sparse dir
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3650-replay-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3650-replay-basics/.git/
+expecting success of 3650.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+
+	git switch -c topic1 &&
+	test_commit C &&
+	git switch -c topic2 &&
+	test_commit D &&
+	test_commit E &&
+	git switch topic1 &&
+	test_commit F &&
+	git switch -c topic3 &&
+	test_commit G &&
+	test_commit H &&
+	git switch -c topic4 main &&
+	test_commit I &&
+	test_commit J &&
+
+	git switch -c next main &&
+	test_commit K &&
+	git merge -m "Merge topic1" topic1 &&
+	git merge -m "Merge topic2" topic2 &&
+	git merge -m "Merge topic3" topic3 &&
+	>evil &&
+	git add evil &&
+	git commit --amend &&
+	git merge -m "Merge topic4" topic4 &&
+
+	git switch main &&
+	test_commit L &&
+	test_commit M &&
+
+	git switch -c conflict B &&
+	test_commit C.conflict C.t conflict
+
+[main (root-commit) 349e9c6] A
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 1188bf6] B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'topic1'
+[topic1 a8f6b72] C
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to a new branch 'topic2'
+[topic2 d953cf2] D
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[topic2 bceb3ac] E
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'topic1'
+[topic1 6c842f2] F
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+Switched to a new branch 'topic3'
+[topic3 722c0e7] G
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[topic3 c3d2928] H
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+Switched to a new branch 'topic4'
+[topic4 5387a3c] I
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+[topic4 50a0d29] J
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+Switched to a new branch 'next'
+[next 71026ee] K
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ F.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 F.t
+Merge made by the 'ort' strategy.
+ D.t | 1 +
+ E.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 D.t
+ create mode 100644 E.t
+Merge made by the 'ort' strategy.
+ G.t | 1 +
+ H.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 G.t
+ create mode 100644 H.t
+[next 05e6edc] Merge topic3
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+Merge made by the 'ort' strategy.
+ I.t | 1 +
+ J.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 I.t
+ create mode 100644 J.t
+Switched to branch 'main'
+[main 9a9b858] L
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 L.t
+[main d6553f1] M
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 M.t
+Switched to a new branch 'conflict'
+[conflict 0783956] C.conflict
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
+
+expecting success of 3650.2 'setup bare': 
+	git clone --bare . bare
+
+Cloning into bare repository 'bare'...
+done.
+ok 2 - setup bare
+
+expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
+	git replay --onto main topic1..topic2 >result &&
+
+	test_line_count = 1 result &&
+
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse topic2 >>expect &&
+
+	test_cmp expect result
+
+ok 3 - using replay to rebase two branches, one on top of other
+
+expecting success of 3650.4 'using replay on bare repo to rebase two branches, one on top of other': 
+	git -C bare replay --onto main topic1..topic2 >result-bare &&
+	test_cmp expect result-bare
+
+ok 4 - using replay on bare repo to rebase two branches, one on top of other
+
+expecting success of 3650.5 'using replay to rebase with a conflict': 
+	test_expect_code 1 git replay --onto topic1 B..conflict
+
+ok 5 - using replay to rebase with a conflict
+
+expecting success of 3650.6 'using replay on bare repo to rebase with a conflict': 
+	test_expect_code 1 git -C bare replay --onto topic1 B..conflict
+
+ok 6 - using replay on bare repo to rebase with a conflict
+
+expecting success of 3650.7 'using replay to perform basic cherry-pick': 
+	# The differences between this test and previous ones are:
+	#   --advance vs --onto
+	# 2nd field of result is refs/heads/main vs. refs/heads/topic2
+	# 4th field of result is hash for main instead of hash for topic2
+
+	git replay --advance main topic1..topic2 >result &&
+
+	test_line_count = 1 result &&
+
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/main " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse main >>expect &&
+
+	test_cmp expect result
+
+ok 7 - using replay to perform basic cherry-pick
+
+expecting success of 3650.8 'using replay on bare repo to perform basic cherry-pick': 
+	git -C bare replay --advance main topic1..topic2 >result-bare &&
+	test_cmp expect result-bare
+
+ok 8 - using replay on bare repo to perform basic cherry-pick
+
+expecting success of 3650.9 'replay on bare repo fails with both --advance and --onto': 
+	test_must_fail git -C bare replay --advance main --onto main topic1..topic2 >result-bare
+
+fatal: options '--onto' and '--advance' cannot be used together
+ok 9 - replay on bare repo fails with both --advance and --onto
+
+expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
+	test_must_fail git replay topic1..topic2 >result
+
+error: option --onto or --advance is mandatory
+usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
+
+    --[no-]advance <branch>
+                          make replay advance given branch
+    --[no-]onto <revision>
+                          replay onto given commit
+    --[no-]contained      advance all branches contained in revision-range
+
+ok 10 - replay fails when both --advance and --onto are omitted
+
+expecting success of 3650.11 'using replay to also rebase a contained branch': 
+	git replay --contained --onto main main..topic3 >result &&
+
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
+	test_write_lines F C M L B A >expect &&
+	test_cmp expect actual &&
+
+	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
+	test_write_lines H G F C M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic1 " >expect &&
+	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic1 >>expect &&
+	printf "update refs/heads/topic3 " >>expect &&
+	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic3 >>expect &&
+
+	test_cmp expect result
+
+ok 11 - using replay to also rebase a contained branch
+
+expecting success of 3650.12 'using replay on bare repo to also rebase a contained branch': 
+	git -C bare replay --contained --onto main main..topic3 >result-bare &&
+	test_cmp expect result-bare
+
+ok 12 - using replay on bare repo to also rebase a contained branch
+
+expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
+	git replay --onto main ^topic1 topic2 topic4 >result &&
+
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
+	test_write_lines J I M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic2 >>expect &&
+	printf "update refs/heads/topic4 " >>expect &&
+	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic4 >>expect &&
+
+	test_cmp expect result
+
+ok 13 - using replay to rebase multiple divergent branches
+
+expecting success of 3650.14 'using replay on bare repo to rebase multiple divergent branches, including contained ones': 
+	git -C bare replay --contained --onto main ^main topic2 topic3 topic4 >result &&
+
+	test_line_count = 4 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	>expect &&
+	for i in 2 1 3 4
+	do
+		printf "update refs/heads/topic$i " >>expect &&
+		printf "%s " $(grep topic$i result | cut -f 3 -d " ") >>expect &&
+		git -C bare rev-parse topic$i >>expect || return 1
+	done &&
+
+	test_cmp expect result &&
+
+	test_write_lines F C M L B A >expect1 &&
+	test_write_lines E D C M L B A >expect2 &&
+	test_write_lines H G F C M L B A >expect3 &&
+	test_write_lines J I M L B A >expect4 &&
+
+	for i in 1 2 3 4
+	do
+		git -C bare log --format=%s $(grep topic$i result | cut -f 3 -d " ") >actual &&
+		test_cmp expect$i actual || return 1
+	done
+
+ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t0027-auto-crlf.sh ***
@@ -188911,742 +189502,108 @@
 1..2600
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3602-rm-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3602-rm-sparse-checkout/.git/
-expecting success of 3602.1 'setup': 
-	mkdir -p sub/dir &&
-	touch a b c sub/d sub/dir/e &&
-	git add -A &&
-	git commit -m files &&
-
-	cat >sparse_error_header <<-EOF &&
-	The following paths and/or pathspecs matched paths that exist
-	outside of your sparse-checkout definition, so will not be
-	updated in the index:
-	EOF
+*** t3702-add-edit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3702-add-edit/.git/
+expecting success of 3702.1 'setup': 
 
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
+	git add file &&
+	test_tick &&
+	git commit -m initial file
 
-	echo b | cat sparse_error_header - >sparse_entry_b_error &&
-	cat sparse_entry_b_error sparse_hint >b_error_and_hint
 
-[master (root-commit) ff99497] files
+[master (root-commit) e055285] initial
  Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 sub/d
- create mode 100644 sub/dir/e
+ 1 file changed, 11 insertions(+)
+ create mode 100644 file
 ok 1 - setup
 
-expecting success of 3602.2 'rm does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 2 - rm does not remove sparse entries
-
-expecting success of 3602.3 'rm -f does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 3 - rm -f does not remove sparse entries
-
-expecting success of 3602.4 'rm --dry-run does not remove sparse entries': 
-		git sparse-checkout set --no-cone a &&
-		test_must_fail git rm $opt b 2>stderr &&
-		test_cmp b_error_and_hint stderr &&
-		git ls-files --error-unmatch b
-	
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 4 - rm --dry-run does not remove sparse entries
+expecting success of 3702.2 'add -e': 
 
-expecting success of 3602.5 'recursive rm does not remove sparse entries': 
-	git reset --hard &&
-	git sparse-checkout set sub/dir &&
-	git rm -r sub &&
-	git status --porcelain -uno >actual &&
-	cat >expected <<-\EOF &&
-	D  sub/dir/e
-	EOF
-	test_cmp expected actual &&
+	cp second-part file &&
+	git add -e &&
+	test_cmp second-part file &&
+	test_cmp expected-patch orig-patch &&
+	git diff --cached >actual &&
+	grep -v index actual >out &&
+	test_cmp expected out
 
-	git rm --sparse -r sub &&
-	git status --porcelain -uno >actual2 &&
-	cat >expected2 <<-\EOF &&
-	D  sub/d
-	D  sub/dir/e
-	EOF
-	test_cmp expected2 actual2
 
-HEAD is now at ff99497 files
-rm 'sub/dir/e'
-rm 'sub/d'
-ok 5 - recursive rm does not remove sparse entries
+ok 2 - add -e
 
-expecting success of 3602.6 'recursive rm --sparse removes sparse entries': 
+expecting success of 3702.3 'add -e notices editor failure': 
 	git reset --hard &&
-	git sparse-checkout set "sub/dir" &&
-	git rm --sparse -r sub &&
-	git status --porcelain -uno >actual &&
-	cat >expected <<-\EOF &&
-	D  sub/d
-	D  sub/dir/e
-	EOF
-	test_cmp expected actual
+	echo change >>file &&
+	test_must_fail env GIT_EDITOR=false git add -e &&
+	test_expect_code 1 git diff --exit-code
 
-HEAD is now at ff99497 files
-rm 'sub/d'
-rm 'sub/dir/e'
-ok 6 - recursive rm --sparse removes sparse entries
+HEAD is now at e055285 initial
+error: there was a problem with the editor 'false'
+fatal: editing patch failed
+diff --git a/file b/file
+index b9834b5..cce9ee2 100644
+--- a/file
++++ b/file
+@@ -9,3 +9,4 @@ for he waxed under welkin, in wealth he throve,
+ till before him the folk, both far and near,
+ who house by the whale-path, heard his mandate,
+ gave him gifts:  a good king he!
++change
+ok 3 - add -e notices editor failure
 
-expecting success of 3602.7 'rm obeys advice.updateSparsePath': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	test_must_fail git -c advice.updateSparsePath=false rm b 2>stderr &&
-	test_cmp sparse_entry_b_error stderr
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3703-add-magic-pathspec/.git/
+expecting success of 3703.1 'setup': 
+	mkdir sub anothersub &&
+	: >sub/foo &&
+	: >anothersub/foo
 
-HEAD is now at ff99497 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 7 - rm obeys advice.updateSparsePath
+ok 1 - setup
 
-expecting success of 3602.8 'do not advice about sparse entries when they do not match the pathspec': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	test_must_fail git rm nonexistent 2>stderr &&
-	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
-	! grep -F -f sparse_error_header stderr
+expecting success of 3703.2 'add :/': 
+	cat >expected <<-EOF &&
+	add 'anothersub/foo'
+	add 'expected'
+	add 'sub/actual'
+	add 'sub/foo'
+	EOF
+	(cd sub && git add -n :/ >actual) &&
+	test_cmp expected sub/actual
 
-HEAD is now at ff99497 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-fatal: pathspec 'nonexistent' did not match any files
-ok 8 - do not advice about sparse entries when they do not match the pathspec
+ok 2 - add :/
 
-expecting success of 3602.9 'do not warn about sparse entries when pathspec matches dense entries': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	git rm "[ba]" 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --error-unmatch b &&
-	test_must_fail git ls-files --error-unmatch a
+expecting success of 3703.3 'add :/anothersub': 
+	(cd sub && git add -n :/anothersub >actual) &&
+	test_cmp expected sub/actual
 
-HEAD is now at ff99497 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-rm 'a'
-b
-error: pathspec 'a' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 9 - do not warn about sparse entries when pathspec matches dense entries
+ok 3 - add :/anothersub
 
-expecting success of 3602.10 'do not warn about sparse entries with --ignore-unmatch': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	git rm --ignore-unmatch b 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --error-unmatch b
+expecting success of 3703.4 'add :/non-existent': 
+	(cd sub && test_must_fail git add -n :/non-existent)
 
-HEAD is now at ff99497 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-b
-ok 10 - do not warn about sparse entries with --ignore-unmatch
+fatal: pathspec ':/non-existent' did not match any files
+ok 4 - add :/non-existent
 
-expecting success of 3602.11 'refuse to rm a non-skip-worktree path outside sparse cone': 
-	git reset --hard &&
-	git sparse-checkout set a &&
-	git update-index --no-skip-worktree b &&
-	test_must_fail git rm b 2>stderr &&
-	test_cmp b_error_and_hint stderr &&
-	git rm --sparse b 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b
+expecting success of 3703.5 'a file with the same (long) magic name exists': 
+	: >":(icase)ha" &&
+	test_must_fail git add -n ":(icase)ha" &&
+	git add -n "./:(icase)ha"
 
-HEAD is now at ff99497 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-rm 'b'
-ok 11 - refuse to rm a non-skip-worktree path outside sparse cone
+fatal: pathspec ':(icase)ha' did not match any files
+add ':(icase)ha'
+ok 5 - a file with the same (long) magic name exists
 
-expecting success of 3602.12 'can remove files from non-sparse dir': 
-	git reset --hard &&
-	git sparse-checkout disable &&
-	mkdir -p w x/y &&
-	test_commit w/f &&
-	test_commit x/y/f &&
+expecting success of 3703.6 'a file with the same (short) magic name exists': 
+	: >":/bar" &&
+	test_must_fail git add -n :/bar &&
+	git add -n "./:/bar"
 
-	git sparse-checkout set --no-cone w !/x y/ &&
-	git rm w/f.t x/y/f.t 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at ff99497 files
-[master 8effd50] w/f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 w/f.t
-[master d038d72] x/y/f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x/y/f.t
-rm 'w/f.t'
-rm 'x/y/f.t'
-ok 12 - can remove files from non-sparse dir
-
-expecting success of 3602.13 'refuse to remove non-skip-worktree file from sparse dir': 
-	git reset --hard &&
-	git sparse-checkout disable &&
-	mkdir -p x/y/z &&
-	test_commit x/y/z/f &&
-	git sparse-checkout set --no-cone !/x y/ !x/y/z &&
-
-	git update-index --no-skip-worktree x/y/z/f.t &&
-	test_must_fail git rm x/y/z/f.t 2>stderr &&
-	echo x/y/z/f.t | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
-
-HEAD is now at d038d72 x/y/f
-[master 9387e98] x/y/z/f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x/y/z/f.t
-ok 13 - refuse to remove non-skip-worktree file from sparse dir
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3303-notes-subtrees/.git/
-expecting success of 3303.1 'setup: create 100 commits': 
-
-	(
-		nr=0 &&
-		while [ $nr -lt $number_of_commits ]; do
-			nr=$(($nr+1)) &&
-			test_tick &&
-			cat <<INPUT_END || return 1
-commit refs/heads/main
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-commit #$nr
-COMMIT
-
-M 644 inline file
-data <<EOF
-file in commit #$nr
-EOF
-
-INPUT_END
-
-		done &&
-		test_tick &&
-		cat <<INPUT_END
-commit refs/notes/commits
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-no notes
-COMMIT
-
-deleteall
-
-INPUT_END
-
-	) |
-	git fast-import --quiet &&
-	git config core.notesRef refs/notes/commits
-
-ok 1 - setup: create 100 commits
-
-expecting success of 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
-ok 2 - test notes in 2/38-fanout
-
-expecting success of 3303.3 'verify notes in 2/38-fanout': verify_notes
-ok 3 - verify notes in 2/38-fanout
-
-expecting success of 3303.4 'test notes in 2/2/36-fanout': test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
-ok 4 - test notes in 2/2/36-fanout
-
-expecting success of 3303.5 'verify notes in 2/2/36-fanout': verify_notes
-ok 5 - verify notes in 2/2/36-fanout
-
-expecting success of 3303.6 'test notes in 2/2/2/34-fanout': test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
-ok 6 - test notes in 2/2/2/34-fanout
-
-expecting success of 3303.7 'verify notes in 2/2/2/34-fanout': verify_notes
-ok 7 - verify notes in 2/2/2/34-fanout
-
-expecting success of 3303.8 'test same notes in no fanout and 2/38-fanout': test_same_notes "s|^..|&/|" ""
-ok 8 - test same notes in no fanout and 2/38-fanout
-
-expecting success of 3303.9 'verify same notes in no fanout and 2/38-fanout': verify_notes
-ok 9 - verify same notes in no fanout and 2/38-fanout
-
-expecting success of 3303.10 'test same notes in no fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 10 - test same notes in no fanout and 2/2/36-fanout
-
-expecting success of 3303.11 'verify same notes in no fanout and 2/2/36-fanout': verify_notes
-ok 11 - verify same notes in no fanout and 2/2/36-fanout
-
-expecting success of 3303.12 'test same notes in 2/38-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success of 3303.13 'verify same notes in 2/38-fanout and 2/2/36-fanout': verify_notes
-ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success of 3303.14 'test same notes in 2/2/2/34-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
-ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout
-
-expecting success of 3303.15 'verify same notes in 2/2/2/34-fanout and 2/2/36-fanout': verify_notes
-ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
-
-expecting success of 3303.16 'test notes in no fanout concatenated with 2/38-fanout': test_concatenated_notes "s|^..|&/|" ""
-ok 16 - test notes in no fanout concatenated with 2/38-fanout
-
-expecting success of 3303.17 'verify notes in no fanout concatenated with 2/38-fanout': verify_concatenated_notes
-ok 17 - verify notes in no fanout concatenated with 2/38-fanout
-
-expecting success of 3303.18 'test notes in no fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.19 'verify notes in no fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
-ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.20 'test notes in 2/38-fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.21 'verify notes in 2/38-fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
-ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.22 'test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': test_concatenated_notes "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|" "s|^\(..\)\(..\)|\1/\2/|"
-ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
-
-expecting success of 3303.23 'verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': verify_concatenated_notes
-ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3702-add-edit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3702-add-edit/.git/
-expecting success of 3702.1 'setup': 
-
-	git add file &&
-	test_tick &&
-	git commit -m initial file
-
-
-[master (root-commit) e055285] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 3702.2 'add -e': 
-
-	cp second-part file &&
-	git add -e &&
-	test_cmp second-part file &&
-	test_cmp expected-patch orig-patch &&
-	git diff --cached >actual &&
-	grep -v index actual >out &&
-	test_cmp expected out
-
-
-ok 2 - add -e
-
-expecting success of 3702.3 'add -e notices editor failure': 
-	git reset --hard &&
-	echo change >>file &&
-	test_must_fail env GIT_EDITOR=false git add -e &&
-	test_expect_code 1 git diff --exit-code
-
-HEAD is now at e055285 initial
-error: there was a problem with the editor 'false'
-fatal: editing patch failed
-diff --git a/file b/file
-index b9834b5..cce9ee2 100644
---- a/file
-+++ b/file
-@@ -9,3 +9,4 @@ for he waxed under welkin, in wealth he throve,
- till before him the folk, both far and near,
- who house by the whale-path, heard his mandate,
- gave him gifts:  a good king he!
-+change
-ok 3 - add -e notices editor failure
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3650-replay-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3650-replay-basics/.git/
-expecting success of 3650.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-
-	git switch -c topic1 &&
-	test_commit C &&
-	git switch -c topic2 &&
-	test_commit D &&
-	test_commit E &&
-	git switch topic1 &&
-	test_commit F &&
-	git switch -c topic3 &&
-	test_commit G &&
-	test_commit H &&
-	git switch -c topic4 main &&
-	test_commit I &&
-	test_commit J &&
-
-	git switch -c next main &&
-	test_commit K &&
-	git merge -m "Merge topic1" topic1 &&
-	git merge -m "Merge topic2" topic2 &&
-	git merge -m "Merge topic3" topic3 &&
-	>evil &&
-	git add evil &&
-	git commit --amend &&
-	git merge -m "Merge topic4" topic4 &&
-
-	git switch main &&
-	test_commit L &&
-	test_commit M &&
-
-	git switch -c conflict B &&
-	test_commit C.conflict C.t conflict
-
-[main (root-commit) 349e9c6] A
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 1188bf6] B
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'topic1'
-[topic1 a8f6b72] C
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'topic2'
-[topic2 d953cf2] D
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[topic2 bceb3ac] E
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'topic1'
-[topic1 6c842f2] F
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-Switched to a new branch 'topic3'
-[topic3 722c0e7] G
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[topic3 c3d2928] H
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to a new branch 'topic4'
-[topic4 5387a3c] I
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-[topic4 50a0d29] J
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-Switched to a new branch 'next'
-[next 71026ee] K
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 K.t
-Merge made by the 'ort' strategy.
- C.t | 1 +
- F.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 C.t
- create mode 100644 F.t
-Merge made by the 'ort' strategy.
- D.t | 1 +
- E.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 D.t
- create mode 100644 E.t
-Merge made by the 'ort' strategy.
- G.t | 1 +
- H.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 G.t
- create mode 100644 H.t
-[next 05e6edc] Merge topic3
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:23:13 2005 -0700
-Merge made by the 'ort' strategy.
- I.t | 1 +
- J.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 I.t
- create mode 100644 J.t
-Switched to branch 'main'
-[main 9a9b858] L
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 L.t
-[main d6553f1] M
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 M.t
-Switched to a new branch 'conflict'
-[conflict 0783956] C.conflict
- Author: author@name <bogus@email@address>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
-
-expecting success of 3650.2 'setup bare': 
-	git clone --bare . bare
-
-Cloning into bare repository 'bare'...
-done.
-ok 2 - setup bare
-
-expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
-	git replay --onto main topic1..topic2 >result &&
-
-	test_line_count = 1 result &&
-
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
-
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse topic2 >>expect &&
-
-	test_cmp expect result
-
-ok 3 - using replay to rebase two branches, one on top of other
-
-expecting success of 3650.4 'using replay on bare repo to rebase two branches, one on top of other': 
-	git -C bare replay --onto main topic1..topic2 >result-bare &&
-	test_cmp expect result-bare
-
-ok 4 - using replay on bare repo to rebase two branches, one on top of other
-
-expecting success of 3650.5 'using replay to rebase with a conflict': 
-	test_expect_code 1 git replay --onto topic1 B..conflict
-
-ok 5 - using replay to rebase with a conflict
-
-expecting success of 3650.6 'using replay on bare repo to rebase with a conflict': 
-	test_expect_code 1 git -C bare replay --onto topic1 B..conflict
-
-ok 6 - using replay on bare repo to rebase with a conflict
-
-expecting success of 3650.7 'using replay to perform basic cherry-pick': 
-	# The differences between this test and previous ones are:
-	#   --advance vs --onto
-	# 2nd field of result is refs/heads/main vs. refs/heads/topic2
-	# 4th field of result is hash for main instead of hash for topic2
-
-	git replay --advance main topic1..topic2 >result &&
-
-	test_line_count = 1 result &&
-
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
-
-	printf "update refs/heads/main " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse main >>expect &&
-
-	test_cmp expect result
-
-ok 7 - using replay to perform basic cherry-pick
-
-expecting success of 3650.8 'using replay on bare repo to perform basic cherry-pick': 
-	git -C bare replay --advance main topic1..topic2 >result-bare &&
-	test_cmp expect result-bare
-
-ok 8 - using replay on bare repo to perform basic cherry-pick
-
-expecting success of 3650.9 'replay on bare repo fails with both --advance and --onto': 
-	test_must_fail git -C bare replay --advance main --onto main topic1..topic2 >result-bare
-
-fatal: options '--onto' and '--advance' cannot be used together
-ok 9 - replay on bare repo fails with both --advance and --onto
-
-expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
-	test_must_fail git replay topic1..topic2 >result
-
-error: option --onto or --advance is mandatory
-usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
-
-    --[no-]advance <branch>
-                          make replay advance given branch
-    --[no-]onto <revision>
-                          replay onto given commit
-    --[no-]contained      advance all branches contained in revision-range
-
-ok 10 - replay fails when both --advance and --onto are omitted
-
-expecting success of 3650.11 'using replay to also rebase a contained branch': 
-	git replay --contained --onto main main..topic3 >result &&
-
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
-
-	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
-	test_write_lines F C M L B A >expect &&
-	test_cmp expect actual &&
-
-	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
-	test_write_lines H G F C M L B A >expect &&
-	test_cmp expect actual &&
-
-	printf "update refs/heads/topic1 " >expect &&
-	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic1 >>expect &&
-	printf "update refs/heads/topic3 " >>expect &&
-	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic3 >>expect &&
-
-	test_cmp expect result
-
-ok 11 - using replay to also rebase a contained branch
-
-expecting success of 3650.12 'using replay on bare repo to also rebase a contained branch': 
-	git -C bare replay --contained --onto main main..topic3 >result-bare &&
-	test_cmp expect result-bare
-
-ok 12 - using replay on bare repo to also rebase a contained branch
-
-expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
-	git replay --onto main ^topic1 topic2 topic4 >result &&
-
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
-
-	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
-
-	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
-	test_write_lines J I M L B A >expect &&
-	test_cmp expect actual &&
-
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic2 >>expect &&
-	printf "update refs/heads/topic4 " >>expect &&
-	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic4 >>expect &&
-
-	test_cmp expect result
-
-ok 13 - using replay to rebase multiple divergent branches
-
-expecting success of 3650.14 'using replay on bare repo to rebase multiple divergent branches, including contained ones': 
-	git -C bare replay --contained --onto main ^main topic2 topic3 topic4 >result &&
-
-	test_line_count = 4 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
-
-	>expect &&
-	for i in 2 1 3 4
-	do
-		printf "update refs/heads/topic$i " >>expect &&
-		printf "%s " $(grep topic$i result | cut -f 3 -d " ") >>expect &&
-		git -C bare rev-parse topic$i >>expect || return 1
-	done &&
-
-	test_cmp expect result &&
-
-	test_write_lines F C M L B A >expect1 &&
-	test_write_lines E D C M L B A >expect2 &&
-	test_write_lines H G F C M L B A >expect3 &&
-	test_write_lines J I M L B A >expect4 &&
-
-	for i in 1 2 3 4
-	do
-		git -C bare log --format=%s $(grep topic$i result | cut -f 3 -d " ") >actual &&
-		test_cmp expect$i actual || return 1
-	done
-
-ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3703-add-magic-pathspec/.git/
-expecting success of 3703.1 'setup': 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
-
-ok 1 - setup
-
-expecting success of 3703.2 'add :/': 
-	cat >expected <<-EOF &&
-	add 'anothersub/foo'
-	add 'expected'
-	add 'sub/actual'
-	add 'sub/foo'
-	EOF
-	(cd sub && git add -n :/ >actual) &&
-	test_cmp expected sub/actual
-
-ok 2 - add :/
-
-expecting success of 3703.3 'add :/anothersub': 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
-
-ok 3 - add :/anothersub
-
-expecting success of 3703.4 'add :/non-existent': 
-	(cd sub && test_must_fail git add -n :/non-existent)
-
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
-
-expecting success of 3703.5 'a file with the same (long) magic name exists': 
-	: >":(icase)ha" &&
-	test_must_fail git add -n ":(icase)ha" &&
-	git add -n "./:(icase)ha"
-
-fatal: pathspec ':(icase)ha' did not match any files
-add ':(icase)ha'
-ok 5 - a file with the same (long) magic name exists
-
-expecting success of 3703.6 'a file with the same (short) magic name exists': 
-	: >":/bar" &&
-	test_must_fail git add -n :/bar &&
-	git add -n "./:/bar"
-
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
+fatal: pathspec ':/bar' did not match any files
+add ':/bar'
+ok 6 - a file with the same (short) magic name exists
 
 # passed all 6 test(s)
 1..6
@@ -210053,8 +210010,7 @@
 	sleep 2 &&
 	! kill $!
 
-t3070-wildmatch.sh: 11: kill: No such process
-
+./test-lib.sh: line 1014: kill: (3133350) - No such process
 ok 1891 - matching does not exhibit exponential behavior
 
 # still have 40 known breakage(s)
@@ -210062,481 +210018,6 @@
 1..1891
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3705-add-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3705-add-sparse-checkout/.git/
-expecting success of 3705.1 'setup': 
-	cat >sparse_error_header <<-EOF &&
-	The following paths and/or pathspecs matched paths that exist
-	outside of your sparse-checkout definition, so will not be
-	updated in the index:
-	EOF
-
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
-
-	echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
-	cat sparse_entry_error sparse_hint >error_and_hint
-
-ok 1 - setup
-
-expecting success of 3705.2 'git add does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	test_must_fail git add sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master (root-commit) c0e866f] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sparse_entry
-ok 2 - git add does not remove sparse entries
-
-expecting success of 3705.3 'git add -A does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	setup_gitignore &&
-	git add -A 2>stderr &&
-	test_must_be_empty stderr &&
-	test_sparse_entry_unchanged
-
-[master 5de8edd] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 3 - git add -A does not remove sparse entries
-
-expecting success of 3705.4 'git add . does not remove sparse entries': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	setup_gitignore &&
-	test_must_fail git add . 2>stderr &&
-	test_sparse_entry_unstaged &&
-
-	cat sparse_error_header >expect &&
-	echo . >>expect &&
-	cat sparse_hint >>expect &&
-
-	test_cmp expect stderr &&
-	test_sparse_entry_unchanged
-
-[master e79cbb6] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 4 - git add . does not remove sparse entries
-
-expecting success of 3705.5 'git add does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 52a8d7c] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 5 - git add does not update sparse entries
-
-expecting success of 3705.6 'git add -f does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 6e383d3] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 6 - git add -f does not update sparse entries
-
-expecting success of 3705.7 'git add -u does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master bb85fed] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 7 - git add -u does not update sparse entries
-
-expecting success of 3705.8 'git add --ignore-removal does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 2bced02] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 8 - git add --ignore-removal does not update sparse entries
-
-expecting success of 3705.9 'git add --dry-run does not update sparse entries': 
-		setup_sparse_entry &&
-		echo modified >sparse_entry &&
-		test_must_fail git add $opt sparse_entry 2>stderr &&
-		test_sparse_entry_unstaged &&
-		test_cmp error_and_hint stderr &&
-		test_sparse_entry_unchanged
-	
-[master 1fb2ac0] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 9 - git add --dry-run does not update sparse entries
-
-expecting success of 3705.10 'git add --refresh does not update sparse entries': 
-	setup_sparse_entry &&
-	git ls-files --debug sparse_entry | grep mtime >before &&
-	test-tool chmtime -60 sparse_entry &&
-	test_must_fail git add --refresh sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	git ls-files --debug sparse_entry | grep mtime >after &&
-	test_cmp before after
-
-[master b9f487e] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 10 - git add --refresh does not update sparse entries
-
-expecting success of 3705.11 'git add --chmod does not update sparse entries': 
-	setup_sparse_entry &&
-	test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged &&
-	! test -x sparse_entry
-
-[master 46b5fb2] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 11 - git add --chmod does not update sparse entries
-
-expecting success of 3705.12 'git add --renormalize does not update sparse entries': 
-	test_when_finished rm .gitattributes &&
-	test_config core.autocrlf false &&
-	setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
-	echo "sparse_entry text=auto" >.gitattributes &&
-	test_must_fail git add --renormalize sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master 18a544d] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 12 - git add --renormalize does not update sparse entries
-
-expecting success of 3705.13 'git add --dry-run --ignore-missing warn on sparse path': 
-	setup_sparse_entry &&
-	rm sparse_entry &&
-	test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp error_and_hint stderr &&
-	test_sparse_entry_unchanged
-
-[master c192c51] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
-ok 13 - git add --dry-run --ignore-missing warn on sparse path
-
-expecting success of 3705.14 'do not advice about sparse entries when they do not match the pathspec': 
-	setup_sparse_entry &&
-	test_must_fail git add nonexistent 2>stderr &&
-	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
-	! grep -F -f sparse_error_header stderr
-
-[master f9f36a2] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-fatal: pathspec 'nonexistent' did not match any files
-ok 14 - do not advice about sparse entries when they do not match the pathspec
-
-expecting success of 3705.15 'do not warn when pathspec matches dense entries': 
-	setup_sparse_entry &&
-	echo modified >sparse_entry &&
-	>dense_entry &&
-	git add "*_entry" 2>stderr &&
-	test_must_be_empty stderr &&
-	test_sparse_entry_unchanged &&
-	git ls-files --error-unmatch dense_entry
-
-[master 8db759d] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-dense_entry
-ok 15 - do not warn when pathspec matches dense entries
-
-expecting success of 3705.16 'git add fails outside of sparse-checkout definition': 
-	test_when_finished git sparse-checkout disable &&
-	test_commit a &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a &&
-	echo >>sparse_entry &&
-
-	git update-index --no-skip-worktree sparse_entry &&
-	test_must_fail git add sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	test_must_fail git add --chmod=+x sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	test_must_fail git add --renormalize sparse_entry &&
-	test_sparse_entry_unstaged &&
-
-	# Avoid munging CRLFs to avoid an error message
-	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --stage >actual &&
-	grep "^100644 .*sparse_entry\$" actual &&
-
-	git add --sparse --chmod=+x sparse_entry 2>stderr &&
-	test_must_be_empty stderr &&
-	git ls-files --stage >actual &&
-	grep "^100755 .*sparse_entry\$" actual &&
-
-	git reset &&
-
-	# This will print a message over stderr on Windows.
-	git add --sparse --renormalize sparse_entry &&
-	git status --porcelain >actual &&
-	grep "^M  sparse_entry\$" actual
-
-[master 2be48a2] a
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 a.t
- create mode 100644 dense_entry
-warning: The following paths were already present and thus not updated despite sparse patterns:
-	sparse_entry
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-warning: The following paths are not up to date and were left despite sparse patterns:
-	sparse_entry
-
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-100644 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
-100755 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
-Unstaged changes after reset:
-M	sparse_entry
-M  sparse_entry
-ok 16 - git add fails outside of sparse-checkout definition
-
-expecting success of 3705.17 'add obeys advice.updateSparsePath': 
-	setup_sparse_entry &&
-	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
-	test_sparse_entry_unstaged &&
-	test_cmp sparse_entry_error stderr
-
-
-[master 91ae5df] ensure sparse_entry exists at HEAD
- Author: A U Thor <author@example.com>
-ok 17 - add obeys advice.updateSparsePath
-
-expecting success of 3705.18 'add allows sparse entries with --sparse': 
-	git sparse-checkout set --no-cone a &&
-	echo modified >sparse_entry &&
-	test_must_fail git add sparse_entry &&
-	test_sparse_entry_unchanged &&
-	git add --sparse sparse_entry 2>stderr &&
-	test_must_be_empty stderr
-
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-sparse_entry
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-ok 18 - add allows sparse entries with --sparse
-
-expecting success of 3705.19 'can add files from non-sparse dir': 
-	git sparse-checkout set w !/x y/ &&
-	mkdir -p w x/y &&
-	touch w/f x/y/f &&
-	git add w/f x/y/f 2>stderr &&
-	test_must_be_empty stderr
-
-ok 19 - can add files from non-sparse dir
-
-expecting success of 3705.20 'refuse to add non-skip-worktree file from sparse dir': 
-	git sparse-checkout set !/x y/ !x/y/z &&
-	mkdir -p x/y/z &&
-	touch x/y/z/f &&
-	test_must_fail git add x/y/z/f 2>stderr &&
-	echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
-
-ok 20 - refuse to add non-skip-worktree file from sparse dir
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3902-quoted.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3902-quoted/.git/
-expecting success of 3902.1 'setup': 
-
-	mkdir "$FN" &&
-	for_each_name "echo initial >\"\$name\"" &&
-	git add . &&
-	git commit -q -m Initial &&
-
-	for_each_name "echo second >\"\$name\"" &&
-	git commit -a -m Second &&
-
-	for_each_name "echo modified >\"\$name\""
-
-
-[master 6e4313d] Second
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+), 11 deletions(-)
-ok 1 - setup
-
-expecting success of 3902.2 'setup expected files': 
-cat >expect.quoted <<\EOF &&
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"\346\277\261\351\207\216\t\347\264\224"
-"\346\277\261\351\207\216\n\347\264\224"
-"\346\277\261\351\207\216 \347\264\224"
-"\346\277\261\351\207\216\"\347\264\224"
-"\346\277\261\351\207\216/file"
-"\346\277\261\351\207\216\347\264\224"
-EOF
-
-cat >expect.raw <<\EOF
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"濱野\t純"
-"濱野\n純"
-濱野 純
-"濱野\"純"
-濱野/file
-濱野純
-EOF
-
-ok 2 - setup expected files
-
-expecting success of 3902.3 'check fully quoted output from ls-files': 
-
-	git ls-files >current && test_cmp expect.quoted current
-
-
-ok 3 - check fully quoted output from ls-files
-
-expecting success of 3902.4 'check fully quoted output from diff-files': 
-
-	git diff --name-only >current &&
-	test_cmp expect.quoted current
-
-
-ok 4 - check fully quoted output from diff-files
-
-expecting success of 3902.5 'check fully quoted output from diff-index': 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 5 - check fully quoted output from diff-index
-
-expecting success of 3902.6 'check fully quoted output from diff-tree': 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 6 - check fully quoted output from diff-tree
-
-expecting success of 3902.7 'check fully quoted output from ls-tree': 
-
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 7 - check fully quoted output from ls-tree
-
-expecting success of 3902.8 'setting core.quotepath': 
-
-	git config --bool core.quotepath false
-
-
-ok 8 - setting core.quotepath
-
-expecting success of 3902.9 'check fully quoted output from ls-files': 
-
-	git ls-files >current && test_cmp expect.raw current
-
-
-ok 9 - check fully quoted output from ls-files
-
-expecting success of 3902.10 'check fully quoted output from diff-files': 
-
-	git diff --name-only >current &&
-	test_cmp expect.raw current
-
-
-ok 10 - check fully quoted output from diff-files
-
-expecting success of 3902.11 'check fully quoted output from diff-index': 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 11 - check fully quoted output from diff-index
-
-expecting success of 3902.12 'check fully quoted output from diff-tree': 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 12 - check fully quoted output from diff-tree
-
-expecting success of 3902.13 'check fully quoted output from ls-tree': 
-
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 13 - check fully quoted output from ls-tree
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3426-rebase-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3426-rebase-submodule/.git/
 expecting success of 3426.1 'git_rebase: added submodule creates empty directory': 
@@ -211703,6 +211184,481 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3902-quoted.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3902-quoted/.git/
+expecting success of 3902.1 'setup': 
+
+	mkdir "$FN" &&
+	for_each_name "echo initial >\"\$name\"" &&
+	git add . &&
+	git commit -q -m Initial &&
+
+	for_each_name "echo second >\"\$name\"" &&
+	git commit -a -m Second &&
+
+	for_each_name "echo modified >\"\$name\""
+
+
+[master 6e4313d] Second
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+ok 1 - setup
+
+expecting success of 3902.2 'setup expected files': 
+cat >expect.quoted <<\EOF &&
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"\346\277\261\351\207\216\t\347\264\224"
+"\346\277\261\351\207\216\n\347\264\224"
+"\346\277\261\351\207\216 \347\264\224"
+"\346\277\261\351\207\216\"\347\264\224"
+"\346\277\261\351\207\216/file"
+"\346\277\261\351\207\216\347\264\224"
+EOF
+
+cat >expect.raw <<\EOF
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"濱野\t純"
+"濱野\n純"
+濱野 純
+"濱野\"純"
+濱野/file
+濱野純
+EOF
+
+ok 2 - setup expected files
+
+expecting success of 3902.3 'check fully quoted output from ls-files': 
+
+	git ls-files >current && test_cmp expect.quoted current
+
+
+ok 3 - check fully quoted output from ls-files
+
+expecting success of 3902.4 'check fully quoted output from diff-files': 
+
+	git diff --name-only >current &&
+	test_cmp expect.quoted current
+
+
+ok 4 - check fully quoted output from diff-files
+
+expecting success of 3902.5 'check fully quoted output from diff-index': 
+
+	git diff --name-only HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 5 - check fully quoted output from diff-index
+
+expecting success of 3902.6 'check fully quoted output from diff-tree': 
+
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 6 - check fully quoted output from diff-tree
+
+expecting success of 3902.7 'check fully quoted output from ls-tree': 
+
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.quoted current
+
+
+ok 7 - check fully quoted output from ls-tree
+
+expecting success of 3902.8 'setting core.quotepath': 
+
+	git config --bool core.quotepath false
+
+
+ok 8 - setting core.quotepath
+
+expecting success of 3902.9 'check fully quoted output from ls-files': 
+
+	git ls-files >current && test_cmp expect.raw current
+
+
+ok 9 - check fully quoted output from ls-files
+
+expecting success of 3902.10 'check fully quoted output from diff-files': 
+
+	git diff --name-only >current &&
+	test_cmp expect.raw current
+
+
+ok 10 - check fully quoted output from diff-files
+
+expecting success of 3902.11 'check fully quoted output from diff-index': 
+
+	git diff --name-only HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 11 - check fully quoted output from diff-index
+
+expecting success of 3902.12 'check fully quoted output from diff-tree': 
+
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 12 - check fully quoted output from diff-tree
+
+expecting success of 3902.13 'check fully quoted output from ls-tree': 
+
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 13 - check fully quoted output from ls-tree
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3705-add-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3705-add-sparse-checkout/.git/
+expecting success of 3705.1 'setup': 
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
+	EOF
+
+	cat >sparse_hint <<-EOF &&
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with "git config set advice.updateSparsePath false"
+	EOF
+
+	echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
+	cat sparse_entry_error sparse_hint >error_and_hint
+
+ok 1 - setup
+
+expecting success of 3705.2 'git add does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	test_must_fail git add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+
+[master (root-commit) c0e866f] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sparse_entry
+ok 2 - git add does not remove sparse entries
+
+expecting success of 3705.3 'git add -A does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	git add -A 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged
+
+[master 5de8edd] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 3 - git add -A does not remove sparse entries
+
+expecting success of 3705.4 'git add . does not remove sparse entries': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	test_must_fail git add . 2>stderr &&
+	test_sparse_entry_unstaged &&
+
+	cat sparse_error_header >expect &&
+	echo . >>expect &&
+	cat sparse_hint >>expect &&
+
+	test_cmp expect stderr &&
+	test_sparse_entry_unchanged
+
+[master e79cbb6] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 4 - git add . does not remove sparse entries
+
+expecting success of 3705.5 'git add does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 52a8d7c] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 5 - git add does not update sparse entries
+
+expecting success of 3705.6 'git add -f does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 6e383d3] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 6 - git add -f does not update sparse entries
+
+expecting success of 3705.7 'git add -u does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master bb85fed] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 7 - git add -u does not update sparse entries
+
+expecting success of 3705.8 'git add --ignore-removal does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 2bced02] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 8 - git add --ignore-removal does not update sparse entries
+
+expecting success of 3705.9 'git add --dry-run does not update sparse entries': 
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_sparse_entry_unstaged &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	
+[master 1fb2ac0] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 9 - git add --dry-run does not update sparse entries
+
+expecting success of 3705.10 'git add --refresh does not update sparse entries': 
+	setup_sparse_entry &&
+	git ls-files --debug sparse_entry | grep mtime >before &&
+	test-tool chmtime -60 sparse_entry &&
+	test_must_fail git add --refresh sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	git ls-files --debug sparse_entry | grep mtime >after &&
+	test_cmp before after
+
+[master b9f487e] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 10 - git add --refresh does not update sparse entries
+
+expecting success of 3705.11 'git add --chmod does not update sparse entries': 
+	setup_sparse_entry &&
+	test_must_fail git add --chmod=+x sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged &&
+	! test -x sparse_entry
+
+[master 46b5fb2] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 11 - git add --chmod does not update sparse entries
+
+expecting success of 3705.12 'git add --renormalize does not update sparse entries': 
+	test_when_finished rm .gitattributes &&
+	test_config core.autocrlf false &&
+	setup_sparse_entry "LINEONE\r\nLINETWO\r\n" &&
+	echo "sparse_entry text=auto" >.gitattributes &&
+	test_must_fail git add --renormalize sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+
+[master 18a544d] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 12 - git add --renormalize does not update sparse entries
+
+expecting success of 3705.13 'git add --dry-run --ignore-missing warn on sparse path': 
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	test_must_fail git add --dry-run --ignore-missing sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+
+[master c192c51] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ok 13 - git add --dry-run --ignore-missing warn on sparse path
+
+expecting success of 3705.14 'do not advice about sparse entries when they do not match the pathspec': 
+	setup_sparse_entry &&
+	test_must_fail git add nonexistent 2>stderr &&
+	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
+	! grep -F -f sparse_error_header stderr
+
+[master f9f36a2] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+fatal: pathspec 'nonexistent' did not match any files
+ok 14 - do not advice about sparse entries when they do not match the pathspec
+
+expecting success of 3705.15 'do not warn when pathspec matches dense entries': 
+	setup_sparse_entry &&
+	echo modified >sparse_entry &&
+	>dense_entry &&
+	git add "*_entry" 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged &&
+	git ls-files --error-unmatch dense_entry
+
+[master 8db759d] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+dense_entry
+ok 15 - do not warn when pathspec matches dense entries
+
+expecting success of 3705.16 'git add fails outside of sparse-checkout definition': 
+	test_when_finished git sparse-checkout disable &&
+	test_commit a &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a &&
+	echo >>sparse_entry &&
+
+	git update-index --no-skip-worktree sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	test_must_fail git add --chmod=+x sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	test_must_fail git add --renormalize sparse_entry &&
+	test_sparse_entry_unstaged &&
+
+	# Avoid munging CRLFs to avoid an error message
+	git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100644 .*sparse_entry\$" actual &&
+
+	git add --sparse --chmod=+x sparse_entry 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --stage >actual &&
+	grep "^100755 .*sparse_entry\$" actual &&
+
+	git reset &&
+
+	# This will print a message over stderr on Windows.
+	git add --sparse --renormalize sparse_entry &&
+	git status --porcelain >actual &&
+	grep "^M  sparse_entry\$" actual
+
+[master 2be48a2] a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 a.t
+ create mode 100644 dense_entry
+warning: The following paths were already present and thus not updated despite sparse patterns:
+	sparse_entry
+
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+warning: The following paths are not up to date and were left despite sparse patterns:
+	sparse_entry
+
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+100644 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
+100755 e0c06d45b9d40f6c18a37e4cab8070a0dc4d2ef1 0	sparse_entry
+Unstaged changes after reset:
+M	sparse_entry
+M  sparse_entry
+ok 16 - git add fails outside of sparse-checkout definition
+
+expecting success of 3705.17 'add obeys advice.updateSparsePath': 
+	setup_sparse_entry &&
+	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+	test_sparse_entry_unstaged &&
+	test_cmp sparse_entry_error stderr
+
+
+[master 91ae5df] ensure sparse_entry exists at HEAD
+ Author: A U Thor <author@example.com>
+ok 17 - add obeys advice.updateSparsePath
+
+expecting success of 3705.18 'add allows sparse entries with --sparse': 
+	git sparse-checkout set --no-cone a &&
+	echo modified >sparse_entry &&
+	test_must_fail git add sparse_entry &&
+	test_sparse_entry_unchanged &&
+	git add --sparse sparse_entry 2>stderr &&
+	test_must_be_empty stderr
+
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+sparse_entry
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+ok 18 - add allows sparse entries with --sparse
+
+expecting success of 3705.19 'can add files from non-sparse dir': 
+	git sparse-checkout set w !/x y/ &&
+	mkdir -p w x/y &&
+	touch w/f x/y/f &&
+	git add w/f x/y/f 2>stderr &&
+	test_must_be_empty stderr
+
+ok 19 - can add files from non-sparse dir
+
+expecting success of 3705.20 'refuse to add non-skip-worktree file from sparse dir': 
+	git sparse-checkout set !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
+	touch x/y/z/f &&
+	test_must_fail git add x/y/z/f 2>stderr &&
+	echo x/y/z/f | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
+
+ok 20 - refuse to add non-skip-worktree file from sparse dir
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3900-i18n-commit.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3900-i18n-commit/.git/
 expecting success of 3900.1 'setup': 
@@ -212993,6 +212949,634 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/.git/
+expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
+[main (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
+[main (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
+[main (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'main'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+[no_submodule 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_test_func: added submodule creates empty directory
+
+expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+[no_submodule 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 3512.4 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_test_func: replace directory with submodule
+
+expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+ok 7 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 3512.9 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+[add_sub1 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
+not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 3512.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+[add_sub1 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
+not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+[add_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 3512.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+[add_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 3512.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+fatal: cherry-pick failed
+ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 3512.15 'unrelated submodule/file conflict is ignored': 
+	test_config_global protocol.file.allow always &&
+
+	test_create_repo sub &&
+
+	touch sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add a file in a submodule" &&
+
+	test_create_repo a_repo &&
+	(
+		cd a_repo &&
+		>a_file &&
+		git add a_file &&
+		git commit -m "add a file" &&
+
+		git branch test &&
+		git checkout test &&
+
+		mkdir sub &&
+		>sub/content &&
+		git add sub/content &&
+		git commit -m "add a regular folder with name sub" &&
+
+		echo "123" >a_file &&
+		git add a_file &&
+		git commit -m "modify a file" &&
+
+		git checkout main &&
+
+		git submodule add ../sub sub &&
+		git submodule update sub &&
+		git commit -m "add a submodule info folder with name sub" &&
+
+		git cherry-pick test
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
+[main (root-commit) 8e92946] add a file in a submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
+[main (root-commit) ab27302] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a_file
+Switched to branch 'test'
+[test 472972d] add a regular folder with name sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/content
+[test 32d3b70] modify a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
+done.
+[main 77c71a9] add a submodule info folder with name sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main ec77434] modify a file
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 15 - unrelated submodule/file conflict is ignored
+
+# still have 2 known breakage(s)
+# passed all remaining 13 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3907-stash-show-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3907-stash-show-config/.git/
 expecting success of 3907.1 'setup': 
@@ -213099,6 +213683,529 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3305-notes-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3305-notes-fanout/.git/
+expecting success of 3305.1 'tweak test environment': 
+	git checkout -b nondeterminism &&
+	test_commit A &&
+	git checkout --orphan with_notes;
+
+Switched to a new branch 'nondeterminism'
+[nondeterminism (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'with_notes'
+ok 1 - tweak test environment
+
+expecting success of 3305.2 'creating many notes with git-notes': 
+	num_notes=300 &&
+	i=0 &&
+	while test $i -lt $num_notes
+	do
+		i=$(($i + 1)) &&
+		test_tick &&
+		echo "file for commit #$i" > file &&
+		git add file &&
+		git commit -q -m "commit #$i" &&
+		git notes add -m "note #$i" || return 1
+	done
+
+ok 2 - creating many notes with git-notes
+
+expecting success of 3305.3 'many notes created correctly with git-notes': 
+	git log >output.raw &&
+	grep "^    " output.raw >output &&
+	i=$num_notes &&
+	while test $i -gt 0
+	do
+		echo "    commit #$i" &&
+		echo "    note #$i" &&
+		i=$(($i - 1)) || return 1
+	done > expect &&
+	test_cmp expect output
+
+ok 3 - many notes created correctly with git-notes
+
+expecting success of 3305.4 'stable fanout 0 is followed by stable fanout 1': 
+	i=$num_notes &&
+	fanout=0 &&
+	while test $i -gt 0
+	do
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
+		then
+			continue
+		elif test $fanout -eq 0
+		then
+			fanout=1 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 1
+
+Fanout 0 -> 1 at refs/notes/commits~202
+ok 4 - stable fanout 0 is followed by stable fanout 1
+
+expecting success of 3305.5 'deleting most notes with git-notes': 
+	remove_notes=285 &&
+	i=0 &&
+	git rev-list HEAD >revs &&
+	while test $i -lt $remove_notes && read sha1
+	do
+		i=$(($i + 1)) &&
+		test_tick &&
+		git notes remove "$sha1" || return 1
+	done <revs
+
+Removing note for object 294487610d9e2f1885f32c5aa8c40e1feae544e6
+Removing note for object 264d6d5a375b9b4a748e868f8887139e144dd9ac
+Removing note for object f4791ca4424bf830c9c4c2fae376f8c17584ecfc
+Removing note for object 04413ee0c628c2149ce195709e68ba9739cecaeb
+Removing note for object 2cba5326a57bff88235ffe0d680843c3a875fdc6
+Removing note for object 98c3a61e7f6474b9edadcd9fd0e2c580fbff9f8c
+Removing note for object 69dd6f05596ba7dd52aece2e66312d72193f2404
+Removing note for object 06faaf7ec015a9d97368c2529bdc8cf31baf70bf
+Removing note for object 95a7e3e972db58539e6ef3cc361cd61e31b17db7
+Removing note for object 136b29822535a2e998f2926ee16b1f3802c88b3f
+Removing note for object a9d5012931c30040ee5e7b0b8ab8eaa87dd2df9e
+Removing note for object 34b0e5146919d1b0b079f4685de49d08d602c765
+Removing note for object ba8e5e2e75a66e54fa2a999671e3d602548b0fad
+Removing note for object 84773486b2f3c371913c2745322c02efe920976c
+Removing note for object 30f4912988cb9df51d6bbec5796642f1b1a9a2fc
+Removing note for object 18b7dd8f1690e8cb8399edd2d469cebf6051c8fb
+Removing note for object 80a8f06bff8197866fb6c2b10e529a67b1d0ed57
+Removing note for object 88d59face24312f906679c56c1c00f41a57aed81
+Removing note for object e591b6658f32d09dc92aaab7f518076d7219baa1
+Removing note for object 7194f853be5be737ab89c55ed8ef76999c694cfb
+Removing note for object 785a3db61beba59185813dd72a4f49cb960ba939
+Removing note for object 3dbbb4bfb12466f2662430857727af32dc37b30b
+Removing note for object a7e4d6ced9493bec81fa7a326a50a053b7dd8e47
+Removing note for object 17d18cf173f34f0c977c7d7410432c4c052e9a35
+Removing note for object 0efe5818f127e837f8c49e7ee292f2e3827b5d8c
+Removing note for object 1329c14017e18f7f75c56c6132d5070386191590
+Removing note for object 4fad07113f4b21f3d3aba2033c13576d74ed0159
+Removing note for object fd7060211fed315790db481cca508f2a59cd33fa
+Removing note for object 24bcc65e72949c7aad1e00a0ae648eb27b94a801
+Removing note for object 74017d116189d350e027f6a2fa197d76a98cb90c
+Removing note for object 829520f74568ec4a7daa4344d4e53612e8e449c6
+Removing note for object fc9c45687e413c9199ed2e2dc13732b0eee1417e
+Removing note for object 68f9d6e536ae8b39e2be3687534f96fb0cedd413
+Removing note for object 85492e5692be8052265ab35b1fb32bd632d7a034
+Removing note for object ed3b17f5fea5faec967aea73fab660c3caa4ec11
+Removing note for object c0038d5ca05de0848b621fe56fa32a95f56ac8bb
+Removing note for object 5805c46d394e6f09d122e29bfc8bc4677227c959
+Removing note for object 82a44ee370b37d4fcd2955c7dd4f59f66bb85055
+Removing note for object bebeed1d6e5df5f8e4519c02be6e36baef2a2b9f
+Removing note for object 84489b9c59967356c347b503e7be812344bec157
+Removing note for object de6bce36f8dbcebae05182254f9839ae88a89519
+Removing note for object 028084dc54b6b3a96adb0db4447c0befbfaf0f77
+Removing note for object b8f0c408564c037d30c51346cc54e5bf9b39a223
+Removing note for object 2ca369ce379b96c92fd48802bf5ca62c31495871
+Removing note for object 6c623624f0cfa64dcf5e0670626a9af249ce8fce
+Removing note for object d07926d68d5ea629bdfca003fd6dd71f4efdde8a
+Removing note for object 6160cde4d6c969e42f949a8d975e72f82ec65ff9
+Removing note for object 73b405a748dba3b757b1c4cfbca475d1a66a1396
+Removing note for object 8bfca76ecc8ffdd1c73e247e20dfc380deec169b
+Removing note for object 49d5b21b59db4b0d7e92d8d58b548c7c7f3ceab3
+Removing note for object 092fdff4f714d2ade8c2a5e0b7230b96e58fa202
+Removing note for object 8e716f1f338b7cde850738a7bcb8fc08458f6da8
+Removing note for object cbbd557f18677bca5328466c4649d42ca38ecd0b
+Removing note for object 3b5f892711e112d1ffe60cc652782db8f5436172
+Removing note for object d00c7dd01101c3f61fa408d9609bd0f34189ca0e
+Removing note for object 2d5dfff9582df22365e988c1dbf26f310ac11018
+Removing note for object b081e0909ddc4f0cd0f880a4151b7a0f93ff7c02
+Removing note for object 72db531cec33db2b935aeefaf533d7cdc8e1e498
+Removing note for object 863bdd410c7d0f81d93dadbb5129004563987cdd
+Removing note for object 53c002754b07b01a6c7b0f25e55ce49452e78998
+Removing note for object 37d37991e387d94d7470e8e1f6d2554e027eb040
+Removing note for object c2a4ca4a2728846813f90dd0f36f5dd413572e53
+Removing note for object c4b7e09bd15665daf91c5a420a56dd3721ca8c09
+Removing note for object a14371c8166385886904c730e0a531b5ac0dc1d4
+Removing note for object 3595eeb0316642224135dda2d7f4e2571d13f960
+Removing note for object b7d693fa9562fb10a24385800b92e21d77158cab
+Removing note for object 0b55bd97fdaa73e8998658138997750f9204f709
+Removing note for object 7581409289445aac9cad5685242225b69438bdb5
+Removing note for object 63e0354a05c6f2bd3ee0454b7c8a1b6ad55bbb39
+Removing note for object e122ffa8e4b75eca6c0a6138dbbbbd8fd90db924
+Removing note for object 12b5dbefaa4c85ef26c42c14bb3a48493fd79aed
+Removing note for object 6187ce5edf2f7d4d97721c6a195e9085ee0b75e0
+Removing note for object 0b29c48dd6f47ab350c0268424c5912ca68eec05
+Removing note for object 00225fa0566873e04cf85786bfcdfc8d5a1fb68b
+Removing note for object e46b064f913b6c0ec92bdb2e3cdc956a9ad929d8
+Removing note for object da6a0c7b416f1929e37ad4ab7aa9a43e40bba3a4
+Removing note for object 0e7679756bda78bcb761a92425082d33ae2eabd6
+Removing note for object 3d884933f1ff6c4b8d3ffffb2c1985295ffc7578
+Removing note for object eb5fad11a1860cbc711e7aae5f815d49739027f9
+Removing note for object 6c5b7cca48d408e6597aae06ac190bf435eea0af
+Removing note for object 9ae6abb2dd899f3453bd4a42c6083d29e5ee2c25
+Removing note for object 1c2be6e6b8a1512b49e2d0ce4f320ac62663bd7c
+Removing note for object 91ba16e88693278bac6ea5b6652be27d519c6284
+Removing note for object 04891a4865ab739593d7f5d934906d805027dcbd
+Removing note for object b727600ac1fd560a92140c46077ce7f8a20f8db2
+Removing note for object 29b24dcd761b95b975c46ffa137d98f74d956875
+Removing note for object b1a3d0c9ddc40d03b3d59b6c7930df4012a61d0a
+Removing note for object 3698be91e4a9197cfefba28d171e52fc0fb571fa
+Removing note for object 85388b2ffc9342b1a9237c75f3f7cb79cc410e64
+Removing note for object 0aed77a3e97c3854fcd751b1f94ecb6756725974
+Removing note for object 011539f0b7e8e95c22436d224695aae6c48bb3db
+Removing note for object 43aa9d033a8bbfa9f3e8b0d7c9a715d1d0096c05
+Removing note for object c35ea1a727952227b88357433be4bdfb30e55856
+Removing note for object 46f4a82d64902ab63e4d7de6c78da677c3b20f8e
+Removing note for object 695cbdb56848e3e0e403da2ea9ef18d665481c3c
+Removing note for object 7c7ef41170927a3a7999968540534c70f68ce2c9
+Removing note for object e48a2c3b1b9c23598053a0416d31f9935be4ce83
+Removing note for object 6c66c6ef6b7c907f347fca51f1dc779eee27f35e
+Removing note for object 1e436c8a45959f2f4dfda6256f00caab47c79e7b
+Removing note for object 28a86738bc402f34c2b895820e4710f9b7517ce1
+Removing note for object a4075445b64d0bfb6d601a08598d4c346391ba6e
+Removing note for object 5136d8fd93d2016a0d59ea94013508fc771d7412
+Removing note for object 581964916f22d8ed9e54c42a5f02ebeeff208a54
+Removing note for object 408b845562d9579cac992b13dcf78c7bc351b83c
+Removing note for object f6606205b38996de225eb0d20a4436613226c5b4
+Removing note for object 69ad0c3f89c0348adaeb2b245f24678ff8fc73ef
+Removing note for object 16d4da4076e02831d14264341b46adc23de10d31
+Removing note for object 61245559e67f9f9ed73efe2bc7ba05c3b0dc61a3
+Removing note for object f5fc94c753f4fd9f47311e9a96823508fdf12867
+Removing note for object 4bf49ef5b8de8cf570854c1c5249b17dbac4da6d
+Removing note for object 2b5e34f8ec5a967a8c118b504cb7c9f82425d307
+Removing note for object 71feadd9546a386bba0956643a7618130275ca2d
+Removing note for object c435f7d2da121e6ca478542d81a09b4cfb1e6d40
+Removing note for object 83b6710b31fe03be8147f88d5679dc1e7d6b93e7
+Removing note for object a5cec4217c4c9459acd08946a5936109f92b234a
+Removing note for object 3466f2562096ec7fee77cfcaf975e045d5ba8bd8
+Removing note for object 0356dbfd30b5c8109865b192297b202b8d4b93b5
+Removing note for object ef04490e0dd39166aa62f7be4cbb8a42c9e9b876
+Removing note for object c6251d973d7136acf8b2817e8275fba9e0bb102d
+Removing note for object a18e024b9c635d261c2f54612b342a67928b8068
+Removing note for object 9d03e90800a10023bd868e1e7fee6a0d54bdb972
+Removing note for object 41d89def92a9052d7cc2ae1c673e807f7ee2bc15
+Removing note for object c1c691f1ee137258e216986125ad7169bbc9944b
+Removing note for object 5536984fddffdfdad3a5007221f3b08dc46e32eb
+Removing note for object cd905ab02b0fbdec5407cc7c454d959645e4fabb
+Removing note for object 8b33d27218a7e8cab8a6d2ff5eddd348c36029ba
+Removing note for object 81491394bf0249b2639a9f4f6bfc43c0e38370d4
+Removing note for object 76bff28d5965aaff4f7ba16e4b7a4bfb05bdc334
+Removing note for object e3504135096a7ca00095a761fcf71ecdd2794043
+Removing note for object 74125e7e86a34c7385ea36bff5c5e8f481b423c5
+Removing note for object 5fed9794bc006a7326587300052cb7e44639412a
+Removing note for object 3510fb1bd504c9221f9679da3fdc2845cf21e140
+Removing note for object bf473ccfa7fdc1e61f62f9c874238a0de5fc513d
+Removing note for object fc327306de924737f321c9baeefdcca0df16d2bc
+Removing note for object 2c10f7b0afac72972ec95cb4d308ba7421755512
+Removing note for object 297d6cb08dee5d25ce9ba83eecdeaf449da865bb
+Removing note for object 545c4c1b43dcc4d0a99cd98fcda0bae1005a78b2
+Removing note for object 4a996de24e1ffe26f732c854882697c1ad516386
+Removing note for object 844420c079e48a5166c01a85a790ce6bdeb873bd
+Removing note for object 023515e4ad959899e29b27f5c5f83c8a1a2de28c
+Removing note for object 7585ebad749b486c7ebf9f8e0855ac3099d09a38
+Removing note for object 413376f50b0489aaecbce66bf7b54b98e6550e03
+Removing note for object 2873e3beec9c3d56bad8f485e61d6a2cf9a16c8c
+Removing note for object 61f865b2efc1072fdb8ed9fe06118feae86e84f7
+Removing note for object 1ea06f1458f13efee0b785253f989b694f938edb
+Removing note for object ce8b86ae2c160f88e1c799aa6837f6c773956227
+Removing note for object e3306eaa12a31c691d43bbca19f98a2d9dab4ba9
+Removing note for object c2fb991d7ec9543b161f4f98c624929675ff4c5d
+Removing note for object d11385ba15c9c5e331981f68dd6bd7164ccf3f85
+Removing note for object 6f891e8ffe677a4c89d16dd2c665ee0e14c7a299
+Removing note for object ed339d1d371f85637989f68d0eb557f351577a21
+Removing note for object 4750ac4f1a2e220c1e8f6640294532c98d99f200
+Removing note for object f292c7df6101b6388f4d124dd0e359f53665aeb9
+Removing note for object 6457f18ae180c94ff5f7e0ea32f5d33194813bd5
+Removing note for object 80dca81cb5b833d22335d913b49a273d34062db9
+Removing note for object c4a04fb500fde0e2ec185ceef5e830841ef81190
+Removing note for object 37f7f6d33ccea935fd3052dcf56f0702a5688a56
+Removing note for object b174abe99a10da71c24f307c4be43b8fd13ddd81
+Removing note for object 521324fde746e0ed1d52d3da451c3d5ce0a51853
+Removing note for object 22145dda21dc965767c9837a456e045b0b905d72
+Removing note for object 65cd0782f778269cac585ca0cfceb3b65b4b0136
+Removing note for object 9f0e002cb37dba666555cb19d9825d53bc1efc7e
+Removing note for object ff7230819570fd6ca726ec2870c7acdbc33475eb
+Removing note for object fdf030fde5370388b806af92806e62e2bfb1bb11
+Removing note for object 5bbfd9a6221cce07357876e6702a17e7a96faae5
+Removing note for object 5863cde659f7dda95d24a43459f482038bbe8eba
+Removing note for object dcbb95084ba98cb6a950efc8a6f340b84dee87c7
+Removing note for object 2f60ea03c053734f2cde5a7f31ace9bac1ee19da
+Removing note for object 7dea3506366b9b27f57bafeb6e5bd508b00c5923
+Removing note for object 589a50a5e7daf7983baf43177e3fab221b3f0781
+Removing note for object 9a87326a7e4fec8672ce330e076fc6dba7c23366
+Removing note for object 177838d572b4628311ae9ba649a598c0627c2088
+Removing note for object b00c6f3383767d26b6b6af4057c6c9e56ec72803
+Removing note for object d856441fdb792888b635d1f62bfba9e64b772960
+Removing note for object 3f023909b06329744f931861ebb9c9bd12da1b84
+Removing note for object b161b8a0267657e40c21ea0a7637c9da05cb6234
+Removing note for object c3f42ce00ec78e8c5653eee37687d86870c1d2c5
+Removing note for object fc070b682384d45f45798cb8883f6f779a8d105f
+Removing note for object 794e608cc670532a53e521b37080ac4fb39e5775
+Removing note for object ce4d96ea40482e50d733d943d3aa1326c5f27f20
+Removing note for object 93d93d194fd2c9309ad75ba0ac36eed962540471
+Removing note for object f5ddfa52c42f3fe5bc24b1d7436d269718fb4ec6
+Removing note for object 84e47a901d70a1b913359a59b0eb4128921d6764
+Removing note for object 54a943437a41a035ae36187788f7863a14677754
+Removing note for object 6a28e6066c6213cc0535eb58ea15cc26cc0cb17d
+Removing note for object 7d8ba8659bb15e61daf37be731562cafc8701af4
+Removing note for object c2a06db27f237154cdf5ae99e9336ad7ac101c75
+Removing note for object ebcbe749543cb23055bfad287b08edd5dd506e49
+Removing note for object 22e47c76aa2449f554aa282f61ce8005a9da279e
+Removing note for object 81090cc10824f5f6a229195d061d5a062241f64e
+Removing note for object 27437784483a95ad6a86161d4e6082efa3fc4b99
+Removing note for object 1becd0970add28104ec7023fa8660f59c8dc85e5
+Removing note for object 975edfc698cb84099be9cd6f54b94c6b0bdfbf3e
+Removing note for object 698172dcc506d88c5d745f6b441ce316e908ac25
+Removing note for object 6c5035c5f925f25c4081fe33bea2e87bd4344eeb
+Removing note for object 7a1b8459367f67da01cbd0852e27aafa063eae5b
+Removing note for object 34a270c65107179578d5cf71f88997941cfceb68
+Removing note for object e1ca3debff6d7f8751a0c43f8e649c37c39ddcff
+Removing note for object f2cd69f72028b7f0334dc46c677dbf6e34c64ff9
+Removing note for object b5b96cb5f658ff89cad9d65d3fe90935741d4280
+Removing note for object 3d231f1ae4643fde656b5195e8a44598a524346c
+Removing note for object 92aff6e6403899d4467dca0759a5f9ca9f6083e8
+Removing note for object d7d8923b4e4c23a1f6a66f072403269416d7bdc5
+Removing note for object f5dbbac5c21c898c8673760bc67123f9ca551f62
+Removing note for object 671b9a1a077aafd0194137ce810e99e8e17aabf7
+Removing note for object cf858fab0fd223f87642d61c2dec71777d597370
+Removing note for object 404b958c22b0eec12dd009d4e6bc043a995096ad
+Removing note for object 30e25d85636fbb5a3962893e97204525d507fe5b
+Removing note for object 68fdee2a017d2b19536a79794a90ac13ad3c9120
+Removing note for object 2beb65e939af69464e8ed5dcdd4c10f8ab65110e
+Removing note for object ae862168e1774f973a69502c447480f81c035c00
+Removing note for object 422f97df0f1f254299575475841c717032a6ca32
+Removing note for object f7b9f4caf310f040a99a8117be5928e95be0b97e
+Removing note for object 7bb335e0bde4008652eb5f427a4a7390ae288309
+Removing note for object f17072c2db1767d4e1c41e0411294506f014c2af
+Removing note for object 99c50e745458fd2faf1c0f55273b7512348d2ddc
+Removing note for object 9aa56e0371ac9a4a4f10b34878d53d83ca8190ca
+Removing note for object 8738fb580d364e7645f0f7e0206dd1f000f03c84
+Removing note for object 2db58456e56e9ee9f425944d1c7743519a24784d
+Removing note for object a33d485949f214abc9fbb192ff36632eaa4cf0b3
+Removing note for object 8e59f0f4fc11cc909b24f15a6ef1b6e1a3fa7bc8
+Removing note for object cd604ed04d960a2e7fead48dd5d1e3fd9ca7886d
+Removing note for object 0c320249ca0ddd30c6fc90374656f6331633280a
+Removing note for object f15d09c23da1e142fd85798fbd4ac0b29cb858f3
+Removing note for object 0a256346bb1c2687845aca1e06c2dcb5d1ac9cf3
+Removing note for object 03a07cdc62a571762b99320c43428698b2d3d91b
+Removing note for object 86b4ee723d450722f69493786dc1a1b3c85f456b
+Removing note for object 5ef6c6a2209bc341ee9300945ee24397668600e9
+Removing note for object eee7b5e88db8d2f4eeff2bfd4ced42dc2b77576c
+Removing note for object 331c2d29861aa09a00a73056e70f156650ef1b4a
+Removing note for object bb32de951ad1f794e77afa53a31aa9433bfdb121
+Removing note for object fe8c44ed3546c964bd8398f5fc0c8d5ee01c08dd
+Removing note for object ac00acde313fa0157a4805bdbce2f22d7e57750a
+Removing note for object 1adc2b3c4610b4da4b2c00cbf153395bb5f72ed0
+Removing note for object 59238cad6edee95b454423e535876306852f6b93
+Removing note for object 4f5bde2686729dfaa60e10051820409fc7102027
+Removing note for object 07db9a697feba6bacfc603c13c8c184c376c1fde
+Removing note for object acd7eec9dcc24a3fda4a46d9cf11056f9fb51592
+Removing note for object 198c967016d1d00e0fc01d66d500fec19cb672e2
+Removing note for object 6d7b633c45a92a296093e657ced14d46d8e86970
+Removing note for object 8f6653f2c207619ceba3794249d8bac152454b16
+Removing note for object c04389fb08740d6a3df7158a5e4843bdc07d2539
+Removing note for object 77cd9bf11d2a4b1577dbcb65eafef24ca5f8d64c
+Removing note for object 4d2fca6077788dcdecd4ef82eb45155d3d3c6ae9
+Removing note for object 7f5b0d2394f7a4410784788eb55a86357795e0ee
+Removing note for object 77c91abace28d046f8f08482515dd4d0ee20e771
+Removing note for object 407c31999146268ab83d71891c905685839800c9
+Removing note for object eb3c3aede523d729990ac25c62a93eb47c21e2e3
+Removing note for object 7d116c2f10b15fa50a8e9f229b3b81c5be8980fa
+Removing note for object 8b658fffa694c94a228bd277048256f1ede590d1
+Removing note for object 0cb7eabc69f7cd5f3859906e5aa190bf6a0080dc
+Removing note for object 1270dedbb9873b651b7661f6fd7f20eca25dcce9
+Removing note for object b944dbe8ce8fa4df89750bdf3a6cd8828ff2f1b9
+Removing note for object a8b0b847225e38e28d972bb583db100457dbf2c0
+Removing note for object 46dcf25ab1fb7b08d57dfef57c2d4ef9cdea0368
+Removing note for object 1ef946fbe3fce53728ce0f4e3f3b686f29783ea9
+Removing note for object 9fb987e1900004b51a70d9945feb70d1a26c5db9
+Removing note for object 697e0a1102060a6a7f0e78c614e6e088e22a746d
+Removing note for object 5c65b7962b5bb7291f385885ae0fe5dc5dd1f9f9
+Removing note for object bdeafb301e44b0e4db0f738a2d2a7beefdb70b70
+Removing note for object 51b4081b24cd2ae32dda79a6bf89c6ca47cd0e19
+Removing note for object 6699f4279478278b1b456670806c5114e5b94cd3
+Removing note for object 24a6294035c71abc89705f20573835a048058e48
+Removing note for object 68e303067eaade6915640259529f90f06a3d723f
+Removing note for object 47797ab742998acf558ec5ecd8f73a170767322d
+Removing note for object a68559cad834c4bf10f897cacff96708fd4c9a06
+Removing note for object 257cfeaa5d3091ff76387dc6129e83307e8ec0c5
+Removing note for object f133b89cb79d15f0d85a19317b2dbc5a871c2039
+Removing note for object bff2d39b4f7122bd4c5caee3de353a774d1e632a
+Removing note for object b2f9acae37b0cff7904de95d05e6077d318696c2
+Removing note for object 46f7cc54c0193d02dc4dff1c8f998cfebb8c17b8
+Removing note for object d38ec8f851adf470131178085bfbaab4b12ad2a7
+Removing note for object 597947c97e89280e1eddffc4c30e36c1cb5e8882
+Removing note for object f297f34cfbd904559c0d202b578b112ef5ae50c2
+Removing note for object edd7609018ee7927fd1f8604ea3223e98a44a245
+Removing note for object 03f8530d6eb3617ab8c874b47651509115d54b5e
+Removing note for object ae3ed93531b892b72e7ae1125b3c0e266df4ab70
+Removing note for object ac647561477b7eddb3807defcb481b30af7db978
+Removing note for object 3f096680dbfb873aa9008e9e22559cc94c4a634e
+Removing note for object 7d50e571ffcb9d83478504d8fdd403aecd8df6a3
+Removing note for object 19eb0d4282bc5d4e46ec80864a71cd2e48bcf18c
+Removing note for object 5a50ba526cb7a741e3736b33e111cd5a35e68d3f
+Removing note for object 90911a48f69e3d23142660e2e658bb72d6bb30d2
+Removing note for object 382d7647311957adb8d7feccfbfddfd6d092d875
+Removing note for object ab5f23d01513db15925fbc0d19e07dc67bb7695d
+ok 5 - deleting most notes with git-notes
+
+expecting success of 3305.6 'most notes deleted correctly with git-notes': 
+	git log HEAD~$remove_notes | grep "^    " > output &&
+	i=$(($num_notes - $remove_notes)) &&
+	while test $i -gt 0
+	do
+		echo "    commit #$i" &&
+		echo "    note #$i" &&
+		i=$(($i - 1)) || return 1
+	done > expect &&
+	test_cmp expect output
+
+ok 6 - most notes deleted correctly with git-notes
+
+expecting success of 3305.7 'stable fanout 1 is followed by stable fanout 0': 
+	i=$remove_notes &&
+	fanout=1 &&
+	while test $i -gt 0
+	do
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
+		then
+			continue
+		elif test $fanout -eq 1
+		then
+			fanout=0 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 0
+
+Fanout 1 -> 0 at refs/notes/commits~43
+ok 7 - stable fanout 1 is followed by stable fanout 0
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3909-stash-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3909-stash-pathspec-file/.git/
+expecting success of 3909.1 'setup': 
+	>fileA.t &&
+	>fileB.t &&
+	>fileC.t &&
+	>fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "Files" &&
+
+	git tag checkpoint
+
+[master (root-commit) 2d1bb5b] Files
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+ok 1 - setup
+
+expecting success of 3909.2 'simplest': 
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	EOF
+
+	echo fileA.t | git stash push --pathspec-from-file=- &&
+	verify_expect
+
+HEAD is now at 2d1bb5b Files
+Saved working directory and index state WIP on master: 2d1bb5b Files
+ok 2 - simplest
+
+expecting success of 3909.3 '--pathspec-file-nul': 
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	M	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+
+HEAD is now at 2d1bb5b Files
+Saved working directory and index state WIP on master: 2d1bb5b Files
+ok 3 - --pathspec-file-nul
+
+expecting success of 3909.4 'only touches what was listed': 
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileB.t
+	M	fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
+	verify_expect
+
+HEAD is now at 2d1bb5b Files
+Saved working directory and index state WIP on master: 2d1bb5b Files
+ok 4 - only touches what was listed
+
+expecting success of 3909.5 'error conditions': 
+	restore_checkpoint &&
+	echo A >fileA.t &&
+	echo fileA.t >list &&
+
+	test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+
+	test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git stash push --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
+
+HEAD is now at 2d1bb5b Files
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+ok 5 - error conditions
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3701-add-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3701-add-interactive/.git/
 expecting success of 3701.1 'unknown command': 
@@ -215238,9 +216345,9 @@
 1..85
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/.git/
-expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
+*** t3513-revert-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/.git/
+expecting success of 3513.1 'git_revert: added submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -215253,31 +216360,31 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
-[main (root-commit) 63c4304] Base inside first submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
-[main (root-commit) 27c5769] nested submodule base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
-[main (root-commit) 27611a5] Base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
 Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/uninitialized_sub'...
 done.
 [add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
@@ -215300,13 +216407,13 @@
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
 [modify_sub1 cb2bda7] Modify sub1
  Author: A U Thor <author@example.com>
 Switched to a new branch 'add_nested_sub'
 Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1/sub2'...
 done.
 [add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
@@ -215327,9 +216434,9 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 [modify_sub1_recursively 953e869] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub2
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
 Cleared directory 'sub2'
 Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
@@ -215373,29 +216480,38 @@
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
 warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'main'
+Switched to branch 'master'
 Cloning into 'submodule_update'...
 done.
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+[add_sub1 000ad6b] Reapply "Add sub1"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_test_func: added submodule creates empty directory
+ok 1 - git_revert: added submodule creates empty directory
 
-expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
+expecting success of 3513.2 'git_revert: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -215414,23 +216530,32 @@
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+[add_sub1 000ad6b] Reapply "Add sub1"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  2 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_test_func: added submodule leaves existing empty directory alone
+ok 2 - git_revert: added submodule leaves existing empty directory alone
 
-expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
+expecting success of 3513.3 'git_revert: replace tracked file with submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_file &&
 		(
@@ -215449,22 +216574,29 @@
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
 fatal: Needed a single revision
 branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+[replace_file_with_sub1 2605f87] Reapply "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+[replace_file_with_sub1 03c927a] Revert "Reapply "Replace sub1 with file""
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  2 files changed, 5 insertions(+), 1 deletion(-)
  mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_test_func: replace tracked file with submodule creates empty directory
+ok 3 - git_revert: replace tracked file with submodule creates empty directory
 
-expecting success of 3512.4 'git_test_func: replace directory with submodule': 
+expecting success of 3513.4 'git_revert: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -215483,24 +216615,34 @@
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
 fatal: Needed a single revision
 branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+[replace_directory_with_sub1 52671cf] Reapply "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+[replace_directory_with_sub1 3cda69e] Revert "Reapply "Replace sub1 with directory""
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  4 files changed, 4 insertions(+), 3 deletions(-)
  delete mode 100644 sub1/file1
  delete mode 100644 sub1/file2
  delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_test_func: replace directory with submodule
+ok 4 - git_revert: replace directory with submodule
 
-expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+expecting success of 3513.5 'git_revert: removed submodule leaves submodule directory and its contents in place': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215515,22 +216657,31 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'remove_sub1' set up to track 'origin/remove_sub1'.
 warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+warning: unable to rmdir 'sub1': Directory not empty
+[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
  delete mode 160000 uninitialized_sub
-ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
+ok 5 - git_revert: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+expecting success of 3513.6 'git_revert: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215547,22 +216698,31 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'remove_sub1' set up to track 'origin/remove_sub1'.
 warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 000ad6b] Reapply "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+warning: unable to rmdir 'sub1': Directory not empty
+[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
  3 files changed, 9 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 sub1
  delete mode 160000 uninitialized_sub
-ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+ok 6 - git_revert: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
+expecting success of 3513.7 'git_revert: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215577,20 +216737,19 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
+error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
 	sub1/file2
-Please move or remove them before you merge.
+Please move or remove them before you switch branches.
 Aborting
-fatal: cherry-pick failed
-ok 7 - git_test_func: replace submodule with a directory must fail
+ok 7 - git_revert: replace submodule with a directory must fail
 
-expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+expecting success of 3513.8 'git_revert: replace submodule containing a .git directory with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215607,20 +216766,19 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
+error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
 	sub1/file2
-Please move or remove them before you merge.
+Please move or remove them before you switch branches.
 Aborting
-fatal: cherry-pick failed
-ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
+ok 8 - git_revert: replace submodule containing a .git directory with a directory must fail
 
-checking known breakage of 3512.9 'git_test_func: replace submodule with a file must fail': 
+checking known breakage of 3513.9 'git_revert: replace submodule with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215635,20 +216793,17 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 9 - git_revert: replace submodule with a file must fail # TODO known breakage
 
-checking known breakage of 3512.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+checking known breakage of 3513.10 'git_revert: replace submodule containing a .git directory with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215665,20 +216820,17 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 10 - git_revert: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
+expecting success of 3513.11 'git_revert: modified submodule does not update submodule work tree': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215695,18 +216847,23 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-[add_sub1 cb2bda7] Modify sub1
+Switched to branch 'modify_sub1'
+Your branch is up to date with 'origin/modify_sub1'.
+[modify_sub1 d25c1ce] Revert "Modify sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+[modify_sub1 c259f2c] Reapply "Modify sub1"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
 Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_test_func: modified submodule does not update submodule work tree
+ok 11 - git_revert: modified submodule does not update submodule work tree
 
-expecting success of 3512.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+expecting success of 3513.12 'git_revert: modified submodule does not update submodule work tree to invalid commit': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -215723,20 +216880,25 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-[add_sub1 e6169bf] Invalid sub1 commit
+Switched to branch 'invalid_sub1'
+Your branch is up to date with 'origin/invalid_sub1'.
+[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+[invalid_sub1 b7227e2] Reapply "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
 fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
 fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+ok 12 - git_revert: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 3512.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+expecting success of 3513.13 'git_revert: modified submodule does not update submodule work tree from invalid commit': 
 		prolog &&
 		reset_work_tree_to invalid_sub1 &&
 		(
@@ -215755,20 +216917,25 @@
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 fatal: Needed a single revision
 branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+[valid_sub1 b7227e2] Reapply "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
+[valid_sub1 909462b] Revert "Reapply "Invalid sub1 commit""
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+expecting success of 3513.14 'git_revert: added submodule doesn't remove untracked unignored file with same name': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -215785,103 +216952,15 @@
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
+error: The following untracked working tree files would be overwritten by checkout:
 	sub1
-Please move or remove them before you merge.
+Please move or remove them before you switch branches.
 Aborting
-fatal: cherry-pick failed
-ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3512.15 'unrelated submodule/file conflict is ignored': 
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-
-	touch sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add a file in a submodule" &&
-
-	test_create_repo a_repo &&
-	(
-		cd a_repo &&
-		>a_file &&
-		git add a_file &&
-		git commit -m "add a file" &&
-
-		git branch test &&
-		git checkout test &&
-
-		mkdir sub &&
-		>sub/content &&
-		git add sub/content &&
-		git commit -m "add a regular folder with name sub" &&
-
-		echo "123" >a_file &&
-		git add a_file &&
-		git commit -m "modify a file" &&
-
-		git checkout main &&
-
-		git submodule add ../sub sub &&
-		git submodule update sub &&
-		git commit -m "add a submodule info folder with name sub" &&
-
-		git cherry-pick test
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
-[main (root-commit) 8e92946] add a file in a submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
-[main (root-commit) ab27302] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a_file
-Switched to branch 'test'
-[test 472972d] add a regular folder with name sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/content
-[test 32d3b70] modify a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
-done.
-[main 77c71a9] add a submodule info folder with name sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main ec77434] modify a file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 15 - unrelated submodule/file conflict is ignored
+ok 14 - git_revert: added submodule doesn't remove untracked unignored file with same name
 
 # still have 2 known breakage(s)
-# passed all remaining 13 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3910-mac-os-precompose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3910-mac-os-precompose/.git/
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-	# check whether FS converts nfd unicode to nfc
-	auml=$(printf "\303\244")
-	aumlcdiar=$(printf "\141\314\210")
-	>"$auml" &&
-	test -f "$aumlcdiar"
-
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-1..0 # SKIP filesystem does not corrupt utf-8
+# passed all remaining 12 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3905-stash-include-untracked.sh ***
@@ -216483,732 +217562,150 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3909-stash-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3909-stash-pathspec-file/.git/
-expecting success of 3909.1 'setup': 
-	>fileA.t &&
-	>fileB.t &&
-	>fileC.t &&
-	>fileD.t &&
-	git add fileA.t fileB.t fileC.t fileD.t &&
-	git commit -m "Files" &&
+*** t3910-mac-os-precompose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3910-mac-os-precompose/.git/
+checking prerequisite: UTF8_NFD_TO_NFC
 
-	git tag checkpoint
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+	# check whether FS converts nfd unicode to nfc
+	auml=$(printf "\303\244")
+	aumlcdiar=$(printf "\141\314\210")
+	>"$auml" &&
+	test -f "$aumlcdiar"
 
-[master (root-commit) 2d1bb5b] Files
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
-ok 1 - setup
+)
+prerequisite UTF8_NFD_TO_NFC not satisfied
+1..0 # SKIP filesystem does not corrupt utf-8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4005-diff-rename-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4005-diff-rename-2/.git/
+expecting success of 4005.1 'setup reference tree': 
+	COPYING_test_data >COPYING &&
+	echo frotz >rezrov &&
+	git update-index --add COPYING rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree &&
+	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
+	origoid=$(git hash-object COPYING) &&
+	oid1=$(git hash-object COPYING.1) &&
+	oid2=$(git hash-object COPYING.2)
 
-expecting success of 3909.2 'simplest': 
-	restore_checkpoint &&
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - setup reference tree
 
-	# More files are written to make sure that git didnt ignore
-	# --pathspec-from-file, stashing everything
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
+expecting success of 4005.2 'validate output from rename/copy detection (#1)': 
+	rm -f COPYING &&
+	git update-index --add --remove COPYING COPYING.? &&
 
-	cat >expect <<-\EOF &&
-	M	fileA.t
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
+	:100644 100644 $origoid $oid2 R1234	COPYING	COPYING.2
 	EOF
+	git diff-index -C $tree >current &&
+	compare_diff_raw expected current
 
-	echo fileA.t | git stash push --pathspec-from-file=- &&
-	verify_expect
-
-HEAD is now at 2d1bb5b Files
-Saved working directory and index state WIP on master: 2d1bb5b Files
-ok 2 - simplest
-
-expecting success of 3909.3 '--pathspec-file-nul': 
-	restore_checkpoint &&
+ok 2 - validate output from rename/copy detection (#1)
 
-	# More files are written to make sure that git didnt ignore
-	# --pathspec-from-file, stashing everything
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
+expecting success of 4005.3 'validate output from rename/copy detection (#2)': 
+	mv COPYING.2 COPYING &&
+	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
 
-	cat >expect <<-\EOF &&
-	M	fileA.t
-	M	fileB.t
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid2 M	COPYING
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
+	git diff-index -C $tree >current &&
+	compare_diff_raw current expected
 
-	printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
-	verify_expect
-
-HEAD is now at 2d1bb5b Files
-Saved working directory and index state WIP on master: 2d1bb5b Files
-ok 3 - --pathspec-file-nul
-
-expecting success of 3909.4 'only touches what was listed': 
-	restore_checkpoint &&
+ok 3 - validate output from rename/copy detection (#2)
 
-	# More files are written to make sure that git didnt ignore
-	# --pathspec-from-file, stashing everything
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
+expecting success of 4005.4 'validate output from rename/copy detection (#3)': 
+	COPYING_test_data >COPYING &&
+	git update-index --add --remove COPYING COPYING.1 &&
 
-	cat >expect <<-\EOF &&
-	M	fileB.t
-	M	fileC.t
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
 
-	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
-	verify_expect
-
-HEAD is now at 2d1bb5b Files
-Saved working directory and index state WIP on master: 2d1bb5b Files
-ok 4 - only touches what was listed
-
-expecting success of 3909.5 'error conditions': 
-	restore_checkpoint &&
-	echo A >fileA.t &&
-	echo fileA.t >list &&
-
-	test_must_fail git stash push --pathspec-from-file=list --patch 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
-
-	test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
-
-	test_must_fail git stash push --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err
-
-HEAD is now at 2d1bb5b Files
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-ok 5 - error conditions
+ok 4 - validate output from rename/copy detection (#3)
 
-# passed all 5 test(s)
-1..5
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3513-revert-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/.git/
-expecting success of 3513.1 'git_revert: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-[add_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_revert: added submodule creates empty directory
-
-expecting success of 3513.2 'git_revert: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-[add_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_revert: added submodule leaves existing empty directory alone
-
-expecting success of 3513.3 'git_revert: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 2605f87] Reapply "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-[replace_file_with_sub1 03c927a] Revert "Reapply "Replace sub1 with file""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_revert: replace tracked file with submodule creates empty directory
-
-expecting success of 3513.4 'git_revert: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-[replace_directory_with_sub1 52671cf] Reapply "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-[replace_directory_with_sub1 3cda69e] Revert "Reapply "Replace sub1 with directory""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_revert: replace directory with submodule
-
-expecting success of 3513.5 'git_revert: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-warning: unable to rmdir 'sub1': Directory not empty
-[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 5 - git_revert: removed submodule leaves submodule directory and its contents in place
+*** t4004-diff-rename-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4004-diff-rename-symlink/.git/
+checking prerequisite: SYMLINKS
 
-expecting success of 3513.6 'git_revert: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 000ad6b] Reapply "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-warning: unable to rmdir 'sub1': Directory not empty
-[remove_sub1 6ba97a8] Revert "Reapply "Add sub1""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 6 - git_revert: removed submodule leaves submodule containing a .git directory alone
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 3513.7 'git_revert: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 7 - git_revert: replace submodule with a directory must fail
+)
+prerequisite SYMLINKS ok
+expecting success of 4004.1 'prepare reference tree': 
+	echo xyzzy | tr -d \\012 >yomin &&
+	ln -s xyzzy frotz &&
+	git update-index --add frotz yomin &&
+	tree=$(git write-tree) &&
+	echo $tree
 
-expecting success of 3513.8 'git_revert: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 8 - git_revert: replace submodule containing a .git directory with a directory must fail
+e8a7292168115b2c189b56bd500aa179ca8d69ba
+ok 1 - prepare reference tree
 
-checking known breakage of 3513.9 'git_revert: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 9 - git_revert: replace submodule with a file must fail # TODO known breakage
+expecting success of 4004.2 'prepare work tree': 
+	mv frotz rezrov &&
+	rm -f yomin &&
+	ln -s xyzzy nitfol &&
+	ln -s xzzzy bozbar &&
+	git update-index --add --remove frotz rezrov nitfol bozbar yomin
 
-checking known breakage of 3513.10 'git_revert: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 10 - git_revert: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 2 - prepare work tree
 
-expecting success of 3513.11 'git_revert: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Switched to branch 'modify_sub1'
-Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 d25c1ce] Revert "Modify sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[modify_sub1 c259f2c] Reapply "Modify sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_revert: modified submodule does not update submodule work tree
+expecting success of 4004.3 'setup diff output': 
+	GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
+	cat >expected <<\EOF
+diff --git a/bozbar b/bozbar
+new file mode 120000
+--- /dev/null
++++ b/bozbar
+@@ -0,0 +1 @@
++xzzzy
+\ No newline at end of file
+diff --git a/frotz b/nitfol
+similarity index 100%
+copy from frotz
+copy to nitfol
+diff --git a/frotz b/rezrov
+similarity index 100%
+rename from frotz
+rename to rezrov
+diff --git a/yomin b/yomin
+deleted file mode 100644
+--- a/yomin
++++ /dev/null
+@@ -1 +0,0 @@
+-xyzzy
+\ No newline at end of file
+EOF
 
-expecting success of 3513.12 'git_revert: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Switched to branch 'invalid_sub1'
-Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[invalid_sub1 b7227e2] Reapply "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_revert: modified submodule does not update submodule work tree to invalid commit
+ok 3 - setup diff output
 
-expecting success of 3513.13 'git_revert: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 b7227e2] Reapply "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-[valid_sub1 909462b] Revert "Reapply "Invalid sub1 commit""
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3513-revert-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
+expecting success of 4004.4 'validate diff output': 
+	compare_diff_patch current expected
 
-expecting success of 3513.14 'git_revert: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 14 - git_revert: added submodule doesn't remove untracked unignored file with same name
+ok 4 - validate diff output
 
-# still have 2 known breakage(s)
-# passed all remaining 12 test(s)
-1..14
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4003-diff-rename-1.sh ***
@@ -217262,516 +217759,34 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3305-notes-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3305-notes-fanout/.git/
-expecting success of 3305.1 'tweak test environment': 
-	git checkout -b nondeterminism &&
-	test_commit A &&
-	git checkout --orphan with_notes;
+*** t4000-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4000-diff-format/.git/
+expecting success of 4000.1 'update-index --add two files with and without +x.': 
+	git update-index --add path0 path1 path2/path3
 
-Switched to a new branch 'nondeterminism'
-[nondeterminism (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'with_notes'
-ok 1 - tweak test environment
+ok 1 - update-index --add two files with and without +x.
 
-expecting success of 3305.2 'creating many notes with git-notes': 
-	num_notes=300 &&
-	i=0 &&
-	while test $i -lt $num_notes
-	do
-		i=$(($i + 1)) &&
-		test_tick &&
-		echo "file for commit #$i" > file &&
-		git add file &&
-		git commit -q -m "commit #$i" &&
-		git notes add -m "note #$i" || return 1
-	done
+expecting success of 4000.2 'git diff-files -p after editing work tree.': 
+	git diff-files -p >actual
 
-ok 2 - creating many notes with git-notes
+ok 2 - git diff-files -p after editing work tree.
 
-expecting success of 3305.3 'many notes created correctly with git-notes': 
-	git log >output.raw &&
-	grep "^    " output.raw >output &&
-	i=$num_notes &&
-	while test $i -gt 0
-	do
-		echo "    commit #$i" &&
-		echo "    note #$i" &&
-		i=$(($i - 1)) || return 1
-	done > expect &&
-	test_cmp expect output
+expecting success of 4000.3 'validate git diff-files -p output.': 
+	compare_diff_patch expected actual
 
-ok 3 - many notes created correctly with git-notes
+ok 3 - validate git diff-files -p output.
 
-expecting success of 3305.4 'stable fanout 0 is followed by stable fanout 1': 
-	i=$num_notes &&
-	fanout=0 &&
-	while test $i -gt 0
-	do
-		i=$(($i - 1)) &&
-		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
-		then
-			continue
-		elif test $fanout -eq 0
-		then
-			fanout=1 &&
-			if all_notes_have_fanout refs/notes/commits~$i $fanout
-			then
-				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
-				continue
-			fi
-		fi &&
-		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
-		git ls-tree -r --name-only refs/notes/commits~$i &&
-		return 1
-	done &&
-	all_notes_have_fanout refs/notes/commits 1
+expecting success of 4000.4 'git diff-files -s after editing work tree': 
+	git diff-files -s >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
 
-Fanout 0 -> 1 at refs/notes/commits~202
-ok 4 - stable fanout 0 is followed by stable fanout 1
+ok 4 - git diff-files -s after editing work tree
 
-expecting success of 3305.5 'deleting most notes with git-notes': 
-	remove_notes=285 &&
-	i=0 &&
-	git rev-list HEAD >revs &&
-	while test $i -lt $remove_notes && read sha1
-	do
-		i=$(($i + 1)) &&
-		test_tick &&
-		git notes remove "$sha1" || return 1
-	done <revs
-
-Removing note for object 294487610d9e2f1885f32c5aa8c40e1feae544e6
-Removing note for object 264d6d5a375b9b4a748e868f8887139e144dd9ac
-Removing note for object f4791ca4424bf830c9c4c2fae376f8c17584ecfc
-Removing note for object 04413ee0c628c2149ce195709e68ba9739cecaeb
-Removing note for object 2cba5326a57bff88235ffe0d680843c3a875fdc6
-Removing note for object 98c3a61e7f6474b9edadcd9fd0e2c580fbff9f8c
-Removing note for object 69dd6f05596ba7dd52aece2e66312d72193f2404
-Removing note for object 06faaf7ec015a9d97368c2529bdc8cf31baf70bf
-Removing note for object 95a7e3e972db58539e6ef3cc361cd61e31b17db7
-Removing note for object 136b29822535a2e998f2926ee16b1f3802c88b3f
-Removing note for object a9d5012931c30040ee5e7b0b8ab8eaa87dd2df9e
-Removing note for object 34b0e5146919d1b0b079f4685de49d08d602c765
-Removing note for object ba8e5e2e75a66e54fa2a999671e3d602548b0fad
-Removing note for object 84773486b2f3c371913c2745322c02efe920976c
-Removing note for object 30f4912988cb9df51d6bbec5796642f1b1a9a2fc
-Removing note for object 18b7dd8f1690e8cb8399edd2d469cebf6051c8fb
-Removing note for object 80a8f06bff8197866fb6c2b10e529a67b1d0ed57
-Removing note for object 88d59face24312f906679c56c1c00f41a57aed81
-Removing note for object e591b6658f32d09dc92aaab7f518076d7219baa1
-Removing note for object 7194f853be5be737ab89c55ed8ef76999c694cfb
-Removing note for object 785a3db61beba59185813dd72a4f49cb960ba939
-Removing note for object 3dbbb4bfb12466f2662430857727af32dc37b30b
-Removing note for object a7e4d6ced9493bec81fa7a326a50a053b7dd8e47
-Removing note for object 17d18cf173f34f0c977c7d7410432c4c052e9a35
-Removing note for object 0efe5818f127e837f8c49e7ee292f2e3827b5d8c
-Removing note for object 1329c14017e18f7f75c56c6132d5070386191590
-Removing note for object 4fad07113f4b21f3d3aba2033c13576d74ed0159
-Removing note for object fd7060211fed315790db481cca508f2a59cd33fa
-Removing note for object 24bcc65e72949c7aad1e00a0ae648eb27b94a801
-Removing note for object 74017d116189d350e027f6a2fa197d76a98cb90c
-Removing note for object 829520f74568ec4a7daa4344d4e53612e8e449c6
-Removing note for object fc9c45687e413c9199ed2e2dc13732b0eee1417e
-Removing note for object 68f9d6e536ae8b39e2be3687534f96fb0cedd413
-Removing note for object 85492e5692be8052265ab35b1fb32bd632d7a034
-Removing note for object ed3b17f5fea5faec967aea73fab660c3caa4ec11
-Removing note for object c0038d5ca05de0848b621fe56fa32a95f56ac8bb
-Removing note for object 5805c46d394e6f09d122e29bfc8bc4677227c959
-Removing note for object 82a44ee370b37d4fcd2955c7dd4f59f66bb85055
-Removing note for object bebeed1d6e5df5f8e4519c02be6e36baef2a2b9f
-Removing note for object 84489b9c59967356c347b503e7be812344bec157
-Removing note for object de6bce36f8dbcebae05182254f9839ae88a89519
-Removing note for object 028084dc54b6b3a96adb0db4447c0befbfaf0f77
-Removing note for object b8f0c408564c037d30c51346cc54e5bf9b39a223
-Removing note for object 2ca369ce379b96c92fd48802bf5ca62c31495871
-Removing note for object 6c623624f0cfa64dcf5e0670626a9af249ce8fce
-Removing note for object d07926d68d5ea629bdfca003fd6dd71f4efdde8a
-Removing note for object 6160cde4d6c969e42f949a8d975e72f82ec65ff9
-Removing note for object 73b405a748dba3b757b1c4cfbca475d1a66a1396
-Removing note for object 8bfca76ecc8ffdd1c73e247e20dfc380deec169b
-Removing note for object 49d5b21b59db4b0d7e92d8d58b548c7c7f3ceab3
-Removing note for object 092fdff4f714d2ade8c2a5e0b7230b96e58fa202
-Removing note for object 8e716f1f338b7cde850738a7bcb8fc08458f6da8
-Removing note for object cbbd557f18677bca5328466c4649d42ca38ecd0b
-Removing note for object 3b5f892711e112d1ffe60cc652782db8f5436172
-Removing note for object d00c7dd01101c3f61fa408d9609bd0f34189ca0e
-Removing note for object 2d5dfff9582df22365e988c1dbf26f310ac11018
-Removing note for object b081e0909ddc4f0cd0f880a4151b7a0f93ff7c02
-Removing note for object 72db531cec33db2b935aeefaf533d7cdc8e1e498
-Removing note for object 863bdd410c7d0f81d93dadbb5129004563987cdd
-Removing note for object 53c002754b07b01a6c7b0f25e55ce49452e78998
-Removing note for object 37d37991e387d94d7470e8e1f6d2554e027eb040
-Removing note for object c2a4ca4a2728846813f90dd0f36f5dd413572e53
-Removing note for object c4b7e09bd15665daf91c5a420a56dd3721ca8c09
-Removing note for object a14371c8166385886904c730e0a531b5ac0dc1d4
-Removing note for object 3595eeb0316642224135dda2d7f4e2571d13f960
-Removing note for object b7d693fa9562fb10a24385800b92e21d77158cab
-Removing note for object 0b55bd97fdaa73e8998658138997750f9204f709
-Removing note for object 7581409289445aac9cad5685242225b69438bdb5
-Removing note for object 63e0354a05c6f2bd3ee0454b7c8a1b6ad55bbb39
-Removing note for object e122ffa8e4b75eca6c0a6138dbbbbd8fd90db924
-Removing note for object 12b5dbefaa4c85ef26c42c14bb3a48493fd79aed
-Removing note for object 6187ce5edf2f7d4d97721c6a195e9085ee0b75e0
-Removing note for object 0b29c48dd6f47ab350c0268424c5912ca68eec05
-Removing note for object 00225fa0566873e04cf85786bfcdfc8d5a1fb68b
-Removing note for object e46b064f913b6c0ec92bdb2e3cdc956a9ad929d8
-Removing note for object da6a0c7b416f1929e37ad4ab7aa9a43e40bba3a4
-Removing note for object 0e7679756bda78bcb761a92425082d33ae2eabd6
-Removing note for object 3d884933f1ff6c4b8d3ffffb2c1985295ffc7578
-Removing note for object eb5fad11a1860cbc711e7aae5f815d49739027f9
-Removing note for object 6c5b7cca48d408e6597aae06ac190bf435eea0af
-Removing note for object 9ae6abb2dd899f3453bd4a42c6083d29e5ee2c25
-Removing note for object 1c2be6e6b8a1512b49e2d0ce4f320ac62663bd7c
-Removing note for object 91ba16e88693278bac6ea5b6652be27d519c6284
-Removing note for object 04891a4865ab739593d7f5d934906d805027dcbd
-Removing note for object b727600ac1fd560a92140c46077ce7f8a20f8db2
-Removing note for object 29b24dcd761b95b975c46ffa137d98f74d956875
-Removing note for object b1a3d0c9ddc40d03b3d59b6c7930df4012a61d0a
-Removing note for object 3698be91e4a9197cfefba28d171e52fc0fb571fa
-Removing note for object 85388b2ffc9342b1a9237c75f3f7cb79cc410e64
-Removing note for object 0aed77a3e97c3854fcd751b1f94ecb6756725974
-Removing note for object 011539f0b7e8e95c22436d224695aae6c48bb3db
-Removing note for object 43aa9d033a8bbfa9f3e8b0d7c9a715d1d0096c05
-Removing note for object c35ea1a727952227b88357433be4bdfb30e55856
-Removing note for object 46f4a82d64902ab63e4d7de6c78da677c3b20f8e
-Removing note for object 695cbdb56848e3e0e403da2ea9ef18d665481c3c
-Removing note for object 7c7ef41170927a3a7999968540534c70f68ce2c9
-Removing note for object e48a2c3b1b9c23598053a0416d31f9935be4ce83
-Removing note for object 6c66c6ef6b7c907f347fca51f1dc779eee27f35e
-Removing note for object 1e436c8a45959f2f4dfda6256f00caab47c79e7b
-Removing note for object 28a86738bc402f34c2b895820e4710f9b7517ce1
-Removing note for object a4075445b64d0bfb6d601a08598d4c346391ba6e
-Removing note for object 5136d8fd93d2016a0d59ea94013508fc771d7412
-Removing note for object 581964916f22d8ed9e54c42a5f02ebeeff208a54
-Removing note for object 408b845562d9579cac992b13dcf78c7bc351b83c
-Removing note for object f6606205b38996de225eb0d20a4436613226c5b4
-Removing note for object 69ad0c3f89c0348adaeb2b245f24678ff8fc73ef
-Removing note for object 16d4da4076e02831d14264341b46adc23de10d31
-Removing note for object 61245559e67f9f9ed73efe2bc7ba05c3b0dc61a3
-Removing note for object f5fc94c753f4fd9f47311e9a96823508fdf12867
-Removing note for object 4bf49ef5b8de8cf570854c1c5249b17dbac4da6d
-Removing note for object 2b5e34f8ec5a967a8c118b504cb7c9f82425d307
-Removing note for object 71feadd9546a386bba0956643a7618130275ca2d
-Removing note for object c435f7d2da121e6ca478542d81a09b4cfb1e6d40
-Removing note for object 83b6710b31fe03be8147f88d5679dc1e7d6b93e7
-Removing note for object a5cec4217c4c9459acd08946a5936109f92b234a
-Removing note for object 3466f2562096ec7fee77cfcaf975e045d5ba8bd8
-Removing note for object 0356dbfd30b5c8109865b192297b202b8d4b93b5
-Removing note for object ef04490e0dd39166aa62f7be4cbb8a42c9e9b876
-Removing note for object c6251d973d7136acf8b2817e8275fba9e0bb102d
-Removing note for object a18e024b9c635d261c2f54612b342a67928b8068
-Removing note for object 9d03e90800a10023bd868e1e7fee6a0d54bdb972
-Removing note for object 41d89def92a9052d7cc2ae1c673e807f7ee2bc15
-Removing note for object c1c691f1ee137258e216986125ad7169bbc9944b
-Removing note for object 5536984fddffdfdad3a5007221f3b08dc46e32eb
-Removing note for object cd905ab02b0fbdec5407cc7c454d959645e4fabb
-Removing note for object 8b33d27218a7e8cab8a6d2ff5eddd348c36029ba
-Removing note for object 81491394bf0249b2639a9f4f6bfc43c0e38370d4
-Removing note for object 76bff28d5965aaff4f7ba16e4b7a4bfb05bdc334
-Removing note for object e3504135096a7ca00095a761fcf71ecdd2794043
-Removing note for object 74125e7e86a34c7385ea36bff5c5e8f481b423c5
-Removing note for object 5fed9794bc006a7326587300052cb7e44639412a
-Removing note for object 3510fb1bd504c9221f9679da3fdc2845cf21e140
-Removing note for object bf473ccfa7fdc1e61f62f9c874238a0de5fc513d
-Removing note for object fc327306de924737f321c9baeefdcca0df16d2bc
-Removing note for object 2c10f7b0afac72972ec95cb4d308ba7421755512
-Removing note for object 297d6cb08dee5d25ce9ba83eecdeaf449da865bb
-Removing note for object 545c4c1b43dcc4d0a99cd98fcda0bae1005a78b2
-Removing note for object 4a996de24e1ffe26f732c854882697c1ad516386
-Removing note for object 844420c079e48a5166c01a85a790ce6bdeb873bd
-Removing note for object 023515e4ad959899e29b27f5c5f83c8a1a2de28c
-Removing note for object 7585ebad749b486c7ebf9f8e0855ac3099d09a38
-Removing note for object 413376f50b0489aaecbce66bf7b54b98e6550e03
-Removing note for object 2873e3beec9c3d56bad8f485e61d6a2cf9a16c8c
-Removing note for object 61f865b2efc1072fdb8ed9fe06118feae86e84f7
-Removing note for object 1ea06f1458f13efee0b785253f989b694f938edb
-Removing note for object ce8b86ae2c160f88e1c799aa6837f6c773956227
-Removing note for object e3306eaa12a31c691d43bbca19f98a2d9dab4ba9
-Removing note for object c2fb991d7ec9543b161f4f98c624929675ff4c5d
-Removing note for object d11385ba15c9c5e331981f68dd6bd7164ccf3f85
-Removing note for object 6f891e8ffe677a4c89d16dd2c665ee0e14c7a299
-Removing note for object ed339d1d371f85637989f68d0eb557f351577a21
-Removing note for object 4750ac4f1a2e220c1e8f6640294532c98d99f200
-Removing note for object f292c7df6101b6388f4d124dd0e359f53665aeb9
-Removing note for object 6457f18ae180c94ff5f7e0ea32f5d33194813bd5
-Removing note for object 80dca81cb5b833d22335d913b49a273d34062db9
-Removing note for object c4a04fb500fde0e2ec185ceef5e830841ef81190
-Removing note for object 37f7f6d33ccea935fd3052dcf56f0702a5688a56
-Removing note for object b174abe99a10da71c24f307c4be43b8fd13ddd81
-Removing note for object 521324fde746e0ed1d52d3da451c3d5ce0a51853
-Removing note for object 22145dda21dc965767c9837a456e045b0b905d72
-Removing note for object 65cd0782f778269cac585ca0cfceb3b65b4b0136
-Removing note for object 9f0e002cb37dba666555cb19d9825d53bc1efc7e
-Removing note for object ff7230819570fd6ca726ec2870c7acdbc33475eb
-Removing note for object fdf030fde5370388b806af92806e62e2bfb1bb11
-Removing note for object 5bbfd9a6221cce07357876e6702a17e7a96faae5
-Removing note for object 5863cde659f7dda95d24a43459f482038bbe8eba
-Removing note for object dcbb95084ba98cb6a950efc8a6f340b84dee87c7
-Removing note for object 2f60ea03c053734f2cde5a7f31ace9bac1ee19da
-Removing note for object 7dea3506366b9b27f57bafeb6e5bd508b00c5923
-Removing note for object 589a50a5e7daf7983baf43177e3fab221b3f0781
-Removing note for object 9a87326a7e4fec8672ce330e076fc6dba7c23366
-Removing note for object 177838d572b4628311ae9ba649a598c0627c2088
-Removing note for object b00c6f3383767d26b6b6af4057c6c9e56ec72803
-Removing note for object d856441fdb792888b635d1f62bfba9e64b772960
-Removing note for object 3f023909b06329744f931861ebb9c9bd12da1b84
-Removing note for object b161b8a0267657e40c21ea0a7637c9da05cb6234
-Removing note for object c3f42ce00ec78e8c5653eee37687d86870c1d2c5
-Removing note for object fc070b682384d45f45798cb8883f6f779a8d105f
-Removing note for object 794e608cc670532a53e521b37080ac4fb39e5775
-Removing note for object ce4d96ea40482e50d733d943d3aa1326c5f27f20
-Removing note for object 93d93d194fd2c9309ad75ba0ac36eed962540471
-Removing note for object f5ddfa52c42f3fe5bc24b1d7436d269718fb4ec6
-Removing note for object 84e47a901d70a1b913359a59b0eb4128921d6764
-Removing note for object 54a943437a41a035ae36187788f7863a14677754
-Removing note for object 6a28e6066c6213cc0535eb58ea15cc26cc0cb17d
-Removing note for object 7d8ba8659bb15e61daf37be731562cafc8701af4
-Removing note for object c2a06db27f237154cdf5ae99e9336ad7ac101c75
-Removing note for object ebcbe749543cb23055bfad287b08edd5dd506e49
-Removing note for object 22e47c76aa2449f554aa282f61ce8005a9da279e
-Removing note for object 81090cc10824f5f6a229195d061d5a062241f64e
-Removing note for object 27437784483a95ad6a86161d4e6082efa3fc4b99
-Removing note for object 1becd0970add28104ec7023fa8660f59c8dc85e5
-Removing note for object 975edfc698cb84099be9cd6f54b94c6b0bdfbf3e
-Removing note for object 698172dcc506d88c5d745f6b441ce316e908ac25
-Removing note for object 6c5035c5f925f25c4081fe33bea2e87bd4344eeb
-Removing note for object 7a1b8459367f67da01cbd0852e27aafa063eae5b
-Removing note for object 34a270c65107179578d5cf71f88997941cfceb68
-Removing note for object e1ca3debff6d7f8751a0c43f8e649c37c39ddcff
-Removing note for object f2cd69f72028b7f0334dc46c677dbf6e34c64ff9
-Removing note for object b5b96cb5f658ff89cad9d65d3fe90935741d4280
-Removing note for object 3d231f1ae4643fde656b5195e8a44598a524346c
-Removing note for object 92aff6e6403899d4467dca0759a5f9ca9f6083e8
-Removing note for object d7d8923b4e4c23a1f6a66f072403269416d7bdc5
-Removing note for object f5dbbac5c21c898c8673760bc67123f9ca551f62
-Removing note for object 671b9a1a077aafd0194137ce810e99e8e17aabf7
-Removing note for object cf858fab0fd223f87642d61c2dec71777d597370
-Removing note for object 404b958c22b0eec12dd009d4e6bc043a995096ad
-Removing note for object 30e25d85636fbb5a3962893e97204525d507fe5b
-Removing note for object 68fdee2a017d2b19536a79794a90ac13ad3c9120
-Removing note for object 2beb65e939af69464e8ed5dcdd4c10f8ab65110e
-Removing note for object ae862168e1774f973a69502c447480f81c035c00
-Removing note for object 422f97df0f1f254299575475841c717032a6ca32
-Removing note for object f7b9f4caf310f040a99a8117be5928e95be0b97e
-Removing note for object 7bb335e0bde4008652eb5f427a4a7390ae288309
-Removing note for object f17072c2db1767d4e1c41e0411294506f014c2af
-Removing note for object 99c50e745458fd2faf1c0f55273b7512348d2ddc
-Removing note for object 9aa56e0371ac9a4a4f10b34878d53d83ca8190ca
-Removing note for object 8738fb580d364e7645f0f7e0206dd1f000f03c84
-Removing note for object 2db58456e56e9ee9f425944d1c7743519a24784d
-Removing note for object a33d485949f214abc9fbb192ff36632eaa4cf0b3
-Removing note for object 8e59f0f4fc11cc909b24f15a6ef1b6e1a3fa7bc8
-Removing note for object cd604ed04d960a2e7fead48dd5d1e3fd9ca7886d
-Removing note for object 0c320249ca0ddd30c6fc90374656f6331633280a
-Removing note for object f15d09c23da1e142fd85798fbd4ac0b29cb858f3
-Removing note for object 0a256346bb1c2687845aca1e06c2dcb5d1ac9cf3
-Removing note for object 03a07cdc62a571762b99320c43428698b2d3d91b
-Removing note for object 86b4ee723d450722f69493786dc1a1b3c85f456b
-Removing note for object 5ef6c6a2209bc341ee9300945ee24397668600e9
-Removing note for object eee7b5e88db8d2f4eeff2bfd4ced42dc2b77576c
-Removing note for object 331c2d29861aa09a00a73056e70f156650ef1b4a
-Removing note for object bb32de951ad1f794e77afa53a31aa9433bfdb121
-Removing note for object fe8c44ed3546c964bd8398f5fc0c8d5ee01c08dd
-Removing note for object ac00acde313fa0157a4805bdbce2f22d7e57750a
-Removing note for object 1adc2b3c4610b4da4b2c00cbf153395bb5f72ed0
-Removing note for object 59238cad6edee95b454423e535876306852f6b93
-Removing note for object 4f5bde2686729dfaa60e10051820409fc7102027
-Removing note for object 07db9a697feba6bacfc603c13c8c184c376c1fde
-Removing note for object acd7eec9dcc24a3fda4a46d9cf11056f9fb51592
-Removing note for object 198c967016d1d00e0fc01d66d500fec19cb672e2
-Removing note for object 6d7b633c45a92a296093e657ced14d46d8e86970
-Removing note for object 8f6653f2c207619ceba3794249d8bac152454b16
-Removing note for object c04389fb08740d6a3df7158a5e4843bdc07d2539
-Removing note for object 77cd9bf11d2a4b1577dbcb65eafef24ca5f8d64c
-Removing note for object 4d2fca6077788dcdecd4ef82eb45155d3d3c6ae9
-Removing note for object 7f5b0d2394f7a4410784788eb55a86357795e0ee
-Removing note for object 77c91abace28d046f8f08482515dd4d0ee20e771
-Removing note for object 407c31999146268ab83d71891c905685839800c9
-Removing note for object eb3c3aede523d729990ac25c62a93eb47c21e2e3
-Removing note for object 7d116c2f10b15fa50a8e9f229b3b81c5be8980fa
-Removing note for object 8b658fffa694c94a228bd277048256f1ede590d1
-Removing note for object 0cb7eabc69f7cd5f3859906e5aa190bf6a0080dc
-Removing note for object 1270dedbb9873b651b7661f6fd7f20eca25dcce9
-Removing note for object b944dbe8ce8fa4df89750bdf3a6cd8828ff2f1b9
-Removing note for object a8b0b847225e38e28d972bb583db100457dbf2c0
-Removing note for object 46dcf25ab1fb7b08d57dfef57c2d4ef9cdea0368
-Removing note for object 1ef946fbe3fce53728ce0f4e3f3b686f29783ea9
-Removing note for object 9fb987e1900004b51a70d9945feb70d1a26c5db9
-Removing note for object 697e0a1102060a6a7f0e78c614e6e088e22a746d
-Removing note for object 5c65b7962b5bb7291f385885ae0fe5dc5dd1f9f9
-Removing note for object bdeafb301e44b0e4db0f738a2d2a7beefdb70b70
-Removing note for object 51b4081b24cd2ae32dda79a6bf89c6ca47cd0e19
-Removing note for object 6699f4279478278b1b456670806c5114e5b94cd3
-Removing note for object 24a6294035c71abc89705f20573835a048058e48
-Removing note for object 68e303067eaade6915640259529f90f06a3d723f
-Removing note for object 47797ab742998acf558ec5ecd8f73a170767322d
-Removing note for object a68559cad834c4bf10f897cacff96708fd4c9a06
-Removing note for object 257cfeaa5d3091ff76387dc6129e83307e8ec0c5
-Removing note for object f133b89cb79d15f0d85a19317b2dbc5a871c2039
-Removing note for object bff2d39b4f7122bd4c5caee3de353a774d1e632a
-Removing note for object b2f9acae37b0cff7904de95d05e6077d318696c2
-Removing note for object 46f7cc54c0193d02dc4dff1c8f998cfebb8c17b8
-Removing note for object d38ec8f851adf470131178085bfbaab4b12ad2a7
-Removing note for object 597947c97e89280e1eddffc4c30e36c1cb5e8882
-Removing note for object f297f34cfbd904559c0d202b578b112ef5ae50c2
-Removing note for object edd7609018ee7927fd1f8604ea3223e98a44a245
-Removing note for object 03f8530d6eb3617ab8c874b47651509115d54b5e
-Removing note for object ae3ed93531b892b72e7ae1125b3c0e266df4ab70
-Removing note for object ac647561477b7eddb3807defcb481b30af7db978
-Removing note for object 3f096680dbfb873aa9008e9e22559cc94c4a634e
-Removing note for object 7d50e571ffcb9d83478504d8fdd403aecd8df6a3
-Removing note for object 19eb0d4282bc5d4e46ec80864a71cd2e48bcf18c
-Removing note for object 5a50ba526cb7a741e3736b33e111cd5a35e68d3f
-Removing note for object 90911a48f69e3d23142660e2e658bb72d6bb30d2
-Removing note for object 382d7647311957adb8d7feccfbfddfd6d092d875
-Removing note for object ab5f23d01513db15925fbc0d19e07dc67bb7695d
-ok 5 - deleting most notes with git-notes
-
-expecting success of 3305.6 'most notes deleted correctly with git-notes': 
-	git log HEAD~$remove_notes | grep "^    " > output &&
-	i=$(($num_notes - $remove_notes)) &&
-	while test $i -gt 0
-	do
-		echo "    commit #$i" &&
-		echo "    note #$i" &&
-		i=$(($i - 1)) || return 1
-	done > expect &&
-	test_cmp expect output
-
-ok 6 - most notes deleted correctly with git-notes
-
-expecting success of 3305.7 'stable fanout 1 is followed by stable fanout 0': 
-	i=$remove_notes &&
-	fanout=1 &&
-	while test $i -gt 0
-	do
-		i=$(($i - 1)) &&
-		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
-		then
-			continue
-		elif test $fanout -eq 1
-		then
-			fanout=0 &&
-			if all_notes_have_fanout refs/notes/commits~$i $fanout
-			then
-				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
-				continue
-			fi
-		fi &&
-		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
-		git ls-tree -r --name-only refs/notes/commits~$i &&
-		return 1
-	done &&
-	all_notes_have_fanout refs/notes/commits 0
-
-Fanout 1 -> 0 at refs/notes/commits~43
-ok 7 - stable fanout 1 is followed by stable fanout 0
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4004-diff-rename-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4004-diff-rename-symlink/.git/
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 4004.1 'prepare reference tree': 
-	echo xyzzy | tr -d \\012 >yomin &&
-	ln -s xyzzy frotz &&
-	git update-index --add frotz yomin &&
-	tree=$(git write-tree) &&
-	echo $tree
-
-e8a7292168115b2c189b56bd500aa179ca8d69ba
-ok 1 - prepare reference tree
-
-expecting success of 4004.2 'prepare work tree': 
-	mv frotz rezrov &&
-	rm -f yomin &&
-	ln -s xyzzy nitfol &&
-	ln -s xzzzy bozbar &&
-	git update-index --add --remove frotz rezrov nitfol bozbar yomin
-
-ok 2 - prepare work tree
-
-expecting success of 4004.3 'setup diff output': 
-	GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
-	cat >expected <<\EOF
-diff --git a/bozbar b/bozbar
-new file mode 120000
---- /dev/null
-+++ b/bozbar
-@@ -0,0 +1 @@
-+xzzzy
-\ No newline at end of file
-diff --git a/frotz b/nitfol
-similarity index 100%
-copy from frotz
-copy to nitfol
-diff --git a/frotz b/rezrov
-similarity index 100%
-rename from frotz
-rename to rezrov
-diff --git a/yomin b/yomin
-deleted file mode 100644
---- a/yomin
-+++ /dev/null
-@@ -1 +0,0 @@
--xyzzy
-\ No newline at end of file
-EOF
-
-ok 3 - setup diff output
-
-expecting success of 4004.4 'validate diff output': 
-	compare_diff_patch current expected
-
-ok 4 - validate diff output
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4000-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4000-diff-format/.git/
-expecting success of 4000.1 'update-index --add two files with and without +x.': 
-	git update-index --add path0 path1 path2/path3
-
-ok 1 - update-index --add two files with and without +x.
-
-expecting success of 4000.2 'git diff-files -p after editing work tree.': 
-	git diff-files -p >actual
-
-ok 2 - git diff-files -p after editing work tree.
-
-expecting success of 4000.3 'validate git diff-files -p output.': 
-	compare_diff_patch expected actual
-
-ok 3 - validate git diff-files -p output.
-
-expecting success of 4000.4 'git diff-files -s after editing work tree': 
-	git diff-files -s >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
-
-ok 4 - git diff-files -s after editing work tree
-
-expecting success of 4000.5 'git diff-files --no-patch as synonym for -s': 
-	git diff-files --no-patch >actual 2>err &&
-	test_must_be_empty actual &&
-	test_must_be_empty err
+expecting success of 4000.5 'git diff-files --no-patch as synonym for -s': 
+	git diff-files --no-patch >actual 2>err &&
+	test_must_be_empty actual &&
+	test_must_be_empty err
 
 ok 5 - git diff-files --no-patch as synonym for -s
 
@@ -218031,6 +218046,138 @@
 1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4006-diff-mode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4006-diff-mode/.git/
+expecting success of 4006.1 'setup': 
+	echo frotz >rezrov &&
+	git update-index --add rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
+ok 1 - setup
+
+expecting success of 4006.2 'chmod': 
+	test_chmod +x rezrov &&
+	git diff-index $tree >current &&
+	sed -e "$sed_script" <current >check &&
+	echo ":100644 100755 X X M	rezrov" >expected &&
+	test_cmp expected check
+
+ok 2 - chmod
+
+expecting success of 4006.3 'prepare binary file': 
+	git commit -m one &&
+	test_commit --printf two binbin "\00\01\02\03\04\05\06"
+
+[master (root-commit) d232af0] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 rezrov
+[master a89ae18] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binbin
+ok 3 - prepare binary file
+
+expecting success of 4006.4 '--stat output after text chmod': 
+	test_chmod -x rezrov &&
+	cat >expect <<-\EOF &&
+	 rezrov | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff HEAD --stat >actual &&
+	test_cmp expect actual
+
+ok 4 - --stat output after text chmod
+
+expecting success of 4006.5 '--shortstat output after text chmod': 
+	tail -n 1 <expect >expect.short &&
+	git diff HEAD --shortstat >actual &&
+	test_cmp expect.short actual
+
+ok 5 - --shortstat output after text chmod
+
+expecting success of 4006.6 '--stat output after binary chmod': 
+	test_chmod +x binbin &&
+	cat >expect <<-EOF &&
+	 binbin | Bin
+	 rezrov |   0
+	 2 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff HEAD --stat >actual &&
+	test_cmp expect actual
+
+ok 6 - --stat output after binary chmod
+
+expecting success of 4006.7 '--shortstat output after binary chmod': 
+	tail -n 1 <expect >expect.short &&
+	git diff HEAD --shortstat >actual &&
+	test_cmp expect.short actual
+
+ok 7 - --shortstat output after binary chmod
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4007-rename-3.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4007-rename-3/.git/
+expecting success of 4007.1 'prepare reference tree': 
+	mkdir path0 path1 &&
+	COPYING_test_data >path0/COPYING &&
+	git update-index --add path0/COPYING &&
+	tree=$(git write-tree) &&
+	blob=$(git rev-parse :path0/COPYING)
+
+ok 1 - prepare reference tree
+
+expecting success of 4007.2 'prepare work tree': 
+	cp path0/COPYING path1/COPYING &&
+	git update-index --add --remove path0/COPYING path1/COPYING
+
+ok 2 - prepare work tree
+
+expecting success of 4007.3 'copy detection': 
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
+
+ok 3 - copy detection
+
+expecting success of 4007.4 'copy detection, cached': 
+	git diff-index -C --find-copies-harder --cached $tree >current &&
+	compare_diff_raw current expected
+
+ok 4 - copy detection, cached
+
+expecting success of 4007.5 'copy, limited to a subtree': 
+	git diff-index -C --find-copies-harder $tree path1 >current &&
+	compare_diff_raw current expected
+
+ok 5 - copy, limited to a subtree
+
+expecting success of 4007.6 'tweak work tree': 
+	rm -f path0/COPYING &&
+	git update-index --remove path0/COPYING
+
+ok 6 - tweak work tree
+
+expecting success of 4007.7 'rename detection': 
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
+
+ok 7 - rename detection
+
+expecting success of 4007.8 'rename, limited to a subtree': 
+	git diff-index -C --find-copies-harder $tree path1 >current &&
+	compare_diff_raw current expected
+
+ok 8 - rename, limited to a subtree
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4001-diff-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4001-diff-rename/.git/
 expecting success of 4001.1 'setup': 
@@ -218536,65 +218683,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4005-diff-rename-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4005-diff-rename-2/.git/
-expecting success of 4005.1 'setup reference tree': 
-	COPYING_test_data >COPYING &&
-	echo frotz >rezrov &&
-	git update-index --add COPYING rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree &&
-	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
-	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
-	origoid=$(git hash-object COPYING) &&
-	oid1=$(git hash-object COPYING.1) &&
-	oid2=$(git hash-object COPYING.2)
-
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - setup reference tree
-
-expecting success of 4005.2 'validate output from rename/copy detection (#1)': 
-	rm -f COPYING &&
-	git update-index --add --remove COPYING COPYING.? &&
-
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	:100644 100644 $origoid $oid2 R1234	COPYING	COPYING.2
-	EOF
-	git diff-index -C $tree >current &&
-	compare_diff_raw expected current
-
-ok 2 - validate output from rename/copy detection (#1)
-
-expecting success of 4005.3 'validate output from rename/copy detection (#2)': 
-	mv COPYING.2 COPYING &&
-	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
-
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid2 M	COPYING
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	EOF
-	git diff-index -C $tree >current &&
-	compare_diff_raw current expected
-
-ok 3 - validate output from rename/copy detection (#2)
-
-expecting success of 4005.4 'validate output from rename/copy detection (#3)': 
-	COPYING_test_data >COPYING &&
-	git update-index --add --remove COPYING COPYING.1 &&
-
-	cat <<-EOF >expected &&
-	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
-	EOF
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
-
-ok 4 - validate output from rename/copy detection (#3)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3920-crlf-messages.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3920-crlf-messages/.git/
 expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
@@ -218822,138 +218910,682 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4006-diff-mode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4006-diff-mode/.git/
-expecting success of 4006.1 'setup': 
-	echo frotz >rezrov &&
-	git update-index --add rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree
+*** t4008-diff-break-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4008-diff-break-rewrite/.git/
+expecting success of 4008.1 'setup': 
+	echo some dissimilar content >file0 &&
+	COPYING_test_data >file1 &&
+	blob0_id=$(git hash-object file0) &&
+	blob1_id=$(git hash-object file1) &&
+	git update-index --add file0 file1 &&
+	git tag reference $(git write-tree)
 
-5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
 ok 1 - setup
 
-expecting success of 4006.2 'chmod': 
-	test_chmod +x rezrov &&
-	git diff-index $tree >current &&
-	sed -e "$sed_script" <current >check &&
-	echo ":100644 100755 X X M	rezrov" >expected &&
-	test_cmp expected check
+expecting success of 4008.2 'change file1 with copy-edit of file0 and remove file0': 
+	sed -e "s/git/GIT/" file0 >file1 &&
+	blob2_id=$(git hash-object file1) &&
+	rm -f file0 &&
+	git update-index --remove file0 file1
 
-ok 2 - chmod
+ok 2 - change file1 with copy-edit of file0 and remove file0
 
-expecting success of 4006.3 'prepare binary file': 
-	git commit -m one &&
-	test_commit --printf two binbin "\00\01\02\03\04\05\06"
+expecting success of 4008.3 'run diff with -B (#1)': 
+	git diff-index -B --cached reference >current &&
+	cat >expect <<-EOF &&
+	:100644 000000 $blob0_id $ZERO_OID D	file0
+	:100644 100644 $blob1_id $blob2_id M100	file1
+	EOF
+	compare_diff_raw expect current
 
-[master (root-commit) d232af0] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100755 rezrov
-[master a89ae18] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binbin
-ok 3 - prepare binary file
+ok 3 - run diff with -B (#1)
 
-expecting success of 4006.4 '--stat output after text chmod': 
-	test_chmod -x rezrov &&
-	cat >expect <<-\EOF &&
-	 rezrov | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
+expecting success of 4008.4 'run diff with -B and -M (#2)': 
+	git diff-index -B -M reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob2_id R100	file0	file1
 	EOF
-	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+	compare_diff_raw expect current
 
-ok 4 - --stat output after text chmod
+ok 4 - run diff with -B and -M (#2)
 
-expecting success of 4006.5 '--shortstat output after text chmod': 
-	tail -n 1 <expect >expect.short &&
-	git diff HEAD --shortstat >actual &&
-	test_cmp expect.short actual
+expecting success of 4008.5 'swap file0 and file1': 
+	rm -f file0 file1 &&
+	git read-tree -m reference &&
+	git checkout-index -f -u -a &&
+	mv file0 tmp &&
+	mv file1 file0 &&
+	mv tmp file1 &&
+	git update-index file0 file1
 
-ok 5 - --shortstat output after text chmod
+ok 5 - swap file0 and file1
 
-expecting success of 4006.6 '--stat output after binary chmod': 
-	test_chmod +x binbin &&
+expecting success of 4008.6 'run diff with -B (#3)': 
+	git diff-index -B reference >current &&
 	cat >expect <<-EOF &&
-	 binbin | Bin
-	 rezrov |   0
-	 2 files changed, 0 insertions(+), 0 deletions(-)
+	:100644 100644 $blob0_id $blob1_id M100	file0
+	:100644 100644 $blob1_id $blob0_id M100	file1
 	EOF
-	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+	compare_diff_raw expect current
 
-ok 6 - --stat output after binary chmod
+ok 6 - run diff with -B (#3)
 
-expecting success of 4006.7 '--shortstat output after binary chmod': 
-	tail -n 1 <expect >expect.short &&
-	git diff HEAD --shortstat >actual &&
-	test_cmp expect.short actual
+expecting success of 4008.7 'run diff with -B and -M (#4)': 
+	git diff-index -B -M reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob1_id $blob1_id R100	file1	file0
+	:100644 100644 $blob0_id $blob0_id R100	file0	file1
+	EOF
+	compare_diff_raw expect current
 
-ok 7 - --shortstat output after binary chmod
+ok 7 - run diff with -B and -M (#4)
+
+expecting success of 4008.8 'make file0 into something completely different': 
+	rm -f file0 &&
+	test_ln_s_add frotz file0 &&
+	slink_id=$(printf frotz | git hash-object --stdin) &&
+	git update-index file1
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 8 - make file0 into something completely different
+
+expecting success of 4008.9 'run diff with -B (#5)': 
+	git diff-index -B reference >current &&
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob1_id $blob0_id M100	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 9 - run diff with -B (#5)
+
+expecting success of 4008.10 'run diff with -B -M (#6)': 
+	git diff-index -B -M reference >current &&
+
+	# file0 changed from regular to symlink.  file1 is the same as the preimage
+	# of file0.  Because the change does not make file0 disappear, file1 is
+	# denoted as a copy of file0
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob0_id $blob0_id C	file0	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 10 - run diff with -B -M (#6)
+
+expecting success of 4008.11 'run diff with -M (#7)': 
+	git diff-index -M reference >current &&
+
+	# This should not mistake file0 as the copy source of new file1
+	# due to type differences.
+	cat >expect <<-EOF &&
+	:100644 120000 $blob0_id $slink_id T	file0
+	:100644 100644 $blob1_id $blob0_id M	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 11 - run diff with -M (#7)
+
+expecting success of 4008.12 'file1 edited to look like file0 and file0 rename-edited to file2': 
+	rm -f file0 file1 &&
+	git read-tree -m reference &&
+	git checkout-index -f -u -a &&
+	sed -e "s/git/GIT/" file0 >file1 &&
+	sed -e "s/git/GET/" file0 >file2 &&
+	blob3_id=$(git hash-object file2) &&
+	rm -f file0 &&
+	git update-index --add --remove file0 file1 file2
+
+ok 12 - file1 edited to look like file0 and file0 rename-edited to file2
+
+expecting success of 4008.13 'run diff with -B (#8)': 
+	git diff-index -B reference >current &&
+	cat >expect <<-EOF &&
+	:100644 000000 $blob0_id $ZERO_OID D	file0
+	:100644 100644 $blob1_id $blob2_id M100	file1
+	:000000 100644 $ZERO_OID $blob3_id A	file2
+	EOF
+	compare_diff_raw expect current
+
+ok 13 - run diff with -B (#8)
+
+expecting success of 4008.14 'run diff with -B -C (#9)': 
+	git diff-index -B -C reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob2_id C095	file0	file1
+	:100644 100644 $blob0_id $blob3_id R095	file0	file2
+	EOF
+	compare_diff_raw expect current
+
+ok 14 - run diff with -B -C (#9)
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4009-diff-rename-4.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4009-diff-rename-4/.git/
+expecting success of 4009.1 'prepare reference tree': COPYING_test_data >COPYING &&
+     echo frotz >rezrov &&
+    git update-index --add COPYING rezrov &&
+    orig=$(git hash-object COPYING) &&
+    tree=$(git write-tree) &&
+    echo $tree
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - prepare reference tree
+
+expecting success of 4009.2 'prepare work tree': sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
+    sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
+    rm -f COPYING &&
+    c1=$(git hash-object COPYING.1) &&
+    c2=$(git hash-object COPYING.2) &&
+    git update-index --add --remove COPYING COPYING.?
+ok 2 - prepare work tree
+
+expecting success of 4009.3 'validate output from rename/copy detection (#1)': compare_diff_raw_z current expected
+ok 3 - validate output from rename/copy detection (#1)
+
+expecting success of 4009.4 'prepare work tree again': mv COPYING.2 COPYING &&
+     git update-index --add --remove COPYING COPYING.1 COPYING.2
+ok 4 - prepare work tree again
+
+expecting success of 4009.5 'validate output from rename/copy detection (#2)': compare_diff_raw_z current expected
+ok 5 - validate output from rename/copy detection (#2)
+
+expecting success of 4009.6 'prepare work tree once again': COPYING_test_data >COPYING &&
+     git update-index --add --remove COPYING COPYING.1
+ok 6 - prepare work tree once again
+
+expecting success of 4009.7 'validate output from rename/copy detection (#3)': compare_diff_raw_z current expected
+ok 7 - validate output from rename/copy detection (#3)
 
 # passed all 7 test(s)
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4007-rename-3.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4007-rename-3/.git/
-expecting success of 4007.1 'prepare reference tree': 
-	mkdir path0 path1 &&
-	COPYING_test_data >path0/COPYING &&
-	git update-index --add path0/COPYING &&
+*** t4011-diff-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4011-diff-symlink/.git/
+expecting success of 4011.1 'diff new symlink and file': 
+	symlink=$(symlink_oid xyzzy) &&
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	new file mode 120000
+	index 0000000..$symlink
+	--- /dev/null
+	+++ b/frotz
+	@@ -0,0 +1 @@
+	+xyzzy
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	new file mode 100644
+	index 0000000..$symlink
+	--- /dev/null
+	+++ b/nitfol
+	@@ -0,0 +1 @@
+	+xyzzy
+	EOF
+
+	# the empty tree
+	git update-index &&
 	tree=$(git write-tree) &&
-	blob=$(git rev-parse :path0/COPYING)
 
-ok 1 - prepare reference tree
+	test_ln_s_add xyzzy frotz &&
+	echo xyzzy >nitfol &&
+	git update-index --add nitfol &&
+	GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-expecting success of 4007.2 'prepare work tree': 
-	cp path0/COPYING path1/COPYING &&
-	git update-index --add --remove path0/COPYING path1/COPYING
+checking prerequisite: SYMLINKS
 
-ok 2 - prepare work tree
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 4007.3 'copy detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+)
+prerequisite SYMLINKS ok
+ok 1 - diff new symlink and file
 
-ok 3 - copy detection
+expecting success of 4011.2 'diff unchanged symlink and file': 
+	tree=$(git write-tree) &&
+	git update-index frotz nitfol &&
+	test -z "$(git diff-index --name-only $tree)"
 
-expecting success of 4007.4 'copy detection, cached': 
-	git diff-index -C --find-copies-harder --cached $tree >current &&
-	compare_diff_raw current expected
+ok 2 - diff unchanged symlink and file
 
-ok 4 - copy detection, cached
+expecting success of 4011.3 'diff removed symlink and file': 
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	deleted file mode 120000
+	index $symlink..0000000
+	--- a/frotz
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-xyzzy
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	deleted file mode 100644
+	index $symlink..0000000
+	--- a/nitfol
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-xyzzy
+	EOF
+	mv frotz frotz2 &&
+	mv nitfol nitfol2 &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-expecting success of 4007.5 'copy, limited to a subtree': 
-	git diff-index -C --find-copies-harder $tree path1 >current &&
-	compare_diff_raw current expected
+ok 3 - diff removed symlink and file
 
-ok 5 - copy, limited to a subtree
+expecting success of 4011.4 'diff identical, but newly created symlink and file': 
+	>expected &&
+	rm -f frotz nitfol &&
+	echo xyzzy >nitfol &&
+	test-tool chmtime +10 nitfol &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s xyzzy frotz
+	else
+		printf xyzzy >frotz
+		# the symlink property propagates from the index
+	fi &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current &&
 
-expecting success of 4007.6 'tweak work tree': 
-	rm -f path0/COPYING &&
-	git update-index --remove path0/COPYING
+	>expected &&
+	git diff-index -M -p -w $tree >current &&
+	compare_diff_patch expected current
 
-ok 6 - tweak work tree
+ok 4 - diff identical, but newly created symlink and file
 
-expecting success of 4007.7 'rename detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+expecting success of 4011.5 'diff different symlink and file': 
+	new=$(symlink_oid yxyyz) &&
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	index $symlink..$new 120000
+	--- a/frotz
+	+++ b/frotz
+	@@ -1 +1 @@
+	-xyzzy
+	\ No newline at end of file
+	+yxyyz
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	index $symlink..$new 100644
+	--- a/nitfol
+	+++ b/nitfol
+	@@ -1 +1 @@
+	-xyzzy
+	+yxyyz
+	EOF
+	rm -f frotz &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s yxyyz frotz
+	else
+		printf yxyyz >frotz
+		# the symlink property propagates from the index
+	fi &&
+	echo yxyyz >nitfol &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-ok 7 - rename detection
+ok 5 - diff different symlink and file
 
-expecting success of 4007.8 'rename, limited to a subtree': 
-	git diff-index -C --find-copies-harder $tree path1 >current &&
-	compare_diff_raw current expected
+expecting success of 4011.6 'diff symlinks with non-existing targets': 
+	ln -s narf pinky &&
+	ln -s take\ over brain &&
+	test_must_fail git diff --no-index pinky brain >output 2>output.err &&
+	grep narf output &&
+	test_must_be_empty output.err
 
-ok 8 - rename, limited to a subtree
+-narf
+ok 6 - diff symlinks with non-existing targets
+
+expecting success of 4011.7 'setup symlinks with attributes': 
+	echo "*.bin diff=bin" >>.gitattributes &&
+	echo content >file.bin &&
+	ln -s file.bin link.bin &&
+	git add -N file.bin link.bin
+
+ok 7 - setup symlinks with attributes
+
+expecting success of 4011.8 'symlinks do not respect userdiff config by path': 
+	file=$(short_oid file.bin) &&
+	link=$(symlink_oid file.bin) &&
+	cat >expect <<-EOF &&
+	diff --git a/file.bin b/file.bin
+	new file mode 100644
+	index 0000000..$file
+	Binary files /dev/null and b/file.bin differ
+	diff --git a/link.bin b/link.bin
+	new file mode 120000
+	index 0000000..$link
+	--- /dev/null
+	+++ b/link.bin
+	@@ -0,0 +1 @@
+	+file.bin
+	\ No newline at end of file
+	EOF
+	git config diff.bin.binary true &&
+	git diff file.bin link.bin >actual &&
+	test_cmp expect actual
+
+ok 8 - symlinks do not respect userdiff config by path
 
 # passed all 8 test(s)
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4012-diff-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4012-diff-binary/.git/
+expecting success of 4012.1 'prepare repository': 
+	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
+	git update-index --add a b c d &&
+	echo git >a &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
+	echo git >c &&
+	cat b b >d
+
+ok 1 - prepare repository
+
+expecting success of 4012.2 'apply --stat output for binary file change': 
+	git diff >diff &&
+	git apply --stat --summary <diff >current &&
+	test_cmp expected current
+
+ok 2 - apply --stat output for binary file change
+
+expecting success of 4012.3 'diff --shortstat output for binary file change': 
+	tail -n 1 expected >expect &&
+	git diff --shortstat >current &&
+	test_cmp expect current
+
+ok 3 - diff --shortstat output for binary file change
+
+expecting success of 4012.4 'diff --shortstat output for binary file change only': 
+	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
+	git diff --shortstat -- b >current &&
+	test_cmp expected current
+
+ok 4 - diff --shortstat output for binary file change only
+
+expecting success of 4012.5 'apply --numstat notices binary file change': 
+	git diff >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expect.binary-numstat current
+
+ok 5 - apply --numstat notices binary file change
+
+expecting success of 4012.6 'apply --numstat understands diff --binary format': 
+	git diff --binary >diff &&
+	git apply --numstat <diff >current &&
+	test_cmp expect.binary-numstat current
+
+ok 6 - apply --numstat understands diff --binary format
+
+expecting success of 4012.7 'apply detecting corrupt patch correctly': 
+	git diff >output &&
+	sed -e "s/-CIT/xCIT/" <output >broken &&
+	test_must_fail git apply --stat --summary broken 2>detected &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
+	test "$detected" = xCIT
+
+ok 7 - apply detecting corrupt patch correctly
+
+expecting success of 4012.8 'apply detecting corrupt patch correctly': 
+	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
+	test_must_fail git apply --stat --summary broken 2>detected &&
+	detected=$(cat detected) &&
+	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
+	detected=$(sed -ne "${detected}p" broken) &&
+	test "$detected" = xCIT
+
+ok 8 - apply detecting corrupt patch correctly
+
+expecting success of 4012.9 'initial commit': git commit -a -m initial
+[master (root-commit) 4ede773] initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 d
+ok 9 - initial commit
+
+expecting success of 4012.10 'diff-index with --binary': 
+	echo AIT >a && mv b e && echo CIT >c && cat e >d &&
+	git update-index --add --remove a b c d e &&
+	tree0=$(git write-tree) &&
+	git diff --cached --binary >current &&
+	git apply --stat --summary current
+
+ a |    2 +-
+ c |    2 +-
+ d |  Bin
+ e |    0 
+ 4 files changed, 2 insertions(+), 2 deletions(-)
+ rename b => e (100%)
+ok 10 - diff-index with --binary
+
+expecting success of 4012.11 'apply binary patch': 
+	git reset --hard &&
+	git apply --binary --index <current &&
+	tree1=$(git write-tree) &&
+	test "$tree1" = "$tree0"
+
+HEAD is now at 4ede773 initial
+ok 11 - apply binary patch
+
+expecting success of 4012.12 'diff --no-index with binary creation': 
+	echo Q | q_to_nul >binary &&
+	# hide error code from diff, which just indicates differences
+	test_might_fail git diff --binary --no-index /dev/null binary >current &&
+	rm binary &&
+	git apply --binary <current &&
+	echo Q >expected &&
+	nul_to_q <binary >actual &&
+	test_cmp expected actual
+
+ok 12 - diff --no-index with binary creation
+
+expecting success of 4012.13 'diff --stat with binary files and big change count': 
+	printf "\01\00%1024d" 1 >binfilë &&
+	git add binfilë &&
+	i=0 &&
+	while test $i -lt 10000; do
+		echo $i &&
+		i=$(($i + 1)) || return 1
+	done >tëxtfilë &&
+	git add tëxtfilë &&
+	git -c core.quotepath=false diff --cached --stat binfilë tëxtfilë >output &&
+	grep " | " output >actual &&
+	test_cmp expect actual
+
+ok 13 - diff --stat with binary files and big change count
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4010-diff-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4010-diff-pathspec/.git/
+expecting success of 4010.1 'setup': echo frotz >file0 &&
+     mkdir path1 &&
+     echo rezrov >path1/file1 &&
+     before0=$(git hash-object file0) &&
+     before1=$(git hash-object path1/file1) &&
+     git update-index --add file0 path1/file1 &&
+     tree=$(git write-tree) &&
+     echo "$tree" &&
+     echo nitfol >file0 &&
+     echo yomin >path1/file1 &&
+     after0=$(git hash-object file0) &&
+     after1=$(git hash-object path1/file1) &&
+     git update-index file0 path1/file1
+6b4658eda9b6c5385f027bc54abf3276b6effd05
+ok 1 - setup
+
+expecting success of 4010.2 'limit to path should show nothing': git diff-index --cached $tree -- path >current &&
+     compare_diff_raw current expected
+ok 2 - limit to path should show nothing
+
+expecting success of 4010.3 'limit to path1 should show path1/file1': git diff-index --cached $tree -- path1 >current &&
+     compare_diff_raw current expected
+ok 3 - limit to path1 should show path1/file1
+
+expecting success of 4010.4 'limit to path1/ should show path1/file1': git diff-index --cached $tree -- path1/ >current &&
+     compare_diff_raw current expected
+ok 4 - limit to path1/ should show path1/file1
+
+expecting success of 4010.5 '"*file1" should show path1/file1': git diff-index --cached $tree -- "*file1" >current &&
+     compare_diff_raw current expected
+ok 5 - "*file1" should show path1/file1
+
+expecting success of 4010.6 'limit to file0 should show file0': git diff-index --cached $tree -- file0 >current &&
+     compare_diff_raw current expected
+ok 6 - limit to file0 should show file0
+
+expecting success of 4010.7 'limit to file0/ should emit nothing.': git diff-index --cached $tree -- file0/ >current &&
+     compare_diff_raw current expected
+ok 7 - limit to file0/ should emit nothing.
+
+expecting success of 4010.8 'diff-tree pathspec': 
+	tree2=$(git write-tree) &&
+	echo "$tree2" &&
+	git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
+	test_must_be_empty current
+
+54d8765b122f32157e847ce3924180cb2ec778fc
+ok 8 - diff-tree pathspec
+
+expecting success of 4010.9 'diff-tree with wildcard shows dir also matches': 
+	git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
+	echo file0 >expected &&
+	test_cmp expected result
+
+ok 9 - diff-tree with wildcard shows dir also matches
+
+expecting success of 4010.10 'diff-tree -r with wildcard': 
+	git diff-tree -r --name-only $EMPTY_TREE $tree -- "*file1" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 10 - diff-tree -r with wildcard
+
+expecting success of 4010.11 'diff-tree with wildcard shows dir also matches': 
+	git diff-tree --name-only $tree $tree2 -- "path1/f*" >result &&
+	echo path1 >expected &&
+	test_cmp expected result
+
+ok 11 - diff-tree with wildcard shows dir also matches
+
+expecting success of 4010.12 'diff-tree -r with wildcard from beginning': 
+	git diff-tree -r --name-only $tree $tree2 -- "path1/*file1" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 12 - diff-tree -r with wildcard from beginning
+
+expecting success of 4010.13 'diff-tree -r with wildcard': 
+	git diff-tree -r --name-only $tree $tree2 -- "path1/f*" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 13 - diff-tree -r with wildcard
+
+expecting success of 4010.14 'setup submodules': 
+	test_tick &&
+	git init submod &&
+	( cd submod && test_commit first ) &&
+	git add submod &&
+	git commit -m first &&
+	( cd submod && test_commit second ) &&
+	git add submod &&
+	git commit -m second
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4010-diff-pathspec/submod/.git/
+[master (root-commit) 1e96f59] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+warning: adding embedded git repository: submod
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submod
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submod
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) f9d7654] first
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file0
+ create mode 100644 path1/file1
+ create mode 160000 submod
+[master 1bf6dc5] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master f1afec5] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - setup submodules
+
+expecting success of 4010.15 'diff-tree ignores trailing slash on submodule path': 
+	git diff --name-only HEAD^ HEAD submod >expect &&
+	git diff --name-only HEAD^ HEAD submod/ >actual &&
+	test_cmp expect actual &&
+	git diff --name-only HEAD^ HEAD -- submod/whatever >actual &&
+	test_must_be_empty actual
+
+ok 15 - diff-tree ignores trailing slash on submodule path
+
+expecting success of 4010.16 'diff multiple wildcard pathspecs': 
+	mkdir path2 &&
+	echo rezrov >path2/file1 &&
+	git update-index --add path2/file1 &&
+	tree3=$(git write-tree) &&
+	git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
+	cat <<-\EOF >expect &&
+	path1/file1
+	path2/file1
+	EOF
+	test_cmp expect actual
+
+ok 16 - diff multiple wildcard pathspecs
+
+expecting success of 4010.17 'diff-cache ignores trailing slash on submodule path': 
+	git diff --name-only HEAD^ submod >expect &&
+	git diff --name-only HEAD^ submod/ >actual &&
+	test_cmp expect actual
+
+ok 17 - diff-cache ignores trailing slash on submodule path
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3800-mktag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3800-mktag/.git/
 expecting success of 3800.1 'setup': 
@@ -221541,682 +222173,6 @@
 1..151
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4009-diff-rename-4.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4009-diff-rename-4/.git/
-expecting success of 4009.1 'prepare reference tree': COPYING_test_data >COPYING &&
-     echo frotz >rezrov &&
-    git update-index --add COPYING rezrov &&
-    orig=$(git hash-object COPYING) &&
-    tree=$(git write-tree) &&
-    echo $tree
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - prepare reference tree
-
-expecting success of 4009.2 'prepare work tree': sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
-    sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
-    rm -f COPYING &&
-    c1=$(git hash-object COPYING.1) &&
-    c2=$(git hash-object COPYING.2) &&
-    git update-index --add --remove COPYING COPYING.?
-ok 2 - prepare work tree
-
-expecting success of 4009.3 'validate output from rename/copy detection (#1)': compare_diff_raw_z current expected
-ok 3 - validate output from rename/copy detection (#1)
-
-expecting success of 4009.4 'prepare work tree again': mv COPYING.2 COPYING &&
-     git update-index --add --remove COPYING COPYING.1 COPYING.2
-ok 4 - prepare work tree again
-
-expecting success of 4009.5 'validate output from rename/copy detection (#2)': compare_diff_raw_z current expected
-ok 5 - validate output from rename/copy detection (#2)
-
-expecting success of 4009.6 'prepare work tree once again': COPYING_test_data >COPYING &&
-     git update-index --add --remove COPYING COPYING.1
-ok 6 - prepare work tree once again
-
-expecting success of 4009.7 'validate output from rename/copy detection (#3)': compare_diff_raw_z current expected
-ok 7 - validate output from rename/copy detection (#3)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4008-diff-break-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4008-diff-break-rewrite/.git/
-expecting success of 4008.1 'setup': 
-	echo some dissimilar content >file0 &&
-	COPYING_test_data >file1 &&
-	blob0_id=$(git hash-object file0) &&
-	blob1_id=$(git hash-object file1) &&
-	git update-index --add file0 file1 &&
-	git tag reference $(git write-tree)
-
-ok 1 - setup
-
-expecting success of 4008.2 'change file1 with copy-edit of file0 and remove file0': 
-	sed -e "s/git/GIT/" file0 >file1 &&
-	blob2_id=$(git hash-object file1) &&
-	rm -f file0 &&
-	git update-index --remove file0 file1
-
-ok 2 - change file1 with copy-edit of file0 and remove file0
-
-expecting success of 4008.3 'run diff with -B (#1)': 
-	git diff-index -B --cached reference >current &&
-	cat >expect <<-EOF &&
-	:100644 000000 $blob0_id $ZERO_OID D	file0
-	:100644 100644 $blob1_id $blob2_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 3 - run diff with -B (#1)
-
-expecting success of 4008.4 'run diff with -B and -M (#2)': 
-	git diff-index -B -M reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob2_id R100	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 4 - run diff with -B and -M (#2)
-
-expecting success of 4008.5 'swap file0 and file1': 
-	rm -f file0 file1 &&
-	git read-tree -m reference &&
-	git checkout-index -f -u -a &&
-	mv file0 tmp &&
-	mv file1 file0 &&
-	mv tmp file1 &&
-	git update-index file0 file1
-
-ok 5 - swap file0 and file1
-
-expecting success of 4008.6 'run diff with -B (#3)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob1_id M100	file0
-	:100644 100644 $blob1_id $blob0_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 6 - run diff with -B (#3)
-
-expecting success of 4008.7 'run diff with -B and -M (#4)': 
-	git diff-index -B -M reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob1_id $blob1_id R100	file1	file0
-	:100644 100644 $blob0_id $blob0_id R100	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 7 - run diff with -B and -M (#4)
-
-expecting success of 4008.8 'make file0 into something completely different': 
-	rm -f file0 &&
-	test_ln_s_add frotz file0 &&
-	slink_id=$(printf frotz | git hash-object --stdin) &&
-	git update-index file1
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 8 - make file0 into something completely different
-
-expecting success of 4008.9 'run diff with -B (#5)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob1_id $blob0_id M100	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 9 - run diff with -B (#5)
-
-expecting success of 4008.10 'run diff with -B -M (#6)': 
-	git diff-index -B -M reference >current &&
-
-	# file0 changed from regular to symlink.  file1 is the same as the preimage
-	# of file0.  Because the change does not make file0 disappear, file1 is
-	# denoted as a copy of file0
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob0_id $blob0_id C	file0	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 10 - run diff with -B -M (#6)
-
-expecting success of 4008.11 'run diff with -M (#7)': 
-	git diff-index -M reference >current &&
-
-	# This should not mistake file0 as the copy source of new file1
-	# due to type differences.
-	cat >expect <<-EOF &&
-	:100644 120000 $blob0_id $slink_id T	file0
-	:100644 100644 $blob1_id $blob0_id M	file1
-	EOF
-	compare_diff_raw expect current
-
-ok 11 - run diff with -M (#7)
-
-expecting success of 4008.12 'file1 edited to look like file0 and file0 rename-edited to file2': 
-	rm -f file0 file1 &&
-	git read-tree -m reference &&
-	git checkout-index -f -u -a &&
-	sed -e "s/git/GIT/" file0 >file1 &&
-	sed -e "s/git/GET/" file0 >file2 &&
-	blob3_id=$(git hash-object file2) &&
-	rm -f file0 &&
-	git update-index --add --remove file0 file1 file2
-
-ok 12 - file1 edited to look like file0 and file0 rename-edited to file2
-
-expecting success of 4008.13 'run diff with -B (#8)': 
-	git diff-index -B reference >current &&
-	cat >expect <<-EOF &&
-	:100644 000000 $blob0_id $ZERO_OID D	file0
-	:100644 100644 $blob1_id $blob2_id M100	file1
-	:000000 100644 $ZERO_OID $blob3_id A	file2
-	EOF
-	compare_diff_raw expect current
-
-ok 13 - run diff with -B (#8)
-
-expecting success of 4008.14 'run diff with -B -C (#9)': 
-	git diff-index -B -C reference >current &&
-	cat >expect <<-EOF &&
-	:100644 100644 $blob0_id $blob2_id C095	file0	file1
-	:100644 100644 $blob0_id $blob3_id R095	file0	file2
-	EOF
-	compare_diff_raw expect current
-
-ok 14 - run diff with -B -C (#9)
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4012-diff-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4012-diff-binary/.git/
-expecting success of 4012.1 'prepare repository': 
-	echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
-	git update-index --add a b c d &&
-	echo git >a &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >b &&
-	echo git >c &&
-	cat b b >d
-
-ok 1 - prepare repository
-
-expecting success of 4012.2 'apply --stat output for binary file change': 
-	git diff >diff &&
-	git apply --stat --summary <diff >current &&
-	test_cmp expected current
-
-ok 2 - apply --stat output for binary file change
-
-expecting success of 4012.3 'diff --shortstat output for binary file change': 
-	tail -n 1 expected >expect &&
-	git diff --shortstat >current &&
-	test_cmp expect current
-
-ok 3 - diff --shortstat output for binary file change
-
-expecting success of 4012.4 'diff --shortstat output for binary file change only': 
-	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
-	git diff --shortstat -- b >current &&
-	test_cmp expected current
-
-ok 4 - diff --shortstat output for binary file change only
-
-expecting success of 4012.5 'apply --numstat notices binary file change': 
-	git diff >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expect.binary-numstat current
-
-ok 5 - apply --numstat notices binary file change
-
-expecting success of 4012.6 'apply --numstat understands diff --binary format': 
-	git diff --binary >diff &&
-	git apply --numstat <diff >current &&
-	test_cmp expect.binary-numstat current
-
-ok 6 - apply --numstat understands diff --binary format
-
-expecting success of 4012.7 'apply detecting corrupt patch correctly': 
-	git diff >output &&
-	sed -e "s/-CIT/xCIT/" <output >broken &&
-	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=$(cat detected) &&
-	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
-	detected=$(sed -ne "${detected}p" broken) &&
-	test "$detected" = xCIT
-
-ok 7 - apply detecting corrupt patch correctly
-
-expecting success of 4012.8 'apply detecting corrupt patch correctly': 
-	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
-	test_must_fail git apply --stat --summary broken 2>detected &&
-	detected=$(cat detected) &&
-	detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
-	detected=$(sed -ne "${detected}p" broken) &&
-	test "$detected" = xCIT
-
-ok 8 - apply detecting corrupt patch correctly
-
-expecting success of 4012.9 'initial commit': git commit -a -m initial
-[master (root-commit) 4ede773] initial
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 d
-ok 9 - initial commit
-
-expecting success of 4012.10 'diff-index with --binary': 
-	echo AIT >a && mv b e && echo CIT >c && cat e >d &&
-	git update-index --add --remove a b c d e &&
-	tree0=$(git write-tree) &&
-	git diff --cached --binary >current &&
-	git apply --stat --summary current
-
- a |    2 +-
- c |    2 +-
- d |  Bin
- e |    0 
- 4 files changed, 2 insertions(+), 2 deletions(-)
- rename b => e (100%)
-ok 10 - diff-index with --binary
-
-expecting success of 4012.11 'apply binary patch': 
-	git reset --hard &&
-	git apply --binary --index <current &&
-	tree1=$(git write-tree) &&
-	test "$tree1" = "$tree0"
-
-HEAD is now at 4ede773 initial
-ok 11 - apply binary patch
-
-expecting success of 4012.12 'diff --no-index with binary creation': 
-	echo Q | q_to_nul >binary &&
-	# hide error code from diff, which just indicates differences
-	test_might_fail git diff --binary --no-index /dev/null binary >current &&
-	rm binary &&
-	git apply --binary <current &&
-	echo Q >expected &&
-	nul_to_q <binary >actual &&
-	test_cmp expected actual
-
-ok 12 - diff --no-index with binary creation
-
-expecting success of 4012.13 'diff --stat with binary files and big change count': 
-	printf "\01\00%1024d" 1 >binfilë &&
-	git add binfilë &&
-	i=0 &&
-	while test $i -lt 10000; do
-		echo $i &&
-		i=$(($i + 1)) || return 1
-	done >tëxtfilë &&
-	git add tëxtfilë &&
-	git -c core.quotepath=false diff --cached --stat binfilë tëxtfilë >output &&
-	grep " | " output >actual &&
-	test_cmp expect actual
-
-ok 13 - diff --stat with binary files and big change count
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4011-diff-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4011-diff-symlink/.git/
-expecting success of 4011.1 'diff new symlink and file': 
-	symlink=$(symlink_oid xyzzy) &&
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	new file mode 120000
-	index 0000000..$symlink
-	--- /dev/null
-	+++ b/frotz
-	@@ -0,0 +1 @@
-	+xyzzy
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	new file mode 100644
-	index 0000000..$symlink
-	--- /dev/null
-	+++ b/nitfol
-	@@ -0,0 +1 @@
-	+xyzzy
-	EOF
-
-	# the empty tree
-	git update-index &&
-	tree=$(git write-tree) &&
-
-	test_ln_s_add xyzzy frotz &&
-	echo xyzzy >nitfol &&
-	git update-index --add nitfol &&
-	GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 1 - diff new symlink and file
-
-expecting success of 4011.2 'diff unchanged symlink and file': 
-	tree=$(git write-tree) &&
-	git update-index frotz nitfol &&
-	test -z "$(git diff-index --name-only $tree)"
-
-ok 2 - diff unchanged symlink and file
-
-expecting success of 4011.3 'diff removed symlink and file': 
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	deleted file mode 120000
-	index $symlink..0000000
-	--- a/frotz
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-xyzzy
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	deleted file mode 100644
-	index $symlink..0000000
-	--- a/nitfol
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-xyzzy
-	EOF
-	mv frotz frotz2 &&
-	mv nitfol nitfol2 &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
-
-ok 3 - diff removed symlink and file
-
-expecting success of 4011.4 'diff identical, but newly created symlink and file': 
-	>expected &&
-	rm -f frotz nitfol &&
-	echo xyzzy >nitfol &&
-	test-tool chmtime +10 nitfol &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s xyzzy frotz
-	else
-		printf xyzzy >frotz
-		# the symlink property propagates from the index
-	fi &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current &&
-
-	>expected &&
-	git diff-index -M -p -w $tree >current &&
-	compare_diff_patch expected current
-
-ok 4 - diff identical, but newly created symlink and file
-
-expecting success of 4011.5 'diff different symlink and file': 
-	new=$(symlink_oid yxyyz) &&
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	index $symlink..$new 120000
-	--- a/frotz
-	+++ b/frotz
-	@@ -1 +1 @@
-	-xyzzy
-	\ No newline at end of file
-	+yxyyz
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	index $symlink..$new 100644
-	--- a/nitfol
-	+++ b/nitfol
-	@@ -1 +1 @@
-	-xyzzy
-	+yxyyz
-	EOF
-	rm -f frotz &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s yxyyz frotz
-	else
-		printf yxyyz >frotz
-		# the symlink property propagates from the index
-	fi &&
-	echo yxyyz >nitfol &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
-
-ok 5 - diff different symlink and file
-
-expecting success of 4011.6 'diff symlinks with non-existing targets': 
-	ln -s narf pinky &&
-	ln -s take\ over brain &&
-	test_must_fail git diff --no-index pinky brain >output 2>output.err &&
-	grep narf output &&
-	test_must_be_empty output.err
-
--narf
-ok 6 - diff symlinks with non-existing targets
-
-expecting success of 4011.7 'setup symlinks with attributes': 
-	echo "*.bin diff=bin" >>.gitattributes &&
-	echo content >file.bin &&
-	ln -s file.bin link.bin &&
-	git add -N file.bin link.bin
-
-ok 7 - setup symlinks with attributes
-
-expecting success of 4011.8 'symlinks do not respect userdiff config by path': 
-	file=$(short_oid file.bin) &&
-	link=$(symlink_oid file.bin) &&
-	cat >expect <<-EOF &&
-	diff --git a/file.bin b/file.bin
-	new file mode 100644
-	index 0000000..$file
-	Binary files /dev/null and b/file.bin differ
-	diff --git a/link.bin b/link.bin
-	new file mode 120000
-	index 0000000..$link
-	--- /dev/null
-	+++ b/link.bin
-	@@ -0,0 +1 @@
-	+file.bin
-	\ No newline at end of file
-	EOF
-	git config diff.bin.binary true &&
-	git diff file.bin link.bin >actual &&
-	test_cmp expect actual
-
-ok 8 - symlinks do not respect userdiff config by path
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4010-diff-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4010-diff-pathspec/.git/
-expecting success of 4010.1 'setup': echo frotz >file0 &&
-     mkdir path1 &&
-     echo rezrov >path1/file1 &&
-     before0=$(git hash-object file0) &&
-     before1=$(git hash-object path1/file1) &&
-     git update-index --add file0 path1/file1 &&
-     tree=$(git write-tree) &&
-     echo "$tree" &&
-     echo nitfol >file0 &&
-     echo yomin >path1/file1 &&
-     after0=$(git hash-object file0) &&
-     after1=$(git hash-object path1/file1) &&
-     git update-index file0 path1/file1
-6b4658eda9b6c5385f027bc54abf3276b6effd05
-ok 1 - setup
-
-expecting success of 4010.2 'limit to path should show nothing': git diff-index --cached $tree -- path >current &&
-     compare_diff_raw current expected
-ok 2 - limit to path should show nothing
-
-expecting success of 4010.3 'limit to path1 should show path1/file1': git diff-index --cached $tree -- path1 >current &&
-     compare_diff_raw current expected
-ok 3 - limit to path1 should show path1/file1
-
-expecting success of 4010.4 'limit to path1/ should show path1/file1': git diff-index --cached $tree -- path1/ >current &&
-     compare_diff_raw current expected
-ok 4 - limit to path1/ should show path1/file1
-
-expecting success of 4010.5 '"*file1" should show path1/file1': git diff-index --cached $tree -- "*file1" >current &&
-     compare_diff_raw current expected
-ok 5 - "*file1" should show path1/file1
-
-expecting success of 4010.6 'limit to file0 should show file0': git diff-index --cached $tree -- file0 >current &&
-     compare_diff_raw current expected
-ok 6 - limit to file0 should show file0
-
-expecting success of 4010.7 'limit to file0/ should emit nothing.': git diff-index --cached $tree -- file0/ >current &&
-     compare_diff_raw current expected
-ok 7 - limit to file0/ should emit nothing.
-
-expecting success of 4010.8 'diff-tree pathspec': 
-	tree2=$(git write-tree) &&
-	echo "$tree2" &&
-	git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
-	test_must_be_empty current
-
-54d8765b122f32157e847ce3924180cb2ec778fc
-ok 8 - diff-tree pathspec
-
-expecting success of 4010.9 'diff-tree with wildcard shows dir also matches': 
-	git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
-	echo file0 >expected &&
-	test_cmp expected result
-
-ok 9 - diff-tree with wildcard shows dir also matches
-
-expecting success of 4010.10 'diff-tree -r with wildcard': 
-	git diff-tree -r --name-only $EMPTY_TREE $tree -- "*file1" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
-
-ok 10 - diff-tree -r with wildcard
-
-expecting success of 4010.11 'diff-tree with wildcard shows dir also matches': 
-	git diff-tree --name-only $tree $tree2 -- "path1/f*" >result &&
-	echo path1 >expected &&
-	test_cmp expected result
-
-ok 11 - diff-tree with wildcard shows dir also matches
-
-expecting success of 4010.12 'diff-tree -r with wildcard from beginning': 
-	git diff-tree -r --name-only $tree $tree2 -- "path1/*file1" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
-
-ok 12 - diff-tree -r with wildcard from beginning
-
-expecting success of 4010.13 'diff-tree -r with wildcard': 
-	git diff-tree -r --name-only $tree $tree2 -- "path1/f*" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
-
-ok 13 - diff-tree -r with wildcard
-
-expecting success of 4010.14 'setup submodules': 
-	test_tick &&
-	git init submod &&
-	( cd submod && test_commit first ) &&
-	git add submod &&
-	git commit -m first &&
-	( cd submod && test_commit second ) &&
-	git add submod &&
-	git commit -m second
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4010-diff-pathspec/submod/.git/
-[master (root-commit) 1e96f59] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-warning: adding embedded git repository: submod
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submod
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submod
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) f9d7654] first
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 file0
- create mode 100644 path1/file1
- create mode 160000 submod
-[master 1bf6dc5] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master f1afec5] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - setup submodules
-
-expecting success of 4010.15 'diff-tree ignores trailing slash on submodule path': 
-	git diff --name-only HEAD^ HEAD submod >expect &&
-	git diff --name-only HEAD^ HEAD submod/ >actual &&
-	test_cmp expect actual &&
-	git diff --name-only HEAD^ HEAD -- submod/whatever >actual &&
-	test_must_be_empty actual
-
-ok 15 - diff-tree ignores trailing slash on submodule path
-
-expecting success of 4010.16 'diff multiple wildcard pathspecs': 
-	mkdir path2 &&
-	echo rezrov >path2/file1 &&
-	git update-index --add path2/file1 &&
-	tree3=$(git write-tree) &&
-	git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
-	cat <<-\EOF >expect &&
-	path1/file1
-	path2/file1
-	EOF
-	test_cmp expect actual
-
-ok 16 - diff multiple wildcard pathspecs
-
-expecting success of 4010.17 'diff-cache ignores trailing slash on submodule path': 
-	git diff --name-only HEAD^ submod >expect &&
-	git diff --name-only HEAD^ submod/ >actual &&
-	test_cmp expect actual
-
-ok 17 - diff-cache ignores trailing slash on submodule path
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4016-diff-quote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4016-diff-quote/.git/
 expecting success of 4016.1 'setup': 
@@ -222739,148 +222695,6 @@
 1..63
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4021-format-patch-numbered.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4021-format-patch-numbered/.git/
-expecting success of 4021.1 'setup': 
-
-	echo A > file &&
-	git add file &&
-	git commit -m First &&
-
-	echo B >> file &&
-	git commit -a -m Second &&
-
-	echo C >> file &&
-	git commit -a -m Third
-
-
-[master (root-commit) c3fa1f8] First
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master e967d08] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 20641e9] Third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 4021.2 'single patch defaults to no numbers': 
-	git format-patch --stdout HEAD~1 >patch0.single &&
-	test_single_no_numbered patch0.single
-
-ok 2 - single patch defaults to no numbers
-
-expecting success of 4021.3 'multiple patch defaults to numbered': 
-
-	git format-patch --stdout HEAD~2 >patch0.multiple &&
-	test_numbered patch0.multiple
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 3 - multiple patch defaults to numbered
-
-expecting success of 4021.4 'Use --numbered': 
-
-	git format-patch --numbered --stdout HEAD~1 >patch1 &&
-	test_single_numbered patch1
-
-
-Subject: [PATCH 1/1] Third
-ok 4 - Use --numbered
-
-expecting success of 4021.5 'format.numbered = true': 
-
-	git config format.numbered true &&
-	git format-patch --stdout HEAD~2 >patch2 &&
-	test_numbered patch2
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 5 - format.numbered = true
-
-expecting success of 4021.6 'format.numbered && single patch': 
-
-	git format-patch --stdout HEAD^ > patch3 &&
-	test_single_numbered patch3
-
-
-Subject: [PATCH 1/1] Third
-ok 6 - format.numbered && single patch
-
-expecting success of 4021.7 'format.numbered && --no-numbered': 
-
-	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
-	test_no_numbered patch4
-
-
-ok 7 - format.numbered && --no-numbered
-
-expecting success of 4021.8 'format.numbered && --keep-subject': 
-
-	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
-	grep "^Subject: Third" patch4a
-
-
-Subject: Third
-ok 8 - format.numbered && --keep-subject
-
-expecting success of 4021.9 'format.numbered = auto': 
-
-	git config format.numbered auto &&
-	git format-patch --stdout HEAD~2 > patch5 &&
-	test_numbered patch5
-
-
-Subject: [PATCH 1/2] Second
-Subject: [PATCH 2/2] Third
-ok 9 - format.numbered = auto
-
-expecting success of 4021.10 'format.numbered = auto && single patch': 
-
-	git format-patch --stdout HEAD^ > patch6 &&
-	test_single_no_numbered patch6
-
-
-ok 10 - format.numbered = auto && single patch
-
-expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
-
-	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
-	test_no_numbered patch7
-
-
-ok 11 - format.numbered = auto && --no-numbered
-
-expecting success of 4021.12 '--start-number && --numbered': 
-
-	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
-	grep "^Subject: \[PATCH 3/3\]" patch8
-
-Subject: [PATCH 3/3] Third
-ok 12 - --start-number && --numbered
-
-expecting success of 4021.13 'single patch with cover-letter defaults to numbers': 
-	git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
-	test_single_cover_letter_numbered patch9.single
-
-Subject: [PATCH 0/1] *** SUBJECT HERE ***
-Subject: [PATCH 1/1] Third
-ok 13 - single patch with cover-letter defaults to numbers
-
-expecting success of 4021.14 'Use --no-numbered and --cover-letter single patch': 
-	git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
-	test_no_numbered patch10
-
-ok 14 - Use --no-numbered and --cover-letter single patch
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4017-diff-retval.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4017-diff-retval/.git/
 expecting success of 4017.1 'setup': 
@@ -223582,6 +223396,148 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4021-format-patch-numbered.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4021-format-patch-numbered/.git/
+expecting success of 4021.1 'setup': 
+
+	echo A > file &&
+	git add file &&
+	git commit -m First &&
+
+	echo B >> file &&
+	git commit -a -m Second &&
+
+	echo C >> file &&
+	git commit -a -m Third
+
+
+[master (root-commit) c3fa1f8] First
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master e967d08] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 20641e9] Third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 4021.2 'single patch defaults to no numbers': 
+	git format-patch --stdout HEAD~1 >patch0.single &&
+	test_single_no_numbered patch0.single
+
+ok 2 - single patch defaults to no numbers
+
+expecting success of 4021.3 'multiple patch defaults to numbered': 
+
+	git format-patch --stdout HEAD~2 >patch0.multiple &&
+	test_numbered patch0.multiple
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 3 - multiple patch defaults to numbered
+
+expecting success of 4021.4 'Use --numbered': 
+
+	git format-patch --numbered --stdout HEAD~1 >patch1 &&
+	test_single_numbered patch1
+
+
+Subject: [PATCH 1/1] Third
+ok 4 - Use --numbered
+
+expecting success of 4021.5 'format.numbered = true': 
+
+	git config format.numbered true &&
+	git format-patch --stdout HEAD~2 >patch2 &&
+	test_numbered patch2
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 5 - format.numbered = true
+
+expecting success of 4021.6 'format.numbered && single patch': 
+
+	git format-patch --stdout HEAD^ > patch3 &&
+	test_single_numbered patch3
+
+
+Subject: [PATCH 1/1] Third
+ok 6 - format.numbered && single patch
+
+expecting success of 4021.7 'format.numbered && --no-numbered': 
+
+	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
+	test_no_numbered patch4
+
+
+ok 7 - format.numbered && --no-numbered
+
+expecting success of 4021.8 'format.numbered && --keep-subject': 
+
+	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
+	grep "^Subject: Third" patch4a
+
+
+Subject: Third
+ok 8 - format.numbered && --keep-subject
+
+expecting success of 4021.9 'format.numbered = auto': 
+
+	git config format.numbered auto &&
+	git format-patch --stdout HEAD~2 > patch5 &&
+	test_numbered patch5
+
+
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 9 - format.numbered = auto
+
+expecting success of 4021.10 'format.numbered = auto && single patch': 
+
+	git format-patch --stdout HEAD^ > patch6 &&
+	test_single_no_numbered patch6
+
+
+ok 10 - format.numbered = auto && single patch
+
+expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
+
+	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
+	test_no_numbered patch7
+
+
+ok 11 - format.numbered = auto && --no-numbered
+
+expecting success of 4021.12 '--start-number && --numbered': 
+
+	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
+	grep "^Subject: \[PATCH 3/3\]" patch8
+
+Subject: [PATCH 3/3] Third
+ok 12 - --start-number && --numbered
+
+expecting success of 4021.13 'single patch with cover-letter defaults to numbers': 
+	git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
+	test_single_cover_letter_numbered patch9.single
+
+Subject: [PATCH 0/1] *** SUBJECT HERE ***
+Subject: [PATCH 1/1] Third
+ok 13 - single patch with cover-letter defaults to numbers
+
+expecting success of 4021.14 'Use --no-numbered and --cover-letter single patch': 
+	git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
+	test_no_numbered patch10
+
+ok 14 - Use --no-numbered and --cover-letter single patch
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4022-diff-rewrite.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4022-diff-rewrite/.git/
 expecting success of 4022.1 'setup': 
@@ -223845,6 +223801,40 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4025-hunk-header.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4025-hunk-header/.git/
+expecting success of 4025.1 'setup': 
+
+	(
+		echo "A $NS" &&
+		printf "  %s\n" B C D E F G H I J K &&
+		echo "L  $NS" &&
+		printf "  %s\n" M N O P Q R S T U V
+	) >file &&
+	git add file &&
+
+	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
+	mv file+ file
+
+
+ok 1 - setup
+
+expecting success of 4025.2 'hunk header truncation with an overly long line': 
+
+	git diff | sed -n -e "s/^.*@@//p" >actual &&
+	(
+		echo " A $N$N$N$N$N$N$N$N$N2" &&
+		echo " L  $N$N$N$N$N$N$N$N$N1"
+	) >expected &&
+	test_cmp expected actual
+
+
+ok 2 - hunk header truncation with an overly long line
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4024-diff-optimize-common.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4024-diff-optimize-common/.git/
 expecting success of 4024.1 'setup': 
@@ -223884,38 +223874,1485 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4025-hunk-header.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4025-hunk-header/.git/
-expecting success of 4025.1 'setup': 
+*** t4028-format-patch-mime-headers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4028-format-patch-mime-headers/.git/
+expecting success of 4028.1 'create commit with utf-8 body': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	echo more >>file &&
+	git commit -a -m "two
+
+	utf-8 body: ñ"
+
+[master (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 219a3c6] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - create commit with utf-8 body
+
+expecting success of 4028.2 'patch has mime headers': 
+	rm -f 0001-two.patch &&
+	git format-patch HEAD^ &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+Content-Type: text/plain; charset=UTF-8
+ok 2 - patch has mime headers
+
+expecting success of 4028.3 'patch has mime and extra headers': 
+	rm -f 0001-two.patch &&
+	git config format.headers "x-foo: bar" &&
+	git format-patch HEAD^ &&
+	grep -i "x-foo: bar" 0001-two.patch &&
+	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
+
+0001-two.patch
+x-foo: bar
+Content-Type: text/plain; charset=UTF-8
+ok 3 - patch has mime and extra headers
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4026-color.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4026-color/.git/
+expecting success of 4026.1 'reset': 
+	color "reset" "[m"
+
+ok 1 - reset
+
+expecting success of 4026.2 'empty color is empty': 
+	color "" ""
+
+ok 2 - empty color is empty
+
+expecting success of 4026.3 'attribute before color name': 
+	color "bold red" "[1;31m"
+
+ok 3 - attribute before color name
+
+expecting success of 4026.4 'aixterm bright fg color': 
+	color "brightred" "[91m"
+
+ok 4 - aixterm bright fg color
+
+expecting success of 4026.5 'aixterm bright bg color': 
+	color "green brightblue" "[32;104m"
+
+ok 5 - aixterm bright bg color
+
+expecting success of 4026.6 'color name before attribute': 
+	color "red bold" "[1;31m"
+
+ok 6 - color name before attribute
+
+expecting success of 4026.7 'attr fg bg': 
+	color "ul blue red" "[4;34;41m"
+
+ok 7 - attr fg bg
+
+expecting success of 4026.8 'fg attr bg': 
+	color "blue ul red" "[4;34;41m"
+
+ok 8 - fg attr bg
+
+expecting success of 4026.9 'fg bg attr': 
+	color "blue red ul" "[4;34;41m"
+
+ok 9 - fg bg attr
+
+expecting success of 4026.10 'fg bg attr...': 
+	color "blue bold dim ul blink reverse" "[1;2;4;5;7;34m"
+
+ok 10 - fg bg attr...
+
+expecting success of 4026.11 'reset fg bg attr...': 
+	color "reset blue bold dim ul blink reverse" "[;1;2;4;5;7;34m"
+
+ok 11 - reset fg bg attr...
+
+expecting success of 4026.12 'attr negation': 
+	color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
+
+ok 12 - attr negation
+
+expecting success of 4026.13 '"no-" variant of negation': 
+	color "no-bold no-blink" "[22;25m"
+
+ok 13 - "no-" variant of negation
+
+expecting success of 4026.14 'long color specification': 
+	color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
+
+ok 14 - long color specification
+
+expecting success of 4026.15 'absurdly long color specification': 
+	color \
+	  "#ffffff #ffffff bold nobold dim nodim italic noitalic
+	   ul noul blink noblink reverse noreverse strike nostrike" \
+	  "[1;2;3;4;5;7;9;22;23;24;25;27;29;38;2;255;255;255;48;2;255;255;255m"
+
+ok 15 - absurdly long color specification
+
+expecting success of 4026.16 '0-7 are aliases for basic ANSI color names': 
+	color "0 7" "[30;47m"
+
+ok 16 - 0-7 are aliases for basic ANSI color names
+
+expecting success of 4026.17 '8-15 are aliases for aixterm color names': 
+	color "12 13" "[94;105m"
+
+ok 17 - 8-15 are aliases for aixterm color names
+
+expecting success of 4026.18 '256 colors': 
+	color "254 bold 255" "[1;38;5;254;48;5;255m"
+
+ok 18 - 256 colors
+
+expecting success of 4026.19 'RGB colors': 
+	color "#ff00ff #0f0" "[38;2;255;0;255;48;2;0;255;0m"
+
+ok 19 - RGB colors
+
+expecting success of 4026.20 '"default" foreground': 
+	color "default" "[39m"
+
+ok 20 - "default" foreground
+
+expecting success of 4026.21 '"normal default" to clear background': 
+	color "normal default" "[49m"
+
+ok 21 - "normal default" to clear background
+
+expecting success of 4026.22 '"default" can be combined with attributes': 
+	color "default default no-reverse bold" "[1;27;39;49m"
+
+ok 22 - "default" can be combined with attributes
+
+expecting success of 4026.23 '"normal" yields no color at all': 
+	color "normal black" "[40m"
+
+ok 23 - "normal" yields no color at all
+
+expecting success of 4026.24 '-1 is a synonym for "normal"': 
+	color "-1 black" "[40m"
+
+ok 24 - -1 is a synonym for "normal"
+
+expecting success of 4026.25 'color too small': 
+	invalid_color "-2"
+
+error: invalid color value: -2
+fatal: unable to parse default color value
+ok 25 - color too small
+
+expecting success of 4026.26 'color too big': 
+	invalid_color "256"
+
+error: invalid color value: 256
+fatal: unable to parse default color value
+ok 26 - color too big
+
+expecting success of 4026.27 'extra character after color number': 
+	invalid_color "3X"
+
+error: invalid color value: 3X
+fatal: unable to parse default color value
+ok 27 - extra character after color number
+
+expecting success of 4026.28 'extra character after color name': 
+	invalid_color "redX"
+
+error: invalid color value: redX
+fatal: unable to parse default color value
+ok 28 - extra character after color name
+
+expecting success of 4026.29 'extra character after attribute': 
+	invalid_color "dimX"
+
+error: invalid color value: dimX
+fatal: unable to parse default color value
+ok 29 - extra character after attribute
+
+expecting success of 4026.30 'non-hex character in RGB color': 
+	invalid_color "#x23456" &&
+	invalid_color "#1x3456" &&
+	invalid_color "#12x456" &&
+	invalid_color "#123x56" &&
+	invalid_color "#1234x6" &&
+	invalid_color "#12345x" &&
+	invalid_color "#x23" &&
+	invalid_color "#1x3" &&
+	invalid_color "#12x"
+
+error: invalid color value: #x23456
+fatal: unable to parse default color value
+error: invalid color value: #1x3456
+fatal: unable to parse default color value
+error: invalid color value: #12x456
+fatal: unable to parse default color value
+error: invalid color value: #123x56
+fatal: unable to parse default color value
+error: invalid color value: #1234x6
+fatal: unable to parse default color value
+error: invalid color value: #12345x
+fatal: unable to parse default color value
+error: invalid color value: #x23
+fatal: unable to parse default color value
+error: invalid color value: #1x3
+fatal: unable to parse default color value
+error: invalid color value: #12x
+fatal: unable to parse default color value
+ok 30 - non-hex character in RGB color
+
+expecting success of 4026.31 'wrong number of letters in RGB color': 
+	invalid_color "#1" &&
+	invalid_color "#23" &&
+	invalid_color "#789a" &&
+	invalid_color "#bcdef" &&
+	invalid_color "#1234567"
+
+error: invalid color value: #1
+fatal: unable to parse default color value
+error: invalid color value: #23
+fatal: unable to parse default color value
+error: invalid color value: #789a
+fatal: unable to parse default color value
+error: invalid color value: #bcdef
+fatal: unable to parse default color value
+error: invalid color value: #1234567
+fatal: unable to parse default color value
+ok 31 - wrong number of letters in RGB color
+
+expecting success of 4026.32 'unknown color slots are ignored (diff)': 
+	git config color.diff.nosuchslotwilleverbedefined white &&
+	git diff --color
+
+ok 32 - unknown color slots are ignored (diff)
+
+expecting success of 4026.33 'unknown color slots are ignored (branch)': 
+	git config color.branch.nosuchslotwilleverbedefined white &&
+	git branch -a
+
+ok 33 - unknown color slots are ignored (branch)
+
+expecting success of 4026.34 'unknown color slots are ignored (status)': 
+	git config color.status.nosuchslotwilleverbedefined white &&
+	{ git status; ret=$?; } &&
+	case $ret in 0|1) : ok ;; *) false ;; esac
+
+On branch master
+
+No commits yet
+
+nothing to commit (create/copy files and use "git add" to track)
+ok 34 - unknown color slots are ignored (status)
+
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t3906-stash-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/.git/
+expecting success of 3906.1 'git_stash: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Saved working directory and index state WIP on no_submodule: 27611a5 Base
+Merging Version stash was based on with Stashed changes
+On branch no_submodule
+Your branch is up to date with 'origin/no_submodule'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   .gitmodules
+	new file:   sub1
+	new file:   uninitialized_sub
+
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_stash: added submodule creates empty directory
+
+checking known breakage of 3906.2 'git_stash: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Saved working directory and index state WIP on no_submodule: 27611a5 Base
+--- expect	2025-03-17 13:21:32.876784367 +0000
++++ actual	2025-03-17 13:21:33.056785505 +0000
+@@ -2,5 +2,3 @@
+ expect
+ file1
+ file2
+-
+-sub1:
+not ok 2 - git_stash: added submodule leaves existing empty directory alone # TODO known breakage
+
+checking known breakage of 3906.3 'git_stash: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Saved working directory and index state WIP on replace_sub1_with_file: 2364f5a Replace sub1 with file
+Merging Version stash was based on with Stashed changes
+On branch replace_sub1_with_file
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   .gitmodules
+	deleted:    sub1
+
+no changes added to commit (use "git add" and/or "git commit -a")
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
+:160000 100644 63c430421a9604f896526f8a04236bdfe3ac1fc1 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
+not ok 3 - git_stash: replace tracked file with submodule creates empty directory # TODO known breakage
+
+checking known breakage of 3906.4 'git_stash: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Saved working directory and index state WIP on replace_sub1_with_directory: cb28587 Replace sub1 with directory
+Merging Version stash was based on with Stashed changes
+error: 'sub1/file1' appears as both a file and as a directory
+error: 'sub1/file2' appears as both a file and as a directory
+error: 'sub1/file3' appears as both a file and as a directory
+On branch replace_sub1_with_directory
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   sub1
+	deleted:    sub1/file1
+	deleted:    sub1/file2
+	deleted:    sub1/file3
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   .gitmodules
+
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
+not ok 4 - git_stash: replace directory with submodule # TODO known breakage
+
+checking known breakage of 3906.5 'git_stash: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
+warning: unable to rmdir 'sub1': Directory not empty
+Merging Version stash was based on with Stashed changes
+On branch add_sub1
+Your branch is up to date with 'origin/add_sub1'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    sub1
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    .gitmodules
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	sub1/
+
+'actual' is not empty, it contains:
+:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
+:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
+not ok 5 - git_stash: removed submodule leaves submodule directory and its contents in place # TODO known breakage
+
+checking known breakage of 3906.6 'git_stash: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
+warning: unable to rmdir 'sub1': Directory not empty
+Merging Version stash was based on with Stashed changes
+On branch add_sub1
+Your branch is up to date with 'origin/add_sub1'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    sub1
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    .gitmodules
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	sub1/
+
+'actual' is not empty, it contains:
+:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
+:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
+not ok 6 - git_stash: removed submodule leaves submodule containing a .git directory alone # TODO known breakage
+
+expecting success of 3906.7 'git_stash: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 7 - git_stash: replace submodule with a directory must fail
+
+expecting success of 3906.8 'git_stash: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 8 - git_stash: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 3906.9 'git_stash: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 9 - git_stash: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 3906.10 'git_stash: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 10 - git_stash: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+checking known breakage of 3906.11 'git_stash: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+No local changes to save
+--- expect	2025-03-17 13:21:44.148855612 +0000
++++ actual	2025-03-17 13:21:44.252856269 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 11 - git_stash: modified submodule does not update submodule work tree # TODO known breakage
+
+checking known breakage of 3906.12 'git_stash: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+No local changes to save
+--- expect	2025-03-17 13:21:45.364863297 +0000
++++ actual	2025-03-17 13:21:45.476864005 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 12 - git_stash: modified submodule does not update submodule work tree to invalid commit # TODO known breakage
+
+checking known breakage of 3906.13 'git_stash: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+No local changes to save
+--- expect	2025-03-17 13:21:45.940866938 +0000
++++ actual	2025-03-17 13:21:46.052867646 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 13 - git_stash: modified submodule does not update submodule work tree from invalid commit # TODO known breakage
+
+expecting success of 3906.14 'git_stash: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 14 - git_stash: added submodule doesn't remove untracked unignored file with same name
 
+expecting success of 3906.15 'stash push with submodule.recurse=true preserves dirty submodule worktree': 
+	setup_basic &&
 	(
-		echo "A $NS" &&
-		printf "  %s\n" B C D E F G H I J K &&
-		echo "L  $NS" &&
-		printf "  %s\n" M N O P Q R S T U V
-	) >file &&
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		test_must_fail git -C sub diff --quiet
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/sub/.git/
+[master (root-commit) af789f4] sub_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/sub'...
+done.
+[master (root-commit) d3a5de8] main_file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 main_file.t
+ create mode 160000 sub
+Saved working directory and index state WIP on master: d3a5de8 main_file
+ok 15 - stash push with submodule.recurse=true preserves dirty submodule worktree
+
+expecting success of 3906.16 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree': 
+	setup_basic &&
+	(
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		git stash pop &&
+		test_must_fail git -C sub diff --quiet
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/sub/.git/
+[master (root-commit) af789f4] sub_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/sub'...
+done.
+[master (root-commit) d3a5de8] main_file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 main_file.t
+ create mode 160000 sub
+Saved working directory and index state WIP on master: d3a5de8 main_file
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+  (commit or discard the untracked or modified content in submodules)
+	modified:   main_file.t
+	modified:   sub (modified content)
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (ee331cc507c2f3e6ac052edd8b1cc51dc982b38c)
+ok 16 - stash push and pop with submodule.recurse=true preserves dirty submodule worktree
+
+# still have 10 known breakage(s)
+# passed all remaining 6 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4029-diff-trailing-space.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4029-diff-trailing-space/.git/
+expecting success of 4029.1 'diff honors config option, diff.suppressBlankEmpty': 
+	printf "\nx\n" > f &&
+	before=$(git hash-object f) &&
+	before=$(git rev-parse --short $before) &&
+	git add f &&
+	git commit -q -m. f &&
+	printf "\ny\n" > f &&
+	after=$(git hash-object f) &&
+	after=$(git rev-parse --short $after) &&
+	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
+	git config --bool diff.suppressBlankEmpty true &&
+	git diff f > actual &&
+	test_cmp exp actual &&
+	perl -i.bak -p -e "s/^\$/ /" exp &&
+	git config --bool diff.suppressBlankEmpty false &&
+	git diff f > actual &&
+	test_cmp exp actual &&
+	git config --bool --unset diff.suppressBlankEmpty &&
+	git diff f > actual &&
+	test_cmp exp actual
+
+ok 1 - diff honors config option, diff.suppressBlankEmpty
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4031-diff-rewrite-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4031-diff-rewrite-binary/.git/
+expecting success of 4031.1 'create binary file with changes': 
+	make_file "\\0" &&
 	git add file &&
+	make_file "\\01"
 
-	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
-	mv file+ file
+ok 1 - create binary file with changes
 
+expecting success of 4031.2 'vanilla diff is binary': 
+	git diff >diff &&
+	grep "Binary files a/file and b/file differ" diff
 
-ok 1 - setup
+Binary files a/file and b/file differ
+ok 2 - vanilla diff is binary
 
-expecting success of 4025.2 'hunk header truncation with an overly long line': 
+expecting success of 4031.3 'rewrite diff is binary': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "Binary files a/file and b/file differ" diff
 
-	git diff | sed -n -e "s/^.*@@//p" >actual &&
-	(
-		echo " A $N$N$N$N$N$N$N$N$N2" &&
-		echo " L  $N$N$N$N$N$N$N$N$N1"
-	) >expected &&
-	test_cmp expected actual
+dissimilarity index 99%
+Binary files a/file and b/file differ
+ok 3 - rewrite diff is binary
 
+expecting success of 4031.4 'rewrite diff can show binary patch': 
+	git diff -B --binary >diff &&
+	grep "dissimilarity index" diff &&
+	grep "GIT binary patch" diff
 
-ok 2 - hunk header truncation with an overly long line
+dissimilarity index 99%
+GIT binary patch
+ok 4 - rewrite diff can show binary patch
 
-# passed all 2 test(s)
-1..2
+expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
+	git diff -B --numstat --summary >diff &&
+	grep -e "-	-	" diff &&
+	grep " rewrite file" diff
+
+-	-	file
+ rewrite file (99%)
+ok 5 - rewrite diff --numstat shows binary changes
+
+expecting success of 4031.6 'diff --stat counts binary rewrite as 0 lines': 
+	git diff -B --stat --summary >diff &&
+	grep "Bin" diff &&
+	test_grep "0 insertions.*0 deletions" diff &&
+	grep " rewrite file" diff
+
+ file | Bin 902 -> 902 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rewrite file (99%)
+ok 6 - diff --stat counts binary rewrite as 0 lines
+
+expecting success of 4031.7 'setup textconv': 
+	echo file diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/dump
+
+ok 7 - setup textconv
+
+expecting success of 4031.8 'rewrite diff respects textconv': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "^-61" diff &&
+	grep "^-0" diff
+
+dissimilarity index 99%
+-61
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+-0
+ok 8 - rewrite diff respects textconv
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3432-rebase-fast-forward.sh ***
@@ -233954,1620 +235391,139 @@
 1..225
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t3906-stash-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/.git/
-expecting success of 3906.1 'git_stash: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
+*** t4027-diff-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4027-diff-submodule/.git/
+expecting success of 4027.1 'setup': 
+	test_tick &&
+	test_create_repo sub &&
+	(
+		cd sub &&
+		echo hello >world &&
+		git add world &&
+		git commit -m submodule
+	) &&
+
+	test_tick &&
+	echo frotz >nitfol &&
+	git add nitfol sub &&
+	git commit -m superproject &&
+
+	(
+		cd sub &&
+		echo goodbye >world &&
+		git add world &&
+		git commit -m "submodule #2"
+	) &&
+
+	git -C sub rev-list HEAD >revs &&
+	set x $(cat revs) &&
+	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
+	subtip=$3 subprev=$2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4027-diff-submodule/sub/.git/
+[master (root-commit) 4431e0b] submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
+ create mode 100644 world
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) 5b035b6] superproject
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ 2 files changed, 2 insertions(+)
+ create mode 100644 nitfol
+ create mode 160000 sub
+[master 2dd69d6] submodule #2
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Saved working directory and index state WIP on no_submodule: 27611a5 Base
-Merging Version stash was based on with Stashed changes
-On branch no_submodule
-Your branch is up to date with 'origin/no_submodule'.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   .gitmodules
-	new file:   sub1
-	new file:   uninitialized_sub
-
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_stash: added submodule creates empty directory
-
-checking known breakage of 3906.2 'git_stash: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Saved working directory and index state WIP on no_submodule: 27611a5 Base
---- expect	2026-04-19 19:19:06.587659440 +0000
-+++ actual	2026-04-19 19:19:06.711659440 +0000
-@@ -2,5 +2,3 @@
- expect
- file1
- file2
--
--sub1:
-not ok 2 - git_stash: added submodule leaves existing empty directory alone # TODO known breakage
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-checking known breakage of 3906.3 'git_stash: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Saved working directory and index state WIP on replace_sub1_with_file: 2364f5a Replace sub1 with file
-Merging Version stash was based on with Stashed changes
-On branch replace_sub1_with_file
-Your branch is up to date with 'origin/replace_sub1_with_file'.
+expecting success of 4027.2 'git diff --raw HEAD': 
+	hexsz=$(test_oid hexsz) &&
+	git diff --raw --abbrev=$hexsz HEAD >actual &&
+	test_cmp expect actual
 
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   .gitmodules
-	deleted:    sub1
+ok 2 - git diff --raw HEAD
 
-no changes added to commit (use "git add" and/or "git commit -a")
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
-:160000 100644 63c430421a9604f896526f8a04236bdfe3ac1fc1 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
-not ok 3 - git_stash: replace tracked file with submodule creates empty directory # TODO known breakage
+expecting success of 4027.3 'git diff-index --raw HEAD': 
+	git diff-index --raw HEAD >actual.index &&
+	test_cmp expect actual.index
 
-checking known breakage of 3906.4 'git_stash: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Saved working directory and index state WIP on replace_sub1_with_directory: cb28587 Replace sub1 with directory
-Merging Version stash was based on with Stashed changes
-error: 'sub1/file1' appears as both a file and as a directory
-error: 'sub1/file2' appears as both a file and as a directory
-error: 'sub1/file3' appears as both a file and as a directory
-On branch replace_sub1_with_directory
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
+ok 3 - git diff-index --raw HEAD
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   sub1
-	deleted:    sub1/file1
-	deleted:    sub1/file2
-	deleted:    sub1/file3
+expecting success of 4027.4 'git diff-files --raw': 
+	git diff-files --raw >actual.files &&
+	test_cmp expect actual.files
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   .gitmodules
+ok 4 - git diff-files --raw
 
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
-not ok 4 - git_stash: replace directory with submodule # TODO known breakage
+expecting success of 4027.5 'git diff HEAD': 
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
 
-checking known breakage of 3906.5 'git_stash: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
-warning: unable to rmdir 'sub1': Directory not empty
-Merging Version stash was based on with Stashed changes
-On branch add_sub1
-Your branch is up to date with 'origin/add_sub1'.
+ok 5 - git diff HEAD
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    sub1
+expecting success of 4027.6 'git diff HEAD with dirty submodule (work tree)': 
+	echo >>sub/world &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    .gitmodules
+ok 6 - git diff HEAD with dirty submodule (work tree)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	sub1/
+expecting success of 4027.7 'git diff HEAD with dirty submodule (index)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		echo >>world &&
+		git add world
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-'actual' is not empty, it contains:
-:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
-not ok 5 - git_stash: removed submodule leaves submodule directory and its contents in place # TODO known breakage
+HEAD is now at 2dd69d6 submodule #2
+ok 7 - git diff HEAD with dirty submodule (index)
 
-checking known breakage of 3906.6 'git_stash: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
-warning: unable to rmdir 'sub1': Directory not empty
-Merging Version stash was based on with Stashed changes
-On branch add_sub1
-Your branch is up to date with 'origin/add_sub1'.
+expecting success of 4027.8 'git diff HEAD with dirty submodule (untracked)': 
+	(
+		cd sub &&
+		git reset --hard &&
+		git clean -qfdx &&
+		>cruft
+	) &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    sub1
+HEAD is now at 2dd69d6 submodule #2
+ok 8 - git diff HEAD with dirty submodule (untracked)
 
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    .gitmodules
+expecting success of 4027.9 'git diff HEAD with dirty submodule (untracked) (none ignored)': 
+	test_config diff.ignoreSubmodules none &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev-dirty &&
+	test_cmp expect.body actual.body
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	sub1/
-
-'actual' is not empty, it contains:
-:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
-not ok 6 - git_stash: removed submodule leaves submodule containing a .git directory alone # TODO known breakage
-
-expecting success of 3906.7 'git_stash: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 7 - git_stash: replace submodule with a directory must fail
-
-expecting success of 3906.8 'git_stash: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 8 - git_stash: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 3906.9 'git_stash: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 9 - git_stash: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3906.10 'git_stash: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 10 - git_stash: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-checking known breakage of 3906.11 'git_stash: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-No local changes to save
---- expect	2026-04-19 19:19:15.171659440 +0000
-+++ actual	2026-04-19 19:19:15.251659440 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 11 - git_stash: modified submodule does not update submodule work tree # TODO known breakage
-
-checking known breakage of 3906.12 'git_stash: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-No local changes to save
---- expect	2026-04-19 19:19:16.211659440 +0000
-+++ actual	2026-04-19 19:19:16.271659440 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 12 - git_stash: modified submodule does not update submodule work tree to invalid commit # TODO known breakage
-
-checking known breakage of 3906.13 'git_stash: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-No local changes to save
---- expect	2026-04-19 19:19:16.691659440 +0000
-+++ actual	2026-04-19 19:19:16.795659440 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 13 - git_stash: modified submodule does not update submodule work tree from invalid commit # TODO known breakage
-
-expecting success of 3906.14 'git_stash: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-ok 14 - git_stash: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3906.15 'stash push with submodule.recurse=true preserves dirty submodule worktree': 
-	setup_basic &&
-	(
-		cd main &&
-		git config submodule.recurse true &&
-		echo "x" >main_file.t &&
-		echo "y" >sub/sub_file.t &&
-		git stash push &&
-		test_must_fail git -C sub diff --quiet
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/sub/.git/
-[master (root-commit) af789f4] sub_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/sub'...
-done.
-[master (root-commit) d3a5de8] main_file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 main_file.t
- create mode 160000 sub
-Saved working directory and index state WIP on master: d3a5de8 main_file
-ok 15 - stash push with submodule.recurse=true preserves dirty submodule worktree
-
-expecting success of 3906.16 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree': 
-	setup_basic &&
-	(
-		cd main &&
-		git config submodule.recurse true &&
-		echo "x" >main_file.t &&
-		echo "y" >sub/sub_file.t &&
-		git stash push &&
-		git stash pop &&
-		test_must_fail git -C sub diff --quiet
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/sub/.git/
-[master (root-commit) af789f4] sub_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3906-stash-submodule/main/sub'...
-done.
-[master (root-commit) d3a5de8] main_file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 main_file.t
- create mode 160000 sub
-Saved working directory and index state WIP on master: d3a5de8 main_file
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-  (commit or discard the untracked or modified content in submodules)
-	modified:   main_file.t
-	modified:   sub (modified content)
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (ee331cc507c2f3e6ac052edd8b1cc51dc982b38c)
-ok 16 - stash push and pop with submodule.recurse=true preserves dirty submodule worktree
-
-# still have 10 known breakage(s)
-# passed all remaining 6 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4028-format-patch-mime-headers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4028-format-patch-mime-headers/.git/
-expecting success of 4028.1 'create commit with utf-8 body': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	echo more >>file &&
-	git commit -a -m "two
-
-	utf-8 body: ñ"
-
-[master (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 219a3c6] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - create commit with utf-8 body
-
-expecting success of 4028.2 'patch has mime headers': 
-	rm -f 0001-two.patch &&
-	git format-patch HEAD^ &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-Content-Type: text/plain; charset=UTF-8
-ok 2 - patch has mime headers
-
-expecting success of 4028.3 'patch has mime and extra headers': 
-	rm -f 0001-two.patch &&
-	git config format.headers "x-foo: bar" &&
-	git format-patch HEAD^ &&
-	grep -i "x-foo: bar" 0001-two.patch &&
-	grep -i "content-type: text/plain; charset=utf-8" 0001-two.patch
-
-0001-two.patch
-x-foo: bar
-Content-Type: text/plain; charset=UTF-8
-ok 3 - patch has mime and extra headers
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4026-color.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4026-color/.git/
-expecting success of 4026.1 'reset': 
-	color "reset" "[m"
-
-ok 1 - reset
-
-expecting success of 4026.2 'empty color is empty': 
-	color "" ""
-
-ok 2 - empty color is empty
-
-expecting success of 4026.3 'attribute before color name': 
-	color "bold red" "[1;31m"
-
-ok 3 - attribute before color name
-
-expecting success of 4026.4 'aixterm bright fg color': 
-	color "brightred" "[91m"
-
-ok 4 - aixterm bright fg color
-
-expecting success of 4026.5 'aixterm bright bg color': 
-	color "green brightblue" "[32;104m"
-
-ok 5 - aixterm bright bg color
-
-expecting success of 4026.6 'color name before attribute': 
-	color "red bold" "[1;31m"
-
-ok 6 - color name before attribute
-
-expecting success of 4026.7 'attr fg bg': 
-	color "ul blue red" "[4;34;41m"
-
-ok 7 - attr fg bg
-
-expecting success of 4026.8 'fg attr bg': 
-	color "blue ul red" "[4;34;41m"
-
-ok 8 - fg attr bg
-
-expecting success of 4026.9 'fg bg attr': 
-	color "blue red ul" "[4;34;41m"
-
-ok 9 - fg bg attr
-
-expecting success of 4026.10 'fg bg attr...': 
-	color "blue bold dim ul blink reverse" "[1;2;4;5;7;34m"
-
-ok 10 - fg bg attr...
-
-expecting success of 4026.11 'reset fg bg attr...': 
-	color "reset blue bold dim ul blink reverse" "[;1;2;4;5;7;34m"
-
-ok 11 - reset fg bg attr...
-
-expecting success of 4026.12 'attr negation': 
-	color "nobold nodim noul noblink noreverse" "[22;24;25;27m"
-
-ok 12 - attr negation
-
-expecting success of 4026.13 '"no-" variant of negation': 
-	color "no-bold no-blink" "[22;25m"
-
-ok 13 - "no-" variant of negation
-
-expecting success of 4026.14 'long color specification': 
-	color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m"
-
-ok 14 - long color specification
-
-expecting success of 4026.15 'absurdly long color specification': 
-	color \
-	  "#ffffff #ffffff bold nobold dim nodim italic noitalic
-	   ul noul blink noblink reverse noreverse strike nostrike" \
-	  "[1;2;3;4;5;7;9;22;23;24;25;27;29;38;2;255;255;255;48;2;255;255;255m"
-
-ok 15 - absurdly long color specification
-
-expecting success of 4026.16 '0-7 are aliases for basic ANSI color names': 
-	color "0 7" "[30;47m"
-
-ok 16 - 0-7 are aliases for basic ANSI color names
-
-expecting success of 4026.17 '8-15 are aliases for aixterm color names': 
-	color "12 13" "[94;105m"
-
-ok 17 - 8-15 are aliases for aixterm color names
-
-expecting success of 4026.18 '256 colors': 
-	color "254 bold 255" "[1;38;5;254;48;5;255m"
-
-ok 18 - 256 colors
-
-expecting success of 4026.19 'RGB colors': 
-	color "#ff00ff #0f0" "[38;2;255;0;255;48;2;0;255;0m"
-
-ok 19 - RGB colors
-
-expecting success of 4026.20 '"default" foreground': 
-	color "default" "[39m"
-
-ok 20 - "default" foreground
-
-expecting success of 4026.21 '"normal default" to clear background': 
-	color "normal default" "[49m"
-
-ok 21 - "normal default" to clear background
-
-expecting success of 4026.22 '"default" can be combined with attributes': 
-	color "default default no-reverse bold" "[1;27;39;49m"
-
-ok 22 - "default" can be combined with attributes
-
-expecting success of 4026.23 '"normal" yields no color at all': 
-	color "normal black" "[40m"
-
-ok 23 - "normal" yields no color at all
-
-expecting success of 4026.24 '-1 is a synonym for "normal"': 
-	color "-1 black" "[40m"
-
-ok 24 - -1 is a synonym for "normal"
-
-expecting success of 4026.25 'color too small': 
-	invalid_color "-2"
-
-error: invalid color value: -2
-fatal: unable to parse default color value
-ok 25 - color too small
-
-expecting success of 4026.26 'color too big': 
-	invalid_color "256"
-
-error: invalid color value: 256
-fatal: unable to parse default color value
-ok 26 - color too big
-
-expecting success of 4026.27 'extra character after color number': 
-	invalid_color "3X"
-
-error: invalid color value: 3X
-fatal: unable to parse default color value
-ok 27 - extra character after color number
-
-expecting success of 4026.28 'extra character after color name': 
-	invalid_color "redX"
-
-error: invalid color value: redX
-fatal: unable to parse default color value
-ok 28 - extra character after color name
-
-expecting success of 4026.29 'extra character after attribute': 
-	invalid_color "dimX"
-
-error: invalid color value: dimX
-fatal: unable to parse default color value
-ok 29 - extra character after attribute
-
-expecting success of 4026.30 'non-hex character in RGB color': 
-	invalid_color "#x23456" &&
-	invalid_color "#1x3456" &&
-	invalid_color "#12x456" &&
-	invalid_color "#123x56" &&
-	invalid_color "#1234x6" &&
-	invalid_color "#12345x" &&
-	invalid_color "#x23" &&
-	invalid_color "#1x3" &&
-	invalid_color "#12x"
-
-error: invalid color value: #x23456
-fatal: unable to parse default color value
-error: invalid color value: #1x3456
-fatal: unable to parse default color value
-error: invalid color value: #12x456
-fatal: unable to parse default color value
-error: invalid color value: #123x56
-fatal: unable to parse default color value
-error: invalid color value: #1234x6
-fatal: unable to parse default color value
-error: invalid color value: #12345x
-fatal: unable to parse default color value
-error: invalid color value: #x23
-fatal: unable to parse default color value
-error: invalid color value: #1x3
-fatal: unable to parse default color value
-error: invalid color value: #12x
-fatal: unable to parse default color value
-ok 30 - non-hex character in RGB color
-
-expecting success of 4026.31 'wrong number of letters in RGB color': 
-	invalid_color "#1" &&
-	invalid_color "#23" &&
-	invalid_color "#789a" &&
-	invalid_color "#bcdef" &&
-	invalid_color "#1234567"
-
-error: invalid color value: #1
-fatal: unable to parse default color value
-error: invalid color value: #23
-fatal: unable to parse default color value
-error: invalid color value: #789a
-fatal: unable to parse default color value
-error: invalid color value: #bcdef
-fatal: unable to parse default color value
-error: invalid color value: #1234567
-fatal: unable to parse default color value
-ok 31 - wrong number of letters in RGB color
-
-expecting success of 4026.32 'unknown color slots are ignored (diff)': 
-	git config color.diff.nosuchslotwilleverbedefined white &&
-	git diff --color
-
-ok 32 - unknown color slots are ignored (diff)
-
-expecting success of 4026.33 'unknown color slots are ignored (branch)': 
-	git config color.branch.nosuchslotwilleverbedefined white &&
-	git branch -a
-
-ok 33 - unknown color slots are ignored (branch)
-
-expecting success of 4026.34 'unknown color slots are ignored (status)': 
-	git config color.status.nosuchslotwilleverbedefined white &&
-	{ git status; ret=$?; } &&
-	case $ret in 0|1) : ok ;; *) false ;; esac
-
-On branch master
-
-No commits yet
-
-nothing to commit (create/copy files and use "git add" to track)
-ok 34 - unknown color slots are ignored (status)
-
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4029-diff-trailing-space.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4029-diff-trailing-space/.git/
-expecting success of 4029.1 'diff honors config option, diff.suppressBlankEmpty': 
-	printf "\nx\n" > f &&
-	before=$(git hash-object f) &&
-	before=$(git rev-parse --short $before) &&
-	git add f &&
-	git commit -q -m. f &&
-	printf "\ny\n" > f &&
-	after=$(git hash-object f) &&
-	after=$(git rev-parse --short $after) &&
-	sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
-	git config --bool diff.suppressBlankEmpty true &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	perl -i.bak -p -e "s/^\$/ /" exp &&
-	git config --bool diff.suppressBlankEmpty false &&
-	git diff f > actual &&
-	test_cmp exp actual &&
-	git config --bool --unset diff.suppressBlankEmpty &&
-	git diff f > actual &&
-	test_cmp exp actual
-
-ok 1 - diff honors config option, diff.suppressBlankEmpty
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4031-diff-rewrite-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4031-diff-rewrite-binary/.git/
-expecting success of 4031.1 'create binary file with changes': 
-	make_file "\\0" &&
-	git add file &&
-	make_file "\\01"
-
-ok 1 - create binary file with changes
-
-expecting success of 4031.2 'vanilla diff is binary': 
-	git diff >diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-Binary files a/file and b/file differ
-ok 2 - vanilla diff is binary
-
-expecting success of 4031.3 'rewrite diff is binary': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-dissimilarity index 99%
-Binary files a/file and b/file differ
-ok 3 - rewrite diff is binary
-
-expecting success of 4031.4 'rewrite diff can show binary patch': 
-	git diff -B --binary >diff &&
-	grep "dissimilarity index" diff &&
-	grep "GIT binary patch" diff
-
-dissimilarity index 99%
-GIT binary patch
-ok 4 - rewrite diff can show binary patch
-
-expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
-	git diff -B --numstat --summary >diff &&
-	grep -e "-	-	" diff &&
-	grep " rewrite file" diff
-
--	-	file
- rewrite file (99%)
-ok 5 - rewrite diff --numstat shows binary changes
-
-expecting success of 4031.6 'diff --stat counts binary rewrite as 0 lines': 
-	git diff -B --stat --summary >diff &&
-	grep "Bin" diff &&
-	test_grep "0 insertions.*0 deletions" diff &&
-	grep " rewrite file" diff
-
- file | Bin 902 -> 902 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rewrite file (99%)
-ok 6 - diff --stat counts binary rewrite as 0 lines
-
-expecting success of 4031.7 'setup textconv': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/dump
-
-ok 7 - setup textconv
-
-expecting success of 4031.8 'rewrite diff respects textconv': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "^-61" diff &&
-	grep "^-0" diff
-
-dissimilarity index 99%
--61
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
-ok 8 - rewrite diff respects textconv
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4027-diff-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4027-diff-submodule/.git/
-expecting success of 4027.1 'setup': 
-	test_tick &&
-	test_create_repo sub &&
-	(
-		cd sub &&
-		echo hello >world &&
-		git add world &&
-		git commit -m submodule
-	) &&
-
-	test_tick &&
-	echo frotz >nitfol &&
-	git add nitfol sub &&
-	git commit -m superproject &&
-
-	(
-		cd sub &&
-		echo goodbye >world &&
-		git add world &&
-		git commit -m "submodule #2"
-	) &&
-
-	git -C sub rev-list HEAD >revs &&
-	set x $(cat revs) &&
-	echo ":160000 160000 $3 $ZERO_OID M	sub" >expect &&
-	subtip=$3 subprev=$2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4027-diff-submodule/sub/.git/
-[master (root-commit) 4431e0b] submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) 5b035b6] superproject
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 nitfol
- create mode 160000 sub
-[master 2dd69d6] submodule #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4027.2 'git diff --raw HEAD': 
-	hexsz=$(test_oid hexsz) &&
-	git diff --raw --abbrev=$hexsz HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - git diff --raw HEAD
-
-expecting success of 4027.3 'git diff-index --raw HEAD': 
-	git diff-index --raw HEAD >actual.index &&
-	test_cmp expect actual.index
-
-ok 3 - git diff-index --raw HEAD
-
-expecting success of 4027.4 'git diff-files --raw': 
-	git diff-files --raw >actual.files &&
-	test_cmp expect actual.files
-
-ok 4 - git diff-files --raw
-
-expecting success of 4027.5 'git diff HEAD': 
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body
-
-ok 5 - git diff HEAD
-
-expecting success of 4027.6 'git diff HEAD with dirty submodule (work tree)': 
-	echo >>sub/world &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-ok 6 - git diff HEAD with dirty submodule (work tree)
-
-expecting success of 4027.7 'git diff HEAD with dirty submodule (index)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		echo >>world &&
-		git add world
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 7 - git diff HEAD with dirty submodule (index)
-
-expecting success of 4027.8 'git diff HEAD with dirty submodule (untracked)': 
-	(
-		cd sub &&
-		git reset --hard &&
-		git clean -qfdx &&
-		>cruft
-	) &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev &&
-	test_cmp expect.body actual.body
-
-HEAD is now at 2dd69d6 submodule #2
-ok 8 - git diff HEAD with dirty submodule (untracked)
-
-expecting success of 4027.9 'git diff HEAD with dirty submodule (untracked) (none ignored)': 
-	test_config diff.ignoreSubmodules none &&
-	git diff HEAD >actual &&
-	sed -e "1,/^@@/d" actual >actual.body &&
-	expect_from_to >expect.body $subtip $subprev-dirty &&
-	test_cmp expect.body actual.body
-
-ok 9 - git diff HEAD with dirty submodule (untracked) (none ignored)
+ok 9 - git diff HEAD with dirty submodule (untracked) (none ignored)
 
 expecting success of 4027.10 'git diff HEAD with dirty submodule (work tree, refs match)': 
 	git commit -m "x" sub &&
@@ -235774,1176 +235730,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4033-diff-patience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4033-diff-patience/.git/
-expecting success of 4033.1 '--ignore-space-at-eol with a single appended character': 
-	printf "a\nb\nc\n" >pre &&
-	printf "a\nbX\nc\n" >post &&
-	test_must_fail git diff --no-index \
-		--patience --ignore-space-at-eol pre post >diff &&
-	grep "^+.*X" diff
-
-+bX
-ok 1 - --ignore-space-at-eol with a single appended character
-
-expecting success of 4033.2 'setup attributes files for tests with patience': 
-		git checkout -b master &&
-		echo "file* diff=driver" >.gitattributes &&
-		git add file1 file2 .gitattributes &&
-		git commit -m "adding files" &&
-		git checkout -b branchA &&
-		echo "file* diff=driverA" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -m "adding driverA as diff driver" &&
-		git checkout master &&
-		git clone --bare --no-local . bare.git
-	
-Switched to a new branch 'master'
-[master (root-commit) 946e965] adding files
- Author: A U Thor <author@example.com>
- 3 files changed, 52 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'branchA'
-[branchA 7cbc84d] adding driverA as diff driver
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Cloning into bare repository 'bare.git'...
-ok 2 - setup attributes files for tests with patience
-
-expecting success of 4033.3 'patience diff from attributes': 
-		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 3 - patience diff from attributes
-
-expecting success of 4033.4 'diff from attributes with bare repo with source': 
-		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
-			-c diff.driverA.algorithm=$STRATEGY \
-			diff HEAD:file1 HEAD:file2 >output &&
-		test_cmp expect output
-	
-ok 4 - diff from attributes with bare repo with source
-
-expecting success of 4033.5 'diff from attributes with bare repo with invalid source': 
-		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
-			HEAD:file1 HEAD:file2
-	
-fatal: bad --attr-source or GIT_ATTR_SOURCE
-ok 5 - diff from attributes with bare repo with invalid source
-
-expecting success of 4033.6 'patience diff from attributes has valid diffstat': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --stat --no-index file1 file2 > output &&
-		test_cmp expect_diffstat output
-	
-ok 6 - patience diff from attributes has valid diffstat
-
-expecting success of 4033.7 'patience diff': 
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 7 - patience diff
-
-expecting success of 4033.8 'patience diff command line precedence before attributes': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm myers &&
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 8 - patience diff command line precedence before attributes
-
-expecting success of 4033.9 'patience diff attributes precedence before config': 
-		git config diff.algorithm default &&
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 9 - patience diff attributes precedence before config
-
-expecting success of 4033.10 'patience diff output is valid': 
-		mv file2 expect &&
-		git apply < output &&
-		test_cmp expect file2
-	
-ok 10 - patience diff output is valid
-
-expecting success of 4033.11 'completely different files': 
-		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
-		test_cmp expect output
-	
-ok 11 - completely different files
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4030-diff-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4030-diff-textconv/.git/
-expecting success of 4030.1 'setup binary file with history': 
-	test_commit --printf one file "\\0\\n" &&
-	test_commit --printf --append two file "\\01\\n"
-
-[master (root-commit) f1b27dd] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master e1c09e5] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 1 - setup binary file with history
-
-expecting success of 4030.2 'file is considered binary by porcelain': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 2 - file is considered binary by porcelain
-
-expecting success of 4030.3 'file is considered binary by plumbing': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 3 - file is considered binary by plumbing
-
-expecting success of 4030.4 'setup textconv filters': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
-	git config diff.fail.textconv false
-
-ok 4 - setup textconv filters
-
-expecting success of 4030.5 'diff produces text': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 5 - diff produces text
-
-expecting success of 4030.6 'show commit produces text': 
-	git show HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 6 - show commit produces text
-
-expecting success of 4030.7 'diff-tree produces binary': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 7 - diff-tree produces binary
-
-expecting success of 4030.8 'log produces text': 
-	git log -1 -p >log &&
-	find_diff <log >actual &&
-	test_cmp expect.text actual
-
-ok 8 - log produces text
-
-expecting success of 4030.9 'format-patch produces binary': 
-	git format-patch --no-binary --stdout HEAD^ >patch &&
-	find_diff <patch >actual &&
-	test_cmp expect.binary actual
-
-ok 9 - format-patch produces binary
-
-expecting success of 4030.10 'status -v produces text': 
-	git reset --soft HEAD^ &&
-	git status -v >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual &&
-	git reset --soft HEAD@{1}
-
-ok 10 - status -v produces text
-
-expecting success of 4030.11 'show blob produces binary': 
-	git show HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
-
-ok 11 - show blob produces binary
-
-expecting success of 4030.12 'show --textconv blob produces text': 
-	git show --textconv HEAD:file >actual &&
-	printf "0\\n1\\n" >expect &&
-	test_cmp expect actual
-
-ok 12 - show --textconv blob produces text
-
-expecting success of 4030.13 'show --no-textconv blob produces binary': 
-	git show --no-textconv HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
-
-ok 13 - show --no-textconv blob produces binary
-
-expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -G0 >actual &&
-	test_cmp expect actual
-
-ok 14 - grep-diff (-G) operates on textconv data (add)
-
-expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -G1 >actual &&
-	test_cmp expect actual
-
-ok 15 - grep-diff (-G) operates on textconv data (modification)
-
-expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -S0 >actual &&
-	test_cmp expect actual
-
-ok 16 - pickaxe (-S) operates on textconv data (add)
-
-expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -S1 >actual &&
-	test_cmp expect actual
-
-ok 17 - pickaxe (-S) operates on textconv data (modification)
-
-expecting success of 4030.18 'diffstat does not run textconv': 
-	echo file diff=fail >.gitattributes &&
-	git diff --stat HEAD^ HEAD >actual &&
-	test_cmp expect.stat actual &&
-
-	head -n1 <expect.stat >expect.line1 &&
-	head -n1 <actual >actual.line1 &&
-	test_cmp expect.line1 actual.line1
-
-ok 18 - diffstat does not run textconv
-
-expecting success of 4030.19 'textconv does not act on symlinks': 
-	rm -f file &&
-	test_ln_s_add frotz file &&
-	git commit -m typechange &&
-	git show >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.typechange actual
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master 552bf47] typechange
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 120000 file
-ok 19 - textconv does not act on symlinks
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4020-diff-external.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4020-diff-external/.git/
-expecting success of 4020.1 'setup': 
-
-	test_tick &&
-	echo initial >file &&
-	git add file &&
-	git commit -m initial &&
-
-	test_tick &&
-	echo second >file &&
-	before=$(git hash-object file) &&
-	before=$(git rev-parse --short $before) &&
-	git add file &&
-	git commit -m second &&
-
-	test_tick &&
-	echo third >file
-
-[master (root-commit) b6d2089] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master f3562cd] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4020.2 'GIT_EXTERNAL_DIFF environment': 
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff >out &&
-	cut -d" " -f1,3- <out >actual &&
-	test_cmp expect actual
-
-
-ok 2 - GIT_EXTERNAL_DIFF environment
-
-expecting success of 4020.3 'GIT_EXTERNAL_DIFF environment should apply only to diff': 
-	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
-
-expecting success of 4020.4 'GIT_EXTERNAL_DIFF environment and --no-ext-diff': 
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 4020.5 'typechange diff': 
-	rm -f file &&
-	ln -s elif file &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual &&
-
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
-	git diff >expect &&
-	test_cmp expect actual
-
-ok 5 - typechange diff
-
-expecting success of 4020.6 'diff.external': 
-	git reset --hard &&
-	echo third >file &&
-	test_config diff.external echo &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-HEAD is now at f3562cd second
-ok 6 - diff.external
-
-expecting success of 4020.7 'diff.external should apply only to diff': 
-	test_config diff.external echo &&
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-diff --git a/file b/file
-ok 7 - diff.external should apply only to diff
-
-expecting success of 4020.8 'diff.external and --no-ext-diff': 
-	test_config diff.external echo &&
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-diff --git a/file b/file
-ok 8 - diff.external and --no-ext-diff
-
-expecting success of 4020.9 'diff attribute': 
-	git reset --hard &&
-	echo third >file &&
-
-	git config diff.parrot.command echo &&
-
-	echo >.gitattributes "file diff=parrot" &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-HEAD is now at f3562cd second
-ok 9 - diff attribute
-
-expecting success of 4020.10 'diff attribute should apply only to diff': 
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 10 - diff attribute should apply only to diff
-
-expecting success of 4020.11 'diff attribute and --no-ext-diff': 
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 11 - diff attribute and --no-ext-diff
-
-expecting success of 4020.12 'diff attribute': 
-
-	git config --unset diff.parrot.command &&
-	git config diff.color.command echo &&
-
-	echo >.gitattributes "file diff=color" &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-ok 12 - diff attribute
-
-expecting success of 4020.13 'diff attribute should apply only to diff': 
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 13 - diff attribute should apply only to diff
-
-expecting success of 4020.14 'diff attribute and --no-ext-diff': 
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 14 - diff attribute and --no-ext-diff
-
-expecting success of 4020.15 'GIT_EXTERNAL_DIFF trumps diff.external': 
-	>.gitattributes &&
-	test_config diff.external "echo ext-global" &&
-
-	cat >expect <<-EOF &&
-	ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
-	cut -d" " -f1-2,4- <out >actual &&
-	test_cmp expect actual
-
-ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
-
-expecting success of 4020.16 'attributes trump GIT_EXTERNAL_DIFF and diff.external': 
-	test_config diff.foo.command "echo ext-attribute" &&
-	test_config diff.external "echo ext-global" &&
-	echo "file diff=foo" >.gitattributes &&
-
-	cat >expect <<-EOF &&
-	ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
-	cut -d" " -f1-2,4- <out >actual &&
-	test_cmp expect actual
-
-ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
-
-expecting success of 4020.17 'no diff with -diff': 
-	echo >.gitattributes "file -diff" &&
-	git diff >out &&
-	grep Binary out
-
-Binary files a/file and b/file differ
-ok 17 - no diff with -diff
-
-expecting success of 4020.18 'setup output files': 
-	: >empty &&
-	echo output >output &&
-	echo "fatal: external diff died, stopping at file" >error
-
-ok 18 - setup output files
-
-expecting success of 4020.19 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 19 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute
-
-expecting success of 4020.20 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 20 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external
-
-expecting success of 4020.21 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF': 
-		>.gitattributes &&
-		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 21 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF
-
-expecting success of 4020.22 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 128 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 22 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute
-
-expecting success of 4020.23 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 128 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 23 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external
-
-expecting success of 4020.24 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF': 
-		>.gitattributes &&
-		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 24 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF
-
-expecting success of 4020.25 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 25 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute
-
-expecting success of 4020.26 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 26 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external
-
-expecting success of 4020.27 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
-		>.gitattributes &&
-		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 27 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF
-
-expecting success of 4020.28 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 28 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute
-
-expecting success of 4020.29 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 0 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 29 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external
-
-expecting success of 4020.30 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
-		>.gitattributes &&
-		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 30 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF
-
-expecting success of 4020.31 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute': 
-		test_config diff.foo.command "echo output; exit 2;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 128 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 31 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute
-
-expecting success of 4020.32 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external': 
-		test_config diff.external "echo output; exit 2;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 128 git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 32 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external
-
-expecting success of 4020.33 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
-		>.gitattributes &&
-		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 33 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF
-
-expecting success of 4020.34 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --exit-code': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 1 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 34 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --exit-code
-
-expecting success of 4020.35 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --exit-code': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 1 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 35 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --exit-code
-
-expecting success of 4020.36 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code': 
-		>.gitattributes &&
-		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 36 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code
-
-expecting success of 4020.37 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --exit-code': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 128 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 37 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --exit-code
-
-expecting success of 4020.38 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --exit-code': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 128 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 38 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --exit-code
-
-expecting success of 4020.39 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code': 
-		>.gitattributes &&
-		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 39 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code
-
-expecting success of 4020.40 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --exit-code': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 0 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 40 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --exit-code
-
-expecting success of 4020.41 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --exit-code': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 0 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 41 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --exit-code
-
-expecting success of 4020.42 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
-		>.gitattributes &&
-		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 42 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
-
-expecting success of 4020.43 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --exit-code': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 1 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 43 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --exit-code
-
-expecting success of 4020.44 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --exit-code': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 1 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 44 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --exit-code
-
-expecting success of 4020.45 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
-		>.gitattributes &&
-		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp empty err
-	
-ok 45 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
-
-expecting success of 4020.46 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --exit-code': 
-		test_config diff.foo.command "echo output; exit 2;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 128 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 46 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --exit-code
-
-expecting success of 4020.47 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --exit-code': 
-		test_config diff.external "echo output; exit 2;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 128 git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 47 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --exit-code
-
-expecting success of 4020.48 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
-		>.gitattributes &&
-		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
-		test_cmp output out &&
-		test_cmp error err
-	
-ok 48 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
-
-expecting success of 4020.49 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --quiet': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 49 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --quiet
-
-expecting success of 4020.50 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --quiet': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 50 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --quiet
-
-expecting success of 4020.51 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet': 
-		>.gitattributes &&
-		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 51 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet
-
-expecting success of 4020.52 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --quiet': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode off &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 52 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --quiet
-
-expecting success of 4020.53 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --quiet': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode off &&
-		>.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 53 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --quiet
-
-expecting success of 4020.54 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet': 
-		>.gitattributes &&
-		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 54 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet
-
-expecting success of 4020.55 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --quiet': 
-		test_config diff.foo.command "echo output; exit 0;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 0 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 55 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --quiet
-
-expecting success of 4020.56 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --quiet': 
-		test_config diff.external "echo output; exit 0;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 0 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 56 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --quiet
-
-expecting success of 4020.57 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
-		>.gitattributes &&
-		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 57 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
-
-expecting success of 4020.58 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --quiet': 
-		test_config diff.foo.command "echo output; exit 1;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 58 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --quiet
-
-expecting success of 4020.59 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --quiet': 
-		test_config diff.external "echo output; exit 1;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 1 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 59 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --quiet
-
-expecting success of 4020.60 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
-		>.gitattributes &&
-		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp empty err
-	
-ok 60 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
-
-expecting success of 4020.61 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --quiet': 
-		test_config diff.foo.command "echo output; exit 2;" &&
-		test_config diff.foo.trustExitCode on &&
-		echo "file diff=foo" >.gitattributes &&
-		test_expect_code 128 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp error err
-	
-ok 61 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --quiet
-
-expecting success of 4020.62 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --quiet': 
-		test_config diff.external "echo output; exit 2;" &&
-		test_config diff.trustExitCode on &&
-		>.gitattributes &&
-		test_expect_code 128 git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp error err
-	
-ok 62 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --quiet
-
-expecting success of 4020.63 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
-		>.gitattributes &&
-		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
-		test_cmp empty out &&
-		test_cmp error err
-	
-ok 63 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
-
-expecting success of 4020.64 'force diff with "diff"': 
-	after=$(git hash-object file) &&
-	after=$(git rev-parse --short $after) &&
-	echo >.gitattributes "file diff" &&
-	git diff >actual &&
-	sed -e "s/^index .*/index $before..$after 100644/" \
-		"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
-	test_cmp expected-diff actual
-
-ok 64 - force diff with "diff"
-
-expecting success of 4020.65 'GIT_EXTERNAL_DIFF with more than one changed files': 
-	echo anotherfile > file2 &&
-	git add file2 &&
-	git commit -m "added 2nd file" &&
-	echo modified >file2 &&
-	GIT_EXTERNAL_DIFF=echo git diff
-
-[master 314ec38] added 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-file /tmp/git-blob-7flOVM/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/git-blob-1rWLHl/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
-ok 65 - GIT_EXTERNAL_DIFF with more than one changed files
-
-expecting success of 4020.66 'GIT_EXTERNAL_DIFF path counter/total': 
-	write_script external-diff.sh <<-\EOF &&
-	echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
-	EOF
-	>counter.txt &&
-	cat >expect <<-\EOF &&
-	1 of 2
-	2 of 2
-	EOF
-	GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
-	test_cmp expect counter.txt
-
-ok 66 - GIT_EXTERNAL_DIFF path counter/total
-
-expecting success of 4020.67 'GIT_EXTERNAL_DIFF generates pretty paths': 
-	test_when_finished "git rm -f file.ext" &&
-	touch file.ext &&
-	git add file.ext &&
-	echo with extension > file.ext &&
-
-	cat >expect <<-EOF &&
-	file.ext
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
-	basename $(cut -d" " -f2 <out) >actual &&
-	test_cmp expect actual
-
-rm 'file.ext'
-ok 67 - GIT_EXTERNAL_DIFF generates pretty paths
-
-expecting success of 4020.68 'external diff with autocrlf = true': 
-	test_config core.autocrlf true &&
-	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
-	test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
-
-warning: in the working copy of 'file2', LF will be replaced by CRLF the next time Git touches it
-ok 68 - external diff with autocrlf = true
-
-expecting success of 4020.69 'diff --cached': 
-	test_config core.autocrlf true &&
-	git add file &&
-	git update-index --assume-unchanged file &&
-	echo second >file &&
-	git diff --cached >actual &&
-	test_cmp expected-diff actual
-
-ok 69 - diff --cached
-
-expecting success of 4020.70 'clean up crlf leftovers': 
-	git update-index --no-assume-unchanged file &&
-	rm -f file* &&
-	git reset --hard
-
-HEAD is now at 314ec38 added 2nd file
-ok 70 - clean up crlf leftovers
-
-expecting success of 4020.71 'submodule diff': 
-	git init sub &&
-	( cd sub && test_commit sub1 ) &&
-	git add sub &&
-	test_tick &&
-	git commit -m "add submodule" &&
-	( cd sub && test_commit sub2 ) &&
-	write_script gather_pre_post.sh <<-\EOF &&
-	echo "$1 $4" # path, mode
-	cat "$2" # old file
-	cat "$5" # new file
-	EOF
-	GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
-	cat >expected <<-EOF &&
-	sub 160000
-	Subproject commit $(git rev-parse HEAD:sub)
-	Subproject commit $(cd sub && git rev-parse HEAD)
-	EOF
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4020-diff-external/sub/.git/
-[master (root-commit) e2fb92c] sub1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub1.t
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master bcd8781] add submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-[master 6a9164c] sub2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub2.t
-ok 71 - submodule diff
-
-# passed all 71 test(s)
-1..71
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4037-diff-r-t-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4037-diff-r-t-dirs/.git/
-expecting success of 4037.1 'setup': 
-	mkdir dc dr dt &&
-	>dc/1 &&
-	>dr/2 &&
-	>dt/3 &&
-	>fc &&
-	>fr &&
-	>ft &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-
-	rm -fr dt dr ft fr &&
-	mkdir da ft &&
-	for p in dc/1 da/4 dt ft/5 fc
-	do
-		echo hello >$p || exit
-	done &&
-	git add -u &&
-	git add . &&
-	test_tick &&
-	git commit -m second
-
-[master (root-commit) 26fc746] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dc/1
- create mode 100644 dr/2
- create mode 100644 dt/3
- create mode 100644 fc
- create mode 100644 fr
- create mode 100644 ft
-[master 25e238e] second
- Author: A U Thor <author@example.com>
- 9 files changed, 5 insertions(+)
- create mode 100644 da/4
- delete mode 100644 dr/2
- create mode 100644 dt
- delete mode 100644 dt/3
- delete mode 100644 fr
- delete mode 100644 ft
- create mode 100644 ft/5
-ok 1 - setup
-
-expecting success of 4037.2 'verify': 
-	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - verify
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4036-format-patch-signer-mime/.git/
-expecting success of 4036.1 'setup': 
-
-	>F &&
-	git add F &&
-	git commit -m initial &&
-	echo new line >F &&
-
-	test_tick &&
-	git commit -m "This adds some lines to F" F
-
-
-[master (root-commit) bf01fa7] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 F
-[master dc5bbb5] This adds some lines to F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 4036.2 'format normally': 
-
-	git format-patch --stdout -1 >output &&
-	! grep Content-Type output
-
-
-ok 2 - format normally
-
-expecting success of 4036.3 'format with signoff without funny signer name': 
-
-	git format-patch -s --stdout -1 >output &&
-	! grep Content-Type output
-
-
-ok 3 - format with signoff without funny signer name
-
-expecting success of 4036.4 'format with non ASCII signer name': 
-
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 >output &&
-	grep Content-Type output
-
-
-Content-Type: text/plain; charset=UTF-8
-ok 4 - format with non ASCII signer name
-
-expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
-
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 --attach >output &&
-	test $(grep -ci ^MIME-Version: output) = 1
-
-
-ok 5 - attach and signoff do not duplicate mime headers
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t3903-stash.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t3903-stash/.git/
 expecting success of 3903.1 'usage on cmd and subcommand invalid option': 
@@ -240178,675 +238964,1054 @@
 1..127
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4035-diff-quiet.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4035-diff-quiet/.git/
-expecting success of 4035.1 'setup': 
-	echo 1 >a &&
-	git add . &&
-	git commit -m first &&
-	echo 2 >b &&
-	git add . &&
-	git commit -a -m second &&
-	mkdir -p test-outside/repo && (
-		cd test-outside/repo &&
-		git init &&
-		echo "1 1" >a &&
-		git add . &&
-		git commit -m 1
-	) &&
-	mkdir -p test-outside/non/git && (
-		cd test-outside/non/git &&
-		echo "1 1" >a &&
-		echo "1 1" >matching-file &&
-		echo "1 1 " >trailing-space &&
-		echo "1   1" >extra-space &&
-		echo "2" >never-match
-	)
+*** t4020-diff-external.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4020-diff-external/.git/
+expecting success of 4020.1 'setup': 
 
-[master (root-commit) 703ec9e] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[master 3476b69] second
+	test_tick &&
+	echo initial >file &&
+	git add file &&
+	git commit -m initial &&
+
+	test_tick &&
+	echo second >file &&
+	before=$(git hash-object file) &&
+	before=$(git rev-parse --short $before) &&
+	git add file &&
+	git commit -m second &&
+
+	test_tick &&
+	echo third >file
+
+[master (root-commit) b6d2089] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
-[master (root-commit) f9eeef1] 1
+ create mode 100644 file
+[master f3562cd] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
-	test_line_count = 0 cnt
+expecting success of 4020.2 'GIT_EXTERNAL_DIFF environment': 
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+	EOF
+	GIT_EXTERNAL_DIFF=echo git diff >out &&
+	cut -d" " -f1,3- <out >actual &&
+	test_cmp expect actual
 
-ok 2 - git diff-tree HEAD^ HEAD
 
-expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
-	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
-	test_line_count = 0 cnt
+ok 2 - GIT_EXTERNAL_DIFF environment
 
-ok 3 - git diff-tree HEAD^ HEAD -- a
+expecting success of 4020.3 'GIT_EXTERNAL_DIFF environment should apply only to diff': 
+	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-expecting success of 4035.4 'git diff-tree HEAD^ HEAD -- b': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
 
-ok 4 - git diff-tree HEAD^ HEAD -- b
+diff --git a/file b/file
+ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
 
-expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
-	echo $(git rev-parse HEAD) |
-	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
-	test_line_count = 1 cnt
+expecting success of 4020.4 'GIT_EXTERNAL_DIFF environment and --no-ext-diff': 
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-ok 5 - echo HEAD | git diff-tree --stdin
 
-expecting success of 4035.6 'git diff-tree HEAD HEAD': 
-	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
-	test_line_count = 0 cnt
+diff --git a/file b/file
+ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
 
-ok 6 - git diff-tree HEAD HEAD
+checking prerequisite: SYMLINKS
 
-expecting success of 4035.7 'git diff-files': 
-	test_expect_code 0 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-ok 7 - git diff-files
+)
+prerequisite SYMLINKS ok
+expecting success of 4020.5 'typechange diff': 
+	rm -f file &&
+	ln -s elif file &&
 
-expecting success of 4035.8 'git diff-index --cached HEAD': 
-	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
+	EOF
+	GIT_EXTERNAL_DIFF=echo git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual &&
 
-ok 8 - git diff-index --cached HEAD
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
+	git diff >expect &&
+	test_cmp expect actual
 
-expecting success of 4035.9 'git diff-index --cached HEAD^': 
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+ok 5 - typechange diff
 
-ok 9 - git diff-index --cached HEAD^
+expecting success of 4020.6 'diff.external': 
+	git reset --hard &&
+	echo third >file &&
+	test_config diff.external echo &&
 
-expecting success of 4035.10 'git diff-index --cached HEAD^': 
-	echo text >>b &&
-	echo 3 >c &&
-	git add . &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual
 
-warning: adding embedded git repository: test-outside/repo
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> test-outside/repo
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached test-outside/repo
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 10 - git diff-index --cached HEAD^
+HEAD is now at f3562cd second
+ok 6 - diff.external
 
-expecting success of 4035.11 'git diff-tree -Stext HEAD^ HEAD -- b': 
-	git commit -m "text in b" &&
-	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+expecting success of 4020.7 'diff.external should apply only to diff': 
+	test_config diff.external echo &&
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-[master b583ee2] text in b
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 c
- create mode 100644 cnt
- create mode 100644 test-outside/non/git/a
- create mode 100644 test-outside/non/git/extra-space
- create mode 100644 test-outside/non/git/matching-file
- create mode 100644 test-outside/non/git/never-match
- create mode 100644 test-outside/non/git/trailing-space
- create mode 160000 test-outside/repo
-ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
+diff --git a/file b/file
+ok 7 - diff.external should apply only to diff
 
-expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
-	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+expecting success of 4020.8 'diff.external and --no-ext-diff': 
+	test_config diff.external echo &&
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+diff --git a/file b/file
+ok 8 - diff.external and --no-ext-diff
 
-expecting success of 4035.13 'git diff-files': 
-	echo 3 >>c &&
-	test_expect_code 1 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+expecting success of 4020.9 'diff attribute': 
+	git reset --hard &&
+	echo third >file &&
 
-ok 13 - git diff-files
+	git config diff.parrot.command echo &&
 
-expecting success of 4035.14 'git diff-index --cached HEAD': 
-	git update-index c &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+	echo >.gitattributes "file diff=parrot" &&
 
-ok 14 - git diff-index --cached HEAD
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual
 
-expecting success of 4035.15 'git diff, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
-		test_expect_code 1 git diff --quiet a ../non/git/extra-space
-	)
+HEAD is now at f3562cd second
+ok 9 - diff attribute
 
-ok 15 - git diff, one file outside repo
+expecting success of 4020.10 'diff attribute should apply only to diff': 
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-expecting success of 4035.16 'git diff, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet a matching-file &&
-		test_expect_code 1 git diff --quiet a extra-space
-	)
 
-ok 16 - git diff, both files outside repo
+diff --git a/file b/file
+ok 10 - diff attribute should apply only to diff
 
-expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
-	)
+expecting success of 4020.11 'diff attribute and --no-ext-diff': 
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-ok 17 - git diff --ignore-space-at-eol, one file outside repo
 
-expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space
-	)
+diff --git a/file b/file
+ok 11 - diff attribute and --no-ext-diff
 
-ok 18 - git diff --ignore-space-at-eol, both files outside repo
+expecting success of 4020.12 'diff attribute': 
 
-expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
-	(
-		cd test-outside/repo &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space &&
-		test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match
-	)
+	git config --unset diff.parrot.command &&
+	git config diff.color.command echo &&
 
-ok 19 - git diff --ignore-all-space, one file outside repo
+	echo >.gitattributes "file diff=color" &&
 
-expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
-		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
-	)
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual
 
-ok 20 - git diff --ignore-all-space, both files outside repo
+ok 12 - diff attribute
 
-expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
-	test-tool chmtime +10 a &&
-	echo modified >>b &&
-	test_expect_code 1 git diff --quiet
+expecting success of 4020.13 'diff attribute should apply only to diff': 
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-ok 21 - git diff --quiet ignores stat-change only entries
 
-expecting success of 4035.22 'git diff --quiet on a path that need conversion': 
-	echo "crlf.txt text=auto" >.gitattributes &&
-	printf "Hello\r\nWorld\r\n" >crlf.txt &&
-	git add .gitattributes crlf.txt &&
+diff --git a/file b/file
+ok 13 - diff attribute should apply only to diff
 
-	printf "Hello\r\nWorld\n" >crlf.txt &&
-	git diff --quiet crlf.txt
+expecting success of 4020.14 'diff attribute and --no-ext-diff': 
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-ok 22 - git diff --quiet on a path that need conversion
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4032-diff-inter-hunk-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4032-diff-inter-hunk-context/.git/
-expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
-		test 2 = 2
+diff --git a/file b/file
+ok 14 - diff attribute and --no-ext-diff
+
+expecting success of 4020.15 'GIT_EXTERNAL_DIFF trumps diff.external': 
+	>.gitattributes &&
+	test_config diff.external "echo ext-global" &&
+
+	cat >expect <<-EOF &&
+	ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+	EOF
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+	cut -d" " -f1-2,4- <out >actual &&
+	test_cmp expect actual
+
+ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
+
+expecting success of 4020.16 'attributes trump GIT_EXTERNAL_DIFF and diff.external': 
+	test_config diff.foo.command "echo ext-attribute" &&
+	test_config diff.external "echo ext-global" &&
+	echo "file diff=foo" >.gitattributes &&
+
+	cat >expect <<-EOF &&
+	ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+	EOF
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+	cut -d" " -f1-2,4- <out >actual &&
+	test_cmp expect actual
+
+ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
+
+expecting success of 4020.17 'no diff with -diff': 
+	echo >.gitattributes "file -diff" &&
+	git diff >out &&
+	grep Binary out
+
+Binary files a/file and b/file differ
+ok 17 - no diff with -diff
+
+expecting success of 4020.18 'setup output files': 
+	: >empty &&
+	echo output >output &&
+	echo "fatal: external diff died, stopping at file" >error
+
+ok 18 - setup output files
+
+expecting success of 4020.19 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 1 - diff -U0, 1 common line: count hunks (2)
+ok 19 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute
 
-expecting success of 4032.2 'diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
+expecting success of 4020.20 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 2 - diff -U0, 1 common line: check output
+ok 20 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external
 
-expecting success of 4032.3 'diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.21 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF': 
+		>.gitattributes &&
+		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
+ok 21 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF
 
-expecting success of 4032.4 'diff -U0 --inter-hunk-context=0, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
+expecting success of 4020.22 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 128 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
+ok 22 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute
 
-expecting success of 4032.5 'diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.23 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 128 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
+ok 23 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external
 
-expecting success of 4032.6 'diff -U0 --inter-hunk-context=1, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=1 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
+expecting success of 4020.24 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF': 
+		>.gitattributes &&
+		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
+ok 24 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF
 
-expecting success of 4032.7 'diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.25 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
+ok 25 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute
 
-expecting success of 4032.8 'diff -U0 --inter-hunk-context=2, 1 common line: check output': 
-		git diff -U0 --inter-hunk-context=2 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
+expecting success of 4020.26 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
+ok 26 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external
 
-expecting success of 4032.9 'diff -U1, 1 common line: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.27 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
+		>.gitattributes &&
+		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 9 - diff -U1, 1 common line: count hunks (1)
+ok 27 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF
 
-expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.28 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 10 - diff -U0, 2 common lines: count hunks (2)
+ok 28 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute
 
-expecting success of 4032.11 'diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.29 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 0 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
+ok 29 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external
 
-expecting success of 4032.12 'diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.30 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
+		>.gitattributes &&
+		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
+ok 30 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF
 
-expecting success of 4032.13 'diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.31 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute': 
+		test_config diff.foo.command "echo output; exit 2;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 128 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
+ok 31 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute
 
-expecting success of 4032.14 'diff -U1, 2 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.32 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external': 
+		test_config diff.external "echo output; exit 2;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 128 git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 14 - diff -U1, 2 common lines: count hunks (1)
+ok 32 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external
 
-expecting success of 4032.15 'diff -U1, 3 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.33 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF': 
+		>.gitattributes &&
+		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff  >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 15 - diff -U1, 3 common lines: count hunks (2)
+ok 33 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF
 
-expecting success of 4032.16 'diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.34 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --exit-code': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 1 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
+ok 34 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --exit-code
 
-expecting success of 4032.17 'diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.35 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --exit-code': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 1 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
+ok 35 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --exit-code
 
-expecting success of 4032.18 'diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.36 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code': 
+		>.gitattributes &&
+		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
+ok 36 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code
 
-expecting success of 4032.19 'diff -U3, 9 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.37 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --exit-code': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 128 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 19 - diff -U3, 9 common lines: count hunks (2)
+ok 37 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --exit-code
 
-expecting success of 4032.20 'diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.38 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --exit-code': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 128 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
+ok 38 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --exit-code
 
-expecting success of 4032.21 'diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.39 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code': 
+		>.gitattributes &&
+		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
+ok 39 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --exit-code
 
-expecting success of 4032.22 '(diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.40 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --exit-code': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 0 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
+ok 40 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --exit-code
 
-expecting success of 4032.23 '(diff.interHunkContext=0) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.2 actual
+expecting success of 4020.41 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --exit-code': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 0 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 23 - (diff.interHunkContext=0) diff -U0, 1 common line: check output
+ok 41 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --exit-code
 
-expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.42 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
+		>.gitattributes &&
+		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
+ok 42 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
 
-expecting success of 4032.25 '(diff.interHunkContext=1) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
+expecting success of 4020.43 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --exit-code': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 1 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 25 - (diff.interHunkContext=1) diff -U0, 1 common line: check output
+ok 43 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --exit-code
 
-expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.44 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --exit-code': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 1 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
+ok 44 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --exit-code
 
-expecting success of 4032.27 '(diff.interHunkContext=2) diff -U0, 1 common line: check output': 
-		git diff -U0 f1 | grep -v '^index ' >actual &&
-		test_cmp expected.f1.0.1 actual
+expecting success of 4020.45 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
+		>.gitattributes &&
+		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp empty err
 	
-ok 27 - (diff.interHunkContext=2) diff -U0, 1 common line: check output
+ok 45 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
 
-expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.46 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --exit-code': 
+		test_config diff.foo.command "echo output; exit 2;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 128 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+ok 46 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --exit-code
 
-expecting success of 4032.29 '(diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.47 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --exit-code': 
+		test_config diff.external "echo output; exit 2;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 128 git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
+ok 47 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --exit-code
 
-expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.48 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code': 
+		>.gitattributes &&
+		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --exit-code >out 2>err &&
+		test_cmp output out &&
+		test_cmp error err
 	
-ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
+ok 48 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --exit-code
 
-expecting success of 4032.31 '(diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.49 'external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --quiet': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
+ok 49 - external diff 'echo output; exit 0;' with trustExitCode=off via attribute with --quiet
 
-expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.50 'external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --quiet': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
+ok 50 - external diff 'echo output; exit 0;' with trustExitCode=off via diff.external with --quiet
 
-expecting success of 4032.33 '(diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.51 'external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet': 
+		>.gitattributes &&
+		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
+ok 51 - external diff 'echo output; exit 0;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet
 
-expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.52 'external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --quiet': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode off &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
+ok 52 - external diff 'echo output; exit 1;' with trustExitCode=off via attribute with --quiet
 
-expecting success of 4032.35 '(diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)': 
-		test 2 = 2
+expecting success of 4020.53 'external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --quiet': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode off &&
+		>.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
+ok 53 - external diff 'echo output; exit 1;' with trustExitCode=off via diff.external with --quiet
 
-expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
+expecting success of 4020.54 'external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet': 
+		>.gitattributes &&
+		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=off 			git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
 	
-ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+ok 54 - external diff 'echo output; exit 1;' with trustExitCode=off via GIT_EXTERNAL_DIFF with --quiet
 
-expecting success of 4032.37 'diff.interHunkContext invalid': 
-	git config diff.interHunkContext asdf &&
-	test_must_fail git diff &&
-	git config diff.interHunkContext -1 &&
-	test_must_fail git diff
+expecting success of 4020.55 'external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --quiet': 
+		test_config diff.foo.command "echo output; exit 0;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 0 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 55 - external diff 'echo output; exit 0;' with trustExitCode=on via attribute with --quiet
 
-fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
-fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
-ok 37 - diff.interHunkContext invalid
+expecting success of 4020.56 'external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --quiet': 
+		test_config diff.external "echo output; exit 0;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 0 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 56 - external diff 'echo output; exit 0;' with trustExitCode=on via diff.external with --quiet
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4039-diff-assume-unchanged/.git/
-expecting success of 4039.1 'setup': 
-	echo zero > zero &&
-	git add zero &&
-	git commit -m zero &&
-	echo one > one &&
-	echo two > two &&
-	blob=$(git hash-object one) &&
-	git add one two &&
-	git commit -m onetwo &&
-	git update-index --assume-unchanged one &&
-	echo borked >> one &&
-	test "$(git ls-files -v one)" = "h one"
+expecting success of 4020.57 'external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
+		>.gitattributes &&
+		test_expect_code 0 env 			GIT_EXTERNAL_DIFF="echo output; exit 0;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 57 - external diff 'echo output; exit 0;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
 
-[master (root-commit) fbf511c] zero
+expecting success of 4020.58 'external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --quiet': 
+		test_config diff.foo.command "echo output; exit 1;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 58 - external diff 'echo output; exit 1;' with trustExitCode=on via attribute with --quiet
+
+expecting success of 4020.59 'external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --quiet': 
+		test_config diff.external "echo output; exit 1;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 1 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 59 - external diff 'echo output; exit 1;' with trustExitCode=on via diff.external with --quiet
+
+expecting success of 4020.60 'external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
+		>.gitattributes &&
+		test_expect_code 1 env 			GIT_EXTERNAL_DIFF="echo output; exit 1;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp empty err
+	
+ok 60 - external diff 'echo output; exit 1;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
+
+expecting success of 4020.61 'external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --quiet': 
+		test_config diff.foo.command "echo output; exit 2;" &&
+		test_config diff.foo.trustExitCode on &&
+		echo "file diff=foo" >.gitattributes &&
+		test_expect_code 128 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp error err
+	
+ok 61 - external diff 'echo output; exit 2;' with trustExitCode=on via attribute with --quiet
+
+expecting success of 4020.62 'external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --quiet': 
+		test_config diff.external "echo output; exit 2;" &&
+		test_config diff.trustExitCode on &&
+		>.gitattributes &&
+		test_expect_code 128 git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp error err
+	
+ok 62 - external diff 'echo output; exit 2;' with trustExitCode=on via diff.external with --quiet
+
+expecting success of 4020.63 'external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet': 
+		>.gitattributes &&
+		test_expect_code 128 env 			GIT_EXTERNAL_DIFF="echo output; exit 2;" 			GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE=on 			git diff --quiet >out 2>err &&
+		test_cmp empty out &&
+		test_cmp error err
+	
+ok 63 - external diff 'echo output; exit 2;' with trustExitCode=on via GIT_EXTERNAL_DIFF with --quiet
+
+expecting success of 4020.64 'force diff with "diff"': 
+	after=$(git hash-object file) &&
+	after=$(git rev-parse --short $after) &&
+	echo >.gitattributes "file diff" &&
+	git diff >actual &&
+	sed -e "s/^index .*/index $before..$after 100644/" \
+		"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
+	test_cmp expected-diff actual
+
+ok 64 - force diff with "diff"
+
+expecting success of 4020.65 'GIT_EXTERNAL_DIFF with more than one changed files': 
+	echo anotherfile > file2 &&
+	git add file2 &&
+	git commit -m "added 2nd file" &&
+	echo modified >file2 &&
+	GIT_EXTERNAL_DIFF=echo git diff
+
+[master 314ec38] added 2nd file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 zero
-[master 3144717] onetwo
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two
-ok 1 - setup
+ create mode 100644 file2
+file /tmp/git-blob-kncLoZ/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/git-blob-VRvkeN/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+ok 65 - GIT_EXTERNAL_DIFF with more than one changed files
 
-expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
-	git diff-index HEAD^ -- one | grep -q $blob
+expecting success of 4020.66 'GIT_EXTERNAL_DIFF path counter/total': 
+	write_script external-diff.sh <<-\EOF &&
+	echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
+	EOF
+	>counter.txt &&
+	cat >expect <<-\EOF &&
+	1 of 2
+	2 of 2
+	EOF
+	GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
+	test_cmp expect counter.txt
 
-ok 2 - diff-index does not examine assume-unchanged entries
+ok 66 - GIT_EXTERNAL_DIFF path counter/total
 
-expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
-	rm one &&
-	test -z "$(git diff-files -- one)"
+expecting success of 4020.67 'GIT_EXTERNAL_DIFF generates pretty paths': 
+	test_when_finished "git rm -f file.ext" &&
+	touch file.ext &&
+	git add file.ext &&
+	echo with extension > file.ext &&
 
-ok 3 - diff-files does not examine assume-unchanged entries
+	cat >expect <<-EOF &&
+	file.ext
+	EOF
+	GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
+	basename $(cut -d" " -f2 <out) >actual &&
+	test_cmp expect actual
 
-expecting success of 4039.4 'find-copies-harder is not confused by mode bits': 
-	echo content >exec &&
-	chmod +x exec &&
-	git add exec &&
-	git commit -m exec &&
-	git update-index --assume-unchanged exec &&
-	git diff-files --find-copies-harder -- exec >actual &&
-	test_must_be_empty actual
+rm 'file.ext'
+ok 67 - GIT_EXTERNAL_DIFF generates pretty paths
 
-[master 4cf4df7] exec
+expecting success of 4020.68 'external diff with autocrlf = true': 
+	test_config core.autocrlf true &&
+	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
+	test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
+
+warning: in the working copy of 'file2', LF will be replaced by CRLF the next time Git touches it
+ok 68 - external diff with autocrlf = true
+
+expecting success of 4020.69 'diff --cached': 
+	test_config core.autocrlf true &&
+	git add file &&
+	git update-index --assume-unchanged file &&
+	echo second >file &&
+	git diff --cached >actual &&
+	test_cmp expected-diff actual
+
+ok 69 - diff --cached
+
+expecting success of 4020.70 'clean up crlf leftovers': 
+	git update-index --no-assume-unchanged file &&
+	rm -f file* &&
+	git reset --hard
+
+HEAD is now at 314ec38 added 2nd file
+ok 70 - clean up crlf leftovers
+
+expecting success of 4020.71 'submodule diff': 
+	git init sub &&
+	( cd sub && test_commit sub1 ) &&
+	git add sub &&
+	test_tick &&
+	git commit -m "add submodule" &&
+	( cd sub && test_commit sub2 ) &&
+	write_script gather_pre_post.sh <<-\EOF &&
+	echo "$1 $4" # path, mode
+	cat "$2" # old file
+	cat "$5" # new file
+	EOF
+	GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
+	cat >expected <<-EOF &&
+	sub 160000
+	Subproject commit $(git rev-parse HEAD:sub)
+	Subproject commit $(cd sub && git rev-parse HEAD)
+	EOF
+	test_cmp expected actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4020-diff-external/sub/.git/
+[master (root-commit) e2fb92c] sub1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100755 exec
-ok 4 - find-copies-harder is not confused by mode bits
+ create mode 100644 sub1.t
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master bcd8781] add submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+[master 6a9164c] sub2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub2.t
+ok 71 - submodule diff
 
-# passed all 4 test(s)
-1..4
+# passed all 71 test(s)
+1..71
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4043-diff-rename-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4043-diff-rename-binary/.git/
-expecting success of 4043.1 'prepare repository': 
-	git init &&
-	echo foo > foo &&
-	echo "barQ" | q_to_nul > bar &&
-	git add . &&
-	git commit -m "Initial commit"
+*** t4030-diff-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4030-diff-textconv/.git/
+expecting success of 4030.1 'setup binary file with history': 
+	test_commit --printf one file "\\0\\n" &&
+	test_commit --printf --append two file "\\01\\n"
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4043-diff-rename-binary/.git/
-[master (root-commit) 07508f6] Initial commit
+[master (root-commit) f1b27dd] one
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 1 - prepare repository
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master e1c09e5] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - setup binary file with history
 
-expecting success of 4043.2 'move the files into a "sub" directory': 
-	mkdir sub &&
-	git mv bar foo sub/ &&
-	git commit -m "Moved to sub/"
+expecting success of 4030.2 'file is considered binary by porcelain': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-[master ebc8afa] Moved to sub/
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename bar => sub/bar (100%)
- rename foo => sub/foo (100%)
-ok 2 - move the files into a "sub" directory
+ok 2 - file is considered binary by porcelain
 
-expecting success of 4043.3 'git show -C -C report renames': 
-	git show -C -C --raw --binary --numstat >patch-with-stat &&
-	tail -n 11 patch-with-stat >current &&
-	test_cmp expected current
+expecting success of 4030.3 'file is considered binary by plumbing': 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-ok 3 - git show -C -C report renames
+ok 3 - file is considered binary by plumbing
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4040-whitespace-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4040-whitespace-status/.git/
-expecting success of 4040.1 'setup': 
-	mkdir a b &&
-	echo >c &&
-	echo >a/d &&
-	echo >b/e &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	echo " " >a/d &&
-	test_tick &&
-	git commit -a -m second &&
-	echo "  " >a/d &&
-	echo " " >b/e &&
-	git add a/d
+expecting success of 4030.4 'setup textconv filters': 
+	echo file diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
+	git config diff.fail.textconv false
 
-[master (root-commit) b80f2e3] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a/d
- create mode 100644 b/e
- create mode 100644 c
-[master 13a0478] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ok 4 - setup textconv filters
 
-expecting success of 4040.2 'diff-tree --exit-code': 
-	test_must_fail git diff --exit-code HEAD^ HEAD &&
-	test_must_fail git diff-tree --exit-code HEAD^ HEAD
+expecting success of 4030.5 'diff produces text': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-diff --git a/a/d b/a/d
-index 8b13789..8d1c8b6 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
--
-+ 
-:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
-ok 2 - diff-tree --exit-code
+ok 5 - diff produces text
 
-expecting success of 4040.3 'diff-tree -b --exit-code': 
-	git diff -b --exit-code HEAD^ HEAD &&
-	git diff-tree -b -p --exit-code HEAD^ HEAD
+expecting success of 4030.6 'show commit produces text': 
+	git show HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-ok 3 - diff-tree -b --exit-code
+ok 6 - show commit produces text
 
-expecting success of 4040.4 'diff-index --cached --exit-code': 
-	test_must_fail git diff --cached --exit-code HEAD &&
-	test_must_fail git diff-index --cached --exit-code HEAD
+expecting success of 4030.7 'diff-tree produces binary': 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-diff --git a/a/d b/a/d
-index 8d1c8b6..1a4baf5 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
-- 
-+  
-:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
-ok 4 - diff-index --cached --exit-code
+ok 7 - diff-tree produces binary
 
-expecting success of 4040.5 'diff-index -b -p --cached --exit-code': 
-	git diff -b --cached --exit-code HEAD &&
-	git diff-index -b -p --cached --exit-code HEAD
+expecting success of 4030.8 'log produces text': 
+	git log -1 -p >log &&
+	find_diff <log >actual &&
+	test_cmp expect.text actual
 
-ok 5 - diff-index -b -p --cached --exit-code
+ok 8 - log produces text
 
-expecting success of 4040.6 'diff-index --exit-code': 
-	test_must_fail git diff --exit-code HEAD &&
-	test_must_fail git diff-index --exit-code HEAD
+expecting success of 4030.9 'format-patch produces binary': 
+	git format-patch --no-binary --stdout HEAD^ >patch &&
+	find_diff <patch >actual &&
+	test_cmp expect.binary actual
 
-diff --git a/a/d b/a/d
-index 8d1c8b6..1a4baf5 100644
---- a/a/d
-+++ b/a/d
-@@ -1 +1 @@
-- 
-+  
-diff --git a/b/e b/b/e
-index 8b13789..8d1c8b6 100644
---- a/b/e
-+++ b/b/e
-@@ -1 +1 @@
--
-+ 
-:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
-:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
-ok 6 - diff-index --exit-code
+ok 9 - format-patch produces binary
 
-expecting success of 4040.7 'diff-index -b -p --exit-code': 
-	git diff -b --exit-code HEAD &&
-	git diff-index -b -p --exit-code HEAD
+expecting success of 4030.10 'status -v produces text': 
+	git reset --soft HEAD^ &&
+	git status -v >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual &&
+	git reset --soft HEAD@{1}
 
-ok 7 - diff-index -b -p --exit-code
+ok 10 - status -v produces text
 
-expecting success of 4040.8 'diff-files --exit-code': 
-	test_must_fail git diff --exit-code &&
-	test_must_fail git diff-files --exit-code
+expecting success of 4030.11 'show blob produces binary': 
+	git show HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
 
-diff --git a/b/e b/b/e
-index 8b13789..8d1c8b6 100644
---- a/b/e
-+++ b/b/e
-@@ -1 +1 @@
--
-+ 
-:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
-ok 8 - diff-files --exit-code
+ok 11 - show blob produces binary
 
-expecting success of 4040.9 'diff-files -b -p --exit-code': 
-	git diff -b --exit-code &&
-	git diff-files -b -p --exit-code
+expecting success of 4030.12 'show --textconv blob produces text': 
+	git show --textconv HEAD:file >actual &&
+	printf "0\\n1\\n" >expect &&
+	test_cmp expect actual
 
-ok 9 - diff-files -b -p --exit-code
+ok 12 - show --textconv blob produces text
 
-expecting success of 4040.10 'diff-files --diff-filter --quiet': 
-	git reset --hard &&
-	rm a/d &&
-	echo x >>b/e &&
-	test_must_fail git diff-files --diff-filter=M --quiet
+expecting success of 4030.13 'show --no-textconv blob produces binary': 
+	git show --no-textconv HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
 
-HEAD is now at 13a0478 second
-ok 10 - diff-files --diff-filter --quiet
+ok 13 - show --no-textconv blob produces binary
 
-expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
-	git commit -a -m "worktree state" &&
-	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -G0 >actual &&
+	test_cmp expect actual
 
-[master c0a31dc] worktree state
+ok 14 - grep-diff (-G) operates on textconv data (add)
+
+expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -G1 >actual &&
+	test_cmp expect actual
+
+ok 15 - grep-diff (-G) operates on textconv data (modification)
+
+expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -S0 >actual &&
+	test_cmp expect actual
+
+ok 16 - pickaxe (-S) operates on textconv data (add)
+
+expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -S1 >actual &&
+	test_cmp expect actual
+
+ok 17 - pickaxe (-S) operates on textconv data (modification)
+
+expecting success of 4030.18 'diffstat does not run textconv': 
+	echo file diff=fail >.gitattributes &&
+	git diff --stat HEAD^ HEAD >actual &&
+	test_cmp expect.stat actual &&
+
+	head -n1 <expect.stat >expect.line1 &&
+	head -n1 <actual >actual.line1 &&
+	test_cmp expect.line1 actual.line1
+
+ok 18 - diffstat does not run textconv
+
+expecting success of 4030.19 'textconv does not act on symlinks': 
+	rm -f file &&
+	test_ln_s_add frotz file &&
+	git commit -m typechange &&
+	git show >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.typechange actual
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 552bf47] typechange
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 a/d
-ok 11 - diff-tree --diff-filter --quiet
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 120000 file
+ok 19 - textconv does not act on symlinks
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4033-diff-patience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4033-diff-patience/.git/
+expecting success of 4033.1 '--ignore-space-at-eol with a single appended character': 
+	printf "a\nb\nc\n" >pre &&
+	printf "a\nbX\nc\n" >post &&
+	test_must_fail git diff --no-index \
+		--patience --ignore-space-at-eol pre post >diff &&
+	grep "^+.*X" diff
+
++bX
+ok 1 - --ignore-space-at-eol with a single appended character
+
+expecting success of 4033.2 'setup attributes files for tests with patience': 
+		git checkout -b master &&
+		echo "file* diff=driver" >.gitattributes &&
+		git add file1 file2 .gitattributes &&
+		git commit -m "adding files" &&
+		git checkout -b branchA &&
+		echo "file* diff=driverA" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -m "adding driverA as diff driver" &&
+		git checkout master &&
+		git clone --bare --no-local . bare.git
+	
+Switched to a new branch 'master'
+[master (root-commit) 946e965] adding files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 52 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'branchA'
+[branchA 7cbc84d] adding driverA as diff driver
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Cloning into bare repository 'bare.git'...
+ok 2 - setup attributes files for tests with patience
+
+expecting success of 4033.3 'patience diff from attributes': 
+		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
+		test_cmp expect output
+	
+ok 3 - patience diff from attributes
+
+expecting success of 4033.4 'diff from attributes with bare repo with source': 
+		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
+			-c diff.driverA.algorithm=$STRATEGY \
+			diff HEAD:file1 HEAD:file2 >output &&
+		test_cmp expect output
+	
+ok 4 - diff from attributes with bare repo with source
+
+expecting success of 4033.5 'diff from attributes with bare repo with invalid source': 
+		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
+			HEAD:file1 HEAD:file2
+	
+fatal: bad --attr-source or GIT_ATTR_SOURCE
+ok 5 - diff from attributes with bare repo with invalid source
+
+expecting success of 4033.6 'patience diff from attributes has valid diffstat': 
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm "$STRATEGY" &&
+		test_must_fail git diff --stat --no-index file1 file2 > output &&
+		test_cmp expect_diffstat output
+	
+ok 6 - patience diff from attributes has valid diffstat
+
+expecting success of 4033.7 'patience diff': 
+		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 7 - patience diff
+
+expecting success of 4033.8 'patience diff command line precedence before attributes': 
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm myers &&
+		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 8 - patience diff command line precedence before attributes
+
+expecting success of 4033.9 'patience diff attributes precedence before config': 
+		git config diff.algorithm default &&
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm "$STRATEGY" &&
+		test_must_fail git diff --no-index file1 file2 > output &&
+		test_cmp expect output
+	
+ok 9 - patience diff attributes precedence before config
+
+expecting success of 4033.10 'patience diff output is valid': 
+		mv file2 expect &&
+		git apply < output &&
+		test_cmp expect file2
+	
+ok 10 - patience diff output is valid
+
+expecting success of 4033.11 'completely different files': 
+		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
+		test_cmp expect output
+	
+ok 11 - completely different files
 
 # passed all 11 test(s)
 1..11
@@ -242301,333 +241466,1009 @@
 1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4042-diff-textconv-caching.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4042-diff-textconv-caching/.git/
-expecting success of 4042.1 'setup': 
-	echo foo content 1 >foo.bin &&
-	echo bar content 1 >bar.bin &&
-	git add . &&
-	git commit -m one &&
-	foo1=$(git rev-parse --short HEAD:foo.bin) &&
-	bar1=$(git rev-parse --short HEAD:bar.bin) &&
-	echo foo content 2 >foo.bin &&
-	echo bar content 2 >bar.bin &&
-	git commit -a -m two &&
-	foo2=$(git rev-parse --short HEAD:foo.bin) &&
-	bar2=$(git rev-parse --short HEAD:bar.bin) &&
-	echo "*.bin diff=magic" >.gitattributes &&
-	git config diff.magic.textconv ./helper &&
-	git config diff.magic.cachetextconv true
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success of 4036.1 'setup': 
 
-[master (root-commit) e62c20e] one
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 bar.bin
- create mode 100644 foo.bin
- create mode 100755 helper
-[master ea2ff12] two
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
 
-expecting success of 4042.2 'first textconv works': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+	test_tick &&
+	git commit -m "This adds some lines to F" F
 
-ok 2 - first textconv works
 
-expecting success of 4042.3 'cached textconv produces same output': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+[master (root-commit) bf01fa7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 F
+[master dc5bbb5] This adds some lines to F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-ok 3 - cached textconv produces same output
+expecting success of 4036.2 'format normally': 
 
-expecting success of 4042.4 'cached textconv does not run helper': 
-	rm -f helper.out &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual &&
-	! test -r helper.out
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
 
-ok 4 - cached textconv does not run helper
 
-expecting success of 4042.5 'changing textconv invalidates cache': 
-	echo other >other &&
-	git config diff.magic.textconv "./helper other" &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+ok 2 - format normally
 
-ok 5 - changing textconv invalidates cache
+expecting success of 4036.3 'format with signoff without funny signer name': 
 
-expecting success of 4042.6 'switching diff driver produces correct results': 
-	git config diff.moremagic.textconv ./helper &&
-	echo foo.bin diff=moremagic >>.gitattributes &&
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
 
-ok 6 - switching diff driver produces correct results
 
-expecting success of 4042.7 'log notes cache and still use cache for -p': 
-	git log --no-walk -p refs/notes/textconv/magic HEAD
+ok 3 - format with signoff without funny signer name
 
-commit 9c639377525bb0485f64e3a844123312ec98541e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+expecting success of 4036.4 'format with non ASCII signer name': 
 
-    ./helper other
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
 
-diff --git a/1345db2c9189a61ef9932f66b656afc986bee58f b/1345db2c9189a61ef9932f66b656afc986bee58f
-new file mode 100644
-index 0000000..01b25c5
---- /dev/null
-+++ b/1345db2c9189a61ef9932f66b656afc986bee58f
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: foo content 2
-diff --git a/28283d51eeb71548ff81d02404b90103b494b983 b/28283d51eeb71548ff81d02404b90103b494b983
-new file mode 100644
-index 0000000..dcd63a4
---- /dev/null
-+++ b/28283d51eeb71548ff81d02404b90103b494b983
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: bar content 2
-diff --git a/d5b9fe314e6004caf906e730045d20689167b3fb b/d5b9fe314e6004caf906e730045d20689167b3fb
-new file mode 100644
-index 0000000..7ef0353
---- /dev/null
-+++ b/d5b9fe314e6004caf906e730045d20689167b3fb
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: foo content 1
-diff --git a/fcf91668044fda4a569b9374589b26dada7adc49 b/fcf91668044fda4a569b9374589b26dada7adc49
-new file mode 100644
-index 0000000..5ead606
---- /dev/null
-+++ b/fcf91668044fda4a569b9374589b26dada7adc49
-@@ -0,0 +1,2 @@
-+converted: other
-+converted: bar content 1
 
-commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
 
-    two
+expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
 
-diff --git a/bar.bin b/bar.bin
-index fcf9166..28283d5 100644
---- a/bar.bin
-+++ b/bar.bin
-@@ -1,2 +1,2 @@
- converted: other
--converted: bar content 1
-+converted: bar content 2
-diff --git a/foo.bin b/foo.bin
-index d5b9fe3..1345db2 100644
---- a/foo.bin
-+++ b/foo.bin
-@@ -1 +1 @@
--converted: foo content 1
-+converted: foo content 2
-ok 7 - log notes cache and still use cache for -p
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
 
-expecting success of 4042.8 'caching is silently ignored outside repo': 
-	mkdir -p non-repo &&
-	echo one >non-repo/one &&
-	echo two >non-repo/two &&
-	echo "* diff=test" >attr &&
-	test_expect_code 1 \
-	nongit git -c core.attributesFile="$PWD/attr" \
-		   -c diff.test.textconv="tr a-z A-Z <" \
-		   -c diff.test.cachetextconv=true \
-		   diff --no-index one two >actual &&
-	cat >expect <<-\EOF &&
-	diff --git a/one b/two
-	index 5626abf..f719efd 100644
-	--- a/one
-	+++ b/two
-	@@ -1 +1 @@
-	-ONE
-	+TWO
-	EOF
-	test_cmp expect actual
 
-ok 8 - caching is silently ignored outside repo
+ok 5 - attach and signoff do not duplicate mime headers
 
-# passed all 8 test(s)
-1..8
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4044-diff-index-unique-abbrev.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4044-diff-index-unique-abbrev/.git/
-expecting success of 4044.1 'setup': 
-	test_oid_cache <<-EOF &&
-	val1 sha1:4827
-	val1 sha256:5664
-
-	val2 sha1:11742
-	val2 sha256:10625
-
-	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
-	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
-
-	hasht1 sha1:51d27384
-	hasht1 sha256:ae31dfff
-
-	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
-	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
-
-	hasht2 sha1:51d2738e
-	hasht2 sha256:ae31dffa
-	EOF
-
-	cat >expect_initial <<-EOF &&
-	100644 blob $(test_oid hash1)	foo
-	EOF
-
-	cat >expect_update <<-EOF &&
-	100644 blob $(test_oid hash2)	foo
-	EOF
+*** t4037-diff-r-t-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4037-diff-r-t-dirs/.git/
+expecting success of 4037.1 'setup': 
+	mkdir dc dr dt &&
+	>dc/1 &&
+	>dr/2 &&
+	>dt/3 &&
+	>fc &&
+	>fr &&
+	>ft &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
 
-	test_oid val1 > foo &&
-	git add foo &&
-	git commit -m "initial" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_initial actual &&
-	test_oid val2 > foo &&
-	git commit -a -m "update" &&
-	git cat-file -p HEAD: > actual &&
-	test_cmp expect_update actual
+	rm -fr dt dr ft fr &&
+	mkdir da ft &&
+	for p in dc/1 da/4 dt ft/5 fc
+	do
+		echo hello >$p || exit
+	done &&
+	git add -u &&
+	git add . &&
+	test_tick &&
+	git commit -m second
 
-[master (root-commit) eaa2693] initial
+[master (root-commit) 26fc746] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 90cb371] update
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dc/1
+ create mode 100644 dr/2
+ create mode 100644 dt/3
+ create mode 100644 fc
+ create mode 100644 fr
+ create mode 100644 ft
+[master 25e238e] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 9 files changed, 5 insertions(+)
+ create mode 100644 da/4
+ delete mode 100644 dr/2
+ create mode 100644 dt
+ delete mode 100644 dt/3
+ delete mode 100644 fr
+ delete mode 100644 ft
+ create mode 100644 ft/5
 ok 1 - setup
 
-expecting success of 4044.2 'diff does not produce ambiguous index line': 
-	git diff HEAD^..HEAD | grep index > actual &&
+expecting success of 4037.2 'verify': 
+	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
 	test_cmp expect actual
 
-ok 2 - diff does not produce ambiguous index line
+ok 2 - verify
 
 # passed all 2 test(s)
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4046-diff-unmerged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4046-diff-unmerged/.git/
-expecting success of 4046.1 'setup': 
-	for i in 0 1 2 3
-	do
-		blob=$(echo $i | git hash-object --stdin) &&
-		eval "blob$i=$blob" &&
-		eval "m$i=\"100644 \$blob$i $i\"" || return 1
-	done &&
-	paths= &&
-	for b in o x
-	do
-		for o in o x
-		do
-			for t in o x
-			do
-				path="$b$o$t" &&
-				if test "$path" != ooo
-				then
-					paths="$paths$path " &&
-					p="	$path" &&
-					case "$b" in x) echo "$m1$p" ;; esac &&
-					case "$o" in x) echo "$m2$p" ;; esac &&
-					case "$t" in x) echo "$m3$p" ;; esac ||
-					return 1
-				fi
-			done
-		done
-	done >ls-files-s.expect &&
-	git update-index --index-info <ls-files-s.expect &&
-	git ls-files -s >ls-files-s.actual &&
-	test_cmp ls-files-s.expect ls-files-s.actual
-
-ok 1 - setup
-
-expecting success of 4046.2 'diff-files -0': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" || return 1
-	done >diff-files-0.expect &&
-	git diff-files -0 >diff-files-0.actual &&
-	test_cmp diff-files-0.expect diff-files-0.actual
+*** t4035-diff-quiet.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4035-diff-quiet/.git/
+expecting success of 4035.1 'setup': 
+	echo 1 >a &&
+	git add . &&
+	git commit -m first &&
+	echo 2 >b &&
+	git add . &&
+	git commit -a -m second &&
+	mkdir -p test-outside/repo && (
+		cd test-outside/repo &&
+		git init &&
+		echo "1 1" >a &&
+		git add . &&
+		git commit -m 1
+	) &&
+	mkdir -p test-outside/non/git && (
+		cd test-outside/non/git &&
+		echo "1 1" >a &&
+		echo "1 1" >matching-file &&
+		echo "1 1 " >trailing-space &&
+		echo "1   1" >extra-space &&
+		echo "2" >never-match
+	)
 
-ok 2 - diff-files -0
+[master (root-commit) 703ec9e] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[master 3476b69] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
+[master (root-commit) f9eeef1] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
 
-expecting success of 4046.3 'diff-files -1': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		x??) echo ":100644 100644 $blob1 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-1.expect &&
-	git diff-files -1 >diff-files-1.actual &&
-	test_cmp diff-files-1.expect diff-files-1.actual
+expecting success of 4035.2 'git diff-tree HEAD^ HEAD': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
+	test_line_count = 0 cnt
 
-ok 3 - diff-files -1
+ok 2 - git diff-tree HEAD^ HEAD
 
-expecting success of 4046.4 'diff-files -2': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		?x?) echo ":100644 100644 $blob2 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-2.expect &&
-	git diff-files -2 >diff-files-2.actual &&
-	test_cmp diff-files-2.expect diff-files-2.actual &&
-	git diff-files >diff-files-default-2.actual &&
-	test_cmp diff-files-2.expect diff-files-default-2.actual
+expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
+	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
+	test_line_count = 0 cnt
 
-ok 4 - diff-files -2
+ok 3 - git diff-tree HEAD^ HEAD -- a
 
-expecting success of 4046.5 'diff-files -3': 
-	for path in $paths
-	do
-		>"$path" &&
-		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
-		case "$path" in
-		??x) echo ":100644 100644 $blob3 $ZERO_OID M	$path"
-		esac || return 1
-	done >diff-files-3.expect &&
-	git diff-files -3 >diff-files-3.actual &&
-	test_cmp diff-files-3.expect diff-files-3.actual
+expecting success of 4035.4 'git diff-tree HEAD^ HEAD -- b': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-ok 5 - diff-files -3
+ok 4 - git diff-tree HEAD^ HEAD -- b
 
-expecting success of 4046.6 'diff --stat': 
-	for path in $paths
-	do
-		echo " $path | Unmerged" || return 1
-	done >diff-stat.expect &&
-	echo " 0 files changed" >>diff-stat.expect &&
-	git diff --cached --stat >diff-stat.actual &&
-	test_cmp diff-stat.expect diff-stat.actual
+expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
+	echo $(git rev-parse HEAD) |
+	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
+	test_line_count = 1 cnt
 
-ok 6 - diff --stat
+ok 5 - echo HEAD | git diff-tree --stdin
 
-expecting success of 4046.7 'diff --quiet': 
-	test_expect_code 1 git diff --cached --quiet
+expecting success of 4035.6 'git diff-tree HEAD HEAD': 
+	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
+	test_line_count = 0 cnt
 
-ok 7 - diff --quiet
+ok 6 - git diff-tree HEAD HEAD
 
-expecting success of 4046.8 'diff --quiet --ignore-all-space': 
-	test_expect_code 1 git diff --cached --quiet --ignore-all-space
+expecting success of 4035.7 'git diff-files': 
+	test_expect_code 0 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
 
-ok 8 - diff --quiet --ignore-all-space
+ok 7 - git diff-files
+
+expecting success of 4035.8 'git diff-index --cached HEAD': 
+	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 8 - git diff-index --cached HEAD
+
+expecting success of 4035.9 'git diff-index --cached HEAD^': 
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
+
+ok 9 - git diff-index --cached HEAD^
+
+expecting success of 4035.10 'git diff-index --cached HEAD^': 
+	echo text >>b &&
+	echo 3 >c &&
+	git add . &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
+	test_line_count = 0 cnt
+
+warning: adding embedded git repository: test-outside/repo
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> test-outside/repo
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached test-outside/repo
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 10 - git diff-index --cached HEAD^
+
+expecting success of 4035.11 'git diff-tree -Stext HEAD^ HEAD -- b': 
+	git commit -m "text in b" &&
+	test_expect_code 1 git diff-tree --quiet -Stext HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
+
+[master b583ee2] text in b
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+)
+ create mode 100644 c
+ create mode 100644 cnt
+ create mode 100644 test-outside/non/git/a
+ create mode 100644 test-outside/non/git/extra-space
+ create mode 100644 test-outside/non/git/matching-file
+ create mode 100644 test-outside/non/git/never-match
+ create mode 100644 test-outside/non/git/trailing-space
+ create mode 160000 test-outside/repo
+ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
+
+expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
+	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
+
+ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+
+expecting success of 4035.13 'git diff-files': 
+	echo 3 >>c &&
+	test_expect_code 1 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
+
+ok 13 - git diff-files
+
+expecting success of 4035.14 'git diff-index --cached HEAD': 
+	git update-index c &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
+
+ok 14 - git diff-index --cached HEAD
+
+expecting success of 4035.15 'git diff, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
+		test_expect_code 1 git diff --quiet a ../non/git/extra-space
+	)
+
+ok 15 - git diff, one file outside repo
+
+expecting success of 4035.16 'git diff, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet a matching-file &&
+		test_expect_code 1 git diff --quiet a extra-space
+	)
+
+ok 16 - git diff, both files outside repo
+
+expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
+		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
+	)
+
+ok 17 - git diff --ignore-space-at-eol, one file outside repo
+
+expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space &&
+		test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space
+	)
+
+ok 18 - git diff --ignore-space-at-eol, both files outside repo
+
+expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match
+	)
+
+ok 19 - git diff --ignore-all-space, one file outside repo
+
+expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
+	)
+
+ok 20 - git diff --ignore-all-space, both files outside repo
+
+expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
+	test-tool chmtime +10 a &&
+	echo modified >>b &&
+	test_expect_code 1 git diff --quiet
+
+ok 21 - git diff --quiet ignores stat-change only entries
+
+expecting success of 4035.22 'git diff --quiet on a path that need conversion': 
+	echo "crlf.txt text=auto" >.gitattributes &&
+	printf "Hello\r\nWorld\r\n" >crlf.txt &&
+	git add .gitattributes crlf.txt &&
+
+	printf "Hello\r\nWorld\n" >crlf.txt &&
+	git diff --quiet crlf.txt
+
+warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
+warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
+ok 22 - git diff --quiet on a path that need conversion
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4032-diff-inter-hunk-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4032-diff-inter-hunk-context/.git/
+expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 1 - diff -U0, 1 common line: count hunks (2)
+
+expecting success of 4032.2 'diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 2 - diff -U0, 1 common line: check output
+
+expecting success of 4032.3 'diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 3 - diff -U0 --inter-hunk-context=0, 1 common line: count hunks (2)
+
+expecting success of 4032.4 'diff -U0 --inter-hunk-context=0, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
+
+expecting success of 4032.5 'diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 5 - diff -U0 --inter-hunk-context=1, 1 common line: count hunks (1)
+
+expecting success of 4032.6 'diff -U0 --inter-hunk-context=1, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=1 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 6 - diff -U0 --inter-hunk-context=1, 1 common line: check output
+
+expecting success of 4032.7 'diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 7 - diff -U0 --inter-hunk-context=2, 1 common line: count hunks (1)
+
+expecting success of 4032.8 'diff -U0 --inter-hunk-context=2, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=2 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 8 - diff -U0 --inter-hunk-context=2, 1 common line: check output
+
+expecting success of 4032.9 'diff -U1, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 9 - diff -U1, 1 common line: count hunks (1)
+
+expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 10 - diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.11 'diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 11 - diff -U0 --inter-hunk-context=0, 2 common lines: count hunks (2)
+
+expecting success of 4032.12 'diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 12 - diff -U0 --inter-hunk-context=1, 2 common lines: count hunks (2)
+
+expecting success of 4032.13 'diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 13 - diff -U0 --inter-hunk-context=2, 2 common lines: count hunks (1)
+
+expecting success of 4032.14 'diff -U1, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 14 - diff -U1, 2 common lines: count hunks (1)
+
+expecting success of 4032.15 'diff -U1, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 15 - diff -U1, 3 common lines: count hunks (2)
+
+expecting success of 4032.16 'diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 16 - diff -U1 --inter-hunk-context=0, 3 common lines: count hunks (2)
+
+expecting success of 4032.17 'diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 17 - diff -U1 --inter-hunk-context=1, 3 common lines: count hunks (1)
+
+expecting success of 4032.18 'diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 18 - diff -U1 --inter-hunk-context=2, 3 common lines: count hunks (1)
+
+expecting success of 4032.19 'diff -U3, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 19 - diff -U3, 9 common lines: count hunks (2)
+
+expecting success of 4032.20 'diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 20 - diff -U3 --inter-hunk-context=2, 9 common lines: count hunks (2)
+
+expecting success of 4032.21 'diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 21 - diff -U3 --inter-hunk-context=3, 9 common lines: count hunks (1)
+
+expecting success of 4032.22 '(diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 22 - (diff.interHunkContext=0) diff -U0, 1 common line: count hunks (2)
+
+expecting success of 4032.23 '(diff.interHunkContext=0) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 23 - (diff.interHunkContext=0) diff -U0, 1 common line: check output
+
+expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
+
+expecting success of 4032.25 '(diff.interHunkContext=1) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 25 - (diff.interHunkContext=1) diff -U0, 1 common line: check output
+
+expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
+
+expecting success of 4032.27 '(diff.interHunkContext=2) diff -U0, 1 common line: check output': 
+		git diff -U0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.1 actual
+	
+ok 27 - (diff.interHunkContext=2) diff -U0, 1 common line: check output
+
+expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+
+expecting success of 4032.29 '(diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 29 - (diff.interHunkContext=0) diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
+
+expecting success of 4032.31 '(diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 31 - (diff.interHunkContext=2) diff -U0, 2 common lines: count hunks (1)
+
+expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
+
+expecting success of 4032.33 '(diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 33 - (diff.interHunkContext=1) diff -U1, 3 common lines: count hunks (1)
+
+expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
+
+expecting success of 4032.35 '(diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 35 - (diff.interHunkContext=2) diff -U3, 9 common lines: count hunks (2)
+
+expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+
+expecting success of 4032.37 'diff.interHunkContext invalid': 
+	git config diff.interHunkContext asdf &&
+	test_must_fail git diff &&
+	git config diff.interHunkContext -1 &&
+	test_must_fail git diff
+
+fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
+fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
+ok 37 - diff.interHunkContext invalid
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4039-diff-assume-unchanged/.git/
+expecting success of 4039.1 'setup': 
+	echo zero > zero &&
+	git add zero &&
+	git commit -m zero &&
+	echo one > one &&
+	echo two > two &&
+	blob=$(git hash-object one) &&
+	git add one two &&
+	git commit -m onetwo &&
+	git update-index --assume-unchanged one &&
+	echo borked >> one &&
+	test "$(git ls-files -v one)" = "h one"
+
+[master (root-commit) fbf511c] zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 zero
+[master 3144717] onetwo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+ok 1 - setup
+
+expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
+	git diff-index HEAD^ -- one | grep -q $blob
+
+ok 2 - diff-index does not examine assume-unchanged entries
+
+expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
+	rm one &&
+	test -z "$(git diff-files -- one)"
+
+ok 3 - diff-files does not examine assume-unchanged entries
+
+expecting success of 4039.4 'find-copies-harder is not confused by mode bits': 
+	echo content >exec &&
+	chmod +x exec &&
+	git add exec &&
+	git commit -m exec &&
+	git update-index --assume-unchanged exec &&
+	git diff-files --find-copies-harder -- exec >actual &&
+	test_must_be_empty actual
+
+[master 4cf4df7] exec
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 exec
+ok 4 - find-copies-harder is not confused by mode bits
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4043-diff-rename-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4043-diff-rename-binary/.git/
+expecting success of 4043.1 'prepare repository': 
+	git init &&
+	echo foo > foo &&
+	echo "barQ" | q_to_nul > bar &&
+	git add . &&
+	git commit -m "Initial commit"
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4043-diff-rename-binary/.git/
+[master (root-commit) 07508f6] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 1 - prepare repository
+
+expecting success of 4043.2 'move the files into a "sub" directory': 
+	mkdir sub &&
+	git mv bar foo sub/ &&
+	git commit -m "Moved to sub/"
+
+[master ebc8afa] Moved to sub/
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename bar => sub/bar (100%)
+ rename foo => sub/foo (100%)
+ok 2 - move the files into a "sub" directory
+
+expecting success of 4043.3 'git show -C -C report renames': 
+	git show -C -C --raw --binary --numstat >patch-with-stat &&
+	tail -n 11 patch-with-stat >current &&
+	test_cmp expected current
+
+ok 3 - git show -C -C report renames
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4040-whitespace-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4040-whitespace-status/.git/
+expecting success of 4040.1 'setup': 
+	mkdir a b &&
+	echo >c &&
+	echo >a/d &&
+	echo >b/e &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+	echo " " >a/d &&
+	test_tick &&
+	git commit -a -m second &&
+	echo "  " >a/d &&
+	echo " " >b/e &&
+	git add a/d
+
+[master (root-commit) b80f2e3] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a/d
+ create mode 100644 b/e
+ create mode 100644 c
+[master 13a0478] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4040.2 'diff-tree --exit-code': 
+	test_must_fail git diff --exit-code HEAD^ HEAD &&
+	test_must_fail git diff-tree --exit-code HEAD^ HEAD
+
+diff --git a/a/d b/a/d
+index 8b13789..8d1c8b6 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+-
++ 
+:040000 040000 13061aad4970f02b314943ec46981e9ef332cae2 ac592974c686387705f2617b895d6585cc0a0d46 M	a
+ok 2 - diff-tree --exit-code
+
+expecting success of 4040.3 'diff-tree -b --exit-code': 
+	git diff -b --exit-code HEAD^ HEAD &&
+	git diff-tree -b -p --exit-code HEAD^ HEAD
+
+ok 3 - diff-tree -b --exit-code
+
+expecting success of 4040.4 'diff-index --cached --exit-code': 
+	test_must_fail git diff --cached --exit-code HEAD &&
+	test_must_fail git diff-index --cached --exit-code HEAD
+
+diff --git a/a/d b/a/d
+index 8d1c8b6..1a4baf5 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+- 
++  
+:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
+ok 4 - diff-index --cached --exit-code
+
+expecting success of 4040.5 'diff-index -b -p --cached --exit-code': 
+	git diff -b --cached --exit-code HEAD &&
+	git diff-index -b -p --cached --exit-code HEAD
+
+ok 5 - diff-index -b -p --cached --exit-code
+
+expecting success of 4040.6 'diff-index --exit-code': 
+	test_must_fail git diff --exit-code HEAD &&
+	test_must_fail git diff-index --exit-code HEAD
+
+diff --git a/a/d b/a/d
+index 8d1c8b6..1a4baf5 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+- 
++  
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 6 - diff-index --exit-code
+
+expecting success of 4040.7 'diff-index -b -p --exit-code': 
+	git diff -b --exit-code HEAD &&
+	git diff-index -b -p --exit-code HEAD
+
+ok 7 - diff-index -b -p --exit-code
+
+expecting success of 4040.8 'diff-files --exit-code': 
+	test_must_fail git diff --exit-code &&
+	test_must_fail git diff-files --exit-code
+
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 8 - diff-files --exit-code
+
+expecting success of 4040.9 'diff-files -b -p --exit-code': 
+	git diff -b --exit-code &&
+	git diff-files -b -p --exit-code
+
+ok 9 - diff-files -b -p --exit-code
+
+expecting success of 4040.10 'diff-files --diff-filter --quiet': 
+	git reset --hard &&
+	rm a/d &&
+	echo x >>b/e &&
+	test_must_fail git diff-files --diff-filter=M --quiet
+
+HEAD is now at 13a0478 second
+ok 10 - diff-files --diff-filter --quiet
+
+expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
+	git commit -a -m "worktree state" &&
+	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+
+[master c0a31dc] worktree state
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a/d
+ok 11 - diff-tree --diff-filter --quiet
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4044-diff-index-unique-abbrev.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4044-diff-index-unique-abbrev/.git/
+expecting success of 4044.1 'setup': 
+	test_oid_cache <<-EOF &&
+	val1 sha1:4827
+	val1 sha256:5664
+
+	val2 sha1:11742
+	val2 sha256:10625
+
+	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
+	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
+
+	hasht1 sha1:51d27384
+	hasht1 sha256:ae31dfff
+
+	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
+	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
+
+	hasht2 sha1:51d2738e
+	hasht2 sha256:ae31dffa
+	EOF
+
+	cat >expect_initial <<-EOF &&
+	100644 blob $(test_oid hash1)	foo
+	EOF
+
+	cat >expect_update <<-EOF &&
+	100644 blob $(test_oid hash2)	foo
+	EOF
+
+	test_oid val1 > foo &&
+	git add foo &&
+	git commit -m "initial" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_initial actual &&
+	test_oid val2 > foo &&
+	git commit -a -m "update" &&
+	git cat-file -p HEAD: > actual &&
+	test_cmp expect_update actual
+
+[master (root-commit) eaa2693] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 90cb371] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4044.2 'diff does not produce ambiguous index line': 
+	git diff HEAD^..HEAD | grep index > actual &&
+	test_cmp expect actual
+
+ok 2 - diff does not produce ambiguous index line
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4042-diff-textconv-caching.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4042-diff-textconv-caching/.git/
+expecting success of 4042.1 'setup': 
+	echo foo content 1 >foo.bin &&
+	echo bar content 1 >bar.bin &&
+	git add . &&
+	git commit -m one &&
+	foo1=$(git rev-parse --short HEAD:foo.bin) &&
+	bar1=$(git rev-parse --short HEAD:bar.bin) &&
+	echo foo content 2 >foo.bin &&
+	echo bar content 2 >bar.bin &&
+	git commit -a -m two &&
+	foo2=$(git rev-parse --short HEAD:foo.bin) &&
+	bar2=$(git rev-parse --short HEAD:bar.bin) &&
+	echo "*.bin diff=magic" >.gitattributes &&
+	git config diff.magic.textconv ./helper &&
+	git config diff.magic.cachetextconv true
+
+[master (root-commit) e62c20e] one
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 bar.bin
+ create mode 100644 foo.bin
+ create mode 100755 helper
+[master ea2ff12] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 4042.2 'first textconv works': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - first textconv works
+
+expecting success of 4042.3 'cached textconv produces same output': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 3 - cached textconv produces same output
+
+expecting success of 4042.4 'cached textconv does not run helper': 
+	rm -f helper.out &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual &&
+	! test -r helper.out
+
+ok 4 - cached textconv does not run helper
+
+expecting success of 4042.5 'changing textconv invalidates cache': 
+	echo other >other &&
+	git config diff.magic.textconv "./helper other" &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 5 - changing textconv invalidates cache
+
+expecting success of 4042.6 'switching diff driver produces correct results': 
+	git config diff.moremagic.textconv ./helper &&
+	echo foo.bin diff=moremagic >>.gitattributes &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 6 - switching diff driver produces correct results
+
+expecting success of 4042.7 'log notes cache and still use cache for -p': 
+	git log --no-walk -p refs/notes/textconv/magic HEAD
+
+commit 9c639377525bb0485f64e3a844123312ec98541e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    ./helper other
+
+diff --git a/1345db2c9189a61ef9932f66b656afc986bee58f b/1345db2c9189a61ef9932f66b656afc986bee58f
+new file mode 100644
+index 0000000..01b25c5
+--- /dev/null
++++ b/1345db2c9189a61ef9932f66b656afc986bee58f
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 2
+diff --git a/28283d51eeb71548ff81d02404b90103b494b983 b/28283d51eeb71548ff81d02404b90103b494b983
+new file mode 100644
+index 0000000..dcd63a4
+--- /dev/null
++++ b/28283d51eeb71548ff81d02404b90103b494b983
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 2
+diff --git a/d5b9fe314e6004caf906e730045d20689167b3fb b/d5b9fe314e6004caf906e730045d20689167b3fb
+new file mode 100644
+index 0000000..7ef0353
+--- /dev/null
++++ b/d5b9fe314e6004caf906e730045d20689167b3fb
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 1
+diff --git a/fcf91668044fda4a569b9374589b26dada7adc49 b/fcf91668044fda4a569b9374589b26dada7adc49
+new file mode 100644
+index 0000000..5ead606
+--- /dev/null
++++ b/fcf91668044fda4a569b9374589b26dada7adc49
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 1
+
+commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    two
+
+diff --git a/bar.bin b/bar.bin
+index fcf9166..28283d5 100644
+--- a/bar.bin
++++ b/bar.bin
+@@ -1,2 +1,2 @@
+ converted: other
+-converted: bar content 1
++converted: bar content 2
+diff --git a/foo.bin b/foo.bin
+index d5b9fe3..1345db2 100644
+--- a/foo.bin
++++ b/foo.bin
+@@ -1 +1 @@
+-converted: foo content 1
++converted: foo content 2
+ok 7 - log notes cache and still use cache for -p
+
+expecting success of 4042.8 'caching is silently ignored outside repo': 
+	mkdir -p non-repo &&
+	echo one >non-repo/one &&
+	echo two >non-repo/two &&
+	echo "* diff=test" >attr &&
+	test_expect_code 1 \
+	nongit git -c core.attributesFile="$PWD/attr" \
+		   -c diff.test.textconv="tr a-z A-Z <" \
+		   -c diff.test.cachetextconv=true \
+		   diff --no-index one two >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/one b/two
+	index 5626abf..f719efd 100644
+	--- a/one
+	+++ b/two
+	@@ -1 +1 @@
+	-ONE
+	+TWO
+	EOF
+	test_cmp expect actual
+
+ok 8 - caching is silently ignored outside repo
 
 # passed all 8 test(s)
 1..8
@@ -245672,6 +245513,121 @@
 1..131
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4046-diff-unmerged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4046-diff-unmerged/.git/
+expecting success of 4046.1 'setup': 
+	for i in 0 1 2 3
+	do
+		blob=$(echo $i | git hash-object --stdin) &&
+		eval "blob$i=$blob" &&
+		eval "m$i=\"100644 \$blob$i $i\"" || return 1
+	done &&
+	paths= &&
+	for b in o x
+	do
+		for o in o x
+		do
+			for t in o x
+			do
+				path="$b$o$t" &&
+				if test "$path" != ooo
+				then
+					paths="$paths$path " &&
+					p="	$path" &&
+					case "$b" in x) echo "$m1$p" ;; esac &&
+					case "$o" in x) echo "$m2$p" ;; esac &&
+					case "$t" in x) echo "$m3$p" ;; esac ||
+					return 1
+				fi
+			done
+		done
+	done >ls-files-s.expect &&
+	git update-index --index-info <ls-files-s.expect &&
+	git ls-files -s >ls-files-s.actual &&
+	test_cmp ls-files-s.expect ls-files-s.actual
+
+ok 1 - setup
+
+expecting success of 4046.2 'diff-files -0': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" || return 1
+	done >diff-files-0.expect &&
+	git diff-files -0 >diff-files-0.actual &&
+	test_cmp diff-files-0.expect diff-files-0.actual
+
+ok 2 - diff-files -0
+
+expecting success of 4046.3 'diff-files -1': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		x??) echo ":100644 100644 $blob1 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-1.expect &&
+	git diff-files -1 >diff-files-1.actual &&
+	test_cmp diff-files-1.expect diff-files-1.actual
+
+ok 3 - diff-files -1
+
+expecting success of 4046.4 'diff-files -2': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		?x?) echo ":100644 100644 $blob2 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-2.expect &&
+	git diff-files -2 >diff-files-2.actual &&
+	test_cmp diff-files-2.expect diff-files-2.actual &&
+	git diff-files >diff-files-default-2.actual &&
+	test_cmp diff-files-2.expect diff-files-default-2.actual
+
+ok 4 - diff-files -2
+
+expecting success of 4046.5 'diff-files -3': 
+	for path in $paths
+	do
+		>"$path" &&
+		echo ":000000 100644 $ZERO_OID $ZERO_OID U	$path" &&
+		case "$path" in
+		??x) echo ":100644 100644 $blob3 $ZERO_OID M	$path"
+		esac || return 1
+	done >diff-files-3.expect &&
+	git diff-files -3 >diff-files-3.actual &&
+	test_cmp diff-files-3.expect diff-files-3.actual
+
+ok 5 - diff-files -3
+
+expecting success of 4046.6 'diff --stat': 
+	for path in $paths
+	do
+		echo " $path | Unmerged" || return 1
+	done >diff-stat.expect &&
+	echo " 0 files changed" >>diff-stat.expect &&
+	git diff --cached --stat >diff-stat.actual &&
+	test_cmp diff-stat.expect diff-stat.actual
+
+ok 6 - diff --stat
+
+expecting success of 4046.7 'diff --quiet': 
+	test_expect_code 1 git diff --cached --quiet
+
+ok 7 - diff --quiet
+
+expecting success of 4046.8 'diff --quiet --ignore-all-space': 
+	test_expect_code 1 git diff --cached --quiet --ignore-all-space
+
+ok 8 - diff --quiet --ignore-all-space
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4049-diff-stat-count.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4049-diff-stat-count/.git/
 expecting success of 4049.1 'setup': 
@@ -247188,8 +247144,8 @@
 Auto-merging subdir/file0
 CONFLICT (content): Merge conflict in subdir/file0
 Automatic merge failed; fix conflicts and then commit the result.
---- expected	2026-04-19 19:19:31.731659440 +0000
-+++ out	2026-04-19 19:19:31.755659440 +0000
+--- expected	2025-03-17 13:22:03.360977039 +0000
++++ out	2025-03-17 13:22:03.384977191 +0000
 @@ -1,7 +1,7 @@
 -diff --cc file0
 +diff --cc subdir/file0
@@ -247310,118 +247266,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4055-diff-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4055-diff-context/.git/
-expecting success of 4055.1 'setup': 
-	cat >template <<-\EOF &&
-	firstline
-	b
-	c
-	d
-	e
-	f
-	preline
-	TARGET
-	postline
-	i
-	j
-	k
-	l
-	m
-	n
-	EOF
-	sed "/TARGET/d" >x <template &&
-	git update-index --add x &&
-	git commit -m initial &&
-
-	sed "s/TARGET/ADDED/" >x <template &&
-	git update-index --add x &&
-	git commit -m next &&
-
-	sed "s/TARGET/MODIFIED/" >x <template
-
-[master (root-commit) aee64db] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 14 insertions(+)
- create mode 100644 x
-[master 4ef1dc5] next
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 4055.2 'the default number of context lines is 3': 
-	git diff >output &&
-	! grep "^ d" output &&
-	grep "^ e" output &&
-	grep "^ j" output &&
-	! grep "^ k" output
-
- e
- j
-ok 2 - the default number of context lines is 3
-
-expecting success of 4055.3 'diff.context honored by "log"': 
-	git log -1 -p >output &&
-	! grep firstline output &&
-	git config diff.context 8 &&
-	git log -1 -p >output &&
-	grep "^ firstline" output
-
- firstline
-ok 3 - diff.context honored by "log"
-
-expecting success of 4055.4 'The -U option overrides diff.context': 
-	git config diff.context 8 &&
-	git log -U4 -1 >output &&
-	! grep "^ firstline" output
-
-ok 4 - The -U option overrides diff.context
-
-expecting success of 4055.5 'diff.context honored by "diff"': 
-	git config diff.context 8 &&
-	git diff >output &&
-	grep "^ firstline" output
-
- firstline
-ok 5 - diff.context honored by "diff"
-
-expecting success of 4055.6 'plumbing not affected': 
-	git config diff.context 8 &&
-	git diff-files -p >output &&
-	! grep "^ firstline" output
-
-ok 6 - plumbing not affected
-
-expecting success of 4055.7 'non-integer config parsing': 
-	git config diff.context no &&
-	test_must_fail git diff 2>output &&
-	test_grep "bad numeric config value" output
-
-fatal: bad numeric config value 'no' for 'diff.context' in file .git/config: invalid unit
-ok 7 - non-integer config parsing
-
-expecting success of 4055.8 'negative integer config parsing': 
-	git config diff.context -1 &&
-	test_must_fail git diff 2>output &&
-	test_grep "bad config variable" output
-
-fatal: bad config variable 'diff.context' in file '.git/config' at line 7
-ok 8 - negative integer config parsing
-
-expecting success of 4055.9 '-U0 is valid, so is diff.context=0': 
-	git config diff.context 0 &&
-	git diff >output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output
-
--ADDED
-+MODIFIED
-ok 9 - -U0 is valid, so is diff.context=0
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4051-diff-function-context.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4051-diff-function-context/.git/
 expecting success of 4051.1 'setup': 
@@ -247787,6 +247631,474 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4055-diff-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4055-diff-context/.git/
+expecting success of 4055.1 'setup': 
+	cat >template <<-\EOF &&
+	firstline
+	b
+	c
+	d
+	e
+	f
+	preline
+	TARGET
+	postline
+	i
+	j
+	k
+	l
+	m
+	n
+	EOF
+	sed "/TARGET/d" >x <template &&
+	git update-index --add x &&
+	git commit -m initial &&
+
+	sed "s/TARGET/ADDED/" >x <template &&
+	git update-index --add x &&
+	git commit -m next &&
+
+	sed "s/TARGET/MODIFIED/" >x <template
+
+[master (root-commit) aee64db] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 14 insertions(+)
+ create mode 100644 x
+[master 4ef1dc5] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 4055.2 'the default number of context lines is 3': 
+	git diff >output &&
+	! grep "^ d" output &&
+	grep "^ e" output &&
+	grep "^ j" output &&
+	! grep "^ k" output
+
+ e
+ j
+ok 2 - the default number of context lines is 3
+
+expecting success of 4055.3 'diff.context honored by "log"': 
+	git log -1 -p >output &&
+	! grep firstline output &&
+	git config diff.context 8 &&
+	git log -1 -p >output &&
+	grep "^ firstline" output
+
+ firstline
+ok 3 - diff.context honored by "log"
+
+expecting success of 4055.4 'The -U option overrides diff.context': 
+	git config diff.context 8 &&
+	git log -U4 -1 >output &&
+	! grep "^ firstline" output
+
+ok 4 - The -U option overrides diff.context
+
+expecting success of 4055.5 'diff.context honored by "diff"': 
+	git config diff.context 8 &&
+	git diff >output &&
+	grep "^ firstline" output
+
+ firstline
+ok 5 - diff.context honored by "diff"
+
+expecting success of 4055.6 'plumbing not affected': 
+	git config diff.context 8 &&
+	git diff-files -p >output &&
+	! grep "^ firstline" output
+
+ok 6 - plumbing not affected
+
+expecting success of 4055.7 'non-integer config parsing': 
+	git config diff.context no &&
+	test_must_fail git diff 2>output &&
+	test_grep "bad numeric config value" output
+
+fatal: bad numeric config value 'no' for 'diff.context' in file .git/config: invalid unit
+ok 7 - non-integer config parsing
+
+expecting success of 4055.8 'negative integer config parsing': 
+	git config diff.context -1 &&
+	test_must_fail git diff 2>output &&
+	test_grep "bad config variable" output
+
+fatal: bad config variable 'diff.context' in file '.git/config' at line 7
+ok 8 - negative integer config parsing
+
+expecting success of 4055.9 '-U0 is valid, so is diff.context=0': 
+	git config diff.context 0 &&
+	git diff >output &&
+	grep "^-ADDED" output &&
+	grep "^+MODIFIED" output
+
+-ADDED
++MODIFIED
+ok 9 - -U0 is valid, so is diff.context=0
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4053-diff-no-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4053-diff-no-index/.git/
+expecting success of 4053.1 'setup': 
+	mkdir a &&
+	mkdir b &&
+	echo 1 >a/1 &&
+	echo 2 >a/2 &&
+	git init repo &&
+	echo 1 >repo/a &&
+	mkdir -p non/git &&
+	echo 1 >non/git/a &&
+	echo 1 >non/git/b
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4053-diff-no-index/repo/.git/
+ok 1 - setup
+
+expecting success of 4053.2 'git diff --no-index --exit-code': 
+	git diff --no-index --exit-code a/1 non/git/a &&
+	test_expect_code 1 git diff --no-index --exit-code a/1 a/2
+
+diff --git a/a/1 b/a/2
+index d00491f..0cfbf08 100644
+--- a/a/1
++++ b/a/2
+@@ -1 +1 @@
+-1
++2
+ok 2 - git diff --no-index --exit-code
+
+expecting success of 4053.3 'git diff --no-index directories': 
+	test_expect_code 1 git diff --no-index a b >cnt &&
+	test_line_count = 14 cnt
+
+ok 3 - git diff --no-index directories
+
+expecting success of 4053.4 'git diff --no-index relative path outside repo': 
+	(
+		cd repo &&
+		test_expect_code 0 git diff --no-index a ../non/git/a &&
+		test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
+	)
+
+ok 4 - git diff --no-index relative path outside repo
+
+expecting success of 4053.5 'git diff --no-index with broken index': 
+	(
+		cd repo &&
+		echo broken >.git/index &&
+		git diff --no-index a ../non/git/a
+	)
+
+ok 5 - git diff --no-index with broken index
+
+expecting success of 4053.6 'git diff outside repo with broken index': 
+	(
+		cd repo &&
+		git diff ../non/git/a ../non/git/b
+	)
+
+ok 6 - git diff outside repo with broken index
+
+expecting success of 4053.7 'git diff --no-index executed outside repo gives correct error message': 
+	(
+		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd non/git &&
+		test_must_fail git diff --no-index a 2>actual.err &&
+		test_grep "usage: git diff --no-index" actual.err
+	)
+
+usage: git diff --no-index [<options>] <path> <path>
+ok 7 - git diff --no-index executed outside repo gives correct error message
+
+expecting success of 4053.8 'diff D F and diff F D': 
+	(
+		cd repo &&
+		echo in-repo >a &&
+		echo non-repo >../non/git/a &&
+		mkdir sub &&
+		echo sub-repo >sub/a &&
+
+		test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
+		test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
+		test_cmp expect actual &&
+
+		test_must_fail git diff --no-index a ../non/git/a >expect &&
+		test_must_fail git diff --no-index a ../non/git/ >actual &&
+		test_cmp expect actual &&
+
+		test_must_fail git diff --no-index ../non/git/a a >expect &&
+		test_must_fail git diff --no-index ../non/git a >actual &&
+		test_cmp expect actual
+	)
+
+ok 8 - diff D F and diff F D
+
+expecting success of 4053.9 'turning a file into a directory': 
+	(
+		cd non/git &&
+		mkdir d e e/sub &&
+		echo 1 >d/sub &&
+		echo 2 >e/sub/file &&
+		printf "D\td/sub\nA\te/sub/file\n" >expect &&
+		test_must_fail git diff --no-index --name-status d e >actual &&
+		test_cmp expect actual
+	)
+
+ok 9 - turning a file into a directory
+
+expecting success of 4053.10 'diff from repo subdir shows real paths (explicit)': 
+	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff --no-index ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 10 - diff from repo subdir shows real paths (explicit)
+
+expecting success of 4053.11 'diff from repo subdir shows real paths (implicit)': 
+	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 11 - diff from repo subdir shows real paths (implicit)
+
+expecting success of 4053.12 'diff --no-index from repo subdir respects config (explicit)': 
+	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
+	test_config -C repo diff.noprefix true &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff --no-index ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 12 - diff --no-index from repo subdir respects config (explicit)
+
+expecting success of 4053.13 'diff --no-index from repo subdir respects config (implicit)': 
+	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
+	test_config -C repo diff.noprefix true &&
+	test_expect_code 1 \
+		git -C repo/sub \
+		diff ../../non/git/a ../../non/git/b >actual &&
+	head -n 1 <actual >actual.head &&
+	test_cmp expect actual.head
+
+ok 13 - diff --no-index from repo subdir respects config (implicit)
+
+expecting success of 4053.14 'diff --no-index from repo subdir with absolute paths': 
+	cat <<-EOF >expect &&
+	1	1	$(pwd)/non/git/{a => b}
+	EOF
+	test_expect_code 1 \
+		git -C repo/sub diff --numstat \
+		"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
+	test_cmp expect actual
+
+ok 14 - diff --no-index from repo subdir with absolute paths
+
+expecting success of 4053.15 'diff --no-index allows external diff': 
+	test_expect_code 1 \
+		env GIT_EXTERNAL_DIFF="echo external ;:" \
+		git diff --no-index non/git/a non/git/b >actual &&
+	echo external >expect &&
+	test_cmp expect actual
+
+ok 15 - diff --no-index allows external diff
+
+expecting success of 4053.16 'diff --no-index normalizes mode: no changes': 
+	echo foo >x &&
+	cp x y &&
+	git diff --no-index x y >out &&
+	test_must_be_empty out
+
+ok 16 - diff --no-index normalizes mode: no changes
+
+expecting success of 4053.17 'diff --no-index normalizes mode: chmod +x': 
+	chmod +x y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+
+ok 17 - diff --no-index normalizes mode: chmod +x
+
+expecting success of 4053.18 'diff --no-index normalizes: mode not like git mode': 
+	chmod 666 x &&
+	chmod 777 y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+
+ok 18 - diff --no-index normalizes: mode not like git mode
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 4053.19 'diff --no-index normalizes: mode not like git mode (symlink)': 
+	ln -s y z &&
+	X_OID=$(git hash-object --stdin <x) &&
+	Z_OID=$(printf y | git hash-object --stdin) &&
+	cat >expected <<-EOF &&
+	diff --git a/x b/x
+	deleted file mode 100644
+	index $X_OID..$ZERO_OID
+	--- a/x
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo
+	diff --git a/z b/z
+	new file mode 120000
+	index $ZERO_OID..$Z_OID
+	--- /dev/null
+	+++ b/z
+	@@ -0,0 +1 @@
+	+y
+	\ No newline at end of file
+	EOF
+	test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
+	test_cmp expected actual
+
+ok 19 - diff --no-index normalizes: mode not like git mode (symlink)
+
+expecting success of 4053.20 'external diff with mode-only change': 
+	echo content >not-executable &&
+	echo content >executable &&
+	chmod +x executable &&
+	echo executable executable $(test_oid zero) 100755 \
+		not-executable $(test_oid zero) 100644 not-executable \
+		>expect &&
+	test_expect_code 1 git -c diff.external=echo diff \
+		--no-index executable not-executable >actual &&
+	test_cmp expect actual
+
+ok 20 - external diff with mode-only change
+
+expecting success of 4053.21 'diff --no-index treats '-' as stdin': 
+	cat >expect <<-EOF &&
+	diff --git a/- b/a/1
+	index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
+	--- a/-
+	+++ b/a/1
+	@@ -1 +1 @@
+	-x
+	+1
+	EOF
+
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
+	test_cmp expect actual &&
+
+	test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
+	test_must_be_empty actual
+
+ok 21 - diff --no-index treats '-' as stdin
+
+expecting success of 4053.22 'diff --no-index -R treats '-' as stdin': 
+	cat >expect <<-EOF &&
+	diff --git b/a/1 a/-
+	index $(git hash-object --stdin <a/1)..$ZERO_OID 100644
+	--- b/a/1
+	+++ a/-
+	@@ -1 +1 @@
+	-1
+	+x
+	EOF
+
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
+	test_cmp expect actual &&
+
+	test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
+	test_must_be_empty actual
+
+ok 22 - diff --no-index -R treats '-' as stdin
+
+expecting success of 4053.23 'diff --no-index refuses to diff stdin and a directory': 
+	test_must_fail git diff --no-index -- - a </dev/null 2>err &&
+	grep "fatal: cannot compare stdin to a directory" err
+
+fatal: cannot compare stdin to a directory
+ok 23 - diff --no-index refuses to diff stdin and a directory
+
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+expecting success of 4053.24 'diff --no-index refuses to diff a named pipe and a directory': 
+	test_when_finished "rm -f pipe" &&
+	mkfifo pipe &&
+	test_must_fail git diff --no-index -- pipe a 2>err &&
+	grep "fatal: cannot compare a named pipe to a directory" err
+
+fatal: cannot compare a named pipe to a directory
+ok 24 - diff --no-index refuses to diff a named pipe and a directory
+
+expecting success of 4053.25 'diff --no-index reads from pipes': 
+	test_when_finished "rm -f old new new-link" &&
+	mkfifo old &&
+	mkfifo new &&
+	ln -s new new-link &&
+	{
+		(test_write_lines a b c >old) &
+	} &&
+	test_when_finished "kill $! || :" &&
+	{
+		(test_write_lines a x c >new) &
+	} &&
+	test_when_finished "kill $! || :" &&
+
+	cat >expect <<-EOF &&
+	diff --git a/old b/new-link
+	--- a/old
+	+++ b/new-link
+	@@ -1,3 +1,3 @@
+	 a
+	-b
+	+x
+	 c
+	EOF
+
+	test_expect_code 1 git diff --no-index old new-link >actual &&
+	test_cmp expect actual
+
+./test-lib.sh: line 1006: kill: (3167747) - No such process
+./test-lib.sh: line 1007: kill: (3167746) - No such process
+ok 25 - diff --no-index reads from pipes
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4034-diff-words.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4034-diff-words/.git/
 expecting success of 4034.1 'setup': 
@@ -248902,8 +249214,8 @@
 [detached HEAD 22de592] empty3
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
---- .tmp-1	2026-04-19 19:19:31.015659440 +0000
-+++ .tmp-2	2026-04-19 19:19:31.027659440 +0000
+--- .tmp-1	2025-03-17 13:22:03.328976837 +0000
++++ .tmp-2	2025-03-17 13:22:03.348976963 +0000
 @@ -1,8 +1,9 @@
  -- 3
  ---1
@@ -249214,364 +249526,6 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4053-diff-no-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4053-diff-no-index/.git/
-expecting success of 4053.1 'setup': 
-	mkdir a &&
-	mkdir b &&
-	echo 1 >a/1 &&
-	echo 2 >a/2 &&
-	git init repo &&
-	echo 1 >repo/a &&
-	mkdir -p non/git &&
-	echo 1 >non/git/a &&
-	echo 1 >non/git/b
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4053-diff-no-index/repo/.git/
-ok 1 - setup
-
-expecting success of 4053.2 'git diff --no-index --exit-code': 
-	git diff --no-index --exit-code a/1 non/git/a &&
-	test_expect_code 1 git diff --no-index --exit-code a/1 a/2
-
-diff --git a/a/1 b/a/2
-index d00491f..0cfbf08 100644
---- a/a/1
-+++ b/a/2
-@@ -1 +1 @@
--1
-+2
-ok 2 - git diff --no-index --exit-code
-
-expecting success of 4053.3 'git diff --no-index directories': 
-	test_expect_code 1 git diff --no-index a b >cnt &&
-	test_line_count = 14 cnt
-
-ok 3 - git diff --no-index directories
-
-expecting success of 4053.4 'git diff --no-index relative path outside repo': 
-	(
-		cd repo &&
-		test_expect_code 0 git diff --no-index a ../non/git/a &&
-		test_expect_code 0 git diff --no-index ../non/git/a ../non/git/b
-	)
-
-ok 4 - git diff --no-index relative path outside repo
-
-expecting success of 4053.5 'git diff --no-index with broken index': 
-	(
-		cd repo &&
-		echo broken >.git/index &&
-		git diff --no-index a ../non/git/a
-	)
-
-ok 5 - git diff --no-index with broken index
-
-expecting success of 4053.6 'git diff outside repo with broken index': 
-	(
-		cd repo &&
-		git diff ../non/git/a ../non/git/b
-	)
-
-ok 6 - git diff outside repo with broken index
-
-expecting success of 4053.7 'git diff --no-index executed outside repo gives correct error message': 
-	(
-		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd non/git &&
-		test_must_fail git diff --no-index a 2>actual.err &&
-		test_grep "usage: git diff --no-index" actual.err
-	)
-
-usage: git diff --no-index [<options>] <path> <path>
-ok 7 - git diff --no-index executed outside repo gives correct error message
-
-expecting success of 4053.8 'diff D F and diff F D': 
-	(
-		cd repo &&
-		echo in-repo >a &&
-		echo non-repo >../non/git/a &&
-		mkdir sub &&
-		echo sub-repo >sub/a &&
-
-		test_must_fail git diff --no-index sub/a ../non/git/a >expect &&
-		test_must_fail git diff --no-index sub/a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index a ../non/git/a >expect &&
-		test_must_fail git diff --no-index a ../non/git/ >actual &&
-		test_cmp expect actual &&
-
-		test_must_fail git diff --no-index ../non/git/a a >expect &&
-		test_must_fail git diff --no-index ../non/git a >actual &&
-		test_cmp expect actual
-	)
-
-ok 8 - diff D F and diff F D
-
-expecting success of 4053.9 'turning a file into a directory': 
-	(
-		cd non/git &&
-		mkdir d e e/sub &&
-		echo 1 >d/sub &&
-		echo 2 >e/sub/file &&
-		printf "D\td/sub\nA\te/sub/file\n" >expect &&
-		test_must_fail git diff --no-index --name-status d e >actual &&
-		test_cmp expect actual
-	)
-
-ok 9 - turning a file into a directory
-
-expecting success of 4053.10 'diff from repo subdir shows real paths (explicit)': 
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 10 - diff from repo subdir shows real paths (explicit)
-
-expecting success of 4053.11 'diff from repo subdir shows real paths (implicit)': 
-	echo "diff --git a/../../non/git/a b/../../non/git/b" >expect &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 11 - diff from repo subdir shows real paths (implicit)
-
-expecting success of 4053.12 'diff --no-index from repo subdir respects config (explicit)': 
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff --no-index ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 12 - diff --no-index from repo subdir respects config (explicit)
-
-expecting success of 4053.13 'diff --no-index from repo subdir respects config (implicit)': 
-	echo "diff --git ../../non/git/a ../../non/git/b" >expect &&
-	test_config -C repo diff.noprefix true &&
-	test_expect_code 1 \
-		git -C repo/sub \
-		diff ../../non/git/a ../../non/git/b >actual &&
-	head -n 1 <actual >actual.head &&
-	test_cmp expect actual.head
-
-ok 13 - diff --no-index from repo subdir respects config (implicit)
-
-expecting success of 4053.14 'diff --no-index from repo subdir with absolute paths': 
-	cat <<-EOF >expect &&
-	1	1	$(pwd)/non/git/{a => b}
-	EOF
-	test_expect_code 1 \
-		git -C repo/sub diff --numstat \
-		"$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
-	test_cmp expect actual
-
-ok 14 - diff --no-index from repo subdir with absolute paths
-
-expecting success of 4053.15 'diff --no-index allows external diff': 
-	test_expect_code 1 \
-		env GIT_EXTERNAL_DIFF="echo external ;:" \
-		git diff --no-index non/git/a non/git/b >actual &&
-	echo external >expect &&
-	test_cmp expect actual
-
-ok 15 - diff --no-index allows external diff
-
-expecting success of 4053.16 'diff --no-index normalizes mode: no changes': 
-	echo foo >x &&
-	cp x y &&
-	git diff --no-index x y >out &&
-	test_must_be_empty out
-
-ok 16 - diff --no-index normalizes mode: no changes
-
-expecting success of 4053.17 'diff --no-index normalizes mode: chmod +x': 
-	chmod +x y &&
-	cat >expected <<-\EOF &&
-	diff --git a/x b/y
-	old mode 100644
-	new mode 100755
-	EOF
-	test_expect_code 1 git diff --no-index x y >actual &&
-	test_cmp expected actual
-
-ok 17 - diff --no-index normalizes mode: chmod +x
-
-expecting success of 4053.18 'diff --no-index normalizes: mode not like git mode': 
-	chmod 666 x &&
-	chmod 777 y &&
-	cat >expected <<-\EOF &&
-	diff --git a/x b/y
-	old mode 100644
-	new mode 100755
-	EOF
-	test_expect_code 1 git diff --no-index x y >actual &&
-	test_cmp expected actual
-
-ok 18 - diff --no-index normalizes: mode not like git mode
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 4053.19 'diff --no-index normalizes: mode not like git mode (symlink)': 
-	ln -s y z &&
-	X_OID=$(git hash-object --stdin <x) &&
-	Z_OID=$(printf y | git hash-object --stdin) &&
-	cat >expected <<-EOF &&
-	diff --git a/x b/x
-	deleted file mode 100644
-	index $X_OID..$ZERO_OID
-	--- a/x
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo
-	diff --git a/z b/z
-	new file mode 120000
-	index $ZERO_OID..$Z_OID
-	--- /dev/null
-	+++ b/z
-	@@ -0,0 +1 @@
-	+y
-	\ No newline at end of file
-	EOF
-	test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
-	test_cmp expected actual
-
-ok 19 - diff --no-index normalizes: mode not like git mode (symlink)
-
-expecting success of 4053.20 'external diff with mode-only change': 
-	echo content >not-executable &&
-	echo content >executable &&
-	chmod +x executable &&
-	echo executable executable $(test_oid zero) 100755 \
-		not-executable $(test_oid zero) 100644 not-executable \
-		>expect &&
-	test_expect_code 1 git -c diff.external=echo diff \
-		--no-index executable not-executable >actual &&
-	test_cmp expect actual
-
-ok 20 - external diff with mode-only change
-
-expecting success of 4053.21 'diff --no-index treats '-' as stdin': 
-	cat >expect <<-EOF &&
-	diff --git a/- b/a/1
-	index $ZERO_OID..$(git hash-object --stdin <a/1) 100644
-	--- a/-
-	+++ b/a/1
-	@@ -1 +1 @@
-	-x
-	+1
-	EOF
-
-	test_write_lines x | test_expect_code 1 \
-		git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
-	test_cmp expect actual &&
-
-	test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
-	test_must_be_empty actual
-
-ok 21 - diff --no-index treats '-' as stdin
-
-expecting success of 4053.22 'diff --no-index -R treats '-' as stdin': 
-	cat >expect <<-EOF &&
-	diff --git b/a/1 a/-
-	index $(git hash-object --stdin <a/1)..$ZERO_OID 100644
-	--- b/a/1
-	+++ a/-
-	@@ -1 +1 @@
-	-1
-	+x
-	EOF
-
-	test_write_lines x | test_expect_code 1 \
-		git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
-	test_cmp expect actual &&
-
-	test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
-	test_must_be_empty actual
-
-ok 22 - diff --no-index -R treats '-' as stdin
-
-expecting success of 4053.23 'diff --no-index refuses to diff stdin and a directory': 
-	test_must_fail git diff --no-index -- - a </dev/null 2>err &&
-	grep "fatal: cannot compare stdin to a directory" err
-
-fatal: cannot compare stdin to a directory
-ok 23 - diff --no-index refuses to diff stdin and a directory
-
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-expecting success of 4053.24 'diff --no-index refuses to diff a named pipe and a directory': 
-	test_when_finished "rm -f pipe" &&
-	mkfifo pipe &&
-	test_must_fail git diff --no-index -- pipe a 2>err &&
-	grep "fatal: cannot compare a named pipe to a directory" err
-
-fatal: cannot compare a named pipe to a directory
-ok 24 - diff --no-index refuses to diff a named pipe and a directory
-
-expecting success of 4053.25 'diff --no-index reads from pipes': 
-	test_when_finished "rm -f old new new-link" &&
-	mkfifo old &&
-	mkfifo new &&
-	ln -s new new-link &&
-	{
-		(test_write_lines a b c >old) &
-	} &&
-	test_when_finished "kill $! || :" &&
-	{
-		(test_write_lines a x c >new) &
-	} &&
-	test_when_finished "kill $! || :" &&
-
-	cat >expect <<-EOF &&
-	diff --git a/old b/new-link
-	--- a/old
-	+++ b/new-link
-	@@ -1,3 +1,3 @@
-	 a
-	-b
-	+x
-	 c
-	EOF
-
-	test_expect_code 1 git diff --no-index old new-link >actual &&
-	test_cmp expect actual
-
-t4053-diff-no-index.sh: 3: kill: No such process
-
-t4053-diff-no-index.sh: 4: kill: No such process
-
-ok 25 - diff --no-index reads from pipes
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4047-diff-dirstat.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4047-diff-dirstat/.git/
 expecting success of 4047.1 'setup': 
@@ -250568,41 +250522,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4062-diff-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4062-diff-pickaxe/.git/
-expecting success of 4062.1 'setup': 
-	test_commit initial &&
-	printf "%04096d" 0 >4096-zeroes.txt &&
-	git add 4096-zeroes.txt &&
-	test_tick &&
-	git commit -m "A 4k file"
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 98d74df] A 4k file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4096-zeroes.txt
-ok 1 - setup
-
-expecting success of 4062.2 '-G matches': 
-	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 2 - -G matches
-
-expecting success of 4062.3 '-S --pickaxe-regex': 
-	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 3 - -S --pickaxe-regex
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4057-diff-combined-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4057-diff-combined-paths/.git/
 expecting success of 4057.1 'trivial merge - combine-diff empty': 
@@ -250996,6 +250915,41 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4062-diff-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4062-diff-pickaxe/.git/
+expecting success of 4062.1 'setup': 
+	test_commit initial &&
+	printf "%04096d" 0 >4096-zeroes.txt &&
+	git add 4096-zeroes.txt &&
+	test_tick &&
+	git commit -m "A 4k file"
+
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[master 98d74df] A 4k file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4096-zeroes.txt
+ok 1 - setup
+
+expecting success of 4062.2 '-G matches': 
+	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
+
+ok 2 - -G matches
+
+expecting success of 4062.3 '-S --pickaxe-regex': 
+	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
+
+ok 3 - -S --pickaxe-regex
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4063-diff-blobs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4063-diff-blobs/.git/
 expecting success of 4063.1 'create some blobs': 
@@ -251133,110 +251087,124 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4059-diff-submodule-not-initialized.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/.git/
-expecting success of 4059.1 'setup - submodules': 
-	test_create_repo sm2 &&
-	add_file . foo &&
-	add_file sm2 foo1 foo2 &&
-	smhead1=$(git -C sm2 rev-parse --short --verify HEAD)
+*** t4065-diff-anchored.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4065-diff-anchored/.git/
+expecting success of 4065.1 '--anchored': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
-36d39d8
-1beffeb
-ok 1 - setup - submodules
+	# normally, c is moved to produce the smallest diff
+	test_expect_code 1 git diff --no-index pre post >diff &&
+	grep "^+c" diff &&
 
-expecting success of 4059.2 'setup - git submodule add': 
-	git -c protocol.file.allow=always submodule add ./sm2 sm1 &&
-	commit_file sm1 .gitmodules &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$smhead1 (new submodule)
-	EOF
-	test_cmp expected actual
+	# with anchor, a is moved
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+a" diff
 
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
-done.
-ok 2 - setup - git submodule add
++c
++a
+ok 1 - --anchored
 
-expecting success of 4059.3 'submodule directory removed': 
-	rm -rf sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$smhead1 (new submodule)
-	EOF
-	test_cmp expected actual
+expecting success of 4065.2 '--anchored multiple': 
+	printf "a\nb\nc\nd\ne\nf\n" >pre &&
+	printf "c\na\nb\nf\nd\ne\n" >post &&
 
-ok 3 - submodule directory removed
+	# with 1 anchor, c is not moved, but f is moved
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+a" diff && # a is moved instead of c
+	grep "^+f" diff &&
 
-expecting success of 4059.4 'setup - submodule multiple commits': 
-	git submodule update --checkout sm1 &&
-	smhead2=$(add_file sm1 foo3 foo4) &&
-	commit_file sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1..$smhead2:
-	  > Add foo4 ($added foo4)
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
+	# with 2 anchors, c and f are not moved
+	test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
+	grep "^+a" diff &&
+	grep "^+d" diff # d is moved instead of f
 
-Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
-ok 4 - setup - submodule multiple commits
++a
++f
++a
++d
+ok 2 - --anchored multiple
 
-expecting success of 4059.5 'submodule removed multiple commits': 
-	rm -rf sm1 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1..$smhead2:
-	  > Add foo4 ($added foo4)
-	  > Add foo3 ($added foo3)
-	EOF
-	test_cmp expected actual
+expecting success of 4065.3 '--anchored with nonexistent line has no effect': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
 
-ok 5 - submodule removed multiple commits
+	test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
+	grep "^+c" diff
 
-expecting success of 4059.6 'submodule not initialized in new clone': 
-	git clone . sm3 &&
-	git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $smhead1...$smhead2 (commits not present)
-	EOF
-	test_cmp expected actual
++c
+ok 3 - --anchored with nonexistent line has no effect
 
-Cloning into 'sm3'...
-done.
-ok 6 - submodule not initialized in new clone
+expecting success of 4065.4 '--anchored with non-unique line has no effect': 
+	printf "a\nb\nc\nd\ne\nc\n" >pre &&
+	printf "c\na\nb\nc\nd\ne\n" >post &&
 
-expecting success of 4059.7 'setup submodule moved': 
-	git submodule update --checkout sm1 &&
-	git mv sm1 sm4 &&
-	commit_file sm4 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm4 0000000...$smhead2 (new submodule)
-	EOF
-	test_cmp expected actual
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+c" diff
 
-Submodule path 'sm1': checked out 'b762e6a22f976e7e5d55bfe47bb4c4694f97a64c'
-ok 7 - setup submodule moved
++c
+ok 4 - --anchored with non-unique line has no effect
 
-expecting success of 4059.8 'submodule moved then removed': 
-	smhead3=$(add_file sm4 foo6 foo7) &&
-	commit_file sm4 &&
-	rm -rf sm4 &&
-	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm4 $smhead2..$smhead3:
-	  > Add foo7 ($added foo7)
-	  > Add foo6 ($added foo6)
-	EOF
-	test_cmp expected actual
+expecting success of 4065.5 'diff still produced with impossible multiple --anchored': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
 
-ok 8 - submodule moved then removed
+	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
+	mv post expected_post &&
 
-# passed all 8 test(s)
-1..8
+	# Ensure that the diff is correct by applying it and then
+	# comparing the result with the original
+	git apply diff &&
+	diff expected_post post
+
+ok 5 - diff still produced with impossible multiple --anchored
+
+expecting success of 4065.6 'later algorithm arguments override earlier ones': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
+
+	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
+	grep "^+a" diff &&
+
+	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
+	grep "^+c" diff &&
+
+	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
+	grep "^+a" diff &&
+
+	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
+	grep "^+c" diff
+
++a
++c
++a
++c
+ok 6 - later algorithm arguments override earlier ones
+
+expecting success of 4065.7 '--anchored works with other commands like "git show"': 
+	printf "a\nb\nc\n" >file &&
+	git add file &&
+	git commit -m foo &&
+	printf "c\na\nb\n" >file &&
+	git add file &&
+	git commit -m foo &&
+
+	# with anchor, a is moved
+	git show --patience --anchored=c >diff &&
+	grep "^+a" diff
+
+[master (root-commit) 59a79f0] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+[master 798b1ed] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++a
+ok 7 - --anchored works with other commands like "git show"
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4066-diff-emit-delay.sh ***
@@ -251336,6 +251304,112 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4059-diff-submodule-not-initialized.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/.git/
+expecting success of 4059.1 'setup - submodules': 
+	test_create_repo sm2 &&
+	add_file . foo &&
+	add_file sm2 foo1 foo2 &&
+	smhead1=$(git -C sm2 rev-parse --short --verify HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
+36d39d8
+1beffeb
+ok 1 - setup - submodules
+
+expecting success of 4059.2 'setup - git submodule add': 
+	git -c protocol.file.allow=always submodule add ./sm2 sm1 &&
+	commit_file sm1 .gitmodules &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$smhead1 (new submodule)
+	EOF
+	test_cmp expected actual
+
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
+done.
+ok 2 - setup - git submodule add
+
+expecting success of 4059.3 'submodule directory removed': 
+	rm -rf sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$smhead1 (new submodule)
+	EOF
+	test_cmp expected actual
+
+ok 3 - submodule directory removed
+
+expecting success of 4059.4 'setup - submodule multiple commits': 
+	git submodule update --checkout sm1 &&
+	smhead2=$(add_file sm1 foo3 foo4) &&
+	commit_file sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1..$smhead2:
+	  > Add foo4 ($added foo4)
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
+ok 4 - setup - submodule multiple commits
+
+expecting success of 4059.5 'submodule removed multiple commits': 
+	rm -rf sm1 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1..$smhead2:
+	  > Add foo4 ($added foo4)
+	  > Add foo3 ($added foo3)
+	EOF
+	test_cmp expected actual
+
+ok 5 - submodule removed multiple commits
+
+expecting success of 4059.6 'submodule not initialized in new clone': 
+	git clone . sm3 &&
+	git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $smhead1...$smhead2 (commits not present)
+	EOF
+	test_cmp expected actual
+
+Cloning into 'sm3'...
+done.
+ok 6 - submodule not initialized in new clone
+
+expecting success of 4059.7 'setup submodule moved': 
+	git submodule update --checkout sm1 &&
+	git mv sm1 sm4 &&
+	commit_file sm4 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm4 0000000...$smhead2 (new submodule)
+	EOF
+	test_cmp expected actual
+
+Submodule path 'sm1': checked out 'b762e6a22f976e7e5d55bfe47bb4c4694f97a64c'
+ok 7 - setup submodule moved
+
+expecting success of 4059.8 'submodule moved then removed': 
+	smhead3=$(add_file sm4 foo6 foo7) &&
+	commit_file sm4 &&
+	rm -rf sm4 &&
+	git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm4 $smhead2..$smhead3:
+	  > Add foo7 ($added foo7)
+	  > Add foo6 ($added foo6)
+	EOF
+	test_cmp expected actual
+
+ok 8 - submodule moved then removed
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4052-stat-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4052-stat-output/.git/
 expecting success of 4052.1 'preparation': 
@@ -251992,126 +252066,6 @@
 1..88
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4065-diff-anchored.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4065-diff-anchored/.git/
-expecting success of 4065.1 '--anchored': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	# normally, c is moved to produce the smallest diff
-	test_expect_code 1 git diff --no-index pre post >diff &&
-	grep "^+c" diff &&
-
-	# with anchor, a is moved
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+a" diff
-
-+c
-+a
-ok 1 - --anchored
-
-expecting success of 4065.2 '--anchored multiple': 
-	printf "a\nb\nc\nd\ne\nf\n" >pre &&
-	printf "c\na\nb\nf\nd\ne\n" >post &&
-
-	# with 1 anchor, c is not moved, but f is moved
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+a" diff && # a is moved instead of c
-	grep "^+f" diff &&
-
-	# with 2 anchors, c and f are not moved
-	test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
-	grep "^+a" diff &&
-	grep "^+d" diff # d is moved instead of f
-
-+a
-+f
-+a
-+d
-ok 2 - --anchored multiple
-
-expecting success of 4065.3 '--anchored with nonexistent line has no effect': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
-	grep "^+c" diff
-
-+c
-ok 3 - --anchored with nonexistent line has no effect
-
-expecting success of 4065.4 '--anchored with non-unique line has no effect': 
-	printf "a\nb\nc\nd\ne\nc\n" >pre &&
-	printf "c\na\nb\nc\nd\ne\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+c" diff
-
-+c
-ok 4 - --anchored with non-unique line has no effect
-
-expecting success of 4065.5 'diff still produced with impossible multiple --anchored': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
-	mv post expected_post &&
-
-	# Ensure that the diff is correct by applying it and then
-	# comparing the result with the original
-	git apply diff &&
-	diff expected_post post
-
-ok 5 - diff still produced with impossible multiple --anchored
-
-expecting success of 4065.6 'later algorithm arguments override earlier ones': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
-	grep "^+a" diff &&
-
-	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
-	grep "^+c" diff &&
-
-	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
-	grep "^+a" diff &&
-
-	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
-	grep "^+c" diff
-
-+a
-+c
-+a
-+c
-ok 6 - later algorithm arguments override earlier ones
-
-expecting success of 4065.7 '--anchored works with other commands like "git show"': 
-	printf "a\nb\nc\n" >file &&
-	git add file &&
-	git commit -m foo &&
-	printf "c\na\nb\n" >file &&
-	git add file &&
-	git commit -m foo &&
-
-	# with anchor, a is moved
-	git show --patience --anchored=c >diff &&
-	grep "^+a" diff
-
-[master (root-commit) 59a79f0] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[master 798b1ed] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-+a
-ok 7 - --anchored works with other commands like "git show"
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4064-diff-oidfind.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4064-diff-oidfind/.git/
 expecting success of 4064.1 'setup ': 
@@ -252304,6 +252258,153 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4100-apply-stat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4100-apply-stat/.git/
+expecting success of 4100.1 'rename': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 1 - rename
+
+expecting success of 4100.2 'rename with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 2 - rename with recount
+
+expecting success of 4100.3 'copy': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 3 - copy
+
+expecting success of 4100.4 'copy with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 4 - copy with recount
+
+expecting success of 4100.5 'rewrite': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 5 - rewrite
+
+expecting success of 4100.6 'rewrite with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 6 - rewrite with recount
+
+expecting success of 4100.7 'mode': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 7 - mode
+
+expecting success of 4100.8 'mode with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 8 - mode with recount
+
+expecting success of 4100.9 'non git (1)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 9 - non git (1)
+
+expecting success of 4100.10 'non git (1) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 10 - non git (1) with recount
+
+expecting success of 4100.11 'non git (2)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 11 - non git (2)
+
+expecting success of 4100.12 'non git (2) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 12 - non git (2) with recount
+
+expecting success of 4100.13 'non git (3)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 13 - non git (3)
+
+expecting success of 4100.14 'non git (3) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 14 - non git (3) with recount
+
+expecting success of 4100.15 'incomplete (1)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 15 - incomplete (1)
+
+expecting success of 4100.16 'incomplete (1) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 16 - incomplete (1) with recount
+
+expecting success of 4100.17 'incomplete (2)': 
+		git apply --stat --summary \
+			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 17 - incomplete (2)
+
+expecting success of 4100.18 'incomplete (2) with recount': 
+		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
+		git apply --recount --stat --summary >current &&
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+	
+ok 18 - incomplete (2) with recount
+
+expecting success of 4100.19 'applying a hunk header which overflows fails': 
+	cat >patch <<-\EOF &&
+	diff -u a/file b/file
+	--- a/file
+	+++ b/file
+	@@ -98765432109876543210 +98765432109876543210 @@
+	-a
+	+b
+	EOF
+	test_must_fail git apply patch 2>err &&
+	echo "error: corrupt patch at line 4" >expect &&
+	test_cmp expect err
+
+ok 19 - applying a hunk header which overflows fails
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4061-diff-indent.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4061-diff-indent/.git/
 expecting success of 4061.1 'prepare': 
@@ -252726,231 +252827,6 @@
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4100-apply-stat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4100-apply-stat/.git/
-expecting success of 4100.1 'rename': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 1 - rename
-
-expecting success of 4100.2 'rename with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 2 - rename with recount
-
-expecting success of 4100.3 'copy': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 3 - copy
-
-expecting success of 4100.4 'copy with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 4 - copy with recount
-
-expecting success of 4100.5 'rewrite': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 5 - rewrite
-
-expecting success of 4100.6 'rewrite with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 6 - rewrite with recount
-
-expecting success of 4100.7 'mode': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 7 - mode
-
-expecting success of 4100.8 'mode with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 8 - mode with recount
-
-expecting success of 4100.9 'non git (1)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 9 - non git (1)
-
-expecting success of 4100.10 'non git (1) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 10 - non git (1) with recount
-
-expecting success of 4100.11 'non git (2)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 11 - non git (2)
-
-expecting success of 4100.12 'non git (2) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 12 - non git (2) with recount
-
-expecting success of 4100.13 'non git (3)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 13 - non git (3)
-
-expecting success of 4100.14 'non git (3) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 14 - non git (3) with recount
-
-expecting success of 4100.15 'incomplete (1)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 15 - incomplete (1)
-
-expecting success of 4100.16 'incomplete (1) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 16 - incomplete (1) with recount
-
-expecting success of 4100.17 'incomplete (2)': 
-		git apply --stat --summary \
-			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 17 - incomplete (2)
-
-expecting success of 4100.18 'incomplete (2) with recount': 
-		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
-		git apply --recount --stat --summary >current &&
-		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
-	
-ok 18 - incomplete (2) with recount
-
-expecting success of 4100.19 'applying a hunk header which overflows fails': 
-	cat >patch <<-\EOF &&
-	diff -u a/file b/file
-	--- a/file
-	+++ b/file
-	@@ -98765432109876543210 +98765432109876543210 @@
-	-a
-	+b
-	EOF
-	test_must_fail git apply patch 2>err &&
-	echo "error: corrupt patch at line 4" >expect &&
-	test_cmp expect err
-
-ok 19 - applying a hunk header which overflows fails
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4101-apply-nonl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4101-apply-nonl/.git/
-expecting success of 4101.1 'apply diff between 0 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 1 - apply diff between 0 and 1
-
-expecting success of 4101.2 'apply diff between 0 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 2 - apply diff between 0 and 2
-
-expecting success of 4101.3 'apply diff between 0 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 3 - apply diff between 0 and 3
-
-expecting success of 4101.4 'apply diff between 1 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 4 - apply diff between 1 and 0
-
-expecting success of 4101.5 'apply diff between 1 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 5 - apply diff between 1 and 2
-
-expecting success of 4101.6 'apply diff between 1 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 6 - apply diff between 1 and 3
-
-expecting success of 4101.7 'apply diff between 2 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 7 - apply diff between 2 and 0
-
-expecting success of 4101.8 'apply diff between 2 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 8 - apply diff between 2 and 1
-
-expecting success of 4101.9 'apply diff between 2 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 9 - apply diff between 2 and 3
-
-expecting success of 4101.10 'apply diff between 3 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 10 - apply diff between 3 and 0
-
-expecting success of 4101.11 'apply diff between 3 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 11 - apply diff between 3 and 1
-
-expecting success of 4101.12 'apply diff between 3 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 12 - apply diff between 3 and 2
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4070-diff-pairs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4070-diff-pairs/.git/
 expecting success of 4070.1 'setup': 
@@ -253083,6 +252959,84 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4101-apply-nonl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4101-apply-nonl/.git/
+expecting success of 4101.1 'apply diff between 0 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 1 - apply diff between 0 and 1
+
+expecting success of 4101.2 'apply diff between 0 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 2 - apply diff between 0 and 2
+
+expecting success of 4101.3 'apply diff between 0 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 3 - apply diff between 0 and 3
+
+expecting success of 4101.4 'apply diff between 1 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 4 - apply diff between 1 and 0
+
+expecting success of 4101.5 'apply diff between 1 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 5 - apply diff between 1 and 2
+
+expecting success of 4101.6 'apply diff between 1 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 6 - apply diff between 1 and 3
+
+expecting success of 4101.7 'apply diff between 2 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 7 - apply diff between 2 and 0
+
+expecting success of 4101.8 'apply diff between 2 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 8 - apply diff between 2 and 1
+
+expecting success of 4101.9 'apply diff between 2 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 9 - apply diff between 2 and 3
+
+expecting success of 4101.10 'apply diff between 3 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 10 - apply diff between 3 and 0
+
+expecting success of 4101.11 'apply diff between 3 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 11 - apply diff between 3 and 1
+
+expecting success of 4101.12 'apply diff between 3 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 12 - apply diff between 3 and 2
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4102-apply-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4102-apply-rename/.git/
 expecting success of 4102.1 'setup': git update-index --add foo
@@ -253104,7 +253058,7 @@
 )
 prerequisite FILEMODE ok
 expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Apr 19 19:19 bar
+-rwxr-xr-x 1 pbuilder2 pbuilder2 12 Mar 17 13:22 bar
 ok 3 - validate
 
 expecting success of 4102.4 'apply reverse': git apply -R --index --stat --summary --apply test-patch &&
@@ -253125,409 +253079,35 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4068-diff-symmetric-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4068-diff-symmetric-merge-base/.git/
-expecting success of 4068.1 'setup': 
-	git commit --allow-empty -m A &&
-	echo b >b &&
-	git add b &&
-	git commit -m B &&
-	git checkout -b br1 HEAD^ &&
-	echo c >c &&
-	git add c &&
-	git commit -m C &&
-	git tag -m commit-C commit-C &&
-	git merge -m D main &&
-	git tag commit-D &&
-	git checkout main &&
-	git merge -m E commit-C &&
-	git checkout -b br2 commit-C &&
-	echo f >f &&
-	git add f &&
-	git commit -m F &&
-	git checkout br1 &&
-	git merge -m G br2 &&
-	git checkout --orphan br3 &&
-	git commit -m H
+*** t4106-apply-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4106-apply-stdin/.git/
+expecting success of 4106.1 'setup': 
+	echo hello >text &&
+	git add text &&
+	echo goodbye >text &&
+	git diff >patch
 
-[main (root-commit) 58052da] A
- Author: A U Thor <author@example.com>
-[main f74ffd5] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to a new branch 'br1'
-[br1 9ba99bb] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Merge made by the 'ort' strategy.
- b | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Switched to a new branch 'br2'
-[br2 5b24cb4] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f
-Switched to branch 'br1'
-Merge made by the 'ort' strategy.
- f | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 f
-Switched to a new branch 'br3'
-[br3 (root-commit) 185e1f1] H
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 b
- create mode 100644 c
- create mode 100644 f
 ok 1 - setup
 
-expecting success of 4068.2 'diff with one merge base': 
-	git diff commit-D...br1 >tmp &&
-	tail -n 1 tmp >actual &&
-	echo +f >expect &&
+expecting success of 4106.2 'git apply --numstat - < patch': 
+	echo "1	1	text" >expect &&
+	git apply --numstat - <patch >actual &&
 	test_cmp expect actual
 
-ok 2 - diff with one merge base
-
-expecting success of 4068.3 'diff with two merge bases': 
-	git diff br1...main >tmp 2>err &&
-	test_line_count = 7 tmp &&
-	test_line_count = 1 err
-
-ok 3 - diff with two merge bases
-
-expecting success of 4068.4 'diff with no merge bases': 
-	test_must_fail git diff br2...br3 2>err &&
-	test_grep "fatal: br2...br3: no merge base" err
-
-fatal: br2...br3: no merge base
-ok 4 - diff with no merge bases
-
-expecting success of 4068.5 'diff with too many symmetric differences': 
-	test_must_fail git diff br1...main br2...br3 2>err &&
-	test_grep "usage" err
-
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 5 - diff with too many symmetric differences
-
-expecting success of 4068.6 'diff with symmetric difference and extraneous arg': 
-	test_must_fail git diff main br1...main 2>err &&
-	test_grep "usage" err
-
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 6 - diff with symmetric difference and extraneous arg
-
-expecting success of 4068.7 'diff with two ranges': 
-	test_must_fail git diff main br1..main br2..br3 2>err &&
-	test_grep "usage" err
-
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 7 - diff with two ranges
-
-expecting success of 4068.8 'diff with ranges and extra arg': 
-	test_must_fail git diff main br1..main commit-D 2>err &&
-	test_grep "usage" err
-
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 8 - diff with ranges and extra arg
-
-expecting success of 4068.9 'diff --merge-base with no commits': 
-	test_must_fail git diff --merge-base
-
-error: invalid option: --merge-base
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-   or: git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
-   or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]
-   or: git diff [<options>] <commit>...<commit> [--] [<path>...]
-   or: git diff [<options>] <blob> <blob>
-   or: git diff [<options>] --no-index [--] <path> <path>
-
-common diff options:
-  -z            output diff-raw with lines terminated with NUL.
-  -p            output patch format.
-  -u            synonym for -p.
-  --patch-with-raw
-                output both a patch and the diff-raw format.
-  --stat        show diffstat instead of patch.
-  --numstat     show numeric diffstat instead of patch.
-  --patch-with-stat
-                output a patch and prepend its diffstat.
-  --name-only   show only names of changed files.
-  --name-status show names and status of changed files.
-  --full-index  show full object name on index lines.
-  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.
-  -R            swap input file pairs.
-  -B            detect complete rewrites.
-  -M            detect renames.
-  -C            detect copies.
-  --find-copies-harder
-                try unchanged files as candidate for copy detection.
-  -l<n>         limit rename attempts up to <n> paths.
-  -O<file>      reorder diffs according to the <file>.
-  -S<string>    find filepair whose only one side contains the string.
-  --pickaxe-all
-                show all files diff when -S is used and hit is found.
-  -a  --text    treat all files as text.
-
-ok 9 - diff --merge-base with no commits
-
-expecting success of 4068.10 'diff --merge-base with three commits': 
-	test_must_fail git diff --merge-base br1 br2 main 2>err &&
-	test_grep "usage" err
-
-usage: git diff [<options>] [<commit>] [--] [<path>...]
-ok 10 - diff --merge-base with three commits
-
-expecting success of 4068.11 'diff-index --merge-base with one commit': 
-		git checkout main &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Switched to branch 'main'
-ok 11 - diff-index --merge-base with one commit
-
-expecting success of 4068.12 'diff-index --merge-base with annotated tag': 
-		git checkout main &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base commit-C >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-ok 12 - diff-index --merge-base with annotated tag
-
-expecting success of 4068.13 'diff-index --merge-base with one commit and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo unstaged >>c &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 13 - diff-index --merge-base with one commit and unstaged changes
-
-expecting success of 4068.14 'diff-index --merge-base with one commit and staged and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo staged >>c &&
-		git add c &&
-		echo unstaged >>c &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 14 - diff-index --merge-base with one commit and staged and unstaged changes
-
-expecting success of 4068.15 'diff-index --merge-base --cached with one commit and staged and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo staged >>c &&
-		git add c &&
-		echo unstaged >>c &&
-		git $cmd --cached commit-C >expect &&
-		git $cmd --cached --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 15 - diff-index --merge-base --cached with one commit and staged and unstaged changes
-
-expecting success of 4068.16 'diff-index --merge-base with non-commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base main^{tree} 2>err &&
-		test_grep "is a tree, not a commit" err
-	
-Already on 'main'
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 16 - diff-index --merge-base with non-commit
-
-expecting success of 4068.17 'diff-index --merge-base with no merge bases and one commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base br3 2>err &&
-		test_grep "fatal: no merge base found" err
-	
-Already on 'main'
-fatal: no merge base found
-ok 17 - diff-index --merge-base with no merge bases and one commit
-
-expecting success of 4068.18 'diff-index --merge-base with multiple merge bases and one commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base br1 2>err &&
-		test_grep "fatal: multiple merge bases found" err
-	
-Already on 'main'
-fatal: multiple merge bases found
-ok 18 - diff-index --merge-base with multiple merge bases and one commit
-
-expecting success of 4068.19 'diff --merge-base with one commit': 
-		git checkout main &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-ok 19 - diff --merge-base with one commit
-
-expecting success of 4068.20 'diff --merge-base with annotated tag': 
-		git checkout main &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base commit-C >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-ok 20 - diff --merge-base with annotated tag
-
-expecting success of 4068.21 'diff --merge-base with one commit and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo unstaged >>c &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 21 - diff --merge-base with one commit and unstaged changes
-
-expecting success of 4068.22 'diff --merge-base with one commit and staged and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo staged >>c &&
-		git add c &&
-		echo unstaged >>c &&
-		git $cmd commit-C >expect &&
-		git $cmd --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 22 - diff --merge-base with one commit and staged and unstaged changes
-
-expecting success of 4068.23 'diff --merge-base --cached with one commit and staged and unstaged changes': 
-		git checkout main &&
-		test_when_finished git reset --hard &&
-		echo staged >>c &&
-		git add c &&
-		echo unstaged >>c &&
-		git $cmd --cached commit-C >expect &&
-		git $cmd --cached --merge-base br2 >actual &&
-		test_cmp expect actual
-	
-Already on 'main'
-HEAD is now at c8f83a5 E
-ok 23 - diff --merge-base --cached with one commit and staged and unstaged changes
-
-expecting success of 4068.24 'diff --merge-base with non-commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base main^{tree} 2>err &&
-		test_grep "is a tree, not a commit" err
-	
-Already on 'main'
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 24 - diff --merge-base with non-commit
-
-expecting success of 4068.25 'diff --merge-base with no merge bases and one commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base br3 2>err &&
-		test_grep "fatal: no merge base found" err
-	
-Already on 'main'
-fatal: no merge base found
-ok 25 - diff --merge-base with no merge bases and one commit
-
-expecting success of 4068.26 'diff --merge-base with multiple merge bases and one commit': 
-		git checkout main &&
-		test_must_fail git $cmd --merge-base br1 2>err &&
-		test_grep "fatal: multiple merge bases found" err
-	
-Already on 'main'
-fatal: multiple merge bases found
-ok 26 - diff --merge-base with multiple merge bases and one commit
-
-expecting success of 4068.27 'diff-tree --merge-base with two commits': 
-		git $cmd commit-C main >expect &&
-		git $cmd --merge-base br2 main >actual &&
-		test_cmp expect actual
-	
-ok 27 - diff-tree --merge-base with two commits
-
-expecting success of 4068.28 'diff-tree --merge-base commit and non-commit': 
-		test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
-		test_grep "is a tree, not a commit" err
-	
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 28 - diff-tree --merge-base commit and non-commit
-
-expecting success of 4068.29 'diff-tree --merge-base with no merge bases and two commits': 
-		test_must_fail git $cmd --merge-base br2 br3 2>err &&
-		test_grep "fatal: no merge base found" err
-	
-fatal: no merge base found
-ok 29 - diff-tree --merge-base with no merge bases and two commits
-
-expecting success of 4068.30 'diff-tree --merge-base with multiple merge bases and two commits': 
-		test_must_fail git $cmd --merge-base main br1 2>err &&
-		test_grep "fatal: multiple merge bases found" err
-	
-fatal: multiple merge bases found
-ok 30 - diff-tree --merge-base with multiple merge bases and two commits
-
-expecting success of 4068.31 'diff --merge-base with two commits': 
-		git $cmd commit-C main >expect &&
-		git $cmd --merge-base br2 main >actual &&
-		test_cmp expect actual
-	
-ok 31 - diff --merge-base with two commits
-
-expecting success of 4068.32 'diff --merge-base commit and non-commit': 
-		test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
-		test_grep "is a tree, not a commit" err
-	
-error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
-ok 32 - diff --merge-base commit and non-commit
-
-expecting success of 4068.33 'diff --merge-base with no merge bases and two commits': 
-		test_must_fail git $cmd --merge-base br2 br3 2>err &&
-		test_grep "fatal: no merge base found" err
-	
-fatal: no merge base found
-ok 33 - diff --merge-base with no merge bases and two commits
-
-expecting success of 4068.34 'diff --merge-base with multiple merge bases and two commits': 
-		test_must_fail git $cmd --merge-base main br1 2>err &&
-		test_grep "fatal: multiple merge bases found" err
-	
-fatal: multiple merge bases found
-ok 34 - diff --merge-base with multiple merge bases and two commits
-
-expecting success of 4068.35 'diff-tree --merge-base with one commit': 
-	test_must_fail git diff-tree --merge-base main 2>err &&
-	test_grep "fatal: --merge-base only works with two commits" err
-
-fatal: --merge-base only works with two commits
-ok 35 - diff-tree --merge-base with one commit
+ok 2 - git apply --numstat - < patch
 
-expecting success of 4068.36 'diff --merge-base with range': 
-	test_must_fail git diff --merge-base br2..br3 2>err &&
-	test_grep "fatal: --merge-base does not work with ranges" err
+expecting success of 4106.3 'git apply --numstat - < patch patch': 
+	cat >expect <<-\EOF &&
+	1	1	text
+	1	1	text
+	EOF
+	git apply --numstat - < patch patch >actual &&
+	test_cmp expect actual
 
-fatal: --merge-base does not work with ranges
-ok 36 - diff --merge-base with range
+ok 3 - git apply --numstat - < patch patch
 
-# passed all 36 test(s)
-1..36
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4069-remerge-diff.sh ***
@@ -253985,35 +253565,409 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4106-apply-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4106-apply-stdin/.git/
-expecting success of 4106.1 'setup': 
-	echo hello >text &&
-	git add text &&
-	echo goodbye >text &&
-	git diff >patch
+*** t4068-diff-symmetric-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4068-diff-symmetric-merge-base/.git/
+expecting success of 4068.1 'setup': 
+	git commit --allow-empty -m A &&
+	echo b >b &&
+	git add b &&
+	git commit -m B &&
+	git checkout -b br1 HEAD^ &&
+	echo c >c &&
+	git add c &&
+	git commit -m C &&
+	git tag -m commit-C commit-C &&
+	git merge -m D main &&
+	git tag commit-D &&
+	git checkout main &&
+	git merge -m E commit-C &&
+	git checkout -b br2 commit-C &&
+	echo f >f &&
+	git add f &&
+	git commit -m F &&
+	git checkout br1 &&
+	git merge -m G br2 &&
+	git checkout --orphan br3 &&
+	git commit -m H
 
+[main (root-commit) 58052da] A
+ Author: A U Thor <author@example.com>
+[main f74ffd5] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to a new branch 'br1'
+[br1 9ba99bb] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Merge made by the 'ort' strategy.
+ b | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Switched to a new branch 'br2'
+[br2 5b24cb4] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f
+Switched to branch 'br1'
+Merge made by the 'ort' strategy.
+ f | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f
+Switched to a new branch 'br3'
+[br3 (root-commit) 185e1f1] H
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 f
 ok 1 - setup
 
-expecting success of 4106.2 'git apply --numstat - < patch': 
-	echo "1	1	text" >expect &&
-	git apply --numstat - <patch >actual &&
+expecting success of 4068.2 'diff with one merge base': 
+	git diff commit-D...br1 >tmp &&
+	tail -n 1 tmp >actual &&
+	echo +f >expect &&
 	test_cmp expect actual
 
-ok 2 - git apply --numstat - < patch
+ok 2 - diff with one merge base
 
-expecting success of 4106.3 'git apply --numstat - < patch patch': 
-	cat >expect <<-\EOF &&
-	1	1	text
-	1	1	text
-	EOF
-	git apply --numstat - < patch patch >actual &&
-	test_cmp expect actual
+expecting success of 4068.3 'diff with two merge bases': 
+	git diff br1...main >tmp 2>err &&
+	test_line_count = 7 tmp &&
+	test_line_count = 1 err
 
-ok 3 - git apply --numstat - < patch patch
+ok 3 - diff with two merge bases
 
-# passed all 3 test(s)
-1..3
+expecting success of 4068.4 'diff with no merge bases': 
+	test_must_fail git diff br2...br3 2>err &&
+	test_grep "fatal: br2...br3: no merge base" err
+
+fatal: br2...br3: no merge base
+ok 4 - diff with no merge bases
+
+expecting success of 4068.5 'diff with too many symmetric differences': 
+	test_must_fail git diff br1...main br2...br3 2>err &&
+	test_grep "usage" err
+
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 5 - diff with too many symmetric differences
+
+expecting success of 4068.6 'diff with symmetric difference and extraneous arg': 
+	test_must_fail git diff main br1...main 2>err &&
+	test_grep "usage" err
+
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 6 - diff with symmetric difference and extraneous arg
+
+expecting success of 4068.7 'diff with two ranges': 
+	test_must_fail git diff main br1..main br2..br3 2>err &&
+	test_grep "usage" err
+
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 7 - diff with two ranges
+
+expecting success of 4068.8 'diff with ranges and extra arg': 
+	test_must_fail git diff main br1..main commit-D 2>err &&
+	test_grep "usage" err
+
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 8 - diff with ranges and extra arg
+
+expecting success of 4068.9 'diff --merge-base with no commits': 
+	test_must_fail git diff --merge-base
+
+error: invalid option: --merge-base
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+   or: git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
+   or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]
+   or: git diff [<options>] <commit>...<commit> [--] [<path>...]
+   or: git diff [<options>] <blob> <blob>
+   or: git diff [<options>] --no-index [--] <path> <path>
+
+common diff options:
+  -z            output diff-raw with lines terminated with NUL.
+  -p            output patch format.
+  -u            synonym for -p.
+  --patch-with-raw
+                output both a patch and the diff-raw format.
+  --stat        show diffstat instead of patch.
+  --numstat     show numeric diffstat instead of patch.
+  --patch-with-stat
+                output a patch and prepend its diffstat.
+  --name-only   show only names of changed files.
+  --name-status show names and status of changed files.
+  --full-index  show full object name on index lines.
+  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.
+  -R            swap input file pairs.
+  -B            detect complete rewrites.
+  -M            detect renames.
+  -C            detect copies.
+  --find-copies-harder
+                try unchanged files as candidate for copy detection.
+  -l<n>         limit rename attempts up to <n> paths.
+  -O<file>      reorder diffs according to the <file>.
+  -S<string>    find filepair whose only one side contains the string.
+  --pickaxe-all
+                show all files diff when -S is used and hit is found.
+  -a  --text    treat all files as text.
+
+ok 9 - diff --merge-base with no commits
+
+expecting success of 4068.10 'diff --merge-base with three commits': 
+	test_must_fail git diff --merge-base br1 br2 main 2>err &&
+	test_grep "usage" err
+
+usage: git diff [<options>] [<commit>] [--] [<path>...]
+ok 10 - diff --merge-base with three commits
+
+expecting success of 4068.11 'diff-index --merge-base with one commit': 
+		git checkout main &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Switched to branch 'main'
+ok 11 - diff-index --merge-base with one commit
+
+expecting success of 4068.12 'diff-index --merge-base with annotated tag': 
+		git checkout main &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base commit-C >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+ok 12 - diff-index --merge-base with annotated tag
+
+expecting success of 4068.13 'diff-index --merge-base with one commit and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 13 - diff-index --merge-base with one commit and unstaged changes
+
+expecting success of 4068.14 'diff-index --merge-base with one commit and staged and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 14 - diff-index --merge-base with one commit and staged and unstaged changes
+
+expecting success of 4068.15 'diff-index --merge-base --cached with one commit and staged and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd --cached commit-C >expect &&
+		git $cmd --cached --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 15 - diff-index --merge-base --cached with one commit and staged and unstaged changes
+
+expecting success of 4068.16 'diff-index --merge-base with non-commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base main^{tree} 2>err &&
+		test_grep "is a tree, not a commit" err
+	
+Already on 'main'
+error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
+ok 16 - diff-index --merge-base with non-commit
+
+expecting success of 4068.17 'diff-index --merge-base with no merge bases and one commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br3 2>err &&
+		test_grep "fatal: no merge base found" err
+	
+Already on 'main'
+fatal: no merge base found
+ok 17 - diff-index --merge-base with no merge bases and one commit
+
+expecting success of 4068.18 'diff-index --merge-base with multiple merge bases and one commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br1 2>err &&
+		test_grep "fatal: multiple merge bases found" err
+	
+Already on 'main'
+fatal: multiple merge bases found
+ok 18 - diff-index --merge-base with multiple merge bases and one commit
+
+expecting success of 4068.19 'diff --merge-base with one commit': 
+		git checkout main &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+ok 19 - diff --merge-base with one commit
+
+expecting success of 4068.20 'diff --merge-base with annotated tag': 
+		git checkout main &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base commit-C >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+ok 20 - diff --merge-base with annotated tag
+
+expecting success of 4068.21 'diff --merge-base with one commit and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 21 - diff --merge-base with one commit and unstaged changes
+
+expecting success of 4068.22 'diff --merge-base with one commit and staged and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 22 - diff --merge-base with one commit and staged and unstaged changes
+
+expecting success of 4068.23 'diff --merge-base --cached with one commit and staged and unstaged changes': 
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd --cached commit-C >expect &&
+		git $cmd --cached --merge-base br2 >actual &&
+		test_cmp expect actual
+	
+Already on 'main'
+HEAD is now at c8f83a5 E
+ok 23 - diff --merge-base --cached with one commit and staged and unstaged changes
+
+expecting success of 4068.24 'diff --merge-base with non-commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base main^{tree} 2>err &&
+		test_grep "is a tree, not a commit" err
+	
+Already on 'main'
+error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
+ok 24 - diff --merge-base with non-commit
+
+expecting success of 4068.25 'diff --merge-base with no merge bases and one commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br3 2>err &&
+		test_grep "fatal: no merge base found" err
+	
+Already on 'main'
+fatal: no merge base found
+ok 25 - diff --merge-base with no merge bases and one commit
+
+expecting success of 4068.26 'diff --merge-base with multiple merge bases and one commit': 
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br1 2>err &&
+		test_grep "fatal: multiple merge bases found" err
+	
+Already on 'main'
+fatal: multiple merge bases found
+ok 26 - diff --merge-base with multiple merge bases and one commit
+
+expecting success of 4068.27 'diff-tree --merge-base with two commits': 
+		git $cmd commit-C main >expect &&
+		git $cmd --merge-base br2 main >actual &&
+		test_cmp expect actual
+	
+ok 27 - diff-tree --merge-base with two commits
+
+expecting success of 4068.28 'diff-tree --merge-base commit and non-commit': 
+		test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
+		test_grep "is a tree, not a commit" err
+	
+error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
+ok 28 - diff-tree --merge-base commit and non-commit
+
+expecting success of 4068.29 'diff-tree --merge-base with no merge bases and two commits': 
+		test_must_fail git $cmd --merge-base br2 br3 2>err &&
+		test_grep "fatal: no merge base found" err
+	
+fatal: no merge base found
+ok 29 - diff-tree --merge-base with no merge bases and two commits
+
+expecting success of 4068.30 'diff-tree --merge-base with multiple merge bases and two commits': 
+		test_must_fail git $cmd --merge-base main br1 2>err &&
+		test_grep "fatal: multiple merge bases found" err
+	
+fatal: multiple merge bases found
+ok 30 - diff-tree --merge-base with multiple merge bases and two commits
+
+expecting success of 4068.31 'diff --merge-base with two commits': 
+		git $cmd commit-C main >expect &&
+		git $cmd --merge-base br2 main >actual &&
+		test_cmp expect actual
+	
+ok 31 - diff --merge-base with two commits
+
+expecting success of 4068.32 'diff --merge-base commit and non-commit': 
+		test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
+		test_grep "is a tree, not a commit" err
+	
+error: object e42ba3e77f66f623836b47df796932f7e5604aec is a tree, not a commit
+ok 32 - diff --merge-base commit and non-commit
+
+expecting success of 4068.33 'diff --merge-base with no merge bases and two commits': 
+		test_must_fail git $cmd --merge-base br2 br3 2>err &&
+		test_grep "fatal: no merge base found" err
+	
+fatal: no merge base found
+ok 33 - diff --merge-base with no merge bases and two commits
+
+expecting success of 4068.34 'diff --merge-base with multiple merge bases and two commits': 
+		test_must_fail git $cmd --merge-base main br1 2>err &&
+		test_grep "fatal: multiple merge bases found" err
+	
+fatal: multiple merge bases found
+ok 34 - diff --merge-base with multiple merge bases and two commits
+
+expecting success of 4068.35 'diff-tree --merge-base with one commit': 
+	test_must_fail git diff-tree --merge-base main 2>err &&
+	test_grep "fatal: --merge-base only works with two commits" err
+
+fatal: --merge-base only works with two commits
+ok 35 - diff-tree --merge-base with one commit
+
+expecting success of 4068.36 'diff --merge-base with range': 
+	test_must_fail git diff --merge-base br2..br3 2>err &&
+	test_grep "fatal: --merge-base does not work with ranges" err
+
+fatal: --merge-base does not work with ranges
+ok 36 - diff --merge-base with range
+
+# passed all 36 test(s)
+1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4105-apply-fuzz.sh ***
@@ -254102,191 +254056,3921 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4014-format-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4014-format-patch/.git/
-expecting success of 4014.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
-	cat file >elif &&
-	git add file elif &&
-	test_tick &&
-	git commit -m Initial &&
-	git checkout -b side &&
-
-	test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
-	test_chmod +x elif &&
-	test_tick &&
-	git commit -m "Side changes #1" &&
-
-	test_write_lines D E F >>file &&
-	git update-index file &&
-	test_tick &&
-	git commit -m "Side changes #2" &&
-	git tag C2 &&
-
-	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
-	git update-index file &&
-	test_tick &&
-	git commit -m "Side changes #3 with \\n backslash-n in it." &&
-
-	git checkout main &&
-	git diff-tree -p C2 >patch &&
-	git apply --index <patch &&
-	test_tick &&
-	git commit -m "Main accepts moral equivalent of #2" &&
+*** t4018-diff-funcname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4018-diff-funcname/.git/
+expecting success of 4018.1 'setup': 
+	# a non-trivial custom pattern
+	git config diff.custom1.funcname "!static
+!String
+[^ 	].*s.*" &&
 
-	git checkout side &&
-	git checkout -b patchid &&
-	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
-	test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
-	test_write_lines 8 9 10 >file &&
-	git add file file2 file3 &&
-	test_tick &&
-	git commit -m "patchid 1" &&
-	test_write_lines 4 A B 7 8 9 10 >file2 &&
-	test_write_lines 8 9 10 5 6 >file3 &&
-	git add file2 file3 &&
-	test_tick &&
-	git commit -m "patchid 2" &&
-	test_write_lines 10 5 6 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m "patchid 3" &&
+	# a custom pattern which matches to end of line
+	git config diff.custom2.funcname "......Beer\$" &&
 
-	git checkout -b empty main &&
-	test_tick &&
-	git commit --allow-empty -m "empty commit" &&
+	# alternation in pattern
+	git config diff.custom3.funcname "Beer$" &&
+	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
 
-	git checkout main
+	# for regexp compilation tests
+	echo A >A.java &&
+	echo B >B.java
 
-[main (root-commit) e27066e] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 20 insertions(+)
- create mode 100644 elif
- create mode 100644 file
-Switched to a new branch 'side'
-[side 1135adf] Side changes #1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
-[side fd00575] Side changes #2
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 2 deletions(-)
-[side 18ed22a] Side changes #3 with \n backslash-n in it.
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 2 deletions(-)
-Switched to branch 'main'
-[main 333d5cb] Main accepts moral equivalent of #2
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 2 deletions(-)
-Switched to branch 'side'
-Switched to a new branch 'patchid'
-[patchid 866b619] patchid 1
- Author: A U Thor <author@example.com>
- 3 files changed, 32 insertions(+), 13 deletions(-)
- create mode 100644 file2
- create mode 100644 file3
-[patchid b0e76a3] patchid 2
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 21 deletions(-)
-[patchid e905b62] patchid 3
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'empty'
-[empty 289be11] empty commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 4014.2 'format-patch --ignore-if-in-upstream': 
-	git format-patch --stdout main..side >patch0 &&
-	grep "^From " patch0 >from0 &&
-	test_line_count = 3 from0
-
-ok 2 - format-patch --ignore-if-in-upstream
-
-expecting success of 4014.3 'format-patch --ignore-if-in-upstream': 
-	git format-patch --stdout \
-		--ignore-if-in-upstream main..side >patch1 &&
-	grep "^From " patch1 >from1 &&
-	test_line_count = 2 from1
+expecting success of 4018.2 'setup: test-tool userdiff': 
+	# Make sure additions to builtin_drivers are sorted
+	test_when_finished "rm builtin-drivers.sorted" &&
+	test-tool userdiff list-builtin-drivers >builtin-drivers &&
+	test_file_not_empty builtin-drivers &&
+	sort <builtin-drivers >builtin-drivers.sorted &&
+	test_cmp builtin-drivers.sorted builtin-drivers &&
 
-ok 3 - format-patch --ignore-if-in-upstream
+	# Ditto, but "custom" requires the .git directory and config
+	# to be setup and read.
+	test_when_finished "rm custom-drivers.sorted" &&
+	test-tool userdiff list-custom-drivers >custom-drivers &&
+	test_file_not_empty custom-drivers &&
+	sort <custom-drivers >custom-drivers.sorted &&
+	test_cmp custom-drivers.sorted custom-drivers
 
-expecting success of 4014.4 'format-patch --ignore-if-in-upstream handles tags': 
-	git tag -a v1 -m tag side &&
-	git tag -a v2 -m tag main &&
-	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
-	grep "^From " patch1 >from1 &&
-	test_line_count = 2 from1
+ok 2 - setup: test-tool userdiff
 
-ok 4 - format-patch --ignore-if-in-upstream handles tags
+expecting success of 4018.3 'builtin ada pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 3 - builtin ada pattern compiles
 
-expecting success of 4014.5 'format-patch doesn't consider merge commits': 
-	git checkout -b feature main &&
-	echo "Another line" >>file &&
-	test_tick &&
-	git commit -am "Feature branch change #1" &&
-	echo "Yet another line" >>file &&
-	test_tick &&
-	git commit -am "Feature branch change #2" &&
-	git checkout -b merger main &&
-	test_tick &&
-	git merge --no-ff feature &&
-	git format-patch -3 --stdout >patch &&
-	grep "^From " patch >from &&
-	test_line_count = 3 from
+expecting success of 4018.4 'builtin ada wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 4 - builtin ada wordRegex pattern compiles
 
-Switched to a new branch 'feature'
-[feature a59b7ab] Feature branch change #1
+expecting success of 4018.5 'builtin ada pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to a new branch 'master'
+[master (root-commit) 09f480a] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[feature 099a2d9] Feature branch change #2
+ 6 files changed, 31 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 A.java
+ create mode 100644 B.java
+ create mode 100644 builtin-drivers
+ create mode 100644 custom-drivers
+ create mode 100644 msg
+Switched to a new branch 'branchA'
+[branchA d2d1668] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'merger'
-Merge made by the 'ort' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 5 - format-patch doesn't consider merge commits
-
-expecting success of 4014.6 'format-patch result applies': 
-	git checkout -b rebuild-0 main &&
-	git am -3 patch0 &&
-	git rev-list main.. >list &&
-	test_line_count = 2 list
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 5 - builtin ada pattern compiles on bare repo with --attr-source
 
-Switched to a new branch 'rebuild-0'
-Applying: Side changes #1
-Applying: Side changes #2
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-670fb98 Side changes #1
-virtual Side changes #2
-found 1 common ancestor:
-virtual 8359489d93991065cdaa748bd96dcb831b3d60ca
-No changes -- Patch already applied.
-Applying: Side changes #3 with \n backslash-n in it.
-ok 6 - format-patch result applies
+expecting success of 4018.6 'builtin bash pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 6 - builtin bash pattern compiles
 
-expecting success of 4014.7 'format-patch --ignore-if-in-upstream result applies': 
-	git checkout -b rebuild-1 main &&
-	git am -3 patch1 &&
-	git rev-list main.. >list &&
-	test_line_count = 2 list
+expecting success of 4018.7 'builtin bash wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 7 - builtin bash wordRegex pattern compiles
 
-Switched to a new branch 'rebuild-1'
-Applying: Side changes #1
-Applying: Side changes #3 with \n backslash-n in it.
-ok 7 - format-patch --ignore-if-in-upstream result applies
+expecting success of 4018.8 'builtin bash pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 76aba7f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 2a04301] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 8 - builtin bash pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.8 'commit did not screw up the log message': 
-	git cat-file commit side >actual &&
-	grep "^Side .* with .* backslash-n" actual
+expecting success of 4018.9 'builtin bibtex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 9 - builtin bibtex pattern compiles
 
-Side changes #3 with \n backslash-n in it.
-ok 8 - commit did not screw up the log message
+expecting success of 4018.10 'builtin bibtex wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 10 - builtin bibtex wordRegex pattern compiles
+
+expecting success of 4018.11 'builtin bibtex pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 07560b6] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 3d6becf] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 11 - builtin bibtex pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.12 'builtin cpp pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 12 - builtin cpp pattern compiles
+
+expecting success of 4018.13 'builtin cpp wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 13 - builtin cpp wordRegex pattern compiles
+
+expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 421387d] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 41525d0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 14 - builtin cpp pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.15 'builtin csharp pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 15 - builtin csharp pattern compiles
+
+expecting success of 4018.16 'builtin csharp wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 16 - builtin csharp wordRegex pattern compiles
+
+expecting success of 4018.17 'builtin csharp pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 1baa7f2] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA c0f2914] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 17 - builtin csharp pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.18 'builtin css pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 18 - builtin css pattern compiles
+
+expecting success of 4018.19 'builtin css wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 19 - builtin css wordRegex pattern compiles
+
+expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 5bdd255] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 54fe80d] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 20 - builtin css pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.21 'builtin dts pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 21 - builtin dts pattern compiles
+
+expecting success of 4018.22 'builtin dts wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 22 - builtin dts wordRegex pattern compiles
+
+expecting success of 4018.23 'builtin dts pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master aa94590] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 0284640] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 23 - builtin dts pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.24 'builtin elixir pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 24 - builtin elixir pattern compiles
+
+expecting success of 4018.25 'builtin elixir wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 25 - builtin elixir wordRegex pattern compiles
+
+expecting success of 4018.26 'builtin elixir pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 91672cc] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA b439317] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 26 - builtin elixir pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.27 'builtin fortran pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 27 - builtin fortran pattern compiles
+
+expecting success of 4018.28 'builtin fortran wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 28 - builtin fortran wordRegex pattern compiles
+
+expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 07df8aa] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d0563d5] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.30 'builtin fountain pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 30 - builtin fountain pattern compiles
+
+expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 31 - builtin fountain wordRegex pattern compiles
+
+expecting success of 4018.32 'builtin fountain pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fe25a8f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9c43ead] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 32 - builtin fountain pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.33 'builtin golang pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 33 - builtin golang pattern compiles
+
+expecting success of 4018.34 'builtin golang wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 34 - builtin golang wordRegex pattern compiles
+
+expecting success of 4018.35 'builtin golang pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4856536] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA e93a5a9] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 35 - builtin golang pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.36 'builtin html pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 36 - builtin html pattern compiles
+
+expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 37 - builtin html wordRegex pattern compiles
+
+expecting success of 4018.38 'builtin html pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master da316a7] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 0c6bd19] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 38 - builtin html pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.39 'builtin java pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 39 - builtin java pattern compiles
+
+expecting success of 4018.40 'builtin java wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 40 - builtin java wordRegex pattern compiles
+
+expecting success of 4018.41 'builtin java pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master c684627] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA dc9d6db] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 41 - builtin java pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.42 'builtin kotlin pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 42 - builtin kotlin pattern compiles
+
+expecting success of 4018.43 'builtin kotlin wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 43 - builtin kotlin wordRegex pattern compiles
+
+expecting success of 4018.44 'builtin kotlin pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fba906f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 411b675] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 44 - builtin kotlin pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.45 'builtin markdown pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 45 - builtin markdown pattern compiles
+
+expecting success of 4018.46 'builtin markdown wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 46 - builtin markdown wordRegex pattern compiles
+
+expecting success of 4018.47 'builtin markdown pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master a36ac80] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA b175325] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 47 - builtin markdown pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.48 'builtin matlab pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 48 - builtin matlab pattern compiles
+
+expecting success of 4018.49 'builtin matlab wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 49 - builtin matlab wordRegex pattern compiles
+
+expecting success of 4018.50 'builtin matlab pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4125614] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 96677f0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 50 - builtin matlab pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.51 'builtin objc pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 51 - builtin objc pattern compiles
+
+expecting success of 4018.52 'builtin objc wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 52 - builtin objc wordRegex pattern compiles
+
+expecting success of 4018.53 'builtin objc pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 542b906] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 40e9567] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 53 - builtin objc pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.54 'builtin pascal pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 54 - builtin pascal pattern compiles
+
+expecting success of 4018.55 'builtin pascal wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 55 - builtin pascal wordRegex pattern compiles
+
+expecting success of 4018.56 'builtin pascal pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 0e8818e] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 7f3b5d9] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 56 - builtin pascal pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.57 'builtin perl pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 57 - builtin perl pattern compiles
+
+expecting success of 4018.58 'builtin perl wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 58 - builtin perl wordRegex pattern compiles
+
+expecting success of 4018.59 'builtin perl pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master ada864b] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6fd3d2c] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 59 - builtin perl pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.60 'builtin php pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 60 - builtin php pattern compiles
+
+expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 61 - builtin php wordRegex pattern compiles
+
+expecting success of 4018.62 'builtin php pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master a9c476a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9141fd7] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 62 - builtin php pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.63 'builtin python pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 63 - builtin python pattern compiles
+
+expecting success of 4018.64 'builtin python wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 64 - builtin python wordRegex pattern compiles
+
+expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master ad7b0c8] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9820662] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 65 - builtin python pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.66 'builtin ruby pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 66 - builtin ruby pattern compiles
+
+expecting success of 4018.67 'builtin ruby wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 67 - builtin ruby wordRegex pattern compiles
+
+expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 41412bb] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6cd7147] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.69 'builtin rust pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 69 - builtin rust pattern compiles
+
+expecting success of 4018.70 'builtin rust wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 70 - builtin rust wordRegex pattern compiles
+
+expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 26ff60e] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d9df4e2] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 71 - builtin rust pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.72 'builtin scheme pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 72 - builtin scheme pattern compiles
+
+expecting success of 4018.73 'builtin scheme wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 73 - builtin scheme wordRegex pattern compiles
+
+expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 1b524cd] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA a0d1221] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.75 'builtin tex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 75 - builtin tex pattern compiles
+
+expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 76 - builtin tex wordRegex pattern compiles
+
+expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master de4ccc4] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6368b67] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 77 - builtin tex pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.78 'builtin custom1 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 78 - builtin custom1 pattern compiles
+
+expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 79 - builtin custom1 wordRegex pattern compiles
+
+expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 633ec55] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 5cb29de] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.81 'builtin custom2 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 81 - builtin custom2 pattern compiles
+
+expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 82 - builtin custom2 wordRegex pattern compiles
+
+expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 399f11a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 3432bdd] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.84 'builtin custom3 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 84 - builtin custom3 pattern compiles
+
+expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 85 - builtin custom3 wordRegex pattern compiles
+
+expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 2a95308] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 90fa73a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 86 - builtin custom3 pattern compiles on bare repo with --attr-source
+
+expecting success of 4018.87 'last regexp must not be negated': 
+	echo "*.java diff=java" >.gitattributes &&
+	test_config diff.java.funcname "!static" &&
+	test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
+	test_grep ": Last expression must not be negated:" msg
+
+fatal: Last expression must not be negated: !static
+ok 87 - last regexp must not be negated
+
+expecting success of 4018.88 'setup hunk header tests': 
+	for i in $diffpatterns
+	do
+		echo "$i-* diff=$i" || return 1
+	done > .gitattributes &&
+
+	# add all test files to the index
+	(
+		cd "$TEST_DIRECTORY"/t4018 &&
+		git --git-dir="$TRASH_DIRECTORY/.git" add .
+	) &&
+
+	# place modified files in the worktree
+	for i in $(git ls-files)
+	do
+		sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
+	done
+
+ok 88 - setup hunk header tests
+
+expecting success of 4018.89 'hunk header: README': 
+		git diff -U1 README >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ How to write RIGHT test cases
+ok 89 - hunk header: README
+
+expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
+		git diff -U1 bash-arithmetic-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 90 - hunk header: bash-arithmetic-function
+
+expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
+		git diff -U1 bash-bashism-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 91 - hunk header: bash-bashism-style-compact
+
+expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
+		git diff -U1 bash-bashism-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT {
+ok 92 - hunk header: bash-bashism-style-function
+
+expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
+		git diff -U1 bash-bashism-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
+ok 93 - hunk header: bash-bashism-style-whitespace
+
+expecting success of 4018.94 'hunk header: bash-conditional-function': 
+		git diff -U1 bash-conditional-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 94 - hunk header: bash-conditional-function
+
+expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
+		git diff -U1 bash-missing-parentheses >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 95 - hunk header: bash-missing-parentheses
+
+expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
+		git diff -U1 bash-mixed-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT(){
+ok 96 - hunk header: bash-mixed-style-compact
+
+expecting success of 4018.97 'hunk header: bash-mixed-style-function': 
+		git diff -U1 bash-mixed-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT() {
+ok 97 - hunk header: bash-mixed-style-function
+
+expecting success of 4018.98 'hunk header: bash-nested-functions': 
+		git diff -U1 bash-nested-functions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT()
+ok 98 - hunk header: bash-nested-functions
+
+expecting success of 4018.99 'hunk header: bash-other-characters': 
+		git diff -U1 bash-other-characters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ _RIGHT_0n()
+ok 99 - hunk header: bash-other-characters
+
+expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
+		git diff -U1 bash-posix-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 100 - hunk header: bash-posix-style-compact
+
+expecting success of 4018.101 'hunk header: bash-posix-style-function': 
+		git diff -U1 bash-posix-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 101 - hunk header: bash-posix-style-function
+
+expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
+		git diff -U1 bash-posix-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT 	( 	)
+ok 102 - hunk header: bash-posix-style-whitespace
+
+expecting success of 4018.103 'hunk header: bash-subshell-function': 
+		git diff -U1 bash-subshell-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 103 - hunk header: bash-subshell-function
+
+expecting success of 4018.104 'hunk header: bash-trailing-comment': 
+		git diff -U1 bash-trailing-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 104 - hunk header: bash-trailing-comment
+
+expecting success of 4018.105 'hunk header: cpp-c++-function': 
+		git diff -U1 cpp-c++-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
+ok 105 - hunk header: cpp-c++-function
+
+expecting success of 4018.106 'hunk header: cpp-class-constructor': 
+		git diff -U1 cpp-class-constructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
+ok 106 - hunk header: cpp-class-constructor
+
+expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
+		git diff -U1 cpp-class-constructor-mem-init >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
+ok 107 - hunk header: cpp-class-constructor-mem-init
+
+expecting success of 4018.108 'hunk header: cpp-class-definition': 
+		git diff -U1 cpp-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ class RIGHT
+ok 108 - hunk header: cpp-class-definition
+
+expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
+		git diff -U1 cpp-class-definition-derived >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ class RIGHT :
+ok 109 - hunk header: cpp-class-definition-derived
+
+expecting success of 4018.110 'hunk header: cpp-class-destructor': 
+		git diff -U1 cpp-class-destructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
+ok 110 - hunk header: cpp-class-destructor
+
+expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
+		git diff -U1 cpp-function-returning-global-type >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
+ok 111 - hunk header: cpp-function-returning-global-type
+
+expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
+		git diff -U1 cpp-function-returning-nested >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
+ok 112 - hunk header: cpp-function-returning-nested
+
+expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
+		git diff -U1 cpp-function-returning-pointer >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
+ok 113 - hunk header: cpp-function-returning-pointer
+
+expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
+		git diff -U1 cpp-function-returning-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
+ok 114 - hunk header: cpp-function-returning-reference
+
+expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
+		git diff -U1 cpp-gnu-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT(int arg)
+ok 115 - hunk header: cpp-gnu-style-function
+
+expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
+		git diff -U1 cpp-namespace-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ namespace RIGHT
+ok 116 - hunk header: cpp-namespace-definition
+
+expecting success of 4018.117 'hunk header: cpp-operator-definition': 
+		git diff -U1 cpp-operator-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
+ok 117 - hunk header: cpp-operator-definition
+
+expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
+		git diff -U1 cpp-skip-access-specifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
+ok 118 - hunk header: cpp-skip-access-specifiers
+
+expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
+		git diff -U1 cpp-skip-comment-block >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ struct item RIGHT(int i)
+ok 119 - hunk header: cpp-skip-comment-block
+
+expecting success of 4018.120 'hunk header: cpp-skip-labels': 
+		git diff -U1 cpp-skip-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ void RIGHT (void)
+ok 120 - hunk header: cpp-skip-labels
+
+expecting success of 4018.121 'hunk header: cpp-struct-definition': 
+		git diff -U1 cpp-struct-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ struct RIGHT {
+ok 121 - hunk header: cpp-struct-definition
+
+expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
+		git diff -U1 cpp-struct-single-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
+ok 122 - hunk header: cpp-struct-single-line
+
+expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
+		git diff -U1 cpp-template-function-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
+ok 123 - hunk header: cpp-template-function-definition
+
+expecting success of 4018.124 'hunk header: cpp-union-definition': 
+		git diff -U1 cpp-union-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ union RIGHT {
+ok 124 - hunk header: cpp-union-definition
+
+expecting success of 4018.125 'hunk header: cpp-void-c-function': 
+		git diff -U1 cpp-void-c-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ void RIGHT (void)
+ok 125 - hunk header: cpp-void-c-function
+
+expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
+		git diff -U1 csharp-exclude-assignments >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 126 - hunk header: csharp-exclude-assignments
+
+expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
+		git diff -U1 csharp-exclude-control-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -29,3 +29,3 @@ string Method(int RIGHT)
+ok 127 - hunk header: csharp-exclude-control-statements
+
+expecting success of 4018.128 'hunk header: csharp-exclude-exceptions': 
+		git diff -U1 csharp-exclude-exceptions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -24,3 +24,3 @@ string Method(int RIGHT)
+ok 128 - hunk header: csharp-exclude-exceptions
+
+expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
+		git diff -U1 csharp-exclude-generic-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 129 - hunk header: csharp-exclude-generic-method-calls
+
+expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
+		git diff -U1 csharp-exclude-init-dispose >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -17,3 +17,3 @@ string Method(int RIGHT)
+ok 130 - hunk header: csharp-exclude-init-dispose
+
+expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
+		git diff -U1 csharp-exclude-iterations >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -21,3 +21,3 @@ string Method(int RIGHT)
+ok 131 - hunk header: csharp-exclude-iterations
+
+expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
+		git diff -U1 csharp-exclude-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 132 - hunk header: csharp-exclude-method-calls
+
+expecting success of 4018.133 'hunk header: csharp-exclude-other': 
+		git diff -U1 csharp-exclude-other >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 133 - hunk header: csharp-exclude-other
+
+expecting success of 4018.134 'hunk header: csharp-method': 
+		git diff -U1 csharp-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 134 - hunk header: csharp-method
+
+expecting success of 4018.135 'hunk header: csharp-method-array': 
+		git diff -U1 csharp-method-array >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
+ok 135 - hunk header: csharp-method-array
+
+expecting success of 4018.136 'hunk header: csharp-method-explicit': 
+		git diff -U1 csharp-method-explicit >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
+ok 136 - hunk header: csharp-method-explicit
+
+expecting success of 4018.137 'hunk header: csharp-method-generics': 
+		git diff -U1 csharp-method-generics >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
+ok 137 - hunk header: csharp-method-generics
+
+expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
+		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
+ok 138 - hunk header: csharp-method-generics-alternate-spaces
+
+expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
+		git diff -U1 csharp-method-modifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
+ok 139 - hunk header: csharp-method-modifiers
+
+expecting success of 4018.140 'hunk header: csharp-method-multiline': 
+		git diff -U1 csharp-method-multiline >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method_RIGHT(
+ok 140 - hunk header: csharp-method-multiline
+
+expecting success of 4018.141 'hunk header: csharp-method-params': 
+		git diff -U1 csharp-method-params >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
+ok 141 - hunk header: csharp-method-params
+
+expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
+		git diff -U1 csharp-method-special-chars >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
+ok 142 - hunk header: csharp-method-special-chars
+
+expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
+		git diff -U1 csharp-method-with-spacing >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
+ok 143 - hunk header: csharp-method-with-spacing
+
+expecting success of 4018.144 'hunk header: csharp-property': 
+		git diff -U1 csharp-property >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ public bool RIGHT
+ok 144 - hunk header: csharp-property
+
+expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
+		git diff -U1 csharp-property-braces-same-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public bool RIGHT {
+ok 145 - hunk header: csharp-property-braces-same-line
+
+expecting success of 4018.146 'hunk header: css-attribute-value-selector': 
+		git diff -U1 css-attribute-value-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ [class*="RIGHT"] {
+ok 146 - hunk header: css-attribute-value-selector
+
+expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
+		git diff -U1 css-block-level-@-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ @keyframes RIGHT {
+ok 147 - hunk header: css-block-level-@-statements
+
+expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
+		git diff -U1 css-brace-in-col-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT label.control-label
+ok 148 - hunk header: css-brace-in-col-1
+
+expecting success of 4018.149 'hunk header: css-class-selector': 
+		git diff -U1 css-class-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ .RIGHT {
+ok 149 - hunk header: css-class-selector
+
+expecting success of 4018.150 'hunk header: css-colon-eol': 
+		git diff -U1 css-colon-eol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT h1 {
+ok 150 - hunk header: css-colon-eol
+
+expecting success of 4018.151 'hunk header: css-colon-selector': 
+		git diff -U1 css-colon-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT a:hover {
+ok 151 - hunk header: css-colon-selector
+
+expecting success of 4018.152 'hunk header: css-common': 
+		git diff -U1 css-common >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT label.control-label {
+ok 152 - hunk header: css-common
+
+expecting success of 4018.153 'hunk header: css-id-selector': 
+		git diff -U1 css-id-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ #RIGHT {
+ok 153 - hunk header: css-id-selector
+
+expecting success of 4018.154 'hunk header: css-long-selector-list': 
+		git diff -U1 css-long-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ div ul#RIGHT {
+ok 154 - hunk header: css-long-selector-list
+
+expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
+		git diff -U1 css-prop-sans-indent >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT, label.control-label {
+ok 155 - hunk header: css-prop-sans-indent
+
+expecting success of 4018.156 'hunk header: css-root-selector': 
+		git diff -U1 css-root-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ :RIGHT {
+ok 156 - hunk header: css-root-selector
+
+expecting success of 4018.157 'hunk header: css-short-selector-list': 
+		git diff -U1 css-short-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
+ok 157 - hunk header: css-short-selector-list
+
+expecting success of 4018.158 'hunk header: css-trailing-space': 
+		git diff -U1 css-trailing-space >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT label.control-label {
+ok 158 - hunk header: css-trailing-space
+
+expecting success of 4018.159 'hunk header: custom1-pattern': 
+		git diff -U1 custom1-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ int special, RIGHT;
+ok 159 - hunk header: custom1-pattern
+
+expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
+		git diff -U1 custom2-match-to-end-of-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ RIGHT_Beer
+ok 160 - hunk header: custom2-match-to-end-of-line
+
+expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
+		git diff -U1 custom3-alternation-in-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 161 - hunk header: custom3-alternation-in-pattern
+
+expecting success of 4018.162 'hunk header: dts-labels': 
+		git diff -U1 dts-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ label2: RIGHT {
+ok 162 - hunk header: dts-labels
+
+expecting success of 4018.163 'hunk header: dts-node-unitless': 
+		git diff -U1 dts-node-unitless >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT {
+ok 163 - hunk header: dts-node-unitless
+
+expecting success of 4018.164 'hunk header: dts-nodes': 
+		git diff -U1 dts-nodes >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
+ok 164 - hunk header: dts-nodes
+
+expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
+		git diff -U1 dts-nodes-boolean-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
+ok 165 - hunk header: dts-nodes-boolean-prop
+
+expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
+		git diff -U1 dts-nodes-comment1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
+ok 166 - hunk header: dts-nodes-comment1
+
+expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
+		git diff -U1 dts-nodes-comment2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
+ok 167 - hunk header: dts-nodes-comment2
+
+expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
+		git diff -U1 dts-nodes-multiline-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
+ok 168 - hunk header: dts-nodes-multiline-prop
+
+expecting success of 4018.169 'hunk header: dts-reference': 
+		git diff -U1 dts-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ &RIGHT {
+ok 169 - hunk header: dts-reference
+
+expecting success of 4018.170 'hunk header: dts-root': 
+		git diff -U1 dts-root >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 170 - hunk header: dts-root
+
+expecting success of 4018.171 'hunk header: dts-root-comment': 
+		git diff -U1 dts-root-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 171 - hunk header: dts-root-comment
+
+expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
+		git diff -U1 elixir-do-not-pick-end >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,2 +4,2 @@ defmodule RIGHT do
+ok 172 - hunk header: elixir-do-not-pick-end
+
+expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
+		git diff -U1 elixir-ex-unit-test >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ test "RIGHT" do
+ok 173 - hunk header: elixir-ex-unit-test
+
+expecting success of 4018.174 'hunk header: elixir-function': 
+		git diff -U1 elixir-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
+ok 174 - hunk header: elixir-function
+
+expecting success of 4018.175 'hunk header: elixir-macro': 
+		git diff -U1 elixir-macro >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
+ok 175 - hunk header: elixir-macro
+
+expecting success of 4018.176 'hunk header: elixir-module': 
+		git diff -U1 elixir-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ defmodule RIGHT do
+ok 176 - hunk header: elixir-module
+
+expecting success of 4018.177 'hunk header: elixir-module-func': 
+		git diff -U1 elixir-module-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ def fun(RIGHT) do
+ok 177 - hunk header: elixir-module-func
+
+expecting success of 4018.178 'hunk header: elixir-nested-module': 
+		git diff -U1 elixir-nested-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
+ok 178 - hunk header: elixir-nested-module
+
+expecting success of 4018.179 'hunk header: elixir-private-function': 
+		git diff -U1 elixir-private-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
+ok 179 - hunk header: elixir-private-function
+
+expecting success of 4018.180 'hunk header: elixir-protocol': 
+		git diff -U1 elixir-protocol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ defprotocol RIGHT do
+ok 180 - hunk header: elixir-protocol
+
+expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
+		git diff -U1 elixir-protocol-implementation >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defimpl RIGHT do
+ok 181 - hunk header: elixir-protocol-implementation
+
+expecting success of 4018.182 'hunk header: fortran-block-data': 
+		git diff -U1 fortran-block-data >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
+ok 182 - hunk header: fortran-block-data
+
+expecting success of 4018.183 'hunk header: fortran-comment': 
+		git diff -U1 fortran-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 183 - hunk header: fortran-comment
+
+expecting success of 4018.184 'hunk header: fortran-comment-keyword': 
+		git diff -U1 fortran-comment-keyword >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
+ok 184 - hunk header: fortran-comment-keyword
+
+expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
+		git diff -U1 fortran-comment-legacy >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 185 - hunk header: fortran-comment-legacy
+
+expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
+		git diff -U1 fortran-comment-legacy-star >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 186 - hunk header: fortran-comment-legacy-star
+
+expecting success of 4018.187 'hunk header: fortran-external-function': 
+		git diff -U1 fortran-external-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
+ok 187 - hunk header: fortran-external-function
+
+expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
+		git diff -U1 fortran-external-subroutine >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ subroutine RIGHT
+ok 188 - hunk header: fortran-external-subroutine
+
+expecting success of 4018.189 'hunk header: fortran-module': 
+		git diff -U1 fortran-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ module RIGHT
+ok 189 - hunk header: fortran-module
+
+expecting success of 4018.190 'hunk header: fortran-module-procedure': 
+		git diff -U1 fortran-module-procedure >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ module RIGHT
+ok 190 - hunk header: fortran-module-procedure
+
+expecting success of 4018.191 'hunk header: fortran-program': 
+		git diff -U1 fortran-program >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ program RIGHT
+ok 191 - hunk header: fortran-program
+
+expecting success of 4018.192 'hunk header: fountain-scene': 
+		git diff -U1 fountain-scene >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
+ok 192 - hunk header: fountain-scene
+
+expecting success of 4018.193 'hunk header: golang-complex-function': 
+		git diff -U1 golang-complex-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
+ok 193 - hunk header: golang-complex-function
+
+expecting success of 4018.194 'hunk header: golang-func': 
+		git diff -U1 golang-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ func RIGHT() {
+ok 194 - hunk header: golang-func
+
+expecting success of 4018.195 'hunk header: golang-interface': 
+		git diff -U1 golang-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ type RIGHT interface {
+ok 195 - hunk header: golang-interface
+
+expecting success of 4018.196 'hunk header: golang-long-func': 
+		git diff -U1 golang-long-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
+ok 196 - hunk header: golang-long-func
+
+expecting success of 4018.197 'hunk header: golang-struct': 
+		git diff -U1 golang-struct >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ type RIGHT struct {
+ok 197 - hunk header: golang-struct
+
+expecting success of 4018.198 'hunk header: java-class-brace-on-separate-line': 
+		git diff -U1 java-class-brace-on-separate-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT
+ok 198 - hunk header: java-class-brace-on-separate-line
+
+expecting success of 4018.199 'hunk header: java-class-member-function': 
+		git diff -U1 java-class-member-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 199 - hunk header: java-class-member-function
+
+expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
+		git diff -U1 java-class-space-before-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
+ok 200 - hunk header: java-class-space-before-type-parameters
+
+expecting success of 4018.201 'hunk header: java-class-type-parameters': 
+		git diff -U1 java-class-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT<A, B> {
+ok 201 - hunk header: java-class-type-parameters
+
+expecting success of 4018.202 'hunk header: java-class-type-parameters-implements': 
+		git diff -U1 java-class-type-parameters-implements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
+ok 202 - hunk header: java-class-type-parameters-implements
+
+expecting success of 4018.203 'hunk header: java-enum-constant': 
+		git diff -U1 java-enum-constant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ private enum RIGHT {
+ok 203 - hunk header: java-enum-constant
+
+expecting success of 4018.204 'hunk header: java-interface-type-parameters': 
+		git diff -U1 java-interface-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
+ok 204 - hunk header: java-interface-type-parameters
+
+expecting success of 4018.205 'hunk header: java-interface-type-parameters-extends': 
+		git diff -U1 java-interface-type-parameters-extends >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
+ok 205 - hunk header: java-interface-type-parameters-extends
+
+expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
+		git diff -U1 java-method-return-generic-bounded >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+ok 206 - hunk header: java-method-return-generic-bounded
+
+expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
+		git diff -U1 java-method-return-generic-wildcard >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
+ok 207 - hunk header: java-method-return-generic-wildcard
+
+expecting success of 4018.208 'hunk header: java-nested-field': 
+		git diff -U1 java-nested-field >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ private static class RIGHT {
+ok 208 - hunk header: java-nested-field
+
+expecting success of 4018.209 'hunk header: java-non-sealed': 
+		git diff -U1 java-non-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
+ok 209 - hunk header: java-non-sealed
+
+expecting success of 4018.210 'hunk header: java-record': 
+		git diff -U1 java-record >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
+ok 210 - hunk header: java-record
+
+expecting success of 4018.211 'hunk header: java-record-space-before-components': 
+		git diff -U1 java-record-space-before-components >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
+ok 211 - hunk header: java-record-space-before-components
+
+expecting success of 4018.212 'hunk header: java-record-type-parameters': 
+		git diff -U1 java-record-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
+ok 212 - hunk header: java-record-type-parameters
+
+expecting success of 4018.213 'hunk header: java-sealed': 
+		git diff -U1 java-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
+ok 213 - hunk header: java-sealed
+
+expecting success of 4018.214 'hunk header: java-sealed-permits': 
+		git diff -U1 java-sealed-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
+ok 214 - hunk header: java-sealed-permits
+
+expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
+		git diff -U1 java-sealed-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
+ok 215 - hunk header: java-sealed-type-parameters
+
+expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
+		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
+ok 216 - hunk header: java-sealed-type-parameters-implements-permits
+
+expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
+		git diff -U1 java-sealed-type-parameters-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
+ok 217 - hunk header: java-sealed-type-parameters-permits
+
+expecting success of 4018.218 'hunk header: kotlin-class': 
+		git diff -U1 kotlin-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ class RIGHT {
+ok 218 - hunk header: kotlin-class
+
+expecting success of 4018.219 'hunk header: kotlin-enum-class': 
+		git diff -U1 kotlin-enum-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ enum class RIGHT{
+ok 219 - hunk header: kotlin-enum-class
+
+expecting success of 4018.220 'hunk header: kotlin-fun': 
+		git diff -U1 kotlin-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ fun RIGHT(){
+ok 220 - hunk header: kotlin-fun
+
+expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
+		git diff -U1 kotlin-inheritace-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ open class RIGHT{
+ok 221 - hunk header: kotlin-inheritace-class
+
+expecting success of 4018.222 'hunk header: kotlin-inline-class': 
+		git diff -U1 kotlin-inline-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ value class RIGHT(Args){
+ok 222 - hunk header: kotlin-inline-class
+
+expecting success of 4018.223 'hunk header: kotlin-interface': 
+		git diff -U1 kotlin-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ interface RIGHT{
+ok 223 - hunk header: kotlin-interface
+
+expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
+		git diff -U1 kotlin-nested-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
+ok 224 - hunk header: kotlin-nested-fun
+
+expecting success of 4018.225 'hunk header: kotlin-public-class': 
+		git diff -U1 kotlin-public-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ public class RIGHT{
+ok 225 - hunk header: kotlin-public-class
+
+expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
+		git diff -U1 kotlin-sealed-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ sealed class RIGHT {
+ok 226 - hunk header: kotlin-sealed-class
+
+expecting success of 4018.227 'hunk header: markdown-heading-indented': 
+		git diff -U1 markdown-heading-indented >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,2 +5,2 @@    ### RIGHT
+ok 227 - hunk header: markdown-heading-indented
+
+expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
+		git diff -U1 markdown-heading-non-headings >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -16,2 +16,2 @@ # RIGHT
+ok 228 - hunk header: markdown-heading-non-headings
+
+expecting success of 4018.229 'hunk header: matlab-class-definition': 
+		git diff -U1 matlab-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ classdef RIGHT
+ok 229 - hunk header: matlab-class-definition
+
+expecting success of 4018.230 'hunk header: matlab-function': 
+		git diff -U1 matlab-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function y = RIGHT()
+ok 230 - hunk header: matlab-function
+
+expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
+		git diff -U1 matlab-octave-section-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ %%% RIGHT section
+ok 231 - hunk header: matlab-octave-section-1
+
+expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
+		git diff -U1 matlab-octave-section-2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ ## RIGHT section
+ok 232 - hunk header: matlab-octave-section-2
+
+expecting success of 4018.233 'hunk header: matlab-section': 
+		git diff -U1 matlab-section >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ %% RIGHT section
+ok 233 - hunk header: matlab-section
+
+expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
+		git diff -U1 perl-skip-end-of-heredoc >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
+ok 234 - hunk header: perl-skip-end-of-heredoc
+
+expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
+		git diff -U1 perl-skip-forward-decl >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,2 +9,2 @@ package RIGHT;
+ok 235 - hunk header: perl-skip-forward-decl
+
+expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
+		git diff -U1 perl-skip-sub-in-pod >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
+ok 236 - hunk header: perl-skip-sub-in-pod
+
+expecting success of 4018.237 'hunk header: perl-sub-definition': 
+		git diff -U1 perl-sub-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ sub RIGHT {
+ok 237 - hunk header: perl-sub-definition
+
+expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
+		git diff -U1 perl-sub-definition-kr-brace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ sub RIGHT
+ok 238 - hunk header: perl-sub-definition-kr-brace
+
+expecting success of 4018.239 'hunk header: php-abstract-class': 
+		git diff -U1 php-abstract-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ abstract class RIGHT
+ok 239 - hunk header: php-abstract-class
+
+expecting success of 4018.240 'hunk header: php-abstract-method': 
+		git diff -U1 php-abstract-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
+ok 240 - hunk header: php-abstract-method
+
+expecting success of 4018.241 'hunk header: php-class': 
+		git diff -U1 php-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ class RIGHT
+ok 241 - hunk header: php-class
+
+expecting success of 4018.242 'hunk header: php-enum': 
+		git diff -U1 php-enum >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ enum RIGHT: string
+ok 242 - hunk header: php-enum
+
+expecting success of 4018.243 'hunk header: php-final-class': 
+		git diff -U1 php-final-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ final class RIGHT
+ok 243 - hunk header: php-final-class
+
+expecting success of 4018.244 'hunk header: php-final-method': 
+		git diff -U1 php-final-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ final public function RIGHT(): string
+ok 244 - hunk header: php-final-method
+
+expecting success of 4018.245 'hunk header: php-function': 
+		git diff -U1 php-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT()
+ok 245 - hunk header: php-function
+
+expecting success of 4018.246 'hunk header: php-interface': 
+		git diff -U1 php-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ interface RIGHT
+ok 246 - hunk header: php-interface
+
+expecting success of 4018.247 'hunk header: php-method': 
+		git diff -U1 php-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public static function RIGHT()
+ok 247 - hunk header: php-method
+
+expecting success of 4018.248 'hunk header: php-trait': 
+		git diff -U1 php-trait >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ trait RIGHT
+ok 248 - hunk header: php-trait
+
+expecting success of 4018.249 'hunk header: python-async-def': 
+		git diff -U1 python-async-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ async def RIGHT(pi: int = 3.14):
+ok 249 - hunk header: python-async-def
+
+expecting success of 4018.250 'hunk header: python-class': 
+		git diff -U1 python-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ class RIGHT(int, str):
+ok 250 - hunk header: python-class
+
+expecting success of 4018.251 'hunk header: python-def': 
+		git diff -U1 python-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ def RIGHT(pi: int = 3.14):
+ok 251 - hunk header: python-def
+
+expecting success of 4018.252 'hunk header: python-indented-async-def': 
+		git diff -U1 python-indented-async-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ async def RIGHT(self, x: int):
+ok 252 - hunk header: python-indented-async-def
+
+expecting success of 4018.253 'hunk header: python-indented-class': 
+		git diff -U1 python-indented-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,2 +4,2 @@ class RIGHT:
+ok 253 - hunk header: python-indented-class
+
+expecting success of 4018.254 'hunk header: python-indented-def': 
+		git diff -U1 python-indented-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ def RIGHT(self, x: int):
+ok 254 - hunk header: python-indented-def
+
+expecting success of 4018.255 'hunk header: rust-fn': 
+		git diff -U1 rust-fn >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
+ok 255 - hunk header: rust-fn
+
+expecting success of 4018.256 'hunk header: rust-impl': 
+		git diff -U1 rust-impl >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ impl<'a, T: AsRef<[u8]>>  std::RIGHT for Git<'a> {
+ok 256 - hunk header: rust-impl
+
+expecting success of 4018.257 'hunk header: rust-macro-rules': 
+		git diff -U1 rust-macro-rules >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ macro_rules! RIGHT {
+ok 257 - hunk header: rust-macro-rules
+
+expecting success of 4018.258 'hunk header: rust-struct': 
+		git diff -U1 rust-struct >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ pub(super) struct RIGHT<'a> {
+ok 258 - hunk header: rust-struct
+
+expecting success of 4018.259 'hunk header: rust-trait': 
+		git diff -U1 rust-trait >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ unsafe trait RIGHT<T> {
+ok 259 - hunk header: rust-trait
+
+expecting success of 4018.260 'hunk header: scheme-class': 
+		git diff -U1 scheme-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ (class* () object% RIGHT
+ok 260 - hunk header: scheme-class
+
+expecting success of 4018.261 'hunk header: scheme-def': 
+		git diff -U1 scheme-def >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (def (some-func x y z) RIGHT
+ok 261 - hunk header: scheme-def
+
+expecting success of 4018.262 'hunk header: scheme-def-variant': 
+		git diff -U1 scheme-def-variant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (defmethod {print point} RIGHT
+ok 262 - hunk header: scheme-def-variant
+
+expecting success of 4018.263 'hunk header: scheme-define-slash-public': 
+		git diff -U1 scheme-define-slash-public >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ (define/public (foo) RIGHT
+ok 263 - hunk header: scheme-define-slash-public
+
+expecting success of 4018.264 'hunk header: scheme-define-syntax': 
+		git diff -U1 scheme-define-syntax >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ (define-syntax define-test-suite RIGHT
+ok 264 - hunk header: scheme-define-syntax
+
+expecting success of 4018.265 'hunk header: scheme-define-variant': 
+		git diff -U1 scheme-define-variant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (define* (some-func x y z) RIGHT
+ok 265 - hunk header: scheme-define-variant
+
+expecting success of 4018.266 'hunk header: scheme-library': 
+		git diff -U1 scheme-library >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ (library (my-helpers id-stuff) RIGHT
+ok 266 - hunk header: scheme-library
+
+expecting success of 4018.267 'hunk header: scheme-local-define': 
+		git diff -U1 scheme-local-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (define local-function RIGHT
+ok 267 - hunk header: scheme-local-define
+
+expecting success of 4018.268 'hunk header: scheme-module': 
+		git diff -U1 scheme-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ (module A RIGHT
+ok 268 - hunk header: scheme-module
+
+expecting success of 4018.269 'hunk header: scheme-top-level-define': 
+		git diff -U1 scheme-top-level-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
+ok 269 - hunk header: scheme-top-level-define
+
+expecting success of 4018.270 'hunk header: scheme-user-defined-define': 
+		git diff -U1 scheme-user-defined-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ (define-test-suite record\ case-tests RIGHT
+ok 270 - hunk header: scheme-user-defined-define
+
+# passed all 270 test(s)
+1..270
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4107-apply-ignore-whitespace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4107-apply-ignore-whitespace/.git/
+expecting success of 4107.1 'file creation': 
+	git apply patch1.patch
+
+ok 1 - file creation
+
+expecting success of 4107.2 'patch2 fails (retab)': 
+	test_must_fail git apply patch2.patch
+
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 2 - patch2 fails (retab)
+
+expecting success of 4107.3 'patch2 applies with --ignore-whitespace': 
+	git apply --ignore-whitespace patch2.patch
+
+ok 3 - patch2 applies with --ignore-whitespace
+
+expecting success of 4107.4 'patch2 reverse applies with --ignore-space-change': 
+	git apply -R --ignore-space-change patch2.patch
+
+ok 4 - patch2 reverse applies with --ignore-space-change
+
+expecting success of 4107.5 'patch2 applies (apply.ignorewhitespace = change)': 
+	git apply patch2.patch &&
+	test_cmp main.c.final main.c
+
+ok 5 - patch2 applies (apply.ignorewhitespace = change)
+
+expecting success of 4107.6 'patch3 fails (missing string at EOL)': 
+	test_must_fail git apply patch3.patch
+
+error: patch failed: main.c:10
+error: main.c: patch does not apply
+ok 6 - patch3 fails (missing string at EOL)
+
+expecting success of 4107.7 'patch4 fails (missing EOL at EOF)': 
+	test_must_fail git apply patch4.patch
+
+error: patch failed: main.c:21
+error: main.c: patch does not apply
+ok 7 - patch4 fails (missing EOL at EOF)
+
+expecting success of 4107.8 'patch5 fails (leading whitespace differences matter)': 
+	test_must_fail git apply patch5.patch
+
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 8 - patch5 fails (leading whitespace differences matter)
+
+expecting success of 4107.9 're-create file (with --ignore-whitespace)': 
+	rm -f main.c &&
+	git apply patch1.patch
+
+ok 9 - re-create file (with --ignore-whitespace)
+
+expecting success of 4107.10 'patch5 fails (--no-ignore-whitespace)': 
+	test_must_fail git apply --no-ignore-whitespace patch5.patch
+
+error: patch failed: main.c:2
+error: main.c: patch does not apply
+ok 10 - patch5 fails (--no-ignore-whitespace)
+
+expecting success of 4107.11 'apply --ignore-space-change --inaccurate-eof': 
+	echo 1 >file &&
+	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
+	diff --git a/file b/file
+	--- a/file
+	+++ b/file
+	@@ -1 +1 @@
+	-1
+	+2
+	EOF
+	printf 2 >expect &&
+	test_cmp expect file
+
+ok 11 - apply --ignore-space-change --inaccurate-eof
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4067-diff-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/.git/
+expecting success of 4067.1 'git show batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Cloning into bare repository 'client'...
+commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    x
+
+diff --git a/a b/a
+new file mode 100644
+index 0000000..7898192
+--- /dev/null
++++ b/a
+@@ -0,0 +1 @@
++a
+diff --git a/b b/b
+new file mode 100644
+index 0000000..6178079
+--- /dev/null
++++ b/b
+@@ -0,0 +1 @@
++b
+ok 1 - git show batches blobs
+
+expecting success of 4067.2 'diff batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo c >server/c &&
+	echo d >server/d &&
+	git -C server add c d &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master f59c7b0] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+ create mode 100644 d
+Cloning into bare repository 'client'...
+diff --git a/c b/c
+new file mode 100644
+index 0000000..f2ad6c7
+--- /dev/null
++++ b/c
+@@ -0,0 +1 @@
++c
+diff --git a/d b/d
+new file mode 100644
+index 0000000..4bcfe98
+--- /dev/null
++++ b/d
+@@ -0,0 +1 @@
++d
+ok 2 - diff batches blobs
+
+expecting success of 4067.3 'diff skips same-OID blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo another-a >server/a &&
+	git -C server add a &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+	echo b | git hash-object --stdin >hash-b &&
+
+	# Ensure that only a and another-a are fetched.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace &&
+	! grep "want $(cat hash-b)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 89f0cea] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'client'...
+diff --git a/a b/a
+index 7898192..594b61f 100644
+--- a/a
++++ b/a
+@@ -1 +1 @@
+-a
++another-a
+packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+ok 3 - diff skips same-OID blobs
+
+expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
+	test_when_finished "rm -rf sub server client trace" &&
+	test_config_global protocol.file.allow always &&
+
+	test_create_repo sub &&
+	test_commit -C sub first &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	git -C server add a &&
+	git -C server submodule add "file://$(pwd)/sub" &&
+	git -C server commit -m x &&
+
+	test_commit -C server/sub second &&
+	echo another-a >server/a &&
+	git -C server add a sub &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+
+	# Ensure that a and another-a are fetched, and check (by successful
+	# execution of the diff) that no invalid OIDs are sent.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/sub/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/sub'...
+[master (root-commit) 3ebacb4] x
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a
+ create mode 160000 sub
+[master d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master bb7fe7e] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Cloning into bare repository 'client'...
+diff --git a/a b/a
+index 7898192..594b61f 100644
+--- a/a
++++ b/a
+@@ -1 +1 @@
+-a
++another-a
+diff --git a/sub b/sub
+index 50e526b..d662100 160000
+--- a/sub
++++ b/sub
+@@ -1 +1 @@
+-Subproject commit 50e526bb426771f6036ad3a8b0c81d511d91fc2a
++Subproject commit d66210046212a498d8c1a48eab414bc6df166f85
+packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+ok 4 - when fetching missing objects, diff skips GITLINKs
+
+expecting success of 4067.5 'diff with rename detection batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	rm server/b &&
+	printf "b\nb\nb\nb\nbX\n" >server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
+	grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 263bf49] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename b => c (72%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e f46cdb7 R072	b	c
+ok 5 - diff with rename detection batches blobs
+
+expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	mv server/b server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 2759f1d] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 33db23e R100	b	c
+ok 6 - diff does not fetch anything if inexact rename detection is not needed
+
+expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	printf "c\nc\nc\nc\nc\n" >server/b &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace &&
+
+	# But with --break-rewrites, ensure that there is exactly 1 negotiation
+	# by checking that there is only 1 "done" line sent. ("done" marks the
+	# end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 3aba490] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 6e7ada2 M	b
+:100644 100644 33db23e 6e7ada2 M	b
+ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4110-apply-scan/.git/
+expecting success of 4110.1 'git apply scan': 
+	git apply \
+		"$TEST_DIRECTORY/t4110/patch1.patch" \
+		"$TEST_DIRECTORY/t4110/patch2.patch" \
+		"$TEST_DIRECTORY/t4110/patch3.patch" \
+		"$TEST_DIRECTORY/t4110/patch4.patch" \
+		"$TEST_DIRECTORY/t4110/patch5.patch" &&
+	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
+
+ok 1 - git apply scan
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4109-apply-multifrag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4109-apply-multifrag/.git/
+expecting success of 4109.1 'git apply (1)': 
+	git apply patch1.patch patch2.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+patch2.patch:58: new blank line at EOF.
++
+warning: 2 lines add whitespace errors.
+ok 1 - git apply (1)
+
+expecting success of 4109.2 'git apply (2)': 
+	git apply patch1.patch patch2.patch patch3.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+patch2.patch:58: new blank line at EOF.
++
+warning: 2 lines add whitespace errors.
+ok 2 - git apply (2)
+
+expecting success of 4109.3 'git apply (3)': 
+	git apply patch1.patch patch4.patch &&
+	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
+
+patch1.patch:28: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+ok 3 - git apply (3)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4014-format-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4014-format-patch/.git/
+expecting success of 4014.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
+	cat file >elif &&
+	git add file elif &&
+	test_tick &&
+	git commit -m Initial &&
+	git checkout -b side &&
+
+	test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
+	test_chmod +x elif &&
+	test_tick &&
+	git commit -m "Side changes #1" &&
+
+	test_write_lines D E F >>file &&
+	git update-index file &&
+	test_tick &&
+	git commit -m "Side changes #2" &&
+	git tag C2 &&
+
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
+	git update-index file &&
+	test_tick &&
+	git commit -m "Side changes #3 with \\n backslash-n in it." &&
+
+	git checkout main &&
+	git diff-tree -p C2 >patch &&
+	git apply --index <patch &&
+	test_tick &&
+	git commit -m "Main accepts moral equivalent of #2" &&
+
+	git checkout side &&
+	git checkout -b patchid &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
+	test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
+	test_write_lines 8 9 10 >file &&
+	git add file file2 file3 &&
+	test_tick &&
+	git commit -m "patchid 1" &&
+	test_write_lines 4 A B 7 8 9 10 >file2 &&
+	test_write_lines 8 9 10 5 6 >file3 &&
+	git add file2 file3 &&
+	test_tick &&
+	git commit -m "patchid 2" &&
+	test_write_lines 10 5 6 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m "patchid 3" &&
+
+	git checkout -b empty main &&
+	test_tick &&
+	git commit --allow-empty -m "empty commit" &&
+
+	git checkout main
+
+[main (root-commit) e27066e] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 20 insertions(+)
+ create mode 100644 elif
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 1135adf] Side changes #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
+[side fd00575] Side changes #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+[side 18ed22a] Side changes #3 with \n backslash-n in it.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Switched to branch 'main'
+[main 333d5cb] Main accepts moral equivalent of #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Switched to branch 'side'
+Switched to a new branch 'patchid'
+[patchid 866b619] patchid 1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 32 insertions(+), 13 deletions(-)
+ create mode 100644 file2
+ create mode 100644 file3
+[patchid b0e76a3] patchid 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 21 deletions(-)
+[patchid e905b62] patchid 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'empty'
+[empty 289be11] empty commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 4014.2 'format-patch --ignore-if-in-upstream': 
+	git format-patch --stdout main..side >patch0 &&
+	grep "^From " patch0 >from0 &&
+	test_line_count = 3 from0
+
+ok 2 - format-patch --ignore-if-in-upstream
+
+expecting success of 4014.3 'format-patch --ignore-if-in-upstream': 
+	git format-patch --stdout \
+		--ignore-if-in-upstream main..side >patch1 &&
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
+
+ok 3 - format-patch --ignore-if-in-upstream
+
+expecting success of 4014.4 'format-patch --ignore-if-in-upstream handles tags': 
+	git tag -a v1 -m tag side &&
+	git tag -a v2 -m tag main &&
+	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
+
+ok 4 - format-patch --ignore-if-in-upstream handles tags
+
+expecting success of 4014.5 'format-patch doesn't consider merge commits': 
+	git checkout -b feature main &&
+	echo "Another line" >>file &&
+	test_tick &&
+	git commit -am "Feature branch change #1" &&
+	echo "Yet another line" >>file &&
+	test_tick &&
+	git commit -am "Feature branch change #2" &&
+	git checkout -b merger main &&
+	test_tick &&
+	git merge --no-ff feature &&
+	git format-patch -3 --stdout >patch &&
+	grep "^From " patch >from &&
+	test_line_count = 3 from
+
+Switched to a new branch 'feature'
+[feature a59b7ab] Feature branch change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[feature 099a2d9] Feature branch change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'merger'
+Merge made by the 'ort' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 5 - format-patch doesn't consider merge commits
+
+expecting success of 4014.6 'format-patch result applies': 
+	git checkout -b rebuild-0 main &&
+	git am -3 patch0 &&
+	git rev-list main.. >list &&
+	test_line_count = 2 list
+
+Switched to a new branch 'rebuild-0'
+Applying: Side changes #1
+Applying: Side changes #2
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+670fb98 Side changes #1
+virtual Side changes #2
+found 1 common ancestor:
+virtual 8359489d93991065cdaa748bd96dcb831b3d60ca
+No changes -- Patch already applied.
+Applying: Side changes #3 with \n backslash-n in it.
+ok 6 - format-patch result applies
+
+expecting success of 4014.7 'format-patch --ignore-if-in-upstream result applies': 
+	git checkout -b rebuild-1 main &&
+	git am -3 patch1 &&
+	git rev-list main.. >list &&
+	test_line_count = 2 list
+
+Switched to a new branch 'rebuild-1'
+Applying: Side changes #1
+Applying: Side changes #3 with \n backslash-n in it.
+ok 7 - format-patch --ignore-if-in-upstream result applies
+
+expecting success of 4014.8 'commit did not screw up the log message': 
+	git cat-file commit side >actual &&
+	grep "^Side .* with .* backslash-n" actual
+
+Side changes #3 with \n backslash-n in it.
+ok 8 - commit did not screw up the log message
 
 expecting success of 4014.9 'format-patch did not screw up the log message': 
 	grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
@@ -258528,8 +262212,8 @@
 	! test_cmp fail actual2
 
 Switched to branch 'patchid'
---- fail	2026-04-19 19:19:36.935659440 +0000
-+++ actual1	2026-04-19 19:19:36.571659440 +0000
+--- fail	2025-03-17 13:22:10.441021787 +0000
++++ actual1	2025-03-17 13:22:09.989018930 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -258540,8 +262224,8 @@
  -- 
  2.49.0.395.g12beb8f557c
  
---- fail	2026-04-19 19:19:36.935659440 +0000
-+++ actual2	2026-04-19 19:19:36.615659440 +0000
+--- fail	2025-03-17 13:22:10.441021787 +0000
++++ actual2	2025-03-17 13:22:10.045019284 +0000
 @@ -1,7 +1,7 @@
  
  base-commit: 18ed22aae56367787c36a882bd61281e07994f11
@@ -259013,4035 +262697,317 @@
 1..212
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4107-apply-ignore-whitespace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4107-apply-ignore-whitespace/.git/
-expecting success of 4107.1 'file creation': 
-	git apply patch1.patch
+*** t4112-apply-renames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4112-apply-renames/.git/
+expecting success of 4112.1 'check rename/copy patch': git apply --check patch
+ok 1 - check rename/copy patch
 
-ok 1 - file creation
+expecting success of 4112.2 'apply rename/copy patch': git apply --index patch
+ok 2 - apply rename/copy patch
 
-expecting success of 4107.2 'patch2 fails (retab)': 
-	test_must_fail git apply patch2.patch
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4060-diff-submodule-option-diff-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
+expecting success of 4060.1 'setup repository': 
+	test_create_repo sm1 &&
+	add_file . foo &&
+	head1=$(add_file sm1 foo1 foo2) &&
+	fullhead1=$(git -C sm1 rev-parse --verify HEAD)
 
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 2 - patch2 fails (retab)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
+36d39d8
+ok 1 - setup repository
 
-expecting success of 4107.3 'patch2 applies with --ignore-whitespace': 
-	git apply --ignore-whitespace patch2.patch
+expecting success of 4060.2 'added submodule': 
+	git add sm1 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo2 b/sm1/foo2
+	new file mode 100644
+	index 0000000..54b060e
+	--- /dev/null
+	+++ b/sm1/foo2
+	@@ -0,0 +1 @@
+	+foo2
+	EOF
+	diff_cmp expected actual
 
-ok 3 - patch2 applies with --ignore-whitespace
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 2 - added submodule
 
-expecting success of 4107.4 'patch2 reverse applies with --ignore-space-change': 
-	git apply -R --ignore-space-change patch2.patch
+expecting success of 4060.3 'added submodule, set diff.submodule': 
+	test_config diff.submodule log &&
+	git add sm1 &&
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 0000000...$head1 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo2 b/sm1/foo2
+	new file mode 100644
+	index 0000000..54b060e
+	--- /dev/null
+	+++ b/sm1/foo2
+	@@ -0,0 +1 @@
+	+foo2
+	EOF
+	diff_cmp expected actual
 
-ok 4 - patch2 reverse applies with --ignore-space-change
+ok 3 - added submodule, set diff.submodule
 
-expecting success of 4107.5 'patch2 applies (apply.ignorewhitespace = change)': 
-	git apply patch2.patch &&
-	test_cmp main.c.final main.c
+expecting success of 4060.4 '--submodule=short overrides diff.submodule': 
+	test_config diff.submodule log &&
+	git add sm1 &&
+	git diff --submodule=short --cached >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	diff_cmp expected actual
 
-ok 5 - patch2 applies (apply.ignorewhitespace = change)
+ok 4 - --submodule=short overrides diff.submodule
 
-expecting success of 4107.6 'patch3 fails (missing string at EOL)': 
-	test_must_fail git apply patch3.patch
+expecting success of 4060.5 'diff.submodule does not affect plumbing': 
+	test_config diff.submodule log &&
+	git diff-index -p HEAD >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	new file mode 160000
+	index 0000000..$head1
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+Subproject commit $fullhead1
+	EOF
+	diff_cmp expected actual
 
-error: patch failed: main.c:10
-error: main.c: patch does not apply
-ok 6 - patch3 fails (missing string at EOL)
+ok 5 - diff.submodule does not affect plumbing
 
-expecting success of 4107.7 'patch4 fails (missing EOL at EOF)': 
-	test_must_fail git apply patch4.patch
+expecting success of 4060.6 'modified submodule(forward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	diff --git a/sm1/foo3 b/sm1/foo3
+	new file mode 100644
+	index 0000000..c1ec6c6
+	--- /dev/null
+	+++ b/sm1/foo3
+	@@ -0,0 +1 @@
+	+foo3
+	EOF
+	diff_cmp expected actual
 
-error: patch failed: main.c:21
-error: main.c: patch does not apply
-ok 7 - patch4 fails (missing EOL at EOF)
+ok 6 - modified submodule(forward)
 
-expecting success of 4107.8 'patch5 fails (leading whitespace differences matter)': 
-	test_must_fail git apply patch5.patch
+expecting success of 4060.7 'modified submodule(forward)': 
+	git diff --submodule=diff >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	diff --git a/sm1/foo3 b/sm1/foo3
+	new file mode 100644
+	index 0000000..c1ec6c6
+	--- /dev/null
+	+++ b/sm1/foo3
+	@@ -0,0 +1 @@
+	+foo3
+	EOF
+	diff_cmp expected actual
 
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 8 - patch5 fails (leading whitespace differences matter)
+ok 7 - modified submodule(forward)
 
-expecting success of 4107.9 're-create file (with --ignore-whitespace)': 
-	rm -f main.c &&
-	git apply patch1.patch
+expecting success of 4060.8 'modified submodule(forward) --submodule': 
+	git diff --submodule >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head1..$head2:
+	  > Add foo3 ($added foo3)
+	EOF
+	diff_cmp expected actual
 
-ok 9 - re-create file (with --ignore-whitespace)
+ok 8 - modified submodule(forward) --submodule
 
-expecting success of 4107.10 'patch5 fails (--no-ignore-whitespace)': 
-	test_must_fail git apply --no-ignore-whitespace patch5.patch
+expecting success of 4060.9 'modified submodule(forward) --submodule=short': 
+	git diff --submodule=short >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	index $head1..$head2 160000
+	--- a/sm1
+	+++ b/sm1
+	@@ -1 +1 @@
+	-Subproject commit $fullhead1
+	+Subproject commit $fullhead2
+	EOF
+	diff_cmp expected actual
 
-error: patch failed: main.c:2
-error: main.c: patch does not apply
-ok 10 - patch5 fails (--no-ignore-whitespace)
+ok 9 - modified submodule(forward) --submodule=short
 
-expecting success of 4107.11 'apply --ignore-space-change --inaccurate-eof': 
-	echo 1 >file &&
-	git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
-	diff --git a/file b/file
-	--- a/file
-	+++ b/file
-	@@ -1 +1 @@
-	-1
-	+2
+expecting success of 4060.10 'modified submodule(backward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2..$head3 (rewind):
+	diff --git a/sm1/foo2 b/sm1/foo2
+	deleted file mode 100644
+	index 54b060e..0000000
+	--- a/sm1/foo2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo2
+	diff --git a/sm1/foo3 b/sm1/foo3
+	deleted file mode 100644
+	index c1ec6c6..0000000
+	--- a/sm1/foo3
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo3
 	EOF
-	printf 2 >expect &&
-	test_cmp expect file
+	diff_cmp expected actual
 
-ok 11 - apply --ignore-space-change --inaccurate-eof
+ok 10 - modified submodule(backward)
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4067-diff-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/.git/
-expecting success of 4067.1 'git show batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
+expecting success of 4060.11 'modified submodule(backward and forward)': 
+	git diff-index -p --submodule=diff HEAD >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head2...$head4:
+	diff --git a/sm1/foo2 b/sm1/foo2
+	deleted file mode 100644
+	index 54b060e..0000000
+	--- a/sm1/foo2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo2
+	diff --git a/sm1/foo3 b/sm1/foo3
+	deleted file mode 100644
+	index c1ec6c6..0000000
+	--- a/sm1/foo3
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo3
+	diff --git a/sm1/foo4 b/sm1/foo4
+	new file mode 100644
+	index 0000000..a0016db
+	--- /dev/null
+	+++ b/sm1/foo4
+	@@ -0,0 +1 @@
+	+foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	new file mode 100644
+	index 0000000..d6f2413
+	--- /dev/null
+	+++ b/sm1/foo5
+	@@ -0,0 +1 @@
+	+foo5
+	EOF
+	diff_cmp expected actual
 
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
+ok 11 - modified submodule(backward and forward)
 
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+expecting success of 4060.12 'typechanged submodule(submodule->blob), --cached': 
+	git diff --submodule=diff --cached >actual &&
+	cat >expected <<-EOF &&
+	Submodule sm1 $head4...0000000 (submodule deleted)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	deleted file mode 100644
+	index 1715acd..0000000
+	--- a/sm1/foo1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo1
+	diff --git a/sm1/foo4 b/sm1/foo4
+	deleted file mode 100644
+	index a0016db..0000000
+	--- a/sm1/foo4
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	deleted file mode 100644
+	index d6f2413..0000000
+	--- a/sm1/foo5
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo5
+	diff --git a/sm1 b/sm1
+	new file mode 100644
+	index 0000000..9da5fb8
+	--- /dev/null
+	+++ b/sm1
+	@@ -0,0 +1 @@
+	+sm1
+	EOF
+	diff_cmp expected actual
 
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
+ok 12 - typechanged submodule(submodule->blob), --cached
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Cloning into bare repository 'client'...
-commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+expecting success of 4060.13 'typechanged submodule(submodule->blob)': 
+	git diff --submodule=diff >actual &&
+	cat >expected <<-EOF &&
+	diff --git a/sm1 b/sm1
+	deleted file mode 100644
+	index 9da5fb8..0000000
+	--- a/sm1
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-sm1
+	Submodule sm1 0000000...$head4 (new submodule)
+	diff --git a/sm1/foo1 b/sm1/foo1
+	new file mode 100644
+	index 0000000..1715acd
+	--- /dev/null
+	+++ b/sm1/foo1
+	@@ -0,0 +1 @@
+	+foo1
+	diff --git a/sm1/foo4 b/sm1/foo4
+	new file mode 100644
+	index 0000000..a0016db
+	--- /dev/null
+	+++ b/sm1/foo4
+	@@ -0,0 +1 @@
+	+foo4
+	diff --git a/sm1/foo5 b/sm1/foo5
+	new file mode 100644
+	index 0000000..d6f2413
+	--- /dev/null
+	+++ b/sm1/foo5
+	@@ -0,0 +1 @@
+	+foo5
+	EOF
+	diff_cmp expected actual
 
-    x
-
-diff --git a/a b/a
-new file mode 100644
-index 0000000..7898192
---- /dev/null
-+++ b/a
-@@ -0,0 +1 @@
-+a
-diff --git a/b b/b
-new file mode 100644
-index 0000000..6178079
---- /dev/null
-+++ b/b
-@@ -0,0 +1 @@
-+b
-ok 1 - git show batches blobs
-
-expecting success of 4067.2 'diff batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo c >server/c &&
-	echo d >server/d &&
-	git -C server add c d &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master f59c7b0] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
- create mode 100644 d
-Cloning into bare repository 'client'...
-diff --git a/c b/c
-new file mode 100644
-index 0000000..f2ad6c7
---- /dev/null
-+++ b/c
-@@ -0,0 +1 @@
-+c
-diff --git a/d b/d
-new file mode 100644
-index 0000000..4bcfe98
---- /dev/null
-+++ b/d
-@@ -0,0 +1 @@
-+d
-ok 2 - diff batches blobs
-
-expecting success of 4067.3 'diff skips same-OID blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo another-a >server/a &&
-	git -C server add a &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-	echo b | git hash-object --stdin >hash-b &&
-
-	# Ensure that only a and another-a are fetched.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace &&
-	! grep "want $(cat hash-b)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 89f0cea] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'client'...
-diff --git a/a b/a
-index 7898192..594b61f 100644
---- a/a
-+++ b/a
-@@ -1 +1 @@
--a
-+another-a
-packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-ok 3 - diff skips same-OID blobs
-
-expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
-	test_when_finished "rm -rf sub server client trace" &&
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-	test_commit -C sub first &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	git -C server add a &&
-	git -C server submodule add "file://$(pwd)/sub" &&
-	git -C server commit -m x &&
-
-	test_commit -C server/sub second &&
-	echo another-a >server/a &&
-	git -C server add a sub &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-
-	# Ensure that a and another-a are fetched, and check (by successful
-	# execution of the diff) that no invalid OIDs are sent.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/sub/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/sub'...
-[master (root-commit) 3ebacb4] x
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a
- create mode 160000 sub
-[master d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master bb7fe7e] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Cloning into bare repository 'client'...
-diff --git a/a b/a
-index 7898192..594b61f 100644
---- a/a
-+++ b/a
-@@ -1 +1 @@
--a
-+another-a
-diff --git a/sub b/sub
-index 50e526b..d662100 160000
---- a/sub
-+++ b/sub
-@@ -1 +1 @@
--Subproject commit 50e526bb426771f6036ad3a8b0c81d511d91fc2a
-+Subproject commit d66210046212a498d8c1a48eab414bc6df166f85
-packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-ok 4 - when fetching missing objects, diff skips GITLINKs
-
-expecting success of 4067.5 'diff with rename detection batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	rm server/b &&
-	printf "b\nb\nb\nb\nbX\n" >server/c &&
-	git -C server add c &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
-	grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 263bf49] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename b => c (72%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e f46cdb7 R072	b	c
-ok 5 - diff with rename detection batches blobs
-
-expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	mv server/b server/c &&
-	git -C server add c &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 2759f1d] x
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 33db23e R100	b	c
-ok 6 - diff does not fetch anything if inexact rename detection is not needed
-
-expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	printf "c\nc\nc\nc\nc\n" >server/b &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace &&
-
-	# But with --break-rewrites, ensure that there is exactly 1 negotiation
-	# by checking that there is only 1 "done" line sent. ("done" marks the
-	# end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 3aba490] x
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+), 5 deletions(-)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 6e7ada2 M	b
-:100644 100644 33db23e 6e7ada2 M	b
-ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4018-diff-funcname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4018-diff-funcname/.git/
-expecting success of 4018.1 'setup': 
-	# a non-trivial custom pattern
-	git config diff.custom1.funcname "!static
-!String
-[^ 	].*s.*" &&
-
-	# a custom pattern which matches to end of line
-	git config diff.custom2.funcname "......Beer\$" &&
-
-	# alternation in pattern
-	git config diff.custom3.funcname "Beer$" &&
-	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
-
-	# for regexp compilation tests
-	echo A >A.java &&
-	echo B >B.java
-
-ok 1 - setup
-
-expecting success of 4018.2 'setup: test-tool userdiff': 
-	# Make sure additions to builtin_drivers are sorted
-	test_when_finished "rm builtin-drivers.sorted" &&
-	test-tool userdiff list-builtin-drivers >builtin-drivers &&
-	test_file_not_empty builtin-drivers &&
-	sort <builtin-drivers >builtin-drivers.sorted &&
-	test_cmp builtin-drivers.sorted builtin-drivers &&
-
-	# Ditto, but "custom" requires the .git directory and config
-	# to be setup and read.
-	test_when_finished "rm custom-drivers.sorted" &&
-	test-tool userdiff list-custom-drivers >custom-drivers &&
-	test_file_not_empty custom-drivers &&
-	sort <custom-drivers >custom-drivers.sorted &&
-	test_cmp custom-drivers.sorted custom-drivers
-
-ok 2 - setup: test-tool userdiff
-
-expecting success of 4018.3 'builtin ada pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 3 - builtin ada pattern compiles
-
-expecting success of 4018.4 'builtin ada wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 4 - builtin ada wordRegex pattern compiles
-
-expecting success of 4018.5 'builtin ada pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to a new branch 'master'
-[master (root-commit) 09f480a] changing gitattributes
- Author: A U Thor <author@example.com>
- 6 files changed, 31 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 A.java
- create mode 100644 B.java
- create mode 100644 builtin-drivers
- create mode 100644 custom-drivers
- create mode 100644 msg
-Switched to a new branch 'branchA'
-[branchA d2d1668] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 5 - builtin ada pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.6 'builtin bash pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 6 - builtin bash pattern compiles
-
-expecting success of 4018.7 'builtin bash wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 7 - builtin bash wordRegex pattern compiles
-
-expecting success of 4018.8 'builtin bash pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 76aba7f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 2a04301] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 8 - builtin bash pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.9 'builtin bibtex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 9 - builtin bibtex pattern compiles
-
-expecting success of 4018.10 'builtin bibtex wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 10 - builtin bibtex wordRegex pattern compiles
-
-expecting success of 4018.11 'builtin bibtex pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 07560b6] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 3d6becf] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 11 - builtin bibtex pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.12 'builtin cpp pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 12 - builtin cpp pattern compiles
-
-expecting success of 4018.13 'builtin cpp wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 13 - builtin cpp wordRegex pattern compiles
-
-expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 421387d] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 41525d0] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 14 - builtin cpp pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.15 'builtin csharp pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 15 - builtin csharp pattern compiles
-
-expecting success of 4018.16 'builtin csharp wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 16 - builtin csharp wordRegex pattern compiles
-
-expecting success of 4018.17 'builtin csharp pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1baa7f2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA c0f2914] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 17 - builtin csharp pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.18 'builtin css pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 18 - builtin css pattern compiles
-
-expecting success of 4018.19 'builtin css wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 19 - builtin css wordRegex pattern compiles
-
-expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 5bdd255] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 54fe80d] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 20 - builtin css pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.21 'builtin dts pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 21 - builtin dts pattern compiles
-
-expecting success of 4018.22 'builtin dts wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 22 - builtin dts wordRegex pattern compiles
-
-expecting success of 4018.23 'builtin dts pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master aa94590] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 0284640] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 23 - builtin dts pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.24 'builtin elixir pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 24 - builtin elixir pattern compiles
-
-expecting success of 4018.25 'builtin elixir wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 25 - builtin elixir wordRegex pattern compiles
-
-expecting success of 4018.26 'builtin elixir pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 91672cc] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA b439317] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 26 - builtin elixir pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.27 'builtin fortran pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 27 - builtin fortran pattern compiles
-
-expecting success of 4018.28 'builtin fortran wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 28 - builtin fortran wordRegex pattern compiles
-
-expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 07df8aa] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d0563d5] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.30 'builtin fountain pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 30 - builtin fountain pattern compiles
-
-expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 31 - builtin fountain wordRegex pattern compiles
-
-expecting success of 4018.32 'builtin fountain pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master fe25a8f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9c43ead] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 32 - builtin fountain pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.33 'builtin golang pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 33 - builtin golang pattern compiles
-
-expecting success of 4018.34 'builtin golang wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 34 - builtin golang wordRegex pattern compiles
-
-expecting success of 4018.35 'builtin golang pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 4856536] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA e93a5a9] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 35 - builtin golang pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.36 'builtin html pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 36 - builtin html pattern compiles
-
-expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 37 - builtin html wordRegex pattern compiles
-
-expecting success of 4018.38 'builtin html pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master da316a7] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 0c6bd19] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 38 - builtin html pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.39 'builtin java pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 39 - builtin java pattern compiles
-
-expecting success of 4018.40 'builtin java wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 40 - builtin java wordRegex pattern compiles
-
-expecting success of 4018.41 'builtin java pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master c684627] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA dc9d6db] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 41 - builtin java pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.42 'builtin kotlin pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 42 - builtin kotlin pattern compiles
-
-expecting success of 4018.43 'builtin kotlin wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 43 - builtin kotlin wordRegex pattern compiles
-
-expecting success of 4018.44 'builtin kotlin pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master fba906f] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 411b675] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 44 - builtin kotlin pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.45 'builtin markdown pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 45 - builtin markdown pattern compiles
-
-expecting success of 4018.46 'builtin markdown wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 46 - builtin markdown wordRegex pattern compiles
-
-expecting success of 4018.47 'builtin markdown pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master a36ac80] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA b175325] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 47 - builtin markdown pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.48 'builtin matlab pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 48 - builtin matlab pattern compiles
-
-expecting success of 4018.49 'builtin matlab wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 49 - builtin matlab wordRegex pattern compiles
-
-expecting success of 4018.50 'builtin matlab pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 4125614] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 96677f0] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 50 - builtin matlab pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.51 'builtin objc pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 51 - builtin objc pattern compiles
-
-expecting success of 4018.52 'builtin objc wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 52 - builtin objc wordRegex pattern compiles
-
-expecting success of 4018.53 'builtin objc pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 542b906] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 40e9567] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 53 - builtin objc pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.54 'builtin pascal pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 54 - builtin pascal pattern compiles
-
-expecting success of 4018.55 'builtin pascal wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 55 - builtin pascal wordRegex pattern compiles
-
-expecting success of 4018.56 'builtin pascal pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 0e8818e] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 7f3b5d9] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 56 - builtin pascal pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.57 'builtin perl pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 57 - builtin perl pattern compiles
-
-expecting success of 4018.58 'builtin perl wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 58 - builtin perl wordRegex pattern compiles
-
-expecting success of 4018.59 'builtin perl pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ada864b] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6fd3d2c] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 59 - builtin perl pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.60 'builtin php pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 60 - builtin php pattern compiles
-
-expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 61 - builtin php wordRegex pattern compiles
-
-expecting success of 4018.62 'builtin php pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master a9c476a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9141fd7] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 62 - builtin php pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.63 'builtin python pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 63 - builtin python pattern compiles
-
-expecting success of 4018.64 'builtin python wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 64 - builtin python wordRegex pattern compiles
-
-expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ad7b0c8] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9820662] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 65 - builtin python pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.66 'builtin ruby pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 66 - builtin ruby pattern compiles
-
-expecting success of 4018.67 'builtin ruby wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 67 - builtin ruby wordRegex pattern compiles
-
-expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 41412bb] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6cd7147] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.69 'builtin rust pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 69 - builtin rust pattern compiles
-
-expecting success of 4018.70 'builtin rust wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 70 - builtin rust wordRegex pattern compiles
-
-expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 26ff60e] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d9df4e2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 71 - builtin rust pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.72 'builtin scheme pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 72 - builtin scheme pattern compiles
-
-expecting success of 4018.73 'builtin scheme wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 73 - builtin scheme wordRegex pattern compiles
-
-expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1b524cd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA a0d1221] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.75 'builtin tex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 75 - builtin tex pattern compiles
-
-expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 76 - builtin tex wordRegex pattern compiles
-
-expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master de4ccc4] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6368b67] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 77 - builtin tex pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.78 'builtin custom1 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 78 - builtin custom1 pattern compiles
-
-expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 79 - builtin custom1 wordRegex pattern compiles
-
-expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 633ec55] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 5cb29de] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.81 'builtin custom2 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 81 - builtin custom2 pattern compiles
-
-expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 82 - builtin custom2 wordRegex pattern compiles
-
-expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 399f11a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 3432bdd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.84 'builtin custom3 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 84 - builtin custom3 pattern compiles
-
-expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 85 - builtin custom3 wordRegex pattern compiles
-
-expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 2a95308] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 90fa73a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 86 - builtin custom3 pattern compiles on bare repo with --attr-source
-
-expecting success of 4018.87 'last regexp must not be negated': 
-	echo "*.java diff=java" >.gitattributes &&
-	test_config diff.java.funcname "!static" &&
-	test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
-	test_grep ": Last expression must not be negated:" msg
-
-fatal: Last expression must not be negated: !static
-ok 87 - last regexp must not be negated
-
-expecting success of 4018.88 'setup hunk header tests': 
-	for i in $diffpatterns
-	do
-		echo "$i-* diff=$i" || return 1
-	done > .gitattributes &&
-
-	# add all test files to the index
-	(
-		cd "$TEST_DIRECTORY"/t4018 &&
-		git --git-dir="$TRASH_DIRECTORY/.git" add .
-	) &&
-
-	# place modified files in the worktree
-	for i in $(git ls-files)
-	do
-		sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
-	done
-
-ok 88 - setup hunk header tests
-
-expecting success of 4018.89 'hunk header: README': 
-		git diff -U1 README >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ How to write RIGHT test cases
-ok 89 - hunk header: README
-
-expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
-		git diff -U1 bash-arithmetic-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 90 - hunk header: bash-arithmetic-function
-
-expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
-		git diff -U1 bash-bashism-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 91 - hunk header: bash-bashism-style-compact
-
-expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
-		git diff -U1 bash-bashism-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT {
-ok 92 - hunk header: bash-bashism-style-function
-
-expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
-		git diff -U1 bash-bashism-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
-ok 93 - hunk header: bash-bashism-style-whitespace
-
-expecting success of 4018.94 'hunk header: bash-conditional-function': 
-		git diff -U1 bash-conditional-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 94 - hunk header: bash-conditional-function
-
-expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
-		git diff -U1 bash-missing-parentheses >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 95 - hunk header: bash-missing-parentheses
-
-expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
-		git diff -U1 bash-mixed-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT(){
-ok 96 - hunk header: bash-mixed-style-compact
-
-expecting success of 4018.97 'hunk header: bash-mixed-style-function': 
-		git diff -U1 bash-mixed-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT() {
-ok 97 - hunk header: bash-mixed-style-function
-
-expecting success of 4018.98 'hunk header: bash-nested-functions': 
-		git diff -U1 bash-nested-functions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT()
-ok 98 - hunk header: bash-nested-functions
-
-expecting success of 4018.99 'hunk header: bash-other-characters': 
-		git diff -U1 bash-other-characters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ _RIGHT_0n()
-ok 99 - hunk header: bash-other-characters
-
-expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
-		git diff -U1 bash-posix-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 100 - hunk header: bash-posix-style-compact
-
-expecting success of 4018.101 'hunk header: bash-posix-style-function': 
-		git diff -U1 bash-posix-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 101 - hunk header: bash-posix-style-function
-
-expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
-		git diff -U1 bash-posix-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT 	( 	)
-ok 102 - hunk header: bash-posix-style-whitespace
-
-expecting success of 4018.103 'hunk header: bash-subshell-function': 
-		git diff -U1 bash-subshell-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 103 - hunk header: bash-subshell-function
-
-expecting success of 4018.104 'hunk header: bash-trailing-comment': 
-		git diff -U1 bash-trailing-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 104 - hunk header: bash-trailing-comment
-
-expecting success of 4018.105 'hunk header: cpp-c++-function': 
-		git diff -U1 cpp-c++-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
-ok 105 - hunk header: cpp-c++-function
-
-expecting success of 4018.106 'hunk header: cpp-class-constructor': 
-		git diff -U1 cpp-class-constructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
-ok 106 - hunk header: cpp-class-constructor
-
-expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
-		git diff -U1 cpp-class-constructor-mem-init >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
-ok 107 - hunk header: cpp-class-constructor-mem-init
-
-expecting success of 4018.108 'hunk header: cpp-class-definition': 
-		git diff -U1 cpp-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 108 - hunk header: cpp-class-definition
-
-expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
-		git diff -U1 cpp-class-definition-derived >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ class RIGHT :
-ok 109 - hunk header: cpp-class-definition-derived
-
-expecting success of 4018.110 'hunk header: cpp-class-destructor': 
-		git diff -U1 cpp-class-destructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
-ok 110 - hunk header: cpp-class-destructor
-
-expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
-		git diff -U1 cpp-function-returning-global-type >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
-ok 111 - hunk header: cpp-function-returning-global-type
-
-expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
-		git diff -U1 cpp-function-returning-nested >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
-ok 112 - hunk header: cpp-function-returning-nested
-
-expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
-		git diff -U1 cpp-function-returning-pointer >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
-ok 113 - hunk header: cpp-function-returning-pointer
-
-expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
-		git diff -U1 cpp-function-returning-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
-ok 114 - hunk header: cpp-function-returning-reference
-
-expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
-		git diff -U1 cpp-gnu-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT(int arg)
-ok 115 - hunk header: cpp-gnu-style-function
-
-expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
-		git diff -U1 cpp-namespace-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ namespace RIGHT
-ok 116 - hunk header: cpp-namespace-definition
-
-expecting success of 4018.117 'hunk header: cpp-operator-definition': 
-		git diff -U1 cpp-operator-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
-ok 117 - hunk header: cpp-operator-definition
-
-expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
-		git diff -U1 cpp-skip-access-specifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
-ok 118 - hunk header: cpp-skip-access-specifiers
-
-expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
-		git diff -U1 cpp-skip-comment-block >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ struct item RIGHT(int i)
-ok 119 - hunk header: cpp-skip-comment-block
-
-expecting success of 4018.120 'hunk header: cpp-skip-labels': 
-		git diff -U1 cpp-skip-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ void RIGHT (void)
-ok 120 - hunk header: cpp-skip-labels
-
-expecting success of 4018.121 'hunk header: cpp-struct-definition': 
-		git diff -U1 cpp-struct-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ struct RIGHT {
-ok 121 - hunk header: cpp-struct-definition
-
-expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
-		git diff -U1 cpp-struct-single-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
-ok 122 - hunk header: cpp-struct-single-line
-
-expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
-		git diff -U1 cpp-template-function-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
-ok 123 - hunk header: cpp-template-function-definition
-
-expecting success of 4018.124 'hunk header: cpp-union-definition': 
-		git diff -U1 cpp-union-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ union RIGHT {
-ok 124 - hunk header: cpp-union-definition
-
-expecting success of 4018.125 'hunk header: cpp-void-c-function': 
-		git diff -U1 cpp-void-c-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ void RIGHT (void)
-ok 125 - hunk header: cpp-void-c-function
-
-expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
-		git diff -U1 csharp-exclude-assignments >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 126 - hunk header: csharp-exclude-assignments
-
-expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
-		git diff -U1 csharp-exclude-control-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -29,3 +29,3 @@ string Method(int RIGHT)
-ok 127 - hunk header: csharp-exclude-control-statements
-
-expecting success of 4018.128 'hunk header: csharp-exclude-exceptions': 
-		git diff -U1 csharp-exclude-exceptions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -24,3 +24,3 @@ string Method(int RIGHT)
-ok 128 - hunk header: csharp-exclude-exceptions
-
-expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
-		git diff -U1 csharp-exclude-generic-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 129 - hunk header: csharp-exclude-generic-method-calls
-
-expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
-		git diff -U1 csharp-exclude-init-dispose >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -17,3 +17,3 @@ string Method(int RIGHT)
-ok 130 - hunk header: csharp-exclude-init-dispose
-
-expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
-		git diff -U1 csharp-exclude-iterations >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -21,3 +21,3 @@ string Method(int RIGHT)
-ok 131 - hunk header: csharp-exclude-iterations
-
-expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
-		git diff -U1 csharp-exclude-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 132 - hunk header: csharp-exclude-method-calls
-
-expecting success of 4018.133 'hunk header: csharp-exclude-other': 
-		git diff -U1 csharp-exclude-other >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 133 - hunk header: csharp-exclude-other
-
-expecting success of 4018.134 'hunk header: csharp-method': 
-		git diff -U1 csharp-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 134 - hunk header: csharp-method
-
-expecting success of 4018.135 'hunk header: csharp-method-array': 
-		git diff -U1 csharp-method-array >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
-ok 135 - hunk header: csharp-method-array
-
-expecting success of 4018.136 'hunk header: csharp-method-explicit': 
-		git diff -U1 csharp-method-explicit >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
-ok 136 - hunk header: csharp-method-explicit
-
-expecting success of 4018.137 'hunk header: csharp-method-generics': 
-		git diff -U1 csharp-method-generics >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
-ok 137 - hunk header: csharp-method-generics
-
-expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
-		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
-ok 138 - hunk header: csharp-method-generics-alternate-spaces
-
-expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
-		git diff -U1 csharp-method-modifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
-ok 139 - hunk header: csharp-method-modifiers
-
-expecting success of 4018.140 'hunk header: csharp-method-multiline': 
-		git diff -U1 csharp-method-multiline >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method_RIGHT(
-ok 140 - hunk header: csharp-method-multiline
-
-expecting success of 4018.141 'hunk header: csharp-method-params': 
-		git diff -U1 csharp-method-params >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
-ok 141 - hunk header: csharp-method-params
-
-expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
-		git diff -U1 csharp-method-special-chars >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
-ok 142 - hunk header: csharp-method-special-chars
-
-expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
-		git diff -U1 csharp-method-with-spacing >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
-ok 143 - hunk header: csharp-method-with-spacing
-
-expecting success of 4018.144 'hunk header: csharp-property': 
-		git diff -U1 csharp-property >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ public bool RIGHT
-ok 144 - hunk header: csharp-property
-
-expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
-		git diff -U1 csharp-property-braces-same-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public bool RIGHT {
-ok 145 - hunk header: csharp-property-braces-same-line
-
-expecting success of 4018.146 'hunk header: css-attribute-value-selector': 
-		git diff -U1 css-attribute-value-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ [class*="RIGHT"] {
-ok 146 - hunk header: css-attribute-value-selector
-
-expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
-		git diff -U1 css-block-level-@-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ @keyframes RIGHT {
-ok 147 - hunk header: css-block-level-@-statements
-
-expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
-		git diff -U1 css-brace-in-col-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT label.control-label
-ok 148 - hunk header: css-brace-in-col-1
-
-expecting success of 4018.149 'hunk header: css-class-selector': 
-		git diff -U1 css-class-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ .RIGHT {
-ok 149 - hunk header: css-class-selector
-
-expecting success of 4018.150 'hunk header: css-colon-eol': 
-		git diff -U1 css-colon-eol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT h1 {
-ok 150 - hunk header: css-colon-eol
-
-expecting success of 4018.151 'hunk header: css-colon-selector': 
-		git diff -U1 css-colon-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT a:hover {
-ok 151 - hunk header: css-colon-selector
-
-expecting success of 4018.152 'hunk header: css-common': 
-		git diff -U1 css-common >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT label.control-label {
-ok 152 - hunk header: css-common
-
-expecting success of 4018.153 'hunk header: css-id-selector': 
-		git diff -U1 css-id-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ #RIGHT {
-ok 153 - hunk header: css-id-selector
-
-expecting success of 4018.154 'hunk header: css-long-selector-list': 
-		git diff -U1 css-long-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ div ul#RIGHT {
-ok 154 - hunk header: css-long-selector-list
-
-expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
-		git diff -U1 css-prop-sans-indent >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT, label.control-label {
-ok 155 - hunk header: css-prop-sans-indent
-
-expecting success of 4018.156 'hunk header: css-root-selector': 
-		git diff -U1 css-root-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ :RIGHT {
-ok 156 - hunk header: css-root-selector
-
-expecting success of 4018.157 'hunk header: css-short-selector-list': 
-		git diff -U1 css-short-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
-ok 157 - hunk header: css-short-selector-list
-
-expecting success of 4018.158 'hunk header: css-trailing-space': 
-		git diff -U1 css-trailing-space >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT label.control-label {
-ok 158 - hunk header: css-trailing-space
-
-expecting success of 4018.159 'hunk header: custom1-pattern': 
-		git diff -U1 custom1-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ int special, RIGHT;
-ok 159 - hunk header: custom1-pattern
-
-expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
-		git diff -U1 custom2-match-to-end-of-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ RIGHT_Beer
-ok 160 - hunk header: custom2-match-to-end-of-line
-
-expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
-		git diff -U1 custom3-alternation-in-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 161 - hunk header: custom3-alternation-in-pattern
-
-expecting success of 4018.162 'hunk header: dts-labels': 
-		git diff -U1 dts-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ label2: RIGHT {
-ok 162 - hunk header: dts-labels
-
-expecting success of 4018.163 'hunk header: dts-node-unitless': 
-		git diff -U1 dts-node-unitless >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT {
-ok 163 - hunk header: dts-node-unitless
-
-expecting success of 4018.164 'hunk header: dts-nodes': 
-		git diff -U1 dts-nodes >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
-ok 164 - hunk header: dts-nodes
-
-expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
-		git diff -U1 dts-nodes-boolean-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
-ok 165 - hunk header: dts-nodes-boolean-prop
-
-expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
-		git diff -U1 dts-nodes-comment1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
-ok 166 - hunk header: dts-nodes-comment1
-
-expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
-		git diff -U1 dts-nodes-comment2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
-ok 167 - hunk header: dts-nodes-comment2
-
-expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
-		git diff -U1 dts-nodes-multiline-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
-ok 168 - hunk header: dts-nodes-multiline-prop
-
-expecting success of 4018.169 'hunk header: dts-reference': 
-		git diff -U1 dts-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ &RIGHT {
-ok 169 - hunk header: dts-reference
-
-expecting success of 4018.170 'hunk header: dts-root': 
-		git diff -U1 dts-root >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 170 - hunk header: dts-root
-
-expecting success of 4018.171 'hunk header: dts-root-comment': 
-		git diff -U1 dts-root-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 171 - hunk header: dts-root-comment
-
-expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
-		git diff -U1 elixir-do-not-pick-end >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,2 +4,2 @@ defmodule RIGHT do
-ok 172 - hunk header: elixir-do-not-pick-end
-
-expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
-		git diff -U1 elixir-ex-unit-test >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ test "RIGHT" do
-ok 173 - hunk header: elixir-ex-unit-test
-
-expecting success of 4018.174 'hunk header: elixir-function': 
-		git diff -U1 elixir-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
-ok 174 - hunk header: elixir-function
-
-expecting success of 4018.175 'hunk header: elixir-macro': 
-		git diff -U1 elixir-macro >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
-ok 175 - hunk header: elixir-macro
-
-expecting success of 4018.176 'hunk header: elixir-module': 
-		git diff -U1 elixir-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ defmodule RIGHT do
-ok 176 - hunk header: elixir-module
-
-expecting success of 4018.177 'hunk header: elixir-module-func': 
-		git diff -U1 elixir-module-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ def fun(RIGHT) do
-ok 177 - hunk header: elixir-module-func
-
-expecting success of 4018.178 'hunk header: elixir-nested-module': 
-		git diff -U1 elixir-nested-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
-ok 178 - hunk header: elixir-nested-module
-
-expecting success of 4018.179 'hunk header: elixir-private-function': 
-		git diff -U1 elixir-private-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
-ok 179 - hunk header: elixir-private-function
-
-expecting success of 4018.180 'hunk header: elixir-protocol': 
-		git diff -U1 elixir-protocol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ defprotocol RIGHT do
-ok 180 - hunk header: elixir-protocol
-
-expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
-		git diff -U1 elixir-protocol-implementation >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defimpl RIGHT do
-ok 181 - hunk header: elixir-protocol-implementation
-
-expecting success of 4018.182 'hunk header: fortran-block-data': 
-		git diff -U1 fortran-block-data >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
-ok 182 - hunk header: fortran-block-data
-
-expecting success of 4018.183 'hunk header: fortran-comment': 
-		git diff -U1 fortran-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 183 - hunk header: fortran-comment
-
-expecting success of 4018.184 'hunk header: fortran-comment-keyword': 
-		git diff -U1 fortran-comment-keyword >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
-ok 184 - hunk header: fortran-comment-keyword
-
-expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
-		git diff -U1 fortran-comment-legacy >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 185 - hunk header: fortran-comment-legacy
-
-expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
-		git diff -U1 fortran-comment-legacy-star >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 186 - hunk header: fortran-comment-legacy-star
-
-expecting success of 4018.187 'hunk header: fortran-external-function': 
-		git diff -U1 fortran-external-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
-ok 187 - hunk header: fortran-external-function
-
-expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
-		git diff -U1 fortran-external-subroutine >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ subroutine RIGHT
-ok 188 - hunk header: fortran-external-subroutine
-
-expecting success of 4018.189 'hunk header: fortran-module': 
-		git diff -U1 fortran-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ module RIGHT
-ok 189 - hunk header: fortran-module
-
-expecting success of 4018.190 'hunk header: fortran-module-procedure': 
-		git diff -U1 fortran-module-procedure >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ module RIGHT
-ok 190 - hunk header: fortran-module-procedure
-
-expecting success of 4018.191 'hunk header: fortran-program': 
-		git diff -U1 fortran-program >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ program RIGHT
-ok 191 - hunk header: fortran-program
-
-expecting success of 4018.192 'hunk header: fountain-scene': 
-		git diff -U1 fountain-scene >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
-ok 192 - hunk header: fountain-scene
-
-expecting success of 4018.193 'hunk header: golang-complex-function': 
-		git diff -U1 golang-complex-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
-ok 193 - hunk header: golang-complex-function
-
-expecting success of 4018.194 'hunk header: golang-func': 
-		git diff -U1 golang-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ func RIGHT() {
-ok 194 - hunk header: golang-func
-
-expecting success of 4018.195 'hunk header: golang-interface': 
-		git diff -U1 golang-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ type RIGHT interface {
-ok 195 - hunk header: golang-interface
-
-expecting success of 4018.196 'hunk header: golang-long-func': 
-		git diff -U1 golang-long-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
-ok 196 - hunk header: golang-long-func
-
-expecting success of 4018.197 'hunk header: golang-struct': 
-		git diff -U1 golang-struct >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ type RIGHT struct {
-ok 197 - hunk header: golang-struct
-
-expecting success of 4018.198 'hunk header: java-class-brace-on-separate-line': 
-		git diff -U1 java-class-brace-on-separate-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT
-ok 198 - hunk header: java-class-brace-on-separate-line
-
-expecting success of 4018.199 'hunk header: java-class-member-function': 
-		git diff -U1 java-class-member-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 199 - hunk header: java-class-member-function
-
-expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
-		git diff -U1 java-class-space-before-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
-ok 200 - hunk header: java-class-space-before-type-parameters
-
-expecting success of 4018.201 'hunk header: java-class-type-parameters': 
-		git diff -U1 java-class-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> {
-ok 201 - hunk header: java-class-type-parameters
-
-expecting success of 4018.202 'hunk header: java-class-type-parameters-implements': 
-		git diff -U1 java-class-type-parameters-implements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
-ok 202 - hunk header: java-class-type-parameters-implements
-
-expecting success of 4018.203 'hunk header: java-enum-constant': 
-		git diff -U1 java-enum-constant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ private enum RIGHT {
-ok 203 - hunk header: java-enum-constant
-
-expecting success of 4018.204 'hunk header: java-interface-type-parameters': 
-		git diff -U1 java-interface-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
-ok 204 - hunk header: java-interface-type-parameters
-
-expecting success of 4018.205 'hunk header: java-interface-type-parameters-extends': 
-		git diff -U1 java-interface-type-parameters-extends >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
-ok 205 - hunk header: java-interface-type-parameters-extends
-
-expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
-		git diff -U1 java-method-return-generic-bounded >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
-ok 206 - hunk header: java-method-return-generic-bounded
-
-expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
-		git diff -U1 java-method-return-generic-wildcard >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
-ok 207 - hunk header: java-method-return-generic-wildcard
-
-expecting success of 4018.208 'hunk header: java-nested-field': 
-		git diff -U1 java-nested-field >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ private static class RIGHT {
-ok 208 - hunk header: java-nested-field
-
-expecting success of 4018.209 'hunk header: java-non-sealed': 
-		git diff -U1 java-non-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
-ok 209 - hunk header: java-non-sealed
-
-expecting success of 4018.210 'hunk header: java-record': 
-		git diff -U1 java-record >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
-ok 210 - hunk header: java-record
-
-expecting success of 4018.211 'hunk header: java-record-space-before-components': 
-		git diff -U1 java-record-space-before-components >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
-ok 211 - hunk header: java-record-space-before-components
-
-expecting success of 4018.212 'hunk header: java-record-type-parameters': 
-		git diff -U1 java-record-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
-ok 212 - hunk header: java-record-type-parameters
-
-expecting success of 4018.213 'hunk header: java-sealed': 
-		git diff -U1 java-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
-ok 213 - hunk header: java-sealed
-
-expecting success of 4018.214 'hunk header: java-sealed-permits': 
-		git diff -U1 java-sealed-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
-ok 214 - hunk header: java-sealed-permits
-
-expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
-		git diff -U1 java-sealed-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
-ok 215 - hunk header: java-sealed-type-parameters
-
-expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
-		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
-ok 216 - hunk header: java-sealed-type-parameters-implements-permits
-
-expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
-		git diff -U1 java-sealed-type-parameters-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
-ok 217 - hunk header: java-sealed-type-parameters-permits
-
-expecting success of 4018.218 'hunk header: kotlin-class': 
-		git diff -U1 kotlin-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ class RIGHT {
-ok 218 - hunk header: kotlin-class
-
-expecting success of 4018.219 'hunk header: kotlin-enum-class': 
-		git diff -U1 kotlin-enum-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ enum class RIGHT{
-ok 219 - hunk header: kotlin-enum-class
-
-expecting success of 4018.220 'hunk header: kotlin-fun': 
-		git diff -U1 kotlin-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ fun RIGHT(){
-ok 220 - hunk header: kotlin-fun
-
-expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
-		git diff -U1 kotlin-inheritace-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ open class RIGHT{
-ok 221 - hunk header: kotlin-inheritace-class
-
-expecting success of 4018.222 'hunk header: kotlin-inline-class': 
-		git diff -U1 kotlin-inline-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ value class RIGHT(Args){
-ok 222 - hunk header: kotlin-inline-class
-
-expecting success of 4018.223 'hunk header: kotlin-interface': 
-		git diff -U1 kotlin-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ interface RIGHT{
-ok 223 - hunk header: kotlin-interface
-
-expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
-		git diff -U1 kotlin-nested-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
-ok 224 - hunk header: kotlin-nested-fun
-
-expecting success of 4018.225 'hunk header: kotlin-public-class': 
-		git diff -U1 kotlin-public-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ public class RIGHT{
-ok 225 - hunk header: kotlin-public-class
-
-expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
-		git diff -U1 kotlin-sealed-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ sealed class RIGHT {
-ok 226 - hunk header: kotlin-sealed-class
-
-expecting success of 4018.227 'hunk header: markdown-heading-indented': 
-		git diff -U1 markdown-heading-indented >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,2 +5,2 @@    ### RIGHT
-ok 227 - hunk header: markdown-heading-indented
-
-expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
-		git diff -U1 markdown-heading-non-headings >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -16,2 +16,2 @@ # RIGHT
-ok 228 - hunk header: markdown-heading-non-headings
-
-expecting success of 4018.229 'hunk header: matlab-class-definition': 
-		git diff -U1 matlab-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ classdef RIGHT
-ok 229 - hunk header: matlab-class-definition
-
-expecting success of 4018.230 'hunk header: matlab-function': 
-		git diff -U1 matlab-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function y = RIGHT()
-ok 230 - hunk header: matlab-function
-
-expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
-		git diff -U1 matlab-octave-section-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ %%% RIGHT section
-ok 231 - hunk header: matlab-octave-section-1
-
-expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
-		git diff -U1 matlab-octave-section-2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ ## RIGHT section
-ok 232 - hunk header: matlab-octave-section-2
-
-expecting success of 4018.233 'hunk header: matlab-section': 
-		git diff -U1 matlab-section >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ %% RIGHT section
-ok 233 - hunk header: matlab-section
-
-expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
-		git diff -U1 perl-skip-end-of-heredoc >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
-ok 234 - hunk header: perl-skip-end-of-heredoc
-
-expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
-		git diff -U1 perl-skip-forward-decl >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,2 +9,2 @@ package RIGHT;
-ok 235 - hunk header: perl-skip-forward-decl
-
-expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
-		git diff -U1 perl-skip-sub-in-pod >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
-ok 236 - hunk header: perl-skip-sub-in-pod
-
-expecting success of 4018.237 'hunk header: perl-sub-definition': 
-		git diff -U1 perl-sub-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ sub RIGHT {
-ok 237 - hunk header: perl-sub-definition
-
-expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
-		git diff -U1 perl-sub-definition-kr-brace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ sub RIGHT
-ok 238 - hunk header: perl-sub-definition-kr-brace
-
-expecting success of 4018.239 'hunk header: php-abstract-class': 
-		git diff -U1 php-abstract-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ abstract class RIGHT
-ok 239 - hunk header: php-abstract-class
-
-expecting success of 4018.240 'hunk header: php-abstract-method': 
-		git diff -U1 php-abstract-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
-ok 240 - hunk header: php-abstract-method
-
-expecting success of 4018.241 'hunk header: php-class': 
-		git diff -U1 php-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 241 - hunk header: php-class
-
-expecting success of 4018.242 'hunk header: php-enum': 
-		git diff -U1 php-enum >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ enum RIGHT: string
-ok 242 - hunk header: php-enum
-
-expecting success of 4018.243 'hunk header: php-final-class': 
-		git diff -U1 php-final-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ final class RIGHT
-ok 243 - hunk header: php-final-class
-
-expecting success of 4018.244 'hunk header: php-final-method': 
-		git diff -U1 php-final-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ final public function RIGHT(): string
-ok 244 - hunk header: php-final-method
-
-expecting success of 4018.245 'hunk header: php-function': 
-		git diff -U1 php-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT()
-ok 245 - hunk header: php-function
-
-expecting success of 4018.246 'hunk header: php-interface': 
-		git diff -U1 php-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ interface RIGHT
-ok 246 - hunk header: php-interface
-
-expecting success of 4018.247 'hunk header: php-method': 
-		git diff -U1 php-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public static function RIGHT()
-ok 247 - hunk header: php-method
-
-expecting success of 4018.248 'hunk header: php-trait': 
-		git diff -U1 php-trait >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ trait RIGHT
-ok 248 - hunk header: php-trait
-
-expecting success of 4018.249 'hunk header: python-async-def': 
-		git diff -U1 python-async-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ async def RIGHT(pi: int = 3.14):
-ok 249 - hunk header: python-async-def
-
-expecting success of 4018.250 'hunk header: python-class': 
-		git diff -U1 python-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ class RIGHT(int, str):
-ok 250 - hunk header: python-class
-
-expecting success of 4018.251 'hunk header: python-def': 
-		git diff -U1 python-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ def RIGHT(pi: int = 3.14):
-ok 251 - hunk header: python-def
-
-expecting success of 4018.252 'hunk header: python-indented-async-def': 
-		git diff -U1 python-indented-async-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ async def RIGHT(self, x: int):
-ok 252 - hunk header: python-indented-async-def
-
-expecting success of 4018.253 'hunk header: python-indented-class': 
-		git diff -U1 python-indented-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,2 +4,2 @@ class RIGHT:
-ok 253 - hunk header: python-indented-class
-
-expecting success of 4018.254 'hunk header: python-indented-def': 
-		git diff -U1 python-indented-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ def RIGHT(self, x: int):
-ok 254 - hunk header: python-indented-def
-
-expecting success of 4018.255 'hunk header: rust-fn': 
-		git diff -U1 rust-fn >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
-ok 255 - hunk header: rust-fn
-
-expecting success of 4018.256 'hunk header: rust-impl': 
-		git diff -U1 rust-impl >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ impl<'a, T: AsRef<[u8]>>  std::RIGHT for Git<'a> {
-ok 256 - hunk header: rust-impl
-
-expecting success of 4018.257 'hunk header: rust-macro-rules': 
-		git diff -U1 rust-macro-rules >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ macro_rules! RIGHT {
-ok 257 - hunk header: rust-macro-rules
-
-expecting success of 4018.258 'hunk header: rust-struct': 
-		git diff -U1 rust-struct >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ pub(super) struct RIGHT<'a> {
-ok 258 - hunk header: rust-struct
-
-expecting success of 4018.259 'hunk header: rust-trait': 
-		git diff -U1 rust-trait >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ unsafe trait RIGHT<T> {
-ok 259 - hunk header: rust-trait
-
-expecting success of 4018.260 'hunk header: scheme-class': 
-		git diff -U1 scheme-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ (class* () object% RIGHT
-ok 260 - hunk header: scheme-class
-
-expecting success of 4018.261 'hunk header: scheme-def': 
-		git diff -U1 scheme-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (def (some-func x y z) RIGHT
-ok 261 - hunk header: scheme-def
-
-expecting success of 4018.262 'hunk header: scheme-def-variant': 
-		git diff -U1 scheme-def-variant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (defmethod {print point} RIGHT
-ok 262 - hunk header: scheme-def-variant
-
-expecting success of 4018.263 'hunk header: scheme-define-slash-public': 
-		git diff -U1 scheme-define-slash-public >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ (define/public (foo) RIGHT
-ok 263 - hunk header: scheme-define-slash-public
-
-expecting success of 4018.264 'hunk header: scheme-define-syntax': 
-		git diff -U1 scheme-define-syntax >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (define-syntax define-test-suite RIGHT
-ok 264 - hunk header: scheme-define-syntax
-
-expecting success of 4018.265 'hunk header: scheme-define-variant': 
-		git diff -U1 scheme-define-variant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define* (some-func x y z) RIGHT
-ok 265 - hunk header: scheme-define-variant
-
-expecting success of 4018.266 'hunk header: scheme-library': 
-		git diff -U1 scheme-library >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (library (my-helpers id-stuff) RIGHT
-ok 266 - hunk header: scheme-library
-
-expecting success of 4018.267 'hunk header: scheme-local-define': 
-		git diff -U1 scheme-local-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define local-function RIGHT
-ok 267 - hunk header: scheme-local-define
-
-expecting success of 4018.268 'hunk header: scheme-module': 
-		git diff -U1 scheme-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ (module A RIGHT
-ok 268 - hunk header: scheme-module
-
-expecting success of 4018.269 'hunk header: scheme-top-level-define': 
-		git diff -U1 scheme-top-level-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
-ok 269 - hunk header: scheme-top-level-define
-
-expecting success of 4018.270 'hunk header: scheme-user-defined-define': 
-		git diff -U1 scheme-user-defined-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ (define-test-suite record\ case-tests RIGHT
-ok 270 - hunk header: scheme-user-defined-define
-
-# passed all 270 test(s)
-1..270
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4110-apply-scan/.git/
-expecting success of 4110.1 'git apply scan': 
-	git apply \
-		"$TEST_DIRECTORY/t4110/patch1.patch" \
-		"$TEST_DIRECTORY/t4110/patch2.patch" \
-		"$TEST_DIRECTORY/t4110/patch3.patch" \
-		"$TEST_DIRECTORY/t4110/patch4.patch" \
-		"$TEST_DIRECTORY/t4110/patch5.patch" &&
-	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
-
-ok 1 - git apply scan
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4109-apply-multifrag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4109-apply-multifrag/.git/
-expecting success of 4109.1 'git apply (1)': 
-	git apply patch1.patch patch2.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-1" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-patch2.patch:58: new blank line at EOF.
-+
-warning: 2 lines add whitespace errors.
-ok 1 - git apply (1)
-
-expecting success of 4109.2 'git apply (2)': 
-	git apply patch1.patch patch2.patch patch3.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-2" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-patch2.patch:58: new blank line at EOF.
-+
-warning: 2 lines add whitespace errors.
-ok 2 - git apply (2)
-
-expecting success of 4109.3 'git apply (3)': 
-	git apply patch1.patch patch4.patch &&
-	test_cmp "$TEST_DIRECTORY/t4109/expect-3" main.c
-
-patch1.patch:28: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-ok 3 - git apply (3)
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4060-diff-submodule-option-diff-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
-expecting success of 4060.1 'setup repository': 
-	test_create_repo sm1 &&
-	add_file . foo &&
-	head1=$(add_file sm1 foo1 foo2) &&
-	fullhead1=$(git -C sm1 rev-parse --verify HEAD)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4060-diff-submodule-option-diff-format/sm1/.git/
-36d39d8
-ok 1 - setup repository
-
-expecting success of 4060.2 'added submodule': 
-	git add sm1 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo2 b/sm1/foo2
-	new file mode 100644
-	index 0000000..54b060e
-	--- /dev/null
-	+++ b/sm1/foo2
-	@@ -0,0 +1 @@
-	+foo2
-	EOF
-	diff_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm1
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm1
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 2 - added submodule
-
-expecting success of 4060.3 'added submodule, set diff.submodule': 
-	test_config diff.submodule log &&
-	git add sm1 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 0000000...$head1 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo2 b/sm1/foo2
-	new file mode 100644
-	index 0000000..54b060e
-	--- /dev/null
-	+++ b/sm1/foo2
-	@@ -0,0 +1 @@
-	+foo2
-	EOF
-	diff_cmp expected actual
-
-ok 3 - added submodule, set diff.submodule
-
-expecting success of 4060.4 '--submodule=short overrides diff.submodule': 
-	test_config diff.submodule log &&
-	git add sm1 &&
-	git diff --submodule=short --cached >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	diff_cmp expected actual
-
-ok 4 - --submodule=short overrides diff.submodule
-
-expecting success of 4060.5 'diff.submodule does not affect plumbing': 
-	test_config diff.submodule log &&
-	git diff-index -p HEAD >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	new file mode 160000
-	index 0000000..$head1
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+Subproject commit $fullhead1
-	EOF
-	diff_cmp expected actual
-
-ok 5 - diff.submodule does not affect plumbing
-
-expecting success of 4060.6 'modified submodule(forward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	diff --git a/sm1/foo3 b/sm1/foo3
-	new file mode 100644
-	index 0000000..c1ec6c6
-	--- /dev/null
-	+++ b/sm1/foo3
-	@@ -0,0 +1 @@
-	+foo3
-	EOF
-	diff_cmp expected actual
-
-ok 6 - modified submodule(forward)
-
-expecting success of 4060.7 'modified submodule(forward)': 
-	git diff --submodule=diff >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	diff --git a/sm1/foo3 b/sm1/foo3
-	new file mode 100644
-	index 0000000..c1ec6c6
-	--- /dev/null
-	+++ b/sm1/foo3
-	@@ -0,0 +1 @@
-	+foo3
-	EOF
-	diff_cmp expected actual
-
-ok 7 - modified submodule(forward)
-
-expecting success of 4060.8 'modified submodule(forward) --submodule': 
-	git diff --submodule >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head1..$head2:
-	  > Add foo3 ($added foo3)
-	EOF
-	diff_cmp expected actual
-
-ok 8 - modified submodule(forward) --submodule
-
-expecting success of 4060.9 'modified submodule(forward) --submodule=short': 
-	git diff --submodule=short >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	index $head1..$head2 160000
-	--- a/sm1
-	+++ b/sm1
-	@@ -1 +1 @@
-	-Subproject commit $fullhead1
-	+Subproject commit $fullhead2
-	EOF
-	diff_cmp expected actual
-
-ok 9 - modified submodule(forward) --submodule=short
-
-expecting success of 4060.10 'modified submodule(backward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2..$head3 (rewind):
-	diff --git a/sm1/foo2 b/sm1/foo2
-	deleted file mode 100644
-	index 54b060e..0000000
-	--- a/sm1/foo2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo2
-	diff --git a/sm1/foo3 b/sm1/foo3
-	deleted file mode 100644
-	index c1ec6c6..0000000
-	--- a/sm1/foo3
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo3
-	EOF
-	diff_cmp expected actual
-
-ok 10 - modified submodule(backward)
-
-expecting success of 4060.11 'modified submodule(backward and forward)': 
-	git diff-index -p --submodule=diff HEAD >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head2...$head4:
-	diff --git a/sm1/foo2 b/sm1/foo2
-	deleted file mode 100644
-	index 54b060e..0000000
-	--- a/sm1/foo2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo2
-	diff --git a/sm1/foo3 b/sm1/foo3
-	deleted file mode 100644
-	index c1ec6c6..0000000
-	--- a/sm1/foo3
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo3
-	diff --git a/sm1/foo4 b/sm1/foo4
-	new file mode 100644
-	index 0000000..a0016db
-	--- /dev/null
-	+++ b/sm1/foo4
-	@@ -0,0 +1 @@
-	+foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	new file mode 100644
-	index 0000000..d6f2413
-	--- /dev/null
-	+++ b/sm1/foo5
-	@@ -0,0 +1 @@
-	+foo5
-	EOF
-	diff_cmp expected actual
-
-ok 11 - modified submodule(backward and forward)
-
-expecting success of 4060.12 'typechanged submodule(submodule->blob), --cached': 
-	git diff --submodule=diff --cached >actual &&
-	cat >expected <<-EOF &&
-	Submodule sm1 $head4...0000000 (submodule deleted)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	deleted file mode 100644
-	index 1715acd..0000000
-	--- a/sm1/foo1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo1
-	diff --git a/sm1/foo4 b/sm1/foo4
-	deleted file mode 100644
-	index a0016db..0000000
-	--- a/sm1/foo4
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	deleted file mode 100644
-	index d6f2413..0000000
-	--- a/sm1/foo5
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-foo5
-	diff --git a/sm1 b/sm1
-	new file mode 100644
-	index 0000000..9da5fb8
-	--- /dev/null
-	+++ b/sm1
-	@@ -0,0 +1 @@
-	+sm1
-	EOF
-	diff_cmp expected actual
-
-ok 12 - typechanged submodule(submodule->blob), --cached
-
-expecting success of 4060.13 'typechanged submodule(submodule->blob)': 
-	git diff --submodule=diff >actual &&
-	cat >expected <<-EOF &&
-	diff --git a/sm1 b/sm1
-	deleted file mode 100644
-	index 9da5fb8..0000000
-	--- a/sm1
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-sm1
-	Submodule sm1 0000000...$head4 (new submodule)
-	diff --git a/sm1/foo1 b/sm1/foo1
-	new file mode 100644
-	index 0000000..1715acd
-	--- /dev/null
-	+++ b/sm1/foo1
-	@@ -0,0 +1 @@
-	+foo1
-	diff --git a/sm1/foo4 b/sm1/foo4
-	new file mode 100644
-	index 0000000..a0016db
-	--- /dev/null
-	+++ b/sm1/foo4
-	@@ -0,0 +1 @@
-	+foo4
-	diff --git a/sm1/foo5 b/sm1/foo5
-	new file mode 100644
-	index 0000000..d6f2413
-	--- /dev/null
-	+++ b/sm1/foo5
-	@@ -0,0 +1 @@
-	+foo5
-	EOF
-	diff_cmp expected actual
-
-ok 13 - typechanged submodule(submodule->blob)
+ok 13 - typechanged submodule(submodule->blob)
 
 expecting success of 4060.14 'typechanged submodule(submodule->blob)': 
 	git diff-index -p --submodule=diff HEAD >actual &&
@@ -263712,347 +263678,115 @@
 1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4104-apply-boundary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4104-apply-boundary/.git/
-expecting success of 4104.1 'setup': 
-	test_write_lines b $L y >victim &&
-	cat victim >original &&
-	git update-index --add victim &&
-
-	# add to the head
-	test_write_lines a b $L y >victim &&
-	cat victim >add-a-expect &&
-	git diff victim >add-a-patch.with &&
-	git diff --unified=0 >add-a-patch.without &&
+*** t4113-apply-ending.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4113-apply-ending/.git/
+expecting success of 4113.1 'setup': git update-index --add file
+ok 1 - setup
 
-	# insert at line two
-	test_write_lines b a $L y >victim &&
-	cat victim >insert-a-expect &&
-	git diff victim >insert-a-patch.with &&
-	git diff --unified=0 >insert-a-patch.without &&
+expecting success of 4113.2 'apply at the end': test_must_fail git apply --index test-patch
+error: patch failed: file:1
+error: file: patch does not apply
+ok 2 - apply at the end
 
-	# modify at the head
-	test_write_lines a $L y >victim &&
-	cat victim >mod-a-expect &&
-	git diff victim >mod-a-patch.with &&
-	git diff --unified=0 >mod-a-patch.without &&
+expecting success of 4113.3 'apply at the beginning': test_must_fail git apply --index test-patch
+error: patch failed: file:1
+error: file: patch does not apply
+ok 3 - apply at the beginning
 
-	# remove from the head
-	test_write_lines $L y >victim &&
-	cat victim >del-a-expect &&
-	git diff victim >del-a-patch.with &&
-	git diff --unified=0 >del-a-patch.without &&
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4103-apply-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4103-apply-binary/.git/
+expecting success of 4103.1 'setup': 
+	cat >file1 <<-\EOF &&
+	A quick brown fox jumps over the lazy dog.
+	A tiny little penguin runs around in circles.
+	There is a flag with Linux written on it.
+	A slow black-and-white panda just sits there,
+	munching on his bamboo.
+	EOF
+	cat file1 >file2 &&
+	cat file1 >file4 &&
 
-	# add to the tail
-	test_write_lines b $L y z >victim &&
-	cat victim >add-z-expect &&
-	git diff victim >add-z-patch.with &&
-	git diff --unified=0 >add-z-patch.without &&
+	git update-index --add --remove file1 file2 file4 &&
+	git commit -m "Initial Version" 2>/dev/null &&
 
-	# modify at the tail
-	test_write_lines b $L z >victim &&
-	cat victim >mod-z-expect &&
-	git diff victim >mod-z-patch.with &&
-	git diff --unified=0 >mod-z-patch.without &&
+	git checkout -b binary &&
+	perl -pe "y/x/\000/" <file1 >file3 &&
+	cat file3 >file4 &&
+	git add file2 &&
+	perl -pe "y/\000/v/" <file3 >file1 &&
+	rm -f file2 &&
+	git update-index --add --remove file1 file2 file3 file4 &&
+	git commit -m "Second Version" &&
 
-	# remove from the tail
-	test_write_lines b $L >victim &&
-	cat victim >del-z-expect &&
-	git diff victim >del-z-patch.with &&
-	git diff --unified=0 >del-z-patch.without
+	git diff-tree -p main binary >B.diff &&
+	git diff-tree -p -C main binary >C.diff &&
 
-	# done
+	git diff-tree -p --binary main binary >BF.diff &&
+	git diff-tree -p --binary -C main binary >CF.diff &&
 
-ok 1 - setup
+	git diff-tree -p --full-index main binary >B-index.diff &&
+	git diff-tree -p -C --full-index main binary >C-index.diff &&
 
-expecting success of 4104.2 'apply add-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 2 - apply add-a-patch with context
+	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
 
-expecting success of 4104.3 'apply add-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 3 - apply add-z-patch with context
+	git init other-repo &&
+	(
+		cd other-repo &&
+		git fetch .. main &&
+		git reset --hard FETCH_HEAD
+	)
 
-expecting success of 4104.4 'apply insert-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 4 - apply insert-a-patch with context
+[main (root-commit) 8985c5f] Initial Version
+ Author: A U Thor <author@example.com>
+ 3 files changed, 15 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 file4
+Switched to a new branch 'binary'
+[binary 749e5f6] Second Version
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4103-apply-binary/other-repo/.git/
+From ..
+ * branch            main       -> FETCH_HEAD
+HEAD is now at 8985c5f Initial Version
+ok 1 - setup
 
-expecting success of 4104.5 'apply mod-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 5 - apply mod-a-patch with context
+expecting success of 4103.2 'stat binary diff -- should not fail.': git checkout main &&
+	 git apply --stat --summary B.diff
+Switched to branch 'main'
+ file1 |    4 ++--
+ file2 |    5 -----
+ file3 |  Bin
+ file4 |  Bin
+ 4 files changed, 2 insertions(+), 7 deletions(-)
+ delete mode 100644 file2
+ create mode 100644 file3
+ok 2 - stat binary diff -- should not fail.
 
-expecting success of 4104.6 'apply mod-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 6 - apply mod-z-patch with context
+expecting success of 4103.3 'stat binary -p0 diff -- should not fail.': 
+	 git checkout main &&
+	 git apply --stat -p0 B0.diff
 
-expecting success of 4104.7 'apply del-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 7 - apply del-a-patch with context
+Already on 'main'
+ file3 |  Bin
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 3 - stat binary -p0 diff -- should not fail.
 
-expecting success of 4104.8 'apply del-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 8 - apply del-z-patch with context
-
-expecting success of 4104.9 'apply add-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 9 - apply add-a-patch without context
-
-expecting success of 4104.10 'apply add-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 10 - apply add-z-patch without context
-
-expecting success of 4104.11 'apply insert-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 11 - apply insert-a-patch without context
-
-expecting success of 4104.12 'apply mod-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 12 - apply mod-a-patch without context
-
-expecting success of 4104.13 'apply mod-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 13 - apply mod-z-patch without context
-
-expecting success of 4104.14 'apply del-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 14 - apply del-a-patch without context
-
-expecting success of 4104.15 'apply del-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 15 - apply del-z-patch without context
-
-expecting success of 4104.16 'apply non-git add-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 16 - apply non-git add-a-patch without context
-
-expecting success of 4104.17 'apply non-git add-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 17 - apply non-git add-z-patch without context
-
-expecting success of 4104.18 'apply non-git insert-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 18 - apply non-git insert-a-patch without context
-
-expecting success of 4104.19 'apply non-git mod-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 19 - apply non-git mod-a-patch without context
-
-expecting success of 4104.20 'apply non-git mod-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 20 - apply non-git mod-z-patch without context
-
-expecting success of 4104.21 'apply non-git del-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 21 - apply non-git del-a-patch without context
-
-expecting success of 4104.22 'apply non-git del-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 22 - apply non-git del-z-patch without context
-
-expecting success of 4104.23 'two lines': 
-	>file &&
-	git add file &&
-	echo aaa >file &&
-	git diff >patch &&
-	git add file &&
-	echo bbb >file &&
-	git add file &&
-	test_must_fail git apply --check patch
-
-error: patch failed: file:0
-error: file: patch does not apply
-ok 23 - two lines
-
-expecting success of 4104.24 'apply patch with 3 context lines matching at end': 
-	test_write_lines a b c d >file &&
-	git add file &&
-	echo e >>file &&
-	git diff >patch &&
-	>file &&
-	test_must_fail git apply patch
-
-error: patch failed: file:2
-error: file: patch does not apply
-ok 24 - apply patch with 3 context lines matching at end
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4103-apply-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4103-apply-binary/.git/
-expecting success of 4103.1 'setup': 
-	cat >file1 <<-\EOF &&
-	A quick brown fox jumps over the lazy dog.
-	A tiny little penguin runs around in circles.
-	There is a flag with Linux written on it.
-	A slow black-and-white panda just sits there,
-	munching on his bamboo.
-	EOF
-	cat file1 >file2 &&
-	cat file1 >file4 &&
-
-	git update-index --add --remove file1 file2 file4 &&
-	git commit -m "Initial Version" 2>/dev/null &&
-
-	git checkout -b binary &&
-	perl -pe "y/x/\000/" <file1 >file3 &&
-	cat file3 >file4 &&
-	git add file2 &&
-	perl -pe "y/\000/v/" <file3 >file1 &&
-	rm -f file2 &&
-	git update-index --add --remove file1 file2 file3 file4 &&
-	git commit -m "Second Version" &&
-
-	git diff-tree -p main binary >B.diff &&
-	git diff-tree -p -C main binary >C.diff &&
-
-	git diff-tree -p --binary main binary >BF.diff &&
-	git diff-tree -p --binary -C main binary >CF.diff &&
-
-	git diff-tree -p --full-index main binary >B-index.diff &&
-	git diff-tree -p -C --full-index main binary >C-index.diff &&
-
-	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
-
-	git init other-repo &&
-	(
-		cd other-repo &&
-		git fetch .. main &&
-		git reset --hard FETCH_HEAD
-	)
-
-[main (root-commit) 8985c5f] Initial Version
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 file4
-Switched to a new branch 'binary'
-[binary 749e5f6] Second Version
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4103-apply-binary/other-repo/.git/
-From ..
- * branch            main       -> FETCH_HEAD
-HEAD is now at 8985c5f Initial Version
-ok 1 - setup
-
-expecting success of 4103.2 'stat binary diff -- should not fail.': git checkout main &&
-	 git apply --stat --summary B.diff
-Switched to branch 'main'
- file1 |    4 ++--
- file2 |    5 -----
- file3 |  Bin
- file4 |  Bin
- 4 files changed, 2 insertions(+), 7 deletions(-)
- delete mode 100644 file2
- create mode 100644 file3
-ok 2 - stat binary diff -- should not fail.
-
-expecting success of 4103.3 'stat binary -p0 diff -- should not fail.': 
-	 git checkout main &&
-	 git apply --stat -p0 B0.diff
-
-Already on 'main'
- file3 |  Bin
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 3 - stat binary -p0 diff -- should not fail.
-
-expecting success of 4103.4 'stat binary diff (copy) -- should not fail.': git checkout main &&
-	 git apply --stat --summary C.diff
-Already on 'main'
- file1 |    4 ++--
- file3 |  Bin
- file4 |  Bin
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename file2 => file3 (57%)
-ok 4 - stat binary diff (copy) -- should not fail.
+expecting success of 4103.4 'stat binary diff (copy) -- should not fail.': git checkout main &&
+	 git apply --stat --summary C.diff
+Already on 'main'
+ file1 |    4 ++--
+ file3 |  Bin
+ file4 |  Bin
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ rename file2 => file3 (57%)
+ok 4 - stat binary diff (copy) -- should not fail.
 
 expecting success of 4103.5 'check binary diff -- should fail.': git checkout main &&
 	 test_must_fail git apply --check B.diff
@@ -264245,37 +263979,1284 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4112-apply-renames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4112-apply-renames/.git/
-expecting success of 4112.1 'check rename/copy patch': git apply --check patch
-ok 1 - check rename/copy patch
+*** t4104-apply-boundary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4104-apply-boundary/.git/
+expecting success of 4104.1 'setup': 
+	test_write_lines b $L y >victim &&
+	cat victim >original &&
+	git update-index --add victim &&
 
-expecting success of 4112.2 'apply rename/copy patch': git apply --index patch
-ok 2 - apply rename/copy patch
+	# add to the head
+	test_write_lines a b $L y >victim &&
+	cat victim >add-a-expect &&
+	git diff victim >add-a-patch.with &&
+	git diff --unified=0 >add-a-patch.without &&
+
+	# insert at line two
+	test_write_lines b a $L y >victim &&
+	cat victim >insert-a-expect &&
+	git diff victim >insert-a-patch.with &&
+	git diff --unified=0 >insert-a-patch.without &&
+
+	# modify at the head
+	test_write_lines a $L y >victim &&
+	cat victim >mod-a-expect &&
+	git diff victim >mod-a-patch.with &&
+	git diff --unified=0 >mod-a-patch.without &&
+
+	# remove from the head
+	test_write_lines $L y >victim &&
+	cat victim >del-a-expect &&
+	git diff victim >del-a-patch.with &&
+	git diff --unified=0 >del-a-patch.without &&
+
+	# add to the tail
+	test_write_lines b $L y z >victim &&
+	cat victim >add-z-expect &&
+	git diff victim >add-z-patch.with &&
+	git diff --unified=0 >add-z-patch.without &&
+
+	# modify at the tail
+	test_write_lines b $L z >victim &&
+	cat victim >mod-z-expect &&
+	git diff victim >mod-z-patch.with &&
+	git diff --unified=0 >mod-z-patch.without &&
+
+	# remove from the tail
+	test_write_lines b $L >victim &&
+	cat victim >del-z-expect &&
+	git diff victim >del-z-patch.with &&
+	git diff --unified=0 >del-z-patch.without
+
+	# done
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4113-apply-ending.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4113-apply-ending/.git/
-expecting success of 4113.1 'setup': git update-index --add file
 ok 1 - setup
 
-expecting success of 4113.2 'apply at the end': test_must_fail git apply --index test-patch
-error: patch failed: file:1
+expecting success of 4104.2 'apply add-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 2 - apply add-a-patch with context
+
+expecting success of 4104.3 'apply add-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 3 - apply add-z-patch with context
+
+expecting success of 4104.4 'apply insert-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 4 - apply insert-a-patch with context
+
+expecting success of 4104.5 'apply mod-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 5 - apply mod-a-patch with context
+
+expecting success of 4104.6 'apply mod-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 6 - apply mod-z-patch with context
+
+expecting success of 4104.7 'apply del-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 7 - apply del-a-patch with context
+
+expecting success of 4104.8 'apply del-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 8 - apply del-z-patch with context
+
+expecting success of 4104.9 'apply add-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 9 - apply add-a-patch without context
+
+expecting success of 4104.10 'apply add-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 10 - apply add-z-patch without context
+
+expecting success of 4104.11 'apply insert-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 11 - apply insert-a-patch without context
+
+expecting success of 4104.12 'apply mod-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 12 - apply mod-a-patch without context
+
+expecting success of 4104.13 'apply mod-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 13 - apply mod-z-patch without context
+
+expecting success of 4104.14 'apply del-a-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 14 - apply del-a-patch without context
+
+expecting success of 4104.15 'apply del-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 15 - apply del-z-patch without context
+
+expecting success of 4104.16 'apply non-git add-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 16 - apply non-git add-a-patch without context
+
+expecting success of 4104.17 'apply non-git add-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 17 - apply non-git add-z-patch without context
+
+expecting success of 4104.18 'apply non-git insert-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 18 - apply non-git insert-a-patch without context
+
+expecting success of 4104.19 'apply non-git mod-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 19 - apply non-git mod-a-patch without context
+
+expecting success of 4104.20 'apply non-git mod-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 20 - apply non-git mod-z-patch without context
+
+expecting success of 4104.21 'apply non-git del-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 21 - apply non-git del-a-patch without context
+
+expecting success of 4104.22 'apply non-git del-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 22 - apply non-git del-z-patch without context
+
+expecting success of 4104.23 'two lines': 
+	>file &&
+	git add file &&
+	echo aaa >file &&
+	git diff >patch &&
+	git add file &&
+	echo bbb >file &&
+	git add file &&
+	test_must_fail git apply --check patch
+
+error: patch failed: file:0
 error: file: patch does not apply
-ok 2 - apply at the end
+ok 23 - two lines
 
-expecting success of 4113.3 'apply at the beginning': test_must_fail git apply --index test-patch
-error: patch failed: file:1
+expecting success of 4104.24 'apply patch with 3 context lines matching at end': 
+	test_write_lines a b c d >file &&
+	git add file &&
+	echo e >>file &&
+	git diff >patch &&
+	>file &&
+	test_must_fail git apply patch
+
+error: patch failed: file:2
 error: file: patch does not apply
-ok 3 - apply at the beginning
+ok 24 - apply patch with 3 context lines matching at end
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4118-apply-empty-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4118-apply-empty-context/.git/
+expecting success of 4118.1 'setup': 
+	test_write_lines "" "" A B C "" >file1 &&
+	cat file1 >file1.orig &&
+	{
+		cat file1 &&
+		echo Q | tr -d "\\012"
+	} >file2 &&
+	cat file2 >file2.orig &&
+	git add file1 file2 &&
+	sed -e "/^B/d" <file1.orig >file1 &&
+	cat file1 > file2 &&
+	echo Q | tr -d "\\012" >>file2 &&
+	cat file1 >file1.mods &&
+	cat file2 >file2.mods &&
+	git diff |
+	sed -e "s/^ \$//" >diff.output
+
+ok 1 - setup
+
+expecting success of 4118.2 'apply --numstat': 
+
+	git apply --numstat diff.output >actual &&
+	{
+		echo "0	1	file1" &&
+		echo "0	1	file2"
+	} >expect &&
+	test_cmp expect actual
+
+
+ok 2 - apply --numstat
+
+expecting success of 4118.3 'apply --apply': 
+
+	cat file1.orig >file1 &&
+	cat file2.orig >file2 &&
+	git update-index file1 file2 &&
+	git apply --index diff.output &&
+	test_cmp file1.mods file1 &&
+	test_cmp file2.mods file2
+
+ok 3 - apply --apply
 
 # passed all 3 test(s)
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4117-apply-reject.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4117-apply-reject/.git/
+expecting success of 4117.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
+	cat file1 >saved.file1 &&
+	git update-index --add file1 &&
+	git commit -m initial &&
+
+	test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
+	git diff >patch.1 &&
+	cat file1 >clean &&
+
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
+
+	mv file1 file2 &&
+	git update-index --add --remove file1 file2 &&
+	git diff -M HEAD >patch.2 &&
+
+	rm -f file1 file2 &&
+	mv saved.file1 file1 &&
+	git update-index --add --remove file1 file2 &&
+
+	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
+
+	cat file1 >saved.file1
+
+[master (root-commit) 11e450e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 21 insertions(+)
+ create mode 100644 file1
+ok 1 - setup
+
+expecting success of 4117.2 'apply --reject is incompatible with --3way': 
+	test_when_finished "cat saved.file1 >file1" &&
+	git diff >patch.0 &&
+	git checkout file1 &&
+	test_must_fail git apply --reject --3way patch.0 &&
+	git diff --exit-code
+
+Updated 1 path from the index
+error: options '--reject' and '--3way' cannot be used together
+ok 2 - apply --reject is incompatible with --3way
+
+expecting success of 4117.3 'apply without --reject should fail': 
+
+	test_must_fail git apply patch.1 &&
+	test_cmp file1 saved.file1
+
+error: patch failed: file1:1
+error: file1: patch does not apply
+ok 3 - apply without --reject should fail
+
+expecting success of 4117.4 'apply without --reject should fail': 
+
+	test_must_fail git apply --verbose patch.1 &&
+	test_cmp file1 saved.file1
+
+Checking patch file1...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: file1: patch does not apply
+ok 4 - apply without --reject should fail
+
+expecting success of 4117.5 'apply with --reject should fail but update the file': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej &&
+
+	test_must_fail git apply --reject patch.1 &&
+	test_cmp expected file1 &&
+
+	test_path_is_file file1.rej &&
+	test_path_is_missing file2.rej
+
+Checking patch file1...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 5 - apply with --reject should fail but update the file
+
+expecting success of 4117.6 'apply with --reject should fail but update the file': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej file2 &&
+
+	test_must_fail git apply --reject patch.2 >rejects &&
+	test_path_is_missing file1 &&
+	test_cmp expected file2 &&
+
+	test_path_is_file file2.rej &&
+	test_path_is_missing file1.rej
+
+
+Checking patch file1 => file2...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 => file2 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 6 - apply with --reject should fail but update the file
+
+expecting success of 4117.7 'the same test with --verbose': 
+
+	cat saved.file1 >file1 &&
+	rm -f file1.rej file2.rej file2 &&
+
+	test_must_fail git apply --reject --verbose patch.2 >rejects &&
+	test_path_is_missing file1 &&
+	test_cmp expected file2 &&
+
+	test_path_is_file file2.rej &&
+	test_path_is_missing file1.rej
+
+
+Checking patch file1 => file2...
+error: while searching for:
+1
+2
+3
+4
+5
+6
+
+error: patch failed: file1:1
+error: while searching for:
+18
+19
+20
+21
+
+error: patch failed: file1:18
+Applying patch file1 => file2 with 2 rejects...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+Rejected hunk #3.
+ok 7 - the same test with --verbose
+
+expecting success of 4117.8 'apply cleanly with --verbose': 
+
+	git cat-file -p HEAD:file1 >file1 &&
+	rm -f file?.rej file2 &&
+
+	git apply --verbose patch.1 &&
+
+	test_cmp file1 clean
+
+Checking patch file1...
+Applied patch file1 cleanly.
+ok 8 - apply cleanly with --verbose
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4116-apply-reverse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/.git/
+expecting success of 4116.1 'setup': 
+
+	test_write_lines a b c d e f g h i j k l m n >file1 &&
+	perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
+
+	git add file1 file2 &&
+	git commit -m initial &&
+	git tag initial &&
+
+	test_write_lines a b c g h i J K L m o n p q >file1 &&
+	perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
+
+	git commit -a -m second &&
+	git tag second &&
+
+	git diff --binary initial second >patch
+
+
+[master (root-commit) 40ea0d8] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 09f0b7a] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+ok 1 - setup
+
+expecting success of 4116.2 'apply in forward': 
+
+	T0=$(git rev-parse "second^{tree}") &&
+	git reset --hard initial &&
+	git apply --index --binary patch &&
+	T1=$(git write-tree) &&
+	test "$T0" = "$T1"
+
+HEAD is now at 40ea0d8 initial
+ok 2 - apply in forward
+
+expecting success of 4116.3 'apply in reverse': 
+
+	git reset --hard second &&
+	git apply --reverse --binary --index patch &&
+	git diff >diff &&
+	test_must_be_empty diff
+
+
+HEAD is now at 09f0b7a second
+ok 3 - apply in reverse
+
+expecting success of 4116.4 'setup separate repository lacking postimage': 
+
+	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
+	(
+		cd initial && git init && git add .
+	) &&
+
+	git archive --format=tar --prefix=second/ second | $TAR xf - &&
+	(
+		cd second && git init && git add .
+	)
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/initial/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/second/.git/
+ok 4 - setup separate repository lacking postimage
+
+expecting success of 4116.5 'apply in forward without postimage': 
+
+	T0=$(git rev-parse "second^{tree}") &&
+	(
+		cd initial &&
+		git apply --index --binary ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
+
+ok 5 - apply in forward without postimage
+
+expecting success of 4116.6 'apply in reverse without postimage': 
+
+	T0=$(git rev-parse "initial^{tree}") &&
+	(
+		cd second &&
+		git apply --index --binary --reverse ../patch &&
+		T1=$(git write-tree) &&
+		test "$T0" = "$T1"
+	)
+
+ok 6 - apply in reverse without postimage
+
+expecting success of 4116.7 'reversing a whitespace introduction': 
+	sed "s/a/a /" < file1 > file1.new &&
+	mv file1.new file1 &&
+	git diff | git apply --reverse --whitespace=error
+
+ok 7 - reversing a whitespace introduction
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4114-apply-typechange.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4114-apply-typechange/.git/
+expecting success of 4114.1 'setup repository and commits': 
+	echo "hello world" > foo &&
+	echo "hi planet" > bar &&
+	git update-index --add foo bar &&
+	git commit -m initial &&
+	git branch initial &&
+	rm -f foo &&
+	test_ln_s_add bar foo &&
+	git commit -m "foo symlinked to bar" &&
+	git branch foo-symlinked-to-bar &&
+	git rm -f foo &&
+	echo "how far is the sun?" > foo &&
+	git update-index --add foo &&
+	git commit -m "foo back to file" &&
+	git branch foo-back-to-file &&
+	printf "\0" > foo &&
+	git update-index foo &&
+	git commit -m "foo becomes binary" &&
+	git branch foo-becomes-binary &&
+	rm -f foo &&
+	git update-index --remove foo &&
+	mkdir foo &&
+	echo "if only I knew" > foo/baz &&
+	git update-index --add foo/baz &&
+	git commit -m "foo becomes a directory" &&
+	git branch "foo-becomes-a-directory" &&
+	echo "hello world" > foo/baz &&
+	git update-index foo/baz &&
+	git commit -m "foo/baz is the original foo" &&
+	git branch foo-baz-renamed-from-foo
+	
+[master (root-commit) 8d5a53c] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 2b1a969] foo symlinked to bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 120000 foo
+rm 'foo'
+[master 41a0307] foo back to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 120000 => 100644 foo
+[master bd76368] foo becomes binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master 918d519] foo becomes a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ delete mode 100644 foo
+ create mode 100644 foo/baz
+[master 5d696d0] foo/baz is the original foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repository and commits
+
+expecting success of 4114.2 'file renamed from foo to foo/baz': 
+	git checkout -f initial &&
+	git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
+	git apply --index < patch
+	
+Switched to branch 'initial'
+ok 2 - file renamed from foo to foo/baz
+
+expecting success of 4114.3 'file renamed from foo/baz to foo': 
+	git checkout -f foo-baz-renamed-from-foo &&
+	git diff-tree -M -p HEAD initial > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-baz-renamed-from-foo'
+ok 3 - file renamed from foo/baz to foo
+
+expecting success of 4114.4 'directory becomes file': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD initial > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-a-directory'
+ok 4 - directory becomes file
+
+expecting success of 4114.5 'file becomes directory': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
+	
+Switched to branch 'initial'
+ok 5 - file becomes directory
+
+expecting success of 4114.6 'file becomes symlink': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Already on 'initial'
+ok 6 - file becomes symlink
+
+expecting success of 4114.7 'symlink becomes file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-symlinked-to-bar'
+ok 7 - symlink becomes file
+
+expecting success of 4114.8 'symlink becomes file, in reverse': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git checkout foo-back-to-file &&
+	git apply -R --index < patch
+	
+Already on 'foo-symlinked-to-bar'
+Switched to branch 'foo-back-to-file'
+ok 8 - symlink becomes file, in reverse
+
+expecting success of 4114.9 'binary file becomes symlink': 
+	git checkout -f foo-becomes-binary &&
+	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-binary'
+ok 9 - binary file becomes symlink
+
+expecting success of 4114.10 'symlink becomes binary file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-symlinked-to-bar'
+ok 10 - symlink becomes binary file
+
+expecting success of 4114.11 'symlink becomes directory': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
+	
+Already on 'foo-symlinked-to-bar'
+ok 11 - symlink becomes directory
+
+expecting success of 4114.12 'directory becomes symlink': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-a-directory'
+ok 12 - directory becomes symlink
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4121-apply-diffs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4121-apply-diffs/.git/
+expecting success of 4121.1 'setup': git add file &&
+	git commit -q -m 1 &&
+	git checkout -b test &&
+	mv file file.tmp &&
+	echo 0 >file &&
+	cat file.tmp >>file &&
+	rm file.tmp &&
+	git commit -a -q -m 2 &&
+	echo 9 >>file &&
+	git commit -a -q -m 3 &&
+	git checkout main
+Switched to a new branch 'test'
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 4121.2 'check if contextually independent diffs for the same file apply': ( git diff test~2 test~1 && git diff test~1 test~0 )| git apply
+ok 2 - check if contextually independent diffs for the same file apply
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4120-apply-popt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4120-apply-popt/.git/
+expecting success of 4120.1 'setup': 
+	mkdir sub &&
+	echo A >sub/file1 &&
+	cp sub/file1 file1.saved &&
+	git add sub/file1 &&
+	echo B >sub/file1 &&
+	git diff >patch.file &&
+	git checkout -- sub/file1 &&
+	git mv sub süb &&
+	echo B >süb/file1 &&
+	git diff >patch.escaped &&
+	grep "[\]" patch.escaped &&
+	rm süb/file1 &&
+	rmdir süb
+
+diff --git "a/s\303\274b/file1" "b/s\303\274b/file1"
+--- "a/s\303\274b/file1"
++++ "b/s\303\274b/file1"
+ok 1 - setup
+
+expecting success of 4120.2 'apply git diff with -p2': 
+	cp file1.saved file1 &&
+	git apply -p2 patch.file
+
+ok 2 - apply git diff with -p2
+
+expecting success of 4120.3 'apply with too large -p': 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.file 2>err &&
+	test_grep "removing 3 leading" err
+
+error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
+ok 3 - apply with too large -p
+
+expecting success of 4120.4 'apply (-p2) traditional diff with funny filenames': 
+	cat >patch.quotes <<-\EOF &&
+	diff -u "a/"sub/file1 "b/"sub/file1
+	--- "a/"sub/file1
+	+++ "b/"sub/file1
+	@@ -1 +1 @@
+	-A
+	+B
+	EOF
+	echo B >expected &&
+
+	cp file1.saved file1 &&
+	git apply -p2 patch.quotes &&
+	test_cmp expected file1
+
+ok 4 - apply (-p2) traditional diff with funny filenames
+
+expecting success of 4120.5 'apply with too large -p and fancy filename': 
+	cp file1.saved file1 &&
+	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
+	test_grep "removing 3 leading" err
+
+error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
+ok 5 - apply with too large -p and fancy filename
+
+expecting success of 4120.6 'apply (-p2) diff, mode change only': 
+	cat >patch.chmod <<-\EOF &&
+	diff --git a/sub/file1 b/sub/file1
+	old mode 100644
+	new mode 100755
+	EOF
+	test_chmod -x file1 &&
+	git apply --index -p2 patch.chmod &&
+	case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac
+
+ok 6 - apply (-p2) diff, mode change only
+
+checking prerequisite: FILEMODE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
+
+)
+prerequisite FILEMODE ok
+expecting success of 4120.7 'file mode was changed': 
+	test -x file1
+
+ok 7 - file mode was changed
+
+expecting success of 4120.8 'apply (-p2) diff, rename': 
+	cat >patch.rename <<-\EOF &&
+	diff --git a/sub/file1 b/sub/file2
+	similarity index 100%
+	rename from sub/file1
+	rename to sub/file2
+	EOF
+	echo A >expected &&
+
+	cp file1.saved file1 &&
+	rm -f file2 &&
+	git apply -p2 patch.rename &&
+	test_cmp expected file2
+
+ok 8 - apply (-p2) diff, rename
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4111-apply-subdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4111-apply-subdir/.git/
+expecting success of 4111.1 'setup': 
+	cat >patch <<-\EOF &&
+	diff file.orig file
+	--- a/file.orig
+	+++ b/file
+	@@ -1 +1,2 @@
+	 1
+	+2
+	EOF
+	patch="$(pwd)/patch" &&
+
+	echo 1 >preimage &&
+	printf "%s\n" 1 2 >postimage &&
+	echo 3 >other &&
+
+	test_tick &&
+	git commit --allow-empty -m basis
+
+[master (root-commit) 2fa880c] basis
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 4111.2 'setup: subdir': 
+	reset_subdir() {
+		git reset &&
+		mkdir -p sub/dir/b &&
+		mkdir -p objects &&
+		cp "$1" file &&
+		cp "$1" objects/file &&
+		cp "$1" sub/dir/file &&
+		cp "$1" sub/dir/b/file &&
+		git add file sub/dir/file sub/dir/b/file objects/file &&
+		cp "$2" file &&
+		cp "$2" sub/dir/file &&
+		cp "$2" sub/dir/b/file &&
+		cp "$2" objects/file &&
+		test_might_fail git update-index --refresh -q
+	}
+
+ok 2 - setup: subdir
+
+expecting success of 4111.3 'apply from subdir of toplevel': 
+	cp postimage expected &&
+	reset_subdir other preimage &&
+	(
+		cd sub/dir &&
+		git apply "$patch"
+	) &&
+	test_cmp expected sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 3 - apply from subdir of toplevel
+
+expecting success of 4111.4 'apply --cached from subdir of toplevel': 
+	cp postimage expected &&
+	cp other expected.working &&
+	reset_subdir preimage other &&
+	(
+		cd sub/dir &&
+		git apply --cached "$patch"
+	) &&
+	git show :sub/dir/file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected.working sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 4 - apply --cached from subdir of toplevel
+
+expecting success of 4111.5 'apply --index from subdir of toplevel': 
+	cp postimage expected &&
+	reset_subdir preimage other &&
+	(
+		cd sub/dir &&
+		test_must_fail git apply --index "$patch"
+	) &&
+	reset_subdir other preimage &&
+	(
+		cd sub/dir &&
+		test_must_fail git apply --index "$patch"
+	) &&
+	reset_subdir preimage preimage &&
+	(
+		cd sub/dir &&
+		git apply --index "$patch"
+	) &&
+	git show :sub/dir/file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected sub/dir/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+error: sub/dir/file: does not match index
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+error: sub/dir/file: does not match index
+ok 5 - apply --index from subdir of toplevel
+
+expecting success of 4111.6 'apply half-broken patch from subdir of toplevel': 
+	(
+		cd sub/dir &&
+		test_must_fail git apply <<-EOF
+		--- sub/dir/file
+		+++ sub/dir/file
+		@@ -1,0 +1,0 @@
+		--- file_in_root
+		+++ file_in_root
+		@@ -1,0 +1,0 @@
+		EOF
+	)
+
+error: corrupt patch at line 4
+ok 6 - apply half-broken patch from subdir of toplevel
+
+expecting success of 4111.7 'apply from .git dir': 
+	cp postimage expected &&
+	cp preimage .git/file &&
+	cp preimage .git/objects/file &&
+	(
+		cd .git &&
+		git apply "$patch"
+	) &&
+	test_cmp expected .git/file
+
+ok 7 - apply from .git dir
+
+expecting success of 4111.8 'apply from subdir of .git dir': 
+	cp postimage expected &&
+	cp preimage .git/file &&
+	cp preimage .git/objects/file &&
+	(
+		cd .git/objects &&
+		git apply "$patch"
+	) &&
+	test_cmp expected .git/objects/file
+
+ok 8 - apply from subdir of .git dir
+
+expecting success of 4111.9 'apply --cached from .git dir': 
+	cp postimage expected &&
+	cp other expected.working &&
+	cp other .git/file &&
+	reset_subdir preimage other &&
+	(
+		cd .git &&
+		git apply --cached "$patch"
+	) &&
+	git show :file >actual &&
+	test_cmp expected actual &&
+	test_cmp expected.working file &&
+	test_cmp expected.working .git/file
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 9 - apply --cached from .git dir
+
+expecting success of 4111.10 'apply --cached from subdir of .git dir': 
+	cp postimage expected &&
+	cp preimage expected.subdir &&
+	cp other .git/file &&
+	cp other .git/objects/file &&
+	reset_subdir preimage other &&
+	(
+		cd .git/objects &&
+		git apply --cached "$patch"
+	) &&
+	git show :file >actual &&
+	git show :objects/file >actual.subdir &&
+	test_cmp expected actual &&
+	test_cmp expected.subdir actual.subdir
+
+file: needs update
+objects/file: needs update
+sub/dir/b/file: needs update
+sub/dir/file: needs update
+ok 10 - apply --cached from subdir of .git dir
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4115-apply-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4115-apply-symlink/.git/
+expecting success of 4115.1 'setup': 
+
+	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
+	git commit -m initial &&
+
+	git branch side &&
+
+	rm -f link? &&
+
+	test_ln_s_add htap6 link1 &&
+	git commit -m second &&
+
+	git diff-tree -p HEAD^ HEAD >patch  &&
+	git apply --stat --summary patch
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) b8ef636] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 link1
+[master 3f5d5e0] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ link1 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4115.2 'apply symlink patch': 
+
+	git checkout side &&
+	git apply patch &&
+	git diff-files -p >patched &&
+	test_cmp patch patched
+
+
+Switched to branch 'side'
+ok 2 - apply symlink patch
+
+expecting success of 4115.3 'apply --index symlink patch': 
+
+	git checkout -f side &&
+	git apply --index patch &&
+	git diff-index --cached -p HEAD >patched &&
+	test_cmp patch patched
+
+
+Already on 'side'
+ok 3 - apply --index symlink patch
+
+expecting success of 4115.4 'symlink setup': 
+	ln -s .git symlink &&
+	git add symlink &&
+	git commit -m "add symlink"
+
+[side 3bf7232] add symlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 120000 symlink
+ok 4 - symlink setup
+
+expecting success of 4115.5 'symlink escape when creating new files': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git /dev/null b/renamed-symlink/create-me
+	new file mode 100644
+	index 0000000..039727e
+	--- /dev/null
+	+++ b/renamed-symlink/create-me
+	@@ -0,0 +1,1 @@
+	+busted
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_path_is_missing .git/create-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing patched
+Removing renamed-symlink
+Removing stderr
+ok 5 - symlink escape when creating new files
+
+expecting success of 4115.6 'symlink escape when modifying file': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+	touch .git/modify-me &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git a/renamed-symlink/modify-me b/renamed-symlink/modify-me
+	index 1111111..2222222 100644
+	--- a/renamed-symlink/modify-me
+	+++ b/renamed-symlink/modify-me
+	@@ -0,0 +1,1 @@
+	+busted
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: renamed-symlink/modify-me: No such file or directory
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_must_be_empty .git/modify-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing stderr
+ok 6 - symlink escape when modifying file
+
+expecting success of 4115.7 'symlink escape when deleting file': 
+	test_when_finished "git reset --hard && git clean -dfx && rm .git/delete-me" &&
+	touch .git/delete-me &&
+
+	cat >patch <<-EOF &&
+	diff --git a/symlink b/renamed-symlink
+	similarity index 100%
+	rename from symlink
+	rename to renamed-symlink
+	--
+	diff --git a/renamed-symlink/delete-me b/renamed-symlink/delete-me
+	deleted file mode 100644
+	index 1111111..0000000 100644
+	EOF
+
+	test_must_fail git apply patch 2>stderr &&
+	cat >expected_stderr <<-EOF &&
+	error: renamed-symlink/delete-me: No such file or directory
+	EOF
+	test_cmp expected_stderr stderr &&
+	test_path_is_file .git/delete-me
+
+HEAD is now at 3bf7232 add symlink
+Removing expected_stderr
+Removing patch
+Removing stderr
+ok 7 - symlink escape when deleting file
+
+expecting success of 4115.8 '--reject removes .rej symlink if it exists': 
+	test_when_finished "git reset --hard && git clean -dfx" &&
+
+	test_commit file &&
+	echo modified >file.t &&
+	git diff -- file.t >patch &&
+	echo modified-again >file.t &&
+
+	ln -s foo file.t.rej &&
+	test_must_fail git apply patch --reject 2>err &&
+	test_grep "Rejected hunk" err &&
+	test_path_is_missing foo &&
+	test_path_is_file file.t.rej
+
+[side 3ecff08] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+Rejected hunk #1.
+HEAD is now at 3ecff08 file
+Removing err
+Removing file.t.rej
+Removing patch
+ok 8 - --reject removes .rej symlink if it exists
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4013-diff-various.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4013-diff-various/.git/
 expecting success of 4013.1 'setup': 
@@ -270933,1033 +271914,6 @@
 1..227
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4118-apply-empty-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4118-apply-empty-context/.git/
-expecting success of 4118.1 'setup': 
-	test_write_lines "" "" A B C "" >file1 &&
-	cat file1 >file1.orig &&
-	{
-		cat file1 &&
-		echo Q | tr -d "\\012"
-	} >file2 &&
-	cat file2 >file2.orig &&
-	git add file1 file2 &&
-	sed -e "/^B/d" <file1.orig >file1 &&
-	cat file1 > file2 &&
-	echo Q | tr -d "\\012" >>file2 &&
-	cat file1 >file1.mods &&
-	cat file2 >file2.mods &&
-	git diff |
-	sed -e "s/^ \$//" >diff.output
-
-ok 1 - setup
-
-expecting success of 4118.2 'apply --numstat': 
-
-	git apply --numstat diff.output >actual &&
-	{
-		echo "0	1	file1" &&
-		echo "0	1	file2"
-	} >expect &&
-	test_cmp expect actual
-
-
-ok 2 - apply --numstat
-
-expecting success of 4118.3 'apply --apply': 
-
-	cat file1.orig >file1 &&
-	cat file2.orig >file2 &&
-	git update-index file1 file2 &&
-	git apply --index diff.output &&
-	test_cmp file1.mods file1 &&
-	test_cmp file2.mods file2
-
-ok 3 - apply --apply
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4116-apply-reverse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/.git/
-expecting success of 4116.1 'setup': 
-
-	test_write_lines a b c d e f g h i j k l m n >file1 &&
-	perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
-
-	git add file1 file2 &&
-	git commit -m initial &&
-	git tag initial &&
-
-	test_write_lines a b c g h i J K L m o n p q >file1 &&
-	perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
-
-	git commit -a -m second &&
-	git tag second &&
-
-	git diff --binary initial second >patch
-
-
-[master (root-commit) 40ea0d8] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-[master 09f0b7a] second
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+), 6 deletions(-)
-ok 1 - setup
-
-expecting success of 4116.2 'apply in forward': 
-
-	T0=$(git rev-parse "second^{tree}") &&
-	git reset --hard initial &&
-	git apply --index --binary patch &&
-	T1=$(git write-tree) &&
-	test "$T0" = "$T1"
-
-HEAD is now at 40ea0d8 initial
-ok 2 - apply in forward
-
-expecting success of 4116.3 'apply in reverse': 
-
-	git reset --hard second &&
-	git apply --reverse --binary --index patch &&
-	git diff >diff &&
-	test_must_be_empty diff
-
-
-HEAD is now at 09f0b7a second
-ok 3 - apply in reverse
-
-expecting success of 4116.4 'setup separate repository lacking postimage': 
-
-	git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
-	(
-		cd initial && git init && git add .
-	) &&
-
-	git archive --format=tar --prefix=second/ second | $TAR xf - &&
-	(
-		cd second && git init && git add .
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/initial/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4116-apply-reverse/second/.git/
-ok 4 - setup separate repository lacking postimage
-
-expecting success of 4116.5 'apply in forward without postimage': 
-
-	T0=$(git rev-parse "second^{tree}") &&
-	(
-		cd initial &&
-		git apply --index --binary ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
-
-ok 5 - apply in forward without postimage
-
-expecting success of 4116.6 'apply in reverse without postimage': 
-
-	T0=$(git rev-parse "initial^{tree}") &&
-	(
-		cd second &&
-		git apply --index --binary --reverse ../patch &&
-		T1=$(git write-tree) &&
-		test "$T0" = "$T1"
-	)
-
-ok 6 - apply in reverse without postimage
-
-expecting success of 4116.7 'reversing a whitespace introduction': 
-	sed "s/a/a /" < file1 > file1.new &&
-	mv file1.new file1 &&
-	git diff | git apply --reverse --whitespace=error
-
-ok 7 - reversing a whitespace introduction
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4117-apply-reject.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4117-apply-reject/.git/
-expecting success of 4117.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 >file1 &&
-	cat file1 >saved.file1 &&
-	git update-index --add file1 &&
-	git commit -m initial &&
-
-	test_write_lines 1 2 A B 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 D 21 >file1 &&
-	git diff >patch.1 &&
-	cat file1 >clean &&
-
-	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 C 13 14 15 16 17 18 19 20 F 21 >expected &&
-
-	mv file1 file2 &&
-	git update-index --add --remove file1 file2 &&
-	git diff -M HEAD >patch.2 &&
-
-	rm -f file1 file2 &&
-	mv saved.file1 file1 &&
-	git update-index --add --remove file1 file2 &&
-
-	test_write_lines 1 E 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 F 21 >file1 &&
-
-	cat file1 >saved.file1
-
-[master (root-commit) 11e450e] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 21 insertions(+)
- create mode 100644 file1
-ok 1 - setup
-
-expecting success of 4117.2 'apply --reject is incompatible with --3way': 
-	test_when_finished "cat saved.file1 >file1" &&
-	git diff >patch.0 &&
-	git checkout file1 &&
-	test_must_fail git apply --reject --3way patch.0 &&
-	git diff --exit-code
-
-Updated 1 path from the index
-error: options '--reject' and '--3way' cannot be used together
-ok 2 - apply --reject is incompatible with --3way
-
-expecting success of 4117.3 'apply without --reject should fail': 
-
-	test_must_fail git apply patch.1 &&
-	test_cmp file1 saved.file1
-
-error: patch failed: file1:1
-error: file1: patch does not apply
-ok 3 - apply without --reject should fail
-
-expecting success of 4117.4 'apply without --reject should fail': 
-
-	test_must_fail git apply --verbose patch.1 &&
-	test_cmp file1 saved.file1
-
-Checking patch file1...
-error: while searching for:
-1
-2
-3
-4
-5
-6
-
-error: patch failed: file1:1
-error: file1: patch does not apply
-ok 4 - apply without --reject should fail
-
-expecting success of 4117.5 'apply with --reject should fail but update the file': 
-
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej &&
-
-	test_must_fail git apply --reject patch.1 &&
-	test_cmp expected file1 &&
-
-	test_path_is_file file1.rej &&
-	test_path_is_missing file2.rej
-
-Checking patch file1...
-error: while searching for:
-1
-2
-3
-4
-5
-6
-
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
-
-error: patch failed: file1:18
-Applying patch file1 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 5 - apply with --reject should fail but update the file
-
-expecting success of 4117.6 'apply with --reject should fail but update the file': 
-
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej file2 &&
-
-	test_must_fail git apply --reject patch.2 >rejects &&
-	test_path_is_missing file1 &&
-	test_cmp expected file2 &&
-
-	test_path_is_file file2.rej &&
-	test_path_is_missing file1.rej
-
-
-Checking patch file1 => file2...
-error: while searching for:
-1
-2
-3
-4
-5
-6
-
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
-
-error: patch failed: file1:18
-Applying patch file1 => file2 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 6 - apply with --reject should fail but update the file
-
-expecting success of 4117.7 'the same test with --verbose': 
-
-	cat saved.file1 >file1 &&
-	rm -f file1.rej file2.rej file2 &&
-
-	test_must_fail git apply --reject --verbose patch.2 >rejects &&
-	test_path_is_missing file1 &&
-	test_cmp expected file2 &&
-
-	test_path_is_file file2.rej &&
-	test_path_is_missing file1.rej
-
-
-Checking patch file1 => file2...
-error: while searching for:
-1
-2
-3
-4
-5
-6
-
-error: patch failed: file1:1
-error: while searching for:
-18
-19
-20
-21
-
-error: patch failed: file1:18
-Applying patch file1 => file2 with 2 rejects...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-Rejected hunk #3.
-ok 7 - the same test with --verbose
-
-expecting success of 4117.8 'apply cleanly with --verbose': 
-
-	git cat-file -p HEAD:file1 >file1 &&
-	rm -f file?.rej file2 &&
-
-	git apply --verbose patch.1 &&
-
-	test_cmp file1 clean
-
-Checking patch file1...
-Applied patch file1 cleanly.
-ok 8 - apply cleanly with --verbose
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4115-apply-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4115-apply-symlink/.git/
-expecting success of 4115.1 'setup': 
-
-	test_ln_s_add path1/path2/path3/path4/path5 link1 &&
-	git commit -m initial &&
-
-	git branch side &&
-
-	rm -f link? &&
-
-	test_ln_s_add htap6 link1 &&
-	git commit -m second &&
-
-	git diff-tree -p HEAD^ HEAD >patch  &&
-	git apply --stat --summary patch
-
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master (root-commit) b8ef636] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 link1
-[master 3f5d5e0] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- link1 |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4115.2 'apply symlink patch': 
-
-	git checkout side &&
-	git apply patch &&
-	git diff-files -p >patched &&
-	test_cmp patch patched
-
-
-Switched to branch 'side'
-ok 2 - apply symlink patch
-
-expecting success of 4115.3 'apply --index symlink patch': 
-
-	git checkout -f side &&
-	git apply --index patch &&
-	git diff-index --cached -p HEAD >patched &&
-	test_cmp patch patched
-
-
-Already on 'side'
-ok 3 - apply --index symlink patch
-
-expecting success of 4115.4 'symlink setup': 
-	ln -s .git symlink &&
-	git add symlink &&
-	git commit -m "add symlink"
-
-[side 3bf7232] add symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 120000 symlink
-ok 4 - symlink setup
-
-expecting success of 4115.5 'symlink escape when creating new files': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git /dev/null b/renamed-symlink/create-me
-	new file mode 100644
-	index 0000000..039727e
-	--- /dev/null
-	+++ b/renamed-symlink/create-me
-	@@ -0,0 +1,1 @@
-	+busted
-	EOF
-
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_path_is_missing .git/create-me
-
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing patched
-Removing renamed-symlink
-Removing stderr
-ok 5 - symlink escape when creating new files
-
-expecting success of 4115.6 'symlink escape when modifying file': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-	touch .git/modify-me &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git a/renamed-symlink/modify-me b/renamed-symlink/modify-me
-	index 1111111..2222222 100644
-	--- a/renamed-symlink/modify-me
-	+++ b/renamed-symlink/modify-me
-	@@ -0,0 +1,1 @@
-	+busted
-	EOF
-
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: renamed-symlink/modify-me: No such file or directory
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_must_be_empty .git/modify-me
-
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 6 - symlink escape when modifying file
-
-expecting success of 4115.7 'symlink escape when deleting file': 
-	test_when_finished "git reset --hard && git clean -dfx && rm .git/delete-me" &&
-	touch .git/delete-me &&
-
-	cat >patch <<-EOF &&
-	diff --git a/symlink b/renamed-symlink
-	similarity index 100%
-	rename from symlink
-	rename to renamed-symlink
-	--
-	diff --git a/renamed-symlink/delete-me b/renamed-symlink/delete-me
-	deleted file mode 100644
-	index 1111111..0000000 100644
-	EOF
-
-	test_must_fail git apply patch 2>stderr &&
-	cat >expected_stderr <<-EOF &&
-	error: renamed-symlink/delete-me: No such file or directory
-	EOF
-	test_cmp expected_stderr stderr &&
-	test_path_is_file .git/delete-me
-
-HEAD is now at 3bf7232 add symlink
-Removing expected_stderr
-Removing patch
-Removing stderr
-ok 7 - symlink escape when deleting file
-
-expecting success of 4115.8 '--reject removes .rej symlink if it exists': 
-	test_when_finished "git reset --hard && git clean -dfx" &&
-
-	test_commit file &&
-	echo modified >file.t &&
-	git diff -- file.t >patch &&
-	echo modified-again >file.t &&
-
-	ln -s foo file.t.rej &&
-	test_must_fail git apply patch --reject 2>err &&
-	test_grep "Rejected hunk" err &&
-	test_path_is_missing foo &&
-	test_path_is_file file.t.rej
-
-[side 3ecff08] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Rejected hunk #1.
-HEAD is now at 3ecff08 file
-Removing err
-Removing file.t.rej
-Removing patch
-ok 8 - --reject removes .rej symlink if it exists
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4114-apply-typechange.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4114-apply-typechange/.git/
-expecting success of 4114.1 'setup repository and commits': 
-	echo "hello world" > foo &&
-	echo "hi planet" > bar &&
-	git update-index --add foo bar &&
-	git commit -m initial &&
-	git branch initial &&
-	rm -f foo &&
-	test_ln_s_add bar foo &&
-	git commit -m "foo symlinked to bar" &&
-	git branch foo-symlinked-to-bar &&
-	git rm -f foo &&
-	echo "how far is the sun?" > foo &&
-	git update-index --add foo &&
-	git commit -m "foo back to file" &&
-	git branch foo-back-to-file &&
-	printf "\0" > foo &&
-	git update-index foo &&
-	git commit -m "foo becomes binary" &&
-	git branch foo-becomes-binary &&
-	rm -f foo &&
-	git update-index --remove foo &&
-	mkdir foo &&
-	echo "if only I knew" > foo/baz &&
-	git update-index --add foo/baz &&
-	git commit -m "foo becomes a directory" &&
-	git branch "foo-becomes-a-directory" &&
-	echo "hello world" > foo/baz &&
-	git update-index foo/baz &&
-	git commit -m "foo/baz is the original foo" &&
-	git branch foo-baz-renamed-from-foo
-	
-[master (root-commit) 8d5a53c] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master 2b1a969] foo symlinked to bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 100644 => 120000 foo
-rm 'foo'
-[master 41a0307] foo back to file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 120000 => 100644 foo
-[master bd76368] foo becomes binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master 918d519] foo becomes a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- delete mode 100644 foo
- create mode 100644 foo/baz
-[master 5d696d0] foo/baz is the original foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup repository and commits
-
-expecting success of 4114.2 'file renamed from foo to foo/baz': 
-	git checkout -f initial &&
-	git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
-	git apply --index < patch
-	
-Switched to branch 'initial'
-ok 2 - file renamed from foo to foo/baz
-
-expecting success of 4114.3 'file renamed from foo/baz to foo': 
-	git checkout -f foo-baz-renamed-from-foo &&
-	git diff-tree -M -p HEAD initial > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-baz-renamed-from-foo'
-ok 3 - file renamed from foo/baz to foo
-
-expecting success of 4114.4 'directory becomes file': 
-	git checkout -f foo-becomes-a-directory &&
-	git diff-tree -p HEAD initial > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-a-directory'
-ok 4 - directory becomes file
-
-expecting success of 4114.5 'file becomes directory': 
-	git checkout -f initial &&
-	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
-	git apply --index < patch
-	
-Switched to branch 'initial'
-ok 5 - file becomes directory
-
-expecting success of 4114.6 'file becomes symlink': 
-	git checkout -f initial &&
-	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Already on 'initial'
-ok 6 - file becomes symlink
-
-expecting success of 4114.7 'symlink becomes file': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-back-to-file > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-symlinked-to-bar'
-ok 7 - symlink becomes file
-
-expecting success of 4114.8 'symlink becomes file, in reverse': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-back-to-file > patch &&
-	git checkout foo-back-to-file &&
-	git apply -R --index < patch
-	
-Already on 'foo-symlinked-to-bar'
-Switched to branch 'foo-back-to-file'
-ok 8 - symlink becomes file, in reverse
-
-expecting success of 4114.9 'binary file becomes symlink': 
-	git checkout -f foo-becomes-binary &&
-	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-binary'
-ok 9 - binary file becomes symlink
-
-expecting success of 4114.10 'symlink becomes binary file': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-symlinked-to-bar'
-ok 10 - symlink becomes binary file
-
-expecting success of 4114.11 'symlink becomes directory': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
-	git apply --index < patch
-	
-Already on 'foo-symlinked-to-bar'
-ok 11 - symlink becomes directory
-
-expecting success of 4114.12 'directory becomes symlink': 
-	git checkout -f foo-becomes-a-directory &&
-	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
-	git apply --index < patch
-	
-Switched to branch 'foo-becomes-a-directory'
-ok 12 - directory becomes symlink
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4121-apply-diffs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4121-apply-diffs/.git/
-expecting success of 4121.1 'setup': git add file &&
-	git commit -q -m 1 &&
-	git checkout -b test &&
-	mv file file.tmp &&
-	echo 0 >file &&
-	cat file.tmp >>file &&
-	rm file.tmp &&
-	git commit -a -q -m 2 &&
-	echo 9 >>file &&
-	git commit -a -q -m 3 &&
-	git checkout main
-Switched to a new branch 'test'
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 4121.2 'check if contextually independent diffs for the same file apply': ( git diff test~2 test~1 && git diff test~1 test~0 )| git apply
-ok 2 - check if contextually independent diffs for the same file apply
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4111-apply-subdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4111-apply-subdir/.git/
-expecting success of 4111.1 'setup': 
-	cat >patch <<-\EOF &&
-	diff file.orig file
-	--- a/file.orig
-	+++ b/file
-	@@ -1 +1,2 @@
-	 1
-	+2
-	EOF
-	patch="$(pwd)/patch" &&
-
-	echo 1 >preimage &&
-	printf "%s\n" 1 2 >postimage &&
-	echo 3 >other &&
-
-	test_tick &&
-	git commit --allow-empty -m basis
-
-[master (root-commit) 2fa880c] basis
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 4111.2 'setup: subdir': 
-	reset_subdir() {
-		git reset &&
-		mkdir -p sub/dir/b &&
-		mkdir -p objects &&
-		cp "$1" file &&
-		cp "$1" objects/file &&
-		cp "$1" sub/dir/file &&
-		cp "$1" sub/dir/b/file &&
-		git add file sub/dir/file sub/dir/b/file objects/file &&
-		cp "$2" file &&
-		cp "$2" sub/dir/file &&
-		cp "$2" sub/dir/b/file &&
-		cp "$2" objects/file &&
-		test_might_fail git update-index --refresh -q
-	}
-
-ok 2 - setup: subdir
-
-expecting success of 4111.3 'apply from subdir of toplevel': 
-	cp postimage expected &&
-	reset_subdir other preimage &&
-	(
-		cd sub/dir &&
-		git apply "$patch"
-	) &&
-	test_cmp expected sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 3 - apply from subdir of toplevel
-
-expecting success of 4111.4 'apply --cached from subdir of toplevel': 
-	cp postimage expected &&
-	cp other expected.working &&
-	reset_subdir preimage other &&
-	(
-		cd sub/dir &&
-		git apply --cached "$patch"
-	) &&
-	git show :sub/dir/file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected.working sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 4 - apply --cached from subdir of toplevel
-
-expecting success of 4111.5 'apply --index from subdir of toplevel': 
-	cp postimage expected &&
-	reset_subdir preimage other &&
-	(
-		cd sub/dir &&
-		test_must_fail git apply --index "$patch"
-	) &&
-	reset_subdir other preimage &&
-	(
-		cd sub/dir &&
-		test_must_fail git apply --index "$patch"
-	) &&
-	reset_subdir preimage preimage &&
-	(
-		cd sub/dir &&
-		git apply --index "$patch"
-	) &&
-	git show :sub/dir/file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected sub/dir/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-error: sub/dir/file: does not match index
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-error: sub/dir/file: does not match index
-ok 5 - apply --index from subdir of toplevel
-
-expecting success of 4111.6 'apply half-broken patch from subdir of toplevel': 
-	(
-		cd sub/dir &&
-		test_must_fail git apply <<-EOF
-		--- sub/dir/file
-		+++ sub/dir/file
-		@@ -1,0 +1,0 @@
-		--- file_in_root
-		+++ file_in_root
-		@@ -1,0 +1,0 @@
-		EOF
-	)
-
-error: corrupt patch at line 4
-ok 6 - apply half-broken patch from subdir of toplevel
-
-expecting success of 4111.7 'apply from .git dir': 
-	cp postimage expected &&
-	cp preimage .git/file &&
-	cp preimage .git/objects/file &&
-	(
-		cd .git &&
-		git apply "$patch"
-	) &&
-	test_cmp expected .git/file
-
-ok 7 - apply from .git dir
-
-expecting success of 4111.8 'apply from subdir of .git dir': 
-	cp postimage expected &&
-	cp preimage .git/file &&
-	cp preimage .git/objects/file &&
-	(
-		cd .git/objects &&
-		git apply "$patch"
-	) &&
-	test_cmp expected .git/objects/file
-
-ok 8 - apply from subdir of .git dir
-
-expecting success of 4111.9 'apply --cached from .git dir': 
-	cp postimage expected &&
-	cp other expected.working &&
-	cp other .git/file &&
-	reset_subdir preimage other &&
-	(
-		cd .git &&
-		git apply --cached "$patch"
-	) &&
-	git show :file >actual &&
-	test_cmp expected actual &&
-	test_cmp expected.working file &&
-	test_cmp expected.working .git/file
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 9 - apply --cached from .git dir
-
-expecting success of 4111.10 'apply --cached from subdir of .git dir': 
-	cp postimage expected &&
-	cp preimage expected.subdir &&
-	cp other .git/file &&
-	cp other .git/objects/file &&
-	reset_subdir preimage other &&
-	(
-		cd .git/objects &&
-		git apply --cached "$patch"
-	) &&
-	git show :file >actual &&
-	git show :objects/file >actual.subdir &&
-	test_cmp expected actual &&
-	test_cmp expected.subdir actual.subdir
-
-file: needs update
-objects/file: needs update
-sub/dir/b/file: needs update
-sub/dir/file: needs update
-ok 10 - apply --cached from subdir of .git dir
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4120-apply-popt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4120-apply-popt/.git/
-expecting success of 4120.1 'setup': 
-	mkdir sub &&
-	echo A >sub/file1 &&
-	cp sub/file1 file1.saved &&
-	git add sub/file1 &&
-	echo B >sub/file1 &&
-	git diff >patch.file &&
-	git checkout -- sub/file1 &&
-	git mv sub süb &&
-	echo B >süb/file1 &&
-	git diff >patch.escaped &&
-	grep "[\]" patch.escaped &&
-	rm süb/file1 &&
-	rmdir süb
-
-diff --git "a/s\303\274b/file1" "b/s\303\274b/file1"
---- "a/s\303\274b/file1"
-+++ "b/s\303\274b/file1"
-ok 1 - setup
-
-expecting success of 4120.2 'apply git diff with -p2': 
-	cp file1.saved file1 &&
-	git apply -p2 patch.file
-
-ok 2 - apply git diff with -p2
-
-expecting success of 4120.3 'apply with too large -p': 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.file 2>err &&
-	test_grep "removing 3 leading" err
-
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 3 - apply with too large -p
-
-expecting success of 4120.4 'apply (-p2) traditional diff with funny filenames': 
-	cat >patch.quotes <<-\EOF &&
-	diff -u "a/"sub/file1 "b/"sub/file1
-	--- "a/"sub/file1
-	+++ "b/"sub/file1
-	@@ -1 +1 @@
-	-A
-	+B
-	EOF
-	echo B >expected &&
-
-	cp file1.saved file1 &&
-	git apply -p2 patch.quotes &&
-	test_cmp expected file1
-
-ok 4 - apply (-p2) traditional diff with funny filenames
-
-expecting success of 4120.5 'apply with too large -p and fancy filename': 
-	cp file1.saved file1 &&
-	test_must_fail git apply --stat -p3 patch.escaped 2>err &&
-	test_grep "removing 3 leading" err
-
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 5 - apply with too large -p and fancy filename
-
-expecting success of 4120.6 'apply (-p2) diff, mode change only': 
-	cat >patch.chmod <<-\EOF &&
-	diff --git a/sub/file1 b/sub/file1
-	old mode 100644
-	new mode 100755
-	EOF
-	test_chmod -x file1 &&
-	git apply --index -p2 patch.chmod &&
-	case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac
-
-ok 6 - apply (-p2) diff, mode change only
-
-checking prerequisite: FILEMODE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
-
-)
-prerequisite FILEMODE ok
-expecting success of 4120.7 'file mode was changed': 
-	test -x file1
-
-ok 7 - file mode was changed
-
-expecting success of 4120.8 'apply (-p2) diff, rename': 
-	cat >patch.rename <<-\EOF &&
-	diff --git a/sub/file1 b/sub/file2
-	similarity index 100%
-	rename from sub/file1
-	rename to sub/file2
-	EOF
-	echo A >expected &&
-
-	cp file1.saved file1 &&
-	rm -f file2 &&
-	git apply -p2 patch.rename &&
-	test_cmp expected file2
-
-ok 8 - apply (-p2) diff, rename
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4119-apply-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4119-apply-config/.git/
 expecting success of 4119.1 'setup': 
@@ -272184,6 +272138,138 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4125-apply-ws-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4125-apply-ws-fuzz/.git/
+expecting success of 4125.1 'setup': 
+
+	>file &&
+	git add file &&
+
+	# file-0 is full of whitespace breakages
+	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
+
+	# patch-0 creates a whitespace broken file
+	cat file-0 >file &&
+	git diff >patch-0 &&
+	git add file &&
+
+	# file-1 is still full of whitespace breakages,
+	# but has one line updated, without fixing any
+	# whitespaces.
+	# patch-1 records that change.
+	sed -e "s/d/D/" file-0 >file-1 &&
+	cat file-1 >file &&
+	git diff >patch-1 &&
+
+	# patch-all is the effect of both patch-0 and patch-1
+	>file &&
+	git add file &&
+	cat file-1 >file &&
+	git diff >patch-all &&
+
+	# patch-2 is the same as patch-1 but is based
+	# on a version that already has whitespace fixed,
+	# and does not introduce whitespace breakages.
+	sed -e "s/ \$//" patch-1 >patch-2 &&
+
+	# If all whitespace breakages are fixed the contents
+	# should look like file-fixed
+	sed -e "s/ \$//" file-1 >file-fixed
+
+
+ok 1 - setup
+
+expecting success of 4125.2 'nofix': 
+
+	>file &&
+	git add file &&
+
+	# Baseline.  Applying without fixing any whitespace
+	# breakages.
+	git apply --whitespace=nowarn patch-0 &&
+	git apply --whitespace=nowarn patch-1 &&
+
+	# The result should obviously match.
+	test_cmp file-1 file
+
+ok 2 - nofix
+
+expecting success of 4125.3 'withfix (forward)': 
+
+	>file &&
+	git add file &&
+
+	# The first application will munge the context lines
+	# the second patch depends on.  We should be able to
+	# adjust and still apply.
+	git apply --whitespace=fix patch-0 &&
+	git apply --whitespace=fix patch-1 &&
+
+	test_cmp file-fixed file
+
+patch-0:6: trailing whitespace.
+a 
+patch-0:7: trailing whitespace.
+bb 
+patch-0:8: trailing whitespace.
+c 
+patch-0:9: trailing whitespace.
+d 
+patch-0:10: trailing whitespace.
+eeee 
+warning: squelched 3 whitespace errors
+warning: 8 lines applied after fixing whitespace errors.
+patch-1:6: trailing whitespace.
+a 
+patch-1:7: trailing whitespace.
+bb 
+patch-1:8: trailing whitespace.
+c 
+patch-1:10: trailing whitespace.
+D 
+patch-1:11: trailing whitespace.
+eeee 
+warning: squelched 2 whitespace errors
+warning: 1 line applied after fixing whitespace errors.
+ok 3 - withfix (forward)
+
+expecting success of 4125.4 'withfix (backward)': 
+
+	>file &&
+	git add file &&
+
+	# Now we have a whitespace breakages on our side.
+	git apply --whitespace=nowarn patch-0 &&
+
+	# And somebody sends in a patch based on image
+	# with whitespace already fixed.
+	git apply --whitespace=fix patch-2 &&
+
+	# The result should accept the whitespace fixed
+	# postimage.  But the line with "h" is beyond context
+	# horizon and left unfixed.
+
+	sed -e /h/d file-fixed >fixed-head &&
+	sed -e /h/d file >file-head &&
+	test_cmp fixed-head file-head &&
+
+	sed -n -e /h/p file-fixed >fixed-tail &&
+	sed -n -e /h/p file >file-tail &&
+
+	! test_cmp fixed-tail file-tail
+
+
+--- fixed-tail	2025-03-17 13:22:21.021088655 +0000
++++ file-tail	2025-03-17 13:22:21.037088756 +0000
+@@ -1 +1 @@
+-h
++h 
+ok 4 - withfix (backward)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4122-apply-symlink-inside.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4122-apply-symlink-inside/.git/
 expecting success of 4122.1 'setup': 
@@ -272408,221 +272494,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4125-apply-ws-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4125-apply-ws-fuzz/.git/
-expecting success of 4125.1 'setup': 
-
-	>file &&
-	git add file &&
-
-	# file-0 is full of whitespace breakages
-	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
-
-	# patch-0 creates a whitespace broken file
-	cat file-0 >file &&
-	git diff >patch-0 &&
-	git add file &&
-
-	# file-1 is still full of whitespace breakages,
-	# but has one line updated, without fixing any
-	# whitespaces.
-	# patch-1 records that change.
-	sed -e "s/d/D/" file-0 >file-1 &&
-	cat file-1 >file &&
-	git diff >patch-1 &&
-
-	# patch-all is the effect of both patch-0 and patch-1
-	>file &&
-	git add file &&
-	cat file-1 >file &&
-	git diff >patch-all &&
-
-	# patch-2 is the same as patch-1 but is based
-	# on a version that already has whitespace fixed,
-	# and does not introduce whitespace breakages.
-	sed -e "s/ \$//" patch-1 >patch-2 &&
-
-	# If all whitespace breakages are fixed the contents
-	# should look like file-fixed
-	sed -e "s/ \$//" file-1 >file-fixed
-
-
-ok 1 - setup
-
-expecting success of 4125.2 'nofix': 
-
-	>file &&
-	git add file &&
-
-	# Baseline.  Applying without fixing any whitespace
-	# breakages.
-	git apply --whitespace=nowarn patch-0 &&
-	git apply --whitespace=nowarn patch-1 &&
-
-	# The result should obviously match.
-	test_cmp file-1 file
-
-ok 2 - nofix
-
-expecting success of 4125.3 'withfix (forward)': 
-
-	>file &&
-	git add file &&
-
-	# The first application will munge the context lines
-	# the second patch depends on.  We should be able to
-	# adjust and still apply.
-	git apply --whitespace=fix patch-0 &&
-	git apply --whitespace=fix patch-1 &&
-
-	test_cmp file-fixed file
-
-patch-0:6: trailing whitespace.
-a 
-patch-0:7: trailing whitespace.
-bb 
-patch-0:8: trailing whitespace.
-c 
-patch-0:9: trailing whitespace.
-d 
-patch-0:10: trailing whitespace.
-eeee 
-warning: squelched 3 whitespace errors
-warning: 8 lines applied after fixing whitespace errors.
-patch-1:6: trailing whitespace.
-a 
-patch-1:7: trailing whitespace.
-bb 
-patch-1:8: trailing whitespace.
-c 
-patch-1:10: trailing whitespace.
-D 
-patch-1:11: trailing whitespace.
-eeee 
-warning: squelched 2 whitespace errors
-warning: 1 line applied after fixing whitespace errors.
-ok 3 - withfix (forward)
-
-expecting success of 4125.4 'withfix (backward)': 
-
-	>file &&
-	git add file &&
-
-	# Now we have a whitespace breakages on our side.
-	git apply --whitespace=nowarn patch-0 &&
-
-	# And somebody sends in a patch based on image
-	# with whitespace already fixed.
-	git apply --whitespace=fix patch-2 &&
-
-	# The result should accept the whitespace fixed
-	# postimage.  But the line with "h" is beyond context
-	# horizon and left unfixed.
-
-	sed -e /h/d file-fixed >fixed-head &&
-	sed -e /h/d file >file-head &&
-	test_cmp fixed-head file-head &&
-
-	sed -n -e /h/p file-fixed >fixed-tail &&
-	sed -n -e /h/p file >file-tail &&
-
-	! test_cmp fixed-tail file-tail
-
-
---- fixed-tail	2026-04-19 19:19:45.879659440 +0000
-+++ file-tail	2026-04-19 19:19:45.891659440 +0000
-@@ -1 +1 @@
--h
-+h 
-ok 4 - withfix (backward)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4131-apply-fake-ancestor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4131-apply-fake-ancestor/.git/
-expecting success of 4131.1 'setup': 
-	test_commit 1 &&
-	test_commit 2 &&
-	mkdir sub &&
-	test_commit 3 sub/3.t &&
-	test_commit 4
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master 0015c90] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub/3.t
-[master 8d74a78] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-ok 1 - setup
-
-expecting success of 4131.2 'apply --build-fake-ancestor': 
-	git checkout 2 &&
-	echo "A" > 1.t &&
-	git diff > 1.patch &&
-	git reset --hard &&
-	git checkout 1 &&
-	git apply --build-fake-ancestor 1.ancestor 1.patch
-
-Note: switching to '2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 82335b2 2
-HEAD is now at 82335b2 2
-Previous HEAD position was 82335b2 2
-HEAD is now at d0dcf97 1
-ok 2 - apply --build-fake-ancestor
-
-expecting success of 4131.3 'apply --build-fake-ancestor in a subdirectory': 
-	git checkout 3 &&
-	echo "C" > sub/3.t &&
-	git diff > 3.patch &&
-	git reset --hard &&
-	git checkout 4 &&
-	(
-		cd sub &&
-		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
-		test -f 3.ancestor
-	) &&
-	git apply --build-fake-ancestor 3.ancestor 3.patch &&
-	test_cmp sub/3.ancestor 3.ancestor
-
-Previous HEAD position was d0dcf97 1
-HEAD is now at 0015c90 3
-HEAD is now at 0015c90 3
-Previous HEAD position was 0015c90 3
-HEAD is now at 8d74a78 4
-ok 3 - apply --build-fake-ancestor in a subdirectory
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4130-apply-criss-cross-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4130-apply-criss-cross-rename/.git/
 expecting success of 4130.1 'setup': 
@@ -272788,6 +272659,72 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4133-apply-filenames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4133-apply-filenames/.git/
+expecting success of 4133.1 'setup': 
+	cat > bad1.patch <<EOF &&
+diff --git a/f b/f
+new file mode 100644
+index 0000000..d00491f
+--- /dev/null
++++ b/f-blah
+@@ -0,0 +1 @@
++1
+EOF
+	cat > bad2.patch <<EOF
+diff --git a/f b/f
+deleted file mode 100644
+index d00491f..0000000
+--- b/f-blah
++++ /dev/null
+@@ -1 +0,0 @@
+-1
+EOF
+
+ok 1 - setup
+
+expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
+	test_must_fail git apply bad1.patch 2>err &&
+	test_grep "inconsistent new filename" err &&
+	test_must_fail git apply bad2.patch 2>err &&
+	test_grep "inconsistent old filename" err
+
+error: git apply: bad git-diff - inconsistent new filename on line 2
+error: git apply: bad git-diff - inconsistent old filename on line 2
+ok 2 - apply diff with inconsistent filenames in headers
+
+expecting success of 4133.3 'apply diff with new filename missing from headers': 
+	cat >missing_new_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index 0000000..d00491f
+	--- a/f
+	@@ -0,0 +1 @@
+	+1
+	EOF
+	test_must_fail git apply missing_new_filename.diff 2>err &&
+	test_grep "lacks filename information" err
+
+error: git diff header lacks filename information (line 4)
+ok 3 - apply diff with new filename missing from headers
+
+expecting success of 4133.4 'apply diff with old filename missing from headers': 
+	cat >missing_old_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index d00491f..0000000
+	+++ b/f
+	@@ -1 +0,0 @@
+	-1
+	EOF
+	test_must_fail git apply missing_old_filename.diff 2>err &&
+	test_grep "lacks filename information" err
+
+error: git diff header lacks filename information (line 4)
+ok 4 - apply diff with old filename missing from headers
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4126-apply-empty.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4126-apply-empty/.git/
 expecting success of 4126.1 'setup': 
@@ -272911,6 +272848,206 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4131-apply-fake-ancestor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4131-apply-fake-ancestor/.git/
+expecting success of 4131.1 'setup': 
+	test_commit 1 &&
+	test_commit 2 &&
+	mkdir sub &&
+	test_commit 3 sub/3.t &&
+	test_commit 4
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master 0015c90] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub/3.t
+[master 8d74a78] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+ok 1 - setup
+
+expecting success of 4131.2 'apply --build-fake-ancestor': 
+	git checkout 2 &&
+	echo "A" > 1.t &&
+	git diff > 1.patch &&
+	git reset --hard &&
+	git checkout 1 &&
+	git apply --build-fake-ancestor 1.ancestor 1.patch
+
+Note: switching to '2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 82335b2 2
+HEAD is now at 82335b2 2
+Previous HEAD position was 82335b2 2
+HEAD is now at d0dcf97 1
+ok 2 - apply --build-fake-ancestor
+
+expecting success of 4131.3 'apply --build-fake-ancestor in a subdirectory': 
+	git checkout 3 &&
+	echo "C" > sub/3.t &&
+	git diff > 3.patch &&
+	git reset --hard &&
+	git checkout 4 &&
+	(
+		cd sub &&
+		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
+		test -f 3.ancestor
+	) &&
+	git apply --build-fake-ancestor 3.ancestor 3.patch &&
+	test_cmp sub/3.ancestor 3.ancestor
+
+Previous HEAD position was d0dcf97 1
+HEAD is now at 0015c90 3
+HEAD is now at 0015c90 3
+Previous HEAD position was 0015c90 3
+HEAD is now at 8d74a78 4
+ok 3 - apply --build-fake-ancestor in a subdirectory
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4127-apply-same-fn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4127-apply-same-fn/.git/
+expecting success of 4127.1 'setup': 
+	test_write_lines a b c d e f g h i j k l m >same_fn &&
+	cp same_fn other_fn &&
+	git add same_fn other_fn &&
+	git commit -m initial
+
+[master (root-commit) a38c7c5] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 26 insertions(+)
+ create mode 100644 other_fn
+ create mode 100644 same_fn
+ok 1 - setup
+
+expecting success of 4127.2 'apply same filename with independent changes': 
+	modify "s/^d/z/" same_fn &&
+	git diff > patch0 &&
+	git add same_fn &&
+	modify "s/^i/y/" same_fn &&
+	git diff >> patch0 &&
+	cp same_fn same_fn2 &&
+	git reset --hard &&
+	git apply patch0 &&
+	test_cmp same_fn same_fn2
+
+HEAD is now at a38c7c5 initial
+ok 2 - apply same filename with independent changes
+
+expecting success of 4127.3 'apply same filename with overlapping changes': 
+	git reset --hard &&
+
+	# Store same_fn so that we can check apply -R in next test
+	cp same_fn same_fn1 &&
+
+	modify "s/^d/z/" same_fn &&
+	git diff > patch0 &&
+	git add same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git diff >> patch0 &&
+	cp same_fn same_fn2 &&
+	git reset --hard &&
+	git apply patch0 &&
+	test_cmp same_fn same_fn2
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+ok 3 - apply same filename with overlapping changes
+
+expecting success of 4127.4 'apply same filename with overlapping changes, in reverse': 
+	git apply -R patch0 &&
+	test_cmp same_fn same_fn1
+
+ok 4 - apply same filename with overlapping changes, in reverse
+
+expecting success of 4127.5 'apply same new filename after rename': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	modify "s/^e/y/" new_fn &&
+	git diff >> patch1 &&
+	cp new_fn new_fn2 &&
+	git reset --hard &&
+	git apply --index patch1 &&
+	test_cmp new_fn new_fn2
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+ok 5 - apply same new filename after rename
+
+expecting success of 4127.6 'apply same old filename after rename -- should fail.': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	git mv new_fn same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git diff >> patch1 &&
+	git reset --hard &&
+	test_must_fail git apply patch1
+
+HEAD is now at a38c7c5 initial
+HEAD is now at a38c7c5 initial
+error: path same_fn has been renamed/deleted
+ok 6 - apply same old filename after rename -- should fail.
+
+expecting success of 4127.7 'apply A->B (rename), C->A (rename), A->A -- should pass.': 
+	git reset --hard &&
+	git mv same_fn new_fn &&
+	modify "s/^d/z/" new_fn &&
+	git add new_fn &&
+	git diff -M --cached > patch1 &&
+	git commit -m "a rename" &&
+	git mv other_fn same_fn &&
+	modify "s/^e/y/" same_fn &&
+	git add same_fn &&
+	git diff -M --cached >> patch1 &&
+	modify "s/^g/x/" same_fn &&
+	git diff >> patch1 &&
+	git reset --hard HEAD^ &&
+	git apply patch1
+
+HEAD is now at a38c7c5 initial
+[master d59c5fe] a rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename same_fn => new_fn (92%)
+HEAD is now at a38c7c5 initial
+ok 7 - apply A->B (rename), C->A (rename), A->A -- should pass.
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4108-apply-threeway.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4108-apply-threeway/.git/
 expecting success of 4108.1 'setup': 
@@ -273431,189 +273568,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4133-apply-filenames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4133-apply-filenames/.git/
-expecting success of 4133.1 'setup': 
-	cat > bad1.patch <<EOF &&
-diff --git a/f b/f
-new file mode 100644
-index 0000000..d00491f
---- /dev/null
-+++ b/f-blah
-@@ -0,0 +1 @@
-+1
-EOF
-	cat > bad2.patch <<EOF
-diff --git a/f b/f
-deleted file mode 100644
-index d00491f..0000000
---- b/f-blah
-+++ /dev/null
-@@ -1 +0,0 @@
--1
-EOF
-
-ok 1 - setup
-
-expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
-	test_must_fail git apply bad1.patch 2>err &&
-	test_grep "inconsistent new filename" err &&
-	test_must_fail git apply bad2.patch 2>err &&
-	test_grep "inconsistent old filename" err
-
-error: git apply: bad git-diff - inconsistent new filename on line 2
-error: git apply: bad git-diff - inconsistent old filename on line 2
-ok 2 - apply diff with inconsistent filenames in headers
-
-expecting success of 4133.3 'apply diff with new filename missing from headers': 
-	cat >missing_new_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index 0000000..d00491f
-	--- a/f
-	@@ -0,0 +1 @@
-	+1
-	EOF
-	test_must_fail git apply missing_new_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 3 - apply diff with new filename missing from headers
-
-expecting success of 4133.4 'apply diff with old filename missing from headers': 
-	cat >missing_old_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index d00491f..0000000
-	+++ b/f
-	@@ -1 +0,0 @@
-	-1
-	EOF
-	test_must_fail git apply missing_old_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 4 - apply diff with old filename missing from headers
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4127-apply-same-fn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4127-apply-same-fn/.git/
-expecting success of 4127.1 'setup': 
-	test_write_lines a b c d e f g h i j k l m >same_fn &&
-	cp same_fn other_fn &&
-	git add same_fn other_fn &&
-	git commit -m initial
-
-[master (root-commit) a38c7c5] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 26 insertions(+)
- create mode 100644 other_fn
- create mode 100644 same_fn
-ok 1 - setup
-
-expecting success of 4127.2 'apply same filename with independent changes': 
-	modify "s/^d/z/" same_fn &&
-	git diff > patch0 &&
-	git add same_fn &&
-	modify "s/^i/y/" same_fn &&
-	git diff >> patch0 &&
-	cp same_fn same_fn2 &&
-	git reset --hard &&
-	git apply patch0 &&
-	test_cmp same_fn same_fn2
-
-HEAD is now at a38c7c5 initial
-ok 2 - apply same filename with independent changes
-
-expecting success of 4127.3 'apply same filename with overlapping changes': 
-	git reset --hard &&
-
-	# Store same_fn so that we can check apply -R in next test
-	cp same_fn same_fn1 &&
-
-	modify "s/^d/z/" same_fn &&
-	git diff > patch0 &&
-	git add same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git diff >> patch0 &&
-	cp same_fn same_fn2 &&
-	git reset --hard &&
-	git apply patch0 &&
-	test_cmp same_fn same_fn2
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-ok 3 - apply same filename with overlapping changes
-
-expecting success of 4127.4 'apply same filename with overlapping changes, in reverse': 
-	git apply -R patch0 &&
-	test_cmp same_fn same_fn1
-
-ok 4 - apply same filename with overlapping changes, in reverse
-
-expecting success of 4127.5 'apply same new filename after rename': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	modify "s/^e/y/" new_fn &&
-	git diff >> patch1 &&
-	cp new_fn new_fn2 &&
-	git reset --hard &&
-	git apply --index patch1 &&
-	test_cmp new_fn new_fn2
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-ok 5 - apply same new filename after rename
-
-expecting success of 4127.6 'apply same old filename after rename -- should fail.': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	git mv new_fn same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git diff >> patch1 &&
-	git reset --hard &&
-	test_must_fail git apply patch1
-
-HEAD is now at a38c7c5 initial
-HEAD is now at a38c7c5 initial
-error: path same_fn has been renamed/deleted
-ok 6 - apply same old filename after rename -- should fail.
-
-expecting success of 4127.7 'apply A->B (rename), C->A (rename), A->A -- should pass.': 
-	git reset --hard &&
-	git mv same_fn new_fn &&
-	modify "s/^d/z/" new_fn &&
-	git add new_fn &&
-	git diff -M --cached > patch1 &&
-	git commit -m "a rename" &&
-	git mv other_fn same_fn &&
-	modify "s/^e/y/" same_fn &&
-	git add same_fn &&
-	git diff -M --cached >> patch1 &&
-	modify "s/^g/x/" same_fn &&
-	git diff >> patch1 &&
-	git reset --hard HEAD^ &&
-	git apply patch1
-
-HEAD is now at a38c7c5 initial
-[master d59c5fe] a rename
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename same_fn => new_fn (92%)
-HEAD is now at a38c7c5 initial
-ok 7 - apply A->B (rename), C->A (rename), A->A -- should pass.
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4134-apply-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4134-apply-submodule/.git/
 expecting success of 4134.1 'setup': 
@@ -273650,82 +273604,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4136-apply-check.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4136-apply-check/.git/
-expecting success of 4136.1 'setup': 
-	test_commit 1
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-ok 1 - setup
-
-expecting success of 4136.2 'apply --check exits non-zero with unrecognized input': 
-	test_must_fail git apply --check - <<-\EOF
-	I am not a patch
-	I look nothing like a patch
-	git apply must fail
-	EOF
-
-error: No valid patches in input (allow with "--allow-empty")
-ok 2 - apply --check exits non-zero with unrecognized input
-
-expecting success of 4136.3 'apply exits non-zero with no-op patch': 
-	cat >input <<-\EOF &&
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-	test_must_fail git apply --stat input &&
-	test_must_fail git apply --check input
-
-error: corrupt patch at line 7
-error: corrupt patch at line 7
-ok 3 - apply exits non-zero with no-op patch
-
-expecting success of 4136.4 '`apply --recount` allows no-op patch': 
-	echo 1 >1 &&
-	git apply --recount --check <<-\EOF
-	diff --get a/1 b/1
-	index 6696ea4..606eddd 100644
-	--- a/1
-	+++ b/1
-	@@ -1,1 +1,1 @@
-	 1
-	EOF
-
-ok 4 - `apply --recount` allows no-op patch
-
-expecting success of 4136.5 'invalid combination: create and copy': 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	copy from 1
-	copy to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 5 - invalid combination: create and copy
-
-expecting success of 4136.6 'invalid combination: create and rename': 
-	test_must_fail git apply --check - <<-\EOF
-	diff --git a/1 b/2
-	new file mode 100644
-	rename from 1
-	rename to 2
-	EOF
-
-error: inconsistent header lines 2 and 3
-ok 6 - invalid combination: create and rename
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4132-apply-removal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4132-apply-removal/.git/
 expecting success of 4132.1 'setup': 
@@ -274289,6 +274167,82 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4136-apply-check.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4136-apply-check/.git/
+expecting success of 4136.1 'setup': 
+	test_commit 1
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+ok 1 - setup
+
+expecting success of 4136.2 'apply --check exits non-zero with unrecognized input': 
+	test_must_fail git apply --check - <<-\EOF
+	I am not a patch
+	I look nothing like a patch
+	git apply must fail
+	EOF
+
+error: No valid patches in input (allow with "--allow-empty")
+ok 2 - apply --check exits non-zero with unrecognized input
+
+expecting success of 4136.3 'apply exits non-zero with no-op patch': 
+	cat >input <<-\EOF &&
+	diff --get a/1 b/1
+	index 6696ea4..606eddd 100644
+	--- a/1
+	+++ b/1
+	@@ -1,1 +1,1 @@
+	 1
+	EOF
+	test_must_fail git apply --stat input &&
+	test_must_fail git apply --check input
+
+error: corrupt patch at line 7
+error: corrupt patch at line 7
+ok 3 - apply exits non-zero with no-op patch
+
+expecting success of 4136.4 '`apply --recount` allows no-op patch': 
+	echo 1 >1 &&
+	git apply --recount --check <<-\EOF
+	diff --get a/1 b/1
+	index 6696ea4..606eddd 100644
+	--- a/1
+	+++ b/1
+	@@ -1,1 +1,1 @@
+	 1
+	EOF
+
+ok 4 - `apply --recount` allows no-op patch
+
+expecting success of 4136.5 'invalid combination: create and copy': 
+	test_must_fail git apply --check - <<-\EOF
+	diff --git a/1 b/2
+	new file mode 100644
+	copy from 1
+	copy to 2
+	EOF
+
+error: inconsistent header lines 2 and 3
+ok 5 - invalid combination: create and copy
+
+expecting success of 4136.6 'invalid combination: create and rename': 
+	test_must_fail git apply --check - <<-\EOF
+	diff --git a/1 b/2
+	new file mode 100644
+	rename from 1
+	rename to 2
+	EOF
+
+error: inconsistent header lines 2 and 3
+ok 6 - invalid combination: create and rename
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4129-apply-samemode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4129-apply-samemode/.git/
 expecting success of 4129.1 'setup': 
@@ -274489,7 +274443,7 @@
 	test_grep "^-rw-rw-rw" worktree
 
 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	non-canon
--rw-rw-rw- 1 pbuilder1 pbuilder1 0 Apr 19 19:19 non-canon
+-rw-rw-rw- 1 pbuilder2 pbuilder2 0 Mar 17 13:22 non-canon
 HEAD is now at 7ddccb0 Add script
 ok 12 - patch mode for new file is canonicalized
 
@@ -274537,7 +274491,7 @@
 	test_grep "^-rwxrwxrwx" worktree
 
 100755 d95f3ad14dee633a758d2e331151e950dd13e4ed 0	non-canon
--rwxrwxrwx 1 pbuilder1 pbuilder1 8 Apr 19 19:19 non-canon
+-rwxrwxrwx 1 pbuilder2 pbuilder2 8 Mar 17 13:22 non-canon
 HEAD is now at 7ddccb0 Add script
 ok 14 - patch mode for mode change is canonicalized
 
@@ -275645,6 +275599,496 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4201-shortlog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4201-shortlog/.git/
+expecting success of 4201.1 'setup': 
+	test_tick &&
+	echo 1 >a1 &&
+	git add a1 &&
+	tree=$(git write-tree) &&
+	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
+	git update-ref HEAD "$commit" &&
+
+	echo 2 >a1 &&
+	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
+
+	# test if the wrapping is still valid
+	# when replacing all is by treble clefs.
+	echo 3 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\360\235\204\236")" a1 &&
+
+	# now fsck up the utf8
+	git config i18n.commitencoding non-utf-8 &&
+	echo 4 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\370\235\204\236")" a1 &&
+
+	echo 5 >a1 &&
+	git commit --quiet -m "a								12	34	56	78" a1 &&
+
+	echo 6 >a1 &&
+	git commit --quiet -m "Commit by someone else" \
+		--author="Someone else <not!me>" a1 &&
+
+	cat >expect.template <<-\EOF
+	A U Thor (5):
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+
+	Someone else (1):
+	      SUBJECT
+
+	EOF
+
+ok 1 - setup
+
+expecting success of 4201.2 'default output format': 
+	git shortlog HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect.template log.predictable
+
+ok 2 - default output format
+
+expecting success of 4201.3 'pretty format': 
+	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
+	git shortlog --format="%H" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 3 - pretty format
+
+expecting success of 4201.4 'pretty format (with --date)': 
+	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
+	git shortlog --format="%ad %H" --date=short HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 4 - pretty format (with --date)
+
+expecting success of 4201.5 '--abbrev': 
+	sed s/SUBJECT/OBJID/ expect.template >expect &&
+	git shortlog --format="%h" --abbrev=35 HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 5 - --abbrev
+
+expecting success of 4201.6 'output from user-defined format is re-wrapped': 
+	sed "s/SUBJECT/two lines/" expect.template >expect &&
+	git shortlog --format="two%nlines" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 6 - output from user-defined format is re-wrapped
+
+expecting success of 4201.7 'shortlog wrapping': 
+	cat >expect <<\EOF &&
+A U Thor (5):
+      Test
+      This is a very, very long first line for the commit message to see if
+         it is wrapped correctly
+      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
+         �t �s wrapped correctly
+      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
+         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
+      a								12	34
+         56	78
+
+Someone else (1):
+      Commit by someone else
+
+EOF
+	git shortlog -w HEAD >out &&
+	test_cmp expect out
+
+ok 7 - shortlog wrapping
+
+expecting success of 4201.8 'shortlog from non-git directory': 
+	git log --no-expand-tabs HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 8 - shortlog from non-git directory
+
+expecting success of 4201.9 'shortlog can read --format=raw output': 
+	git log --format=raw HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 9 - shortlog can read --format=raw output
+
+expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
+	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
+	test_grep "too many arguments" out
+
+error: too many arguments given outside repository
+ok 10 - shortlog from non-git directory refuses extra arguments
+
+expecting success of 4201.11 'shortlog --author from non-git directory does not segfault': 
+	nongit git shortlog --author=author </dev/null
+
+ok 11 - shortlog --author from non-git directory does not segfault
+
+expecting success of 4201.12 'shortlog should add newline when input line matches wraplen': 
+	cat >expect <<\EOF &&
+A U Thor (2):
+      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+EOF
+	git shortlog -w >out <<\EOF &&
+commit 0000000000000000000000000000000000000001
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+commit 0000000000000000000000000000000000000002
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+
+EOF
+	test_cmp expect out
+
+ok 12 - shortlog should add newline when input line matches wraplen
+
+expecting success of 4201.13 'shortlog encoding': 
+	git reset --hard "$commit" &&
+	git config --unset i18n.commitencoding &&
+	echo 2 > a1 &&
+	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
+	git config i18n.commitencoding "ISO8859-1" &&
+	echo 3 > a1 &&
+	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
+		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
+	git config --unset i18n.commitencoding &&
+	git shortlog HEAD~2.. > out &&
+test_cmp expect out
+HEAD is now at aa97132 Test
+ok 13 - shortlog encoding
+
+expecting success of 4201.14 'shortlog with revision pseudo options': 
+	git shortlog --all &&
+	git shortlog --branches &&
+	git shortlog --exclude=refs/heads/m* --all
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+ok 14 - shortlog with revision pseudo options
+
+expecting success of 4201.15 'shortlog with --output=<file>': 
+	git shortlog --output=shortlog -1 main >output &&
+	test_must_be_empty output &&
+	test_line_count = 3 shortlog
+
+ok 15 - shortlog with --output=<file>
+
+expecting success of 4201.16 'shortlog --committer (internal)': 
+	git checkout --orphan side &&
+	git commit --allow-empty -m one &&
+	git commit --allow-empty -m two &&
+	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
+
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Sin Nombre
+	EOF
+	git shortlog -nsc HEAD >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'side'
+[side (root-commit) 9ed1028] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+[side 4046e48] two
+ Author: A U Thor <author@example.com>
+[side 1c4141a] three
+ Author: A U Thor <author@example.com>
+ok 16 - shortlog --committer (internal)
+
+expecting success of 4201.17 'shortlog --committer (external)': 
+	git log --format=full | git shortlog -nsc >actual &&
+	test_cmp expect actual
+
+ok 17 - shortlog --committer (external)
+
+expecting success of 4201.18 '--group=committer is the same as --committer': 
+	git shortlog -ns --group=committer HEAD >actual &&
+	test_cmp expect actual
+
+ok 18 - --group=committer is the same as --committer
+
+expecting success of 4201.19 'shortlog --group=trailer:signed-off-by': 
+	git commit --allow-empty -m foo -s &&
+	GIT_COMMITTER_NAME="SOB One" \
+	GIT_COMMITTER_EMAIL=sob@example.com \
+		git commit --allow-empty -m foo -s &&
+	git commit --allow-empty --amend --no-edit -s &&
+	cat >expect <<-\EOF &&
+	     2	C O Mitter <committer@example.com>
+	     1	SOB One <sob@example.com>
+	EOF
+	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+[side d645125] foo
+ Author: A U Thor <author@example.com>
+[side 4ea5894] foo
+ Author: A U Thor <author@example.com>
+[side 4d83f03] foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ok 19 - shortlog --group=trailer:signed-off-by
+
+expecting success of 4201.20 'shortlog --group=format': 
+	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
+		HEAD >actual &&
+	cat >expect <<-\EOF &&
+	     4	C O Mitter (2005)
+	     1	Sin Nombre (2005)
+	EOF
+	test_cmp expect actual
+
+ok 20 - shortlog --group=format
+
+expecting success of 4201.21 'shortlog --group=<format> DWIM': 
+	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
+	test_cmp expect actual
+
+ok 21 - shortlog --group=<format> DWIM
+
+expecting success of 4201.22 'shortlog bogus --group': 
+	test_must_fail git shortlog --group=bogus HEAD 2>err &&
+	grep "unknown group type" err
+
+error: unknown group type: bogus
+ok 22 - shortlog bogus --group
+
+expecting success of 4201.23 'trailer idents are split': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	SOB One
+	EOF
+	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+ok 23 - trailer idents are split
+
+expecting success of 4201.24 'trailer idents are mailmapped': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Another Name
+	EOF
+	echo "Another Name <sob@example.com>" >mail.map &&
+	git -c mailmap.file=mail.map shortlog -ns \
+		--group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+
+ok 24 - trailer idents are mailmapped
+
+expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this message has two distinct values, plus a repeat
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	similar to the previous, but without the second distinct value
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Foo
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	Foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side 0a2c930] subject one
+ Author: A U Thor <author@example.com>
+[side 45f2a27] subject two
+ Author: A U Thor <author@example.com>
+ok 25 - shortlog de-duplicates trailers in a single commit
+
+expecting success of 4201.26 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this message has two distinct values, plus a repeat (folded)
+
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	similar to the previous, but without the second distinct value
+
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	Foo foo foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side f22298e] subject one
+ Author: A U Thor <author@example.com>
+[side b178ed0] subject two
+ Author: A U Thor <author@example.com>
+ok 26 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
+
+expecting success of 4201.27 'shortlog can match multiple groups': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this has two trailers that are distinct from the author; it will count
+	3 times in the output
+
+	Some-trailer: User A <a@example.com>
+	Another-trailer: User B <b@example.com>
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	this one has two trailers, one of which is a duplicate with the author;
+	it will only be counted once for them
+
+	Another-trailer: A U Thor <author@example.com>
+	Some-trailer: User B <b@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     2	User B
+	     1	User A
+	EOF
+	git shortlog -ns \
+		--group=author \
+		--group=trailer:some-trailer \
+		--group=trailer:another-trailer \
+		-2 HEAD >actual &&
+	test_cmp expect actual
+
+[side d95d79b] subject one
+ Author: A U Thor <author@example.com>
+[side 01085b4] subject two
+ Author: A U Thor <author@example.com>
+ok 27 - shortlog can match multiple groups
+
+expecting success of 4201.28 'shortlog can match multiple format groups': 
+	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
+		git commit --allow-empty -m "identical names" &&
+	test_tick &&
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     1	C O Mitter
+	EOF
+	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
+	test_cmp expect actual
+
+[side 409752b] identical names
+ Author: A U Thor <author@example.com>
+ok 28 - shortlog can match multiple format groups
+
+expecting success of 4201.29 'set up option selection tests': 
+	git commit --allow-empty -F - <<-\EOF
+	subject
+
+	body
+
+	Trailer-one: value-one
+	Trailer-two: value-two
+	EOF
+
+[side 581ede9] subject
+ Author: A U Thor <author@example.com>
+ok 29 - set up option selection tests
+
+expecting success of 4201.30 '--no-group resets group list to author': 
+	cat >expect <<-\EOF &&
+	     1	A U Thor
+	EOF
+	git shortlog -ns \
+		--group=committer \
+		--group=trailer:trailer-one \
+		--no-group \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 30 - --no-group resets group list to author
+
+expecting success of 4201.31 '--no-group resets trailer list': 
+	cat >expect <<-\EOF &&
+	     1	value-two
+	EOF
+	git shortlog -ns \
+		--group=trailer:trailer-one \
+		--no-group \
+		--group=trailer:trailer-two \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 31 - --no-group resets trailer list
+
+expecting success of 4201.32 'stdin with multiple groups reports error': 
+	git log >log &&
+	test_must_fail git shortlog --group=author --group=committer <log
+
+fatal: using multiple --group options with stdin is not supported
+ok 32 - stdin with multiple groups reports error
+
+# passed all 32 test(s)
+1..32
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4151-am-abort.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4151-am-abort/.git/
 expecting success of 4151.1 'setup': 
@@ -276194,576 +276638,86 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4201-shortlog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4201-shortlog/.git/
-expecting success of 4201.1 'setup': 
-	test_tick &&
-	echo 1 >a1 &&
-	git add a1 &&
-	tree=$(git write-tree) &&
-	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
-	git update-ref HEAD "$commit" &&
-
-	echo 2 >a1 &&
-	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
-
-	# test if the wrapping is still valid
-	# when replacing all is by treble clefs.
-	echo 3 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\360\235\204\236")" a1 &&
+*** t4207-log-decoration-colors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4207-log-decoration-colors/.git/
+expecting success of 4207.1 'setup': 
+	git config diff.color.commit yellow &&
+	git config color.decorate.branch green &&
+	git config color.decorate.remoteBranch red &&
+	git config color.decorate.tag "reverse bold yellow" &&
+	git config color.decorate.stash magenta &&
+	git config color.decorate.grafted black &&
+	git config color.decorate.HEAD cyan &&
 
-	# now fsck up the utf8
-	git config i18n.commitencoding non-utf-8 &&
-	echo 4 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\370\235\204\236")" a1 &&
+	c_reset="<RESET>" &&
 
-	echo 5 >a1 &&
-	git commit --quiet -m "a								12	34	56	78" a1 &&
+	c_commit="<YELLOW>" &&
+	c_branch="<GREEN>" &&
+	c_remoteBranch="<RED>" &&
+	c_tag="<BOLD;REVERSE;YELLOW>" &&
+	c_stash="<MAGENTA>" &&
+	c_HEAD="<CYAN>" &&
+	c_grafted="<BLACK>" &&
 
-	echo 6 >a1 &&
-	git commit --quiet -m "Commit by someone else" \
-		--author="Someone else <not!me>" a1 &&
+	test_commit A &&
+	git clone . other &&
+	(
+		cd other &&
+		test_commit A1
+	) &&
 
-	cat >expect.template <<-\EOF
-	A U Thor (5):
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
+	git remote add -f other ./other &&
+	test_commit B &&
+	git tag v1.0 &&
+	echo >>A.t &&
+	git stash save Changes to A.t
 
-	Someone else (1):
-	      SUBJECT
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Cloning into 'other'...
+done.
+[main ca6ed14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+Updating other
+From ./other
+ * [new branch]      main       -> other/main
+ * [new tag]         A1         -> A1
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Saved working directory and index state On main: Changes to A.t
+ok 1 - setup
 
+expecting success of 4207.2 'commit decorations colored correctly': 
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
+${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit}, \
+${c_reset}${c_remoteBranch}other/HEAD${c_reset}${c_commit})${c_reset} A1
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
 	EOF
 
-ok 1 - setup
+	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
+	cmp_filtered_decorations
 
-expecting success of 4201.2 'default output format': 
-	git shortlog HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect.template log.predictable
+ok 2 - commit decorations colored correctly
 
-ok 2 - default output format
-
-expecting success of 4201.3 'pretty format': 
-	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
-	git shortlog --format="%H" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 3 - pretty format
-
-expecting success of 4201.4 'pretty format (with --date)': 
-	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
-	git shortlog --format="%ad %H" --date=short HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 4 - pretty format (with --date)
-
-expecting success of 4201.5 '--abbrev': 
-	sed s/SUBJECT/OBJID/ expect.template >expect &&
-	git shortlog --format="%h" --abbrev=35 HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 5 - --abbrev
-
-expecting success of 4201.6 'output from user-defined format is re-wrapped': 
-	sed "s/SUBJECT/two lines/" expect.template >expect &&
-	git shortlog --format="two%nlines" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 6 - output from user-defined format is re-wrapped
-
-expecting success of 4201.7 'shortlog wrapping': 
-	cat >expect <<\EOF &&
-A U Thor (5):
-      Test
-      This is a very, very long first line for the commit message to see if
-         it is wrapped correctly
-      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
-         �t �s wrapped correctly
-      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
-         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
-      a								12	34
-         56	78
-
-Someone else (1):
-      Commit by someone else
-
-EOF
-	git shortlog -w HEAD >out &&
-	test_cmp expect out
-
-ok 7 - shortlog wrapping
-
-expecting success of 4201.8 'shortlog from non-git directory': 
-	git log --no-expand-tabs HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
-
-ok 8 - shortlog from non-git directory
-
-expecting success of 4201.9 'shortlog can read --format=raw output': 
-	git log --format=raw HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
-
-ok 9 - shortlog can read --format=raw output
-
-expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
-	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
-	test_grep "too many arguments" out
-
-error: too many arguments given outside repository
-ok 10 - shortlog from non-git directory refuses extra arguments
-
-expecting success of 4201.11 'shortlog --author from non-git directory does not segfault': 
-	nongit git shortlog --author=author </dev/null
-
-ok 11 - shortlog --author from non-git directory does not segfault
-
-expecting success of 4201.12 'shortlog should add newline when input line matches wraplen': 
-	cat >expect <<\EOF &&
-A U Thor (2):
-      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
-      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
-
-EOF
-	git shortlog -w >out <<\EOF &&
-commit 0000000000000000000000000000000000000001
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
-
-commit 0000000000000000000000000000000000000002
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
-
-EOF
-	test_cmp expect out
-
-ok 12 - shortlog should add newline when input line matches wraplen
-
-expecting success of 4201.13 'shortlog encoding': 
-	git reset --hard "$commit" &&
-	git config --unset i18n.commitencoding &&
-	echo 2 > a1 &&
-	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
-	git config i18n.commitencoding "ISO8859-1" &&
-	echo 3 > a1 &&
-	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
-		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
-	git config --unset i18n.commitencoding &&
-	git shortlog HEAD~2.. > out &&
-test_cmp expect out
-HEAD is now at aa97132 Test
-ok 13 - shortlog encoding
-
-expecting success of 4201.14 'shortlog with revision pseudo options': 
-	git shortlog --all &&
-	git shortlog --branches &&
-	git shortlog --exclude=refs/heads/m* --all
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-ok 14 - shortlog with revision pseudo options
-
-expecting success of 4201.15 'shortlog with --output=<file>': 
-	git shortlog --output=shortlog -1 main >output &&
-	test_must_be_empty output &&
-	test_line_count = 3 shortlog
-
-ok 15 - shortlog with --output=<file>
-
-expecting success of 4201.16 'shortlog --committer (internal)': 
-	git checkout --orphan side &&
-	git commit --allow-empty -m one &&
-	git commit --allow-empty -m two &&
-	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
-
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Sin Nombre
-	EOF
-	git shortlog -nsc HEAD >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'side'
-[side (root-commit) 9ed1028] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-[side 4046e48] two
- Author: A U Thor <author@example.com>
-[side 1c4141a] three
- Author: A U Thor <author@example.com>
-ok 16 - shortlog --committer (internal)
-
-expecting success of 4201.17 'shortlog --committer (external)': 
-	git log --format=full | git shortlog -nsc >actual &&
-	test_cmp expect actual
-
-ok 17 - shortlog --committer (external)
-
-expecting success of 4201.18 '--group=committer is the same as --committer': 
-	git shortlog -ns --group=committer HEAD >actual &&
-	test_cmp expect actual
-
-ok 18 - --group=committer is the same as --committer
-
-expecting success of 4201.19 'shortlog --group=trailer:signed-off-by': 
-	git commit --allow-empty -m foo -s &&
-	GIT_COMMITTER_NAME="SOB One" \
-	GIT_COMMITTER_EMAIL=sob@example.com \
-		git commit --allow-empty -m foo -s &&
-	git commit --allow-empty --amend --no-edit -s &&
-	cat >expect <<-\EOF &&
-	     2	C O Mitter <committer@example.com>
-	     1	SOB One <sob@example.com>
-	EOF
-	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-[side d645125] foo
- Author: A U Thor <author@example.com>
-[side 4ea5894] foo
- Author: A U Thor <author@example.com>
-[side 4d83f03] foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
-ok 19 - shortlog --group=trailer:signed-off-by
-
-expecting success of 4201.20 'shortlog --group=format': 
-	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
-		HEAD >actual &&
-	cat >expect <<-\EOF &&
-	     4	C O Mitter (2005)
-	     1	Sin Nombre (2005)
-	EOF
-	test_cmp expect actual
-
-ok 20 - shortlog --group=format
-
-expecting success of 4201.21 'shortlog --group=<format> DWIM': 
-	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
-	test_cmp expect actual
-
-ok 21 - shortlog --group=<format> DWIM
-
-expecting success of 4201.22 'shortlog bogus --group': 
-	test_must_fail git shortlog --group=bogus HEAD 2>err &&
-	grep "unknown group type" err
-
-error: unknown group type: bogus
-ok 22 - shortlog bogus --group
-
-expecting success of 4201.23 'trailer idents are split': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	SOB One
-	EOF
-	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-ok 23 - trailer idents are split
-
-expecting success of 4201.24 'trailer idents are mailmapped': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Another Name
-	EOF
-	echo "Another Name <sob@example.com>" >mail.map &&
-	git -c mailmap.file=mail.map shortlog -ns \
-		--group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-ok 24 - trailer idents are mailmapped
-
-expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this message has two distinct values, plus a repeat
-
-	Repeated-trailer: Foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	similar to the previous, but without the second distinct value
-
-	Repeated-trailer: Foo
-	Repeated-trailer: Foo
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	Foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side 0a2c930] subject one
- Author: A U Thor <author@example.com>
-[side 45f2a27] subject two
- Author: A U Thor <author@example.com>
-ok 25 - shortlog de-duplicates trailers in a single commit
-
-expecting success of 4201.26 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this message has two distinct values, plus a repeat (folded)
-
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	similar to the previous, but without the second distinct value
-
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	Foo foo foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side f22298e] subject one
- Author: A U Thor <author@example.com>
-[side b178ed0] subject two
- Author: A U Thor <author@example.com>
-ok 26 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
-
-expecting success of 4201.27 'shortlog can match multiple groups': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
-
-	this has two trailers that are distinct from the author; it will count
-	3 times in the output
-
-	Some-trailer: User A <a@example.com>
-	Another-trailer: User B <b@example.com>
-	EOF
-
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
-
-	this one has two trailers, one of which is a duplicate with the author;
-	it will only be counted once for them
-
-	Another-trailer: A U Thor <author@example.com>
-	Some-trailer: User B <b@example.com>
-	EOF
-
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     2	User B
-	     1	User A
-	EOF
-	git shortlog -ns \
-		--group=author \
-		--group=trailer:some-trailer \
-		--group=trailer:another-trailer \
-		-2 HEAD >actual &&
-	test_cmp expect actual
-
-[side d95d79b] subject one
- Author: A U Thor <author@example.com>
-[side 01085b4] subject two
- Author: A U Thor <author@example.com>
-ok 27 - shortlog can match multiple groups
-
-expecting success of 4201.28 'shortlog can match multiple format groups': 
-	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
-		git commit --allow-empty -m "identical names" &&
-	test_tick &&
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     1	C O Mitter
-	EOF
-	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
-	test_cmp expect actual
-
-[side 409752b] identical names
- Author: A U Thor <author@example.com>
-ok 28 - shortlog can match multiple format groups
-
-expecting success of 4201.29 'set up option selection tests': 
-	git commit --allow-empty -F - <<-\EOF
-	subject
-
-	body
-
-	Trailer-one: value-one
-	Trailer-two: value-two
-	EOF
-
-[side 581ede9] subject
- Author: A U Thor <author@example.com>
-ok 29 - set up option selection tests
-
-expecting success of 4201.30 '--no-group resets group list to author': 
-	cat >expect <<-\EOF &&
-	     1	A U Thor
-	EOF
-	git shortlog -ns \
-		--group=committer \
-		--group=trailer:trailer-one \
-		--no-group \
-		-1 HEAD >actual &&
-	test_cmp expect actual
-
-ok 30 - --no-group resets group list to author
-
-expecting success of 4201.31 '--no-group resets trailer list': 
-	cat >expect <<-\EOF &&
-	     1	value-two
-	EOF
-	git shortlog -ns \
-		--group=trailer:trailer-one \
-		--no-group \
-		--group=trailer:trailer-two \
-		-1 HEAD >actual &&
-	test_cmp expect actual
-
-ok 31 - --no-group resets trailer list
-
-expecting success of 4201.32 'stdin with multiple groups reports error': 
-	git log >log &&
-	test_must_fail git shortlog --group=author --group=committer <log
-
-fatal: using multiple --group options with stdin is not supported
-ok 32 - stdin with multiple groups reports error
-
-# passed all 32 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4207-log-decoration-colors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4207-log-decoration-colors/.git/
-expecting success of 4207.1 'setup': 
-	git config diff.color.commit yellow &&
-	git config color.decorate.branch green &&
-	git config color.decorate.remoteBranch red &&
-	git config color.decorate.tag "reverse bold yellow" &&
-	git config color.decorate.stash magenta &&
-	git config color.decorate.grafted black &&
-	git config color.decorate.HEAD cyan &&
-
-	c_reset="<RESET>" &&
-
-	c_commit="<YELLOW>" &&
-	c_branch="<GREEN>" &&
-	c_remoteBranch="<RED>" &&
-	c_tag="<BOLD;REVERSE;YELLOW>" &&
-	c_stash="<MAGENTA>" &&
-	c_HEAD="<CYAN>" &&
-	c_grafted="<BLACK>" &&
-
-	test_commit A &&
-	git clone . other &&
-	(
-		cd other &&
-		test_commit A1
-	) &&
-
-	git remote add -f other ./other &&
-	test_commit B &&
-	git tag v1.0 &&
-	echo >>A.t &&
-	git stash save Changes to A.t
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Cloning into 'other'...
-done.
-[main ca6ed14] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-Updating other
-From ./other
- * [new branch]      main       -> other/main
- * [new tag]         A1         -> A1
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Saved working directory and index state On main: Changes to A.t
-ok 1 - setup
-
-expecting success of 4207.2 'commit decorations colored correctly': 
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
-${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit}, \
-${c_reset}${c_remoteBranch}other/HEAD${c_reset}${c_commit})${c_reset} A1
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
-	EOF
-
-	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
-	cmp_filtered_decorations
-
-ok 2 - commit decorations colored correctly
-
-expecting success of 4207.3 'test coloring with replace-objects': 
-	test_when_finished remove_replace_refs &&
-	test_commit C &&
-	test_commit D &&
+expecting success of 4207.3 'test coloring with replace-objects': 
+	test_when_finished remove_replace_refs &&
+	test_commit C &&
+	test_commit D &&
 
 	git replace HEAD~1 HEAD~2 &&
 
@@ -276831,180 +276785,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4210-log-i18n/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 4210.1 'create commits in different encodings': 
-	test_tick &&
-	cat >msg <<-EOF &&
-	utf8
-
-	t${utf8_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=utf8 commit -F msg &&
-	cat >msg <<-EOF &&
-	latin1
-
-	t${latin1_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
-
-[master (root-commit) cbf2796] utf8
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
-
-expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
-
-ok 2 - log --grep searches in log output encoding (utf8)
-
-expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
-	test_cmp expect actual
-
-ok 3 - log --grep searches in log output encoding (latin1)
-
-expecting success of 4210.4 'log --grep does not find non-reencoded values (utf8)': 
-	git log --encoding=utf8 --format=%s --grep=$latin1_e >actual &&
-	test_must_be_empty actual
-
-ok 4 - log --grep does not find non-reencoded values (utf8)
-
-expecting success of 4210.5 'log --grep does not find non-reencoded values (latin1)': 
-	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
-	test_must_be_empty actual
-
-ok 5 - log --grep does not find non-reencoded values (latin1)
-
-expecting success of 4210.6 'config grep.patternType=fixed': 
-		git config grep.patternType fixed
-	
-ok 6 - config grep.patternType=fixed
-
-expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log 'é' >actual &&
-		test_must_be_empty actual
-	
-ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.8 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log 'é' >actual &&
-			test_cmp expect actual
-		
-ok 8 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.9 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log 'Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 9 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.10 'config grep.patternType=basic': 
-		git config grep.patternType basic
-	
-ok 10 - config grep.patternType=basic
-
-expecting success of 4210.11 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 11 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.12 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 12 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.13 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 13 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.14 'config grep.patternType=extended': 
-		git config grep.patternType extended
-	
-ok 14 - config grep.patternType=extended
-
-expecting success of 4210.15 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 15 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.16 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 16 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.17 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 17 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-expecting success of 4210.18 'config grep.patternType=perl': 
-		git config grep.patternType perl
-	
-ok 18 - config grep.patternType=perl
-
-expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
-
-expecting success of 4210.20 'log --grep searches in log output encoding (latin1 + locale)': 
-			cat >expect <<-\EOF &&
-			latin1
-			utf8
-			EOF
-			mismatched_git_log '.*é' >actual &&
-			test_cmp expect actual
-		
-ok 20 - log --grep searches in log output encoding (latin1 + locale)
-
-expecting success of 4210.21 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
-			mismatched_git_log '.*Ã()' >actual &&
-			test_must_be_empty actual
-		
-ok 21 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4208-log-magic-pathspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4208-log-magic-pathspec/.git/
 expecting success of 4208.1 'setup': 
@@ -277341,6 +277121,180 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4210-log-i18n/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 4210.1 'create commits in different encodings': 
+	test_tick &&
+	cat >msg <<-EOF &&
+	utf8
+
+	t${utf8_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=utf8 commit -F msg &&
+	cat >msg <<-EOF &&
+	latin1
+
+	t${latin1_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
+
+[master (root-commit) cbf2796] utf8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 msg
+[master b077cf9] latin1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - create commits in different encodings
+
+expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
+	test_cmp expect actual
+
+ok 2 - log --grep searches in log output encoding (utf8)
+
+expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
+	test_cmp expect actual
+
+ok 3 - log --grep searches in log output encoding (latin1)
+
+expecting success of 4210.4 'log --grep does not find non-reencoded values (utf8)': 
+	git log --encoding=utf8 --format=%s --grep=$latin1_e >actual &&
+	test_must_be_empty actual
+
+ok 4 - log --grep does not find non-reencoded values (utf8)
+
+expecting success of 4210.5 'log --grep does not find non-reencoded values (latin1)': 
+	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
+	test_must_be_empty actual
+
+ok 5 - log --grep does not find non-reencoded values (latin1)
+
+expecting success of 4210.6 'config grep.patternType=fixed': 
+		git config grep.patternType fixed
+	
+ok 6 - config grep.patternType=fixed
+
+expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log 'é' >actual &&
+		test_must_be_empty actual
+	
+ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.8 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log 'é' >actual &&
+			test_cmp expect actual
+		
+ok 8 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.9 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log 'Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 9 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.10 'config grep.patternType=basic': 
+		git config grep.patternType basic
+	
+ok 10 - config grep.patternType=basic
+
+expecting success of 4210.11 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 11 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.12 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 12 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.13 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 13 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.14 'config grep.patternType=extended': 
+		git config grep.patternType extended
+	
+ok 14 - config grep.patternType=extended
+
+expecting success of 4210.15 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 15 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.16 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 16 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.17 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 17 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.18 'config grep.patternType=perl': 
+		git config grep.patternType perl
+	
+ok 18 - config grep.patternType=perl
+
+expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.20 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 20 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.21 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 21 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4204-patch-id.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4204-patch-id/.git/
 expecting success of 4204.1 'setup': 
@@ -277423,8 +277377,8 @@
 	get_patch_id notsame &&
 	! test_cmp patch-id_main patch-id_notsame
 
---- patch-id_main	2026-04-19 19:19:50.139659440 +0000
-+++ patch-id_notsame	2026-04-19 19:19:50.191659440 +0000
+--- patch-id_main	2025-03-17 13:22:26.945126096 +0000
++++ patch-id_notsame	2025-03-17 13:22:27.033126652 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +6276aec15da664e9f9ce6dde29c2e2c71607e017
@@ -277458,8 +277412,8 @@
 	! test_cmp patch-id_main patch-id_notsame &&
 	test_when_finished "rm .gitattributes"
 
---- patch-id_main	2026-04-19 19:19:50.543659440 +0000
-+++ patch-id_notsame	2026-04-19 19:19:50.595659440 +0000
+--- patch-id_main	2025-03-17 13:22:27.793131456 +0000
++++ patch-id_notsame	2025-03-17 13:22:27.877131987 +0000
 @@ -1 +1 @@
 -6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
 +f92e710b91f98a3598e43f302e80d3e4a9bfe874
@@ -277497,8 +277451,8 @@
 	test_patch_id_file_order relevant --unstable --unstable
 
 Already on 'same'
---- patch-id_order---unstable-relevant	2026-04-19 19:19:51.259659440 +0000
-+++ patch-id_ordered-order---unstable-relevant	2026-04-19 19:19:51.315659440 +0000
+--- patch-id_order---unstable-relevant	2025-03-17 13:22:28.793137776 +0000
++++ patch-id_ordered-order---unstable-relevant	2025-03-17 13:22:28.905138484 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -277507,8 +277461,8 @@
 expecting success of 4204.11 'whitespace is relevant with --verbatim': 
 	test_patch_id_whitespace relevant --verbatim --verbatim
 
---- patch-id_ws---verbatim-relevant	2026-04-19 19:19:51.383659440 +0000
-+++ patch-id_ws-ws---verbatim-relevant	2026-04-19 19:19:51.431659440 +0000
+--- patch-id_ws---verbatim-relevant	2025-03-17 13:22:29.017139192 +0000
++++ patch-id_ws-ws---verbatim-relevant	2025-03-17 13:22:29.101139722 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -277523,8 +277477,8 @@
 	test_patch_id relevant default
 
 Already on 'same'
---- patch-id_order-default-relevant	2026-04-19 19:19:51.687659440 +0000
-+++ patch-id_ordered-order-default-relevant	2026-04-19 19:19:51.803659440 +0000
+--- patch-id_order-default-relevant	2025-03-17 13:22:29.425141770 +0000
++++ patch-id_ordered-order-default-relevant	2025-03-17 13:22:29.537142478 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -277542,8 +277496,8 @@
 	test_patch_id relevant patchid.stable=false
 
 Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2026-04-19 19:19:52.115659440 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2026-04-19 19:19:52.207659440 +0000
+--- patch-id_order-patchid.stable=false-relevant	2025-03-17 13:22:29.957145133 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2025-03-17 13:22:30.125146194 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -277554,8 +277508,8 @@
 	test_patch_id_whitespace relevant patchid.verbatim=true &&
 	test_patch_id irrelevant patchid.verbatim=true
 
---- patch-id_ws-patchid.verbatim=true-relevant	2026-04-19 19:19:52.319659440 +0000
-+++ patch-id_ws-ws-patchid.verbatim=true-relevant	2026-04-19 19:19:52.359659440 +0000
+--- patch-id_ws-patchid.verbatim=true-relevant	2025-03-17 13:22:30.337147534 +0000
++++ patch-id_ws-ws-patchid.verbatim=true-relevant	2025-03-17 13:22:30.441148192 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -277567,8 +277521,8 @@
 	test_patch_id relevant patchid.verbatim=false
 
 Already on 'same'
---- patch-id_order-patchid.verbatim=false-relevant	2026-04-19 19:19:52.695659440 +0000
-+++ patch-id_ordered-order-patchid.verbatim=false-relevant	2026-04-19 19:19:52.763659440 +0000
+--- patch-id_order-patchid.verbatim=false-relevant	2025-03-17 13:22:30.869150897 +0000
++++ patch-id_ordered-order-patchid.verbatim=false-relevant	2025-03-17 13:22:31.001151731 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -277579,8 +277533,8 @@
 	test_patch_id relevant patchid.stable=true--unstable --unstable
 
 Already on 'same'
---- patch-id_order-patchid.stable=true--unstable-relevant	2026-04-19 19:19:52.903659440 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2026-04-19 19:19:53.011659440 +0000
+--- patch-id_order-patchid.stable=true--unstable-relevant	2025-03-17 13:22:31.185152894 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2025-03-17 13:22:31.317153728 +0000
 @@ -1 +1 @@
 -c58fad5dc58fa3f768f4c9a1809f1bf824870825
 +892d1d3b08f44511b1fdc7cab43c0ad907ac772b
@@ -277597,8 +277551,8 @@
 	test_config patchid.stable false &&
 	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
 
---- patch-id_ws-stable=false--verbatim-relevant	2026-04-19 19:19:53.431659440 +0000
-+++ patch-id_ws-ws-stable=false--verbatim-relevant	2026-04-19 19:19:53.507659440 +0000
+--- patch-id_ws-stable=false--verbatim-relevant	2025-03-17 13:22:31.881157293 +0000
++++ patch-id_ws-ws-stable=false--verbatim-relevant	2025-03-17 13:22:31.977157899 +0000
 @@ -1 +1 @@
 -bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
 +ec56d730a19f56a178db031386e5bcaabfea5677
@@ -277667,8 +277621,8 @@
 	calc_patch_id withnl-inc-ws --verbatim <withnl &&
 	! test_cmp patch-id_nonl-inc-ws patch-id_withnl-inc-ws
 
---- patch-id_nonl-inc-ws	2026-04-19 19:19:54.191659440 +0000
-+++ patch-id_withnl-inc-ws	2026-04-19 19:19:54.215659440 +0000
+--- patch-id_nonl-inc-ws	2025-03-17 13:22:32.989164295 +0000
++++ patch-id_withnl-inc-ws	2025-03-17 13:22:33.037164599 +0000
 @@ -1 +1 @@
 -7ff2bcb9c001e010d881f0fccddc20be3af94012
 +897be18d6338cd2e68bf17f3848b1c48bbc17459
@@ -277725,8 +277679,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4204-patch-id/repo-sha1/.git/
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4204-patch-id/repo-sha256/.git/
---- patch-id-sha1	2026-04-19 19:19:54.395659440 +0000
-+++ patch-id-sha256	2026-04-19 19:19:54.427659440 +0000
+--- patch-id-sha1	2025-03-17 13:22:33.409166950 +0000
++++ patch-id-sha256	2025-03-17 13:22:33.461167279 +0000
 @@ -1 +1 @@
 -412211131a680f60efe39ff97826b8a673042664 0000000000000000000000000000000000000000
 +f8e1e9607584d07254be0d54eebb3f8ce98ce90acb09c653b9bbda1ad2ffc516 0000000000000000000000000000000000000000000000000000000000000000
@@ -277752,154 +277706,6 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4212-log-corrupt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4212-log-corrupt/.git/
-expecting success of 4212.1 'setup': 
-	test_commit foo &&
-
-	git cat-file commit HEAD >ok.commit &&
-	sed "s/>/>-<>/" <ok.commit >broken_email.commit &&
-
-	git hash-object --literally -w -t commit broken_email.commit >broken_email.hash &&
-	git update-ref refs/heads/broken_email $(cat broken_email.hash)
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup
-
-expecting success of 4212.2 'fsck notices broken commit': 
-	test_must_fail git fsck 2>actual &&
-	test_grep invalid.author actual
-
-error in commit 95d34e8ea91fa7096fda0f149aaf014999b43f25: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 2 - fsck notices broken commit
-
-expecting success of 4212.3 'git log with broken author email': 
-	{
-		echo commit $(cat broken_email.hash) &&
-		echo "Author: A U Thor <author@example.com>" &&
-		echo "Date:   Thu Apr 7 15:13:13 2005 -0700" &&
-		echo &&
-		echo "    foo"
-	} >expect.out &&
-
-	git log broken_email >actual.out 2>actual.err &&
-
-	test_cmp expect.out actual.out &&
-	test_must_be_empty actual.err
-
-ok 3 - git log with broken author email
-
-expecting success of 4212.4 'git log --format with broken author email': 
-	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
-
-	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
-
-	test_cmp expect.out actual.out &&
-	test_must_be_empty actual.err
-
-ok 4 - git log --format with broken author email
-
-expecting success of 4212.5 '--until handles broken email': 
-	git rev-list --until=1980-01-01 broken_email >actual &&
-	test_must_be_empty actual
-
-ok 5 - --until handles broken email
-
-expecting success of 4212.6 'unparsable dates produce sentinel value': 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 $commit >actual.full &&
-	grep Date <actual.full >actual &&
-	test_cmp expect actual
-
-ok 6 - unparsable dates produce sentinel value
-
-expecting success of 4212.7 'unparsable dates produce sentinel value (%ad)': 
-	commit=$(munge_author_date HEAD totally_bogus) &&
-	echo >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 7 - unparsable dates produce sentinel value (%ad)
-
-expecting success of 4212.8 'date parser recognizes integer overflow': 
-	commit=$(munge_author_date HEAD 18446744073709551617) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 8 - date parser recognizes integer overflow
-
-expecting success of 4212.9 'date parser recognizes time_t overflow': 
-	commit=$(munge_author_date HEAD 18446744073709551614) &&
-	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
-	git log -1 --format=%ad $commit >actual &&
-	test_cmp expect actual
-
-ok 9 - date parser recognizes time_t overflow
-
-expecting success of 4212.10 'absurdly far-in-future date': 
-	commit=$(munge_author_date HEAD 999999999999999999) &&
-	git log -1 --format=%ad $commit
-
-Thu Jan 1 00:00:00 1970 +0000
-ok 10 - absurdly far-in-future date
-
-expecting success of 4212.11 'create commits with whitespace committer dates': 
-	# It is important that this subject line is numeric, since we want to
-	# be sure we are not confused by skipping whitespace and accidentally
-	# parsing the subject as a timestamp.
-	#
-	# Do not use munge_author_date here. Besides not hitting the committer
-	# line, it leaves the timezone intact, and we want nothing but
-	# whitespace.
-	#
-	# We will make two munged commits here. The first, ws_commit, will
-	# be purely spaces. The second contains a vertical tab, which is
-	# considered a space by strtoumax(), but not by our isspace().
-	test_commit 1234567890 &&
-	git cat-file commit HEAD >commit.orig &&
-	sed "s/>.*/>    /" <commit.orig >commit.munge &&
-	ws_commit=$(git hash-object --literally -w -t commit commit.munge) &&
-	sed "s/>.*/>   $(printf "\013")/" <commit.orig >commit.munge &&
-	vt_commit=$(git hash-object --literally -w -t commit commit.munge)
-
-[master f47e17d] 1234567890
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1234567890.t
-ok 11 - create commits with whitespace committer dates
-
-expecting success of 4212.12 '--until treats whitespace date as sentinel': 
-	echo $ws_commit >expect &&
-	git rev-list --until=1980-01-01 $ws_commit >actual &&
-	test_cmp expect actual &&
-
-	echo $vt_commit >expect &&
-	git rev-list --until=1980-01-01 $vt_commit >actual &&
-	test_cmp expect actual
-
-ok 12 - --until treats whitespace date as sentinel
-
-expecting success of 4212.13 'pretty-printer handles whitespace date': 
-	# as with the %ad test above, we will show these as the empty string,
-	# not the 1970 epoch date. This is intentional; see 7d9a281941 (t4212:
-	# test bogus timestamps with git-log, 2014-02-24) for more discussion.
-	echo : >expect &&
-	git log -1 --format="%at:%ct" $ws_commit >actual &&
-	test_cmp expect actual &&
-	git log -1 --format="%at:%ct" $vt_commit >actual &&
-	test_cmp expect actual
-
-ok 13 - pretty-printer handles whitespace date
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4209-log-pickaxe.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4209-log-pickaxe/.git/
 expecting success of 4209.1 'setup': 
@@ -279646,6 +279452,154 @@
 1..78
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4212-log-corrupt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4212-log-corrupt/.git/
+expecting success of 4212.1 'setup': 
+	test_commit foo &&
+
+	git cat-file commit HEAD >ok.commit &&
+	sed "s/>/>-<>/" <ok.commit >broken_email.commit &&
+
+	git hash-object --literally -w -t commit broken_email.commit >broken_email.hash &&
+	git update-ref refs/heads/broken_email $(cat broken_email.hash)
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup
+
+expecting success of 4212.2 'fsck notices broken commit': 
+	test_must_fail git fsck 2>actual &&
+	test_grep invalid.author actual
+
+error in commit 95d34e8ea91fa7096fda0f149aaf014999b43f25: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 2 - fsck notices broken commit
+
+expecting success of 4212.3 'git log with broken author email': 
+	{
+		echo commit $(cat broken_email.hash) &&
+		echo "Author: A U Thor <author@example.com>" &&
+		echo "Date:   Thu Apr 7 15:13:13 2005 -0700" &&
+		echo &&
+		echo "    foo"
+	} >expect.out &&
+
+	git log broken_email >actual.out 2>actual.err &&
+
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
+
+ok 3 - git log with broken author email
+
+expecting success of 4212.4 'git log --format with broken author email': 
+	echo "A U Thor+author@example.com+Thu Apr 7 15:13:13 2005 -0700" >expect.out &&
+
+	git log --format="%an+%ae+%ad" broken_email >actual.out 2>actual.err &&
+
+	test_cmp expect.out actual.out &&
+	test_must_be_empty actual.err
+
+ok 4 - git log --format with broken author email
+
+expecting success of 4212.5 '--until handles broken email': 
+	git rev-list --until=1980-01-01 broken_email >actual &&
+	test_must_be_empty actual
+
+ok 5 - --until handles broken email
+
+expecting success of 4212.6 'unparsable dates produce sentinel value': 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo "Date:   Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 $commit >actual.full &&
+	grep Date <actual.full >actual &&
+	test_cmp expect actual
+
+ok 6 - unparsable dates produce sentinel value
+
+expecting success of 4212.7 'unparsable dates produce sentinel value (%ad)': 
+	commit=$(munge_author_date HEAD totally_bogus) &&
+	echo >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 7 - unparsable dates produce sentinel value (%ad)
+
+expecting success of 4212.8 'date parser recognizes integer overflow': 
+	commit=$(munge_author_date HEAD 18446744073709551617) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 8 - date parser recognizes integer overflow
+
+expecting success of 4212.9 'date parser recognizes time_t overflow': 
+	commit=$(munge_author_date HEAD 18446744073709551614) &&
+	echo "Thu Jan 1 00:00:00 1970 +0000" >expect &&
+	git log -1 --format=%ad $commit >actual &&
+	test_cmp expect actual
+
+ok 9 - date parser recognizes time_t overflow
+
+expecting success of 4212.10 'absurdly far-in-future date': 
+	commit=$(munge_author_date HEAD 999999999999999999) &&
+	git log -1 --format=%ad $commit
+
+Thu Jan 1 00:00:00 1970 +0000
+ok 10 - absurdly far-in-future date
+
+expecting success of 4212.11 'create commits with whitespace committer dates': 
+	# It is important that this subject line is numeric, since we want to
+	# be sure we are not confused by skipping whitespace and accidentally
+	# parsing the subject as a timestamp.
+	#
+	# Do not use munge_author_date here. Besides not hitting the committer
+	# line, it leaves the timezone intact, and we want nothing but
+	# whitespace.
+	#
+	# We will make two munged commits here. The first, ws_commit, will
+	# be purely spaces. The second contains a vertical tab, which is
+	# considered a space by strtoumax(), but not by our isspace().
+	test_commit 1234567890 &&
+	git cat-file commit HEAD >commit.orig &&
+	sed "s/>.*/>    /" <commit.orig >commit.munge &&
+	ws_commit=$(git hash-object --literally -w -t commit commit.munge) &&
+	sed "s/>.*/>   $(printf "\013")/" <commit.orig >commit.munge &&
+	vt_commit=$(git hash-object --literally -w -t commit commit.munge)
+
+[master f47e17d] 1234567890
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1234567890.t
+ok 11 - create commits with whitespace committer dates
+
+expecting success of 4212.12 '--until treats whitespace date as sentinel': 
+	echo $ws_commit >expect &&
+	git rev-list --until=1980-01-01 $ws_commit >actual &&
+	test_cmp expect actual &&
+
+	echo $vt_commit >expect &&
+	git rev-list --until=1980-01-01 $vt_commit >actual &&
+	test_cmp expect actual
+
+ok 12 - --until treats whitespace date as sentinel
+
+expecting success of 4212.13 'pretty-printer handles whitespace date': 
+	# as with the %ad test above, we will show these as the empty string,
+	# not the 1970 epoch date. This is intentional; see 7d9a281941 (t4212:
+	# test bogus timestamps with git-log, 2014-02-24) for more discussion.
+	echo : >expect &&
+	git log -1 --format="%at:%ct" $ws_commit >actual &&
+	test_cmp expect actual &&
+	git log -1 --format="%at:%ct" $vt_commit >actual &&
+	test_cmp expect actual
+
+ok 13 - pretty-printer handles whitespace date
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4200-rerere.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4200-rerere/.git/
 expecting success of 4200.1 'setup': 
@@ -282365,6 +282319,598 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4252-am-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4252-am-options/.git/
+expecting success of 4252.1 'setup': 
+	cp "$tm/file-1-0" file-1 &&
+	cp "$tm/file-2-0" file-2 &&
+	git add file-1 file-2 &&
+	test_tick &&
+	git commit -m initial &&
+	git tag initial
+
+[master (root-commit) f06d5e1] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 14 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+ok 1 - setup
+
+expecting success of 4252.2 'interrupted am --whitespace=fix': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Six$" file-2
+
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+.git/rebase-apply/patch:13: trailing whitespace.
+Six 
+warning: 1 line applied after fixing whitespace errors.
+Applying: Six
+3
+Six
+ok 2 - interrupted am --whitespace=fix
+
+expecting success of 4252.3 'interrupted am -C1': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -C1 "$tm"/am-test-2-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
+
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 3 - interrupted am -C1
+
+expecting success of 4252.4 'interrupted am -p2': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -p2 "$tm"/am-test-3-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
+
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Applying: Six
+3
+Three
+ok 4 - interrupted am -p2
+
+expecting success of 4252.5 'interrupted am -C1 -p2': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
+	git am --skip &&
+	grep 3 file-1 &&
+	grep "^Three$" file-2
+
+HEAD is now at f06d5e1 initial
+.git/rebase-apply/patch:9: trailing whitespace.
+Three 
+error: patch failed: file-1:1
+error: file-1: patch does not apply
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Three
+Patch failed at 0001 Three
+Context reduced to (1/1) to apply fragment at 2
+Applying: Six
+3
+Three
+ok 5 - interrupted am -C1 -p2
+
+expecting success of 4252.6 'interrupted am --directory="frotz nitfol"': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
+	git am --skip &&
+	grep One "frotz nitfol/file-5"
+
+HEAD is now at f06d5e1 initial
+error: frotz nitfol/junk/file-2: does not exist in index
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Six
+Patch failed at 0001 Six
+Applying: Six
+One
+ok 6 - interrupted am --directory="frotz nitfol"
+
+expecting success of 4252.7 'apply to a funny path': 
+	with_sq="with'sq" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard initial &&
+	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
+	test -f "$with_sq/file-5"
+
+HEAD is now at f06d5e1 initial
+Applying: Six
+ok 7 - apply to a funny path
+
+expecting success of 4252.8 'am --reject': 
+	rm -rf .git/rebase-apply &&
+	git reset --hard initial &&
+	test_must_fail git am --reject "$tm"/am-test-6-1 &&
+	grep "@@ -1,3 +1,3 @@" file-2.rej &&
+	test_must_fail git diff-files --exit-code --quiet file-2 &&
+	grep "[-]-reject" .git/rebase-apply/apply-opt
+
+HEAD is now at f06d5e1 initial
+Checking patch file-2...
+error: while searching for:
+0
+2
+3
+
+error: patch failed: file-2:1
+Applying patch file-2 with 1 reject...
+Rejected hunk #1.
+Hunk #2 applied cleanly.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Huh
+Patch failed at 0001 Huh
+@@ -1,3 +1,3 @@
+ '--reject'
+ok 8 - am --reject
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4214-log-graph-octopus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4214-log-graph-octopus/.git/
+expecting success of 4214.1 'set up merge history': 
+	test_commit initial &&
+	for i in 1 2 3 4 ; do
+		git checkout main -b $i || return $?
+		# Make tag name different from branch name, to avoid
+		# ambiguity error when calling checkout.
+		test_commit $i $i $i tag$i || return $?
+	done &&
+	git checkout 1 -b merge &&
+	test_merge octopus-merge 1 2 3 4 &&
+	test_commit after-merge &&
+	git checkout 1 -b L &&
+	test_commit left &&
+	git checkout 4 -b crossover &&
+	test_commit after-4 &&
+	git checkout initial -b more-L &&
+	test_commit after-initial
+
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch '1'
+[1 0152a24] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+Switched to a new branch '2'
+[2 bca45ad] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+Switched to a new branch '3'
+[3 ec94035] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to a new branch '4'
+[4 132f27d] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Switched to a new branch 'merge'
+Trying simple merge with 2
+Trying simple merge with 3
+Trying simple merge with 4
+Merge made by the 'octopus' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 4 | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+[merge ce2ad1c] after-merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-merge.t
+Switched to a new branch 'L'
+[L d607189] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 left.t
+Switched to a new branch 'crossover'
+[crossover 7a146e9] after-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-4.t
+Switched to a new branch 'more-L'
+[more-L a2d7eba] after-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-initial.t
+ok 1 - set up merge history
+
+expecting success of 4214.2 'log --graph with tricky octopus merge, no color': 
+	test_cmp_graph left octopus-merge <<-\EOF
+	* left
+	| *-.   octopus-merge
+	|/|\ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+
+ok 2 - log --graph with tricky octopus merge, no color
+
+expecting success of 4214.3 'log --graph with tricky octopus merge with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
+	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	<RED>|<RESET> * <MAGENTA>/<RESET> 2
+	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* <MAGENTA>/<RESET> 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph left octopus-merge
+
+ok 3 - log --graph with tricky octopus merge with colors
+
+expecting success of 4214.4 'log --graph with normal octopus merge, no color': 
+	test_cmp_graph octopus-merge <<-\EOF
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+
+ok 4 - log --graph with normal octopus merge, no color
+
+expecting success of 4214.5 'log --graph with normal octopus merge with colors': 
+	cat >expect.colors <<-\EOF &&
+	*<YELLOW>-<RESET><YELLOW>-<RESET><BLUE>-<RESET><BLUE>.<RESET>   octopus-merge
+	<RED>|<RESET><GREEN>\<RESET> <YELLOW>\<RESET> <BLUE>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
+	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
+	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
+	<RED>|<RESET> * <BLUE>/<RESET> 2
+	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
+	* <BLUE>/<RESET> 1
+	<BLUE>|<RESET><BLUE>/<RESET>
+	* initial
+	EOF
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	test_cmp_colored_graph octopus-merge
+
+ok 5 - log --graph with normal octopus merge with colors
+
+expecting success of 4214.6 'log --graph with normal octopus merge and child, no color': 
+	test_cmp_graph after-merge <<-\EOF
+	* after-merge
+	*---.   octopus-merge
+	|\ \ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+
+ok 6 - log --graph with normal octopus merge and child, no color
+
+expecting success of 4214.7 'log --graph with normal octopus and child merge with colors': 
+	cat >expect.colors <<-\EOF &&
+	* after-merge
+	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
+	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
+	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* <MAGENTA>/<RESET> 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	test_cmp_colored_graph after-merge
+
+ok 7 - log --graph with normal octopus and child merge with colors
+
+expecting success of 4214.8 'log --graph with tricky octopus merge and its child, no color': 
+	test_cmp_graph left after-merge <<-\EOF
+	* left
+	| * after-merge
+	| *-.   octopus-merge
+	|/|\ \
+	| | | * 4
+	| | * | 3
+	| | |/
+	| * / 2
+	| |/
+	* / 1
+	|/
+	* initial
+	EOF
+
+ok 8 - log --graph with tricky octopus merge and its child, no color
+
+expecting success of 4214.9 'log --graph with tricky octopus merge and its child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* left
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
+	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	<RED>|<RESET> * <CYAN>/<RESET> 2
+	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
+	* <CYAN>/<RESET> 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph left after-merge
+
+ok 9 - log --graph with tricky octopus merge and its child with colors
+
+expecting success of 4214.10 'log --graph with crossover in octopus merge, no color': 
+	test_cmp_graph after-4 octopus-merge <<-\EOF
+	* after-4
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 10 - log --graph with crossover in octopus merge, no color
+
+expecting success of 4214.11 'log --graph with crossover in octopus merge with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
+	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
+	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
+	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
+	<MAGENTA>|<RESET> * 1
+	<MAGENTA>|<RESET><MAGENTA>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 octopus-merge
+
+ok 11 - log --graph with crossover in octopus merge with colors
+
+expecting success of 4214.12 'log --graph with crossover in octopus merge and its child, no color': 
+	test_cmp_graph after-4 after-merge <<-\EOF
+	* after-4
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| |_|_|/
+	|/| | |
+	* | | | 4
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 12 - log --graph with crossover in octopus merge and its child, no color
+
+expecting success of 4214.13 'log --graph with crossover in octopus merge and its child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-4
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
+	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
+	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
+	<CYAN>|<RESET> * 1
+	<CYAN>|<RESET><CYAN>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-4 after-merge
+
+ok 13 - log --graph with crossover in octopus merge and its child with colors
+
+expecting success of 4214.14 'log --graph with unrelated commit and octopus tip, no color': 
+	test_cmp_graph after-initial octopus-merge <<-\EOF
+	* after-initial
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 14 - log --graph with unrelated commit and octopus tip, no color
+
+expecting success of 4214.15 'log --graph with unrelated commit and octopus tip with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> * 2
+	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial octopus-merge
+
+ok 15 - log --graph with unrelated commit and octopus tip with colors
+
+expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
+	test_cmp_graph after-initial after-merge <<-\EOF
+	* after-initial
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 16 - log --graph with unrelated commit and octopus child, no color
+
+expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> * 2
+	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial after-merge
+
+ok 17 - log --graph with unrelated commit and octopus child with colors
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4203-mailmap.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4203-mailmap/.git/
 expecting success of 4203.1 'setup commits and contacts file': 
@@ -283727,598 +284273,6 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4214-log-graph-octopus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4214-log-graph-octopus/.git/
-expecting success of 4214.1 'set up merge history': 
-	test_commit initial &&
-	for i in 1 2 3 4 ; do
-		git checkout main -b $i || return $?
-		# Make tag name different from branch name, to avoid
-		# ambiguity error when calling checkout.
-		test_commit $i $i $i tag$i || return $?
-	done &&
-	git checkout 1 -b merge &&
-	test_merge octopus-merge 1 2 3 4 &&
-	test_commit after-merge &&
-	git checkout 1 -b L &&
-	test_commit left &&
-	git checkout 4 -b crossover &&
-	test_commit after-4 &&
-	git checkout initial -b more-L &&
-	test_commit after-initial
-
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch '1'
-[1 0152a24] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-Switched to a new branch '2'
-[2 bca45ad] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-Switched to a new branch '3'
-[3 ec94035] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to a new branch '4'
-[4 132f27d] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Switched to a new branch 'merge'
-Trying simple merge with 2
-Trying simple merge with 3
-Trying simple merge with 4
-Merge made by the 'octopus' strategy.
- 2 | 1 +
- 3 | 1 +
- 4 | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
-[merge ce2ad1c] after-merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-merge.t
-Switched to a new branch 'L'
-[L d607189] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 left.t
-Switched to a new branch 'crossover'
-[crossover 7a146e9] after-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-4.t
-Switched to a new branch 'more-L'
-[more-L a2d7eba] after-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-initial.t
-ok 1 - set up merge history
-
-expecting success of 4214.2 'log --graph with tricky octopus merge, no color': 
-	test_cmp_graph left octopus-merge <<-\EOF
-	* left
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 2 - log --graph with tricky octopus merge, no color
-
-expecting success of 4214.3 'log --graph with tricky octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<RED>|<RESET> * <MAGENTA>/<RESET> 2
-	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left octopus-merge
-
-ok 3 - log --graph with tricky octopus merge with colors
-
-expecting success of 4214.4 'log --graph with normal octopus merge, no color': 
-	test_cmp_graph octopus-merge <<-\EOF
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 4 - log --graph with normal octopus merge, no color
-
-expecting success of 4214.5 'log --graph with normal octopus merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	*<YELLOW>-<RESET><YELLOW>-<RESET><BLUE>-<RESET><BLUE>.<RESET>   octopus-merge
-	<RED>|<RESET><GREEN>\<RESET> <YELLOW>\<RESET> <BLUE>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
-	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	<RED>|<RESET> * <BLUE>/<RESET> 2
-	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	* <BLUE>/<RESET> 1
-	<BLUE>|<RESET><BLUE>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph octopus-merge
-
-ok 5 - log --graph with normal octopus merge with colors
-
-expecting success of 4214.6 'log --graph with normal octopus merge and child, no color': 
-	test_cmp_graph after-merge <<-\EOF
-	* after-merge
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 6 - log --graph with normal octopus merge and child, no color
-
-expecting success of 4214.7 'log --graph with normal octopus and child merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	* after-merge
-	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
-	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph after-merge
-
-ok 7 - log --graph with normal octopus and child merge with colors
-
-expecting success of 4214.8 'log --graph with tricky octopus merge and its child, no color': 
-	test_cmp_graph left after-merge <<-\EOF
-	* left
-	| * after-merge
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 8 - log --graph with tricky octopus merge and its child, no color
-
-expecting success of 4214.9 'log --graph with tricky octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
-	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	<RED>|<RESET> * <CYAN>/<RESET> 2
-	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	* <CYAN>/<RESET> 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left after-merge
-
-ok 9 - log --graph with tricky octopus merge and its child with colors
-
-expecting success of 4214.10 'log --graph with crossover in octopus merge, no color': 
-	test_cmp_graph after-4 octopus-merge <<-\EOF
-	* after-4
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 10 - log --graph with crossover in octopus merge, no color
-
-expecting success of 4214.11 'log --graph with crossover in octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
-	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
-	<MAGENTA>|<RESET> * 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 octopus-merge
-
-ok 11 - log --graph with crossover in octopus merge with colors
-
-expecting success of 4214.12 'log --graph with crossover in octopus merge and its child, no color': 
-	test_cmp_graph after-4 after-merge <<-\EOF
-	* after-4
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 12 - log --graph with crossover in octopus merge and its child, no color
-
-expecting success of 4214.13 'log --graph with crossover in octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
-	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
-	<CYAN>|<RESET> * 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 after-merge
-
-ok 13 - log --graph with crossover in octopus merge and its child with colors
-
-expecting success of 4214.14 'log --graph with unrelated commit and octopus tip, no color': 
-	test_cmp_graph after-initial octopus-merge <<-\EOF
-	* after-initial
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 14 - log --graph with unrelated commit and octopus tip, no color
-
-expecting success of 4214.15 'log --graph with unrelated commit and octopus tip with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> * 2
-	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial octopus-merge
-
-ok 15 - log --graph with unrelated commit and octopus tip with colors
-
-expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
-	test_cmp_graph after-initial after-merge <<-\EOF
-	* after-initial
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 16 - log --graph with unrelated commit and octopus child, no color
-
-expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> * 2
-	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial after-merge
-
-ok 17 - log --graph with unrelated commit and octopus child with colors
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4252-am-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4252-am-options/.git/
-expecting success of 4252.1 'setup': 
-	cp "$tm/file-1-0" file-1 &&
-	cp "$tm/file-2-0" file-2 &&
-	git add file-1 file-2 &&
-	test_tick &&
-	git commit -m initial &&
-	git tag initial
-
-[master (root-commit) f06d5e1] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 14 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-ok 1 - setup
-
-expecting success of 4252.2 'interrupted am --whitespace=fix': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --whitespace=fix "$tm"/am-test-1-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Six$" file-2
-
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-.git/rebase-apply/patch:13: trailing whitespace.
-Six 
-warning: 1 line applied after fixing whitespace errors.
-Applying: Six
-3
-Six
-ok 2 - interrupted am --whitespace=fix
-
-expecting success of 4252.3 'interrupted am -C1': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -C1 "$tm"/am-test-2-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
-
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 3 - interrupted am -C1
-
-expecting success of 4252.4 'interrupted am -p2': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 "$tm"/am-test-3-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
-
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Applying: Six
-3
-Three
-ok 4 - interrupted am -p2
-
-expecting success of 4252.5 'interrupted am -C1 -p2': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am -p2 -C1 "$tm"/am-test-4-? &&
-	git am --skip &&
-	grep 3 file-1 &&
-	grep "^Three$" file-2
-
-HEAD is now at f06d5e1 initial
-.git/rebase-apply/patch:9: trailing whitespace.
-Three 
-error: patch failed: file-1:1
-error: file-1: patch does not apply
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Three
-Patch failed at 0001 Three
-Context reduced to (1/1) to apply fragment at 2
-Applying: Six
-3
-Three
-ok 5 - interrupted am -C1 -p2
-
-expecting success of 4252.6 'interrupted am --directory="frotz nitfol"': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --directory="frotz nitfol" "$tm"/am-test-5-? &&
-	git am --skip &&
-	grep One "frotz nitfol/file-5"
-
-HEAD is now at f06d5e1 initial
-error: frotz nitfol/junk/file-2: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Six
-Patch failed at 0001 Six
-Applying: Six
-One
-ok 6 - interrupted am --directory="frotz nitfol"
-
-expecting success of 4252.7 'apply to a funny path': 
-	with_sq="with'sq" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard initial &&
-	git am --directory="$with_sq" "$tm"/am-test-5-2 &&
-	test -f "$with_sq/file-5"
-
-HEAD is now at f06d5e1 initial
-Applying: Six
-ok 7 - apply to a funny path
-
-expecting success of 4252.8 'am --reject': 
-	rm -rf .git/rebase-apply &&
-	git reset --hard initial &&
-	test_must_fail git am --reject "$tm"/am-test-6-1 &&
-	grep "@@ -1,3 +1,3 @@" file-2.rej &&
-	test_must_fail git diff-files --exit-code --quiet file-2 &&
-	grep "[-]-reject" .git/rebase-apply/apply-opt
-
-HEAD is now at f06d5e1 initial
-Checking patch file-2...
-error: while searching for:
-0
-2
-3
-
-error: patch failed: file-2:1
-Applying patch file-2 with 1 reject...
-Rejected hunk #1.
-Hunk #2 applied cleanly.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Huh
-Patch failed at 0001 Huh
-@@ -1,3 +1,3 @@
- '--reject'
-ok 8 - am --reject
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4254-am-corrupt.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4254-am-corrupt/.git/
 expecting success of 4254.1 'setup': 
@@ -284745,6 +284699,145 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4213-log-tabexpand.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4213-log-tabexpand/.git/
+expecting success of 4213.1 'setup': 
+	test_tick &&
+	sed -e "s/Q/$HT/g" <<-EOF >msg &&
+	Q$title
+
+	Q$body
+	EOF
+	git commit --allow-empty -F msg
+
+[master (root-commit) 4243c44] 	tab indent at the beginning of the title line
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 4213.2 'expand/no-expand': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 2 - expand/no-expand
+
+expecting success of 4213.3 'expand/no-expand for --pretty': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 3 - expand/no-expand for --pretty
+
+expecting success of 4213.4 'expand/no-expand for --pretty=short': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 4 - expand/no-expand for --pretty=short
+
+expecting success of 4213.5 'expand/no-expand for --pretty=medium': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 5 - expand/no-expand for --pretty=medium
+
+expecting success of 4213.6 'expand/no-expand for --pretty=full': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 6 - expand/no-expand for --pretty=full
+
+expecting success of 4213.7 'expand/no-expand for --pretty=fuller': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 7 - expand/no-expand for --pretty=fuller
+
+expecting success of 4213.8 'expand/no-expand for --pretty=raw': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 8 - expand/no-expand for --pretty=raw
+
+expecting success of 4213.9 'expand/no-expand for --pretty=email': 
+		count_expand $in $default $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs &&
+		count_expand $in 8 0 --expand-tabs $fmt &&
+		count_expand $in 8 0 $fmt --expand-tabs=8 &&
+		count_expand $in 8 0 --expand-tabs=8 $fmt &&
+		count_expand $in 0 1 $fmt --no-expand-tabs &&
+		count_expand $in 0 1 --no-expand-tabs $fmt &&
+		count_expand $in 0 1 $fmt --expand-tabs=0 &&
+		count_expand $in 0 1 --expand-tabs=0 $fmt &&
+		count_expand $in 4 0 $fmt --expand-tabs=4 &&
+		count_expand $in 4 0 --expand-tabs=4 $fmt
+	
+ok 9 - expand/no-expand for --pretty=email
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4205-log-pretty-formats.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4205-log-pretty-formats/.git/
 expecting success of 4205.1 'set up basic repos': 
@@ -286218,8 +286311,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250\360\237\221\250.t"
---- expected	2026-04-19 19:20:01.343659440 +0000
-+++ actual	2026-04-19 19:20:01.363659440 +0000
+--- expected	2025-03-17 13:22:43.449230404 +0000
++++ actual	2025-03-17 13:22:43.477230581 +0000
 @@ -1,4 +1,4 @@
 -👨..👨⋮
 -e�..e�e�
@@ -286234,145 +286327,6 @@
 1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4213-log-tabexpand.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4213-log-tabexpand/.git/
-expecting success of 4213.1 'setup': 
-	test_tick &&
-	sed -e "s/Q/$HT/g" <<-EOF >msg &&
-	Q$title
-
-	Q$body
-	EOF
-	git commit --allow-empty -F msg
-
-[master (root-commit) 4243c44] 	tab indent at the beginning of the title line
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 4213.2 'expand/no-expand': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 2 - expand/no-expand
-
-expecting success of 4213.3 'expand/no-expand for --pretty': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 3 - expand/no-expand for --pretty
-
-expecting success of 4213.4 'expand/no-expand for --pretty=short': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 4 - expand/no-expand for --pretty=short
-
-expecting success of 4213.5 'expand/no-expand for --pretty=medium': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 5 - expand/no-expand for --pretty=medium
-
-expecting success of 4213.6 'expand/no-expand for --pretty=full': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 6 - expand/no-expand for --pretty=full
-
-expecting success of 4213.7 'expand/no-expand for --pretty=fuller': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 7 - expand/no-expand for --pretty=fuller
-
-expecting success of 4213.8 'expand/no-expand for --pretty=raw': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 8 - expand/no-expand for --pretty=raw
-
-expecting success of 4213.9 'expand/no-expand for --pretty=email': 
-		count_expand $in $default $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs &&
-		count_expand $in 8 0 --expand-tabs $fmt &&
-		count_expand $in 8 0 $fmt --expand-tabs=8 &&
-		count_expand $in 8 0 --expand-tabs=8 $fmt &&
-		count_expand $in 0 1 $fmt --no-expand-tabs &&
-		count_expand $in 0 1 --no-expand-tabs $fmt &&
-		count_expand $in 0 1 $fmt --expand-tabs=0 &&
-		count_expand $in 0 1 --expand-tabs=0 $fmt &&
-		count_expand $in 4 0 $fmt --expand-tabs=4 &&
-		count_expand $in 4 0 --expand-tabs=4 $fmt
-	
-ok 9 - expand/no-expand for --pretty=email
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5002-archive-attr-pattern.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5002-archive-attr-pattern/.git/
 expecting success of 5002.1 'setup': 
@@ -290393,8 +290347,8 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
---- at	2026-04-19 19:19:58.507659440 +0000
-+++ ct	2026-04-19 19:19:58.519659440 +0000
+--- at	2025-03-17 13:22:39.541205705 +0000
++++ ct	2025-03-17 13:22:39.565205857 +0000
 @@ -1 +1 @@
 -1112912053 -0700
 +1112912293 -0700
@@ -290423,7 +290377,7 @@
 
 HEAD is now at 6b2d93f first
 Applying: second
-1776626398 +0000
+1742217759 +0000
 ok 62 - am --ignore-date
 
 expecting success of 4150.63 'am into an unborn branch': 
@@ -290444,7 +290398,7 @@
 	) &&
 	test_cmp expected actual
 
-HEAD is now at 5bf969e second
+HEAD is now at 2bb75d7 second
 subdir/1
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4150-am/subdir/.git/
 applying to an empty history
@@ -290460,16 +290414,16 @@
 	git am <patchnl >output.out 2>&1 &&
 	test_grep "^Applying: second \\\n foo$" output.out
 
-HEAD is now at 5bf969e second
+HEAD is now at 2bb75d7 second
 Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  5bf969e second
+  2bb75d7 second
 
 If you want to keep it by creating a new branch, this may be a good time
 to do so with:
 
- git branch <new-branch-name> 5bf969e
+ git branch <new-branch-name> 2bb75d7
 
 HEAD is now at 6b2d93f first
 Applying: second \n foo
@@ -291270,6 +291224,76 @@
 1..87
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5200-update-server-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5200-update-server-info/.git/
+expecting success of 5200.1 'setup': test_commit file
+[master (root-commit) 4c1911f] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 1 - setup
+
+expecting success of 5200.2 'create info/refs': 
+	git update-server-info &&
+	test_path_is_file .git/info/refs
+
+ok 2 - create info/refs
+
+expecting success of 5200.3 'modify and store mtime': 
+	test-tool chmtime =0 .git/info/refs &&
+	test-tool chmtime --get .git/info/refs >a
+
+ok 3 - modify and store mtime
+
+expecting success of 5200.4 'info/refs is not needlessly overwritten': 
+	git update-server-info &&
+	test-tool chmtime --get .git/info/refs >b &&
+	test_cmp a b
+
+ok 4 - info/refs is not needlessly overwritten
+
+expecting success of 5200.5 'info/refs can be forced to update': 
+	git update-server-info -f &&
+	test-tool chmtime --get .git/info/refs >b &&
+	! test_cmp a b
+
+--- a	2025-03-17 13:22:50.513275049 +0000
++++ b	2025-03-17 13:22:50.653275934 +0000
+@@ -1 +1 @@
+-0
++1742217770
+ok 5 - info/refs can be forced to update
+
+expecting success of 5200.6 'info/refs updates when changes are made': 
+	test-tool chmtime =0 .git/info/refs &&
+	test-tool chmtime --get .git/info/refs >b &&
+	test_cmp a b &&
+	git update-ref refs/heads/foo HEAD &&
+	git update-server-info &&
+	test-tool chmtime --get .git/info/refs >b &&
+	! test_cmp a b
+
+--- a	2025-03-17 13:22:50.513275049 +0000
++++ b	2025-03-17 13:22:50.805276895 +0000
+@@ -1 +1 @@
+-0
++1742217770
+ok 6 - info/refs updates when changes are made
+
+expecting success of 5200.7 'midx does not create duplicate pack entries': 
+	git repack -d --write-midx &&
+	git repack -d &&
+	grep ^P .git/objects/info/packs >packs &&
+	uniq -d <packs >dups &&
+	test_must_be_empty dups
+
+Nothing new to pack.
+ok 7 - midx does not create duplicate pack entries
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4300-merge-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4300-merge-tree/.git/
 expecting success of 4300.1 'setup': 
@@ -291878,6 +291902,748 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5000-tar-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5000-tar-tree/.git/
+expecting success of 5000.1 'setup': 
+	test_oid_cache <<-EOF
+	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
+	obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
+	EOF
+
+ok 1 - setup
+
+expecting success of 5000.2 '--list notices extra parameters': 
+	test_must_fail git archive --list blah &&
+	test_must_fail git archive --remote=. --list blah
+
+fatal: extra command line parameter 'blah'
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: extra command line parameter 'blah'        
+remote: git upload-archive: archiver died with error
+ok 2 - --list notices extra parameters
+
+expecting success of 5000.3 'end-of-options is correctly eaten': 
+	git archive --list --end-of-options &&
+	git archive --remote=. --list --end-of-options
+
+tar
+tgz
+tar.gz
+zip
+tar
+tgz
+tar.gz
+zip
+ok 3 - end-of-options is correctly eaten
+
+expecting success of 5000.4 'populate workdir': 
+	mkdir a &&
+	echo "a files_named_a" >.gitattributes &&
+	git add .gitattributes &&
+	echo simple textfile >a/a &&
+	ten=0123456789 &&
+	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
+	echo long filename >"a/four$hundred" &&
+	mkdir a/bin &&
+	test-tool genrandom "frotz" 500000 >a/bin/sh &&
+	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+	printf "A not substituted O" >a/substfile2 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s a a/l1
+	else
+		printf %s a >a/l1
+	fi &&
+	(
+		p=long_path_to_a_file &&
+		cd a &&
+		for depth in 1 2 3 4 5
+		do
+			mkdir $p &&
+			cd $p || exit 1
+		done &&
+		echo text >file_with_long_path
+	) &&
+	(cd a && find .) | sort >a.lst
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 4 - populate workdir
+
+expecting success of 5000.5 'add ignored file': echo ignore me >a/ignored &&
+     mkdir .git/info &&
+     echo ignored export-ignore >.git/info/attributes
+ok 5 - add ignored file
+
+expecting success of 5000.6 'add files to repository': 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+
+[master (root-commit) cc086e8] initial
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 a/a
+ create mode 100644 a/bin/sh
+ create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+ create mode 100644 a/ignored
+ create mode 120000 a/l1
+ create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
+ create mode 100644 a/substfile1
+ create mode 100644 a/substfile2
+ok 6 - add files to repository
+
+expecting success of 5000.7 'setup export-subst': 
+	echo "substfile?" export-subst >>.git/info/attributes &&
+	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+		>a/substfile1
+
+ok 7 - setup export-subst
+
+expecting success of 5000.8 'create bare clone': 
+	git clone --template= --bare . bare.git &&
+	mkdir bare.git/info &&
+	cp .git/info/attributes bare.git/info/attributes
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - create bare clone
+
+expecting success of 5000.9 'remove ignored file': 
+	rm a/ignored
+
+ok 9 - remove ignored file
+
+expecting success of 5000.10 'git archive': 
+	git archive HEAD >b.tar
+
+ok 10 - git archive
+
+expecting success of 5000.11 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 11 -  extract tar archive
+
+checking prerequisite: TAR_NEEDS_PAX_FALLBACK
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
+	(
+		mkdir pax &&
+		cd pax &&
+		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
+		test -f PaxHeaders.1791/file
+	)
+
+)
+prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
+ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.13 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 13 -  validate filenames
+
+expecting success of 5000.14 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 14 -  validate file contents
+
+expecting success of 5000.15 ' validate mtime of a/a': 
+		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
+		echo $mtime >expect.mtime &&
+		test_cmp expect.mtime actual.mtime
+	
+ok 15 -  validate mtime of a/a
+
+expecting success of 5000.16 'git archive --mtime': 
+	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
+
+ok 16 - git archive --mtime
+
+expecting success of 5000.17 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 17 -  extract tar archive
+
+ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.19 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 19 -  validate filenames
+
+expecting success of 5000.20 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 20 -  validate file contents
+
+expecting success of 5000.21 ' validate mtime of a/a': 
+		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
+		echo $mtime >expect.mtime &&
+		test_cmp expect.mtime actual.mtime
+	
+ok 21 -  validate mtime of a/a
+
+expecting success of 5000.22 'git archive --prefix=prefix/': 
+	git archive --prefix=prefix/ HEAD >with_prefix.tar
+
+ok 22 - git archive --prefix=prefix/
+
+expecting success of 5000.23 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 23 -  extract tar archive
+
+ok 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.25 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 25 -  validate filenames
+
+expecting success of 5000.26 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 26 -  validate file contents
+
+expecting success of 5000.27 'git-archive --prefix=olde-': 
+	git archive --prefix=olde- HEAD >with_olde-prefix.tar
+
+ok 27 - git-archive --prefix=olde-
+
+expecting success of 5000.28 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 28 -  extract tar archive
+
+ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.30 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 30 -  validate filenames
+
+expecting success of 5000.31 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 31 -  validate file contents
+
+expecting success of 5000.32 'git archive --add-file': 
+	echo untracked >untracked &&
+	git archive --add-file=untracked HEAD >with_untracked.tar
+
+ok 32 - git archive --add-file
+
+expecting success of 5000.33 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 33 -  extract tar archive
+
+ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.35 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 35 -  validate filenames
+
+expecting success of 5000.36 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 36 -  validate file contents
+
+expecting success of 5000.37 ' validate extra file untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 37 -  validate extra file untracked
+
+expecting success of 5000.38 'git archive --add-file twice': 
+	echo untracked >untracked &&
+	git archive --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.tar
+
+ok 38 - git archive --add-file twice
+
+expecting success of 5000.39 ' extract tar archive': 
+		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
+	
+ok 39 -  extract tar archive
+
+ok 40 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
+
+expecting success of 5000.41 ' validate filenames': 
+		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
+		test_cmp a.lst $listfile
+	
+ok 41 -  validate filenames
+
+expecting success of 5000.42 ' validate file contents': 
+		diff -r a ${dir_with_prefix}a
+	
+ok 42 -  validate file contents
+
+expecting success of 5000.43 ' validate extra file one/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 43 -  validate extra file one/untracked
+
+expecting success of 5000.44 ' validate extra file two/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 44 -  validate extra file two/untracked
+
+expecting success of 5000.45 'git archive on large files': 
+	test_config core.bigfilethreshold 1 &&
+	git archive HEAD >b3.tar &&
+	test_cmp_bin b.tar b3.tar
+
+ok 45 - git archive on large files
+
+expecting success of 5000.46 'git archive in a bare repo': 
+	git --git-dir bare.git archive HEAD >b3.tar
+
+ok 46 - git archive in a bare repo
+
+expecting success of 5000.47 'git archive vs. the same in a bare repo': 
+	test_cmp_bin b.tar b3.tar
+
+ok 47 - git archive vs. the same in a bare repo
+
+expecting success of 5000.48 'git archive with --output': 
+	git archive --output=b4.tar HEAD &&
+	test_cmp_bin b.tar b4.tar
+
+ok 48 - git archive with --output
+
+expecting success of 5000.49 'git archive --remote': 
+	git archive --remote=. HEAD >b5.tar &&
+	test_cmp_bin b.tar b5.tar
+
+ok 49 - git archive --remote
+
+expecting success of 5000.50 'git archive --remote with configured remote': 
+	git config remote.foo.url . &&
+	(
+		cd a &&
+		git archive --remote=foo --output=../b5-nick.tar HEAD
+	) &&
+	test_cmp_bin b.tar b5-nick.tar
+
+ok 50 - git archive --remote with configured remote
+
+expecting success of 5000.51 'git get-tar-commit-id': 
+	git get-tar-commit-id <b.tar >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
+
+ok 51 - git get-tar-commit-id
+
+expecting success of 5000.52 'git archive with --output, override inferred format': 
+	git archive --format=tar --output=d4.zip HEAD &&
+	test_cmp_bin b.tar d4.zip
+
+ok 52 - git archive with --output, override inferred format
+
+checking prerequisite: GZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
+)
+gzip 1.13
+Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 1993 Jean-loup Gailly.
+This is free software.  You may redistribute copies of it under the terms of
+the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
+There is NO WARRANTY, to the extent permitted by law.
+
+Written by Jean-loup Gailly.
+prerequisite GZIP ok
+expecting success of 5000.53 'git archive with --output and --remote creates .tgz': 
+	git archive --output=d5.tgz --remote=. HEAD &&
+	gzip -d -c <d5.tgz >d5.tar &&
+	test_cmp_bin b.tar d5.tar
+
+ok 53 - git archive with --output and --remote creates .tgz
+
+expecting success of 5000.54 'git archive --list outside of a git repo': 
+	nongit git archive --list
+
+tar
+tgz
+tar.gz
+zip
+ok 54 - git archive --list outside of a git repo
+
+expecting success of 5000.55 'git archive --remote outside of a git repo': 
+	git archive HEAD >expect.tar &&
+	nongit git archive --remote="$PWD" HEAD >actual.tar &&
+	test_cmp_bin expect.tar actual.tar
+
+ok 55 - git archive --remote outside of a git repo
+
+expecting success of 5000.56 'clients cannot access unreachable commits': 
+	test_commit unreachable &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_must_fail git archive --remote=. $sha1 >remote.tar
+
+[master 7227b65] unreachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable.t
+HEAD is now at cc086e8 initial
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: no such ref: 7227b65e2133d76ecf028be4e1142e6868caf227        
+remote: git upload-archive: archiver died with error
+ok 56 - clients cannot access unreachable commits
+
+expecting success of 5000.57 'upload-archive can allow unreachable commits': 
+	test_commit unreachable1 &&
+	sha1=$(git rev-parse HEAD) &&
+	git reset --hard HEAD^ &&
+	git archive $sha1 >remote.tar &&
+	test_config uploadarchive.allowUnreachable true &&
+	git archive --remote=. $sha1 >remote.tar
+
+[master a9e9f2b] unreachable1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unreachable1.t
+HEAD is now at cc086e8 initial
+ok 57 - upload-archive can allow unreachable commits
+
+expecting success of 5000.58 'setup tar filters': 
+	git config tar.tar.foo.command "tr ab ba" &&
+	git config tar.bar.command "tr ab ba" &&
+	git config tar.bar.remote true &&
+	git config tar.invalid baz
+
+ok 58 - setup tar filters
+
+expecting success of 5000.59 'archive --list mentions user filter': 
+	git archive --list >output &&
+	grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+tar.foo
+bar
+ok 59 - archive --list mentions user filter
+
+expecting success of 5000.60 'archive --list shows only enabled remote filters': 
+	git archive --list --remote=. >output &&
+	! grep "^tar\.foo\$" output &&
+	grep "^bar\$" output
+
+bar
+ok 60 - archive --list shows only enabled remote filters
+
+expecting success of 5000.61 'invoke tar filter by format': 
+	git archive --format=tar.foo HEAD >config.tar.foo &&
+	tr ab ba <config.tar.foo >config.tar &&
+	test_cmp_bin b.tar config.tar &&
+	git archive --format=bar HEAD >config.bar &&
+	tr ab ba <config.bar >config.tar &&
+	test_cmp_bin b.tar config.tar
+
+ok 61 - invoke tar filter by format
+
+expecting success of 5000.62 'invoke tar filter by extension': 
+	git archive -o config-implicit.tar.foo HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
+	git archive -o config-implicit.bar HEAD &&
+	test_cmp_bin config.tar.foo config-implicit.bar
+
+ok 62 - invoke tar filter by extension
+
+expecting success of 5000.63 'default output format remains tar': 
+	git archive -o config-implicit.baz HEAD &&
+	test_cmp_bin b.tar config-implicit.baz
+
+ok 63 - default output format remains tar
+
+expecting success of 5000.64 'extension matching requires dot': 
+	git archive -o config-implicittar.foo HEAD &&
+	test_cmp_bin b.tar config-implicittar.foo
+
+ok 64 - extension matching requires dot
+
+expecting success of 5000.65 'only enabled filters are available remotely': 
+	test_must_fail git archive --remote=. --format=tar.foo HEAD \
+		>remote.tar.foo &&
+	git archive --remote=. --format=bar >remote.bar HEAD &&
+	test_cmp_bin remote.bar config.bar
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.foo'        
+remote: git upload-archive: archiver died with error
+ok 65 - only enabled filters are available remotely
+
+expecting success of 5000.66 'invalid filter is reported only once': 
+	test_must_fail git -c tar.invalid.command= archive --format=invalid \
+		HEAD >out 2>err &&
+	test_must_be_empty out &&
+	test_line_count = 1 err
+
+ok 66 - invalid filter is reported only once
+
+expecting success of 5000.67 'git archive --format=tgz': 
+	git archive --format=tgz HEAD >j.tgz
+
+ok 67 - git archive --format=tgz
+
+expecting success of 5000.68 'git archive --format=tar.gz': 
+	git archive --format=tar.gz HEAD >j1.tar.gz &&
+	test_cmp_bin j.tgz j1.tar.gz
+
+ok 68 - git archive --format=tar.gz
+
+expecting success of 5000.69 'infer tgz from .tgz filename': 
+	git archive --output=j2.tgz HEAD &&
+	test_cmp_bin j.tgz j2.tgz
+
+ok 69 - infer tgz from .tgz filename
+
+expecting success of 5000.70 'infer tgz from .tar.gz filename': 
+	git archive --output=j3.tar.gz HEAD &&
+	test_cmp_bin j.tgz j3.tar.gz
+
+ok 70 - infer tgz from .tar.gz filename
+
+expecting success of 5000.71 'extract tgz file': 
+	gzip -d -c <j.tgz >j.tar &&
+	test_cmp_bin b.tar j.tar
+
+ok 71 - extract tgz file
+
+expecting success of 5000.72 'remote tar.gz is allowed by default': 
+	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
+	test_cmp_bin j.tgz remote.tar.gz
+
+ok 72 - remote tar.gz is allowed by default
+
+expecting success of 5000.73 'remote tar.gz can be disabled': 
+	git config tar.tar.gz.remote false &&
+	test_must_fail git archive --remote=. --format=tar.gz HEAD \
+		>remote.tar.gz
+
+fatal: sent error to the client: git upload-archive: archiver died with error
+remote: fatal: Unknown archive format 'tar.gz'        
+remote: git upload-archive: archiver died with error
+ok 73 - remote tar.gz can be disabled
+
+expecting success of 5000.74 'git archive --format=tgz (external gzip)': 
+	test_config tar.tgz.command "gzip -cn" &&
+	git archive --format=tgz HEAD >external_gzip.tgz
+
+ok 74 - git archive --format=tgz (external gzip)
+
+expecting success of 5000.75 'git archive --format=tar.gz (external gzip)': 
+	test_config tar.tar.gz.command "gzip -cn" &&
+	git archive --format=tar.gz HEAD >external_gzip.tar.gz &&
+	test_cmp_bin external_gzip.tgz external_gzip.tar.gz
+
+ok 75 - git archive --format=tar.gz (external gzip)
+
+expecting success of 5000.76 'extract tgz file (external gzip)': 
+	gzip -d -c <external_gzip.tgz >external_gzip.tar &&
+	test_cmp_bin b.tar external_gzip.tar
+
+ok 76 - extract tgz file (external gzip)
+
+expecting success of 5000.77 'archive and :(glob)': 
+	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	a/
+	a/bin/
+	a/bin/sh
+	EOF
+	test_cmp expect actual
+
+ok 77 - archive and :(glob)
+
+expecting success of 5000.78 'catch non-matching pathspec': 
+	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
+
+fatal: pathspec '*.abc' did not match any files
+ok 78 - catch non-matching pathspec
+
+expecting success of 5000.79 'reject paths outside the current directory': 
+	test_must_fail git -C a/bin archive HEAD .. >/dev/null 2>err &&
+	grep "outside the current directory" err
+
+fatal: pathspec '..' matches files outside the current directory
+ok 79 - reject paths outside the current directory
+
+expecting success of 5000.80 'allow pathspecs that resolve to the current directory': 
+	git -C a/bin archive -v HEAD ../bin >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	sh
+	EOF
+	test_cmp expect actual
+
+ok 80 - allow pathspecs that resolve to the current directory
+
+expecting success of 5000.81 'attr pathspec in bare repo': 
+	test_expect_code 0 git --git-dir=bare.git archive -v HEAD \
+		":(attr:files_named_a)" >/dev/null 2>actual &&
+	cat >expect <<-\EOF &&
+	a/
+	a/a
+	EOF
+	test_cmp expect actual
+
+ok 81 - attr pathspec in bare repo
+
+checking prerequisite: LONG_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+	test 8 -le "$(build_option sizeof-long)"
+
+)
+prerequisite LONG_IS_64BIT ok
+expecting success of 5000.82 'set up repository with huge blob': 
+	obj=$(test_oid obj) &&
+	path=$(test_oid_to_path $obj) &&
+	mkdir -p .git/objects/$(dirname $path) &&
+	cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
+	rm -f .git/index &&
+	git update-index --add --cacheinfo 100644,$obj,huge &&
+	git commit -m huge
+
+[master 82a0aa8] huge
+ Author: A U Thor <author@example.com>
+ 10 files changed, 8 deletions(-)
+ delete mode 100644 .gitattributes
+ delete mode 100644 a/a
+ delete mode 100644 a/bin/sh
+ delete mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
+ delete mode 100644 a/ignored
+ delete mode 120000 a/l1
+ delete mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
+ delete mode 100644 a/substfile1
+ delete mode 100644 a/substfile2
+ create mode 100644 huge
+ok 82 - set up repository with huge blob
+
+expecting success of 5000.83 'generate tar with huge size': 
+	{
+		git archive HEAD
+		echo $? >exit-code
+	} | test_copy_bytes 4096 >huge.tar &&
+	echo 141 >expect &&
+	test_cmp expect exit-code
+
+ok 83 - generate tar with huge size
+
+checking prerequisite: TAR_HUGE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
+	echo "68719476737 4147" >expect &&
+	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
+	test_cmp expect actual
+
+)
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+prerequisite TAR_HUGE ok
+expecting success of 5000.84 'system tar can read our huge size': 
+	echo 68719476737 >expect &&
+	tar_info huge.tar | cut -d" " -f1 >actual &&
+	test_cmp expect actual
+
+tar: rmtlseek not stopped at a record boundary
+tar: Error is not recoverable: exiting now
+ok 84 - system tar can read our huge size
+
+checking prerequisite: TIME_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+expecting success of 5000.85 'set up repository with far-future (2^34 - 1) commit': 
+	rm -f .git/index &&
+	echo foo >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="@17179869183 +0000" \
+		git commit -m "tempori parendum"
+
+[master 8127a15] tempori parendum
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ delete mode 100644 huge
+ok 85 - set up repository with far-future (2^34 - 1) commit
+
+expecting success of 5000.86 'generate tar with far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 86 - generate tar with far-future mtime
+
+checking prerequisite: TIME_T_IS_64BIT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success of 5000.87 'system tar can read our future mtime': 
+	echo 2514 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+
+ok 87 - system tar can read our future mtime
+
+expecting success of 5000.88 'set up repository with far-far-future (2^36 + 1) commit': 
+	rm -f .git/index &&
+	echo content >file &&
+	git add file &&
+	GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
+		git commit -m "tempori parendum"
+
+[master c6bd888] tempori parendum
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 88 - set up repository with far-far-future (2^36 + 1) commit
+
+expecting success of 5000.89 'generate tar with far-far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 89 - generate tar with far-far-future mtime
+
+expecting success of 5000.90 'system tar can read our future mtime': 
+	echo 4147 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+
+ok 90 - system tar can read our future mtime
+
+# passed all 90 test(s)
+1..90
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4215-log-skewed-merges.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4215-log-skewed-merges/.git/
 expecting success of 4215.1 'log --graph with merge fusing with its left and right neighbors': 
@@ -292987,2437 +293753,502 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5200-update-server-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5200-update-server-info/.git/
-expecting success of 5200.1 'setup': test_commit file
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 1 - setup
+*** t5100-mailinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5100-mailinfo/.git/
+expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
+	last=$(cat last) &&
+	echo total is $last &&
+	test $(cat last) = 18
+total is 18
+ok 1 - split sample box
 
-expecting success of 5200.2 'create info/refs': 
-	git update-server-info &&
-	test_path_is_file .git/info/refs
+expecting success of 5100.2 'mailinfo 0001': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 2 - mailinfo 0001
 
-ok 2 - create info/refs
+expecting success of 5100.3 'mailinfo 0002': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 3 - mailinfo 0002
 
-expecting success of 5200.3 'modify and store mtime': 
-	test-tool chmtime =0 .git/info/refs &&
-	test-tool chmtime --get .git/info/refs >a
+expecting success of 5100.4 'mailinfo 0003': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 4 - mailinfo 0003
 
-ok 3 - modify and store mtime
+expecting success of 5100.5 'mailinfo 0004': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 5 - mailinfo 0004
 
-expecting success of 5200.4 'info/refs is not needlessly overwritten': 
-	git update-server-info &&
-	test-tool chmtime --get .git/info/refs >b &&
-	test_cmp a b
+expecting success of 5100.6 'mailinfo 0005': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 6 - mailinfo 0005
 
-ok 4 - info/refs is not needlessly overwritten
+expecting success of 5100.7 'mailinfo 0006': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 7 - mailinfo 0006
 
-expecting success of 5200.5 'info/refs can be forced to update': 
-	git update-server-info -f &&
-	test-tool chmtime --get .git/info/refs >b &&
-	! test_cmp a b
+expecting success of 5100.8 'mailinfo 0007': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 8 - mailinfo 0007
 
---- a	2026-04-19 19:20:06.863659440 +0000
-+++ b	2026-04-19 19:20:06.991659440 +0000
-@@ -1 +1 @@
--0
-+1776626406
-ok 5 - info/refs can be forced to update
+expecting success of 5100.9 'mailinfo 0008': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 9 - mailinfo 0008
 
-expecting success of 5200.6 'info/refs updates when changes are made': 
-	test-tool chmtime =0 .git/info/refs &&
-	test-tool chmtime --get .git/info/refs >b &&
-	test_cmp a b &&
-	git update-ref refs/heads/foo HEAD &&
-	git update-server-info &&
-	test-tool chmtime --get .git/info/refs >b &&
-	! test_cmp a b
+expecting success of 5100.10 'mailinfo 0009': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 10 - mailinfo 0009
 
---- a	2026-04-19 19:20:06.863659440 +0000
-+++ b	2026-04-19 19:20:07.111659440 +0000
-@@ -1 +1 @@
--0
-+1776626407
-ok 6 - info/refs updates when changes are made
+expecting success of 5100.11 'mailinfo 0010': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 11 - mailinfo 0010
 
-expecting success of 5200.7 'midx does not create duplicate pack entries': 
-	git repack -d --write-midx &&
-	git repack -d &&
-	grep ^P .git/objects/info/packs >packs &&
-	uniq -d <packs >dups &&
-	test_must_be_empty dups
+expecting success of 5100.12 'mailinfo 0011': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 12 - mailinfo 0011
 
-Nothing new to pack.
-ok 7 - midx does not create duplicate pack entries
+expecting success of 5100.13 'mailinfo 0012': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 13 - mailinfo 0012
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5003-archive-zip/.git/
-expecting success of 5003.1 'populate workdir': mkdir a &&
-     echo simple textfile >a/a &&
-     mkdir a/bin &&
-     cp /bin/sh a/bin &&
-     printf "text\r"	>a/text.cr &&
-     printf "text\r\n"	>a/text.crlf &&
-     printf "text\n"	>a/text.lf &&
-     printf "text\r"	>a/nodiff.cr &&
-     printf "text\r\n"	>a/nodiff.crlf &&
-     printf "text\n"	>a/nodiff.lf &&
-     printf "text\r"	>a/custom.cr &&
-     printf "text\r\n"	>a/custom.crlf &&
-     printf "text\n"	>a/custom.lf &&
-     printf "\0\r"	>a/binary.cr &&
-     printf "\0\r\n"	>a/binary.crlf &&
-     printf "\0\n"	>a/binary.lf &&
-     printf "\0\r"	>a/diff.cr &&
-     printf "\0\r\n"	>a/diff.crlf &&
-     printf "\0\n"	>a/diff.lf &&
-     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-     printf "A not substituted O" >a/substfile2 &&
-     (p=long_path_to_a_file && cd a &&
-      for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
-      echo text >file_with_long_path)
+expecting success of 5100.14 'mailinfo 0013': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 14 - mailinfo 0013
 
-ok 1 - populate workdir
+expecting success of 5100.15 'mailinfo 0014': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 15 - mailinfo 0014
 
-checking prerequisite: SYMLINKS
+expecting success of 5100.16 'mailinfo 0015': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 16 - mailinfo 0015
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+expecting success of 5100.17 'mailinfo 0016': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 17 - mailinfo 0016
 
-)
-prerequisite SYMLINKS ok
-checking prerequisite: UNZIP_SYMLINKS
+expecting success of 5100.18 'mailinfo 0017': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 18 - mailinfo 0017
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
-	"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
-	test -h symlink
+expecting success of 5100.19 'mailinfo 0018': 
+		check_mailinfo "$mail" "" &&
+		if test -f "$DATA/msg$mail--scissors"
+		then
+			check_mailinfo "$mail" --scissors
+		fi &&
+		if test -f "$DATA/msg$mail--no-inbody-headers"
+		then
+			check_mailinfo "$mail" --no-inbody-headers
+		fi &&
+		if test -f "$DATA/msg$mail--message-id"
+		then
+			check_mailinfo "$mail" --message-id
+		fi
+	
+ok 19 - mailinfo 0018
 
-)
-Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/t5003/infozip-symlinks.zip
- extracting: textfile                
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_SYMLINKS ok
-expecting success of 5003.2 'add symlink': 
-	ln -s a a/symlink_to_a
+expecting success of 5100.20 'split box with rfc2047 samples': mkdir rfc2047 &&
+	git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
+	  >rfc2047/last &&
+	last=$(cat rfc2047/last) &&
+	echo total is $last &&
+	test $(cat rfc2047/last) = 11
+total is 11
+ok 20 - split box with rfc2047 samples
 
-ok 2 - add symlink
+expecting success of 5100.21 'mailinfo rfc2047/0001': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 21 - mailinfo rfc2047/0001
 
-expecting success of 5003.3 'prepare file list': 
-	(cd a && find .) | sort >a.lst
+expecting success of 5100.22 'mailinfo rfc2047/0002': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 22 - mailinfo rfc2047/0002
 
-ok 3 - prepare file list
+expecting success of 5100.23 'mailinfo rfc2047/0003': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 23 - mailinfo rfc2047/0003
 
-expecting success of 5003.4 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 4 - add ignored file
+expecting success of 5100.24 'mailinfo rfc2047/0004': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 24 - mailinfo rfc2047/0004
 
-expecting success of 5003.5 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+expecting success of 5100.25 'mailinfo rfc2047/0005': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 25 - mailinfo rfc2047/0005
 
-[master (root-commit) 9cc2aa8] initial
- Author: A U Thor <author@example.com>
- 22 files changed, 15 insertions(+)
- create mode 100644 a/a
- create mode 100755 a/bin/sh
- create mode 100644 a/binary.cr
- create mode 100644 a/binary.crlf
- create mode 100644 a/binary.lf
- create mode 100644 a/custom.cr
- create mode 100644 a/custom.crlf
- create mode 100644 a/custom.lf
- create mode 100644 a/diff.cr
- create mode 100644 a/diff.crlf
- create mode 100644 a/diff.lf
- create mode 100644 a/ignored
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/nodiff.cr
- create mode 100644 a/nodiff.crlf
- create mode 100644 a/nodiff.lf
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
- create mode 120000 a/symlink_to_a
- create mode 100644 a/text.cr
- create mode 100644 a/text.crlf
- create mode 100644 a/text.lf
-ok 5 - add files to repository
+expecting success of 5100.26 'mailinfo rfc2047/0006': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 26 - mailinfo rfc2047/0006
 
-expecting success of 5003.6 'setup export-subst and diff attributes': 
-	echo "a/nodiff.* -diff" >>.git/info/attributes &&
-	echo "a/diff.* diff" >>.git/info/attributes &&
-	echo "a/custom.* diff=custom" >>.git/info/attributes &&
-	git config diff.custom.binary true &&
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
+expecting success of 5100.27 'mailinfo rfc2047/0007': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 27 - mailinfo rfc2047/0007
 
-ok 6 - setup export-subst and diff attributes
+expecting success of 5100.28 'mailinfo rfc2047/0008': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 28 - mailinfo rfc2047/0008
 
-expecting success of 5003.7 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes &&
-	# Recreate our changes to .git/config rather than just copying it, as
-	# we do not want to clobber core.bare or other settings.
-	git -C bare.git config diff.custom.binary true
+expecting success of 5100.29 'mailinfo rfc2047/0009': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 29 - mailinfo rfc2047/0009
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 7 - create bare clone
+expecting success of 5100.30 'mailinfo rfc2047/0010': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 30 - mailinfo rfc2047/0010
 
-expecting success of 5003.8 'remove ignored file': rm a/ignored
-ok 8 - remove ignored file
+expecting success of 5100.31 'mailinfo rfc2047/0011': 
+		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
+		echo msg &&
+		test_cmp "$DATA/empty" "$mail-msg" &&
+		echo patch &&
+		test_cmp "$DATA/empty" "$mail-patch" &&
+		echo info &&
+		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
+	
+msg
+patch
+info
+ok 31 - mailinfo rfc2047/0011
 
-expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
-ok 9 - git archive --format=zip
+expecting success of 5100.32 'respect NULs': 
 
-checking prerequisite: UNZIP
+	git mailsplit -d3 -o. "$DATA/nul-plain" &&
+	test_cmp "$DATA/nul-plain" 001 &&
+	git mailinfo msg patch <001 &&
+	test_line_count = 4 patch
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
 
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+1
 
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+ok 32 - respect NULs
 
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
+expecting success of 5100.33 'Preserve NULs out of MIME encoded message': 
 
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
-
-UnZip and ZipInfo environment options:
-           UNZIP:  [none]
-        UNZIPOPT:  [none]
-         ZIPINFO:  [none]
-      ZIPINFOOPT:  [none]
-prerequisite UNZIP ok
-expecting success of 5003.10 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../d.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 10 -  extract ZIP archive
-
-expecting success of 5003.11 ' validate filenames': 
-		(cd d/a && find .) | sort >d.lst &&
-		test_cmp a.lst d.lst
-	
-ok 11 -  validate filenames
-
-expecting success of 5003.12 ' validate file contents': 
-		diff -r a d/a
-	
-ok 12 -  validate file contents
-
-checking prerequisite: UNZIP_CONVERT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
-	"$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
-
-)
-Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/t5003/infozip-symlinks.zip
- extracting: textfile                [text]  
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_CONVERT ok
-expecting success of 5003.13 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../d.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 13 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.14 ' validate that text files are converted': 
-		test_cmp_bin eol_d/a/text.cr eol_d/a/text.crlf &&
-		test_cmp_bin eol_d/a/text.cr eol_d/a/text.lf
-	
-ok 14 -  validate that text files are converted
-
-expecting success of 5003.15 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_d/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_d/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_d/a/binary.lf
-	
-ok 15 -  validate that binary files are unchanged
-
-expecting success of 5003.16 ' validate that diff files are converted': 
-		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.crlf &&
-		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.lf
-	
-ok 16 -  validate that diff files are converted
-
-expecting success of 5003.17 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_d/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_d/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_d/a/nodiff.lf
-	
-ok 17 -  validate that -diff files are unchanged
-
-expecting success of 5003.18 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_d/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_d/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_d/a/custom.lf
-	
-ok 18 -  validate that custom diff is unchanged 
-
-expecting success of 5003.19 'git archive --format=zip in a bare repo': (cd bare.git && git archive --format=zip HEAD) >d1.zip
-ok 19 - git archive --format=zip in a bare repo
-
-expecting success of 5003.20 'git archive --format=zip vs. the same in a bare repo': test_cmp_bin d.zip d1.zip
-ok 20 - git archive --format=zip vs. the same in a bare repo
-
-expecting success of 5003.21 'git archive --format=zip with --output': git archive --format=zip --output=d2.zip HEAD &&
-    test_cmp_bin d.zip d2.zip
-ok 21 - git archive --format=zip with --output
-
-expecting success of 5003.22 'git archive with --output, inferring format (local)': 
-	git archive --output=d3.zip HEAD &&
-	test_cmp_bin d.zip d3.zip
-
-ok 22 - git archive with --output, inferring format (local)
-
-expecting success of 5003.23 'git archive with --output, inferring format (remote)': 
-	git archive --remote=. --output=d4.zip HEAD &&
-	test_cmp_bin d.zip d4.zip
-
-ok 23 - git archive with --output, inferring format (remote)
-
-expecting success of 5003.24 'git archive --format=zip with prefix': git archive --format=zip --prefix=prefix/ HEAD >e.zip
-ok 24 - git archive --format=zip with prefix
-
-expecting success of 5003.25 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../e.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: prefix/
-   creating: prefix/a/
- extracting: prefix/a/a              
-   creating: prefix/a/bin/
-  inflating: prefix/a/bin/sh         
- extracting: prefix/a/binary.cr      
- extracting: prefix/a/binary.crlf    
- extracting: prefix/a/binary.lf      
- extracting: prefix/a/custom.cr      
- extracting: prefix/a/custom.crlf    
- extracting: prefix/a/custom.lf      
- extracting: prefix/a/diff.cr        
- extracting: prefix/a/diff.crlf      
- extracting: prefix/a/diff.lf        
-   creating: prefix/a/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: prefix/a/nodiff.cr      
- extracting: prefix/a/nodiff.crlf    
- extracting: prefix/a/nodiff.lf      
- extracting: prefix/a/substfile1     
- extracting: prefix/a/substfile2     
-    linking: prefix/a/symlink_to_a   -> a 
- extracting: prefix/a/text.cr        
- extracting: prefix/a/text.crlf      
- extracting: prefix/a/text.lf        
-finishing deferred symbolic links:
-  prefix/a/symlink_to_a  -> a
-ok 25 -  extract ZIP archive
-
-expecting success of 5003.26 ' validate filenames': 
-		(cd e/prefix/a && find .) | sort >e.lst &&
-		test_cmp a.lst e.lst
-	
-ok 26 -  validate filenames
-
-expecting success of 5003.27 ' validate file contents': 
-		diff -r a e/prefix/a
-	
-ok 27 -  validate file contents
-
-expecting success of 5003.28 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../e.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: prefix/
-   creating: prefix/a/
- extracting: prefix/a/a              [text]  
-   creating: prefix/a/bin/
-  inflating: prefix/a/bin/sh         [binary]
- extracting: prefix/a/binary.cr      [binary]
- extracting: prefix/a/binary.crlf    [binary]
- extracting: prefix/a/binary.lf      [binary]
- extracting: prefix/a/custom.cr      [binary]
- extracting: prefix/a/custom.crlf    [binary]
- extracting: prefix/a/custom.lf      [binary]
- extracting: prefix/a/diff.cr        [text]  
- extracting: prefix/a/diff.crlf      [text]  
- extracting: prefix/a/diff.lf        [text]  
-   creating: prefix/a/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: prefix/a/nodiff.cr      [binary]
- extracting: prefix/a/nodiff.crlf    [binary]
- extracting: prefix/a/nodiff.lf      [binary]
- extracting: prefix/a/substfile1     [text]  
- extracting: prefix/a/substfile2     [text]  
-    linking: prefix/a/symlink_to_a   -> a 
- extracting: prefix/a/text.cr        [text]  
- extracting: prefix/a/text.crlf      [text]  
- extracting: prefix/a/text.lf        [text]  
-finishing deferred symbolic links:
-  prefix/a/symlink_to_a  -> a
-ok 28 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.29 ' validate that text files are converted': 
-		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.crlf &&
-		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.lf
-	
-ok 29 -  validate that text files are converted
-
-expecting success of 5003.30 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_e/prefix/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_e/prefix/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_e/prefix/a/binary.lf
-	
-ok 30 -  validate that binary files are unchanged
-
-expecting success of 5003.31 ' validate that diff files are converted': 
-		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.crlf &&
-		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.lf
-	
-ok 31 -  validate that diff files are converted
-
-expecting success of 5003.32 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_e/prefix/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_e/prefix/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_e/prefix/a/nodiff.lf
-	
-ok 32 -  validate that -diff files are unchanged
-
-expecting success of 5003.33 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_e/prefix/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_e/prefix/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_e/prefix/a/custom.lf
-	
-ok 33 -  validate that custom diff is unchanged 
-
-expecting success of 5003.34 'git archive -0 --format=zip on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive -0 --format=zip HEAD >large.zip
-
-ok 34 - git archive -0 --format=zip on large files
-
-expecting success of 5003.35 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
- extracting: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 35 -  extract ZIP archive
-
-expecting success of 5003.36 ' validate filenames': 
-		(cd large/a && find .) | sort >large.lst &&
-		test_cmp a.lst large.lst
-	
-ok 36 -  validate filenames
-
-expecting success of 5003.37 ' validate file contents': 
-		diff -r a large/a
-	
-ok 37 -  validate file contents
-
-expecting success of 5003.38 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
- extracting: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 38 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.39 ' validate that text files are converted': 
-		test_cmp_bin eol_large/a/text.cr eol_large/a/text.crlf &&
-		test_cmp_bin eol_large/a/text.cr eol_large/a/text.lf
-	
-ok 39 -  validate that text files are converted
-
-expecting success of 5003.40 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_large/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_large/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_large/a/binary.lf
-	
-ok 40 -  validate that binary files are unchanged
-
-expecting success of 5003.41 ' validate that diff files are converted': 
-		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.crlf &&
-		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.lf
-	
-ok 41 -  validate that diff files are converted
-
-expecting success of 5003.42 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_large/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_large/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_large/a/nodiff.lf
-	
-ok 42 -  validate that -diff files are unchanged
-
-expecting success of 5003.43 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_large/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_large/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_large/a/custom.lf
-	
-ok 43 -  validate that custom diff is unchanged 
-
-expecting success of 5003.44 'git archive --format=zip on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive --format=zip HEAD >large-compressed.zip
-
-ok 44 - git archive --format=zip on large files
-
-expecting success of 5003.45 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
-  inflating: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
-  inflating: a/binary.cr             
-  inflating: a/binary.crlf           
-  inflating: a/binary.lf             
-  inflating: a/custom.cr             
-  inflating: a/custom.crlf           
-  inflating: a/custom.lf             
-  inflating: a/diff.cr               
-  inflating: a/diff.crlf             
-  inflating: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
-  inflating: a/nodiff.cr             
-  inflating: a/nodiff.crlf           
-  inflating: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
-  inflating: a/text.cr               
-  inflating: a/text.crlf             
-  inflating: a/text.lf               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 45 -  extract ZIP archive
-
-expecting success of 5003.46 ' validate filenames': 
-		(cd large-compressed/a && find .) | sort >large-compressed.lst &&
-		test_cmp a.lst large-compressed.lst
-	
-ok 46 -  validate filenames
-
-expecting success of 5003.47 ' validate file contents': 
-		diff -r a large-compressed/a
-	
-ok 47 -  validate file contents
-
-expecting success of 5003.48 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../large-compressed.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
-  inflating: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
-  inflating: a/binary.cr             [binary]
-  inflating: a/binary.crlf           [binary]
-  inflating: a/binary.lf             [binary]
-  inflating: a/custom.cr             [binary]
-  inflating: a/custom.crlf           [binary]
-  inflating: a/custom.lf             [binary]
-  inflating: a/diff.cr               [text]  
-  inflating: a/diff.crlf             [text]  
-  inflating: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
-  inflating: a/nodiff.cr             [binary]
-  inflating: a/nodiff.crlf           [binary]
-  inflating: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
-  inflating: a/text.cr               [text]  
-  inflating: a/text.crlf             [text]  
-  inflating: a/text.lf               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 48 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.49 ' validate that text files are converted': 
-		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.crlf &&
-		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.lf
-	
-ok 49 -  validate that text files are converted
-
-expecting success of 5003.50 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_large-compressed/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_large-compressed/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_large-compressed/a/binary.lf
-	
-ok 50 -  validate that binary files are unchanged
-
-expecting success of 5003.51 ' validate that diff files are converted': 
-		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.crlf &&
-		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.lf
-	
-ok 51 -  validate that diff files are converted
-
-expecting success of 5003.52 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_large-compressed/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_large-compressed/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_large-compressed/a/nodiff.lf
-	
-ok 52 -  validate that -diff files are unchanged
-
-expecting success of 5003.53 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_large-compressed/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_large-compressed/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_large-compressed/a/custom.lf
-	
-ok 53 -  validate that custom diff is unchanged 
-
-expecting success of 5003.54 'git archive --format=zip --add-file': 
-	echo untracked >untracked &&
-	git archive --format=zip --add-file=untracked HEAD >with_untracked.zip
-
-ok 54 - git archive --format=zip --add-file
-
-expecting success of 5003.55 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
- extracting: untracked               
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 55 -  extract ZIP archive
-
-expecting success of 5003.56 ' validate filenames': 
-		(cd with_untracked/a && find .) | sort >with_untracked.lst &&
-		test_cmp a.lst with_untracked.lst
-	
-ok 56 -  validate filenames
-
-expecting success of 5003.57 ' validate file contents': 
-		diff -r a with_untracked/a
-	
-ok 57 -  validate file contents
-
-expecting success of 5003.58 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
- extracting: untracked               [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 58 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.59 ' validate that text files are converted': 
-		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.crlf &&
-		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.lf
-	
-ok 59 -  validate that text files are converted
-
-expecting success of 5003.60 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_with_untracked/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_with_untracked/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_with_untracked/a/binary.lf
-	
-ok 60 -  validate that binary files are unchanged
-
-expecting success of 5003.61 ' validate that diff files are converted': 
-		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.crlf &&
-		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.lf
-	
-ok 61 -  validate that diff files are converted
-
-expecting success of 5003.62 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_with_untracked/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_with_untracked/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_with_untracked/a/nodiff.lf
-	
-ok 62 -  validate that -diff files are unchanged
-
-expecting success of 5003.63 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_with_untracked/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_with_untracked/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_with_untracked/a/custom.lf
-	
-ok 63 -  validate that custom diff is unchanged 
-
-expecting success of 5003.64 ' validate extra file untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 64 -  validate extra file untracked
-
-expecting success of 5003.65 'git archive --format=zip --add-virtual-file': 
-	if test_have_prereq FUNNYNAMES
-	then
-		PATHNAME="pathname with : colon"
-	else
-		PATHNAME="pathname without colon"
-	fi &&
-	git archive --format=zip >with_file_with_content.zip \
-		--add-virtual-file=\""$PATHNAME"\": \
-		--add-virtual-file=hello:world $EMPTY_TREE &&
-	test_when_finished "rm -rf tmp-unpack" &&
-	mkdir tmp-unpack && (
-		cd tmp-unpack &&
-		"$GIT_UNZIP" ../with_file_with_content.zip &&
-		test_path_is_file hello &&
-		test_path_is_file "$PATHNAME" &&
-		test world = $(cat hello)
-	)
-
-checking prerequisite: FUNNYNAMES
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
-	test_have_prereq !MINGW &&
-	touch -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null &&
-	rm -- \
-		"FUNNYNAMES tab	embedded" \
-		"FUNNYNAMES \"quote embedded\"" \
-		"FUNNYNAMES newline
-embedded" 2>/dev/null
-
-)
-prerequisite FUNNYNAMES ok
-Archive:  ../with_file_with_content.zip
- extracting: pathname with : colon   
- extracting: hello                   
-ok 65 - git archive --format=zip --add-virtual-file
-
-expecting success of 5003.66 'git archive --format=zip --add-file twice': 
-	echo untracked >untracked &&
-	git archive --format=zip --prefix=one/ --add-file=untracked \
-		--prefix=two/ --add-file=untracked \
-		--prefix= HEAD >with_untracked2.zip
-
-ok 66 - git archive --format=zip --add-file twice
-
-expecting success of 5003.67 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     
-   creating: a/bin/
-  inflating: a/bin/sh                
- extracting: a/binary.cr             
- extracting: a/binary.crlf           
- extracting: a/binary.lf             
- extracting: a/custom.cr             
- extracting: a/custom.crlf           
- extracting: a/custom.lf             
- extracting: a/diff.cr               
- extracting: a/diff.crlf             
- extracting: a/diff.lf               
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
- extracting: a/nodiff.cr             
- extracting: a/nodiff.crlf           
- extracting: a/nodiff.lf             
- extracting: a/substfile1            
- extracting: a/substfile2            
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               
- extracting: a/text.crlf             
- extracting: a/text.lf               
- extracting: one/untracked           
- extracting: two/untracked           
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 67 -  extract ZIP archive
-
-expecting success of 5003.68 ' validate filenames': 
-		(cd with_untracked2/a && find .) | sort >with_untracked2.lst &&
-		test_cmp a.lst with_untracked2.lst
-	
-ok 68 -  validate filenames
-
-expecting success of 5003.69 ' validate file contents': 
-		diff -r a with_untracked2/a
-	
-ok 69 -  validate file contents
-
-expecting success of 5003.70 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-9cc2aa83213431d0834dff16b27ec8ad7c4bdbf5
-   creating: a/
- extracting: a/a                     [text]  
-   creating: a/bin/
-  inflating: a/bin/sh                [binary]
- extracting: a/binary.cr             [binary]
- extracting: a/binary.crlf           [binary]
- extracting: a/binary.lf             [binary]
- extracting: a/custom.cr             [binary]
- extracting: a/custom.crlf           [binary]
- extracting: a/custom.lf             [binary]
- extracting: a/diff.cr               [text]  
- extracting: a/diff.crlf             [text]  
- extracting: a/diff.lf               [text]  
-   creating: a/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
-   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
- extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
- extracting: a/nodiff.cr             [binary]
- extracting: a/nodiff.crlf           [binary]
- extracting: a/nodiff.lf             [binary]
- extracting: a/substfile1            [text]  
- extracting: a/substfile2            [text]  
-    linking: a/symlink_to_a          -> a 
- extracting: a/text.cr               [text]  
- extracting: a/text.crlf             [text]  
- extracting: a/text.lf               [text]  
- extracting: one/untracked           [text]  
- extracting: two/untracked           [text]  
-finishing deferred symbolic links:
-  a/symlink_to_a         -> a
-ok 70 -  extract ZIP archive with EOL conversion
-
-expecting success of 5003.71 ' validate that text files are converted': 
-		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.crlf &&
-		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.lf
-	
-ok 71 -  validate that text files are converted
-
-expecting success of 5003.72 ' validate that binary files are unchanged': 
-		test_cmp_bin a/binary.cr   eol_with_untracked2/a/binary.cr &&
-		test_cmp_bin a/binary.crlf eol_with_untracked2/a/binary.crlf &&
-		test_cmp_bin a/binary.lf   eol_with_untracked2/a/binary.lf
-	
-ok 72 -  validate that binary files are unchanged
-
-expecting success of 5003.73 ' validate that diff files are converted': 
-		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.crlf &&
-		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.lf
-	
-ok 73 -  validate that diff files are converted
-
-expecting success of 5003.74 ' validate that -diff files are unchanged': 
-		test_cmp_bin a/nodiff.cr   eol_with_untracked2/a/nodiff.cr &&
-		test_cmp_bin a/nodiff.crlf eol_with_untracked2/a/nodiff.crlf &&
-		test_cmp_bin a/nodiff.lf   eol_with_untracked2/a/nodiff.lf
-	
-ok 74 -  validate that -diff files are unchanged
-
-expecting success of 5003.75 ' validate that custom diff is unchanged ': 
-		test_cmp_bin a/custom.cr   eol_with_untracked2/a/custom.cr &&
-		test_cmp_bin a/custom.crlf eol_with_untracked2/a/custom.crlf &&
-		test_cmp_bin a/custom.lf   eol_with_untracked2/a/custom.lf
-	
-ok 75 -  validate that custom diff is unchanged 
-
-expecting success of 5003.76 ' validate extra file one/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 76 -  validate extra file one/untracked
-
-expecting success of 5003.77 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 77 -  validate extra file two/untracked
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 77 test(s)
-# SKIP no web server found at ''
-1..77
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5000-tar-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5000-tar-tree/.git/
-expecting success of 5000.1 'setup': 
-	test_oid_cache <<-EOF
-	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
-	obj sha256:3c666f798798601571f5cec0adb57ce4aba8546875e7693177e0535f34d2c49b
-	EOF
-
-ok 1 - setup
-
-expecting success of 5000.2 '--list notices extra parameters': 
-	test_must_fail git archive --list blah &&
-	test_must_fail git archive --remote=. --list blah
-
-fatal: extra command line parameter 'blah'
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: extra command line parameter 'blah'        
-remote: git upload-archive: archiver died with error
-ok 2 - --list notices extra parameters
-
-expecting success of 5000.3 'end-of-options is correctly eaten': 
-	git archive --list --end-of-options &&
-	git archive --remote=. --list --end-of-options
-
-tar
-tgz
-tar.gz
-zip
-tar
-tgz
-tar.gz
-zip
-ok 3 - end-of-options is correctly eaten
-
-expecting success of 5000.4 'populate workdir': 
-	mkdir a &&
-	echo "a files_named_a" >.gitattributes &&
-	git add .gitattributes &&
-	echo simple textfile >a/a &&
-	ten=0123456789 &&
-	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
-	echo long filename >"a/four$hundred" &&
-	mkdir a/bin &&
-	test-tool genrandom "frotz" 500000 >a/bin/sh &&
-	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-	printf "A not substituted O" >a/substfile2 &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s a a/l1
-	else
-		printf %s a >a/l1
-	fi &&
-	(
-		p=long_path_to_a_file &&
-		cd a &&
-		for depth in 1 2 3 4 5
-		do
-			mkdir $p &&
-			cd $p || exit 1
-		done &&
-		echo text >file_with_long_path
-	) &&
-	(cd a && find .) | sort >a.lst
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-ok 4 - populate workdir
-
-expecting success of 5000.5 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 5 - add ignored file
-
-expecting success of 5000.6 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
-
-[master (root-commit) cc086e8] initial
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 a/a
- create mode 100644 a/bin/sh
- create mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- create mode 100644 a/ignored
- create mode 120000 a/l1
- create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- create mode 100644 a/substfile1
- create mode 100644 a/substfile2
-ok 6 - add files to repository
-
-expecting success of 5000.7 'setup export-subst': 
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
-
-ok 7 - setup export-subst
-
-expecting success of 5000.8 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - create bare clone
-
-expecting success of 5000.9 'remove ignored file': 
-	rm a/ignored
-
-ok 9 - remove ignored file
-
-expecting success of 5000.10 'git archive': 
-	git archive HEAD >b.tar
-
-ok 10 - git archive
-
-expecting success of 5000.11 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 11 -  extract tar archive
-
-checking prerequisite: TAR_NEEDS_PAX_FALLBACK
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_NEEDS_PAX_FALLBACK" &&
-	(
-		mkdir pax &&
-		cd pax &&
-		"$TAR" xf "$TEST_DIRECTORY"/t5000/pax.tar &&
-		test -f PaxHeaders.1791/file
-	)
-
-)
-prerequisite TAR_NEEDS_PAX_FALLBACK not satisfied
-ok 12 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.13 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 13 -  validate filenames
-
-expecting success of 5000.14 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 14 -  validate file contents
-
-expecting success of 5000.15 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 15 -  validate mtime of a/a
-
-expecting success of 5000.16 'git archive --mtime': 
-	git archive --mtime=2002-02-02T02:02:02-0200 HEAD >with_mtime.tar
-
-ok 16 - git archive --mtime
-
-expecting success of 5000.17 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 17 -  extract tar archive
-
-ok 18 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.19 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 19 -  validate filenames
-
-expecting success of 5000.20 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 20 -  validate file contents
-
-expecting success of 5000.21 ' validate mtime of a/a': 
-		test-tool chmtime --get $dir/$path_in_archive >actual.mtime &&
-		echo $mtime >expect.mtime &&
-		test_cmp expect.mtime actual.mtime
-	
-ok 21 -  validate mtime of a/a
-
-expecting success of 5000.22 'git archive --prefix=prefix/': 
-	git archive --prefix=prefix/ HEAD >with_prefix.tar
-
-ok 22 - git archive --prefix=prefix/
-
-expecting success of 5000.23 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 23 -  extract tar archive
-
-ok 24 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.25 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 25 -  validate filenames
-
-expecting success of 5000.26 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 26 -  validate file contents
-
-expecting success of 5000.27 'git-archive --prefix=olde-': 
-	git archive --prefix=olde- HEAD >with_olde-prefix.tar
-
-ok 27 - git-archive --prefix=olde-
-
-expecting success of 5000.28 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 28 -  extract tar archive
-
-ok 29 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.30 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 30 -  validate filenames
-
-expecting success of 5000.31 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 31 -  validate file contents
-
-expecting success of 5000.32 'git archive --add-file': 
-	echo untracked >untracked &&
-	git archive --add-file=untracked HEAD >with_untracked.tar
-
-ok 32 - git archive --add-file
-
-expecting success of 5000.33 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 33 -  extract tar archive
-
-ok 34 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.35 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 35 -  validate filenames
-
-expecting success of 5000.36 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 36 -  validate file contents
-
-expecting success of 5000.37 ' validate extra file untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 37 -  validate extra file untracked
-
-expecting success of 5000.38 'git archive --add-file twice': 
-	echo untracked >untracked &&
-	git archive --prefix=one/ --add-file=untracked \
-		--prefix=two/ --add-file=untracked \
-		--prefix= HEAD >with_untracked2.tar
-
-ok 38 - git archive --add-file twice
-
-expecting success of 5000.39 ' extract tar archive': 
-		(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
-	
-ok 39 -  extract tar archive
-
-ok 40 # skip  interpret pax headers (missing TAR_NEEDS_PAX_FALLBACK)
-
-expecting success of 5000.41 ' validate filenames': 
-		(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
-		test_cmp a.lst $listfile
-	
-ok 41 -  validate filenames
-
-expecting success of 5000.42 ' validate file contents': 
-		diff -r a ${dir_with_prefix}a
-	
-ok 42 -  validate file contents
-
-expecting success of 5000.43 ' validate extra file one/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 43 -  validate extra file one/untracked
-
-expecting success of 5000.44 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 44 -  validate extra file two/untracked
-
-expecting success of 5000.45 'git archive on large files': 
-	test_config core.bigfilethreshold 1 &&
-	git archive HEAD >b3.tar &&
-	test_cmp_bin b.tar b3.tar
-
-ok 45 - git archive on large files
-
-expecting success of 5000.46 'git archive in a bare repo': 
-	git --git-dir bare.git archive HEAD >b3.tar
-
-ok 46 - git archive in a bare repo
-
-expecting success of 5000.47 'git archive vs. the same in a bare repo': 
-	test_cmp_bin b.tar b3.tar
-
-ok 47 - git archive vs. the same in a bare repo
-
-expecting success of 5000.48 'git archive with --output': 
-	git archive --output=b4.tar HEAD &&
-	test_cmp_bin b.tar b4.tar
-
-ok 48 - git archive with --output
-
-expecting success of 5000.49 'git archive --remote': 
-	git archive --remote=. HEAD >b5.tar &&
-	test_cmp_bin b.tar b5.tar
-
-ok 49 - git archive --remote
-
-expecting success of 5000.50 'git archive --remote with configured remote': 
-	git config remote.foo.url . &&
-	(
-		cd a &&
-		git archive --remote=foo --output=../b5-nick.tar HEAD
-	) &&
-	test_cmp_bin b.tar b5-nick.tar
-
-ok 50 - git archive --remote with configured remote
-
-expecting success of 5000.51 'git get-tar-commit-id': 
-	git get-tar-commit-id <b.tar >actual &&
-	git rev-parse HEAD >expect &&
-	test_cmp expect actual
-
-ok 51 - git get-tar-commit-id
-
-expecting success of 5000.52 'git archive with --output, override inferred format': 
-	git archive --format=tar --output=d4.zip HEAD &&
-	test_cmp_bin b.tar d4.zip
-
-ok 52 - git archive with --output, override inferred format
-
-checking prerequisite: GZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
-)
-gzip 1.13
-Copyright (C) 2023 Free Software Foundation, Inc.
-Copyright (C) 1993 Jean-loup Gailly.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <https://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Jean-loup Gailly.
-prerequisite GZIP ok
-expecting success of 5000.53 'git archive with --output and --remote creates .tgz': 
-	git archive --output=d5.tgz --remote=. HEAD &&
-	gzip -d -c <d5.tgz >d5.tar &&
-	test_cmp_bin b.tar d5.tar
-
-ok 53 - git archive with --output and --remote creates .tgz
-
-expecting success of 5000.54 'git archive --list outside of a git repo': 
-	nongit git archive --list
-
-tar
-tgz
-tar.gz
-zip
-ok 54 - git archive --list outside of a git repo
-
-expecting success of 5000.55 'git archive --remote outside of a git repo': 
-	git archive HEAD >expect.tar &&
-	nongit git archive --remote="$PWD" HEAD >actual.tar &&
-	test_cmp_bin expect.tar actual.tar
-
-ok 55 - git archive --remote outside of a git repo
-
-expecting success of 5000.56 'clients cannot access unreachable commits': 
-	test_commit unreachable &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_must_fail git archive --remote=. $sha1 >remote.tar
-
-[master 7227b65] unreachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unreachable.t
-HEAD is now at cc086e8 initial
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: no such ref: 7227b65e2133d76ecf028be4e1142e6868caf227        
-remote: git upload-archive: archiver died with error
-ok 56 - clients cannot access unreachable commits
-
-expecting success of 5000.57 'upload-archive can allow unreachable commits': 
-	test_commit unreachable1 &&
-	sha1=$(git rev-parse HEAD) &&
-	git reset --hard HEAD^ &&
-	git archive $sha1 >remote.tar &&
-	test_config uploadarchive.allowUnreachable true &&
-	git archive --remote=. $sha1 >remote.tar
-
-[master a9e9f2b] unreachable1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unreachable1.t
-HEAD is now at cc086e8 initial
-ok 57 - upload-archive can allow unreachable commits
-
-expecting success of 5000.58 'setup tar filters': 
-	git config tar.tar.foo.command "tr ab ba" &&
-	git config tar.bar.command "tr ab ba" &&
-	git config tar.bar.remote true &&
-	git config tar.invalid baz
-
-ok 58 - setup tar filters
-
-expecting success of 5000.59 'archive --list mentions user filter': 
-	git archive --list >output &&
-	grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-tar.foo
-bar
-ok 59 - archive --list mentions user filter
-
-expecting success of 5000.60 'archive --list shows only enabled remote filters': 
-	git archive --list --remote=. >output &&
-	! grep "^tar\.foo\$" output &&
-	grep "^bar\$" output
-
-bar
-ok 60 - archive --list shows only enabled remote filters
-
-expecting success of 5000.61 'invoke tar filter by format': 
-	git archive --format=tar.foo HEAD >config.tar.foo &&
-	tr ab ba <config.tar.foo >config.tar &&
-	test_cmp_bin b.tar config.tar &&
-	git archive --format=bar HEAD >config.bar &&
-	tr ab ba <config.bar >config.tar &&
-	test_cmp_bin b.tar config.tar
-
-ok 61 - invoke tar filter by format
-
-expecting success of 5000.62 'invoke tar filter by extension': 
-	git archive -o config-implicit.tar.foo HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.tar.foo &&
-	git archive -o config-implicit.bar HEAD &&
-	test_cmp_bin config.tar.foo config-implicit.bar
-
-ok 62 - invoke tar filter by extension
-
-expecting success of 5000.63 'default output format remains tar': 
-	git archive -o config-implicit.baz HEAD &&
-	test_cmp_bin b.tar config-implicit.baz
-
-ok 63 - default output format remains tar
-
-expecting success of 5000.64 'extension matching requires dot': 
-	git archive -o config-implicittar.foo HEAD &&
-	test_cmp_bin b.tar config-implicittar.foo
-
-ok 64 - extension matching requires dot
-
-expecting success of 5000.65 'only enabled filters are available remotely': 
-	test_must_fail git archive --remote=. --format=tar.foo HEAD \
-		>remote.tar.foo &&
-	git archive --remote=. --format=bar >remote.bar HEAD &&
-	test_cmp_bin remote.bar config.bar
-
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: Unknown archive format 'tar.foo'        
-remote: git upload-archive: archiver died with error
-ok 65 - only enabled filters are available remotely
-
-expecting success of 5000.66 'invalid filter is reported only once': 
-	test_must_fail git -c tar.invalid.command= archive --format=invalid \
-		HEAD >out 2>err &&
-	test_must_be_empty out &&
-	test_line_count = 1 err
-
-ok 66 - invalid filter is reported only once
-
-expecting success of 5000.67 'git archive --format=tgz': 
-	git archive --format=tgz HEAD >j.tgz
-
-ok 67 - git archive --format=tgz
-
-expecting success of 5000.68 'git archive --format=tar.gz': 
-	git archive --format=tar.gz HEAD >j1.tar.gz &&
-	test_cmp_bin j.tgz j1.tar.gz
-
-ok 68 - git archive --format=tar.gz
-
-expecting success of 5000.69 'infer tgz from .tgz filename': 
-	git archive --output=j2.tgz HEAD &&
-	test_cmp_bin j.tgz j2.tgz
-
-ok 69 - infer tgz from .tgz filename
-
-expecting success of 5000.70 'infer tgz from .tar.gz filename': 
-	git archive --output=j3.tar.gz HEAD &&
-	test_cmp_bin j.tgz j3.tar.gz
-
-ok 70 - infer tgz from .tar.gz filename
-
-expecting success of 5000.71 'extract tgz file': 
-	gzip -d -c <j.tgz >j.tar &&
-	test_cmp_bin b.tar j.tar
-
-ok 71 - extract tgz file
-
-expecting success of 5000.72 'remote tar.gz is allowed by default': 
-	git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
-	test_cmp_bin j.tgz remote.tar.gz
-
-ok 72 - remote tar.gz is allowed by default
-
-expecting success of 5000.73 'remote tar.gz can be disabled': 
-	git config tar.tar.gz.remote false &&
-	test_must_fail git archive --remote=. --format=tar.gz HEAD \
-		>remote.tar.gz
-
-fatal: sent error to the client: git upload-archive: archiver died with error
-remote: fatal: Unknown archive format 'tar.gz'        
-remote: git upload-archive: archiver died with error
-ok 73 - remote tar.gz can be disabled
-
-expecting success of 5000.74 'git archive --format=tgz (external gzip)': 
-	test_config tar.tgz.command "gzip -cn" &&
-	git archive --format=tgz HEAD >external_gzip.tgz
-
-ok 74 - git archive --format=tgz (external gzip)
-
-expecting success of 5000.75 'git archive --format=tar.gz (external gzip)': 
-	test_config tar.tar.gz.command "gzip -cn" &&
-	git archive --format=tar.gz HEAD >external_gzip.tar.gz &&
-	test_cmp_bin external_gzip.tgz external_gzip.tar.gz
-
-ok 75 - git archive --format=tar.gz (external gzip)
-
-expecting success of 5000.76 'extract tgz file (external gzip)': 
-	gzip -d -c <external_gzip.tgz >external_gzip.tar &&
-	test_cmp_bin b.tar external_gzip.tar
-
-ok 76 - extract tgz file (external gzip)
-
-expecting success of 5000.77 'archive and :(glob)': 
-	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	a/
-	a/bin/
-	a/bin/sh
-	EOF
-	test_cmp expect actual
-
-ok 77 - archive and :(glob)
-
-expecting success of 5000.78 'catch non-matching pathspec': 
-	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
-
-fatal: pathspec '*.abc' did not match any files
-ok 78 - catch non-matching pathspec
-
-expecting success of 5000.79 'reject paths outside the current directory': 
-	test_must_fail git -C a/bin archive HEAD .. >/dev/null 2>err &&
-	grep "outside the current directory" err
-
-fatal: pathspec '..' matches files outside the current directory
-ok 79 - reject paths outside the current directory
-
-expecting success of 5000.80 'allow pathspecs that resolve to the current directory': 
-	git -C a/bin archive -v HEAD ../bin >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	sh
-	EOF
-	test_cmp expect actual
-
-ok 80 - allow pathspecs that resolve to the current directory
-
-expecting success of 5000.81 'attr pathspec in bare repo': 
-	test_expect_code 0 git --git-dir=bare.git archive -v HEAD \
-		":(attr:files_named_a)" >/dev/null 2>actual &&
-	cat >expect <<-\EOF &&
-	a/
-	a/a
-	EOF
-	test_cmp expect actual
-
-ok 81 - attr pathspec in bare repo
-
-checking prerequisite: LONG_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
-	test 8 -le "$(build_option sizeof-long)"
-
-)
-prerequisite LONG_IS_64BIT ok
-expecting success of 5000.82 'set up repository with huge blob': 
-	obj=$(test_oid obj) &&
-	path=$(test_oid_to_path $obj) &&
-	mkdir -p .git/objects/$(dirname $path) &&
-	cp "$TEST_DIRECTORY"/t5000/huge-object .git/objects/$path &&
-	rm -f .git/index &&
-	git update-index --add --cacheinfo 100644,$obj,huge &&
-	git commit -m huge
-
-[master 82a0aa8] huge
- Author: A U Thor <author@example.com>
- 10 files changed, 8 deletions(-)
- delete mode 100644 .gitattributes
- delete mode 100644 a/a
- delete mode 100644 a/bin/sh
- delete mode 100644 a/four0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
- delete mode 100644 a/ignored
- delete mode 120000 a/l1
- delete mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
- delete mode 100644 a/substfile1
- delete mode 100644 a/substfile2
- create mode 100644 huge
-ok 82 - set up repository with huge blob
-
-expecting success of 5000.83 'generate tar with huge size': 
-	{
-		git archive HEAD
-		echo $? >exit-code
-	} | test_copy_bytes 4096 >huge.tar &&
-	echo 141 >expect &&
-	test_cmp expect exit-code
-
-ok 83 - generate tar with huge size
-
-checking prerequisite: TAR_HUGE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TAR_HUGE" &&
-	echo "68719476737 4147" >expect &&
-	tar_info "$TEST_DIRECTORY"/t5000/huge-and-future.tar >actual &&
-	test_cmp expect actual
-
-)
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-prerequisite TAR_HUGE ok
-expecting success of 5000.84 'system tar can read our huge size': 
-	echo 68719476737 >expect &&
-	tar_info huge.tar | cut -d" " -f1 >actual &&
-	test_cmp expect actual
-
-tar: rmtlseek not stopped at a record boundary
-tar: Error is not recoverable: exiting now
-ok 84 - system tar can read our huge size
-
-checking prerequisite: TIME_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-expecting success of 5000.85 'set up repository with far-future (2^34 - 1) commit': 
-	rm -f .git/index &&
-	echo foo >file &&
-	git add file &&
-	GIT_COMMITTER_DATE="@17179869183 +0000" \
-		git commit -m "tempori parendum"
-
-[master 8127a15] tempori parendum
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- delete mode 100644 huge
-ok 85 - set up repository with far-future (2^34 - 1) commit
-
-expecting success of 5000.86 'generate tar with far-future mtime': 
-	git archive HEAD >future.tar
-
-ok 86 - generate tar with far-future mtime
-
-checking prerequisite: TIME_T_IS_64BIT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
-expecting success of 5000.87 'system tar can read our future mtime': 
-	echo 2514 >expect &&
-	tar_info future.tar | cut -d" " -f2 >actual &&
-	test_cmp expect actual
-
-ok 87 - system tar can read our future mtime
-
-expecting success of 5000.88 'set up repository with far-far-future (2^36 + 1) commit': 
-	rm -f .git/index &&
-	echo content >file &&
-	git add file &&
-	GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
-		git commit -m "tempori parendum"
-
-[master c6bd888] tempori parendum
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 88 - set up repository with far-far-future (2^36 + 1) commit
-
-expecting success of 5000.89 'generate tar with far-far-future mtime': 
-	git archive HEAD >future.tar
-
-ok 89 - generate tar with far-far-future mtime
-
-expecting success of 5000.90 'system tar can read our future mtime': 
-	echo 4147 >expect &&
-	tar_info future.tar | cut -d" " -f2 >actual &&
-	test_cmp expect actual
-
-ok 90 - system tar can read our future mtime
-
-# passed all 90 test(s)
-1..90
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5301-sliding-window.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5301-sliding-window/.git/
-expecting success of 5301.1 'setup': 
-	rm -f .git/index* &&
-	for i in a b c
-	do
-	echo $i >$i &&
-	test-tool genrandom "$i" 32768 >>$i &&
-	git update-index --add $i || return 1
-	done &&
-	echo d >d && cat c >>d && git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit1=$(git commit-tree $tree </dev/null) &&
-	git update-ref HEAD $commit1 &&
-	git repack -a -d &&
-	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
-	pack1=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack1"
-
-ok 1 - setup
-
-expecting success of 5301.2 'verify-pack -v, defaults': 
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 2 - verify-pack -v, defaults
-
-expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 3 - verify-pack -v, packedGitWindowSize == 1 page
-
-expecting success of 5301.4 'verify-pack -v, packedGit{WindowSize,Limit} == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git config core.packedGitLimit 512 &&
-	git verify-pack -v "$pack1"
-
-3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
-non delta: 5 objects
-chain length = 1: 1 object
-.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
-ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
-
-expecting success of 5301.5 'repack -a -d, packedGit{WindowSize,Limit} == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git config core.packedGitLimit 512 &&
-	commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
-	git update-ref HEAD $commit2 &&
-	git repack -a -d &&
-	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
-	pack2=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack2" &&
-	test "$pack1" \!= "$pack2"
-
-ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
-
-expecting success of 5301.6 'verify-pack -v, defaults': 
-	git config --unset core.packedGitWindowSize &&
-	git config --unset core.packedGitLimit &&
-	git verify-pack -v "$pack2"
-
-18387a63ae69bf35f4c71d97190d0ac78c135dbc commit 211 153 12
-3b60f63a6ae089462c1536850930bc628b471412 commit 9 20 165 1 18387a63ae69bf35f4c71d97190d0ac78c135dbc
-d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 185
-7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32974
-f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65763
-556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98554 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
-b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98576
-non delta: 5 objects
-chain length = 1: 2 objects
-.git/objects/pack/pack-2f02d879c6fc547b007694422ca84c5228e10f68.pack: ok
-ok 6 - verify-pack -v, defaults
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5100-mailinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5100-mailinfo/.git/
-expecting success of 5100.1 'split sample box': git mailsplit -o. "$DATA/sample.mbox" >last &&
-	last=$(cat last) &&
-	echo total is $last &&
-	test $(cat last) = 18
-total is 18
-ok 1 - split sample box
-
-expecting success of 5100.2 'mailinfo 0001': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 2 - mailinfo 0001
-
-expecting success of 5100.3 'mailinfo 0002': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 3 - mailinfo 0002
-
-expecting success of 5100.4 'mailinfo 0003': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 4 - mailinfo 0003
-
-expecting success of 5100.5 'mailinfo 0004': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 5 - mailinfo 0004
-
-expecting success of 5100.6 'mailinfo 0005': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 6 - mailinfo 0005
-
-expecting success of 5100.7 'mailinfo 0006': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 7 - mailinfo 0006
-
-expecting success of 5100.8 'mailinfo 0007': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 8 - mailinfo 0007
-
-expecting success of 5100.9 'mailinfo 0008': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 9 - mailinfo 0008
-
-expecting success of 5100.10 'mailinfo 0009': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 10 - mailinfo 0009
-
-expecting success of 5100.11 'mailinfo 0010': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 11 - mailinfo 0010
-
-expecting success of 5100.12 'mailinfo 0011': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 12 - mailinfo 0011
-
-expecting success of 5100.13 'mailinfo 0012': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 13 - mailinfo 0012
-
-expecting success of 5100.14 'mailinfo 0013': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 14 - mailinfo 0013
-
-expecting success of 5100.15 'mailinfo 0014': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 15 - mailinfo 0014
-
-expecting success of 5100.16 'mailinfo 0015': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 16 - mailinfo 0015
-
-expecting success of 5100.17 'mailinfo 0016': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 17 - mailinfo 0016
-
-expecting success of 5100.18 'mailinfo 0017': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 18 - mailinfo 0017
-
-expecting success of 5100.19 'mailinfo 0018': 
-		check_mailinfo "$mail" "" &&
-		if test -f "$DATA/msg$mail--scissors"
-		then
-			check_mailinfo "$mail" --scissors
-		fi &&
-		if test -f "$DATA/msg$mail--no-inbody-headers"
-		then
-			check_mailinfo "$mail" --no-inbody-headers
-		fi &&
-		if test -f "$DATA/msg$mail--message-id"
-		then
-			check_mailinfo "$mail" --message-id
-		fi
-	
-ok 19 - mailinfo 0018
-
-expecting success of 5100.20 'split box with rfc2047 samples': mkdir rfc2047 &&
-	git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
-	  >rfc2047/last &&
-	last=$(cat rfc2047/last) &&
-	echo total is $last &&
-	test $(cat rfc2047/last) = 11
-total is 11
-ok 20 - split box with rfc2047 samples
-
-expecting success of 5100.21 'mailinfo rfc2047/0001': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 21 - mailinfo rfc2047/0001
-
-expecting success of 5100.22 'mailinfo rfc2047/0002': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 22 - mailinfo rfc2047/0002
-
-expecting success of 5100.23 'mailinfo rfc2047/0003': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 23 - mailinfo rfc2047/0003
-
-expecting success of 5100.24 'mailinfo rfc2047/0004': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 24 - mailinfo rfc2047/0004
-
-expecting success of 5100.25 'mailinfo rfc2047/0005': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 25 - mailinfo rfc2047/0005
-
-expecting success of 5100.26 'mailinfo rfc2047/0006': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 26 - mailinfo rfc2047/0006
-
-expecting success of 5100.27 'mailinfo rfc2047/0007': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 27 - mailinfo rfc2047/0007
-
-expecting success of 5100.28 'mailinfo rfc2047/0008': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 28 - mailinfo rfc2047/0008
-
-expecting success of 5100.29 'mailinfo rfc2047/0009': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 29 - mailinfo rfc2047/0009
-
-expecting success of 5100.30 'mailinfo rfc2047/0010': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 30 - mailinfo rfc2047/0010
-
-expecting success of 5100.31 'mailinfo rfc2047/0011': 
-		git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
-		echo msg &&
-		test_cmp "$DATA/empty" "$mail-msg" &&
-		echo patch &&
-		test_cmp "$DATA/empty" "$mail-patch" &&
-		echo info &&
-		test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
-	
-msg
-patch
-info
-ok 31 - mailinfo rfc2047/0011
-
-expecting success of 5100.32 'respect NULs': 
-
-	git mailsplit -d3 -o. "$DATA/nul-plain" &&
-	test_cmp "$DATA/nul-plain" 001 &&
-	git mailinfo msg patch <001 &&
-	test_line_count = 4 patch
-
-
-1
-
-ok 32 - respect NULs
-
-expecting success of 5100.33 'Preserve NULs out of MIME encoded message': 
-
-	git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
-	test_cmp "$DATA/nul-b64.in" 00001 &&
-	git mailinfo msg patch <00001 &&
-	test_cmp "$DATA/nul-b64.expect" patch
+	git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
+	test_cmp "$DATA/nul-b64.in" 00001 &&
+	git mailinfo msg patch <00001 &&
+	test_cmp "$DATA/nul-b64.expect" patch
 
 
 1
@@ -295655,6 +294486,106 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5301-sliding-window.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5301-sliding-window/.git/
+expecting success of 5301.1 'setup': 
+	rm -f .git/index* &&
+	for i in a b c
+	do
+	echo $i >$i &&
+	test-tool genrandom "$i" 32768 >>$i &&
+	git update-index --add $i || return 1
+	done &&
+	echo d >d && cat c >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit1=$(git commit-tree $tree </dev/null) &&
+	git update-ref HEAD $commit1 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack1=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack1"
+
+ok 1 - setup
+
+expecting success of 5301.2 'verify-pack -v, defaults': 
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 2 - verify-pack -v, defaults
+
+expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 3 - verify-pack -v, packedGitWindowSize == 1 page
+
+expecting success of 5301.4 'verify-pack -v, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.5 'repack -a -d, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
+	git update-ref HEAD $commit2 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack2=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack2" &&
+	test "$pack1" \!= "$pack2"
+
+ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.6 'verify-pack -v, defaults': 
+	git config --unset core.packedGitWindowSize &&
+	git config --unset core.packedGitLimit &&
+	git verify-pack -v "$pack2"
+
+18387a63ae69bf35f4c71d97190d0ac78c135dbc commit 211 153 12
+3b60f63a6ae089462c1536850930bc628b471412 commit 9 20 165 1 18387a63ae69bf35f4c71d97190d0ac78c135dbc
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 185
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32974
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65763
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98554 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98576
+non delta: 5 objects
+chain length = 1: 2 objects
+.git/objects/pack/pack-2f02d879c6fc547b007694422ca84c5228e10f68.pack: ok
+ok 6 - verify-pack -v, defaults
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5004-archive-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5004-archive-corner-cases/.git/
 expecting success of 5004.1 'create commit with empty tree and fake empty tar': 
@@ -297501,6 +296432,1029 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5003-archive-zip/.git/
+expecting success of 5003.1 'populate workdir': mkdir a &&
+     echo simple textfile >a/a &&
+     mkdir a/bin &&
+     cp /bin/sh a/bin &&
+     printf "text\r"	>a/text.cr &&
+     printf "text\r\n"	>a/text.crlf &&
+     printf "text\n"	>a/text.lf &&
+     printf "text\r"	>a/nodiff.cr &&
+     printf "text\r\n"	>a/nodiff.crlf &&
+     printf "text\n"	>a/nodiff.lf &&
+     printf "text\r"	>a/custom.cr &&
+     printf "text\r\n"	>a/custom.crlf &&
+     printf "text\n"	>a/custom.lf &&
+     printf "\0\r"	>a/binary.cr &&
+     printf "\0\r\n"	>a/binary.crlf &&
+     printf "\0\n"	>a/binary.lf &&
+     printf "\0\r"	>a/diff.cr &&
+     printf "\0\r\n"	>a/diff.crlf &&
+     printf "\0\n"	>a/diff.lf &&
+     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+     printf "A not substituted O" >a/substfile2 &&
+     (p=long_path_to_a_file && cd a &&
+      for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
+      echo text >file_with_long_path)
+
+ok 1 - populate workdir
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+checking prerequisite: UNZIP_SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
+	"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
+	test -h symlink
+
+)
+Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/t5003/infozip-symlinks.zip
+ extracting: textfile                
+    linking: symlink                 -> textfile 
+finishing deferred symbolic links:
+  symlink                -> textfile
+prerequisite UNZIP_SYMLINKS ok
+expecting success of 5003.2 'add symlink': 
+	ln -s a a/symlink_to_a
+
+ok 2 - add symlink
+
+expecting success of 5003.3 'prepare file list': 
+	(cd a && find .) | sort >a.lst
+
+ok 3 - prepare file list
+
+expecting success of 5003.4 'add ignored file': echo ignore me >a/ignored &&
+     mkdir .git/info &&
+     echo ignored export-ignore >.git/info/attributes
+ok 4 - add ignored file
+
+expecting success of 5003.5 'add files to repository': 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+
+[master (root-commit) b00365d] initial
+ Author: A U Thor <author@example.com>
+ 22 files changed, 15 insertions(+)
+ create mode 100644 a/a
+ create mode 100755 a/bin/sh
+ create mode 100644 a/binary.cr
+ create mode 100644 a/binary.crlf
+ create mode 100644 a/binary.lf
+ create mode 100644 a/custom.cr
+ create mode 100644 a/custom.crlf
+ create mode 100644 a/custom.lf
+ create mode 100644 a/diff.cr
+ create mode 100644 a/diff.crlf
+ create mode 100644 a/diff.lf
+ create mode 100644 a/ignored
+ create mode 100644 a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path
+ create mode 100644 a/nodiff.cr
+ create mode 100644 a/nodiff.crlf
+ create mode 100644 a/nodiff.lf
+ create mode 100644 a/substfile1
+ create mode 100644 a/substfile2
+ create mode 120000 a/symlink_to_a
+ create mode 100644 a/text.cr
+ create mode 100644 a/text.crlf
+ create mode 100644 a/text.lf
+ok 5 - add files to repository
+
+expecting success of 5003.6 'setup export-subst and diff attributes': 
+	echo "a/nodiff.* -diff" >>.git/info/attributes &&
+	echo "a/diff.* diff" >>.git/info/attributes &&
+	echo "a/custom.* diff=custom" >>.git/info/attributes &&
+	git config diff.custom.binary true &&
+	echo "substfile?" export-subst >>.git/info/attributes &&
+	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+		>a/substfile1
+
+ok 6 - setup export-subst and diff attributes
+
+expecting success of 5003.7 'create bare clone': 
+	git clone --template= --bare . bare.git &&
+	mkdir bare.git/info &&
+	cp .git/info/attributes bare.git/info/attributes &&
+	# Recreate our changes to .git/config rather than just copying it, as
+	# we do not want to clobber core.bare or other settings.
+	git -C bare.git config diff.custom.binary true
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 7 - create bare clone
+
+expecting success of 5003.8 'remove ignored file': rm a/ignored
+ok 8 - remove ignored file
+
+expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
+ok 9 - git archive --format=zip
+
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
+
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+
+Compiled with gcc 14.2.0 for Unix (Linux ELF).
+
+UnZip special compilation options:
+        ACORN_FTYPE_NFS
+        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
+        SET_DIR_ATTRIB
+        SYMLINKS (symbolic links supported, if RTL and file system permit)
+        TIMESTAMP
+        UNIXBACKUP
+        USE_EF_UT_TIME
+        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
+        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
+        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
+        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
+        VMS_TEXT_CONV
+        WILD_STOP_AT_DIR
+        [decryption, version 2.11 of 05 Jan 2007]
+
+UnZip and ZipInfo environment options:
+           UNZIP:  [none]
+        UNZIPOPT:  [none]
+         ZIPINFO:  [none]
+      ZIPINFOOPT:  [none]
+prerequisite UNZIP ok
+expecting success of 5003.10 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../d.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     
+   creating: a/bin/
+  inflating: a/bin/sh                
+ extracting: a/binary.cr             
+ extracting: a/binary.crlf           
+ extracting: a/binary.lf             
+ extracting: a/custom.cr             
+ extracting: a/custom.crlf           
+ extracting: a/custom.lf             
+ extracting: a/diff.cr               
+ extracting: a/diff.crlf             
+ extracting: a/diff.lf               
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+ extracting: a/nodiff.cr             
+ extracting: a/nodiff.crlf           
+ extracting: a/nodiff.lf             
+  inflating: a/substfile1            
+ extracting: a/substfile2            
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               
+ extracting: a/text.crlf             
+ extracting: a/text.lf               
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 10 -  extract ZIP archive
+
+expecting success of 5003.11 ' validate filenames': 
+		(cd d/a && find .) | sort >d.lst &&
+		test_cmp a.lst d.lst
+	
+ok 11 -  validate filenames
+
+expecting success of 5003.12 ' validate file contents': 
+		diff -r a d/a
+	
+ok 12 -  validate file contents
+
+checking prerequisite: UNZIP_CONVERT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_CONVERT" &&
+	"$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
+
+)
+Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/t5003/infozip-symlinks.zip
+ extracting: textfile                [text]  
+    linking: symlink                 -> textfile 
+finishing deferred symbolic links:
+  symlink                -> textfile
+prerequisite UNZIP_CONVERT ok
+expecting success of 5003.13 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../d.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     [text]  
+   creating: a/bin/
+  inflating: a/bin/sh                [binary]
+ extracting: a/binary.cr             [binary]
+ extracting: a/binary.crlf           [binary]
+ extracting: a/binary.lf             [binary]
+ extracting: a/custom.cr             [binary]
+ extracting: a/custom.crlf           [binary]
+ extracting: a/custom.lf             [binary]
+ extracting: a/diff.cr               [text]  
+ extracting: a/diff.crlf             [text]  
+ extracting: a/diff.lf               [text]  
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+ extracting: a/nodiff.cr             [binary]
+ extracting: a/nodiff.crlf           [binary]
+ extracting: a/nodiff.lf             [binary]
+  inflating: a/substfile1            [text]  
+ extracting: a/substfile2            [text]  
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               [text]  
+ extracting: a/text.crlf             [text]  
+ extracting: a/text.lf               [text]  
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 13 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.14 ' validate that text files are converted': 
+		test_cmp_bin eol_d/a/text.cr eol_d/a/text.crlf &&
+		test_cmp_bin eol_d/a/text.cr eol_d/a/text.lf
+	
+ok 14 -  validate that text files are converted
+
+expecting success of 5003.15 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_d/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_d/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_d/a/binary.lf
+	
+ok 15 -  validate that binary files are unchanged
+
+expecting success of 5003.16 ' validate that diff files are converted': 
+		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.crlf &&
+		test_cmp_bin eol_d/a/diff.cr eol_d/a/diff.lf
+	
+ok 16 -  validate that diff files are converted
+
+expecting success of 5003.17 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_d/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_d/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_d/a/nodiff.lf
+	
+ok 17 -  validate that -diff files are unchanged
+
+expecting success of 5003.18 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_d/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_d/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_d/a/custom.lf
+	
+ok 18 -  validate that custom diff is unchanged 
+
+expecting success of 5003.19 'git archive --format=zip in a bare repo': (cd bare.git && git archive --format=zip HEAD) >d1.zip
+ok 19 - git archive --format=zip in a bare repo
+
+expecting success of 5003.20 'git archive --format=zip vs. the same in a bare repo': test_cmp_bin d.zip d1.zip
+ok 20 - git archive --format=zip vs. the same in a bare repo
+
+expecting success of 5003.21 'git archive --format=zip with --output': git archive --format=zip --output=d2.zip HEAD &&
+    test_cmp_bin d.zip d2.zip
+ok 21 - git archive --format=zip with --output
+
+expecting success of 5003.22 'git archive with --output, inferring format (local)': 
+	git archive --output=d3.zip HEAD &&
+	test_cmp_bin d.zip d3.zip
+
+ok 22 - git archive with --output, inferring format (local)
+
+expecting success of 5003.23 'git archive with --output, inferring format (remote)': 
+	git archive --remote=. --output=d4.zip HEAD &&
+	test_cmp_bin d.zip d4.zip
+
+ok 23 - git archive with --output, inferring format (remote)
+
+expecting success of 5003.24 'git archive --format=zip with prefix': git archive --format=zip --prefix=prefix/ HEAD >e.zip
+ok 24 - git archive --format=zip with prefix
+
+expecting success of 5003.25 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../e.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: prefix/
+   creating: prefix/a/
+ extracting: prefix/a/a              
+   creating: prefix/a/bin/
+  inflating: prefix/a/bin/sh         
+ extracting: prefix/a/binary.cr      
+ extracting: prefix/a/binary.crlf    
+ extracting: prefix/a/binary.lf      
+ extracting: prefix/a/custom.cr      
+ extracting: prefix/a/custom.crlf    
+ extracting: prefix/a/custom.lf      
+ extracting: prefix/a/diff.cr        
+ extracting: prefix/a/diff.crlf      
+ extracting: prefix/a/diff.lf        
+   creating: prefix/a/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+ extracting: prefix/a/nodiff.cr      
+ extracting: prefix/a/nodiff.crlf    
+ extracting: prefix/a/nodiff.lf      
+  inflating: prefix/a/substfile1     
+ extracting: prefix/a/substfile2     
+    linking: prefix/a/symlink_to_a   -> a 
+ extracting: prefix/a/text.cr        
+ extracting: prefix/a/text.crlf      
+ extracting: prefix/a/text.lf        
+finishing deferred symbolic links:
+  prefix/a/symlink_to_a  -> a
+ok 25 -  extract ZIP archive
+
+expecting success of 5003.26 ' validate filenames': 
+		(cd e/prefix/a && find .) | sort >e.lst &&
+		test_cmp a.lst e.lst
+	
+ok 26 -  validate filenames
+
+expecting success of 5003.27 ' validate file contents': 
+		diff -r a e/prefix/a
+	
+ok 27 -  validate file contents
+
+expecting success of 5003.28 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../e.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: prefix/
+   creating: prefix/a/
+ extracting: prefix/a/a              [text]  
+   creating: prefix/a/bin/
+  inflating: prefix/a/bin/sh         [binary]
+ extracting: prefix/a/binary.cr      [binary]
+ extracting: prefix/a/binary.crlf    [binary]
+ extracting: prefix/a/binary.lf      [binary]
+ extracting: prefix/a/custom.cr      [binary]
+ extracting: prefix/a/custom.crlf    [binary]
+ extracting: prefix/a/custom.lf      [binary]
+ extracting: prefix/a/diff.cr        [text]  
+ extracting: prefix/a/diff.crlf      [text]  
+ extracting: prefix/a/diff.lf        [text]  
+   creating: prefix/a/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: prefix/a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+ extracting: prefix/a/nodiff.cr      [binary]
+ extracting: prefix/a/nodiff.crlf    [binary]
+ extracting: prefix/a/nodiff.lf      [binary]
+  inflating: prefix/a/substfile1     [text]  
+ extracting: prefix/a/substfile2     [text]  
+    linking: prefix/a/symlink_to_a   -> a 
+ extracting: prefix/a/text.cr        [text]  
+ extracting: prefix/a/text.crlf      [text]  
+ extracting: prefix/a/text.lf        [text]  
+finishing deferred symbolic links:
+  prefix/a/symlink_to_a  -> a
+ok 28 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.29 ' validate that text files are converted': 
+		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.crlf &&
+		test_cmp_bin eol_e/prefix/a/text.cr eol_e/prefix/a/text.lf
+	
+ok 29 -  validate that text files are converted
+
+expecting success of 5003.30 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_e/prefix/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_e/prefix/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_e/prefix/a/binary.lf
+	
+ok 30 -  validate that binary files are unchanged
+
+expecting success of 5003.31 ' validate that diff files are converted': 
+		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.crlf &&
+		test_cmp_bin eol_e/prefix/a/diff.cr eol_e/prefix/a/diff.lf
+	
+ok 31 -  validate that diff files are converted
+
+expecting success of 5003.32 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_e/prefix/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_e/prefix/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_e/prefix/a/nodiff.lf
+	
+ok 32 -  validate that -diff files are unchanged
+
+expecting success of 5003.33 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_e/prefix/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_e/prefix/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_e/prefix/a/custom.lf
+	
+ok 33 -  validate that custom diff is unchanged 
+
+expecting success of 5003.34 'git archive -0 --format=zip on large files': 
+	test_config core.bigfilethreshold 1 &&
+	git archive -0 --format=zip HEAD >large.zip
+
+ok 34 - git archive -0 --format=zip on large files
+
+expecting success of 5003.35 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     
+   creating: a/bin/
+ extracting: a/bin/sh                
+ extracting: a/binary.cr             
+ extracting: a/binary.crlf           
+ extracting: a/binary.lf             
+ extracting: a/custom.cr             
+ extracting: a/custom.crlf           
+ extracting: a/custom.lf             
+ extracting: a/diff.cr               
+ extracting: a/diff.crlf             
+ extracting: a/diff.lf               
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+ extracting: a/nodiff.cr             
+ extracting: a/nodiff.crlf           
+ extracting: a/nodiff.lf             
+ extracting: a/substfile1            
+ extracting: a/substfile2            
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               
+ extracting: a/text.crlf             
+ extracting: a/text.lf               
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 35 -  extract ZIP archive
+
+expecting success of 5003.36 ' validate filenames': 
+		(cd large/a && find .) | sort >large.lst &&
+		test_cmp a.lst large.lst
+	
+ok 36 -  validate filenames
+
+expecting success of 5003.37 ' validate file contents': 
+		diff -r a large/a
+	
+ok 37 -  validate file contents
+
+expecting success of 5003.38 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     [text]  
+   creating: a/bin/
+ extracting: a/bin/sh                [binary]
+ extracting: a/binary.cr             [binary]
+ extracting: a/binary.crlf           [binary]
+ extracting: a/binary.lf             [binary]
+ extracting: a/custom.cr             [binary]
+ extracting: a/custom.crlf           [binary]
+ extracting: a/custom.lf             [binary]
+ extracting: a/diff.cr               [text]  
+ extracting: a/diff.crlf             [text]  
+ extracting: a/diff.lf               [text]  
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+ extracting: a/nodiff.cr             [binary]
+ extracting: a/nodiff.crlf           [binary]
+ extracting: a/nodiff.lf             [binary]
+ extracting: a/substfile1            [text]  
+ extracting: a/substfile2            [text]  
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               [text]  
+ extracting: a/text.crlf             [text]  
+ extracting: a/text.lf               [text]  
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 38 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.39 ' validate that text files are converted': 
+		test_cmp_bin eol_large/a/text.cr eol_large/a/text.crlf &&
+		test_cmp_bin eol_large/a/text.cr eol_large/a/text.lf
+	
+ok 39 -  validate that text files are converted
+
+expecting success of 5003.40 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_large/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_large/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_large/a/binary.lf
+	
+ok 40 -  validate that binary files are unchanged
+
+expecting success of 5003.41 ' validate that diff files are converted': 
+		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.crlf &&
+		test_cmp_bin eol_large/a/diff.cr eol_large/a/diff.lf
+	
+ok 41 -  validate that diff files are converted
+
+expecting success of 5003.42 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_large/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_large/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_large/a/nodiff.lf
+	
+ok 42 -  validate that -diff files are unchanged
+
+expecting success of 5003.43 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_large/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_large/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_large/a/custom.lf
+	
+ok 43 -  validate that custom diff is unchanged 
+
+expecting success of 5003.44 'git archive --format=zip on large files': 
+	test_config core.bigfilethreshold 1 &&
+	git archive --format=zip HEAD >large-compressed.zip
+
+ok 44 - git archive --format=zip on large files
+
+expecting success of 5003.45 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+  inflating: a/a                     
+   creating: a/bin/
+  inflating: a/bin/sh                
+  inflating: a/binary.cr             
+  inflating: a/binary.crlf           
+  inflating: a/binary.lf             
+  inflating: a/custom.cr             
+  inflating: a/custom.crlf           
+  inflating: a/custom.lf             
+  inflating: a/diff.cr               
+  inflating: a/diff.crlf             
+  inflating: a/diff.lf               
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+  inflating: a/nodiff.cr             
+  inflating: a/nodiff.crlf           
+  inflating: a/nodiff.lf             
+  inflating: a/substfile1            
+ extracting: a/substfile2            
+    linking: a/symlink_to_a          -> a 
+  inflating: a/text.cr               
+  inflating: a/text.crlf             
+  inflating: a/text.lf               
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 45 -  extract ZIP archive
+
+expecting success of 5003.46 ' validate filenames': 
+		(cd large-compressed/a && find .) | sort >large-compressed.lst &&
+		test_cmp a.lst large-compressed.lst
+	
+ok 46 -  validate filenames
+
+expecting success of 5003.47 ' validate file contents': 
+		diff -r a large-compressed/a
+	
+ok 47 -  validate file contents
+
+expecting success of 5003.48 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+  inflating: a/a                     [text]  
+   creating: a/bin/
+  inflating: a/bin/sh                [binary]
+  inflating: a/binary.cr             [binary]
+  inflating: a/binary.crlf           [binary]
+  inflating: a/binary.lf             [binary]
+  inflating: a/custom.cr             [binary]
+  inflating: a/custom.crlf           [binary]
+  inflating: a/custom.lf             [binary]
+  inflating: a/diff.cr               [text]  
+  inflating: a/diff.crlf             [text]  
+  inflating: a/diff.lf               [text]  
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+  inflating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+  inflating: a/nodiff.cr             [binary]
+  inflating: a/nodiff.crlf           [binary]
+  inflating: a/nodiff.lf             [binary]
+  inflating: a/substfile1            [text]  
+ extracting: a/substfile2            [text]  
+    linking: a/symlink_to_a          -> a 
+  inflating: a/text.cr               [text]  
+  inflating: a/text.crlf             [text]  
+  inflating: a/text.lf               [text]  
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 48 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.49 ' validate that text files are converted': 
+		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.crlf &&
+		test_cmp_bin eol_large-compressed/a/text.cr eol_large-compressed/a/text.lf
+	
+ok 49 -  validate that text files are converted
+
+expecting success of 5003.50 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_large-compressed/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_large-compressed/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_large-compressed/a/binary.lf
+	
+ok 50 -  validate that binary files are unchanged
+
+expecting success of 5003.51 ' validate that diff files are converted': 
+		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.crlf &&
+		test_cmp_bin eol_large-compressed/a/diff.cr eol_large-compressed/a/diff.lf
+	
+ok 51 -  validate that diff files are converted
+
+expecting success of 5003.52 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_large-compressed/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_large-compressed/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_large-compressed/a/nodiff.lf
+	
+ok 52 -  validate that -diff files are unchanged
+
+expecting success of 5003.53 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_large-compressed/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_large-compressed/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_large-compressed/a/custom.lf
+	
+ok 53 -  validate that custom diff is unchanged 
+
+expecting success of 5003.54 'git archive --format=zip --add-file': 
+	echo untracked >untracked &&
+	git archive --format=zip --add-file=untracked HEAD >with_untracked.zip
+
+ok 54 - git archive --format=zip --add-file
+
+expecting success of 5003.55 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../with_untracked.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     
+   creating: a/bin/
+  inflating: a/bin/sh                
+ extracting: a/binary.cr             
+ extracting: a/binary.crlf           
+ extracting: a/binary.lf             
+ extracting: a/custom.cr             
+ extracting: a/custom.crlf           
+ extracting: a/custom.lf             
+ extracting: a/diff.cr               
+ extracting: a/diff.crlf             
+ extracting: a/diff.lf               
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+ extracting: a/nodiff.cr             
+ extracting: a/nodiff.crlf           
+ extracting: a/nodiff.lf             
+  inflating: a/substfile1            
+ extracting: a/substfile2            
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               
+ extracting: a/text.crlf             
+ extracting: a/text.lf               
+ extracting: untracked               
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 55 -  extract ZIP archive
+
+expecting success of 5003.56 ' validate filenames': 
+		(cd with_untracked/a && find .) | sort >with_untracked.lst &&
+		test_cmp a.lst with_untracked.lst
+	
+ok 56 -  validate filenames
+
+expecting success of 5003.57 ' validate file contents': 
+		diff -r a with_untracked/a
+	
+ok 57 -  validate file contents
+
+expecting success of 5003.58 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../with_untracked.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     [text]  
+   creating: a/bin/
+  inflating: a/bin/sh                [binary]
+ extracting: a/binary.cr             [binary]
+ extracting: a/binary.crlf           [binary]
+ extracting: a/binary.lf             [binary]
+ extracting: a/custom.cr             [binary]
+ extracting: a/custom.crlf           [binary]
+ extracting: a/custom.lf             [binary]
+ extracting: a/diff.cr               [text]  
+ extracting: a/diff.crlf             [text]  
+ extracting: a/diff.lf               [text]  
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+ extracting: a/nodiff.cr             [binary]
+ extracting: a/nodiff.crlf           [binary]
+ extracting: a/nodiff.lf             [binary]
+  inflating: a/substfile1            [text]  
+ extracting: a/substfile2            [text]  
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               [text]  
+ extracting: a/text.crlf             [text]  
+ extracting: a/text.lf               [text]  
+ extracting: untracked               [text]  
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 58 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.59 ' validate that text files are converted': 
+		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.crlf &&
+		test_cmp_bin eol_with_untracked/a/text.cr eol_with_untracked/a/text.lf
+	
+ok 59 -  validate that text files are converted
+
+expecting success of 5003.60 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_with_untracked/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_with_untracked/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_with_untracked/a/binary.lf
+	
+ok 60 -  validate that binary files are unchanged
+
+expecting success of 5003.61 ' validate that diff files are converted': 
+		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.crlf &&
+		test_cmp_bin eol_with_untracked/a/diff.cr eol_with_untracked/a/diff.lf
+	
+ok 61 -  validate that diff files are converted
+
+expecting success of 5003.62 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_with_untracked/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_with_untracked/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_with_untracked/a/nodiff.lf
+	
+ok 62 -  validate that -diff files are unchanged
+
+expecting success of 5003.63 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_with_untracked/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_with_untracked/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_with_untracked/a/custom.lf
+	
+ok 63 -  validate that custom diff is unchanged 
+
+expecting success of 5003.64 ' validate extra file untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 64 -  validate extra file untracked
+
+expecting success of 5003.65 'git archive --format=zip --add-virtual-file': 
+	if test_have_prereq FUNNYNAMES
+	then
+		PATHNAME="pathname with : colon"
+	else
+		PATHNAME="pathname without colon"
+	fi &&
+	git archive --format=zip >with_file_with_content.zip \
+		--add-virtual-file=\""$PATHNAME"\": \
+		--add-virtual-file=hello:world $EMPTY_TREE &&
+	test_when_finished "rm -rf tmp-unpack" &&
+	mkdir tmp-unpack && (
+		cd tmp-unpack &&
+		"$GIT_UNZIP" ../with_file_with_content.zip &&
+		test_path_is_file hello &&
+		test_path_is_file "$PATHNAME" &&
+		test world = $(cat hello)
+	)
+
+checking prerequisite: FUNNYNAMES
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
+	test_have_prereq !MINGW &&
+	touch -- \
+		"FUNNYNAMES tab	embedded" \
+		"FUNNYNAMES \"quote embedded\"" \
+		"FUNNYNAMES newline
+embedded" 2>/dev/null &&
+	rm -- \
+		"FUNNYNAMES tab	embedded" \
+		"FUNNYNAMES \"quote embedded\"" \
+		"FUNNYNAMES newline
+embedded" 2>/dev/null
+
+)
+prerequisite FUNNYNAMES ok
+Archive:  ../with_file_with_content.zip
+ extracting: pathname with : colon   
+ extracting: hello                   
+ok 65 - git archive --format=zip --add-virtual-file
+
+expecting success of 5003.66 'git archive --format=zip --add-file twice': 
+	echo untracked >untracked &&
+	git archive --format=zip --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.zip
+
+ok 66 - git archive --format=zip --add-file twice
+
+expecting success of 5003.67 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../with_untracked2.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     
+   creating: a/bin/
+  inflating: a/bin/sh                
+ extracting: a/binary.cr             
+ extracting: a/binary.crlf           
+ extracting: a/binary.lf             
+ extracting: a/custom.cr             
+ extracting: a/custom.crlf           
+ extracting: a/custom.lf             
+ extracting: a/diff.cr               
+ extracting: a/diff.crlf             
+ extracting: a/diff.lf               
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  
+ extracting: a/nodiff.cr             
+ extracting: a/nodiff.crlf           
+ extracting: a/nodiff.lf             
+  inflating: a/substfile1            
+ extracting: a/substfile2            
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               
+ extracting: a/text.crlf             
+ extracting: a/text.lf               
+ extracting: one/untracked           
+ extracting: two/untracked           
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 67 -  extract ZIP archive
+
+expecting success of 5003.68 ' validate filenames': 
+		(cd with_untracked2/a && find .) | sort >with_untracked2.lst &&
+		test_cmp a.lst with_untracked2.lst
+	
+ok 68 -  validate filenames
+
+expecting success of 5003.69 ' validate file contents': 
+		diff -r a with_untracked2/a
+	
+ok 69 -  validate file contents
+
+expecting success of 5003.70 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../with_untracked2.zip
+b00365d6949ef462c002cf04002d4ef88a20b00e
+   creating: a/
+ extracting: a/a                     [text]  
+   creating: a/bin/
+  inflating: a/bin/sh                [binary]
+ extracting: a/binary.cr             [binary]
+ extracting: a/binary.crlf           [binary]
+ extracting: a/binary.lf             [binary]
+ extracting: a/custom.cr             [binary]
+ extracting: a/custom.crlf           [binary]
+ extracting: a/custom.lf             [binary]
+ extracting: a/diff.cr               [text]  
+ extracting: a/diff.crlf             [text]  
+ extracting: a/diff.lf               [text]  
+   creating: a/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+   creating: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/
+ extracting: a/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/long_path_to_a_file/file_with_long_path  [text]  
+ extracting: a/nodiff.cr             [binary]
+ extracting: a/nodiff.crlf           [binary]
+ extracting: a/nodiff.lf             [binary]
+  inflating: a/substfile1            [text]  
+ extracting: a/substfile2            [text]  
+    linking: a/symlink_to_a          -> a 
+ extracting: a/text.cr               [text]  
+ extracting: a/text.crlf             [text]  
+ extracting: a/text.lf               [text]  
+ extracting: one/untracked           [text]  
+ extracting: two/untracked           [text]  
+finishing deferred symbolic links:
+  a/symlink_to_a         -> a
+ok 70 -  extract ZIP archive with EOL conversion
+
+expecting success of 5003.71 ' validate that text files are converted': 
+		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.crlf &&
+		test_cmp_bin eol_with_untracked2/a/text.cr eol_with_untracked2/a/text.lf
+	
+ok 71 -  validate that text files are converted
+
+expecting success of 5003.72 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_with_untracked2/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_with_untracked2/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_with_untracked2/a/binary.lf
+	
+ok 72 -  validate that binary files are unchanged
+
+expecting success of 5003.73 ' validate that diff files are converted': 
+		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.crlf &&
+		test_cmp_bin eol_with_untracked2/a/diff.cr eol_with_untracked2/a/diff.lf
+	
+ok 73 -  validate that diff files are converted
+
+expecting success of 5003.74 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_with_untracked2/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_with_untracked2/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_with_untracked2/a/nodiff.lf
+	
+ok 74 -  validate that -diff files are unchanged
+
+expecting success of 5003.75 ' validate that custom diff is unchanged ': 
+		test_cmp_bin a/custom.cr   eol_with_untracked2/a/custom.cr &&
+		test_cmp_bin a/custom.crlf eol_with_untracked2/a/custom.crlf &&
+		test_cmp_bin a/custom.lf   eol_with_untracked2/a/custom.lf
+	
+ok 75 -  validate that custom diff is unchanged 
+
+expecting success of 5003.76 ' validate extra file one/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 76 -  validate extra file one/untracked
+
+expecting success of 5003.77 ' validate extra file two/untracked': 
+		diff -r $path_in_fs $dir/$path_in_archive
+	
+ok 77 -  validate extra file two/untracked
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 77 test(s)
+# SKIP no web server found at ''
+1..77
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5305-include-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5305-include-tag/.git/
 expecting success of 5305.1 'setup': 
@@ -297820,67 +297774,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5308-pack-detect-duplicates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5308-pack-detect-duplicates/.git/
-expecting success of 5308.1 'setup': 
-	test_oid_cache <<-EOF
-	lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
-	lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
-
-	missing_oid sha1:e69d000000000000000000000000000000000000
-	missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
-	EOF
-
-ok 1 - setup
-
-expecting success of 5308.2 'pack with no duplicates': 
-	create_pack no-dups.pack 1 &&
-	git index-pack --stdin <no-dups.pack
-
-pack	2b6334c837f829fc85b8483b099737d46872fcf1
-ok 2 - pack with no duplicates
-
-expecting success of 5308.3 'index-pack will allow duplicate objects by default': 
-	clear_packs &&
-	create_pack dups.pack 100 &&
-	git index-pack --stdin <dups.pack
-
-pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
-ok 3 - index-pack will allow duplicate objects by default
-
-expecting success of 5308.4 'create batch-check test vectors': 
-	cat >input <<-EOF &&
-	$LO_SHA1
-	$HI_SHA1
-	$MISSING_SHA1
-	EOF
-	cat >expect <<-EOF
-	$LO_SHA1 blob 2
-	$HI_SHA1 blob 0
-	$MISSING_SHA1 missing
-	EOF
-
-ok 4 - create batch-check test vectors
-
-expecting success of 5308.5 'lookup in duplicated pack': 
-	git cat-file --batch-check <input >actual &&
-	test_cmp expect actual
-
-ok 5 - lookup in duplicated pack
-
-expecting success of 5308.6 'index-pack can reject packs with duplicates': 
-	clear_packs &&
-	create_pack dups.pack 2 &&
-	test_must_fail git index-pack --strict --stdin <dups.pack &&
-	test_expect_code 1 git cat-file -e $LO_SHA1
-
-fatal: The same object e68fe8129b546b101aee9510c5328e7f21ca1d18 appears twice in the pack
-ok 6 - index-pack can reject packs with duplicates
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5309-pack-delta-cycles.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5309-pack-delta-cycles/.git/
 expecting success of 5309.1 'index-pack works with a single delta (A->B)': 
@@ -297969,90 +297862,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5311-pack-bitmaps-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-expecting success of 5311.1 'setup shallow repo': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable false &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m orig &&
-		echo 2 >file &&
-		git commit -a -m update &&
-		git clone --no-local --bare --depth=1 . shallow.git &&
-		echo 1 >file &&
-		git commit -a -m repeat
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-[master (root-commit) c96ad4c] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 0ffc409] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'shallow.git'...
-[master 07d4efd] repeat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup shallow repo
-
-expecting success of 5311.2 'turn on bitmaps in the parent': 
-		git repack -adb
-	
-ok 2 - turn on bitmaps in the parent
-
-expecting success of 5311.3 'shallow fetch from bitmapped repo': 
-		(cd shallow.git && git fetch)
-	
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.
- * branch            HEAD       -> FETCH_HEAD
-ok 3 - shallow fetch from bitmapped repo
-
-expecting success of 5311.4 'setup shallow repo': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable true &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m orig &&
-		echo 2 >file &&
-		git commit -a -m update &&
-		git clone --no-local --bare --depth=1 . shallow.git &&
-		echo 1 >file &&
-		git commit -a -m repeat
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
-[master (root-commit) c96ad4c] orig
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 0ffc409] update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'shallow.git'...
-[master 07d4efd] repeat
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - setup shallow repo
-
-expecting success of 5311.5 'turn on bitmaps in the parent': 
-		git repack -adb
-	
-ok 5 - turn on bitmaps in the parent
-
-expecting success of 5311.6 'shallow fetch from bitmapped repo': 
-		(cd shallow.git && git fetch)
-	
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.
- * branch            HEAD       -> FETCH_HEAD
-ok 6 - shallow fetch from bitmapped repo
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5150-request-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5150-request-pull/.git/
 expecting success of 5150.1 'setup': 
@@ -298599,59 +298408,149 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5314-pack-cycle-detection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5314-pack-cycle-detection/.git/
-expecting success of 5314.1 'setup': 
-	test-tool genrandom base 4096 >base &&
-	for i in one two
-	do
-		# we want shared content here to encourage deltas...
-		cp base file &&
-		echo $i >>file &&
-
-		# ...whereas dummy should be short, because we do not want
-		# deltas that would create duplicates when we --fix-thin
-		echo $i >dummy &&
+*** t5311-pack-bitmaps-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+expecting success of 5311.1 'setup shallow repo': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable false &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m orig &&
+		echo 2 >file &&
+		git commit -a -m update &&
+		git clone --no-local --bare --depth=1 . shallow.git &&
+		echo 1 >file &&
+		git commit -a -m repeat
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+[master (root-commit) c96ad4c] orig
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 0ffc409] update
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'shallow.git'...
+[master 07d4efd] repeat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup shallow repo
 
-		git add file dummy &&
-		test_tick &&
-		git commit -m $i ||
-		return 1
-	done &&
+expecting success of 5311.2 'turn on bitmaps in the parent': 
+		git repack -adb
+	
+ok 2 - turn on bitmaps in the parent
 
-	make_pack HEAD^ HEAD &&
-	make_pack HEAD HEAD^
+expecting success of 5311.3 'shallow fetch from bitmapped repo': 
+		(cd shallow.git && git fetch)
+	
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 3 - shallow fetch from bitmapped repo
 
-[master (root-commit) e98f41e] one
+expecting success of 5311.4 'setup shallow repo': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable true &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m orig &&
+		echo 2 >file &&
+		git commit -a -m update &&
+		git clone --no-local --bare --depth=1 . shallow.git &&
+		echo 1 >file &&
+		git commit -a -m repeat
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.git/
+[master (root-commit) c96ad4c] orig
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dummy
+ 1 file changed, 1 insertion(+)
  create mode 100644 file
-[master 1d543a7] two
+[master 0ffc409] update
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
-pack	86885ae86429a2983f8a2824647f8b7773ff8e16
-pack	8a63be3313e6a04258b6d166a5abfb3005aac8f8
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'shallow.git'...
+[master 07d4efd] repeat
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - setup shallow repo
+
+expecting success of 5311.5 'turn on bitmaps in the parent': 
+		git repack -adb
+	
+ok 5 - turn on bitmaps in the parent
+
+expecting success of 5311.6 'shallow fetch from bitmapped repo': 
+		(cd shallow.git && git fetch)
+	
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5311-pack-bitmaps-shallow/.
+ * branch            HEAD       -> FETCH_HEAD
+ok 6 - shallow fetch from bitmapped repo
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5308-pack-detect-duplicates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5308-pack-detect-duplicates/.git/
+expecting success of 5308.1 'setup': 
+	test_oid_cache <<-EOF
+	lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+	lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
+
+	missing_oid sha1:e69d000000000000000000000000000000000000
+	missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
+	EOF
+
 ok 1 - setup
 
-expecting success of 5314.2 'repack': 
-	# We first want to check that we do not have any internal errors,
-	# and also that we do not hit the last-ditch cycle-breaking code
-	# in write_object(), which will issue a warning to stderr.
-	git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
+expecting success of 5308.2 'pack with no duplicates': 
+	create_pack no-dups.pack 1 &&
+	git index-pack --stdin <no-dups.pack
 
-	# And then double-check that the resulting pack is usable (i.e.,
-	# we did not fail to notice any cycles). We know we are accessing
-	# the objects via the new pack here, because "repack -d" will have
-	# removed the others.
-	git cat-file blob HEAD:file >/dev/null &&
-	git cat-file blob HEAD^:file >/dev/null
+pack	2b6334c837f829fc85b8483b099737d46872fcf1
+ok 2 - pack with no duplicates
 
-ok 2 - repack
+expecting success of 5308.3 'index-pack will allow duplicate objects by default': 
+	clear_packs &&
+	create_pack dups.pack 100 &&
+	git index-pack --stdin <dups.pack
 
-# passed all 2 test(s)
-1..2
+pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
+ok 3 - index-pack will allow duplicate objects by default
+
+expecting success of 5308.4 'create batch-check test vectors': 
+	cat >input <<-EOF &&
+	$LO_SHA1
+	$HI_SHA1
+	$MISSING_SHA1
+	EOF
+	cat >expect <<-EOF
+	$LO_SHA1 blob 2
+	$HI_SHA1 blob 0
+	$MISSING_SHA1 missing
+	EOF
+
+ok 4 - create batch-check test vectors
+
+expecting success of 5308.5 'lookup in duplicated pack': 
+	git cat-file --batch-check <input >actual &&
+	test_cmp expect actual
+
+ok 5 - lookup in duplicated pack
+
+expecting success of 5308.6 'index-pack can reject packs with duplicates': 
+	clear_packs &&
+	create_pack dups.pack 2 &&
+	test_must_fail git index-pack --strict --stdin <dups.pack &&
+	test_expect_code 1 git cat-file -e $LO_SHA1
+
+fatal: The same object e68fe8129b546b101aee9510c5328e7f21ca1d18 appears twice in the pack
+ok 6 - index-pack can reject packs with duplicates
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5312-prune-corruption.sh ***
@@ -298767,6 +298666,61 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5314-pack-cycle-detection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5314-pack-cycle-detection/.git/
+expecting success of 5314.1 'setup': 
+	test-tool genrandom base 4096 >base &&
+	for i in one two
+	do
+		# we want shared content here to encourage deltas...
+		cp base file &&
+		echo $i >>file &&
+
+		# ...whereas dummy should be short, because we do not want
+		# deltas that would create duplicates when we --fix-thin
+		echo $i >dummy &&
+
+		git add file dummy &&
+		test_tick &&
+		git commit -m $i ||
+		return 1
+	done &&
+
+	make_pack HEAD^ HEAD &&
+	make_pack HEAD HEAD^
+
+[master (root-commit) e98f41e] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dummy
+ create mode 100644 file
+[master 1d543a7] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+pack	86885ae86429a2983f8a2824647f8b7773ff8e16
+pack	8a63be3313e6a04258b6d166a5abfb3005aac8f8
+ok 1 - setup
+
+expecting success of 5314.2 'repack': 
+	# We first want to check that we do not have any internal errors,
+	# and also that we do not hit the last-ditch cycle-breaking code
+	# in write_object(), which will issue a warning to stderr.
+	git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
+
+	# And then double-check that the resulting pack is usable (i.e.,
+	# we did not fail to notice any cycles). We know we are accessing
+	# the objects via the new pack here, because "repack -d" will have
+	# removed the others.
+	git cat-file blob HEAD:file >/dev/null &&
+	git cat-file blob HEAD^:file >/dev/null
+
+ok 2 - repack
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5315-pack-objects-compression.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5315-pack-objects-compression/.git/
 expecting success of 5315.1 'setup': 
@@ -298907,7 +298861,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.632e-05 s, 38.0 kB/s
+1 byte copied, 2.84e-05 s, 35.2 kB/s
 fatal: pack has bad object at offset 12: unknown object type 0
 error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
 fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
@@ -299035,7 +298989,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.872e-05 s, 34.8 kB/s
+1 byte copied, 2.652e-05 s, 37.7 kB/s
 fatal: pack has bad object at offset 2032: unknown object type 0
 error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
 fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
@@ -299139,7 +299093,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.644e-05 s, 37.8 kB/s
+1 byte copied, 2.58e-05 s, 38.8 kB/s
 fatal: pack is corrupted (SHA1 mismatch)
 fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
 fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
@@ -299186,7 +299140,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 2.552e-05 s, 39.2 kB/s
+1 byte copied, 2.836e-05 s, 35.3 kB/s
 fatal: pack has bad object at offset 2032: delta base offset is out of bound
 fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
 fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
@@ -299234,7 +299188,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 1+0 records in
 1+0 records out
-1 byte copied, 3.06e-05 s, 32.7 kB/s
+1 byte copied, 2.904e-05 s, 34.4 kB/s
 error: inflate: data stream error (incorrect header check)
 fatal: pack has bad object at offset 2032: inflate returned -3
 error: bad offset for revindex
@@ -299291,7 +299245,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.748e-05 s, 36.4 kB/s
+1 byte copied, 2.408e-05 s, 41.5 kB/s
 fatal: pack has bad object at offset 2032: delta base offset is out of bound
 fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
 fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
@@ -299320,7 +299274,7 @@
 .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 2.844e-05 s, 70.3 kB/s
+2 bytes copied, 2.876e-05 s, 69.5 kB/s
 fatal: pack is corrupted (SHA1 mismatch)
 error: failed to apply delta
 fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
@@ -299367,7 +299321,7 @@
 .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
 2+0 records in
 2+0 records out
-2 bytes copied, 3.092e-05 s, 64.7 kB/s
+2 bytes copied, 2.824e-05 s, 70.8 kB/s
 fatal: pack has bad object at offset 12: inflate returned -5
 fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
 error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
@@ -299510,7 +299464,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 4.084e-05 s, 97.9 kB/s
+4 bytes copied, 4.08e-05 s, 98.0 kB/s
 error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
 error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
 error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
@@ -299520,7 +299474,6 @@
 error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
 error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
 fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
 fatal: data too large to fit into virtual memory space
 ok 3 - pack/index object count mismatch
 
@@ -299545,10 +299498,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.00354576 s, 1.1 kB/s
+4 bytes copied, 0.00800233 s, 0.5 kB/s
 4+0 records in
 4+0 records out
-4 bytes copied, 4.224e-05 s, 94.7 kB/s
+4 bytes copied, 3.788e-05 s, 106 kB/s
 error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
 error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
 error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
@@ -299571,7 +299524,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 3.9e-05 s, 103 kB/s
+4 bytes copied, 0.00377082 s, 1.1 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 5 - bogus object offset (v1)
@@ -299585,7 +299538,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 0.00608028 s, 0.7 kB/s
+4 bytes copied, 3.8041e-05 s, 105 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 6 - bogus object offset (v2, no msb)
@@ -299599,7 +299552,7 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 4.368e-05 s, 91.6 kB/s
+4 bytes copied, 3.592e-05 s, 111 kB/s
 fatal: offset beyond end of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (truncated index?)
 fatal: offset beyond end of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (truncated index?)
 ok 7 - bogus offset into v2 extended table
@@ -299630,10 +299583,10 @@
 
 1084+0 records in
 1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.0008134 s, 1.3 MB/s
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.000812045 s, 1.3 MB/s
 40+0 records in
 40+0 records out
-40 bytes copied, 5.568e-05 s, 718 kB/s
+40 bytes copied, 5.6521e-05 s, 708 kB/s
 fatal: offset beyond end of packfile (truncated pack?)
 fatal: offset beyond end of packfile (truncated pack?)
 ok 8 - bogus offset inside v2 extended table
@@ -299660,7 +299613,7 @@
 
 2+0 records in
 2+0 records out
-2 bytes copied, 3.968e-05 s, 50.4 kB/s
+2 bytes copied, 3.824e-05 s, 52.3 kB/s
 error: bad offset for revindex
 fatal: packed object 49fca29a258fafab9eb7e08a4325c335fa999cb6 (stored in .git/objects/pack/pack-8b2bcfe25ac8b931c950b271f97a8d767c427364.pack) is corrupt
 ok 9 - bogus OFS_DELTA in packfile
@@ -300140,6 +300093,32 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5321-pack-large-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5321-pack-large-objects/.git/
+expecting success of 5321.1 'setup': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B
+	} >ab.pack &&
+	pack_trailer ab.pack &&
+	git index-pack --stdin <ab.pack
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+ok 1 - setup
+
+expecting success of 5321.2 'repack large deltas': 
+	printf "%s\\n" $A $B |
+	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
+
+aee080dc5b8a48f951541c0ad63f65af48847a6f
+ok 2 - repack large deltas
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5316-pack-delta-depth.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5316-pack-delta-depth/.git/
 expecting success of 5316.1 'create series of packs': 
@@ -300268,1001 +300247,87 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5321-pack-large-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5321-pack-large-objects/.git/
-expecting success of 5321.1 'setup': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-ok 1 - setup
-
-expecting success of 5321.2 'repack large deltas': 
-	printf "%s\\n" $A $B |
-	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
-
-aee080dc5b8a48f951541c0ad63f65af48847a6f
-ok 2 - repack large deltas
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5320-delta-islands.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5320-delta-islands/.git/
-expecting success of 5320.1 'setup commits': 
-	commit one seed 1 &&
-	commit two seed 12
-
-one=babc1f87e2baa9f6ad764af981fccdd2da48016e
-two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 1 - setup commits
-
-expecting success of 5320.2 'vanilla repack deltas one against two': 
-	git repack -adf &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 2 - vanilla repack deltas one against two
-
-expecting success of 5320.3 'island repack with no island definition is vanilla': 
-	git repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 3 - island repack with no island definition is vanilla
-
-expecting success of 5320.4 'island repack with no matches is vanilla': 
-	git -c "pack.island=refs/foo" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 4 - island repack with no matches is vanilla
-
-expecting success of 5320.5 'separate islands disallows delta': 
-	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
-	! is_delta_base $one $two &&
-	! is_delta_base $two $one
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
-ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
-ok 5 - separate islands disallows delta
-
-expecting success of 5320.6 'same island allows delta': 
-	git -c "pack.island=refs/heads" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 6 - same island allows delta
-
-expecting success of 5320.7 'coalesce same-named islands': 
-	git \
-		-c "pack.island=refs/(.*)/one" \
-		-c "pack.island=refs/(.*)/two" \
-		repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 7 - coalesce same-named islands
-
-expecting success of 5320.8 'island restrictions drop reused deltas': 
-	git repack -adfi &&
-	is_delta_base $one $two &&
-	git -c "pack.island=refs/heads/(.*)" repack -adi &&
-	! is_delta_base $one $two &&
-	! is_delta_base $two $one
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
-ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
-ok 8 - island restrictions drop reused deltas
-
-expecting success of 5320.9 'island regexes are left-anchored': 
-	git -c "pack.island=heads/(.*)" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 9 - island regexes are left-anchored
-
-expecting success of 5320.10 'island regexes follow last-one-wins scheme': 
-	git \
-		-c "pack.island=refs/heads/(.*)" \
-		-c "pack.island=refs/heads/" \
-		repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 10 - island regexes follow last-one-wins scheme
-
-expecting success of 5320.11 'setup shared history': 
-	commit root shared root &&
-	commit one shared 1 root &&
-	commit two shared 12-long root
-
-root=2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-one=1db8b3605f452b4a89b403abb2ae905f0a7ffaf6
-two=c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-ok 11 - setup shared history
-
-expecting success of 5320.12 'vanilla delta goes between branches': 
-	git repack -adf &&
-	is_delta_base $one $two &&
-	is_delta_base $root $two
-
-1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-2399f35d1d9acc612cefa2f7983f510fbd6b24e9 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-ok 12 - vanilla delta goes between branches
-
-expecting success of 5320.13 'deltas allowed against superset islands': 
-	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
-	is_delta_base $one $root &&
-	is_delta_base $two $root
-
-1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-c160aaeae55c91b198ce651c8fc1d4e09dd97b4b has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-ok 13 - deltas allowed against superset islands
-
-expecting success of 5320.14 'island core places core objects first': 
-	cat >expect <<-EOF &&
-	$root
-	$two
-	EOF
-	git -c "pack.island=refs/heads/(.*)" \
-	    -c "pack.islandcore=one" \
-	    repack -adfi &&
-	git verify-pack -v .git/objects/pack/*.pack |
-	cut -d" " -f1 |
-	grep -E "$root|$two" >actual &&
-	test_cmp expect actual
-
-ok 14 - island core places core objects first
-
-expecting success of 5320.15 'unmatched island core is not fatal': 
-	git -c "pack.islandcore=one" repack -adfi
-
-ok 15 - unmatched island core is not fatal
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5322-pack-objects-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5322-pack-objects-sparse/.git/
-expecting success of 5322.1 'setup repo': 
-	test_commit initial &&
-	for i in $(test_seq 1 3)
-	do
-		mkdir f$i &&
-		for j in $(test_seq 1 3)
-		do
-			mkdir f$i/f$j &&
-			echo $j >f$i/f$j/data.txt || return 1
-		done
-	done &&
-	git add . &&
-	git commit -m "Initialized trees" &&
-	for i in $(test_seq 1 3)
-	do
-		git checkout -b topic$i main &&
-		echo change-$i >f$i/f$i/data.txt &&
-		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
-	done &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic2
-	^topic3
-	EOF
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >expect_objects.txt
-
-[main (root-commit) 24b24cf] initial
+*** t4137-apply-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/.git/
+expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 8ccf85b] Initialized trees
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 f1/f1/data.txt
- create mode 100644 f1/f2/data.txt
- create mode 100644 f1/f3/data.txt
- create mode 100644 f2/f1/data.txt
- create mode 100644 f2/f2/data.txt
- create mode 100644 f2/f3/data.txt
- create mode 100644 f3/f1/data.txt
- create mode 100644 f3/f2/data.txt
- create mode 100644 f3/f3/data.txt
-Switched to a new branch 'topic1'
-[topic1 32cf0ab] Changed f1/f1/data.txt
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic2'
-[topic2 2b44896] Changed f2/f2/data.txt
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic3'
-[topic3 48a532e] Changed f3/f3/data.txt
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup repo
-
-expecting success of 5322.2 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	test_cmp expect_objects.txt nonsparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 2 - non-sparse pack-objects
-
-expecting success of 5322.3 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_objects.txt sparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 3 - sparse pack-objects
-
-expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
-	git checkout topic1 &&
-	echo change-3 >f3/f3/data.txt &&
-	git commit -a -m "Changed f3/f3/data.txt" &&
-	git rev-parse			\
-		topic1~1		\
-		topic1~1^{tree}		\
-		topic1^{tree}		\
-		topic1			\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >required_objects.txt
-
-Switched to branch 'topic1'
-[topic1 200bcc4] Changed f3/f3/data.txt
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - duplicate a folder from f3 and commit to topic1
-
-expecting success of 5322.5 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 5 - non-sparse pack-objects
-
-expecting success of 5322.6 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
-	test_cmp required_objects.txt sparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 6 - sparse pack-objects
-
-expecting success of 5322.7 'duplicate a folder from f1 into f3': 
-	mkdir f3/f4 &&
-	cp -r f1/f1/* f3/f4 &&
-	git add f3/f4 &&
-	git commit -m "Copied f1/f1 to f3/f4" &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic1~1
-	EOF
-	git rev-parse		\
-		topic1		\
-		topic1^{tree}   \
-		topic1:f3 | sort >required_objects.txt
-
-[topic1 b9b902e] Copied f1/f1 to f3/f4
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f3/f4/data.txt
-ok 7 - duplicate a folder from f1 into f3
-
-expecting success of 5322.8 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 8 - non-sparse pack-objects
-
-expecting success of 5322.9 'sparse pack-objects': 
-	GIT_TEST_PACK_SPARSE=-1 &&
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f3		\
-		topic1:f3/f4		\
-		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 9 - sparse pack-objects
-
-expecting success of 5322.10 'pack.useSparse enables algorithm': 
-	git config pack.useSparse true &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 10 - pack.useSparse enables algorithm
-
-expecting success of 5322.11 'pack.useSparse overridden': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp required_objects.txt sparse_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 11 - pack.useSparse overridden
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5317-pack-objects-filter-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/.git/
-expecting success of 5317.1 'setup r1': 
-	git init r1 &&
-	for n in 1 2 3 4 5
-	do
-		echo "This is file: $n" > r1/file.$n &&
-		git -C r1 add file.$n &&
-		git -C r1 commit -m "$n" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
-[main (root-commit) a56c7ae] 1
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1
-[main 7d743f2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2
-[main fcc1d33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3
-[main e1d918e] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4
-[main 90f11b5] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.5
-ok 1 - setup r1
-
-expecting success of 5317.2 'verify blob count in normal packfile': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../all.pack &&
-
-	git -C r1 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
-ok 2 - verify blob count in normal packfile
-
-expecting success of 5317.3 'verify blob:none packfile has no blobs': 
-	git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../filter.pack &&
-
-	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
-ok 3 - verify blob:none packfile has no blobs
-
-expecting success of 5317.4 'verify blob:none packfile without --stdout': 
-	git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
-	! grep blob verify_result
-
-ok 4 - verify blob:none packfile without --stdout
-
-expecting success of 5317.5 'verify normal and blob:none packfiles have same commits/trees': 
-	git -C r1 verify-pack -v ../all.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >expected &&
-
-	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 5 - verify normal and blob:none packfiles have same commits/trees
-
-expecting success of 5317.6 'get an error for missing tree object': 
-	git init r5 &&
-	echo foo >r5/foo &&
-	git -C r5 add foo &&
-	git -C r5 commit -m "foo" &&
-	git -C r5 rev-parse HEAD^{tree} >tree &&
-	del=$(sed "s|..|&/|" tree) &&
-	rm r5/.git/objects/$del &&
-	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
-	HEAD
-	EOF
-	grep "bad tree object" bad_tree
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
-[main (root-commit) fbd86ca] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
-ok 6 - get an error for missing tree object
-
-expecting success of 5317.7 'setup for tests of tree:0': 
-	mkdir r1/subtree &&
-	echo "This is a file in a subtree" >r1/subtree/file &&
-	git -C r1 add subtree/file &&
-	git -C r1 commit -m subtree
-
-[main 4b273c5] subtree
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subtree/file
-ok 7 - setup for tests of tree:0
-
-expecting success of 5317.8 'verify tree:0 packfile has no blobs or trees': 
-	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r1 index-pack ../commitsonly.pack &&
-	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
-	! grep -E "tree|blob" objs
-
-a6f7596938aae585d3cefef3aa3c06c5b75da36b
-ok 8 - verify tree:0 packfile has no blobs or trees
-
-expecting success of 5317.9 'grab tree directly when using tree:0': 
-	# We should get the tree specified directly but not its blobs or subtrees.
-	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
-	HEAD:
-	EOF
-	git -C r1 index-pack ../commitsonly.pack &&
-	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
-	awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
-	git -C r1 rev-parse HEAD: >expected &&
-	test_cmp expected trees_and_blobs
-
-2abcb6db3990fe53c59fd41f9590643ae34427f0
-ok 9 - grab tree directly when using tree:0
-
-expecting success of 5317.10 'setup r2': 
-	git init r2 &&
-	for n in 1000 10000
-	do
-		printf "%"$n"s" X > r2/large.$n &&
-		git -C r2 add large.$n &&
-		git -C r2 commit -m "$n" || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
-[main (root-commit) 0c54972] 1000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.1000
-[main fdc71e4] 10000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.10000
-ok 10 - setup r2
-
-expecting success of 5317.11 'verify blob count in normal packfile': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../all.pack &&
-
-	git -C r2 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 11 - verify blob count in normal packfile
-
-expecting success of 5317.12 'verify blob:limit=500 omits all blobs': 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 12 - verify blob:limit=500 omits all blobs
-
-expecting success of 5317.13 'verify blob:limit=1000': 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
-
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 13 - verify blob:limit=1000
-
-expecting success of 5317.14 'verify blob:limit=1001': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 14 - verify blob:limit=1001
-
-expecting success of 5317.15 'verify blob:limit=10001': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 15 - verify blob:limit=10001
-
-expecting success of 5317.16 'verify blob:limit=1k': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 16 - verify blob:limit=1k
-
-expecting success of 5317.17 'verify explicitly specifying oversized blob in input': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	echo HEAD >objects &&
-	git -C r2 rev-parse HEAD:large.10000 >>objects &&
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-caafb8a9cc92845f6f65afdea7e6fac6add3e5df
-ok 17 - verify explicitly specifying oversized blob in input
-
-expecting success of 5317.18 'verify blob:limit=1m': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 18 - verify blob:limit=1m
-
-expecting success of 5317.19 'verify normal and blob:limit packfiles have same commits/trees': 
-	git -C r2 verify-pack -v ../all.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >expected &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 19 - verify normal and blob:limit packfiles have same commits/trees
-
-expecting success of 5317.20 'verify small limit and big limit results in small limit': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
-		--filter=blob:limit=10001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 20 - verify small limit and big limit results in small limit
-
-expecting success of 5317.21 'verify big limit and small limit results in small limit': 
-	git -C r2 ls-files -s large.1000 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
-		--filter=blob:limit=1001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
-
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 21 - verify big limit and small limit results in small limit
-
-expecting success of 5317.22 'setup r3': 
-	git init r3 &&
-	mkdir r3/dir1 &&
-	for n in sparse1 sparse2
-	do
-		echo "This is file: $n" > r3/$n &&
-		git -C r3 add $n &&
-		echo "This is file: dir1/$n" > r3/dir1/$n &&
-		git -C r3 add dir1/$n || return 1
-	done &&
-	git -C r3 commit -m "sparse" &&
-	echo dir1/ >pattern1 &&
-	echo sparse1 >pattern2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
-[main (root-commit) b18fcc1] sparse
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 22 - setup r3
-
-expecting success of 5317.23 'verify blob count in normal packfile': 
-	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r3 index-pack ../all.pack &&
-
-	git -C r3 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-c032f005b6a497478f1daa2fb324aa5c51224039
-ok 23 - verify blob count in normal packfile
-
-expecting success of 5317.24 'verify sparse:path=pattern1 fails': 
-	test_must_fail git -C r3 pack-objects --revs --stdout \
-		--filter=sparse:path=../pattern1 <<-EOF
-	HEAD
-	EOF
-
-fatal: sparse:path filters support has been dropped
-ok 24 - verify sparse:path=pattern1 fails
-
-expecting success of 5317.25 'verify sparse:path=pattern2 fails': 
-	test_must_fail git -C r3 pack-objects --revs --stdout \
-		--filter=sparse:path=../pattern2 <<-EOF
-	HEAD
-	EOF
-
-fatal: sparse:path filters support has been dropped
-ok 25 - verify sparse:path=pattern2 fails
-
-expecting success of 5317.26 'setup r4': 
-	git init r4 &&
-	mkdir r4/dir1 &&
-	for n in sparse1 sparse2
-	do
-		echo "This is file: $n" > r4/$n &&
-		git -C r4 add $n &&
-		echo "This is file: dir1/$n" > r4/dir1/$n &&
-		git -C r4 add dir1/$n || return 1
-	done &&
-	echo dir1/ >r4/pattern &&
-	git -C r4 add pattern &&
-	git -C r4 commit -m "pattern"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
-[main (root-commit) 94c5152] pattern
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 pattern
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 26 - setup r4
-
-expecting success of 5317.27 'verify blob count in normal packfile': 
-	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../all.pack &&
-
-	git -C r4 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-1eda0c5015c4170144f9c7ac96c56690163e1d85
-ok 27 - verify blob count in normal packfile
-
-expecting success of 5317.28 'verify sparse:oid=OID': 
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 ls-files -s pattern >staged &&
-	oid=$(test_parse_ls_files_stage_oids <staged) &&
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../filter.pack &&
-
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 28 - verify sparse:oid=OID
-
-expecting success of 5317.29 'verify sparse:oid=oid-ish': 
-	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../filter.pack &&
-
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
-
-	test_cmp expected observed
-
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 29 - verify sparse:oid=oid-ish
-
-expecting success of 5317.30 'setup r1 - delete loose blobs': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	test_parse_ls_files_stage_oids <ls_files_result |
-	sort >expected &&
-
-	for id in `sed "s|..|&/|" expected`
-	do
-		rm r1/.git/objects/$id || return 1
-	done
-
-ok 30 - setup r1 - delete loose blobs
-
-expecting success of 5317.31 'verify pack-objects fails w/ missing objects': 
-	test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
-	HEAD
-	EOF
-
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 31 - verify pack-objects fails w/ missing objects
-
-expecting success of 5317.32 'verify pack-objects fails w/ --missing=error': 
-	test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
-	HEAD
-	EOF
-
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 32 - verify pack-objects fails w/ --missing=error
-
-expecting success of 5317.33 'verify pack-objects w/ --missing=allow-any': 
-	git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
-	HEAD
-	EOF
-
-ok 33 - verify pack-objects w/ --missing=allow-any
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4137-apply-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/.git/
-expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file3
@@ -302099,6 +301164,894 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5320-delta-islands.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5320-delta-islands/.git/
+expecting success of 5320.1 'setup commits': 
+	commit one seed 1 &&
+	commit two seed 12
+
+one=babc1f87e2baa9f6ad764af981fccdd2da48016e
+two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 1 - setup commits
+
+expecting success of 5320.2 'vanilla repack deltas one against two': 
+	git repack -adf &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 2 - vanilla repack deltas one against two
+
+expecting success of 5320.3 'island repack with no island definition is vanilla': 
+	git repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 3 - island repack with no island definition is vanilla
+
+expecting success of 5320.4 'island repack with no matches is vanilla': 
+	git -c "pack.island=refs/foo" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 4 - island repack with no matches is vanilla
+
+expecting success of 5320.5 'separate islands disallows delta': 
+	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
+	! is_delta_base $one $two &&
+	! is_delta_base $two $one
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
+ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
+ok 5 - separate islands disallows delta
+
+expecting success of 5320.6 'same island allows delta': 
+	git -c "pack.island=refs/heads" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 6 - same island allows delta
+
+expecting success of 5320.7 'coalesce same-named islands': 
+	git \
+		-c "pack.island=refs/(.*)/one" \
+		-c "pack.island=refs/(.*)/two" \
+		repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 7 - coalesce same-named islands
+
+expecting success of 5320.8 'island restrictions drop reused deltas': 
+	git repack -adfi &&
+	is_delta_base $one $two &&
+	git -c "pack.island=refs/heads/(.*)" repack -adi &&
+	! is_delta_base $one $two &&
+	! is_delta_base $two $one
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
+ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
+ok 8 - island restrictions drop reused deltas
+
+expecting success of 5320.9 'island regexes are left-anchored': 
+	git -c "pack.island=heads/(.*)" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 9 - island regexes are left-anchored
+
+expecting success of 5320.10 'island regexes follow last-one-wins scheme': 
+	git \
+		-c "pack.island=refs/heads/(.*)" \
+		-c "pack.island=refs/heads/" \
+		repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 10 - island regexes follow last-one-wins scheme
+
+expecting success of 5320.11 'setup shared history': 
+	commit root shared root &&
+	commit one shared 1 root &&
+	commit two shared 12-long root
+
+root=2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+one=1db8b3605f452b4a89b403abb2ae905f0a7ffaf6
+two=c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+ok 11 - setup shared history
+
+expecting success of 5320.12 'vanilla delta goes between branches': 
+	git repack -adf &&
+	is_delta_base $one $two &&
+	is_delta_base $root $two
+
+1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+2399f35d1d9acc612cefa2f7983f510fbd6b24e9 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+ok 12 - vanilla delta goes between branches
+
+expecting success of 5320.13 'deltas allowed against superset islands': 
+	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
+	is_delta_base $one $root &&
+	is_delta_base $two $root
+
+1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+c160aaeae55c91b198ce651c8fc1d4e09dd97b4b has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+ok 13 - deltas allowed against superset islands
+
+expecting success of 5320.14 'island core places core objects first': 
+	cat >expect <<-EOF &&
+	$root
+	$two
+	EOF
+	git -c "pack.island=refs/heads/(.*)" \
+	    -c "pack.islandcore=one" \
+	    repack -adfi &&
+	git verify-pack -v .git/objects/pack/*.pack |
+	cut -d" " -f1 |
+	grep -E "$root|$two" >actual &&
+	test_cmp expect actual
+
+ok 14 - island core places core objects first
+
+expecting success of 5320.15 'unmatched island core is not fatal': 
+	git -c "pack.islandcore=one" repack -adfi
+
+ok 15 - unmatched island core is not fatal
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5322-pack-objects-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5322-pack-objects-sparse/.git/
+expecting success of 5322.1 'setup repo': 
+	test_commit initial &&
+	for i in $(test_seq 1 3)
+	do
+		mkdir f$i &&
+		for j in $(test_seq 1 3)
+		do
+			mkdir f$i/f$j &&
+			echo $j >f$i/f$j/data.txt || return 1
+		done
+	done &&
+	git add . &&
+	git commit -m "Initialized trees" &&
+	for i in $(test_seq 1 3)
+	do
+		git checkout -b topic$i main &&
+		echo change-$i >f$i/f$i/data.txt &&
+		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
+	done &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic2
+	^topic3
+	EOF
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >expect_objects.txt
+
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 8ccf85b] Initialized trees
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 f1/f1/data.txt
+ create mode 100644 f1/f2/data.txt
+ create mode 100644 f1/f3/data.txt
+ create mode 100644 f2/f1/data.txt
+ create mode 100644 f2/f2/data.txt
+ create mode 100644 f2/f3/data.txt
+ create mode 100644 f3/f1/data.txt
+ create mode 100644 f3/f2/data.txt
+ create mode 100644 f3/f3/data.txt
+Switched to a new branch 'topic1'
+[topic1 32cf0ab] Changed f1/f1/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic2'
+[topic2 2b44896] Changed f2/f2/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic3'
+[topic3 48a532e] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repo
+
+expecting success of 5322.2 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	test_cmp expect_objects.txt nonsparse_objects.txt
+
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 2 - non-sparse pack-objects
+
+expecting success of 5322.3 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_objects.txt sparse_objects.txt
+
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 3 - sparse pack-objects
+
+expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
+	git checkout topic1 &&
+	echo change-3 >f3/f3/data.txt &&
+	git commit -a -m "Changed f3/f3/data.txt" &&
+	git rev-parse			\
+		topic1~1		\
+		topic1~1^{tree}		\
+		topic1^{tree}		\
+		topic1			\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >required_objects.txt
+
+Switched to branch 'topic1'
+[topic1 200bcc4] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - duplicate a folder from f3 and commit to topic1
+
+expecting success of 5322.5 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
+
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 5 - non-sparse pack-objects
+
+expecting success of 5322.6 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
+	test_cmp required_objects.txt sparse_required_objects.txt
+
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 6 - sparse pack-objects
+
+expecting success of 5322.7 'duplicate a folder from f1 into f3': 
+	mkdir f3/f4 &&
+	cp -r f1/f1/* f3/f4 &&
+	git add f3/f4 &&
+	git commit -m "Copied f1/f1 to f3/f4" &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic1~1
+	EOF
+	git rev-parse		\
+		topic1		\
+		topic1^{tree}   \
+		topic1:f3 | sort >required_objects.txt
+
+[topic1 b9b902e] Copied f1/f1 to f3/f4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f3/f4/data.txt
+ok 7 - duplicate a folder from f1 into f3
+
+expecting success of 5322.8 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
+
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 8 - non-sparse pack-objects
+
+expecting success of 5322.9 'sparse pack-objects': 
+	GIT_TEST_PACK_SPARSE=-1 &&
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f3		\
+		topic1:f3/f4		\
+		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
+
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 9 - sparse pack-objects
+
+expecting success of 5322.10 'pack.useSparse enables algorithm': 
+	git config pack.useSparse true &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
+
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 10 - pack.useSparse enables algorithm
+
+expecting success of 5322.11 'pack.useSparse overridden': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp required_objects.txt sparse_objects.txt
+
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 11 - pack.useSparse overridden
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5317-pack-objects-filter-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/.git/
+expecting success of 5317.1 'setup r1': 
+	git init r1 &&
+	for n in 1 2 3 4 5
+	do
+		echo "This is file: $n" > r1/file.$n &&
+		git -C r1 add file.$n &&
+		git -C r1 commit -m "$n" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
+[main (root-commit) a56c7ae] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1
+[main 7d743f2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2
+[main fcc1d33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3
+[main e1d918e] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4
+[main 90f11b5] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.5
+ok 1 - setup r1
+
+expecting success of 5317.2 'verify blob count in normal packfile': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../all.pack &&
+
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
+ok 2 - verify blob count in normal packfile
+
+expecting success of 5317.3 'verify blob:none packfile has no blobs': 
+	git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../filter.pack &&
+
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
+ok 3 - verify blob:none packfile has no blobs
+
+expecting success of 5317.4 'verify blob:none packfile without --stdout': 
+	git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
+	! grep blob verify_result
+
+ok 4 - verify blob:none packfile without --stdout
+
+expecting success of 5317.5 'verify normal and blob:none packfiles have same commits/trees': 
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
+
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 5 - verify normal and blob:none packfiles have same commits/trees
+
+expecting success of 5317.6 'get an error for missing tree object': 
+	git init r5 &&
+	echo foo >r5/foo &&
+	git -C r5 add foo &&
+	git -C r5 commit -m "foo" &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
+	rm r5/.git/objects/$del &&
+	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
+	HEAD
+	EOF
+	grep "bad tree object" bad_tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
+[main (root-commit) fbd86ca] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
+ok 6 - get an error for missing tree object
+
+expecting success of 5317.7 'setup for tests of tree:0': 
+	mkdir r1/subtree &&
+	echo "This is a file in a subtree" >r1/subtree/file &&
+	git -C r1 add subtree/file &&
+	git -C r1 commit -m subtree
+
+[main 4b273c5] subtree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subtree/file
+ok 7 - setup for tests of tree:0
+
+expecting success of 5317.8 'verify tree:0 packfile has no blobs or trees': 
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	! grep -E "tree|blob" objs
+
+a6f7596938aae585d3cefef3aa3c06c5b75da36b
+ok 8 - verify tree:0 packfile has no blobs or trees
+
+expecting success of 5317.9 'grab tree directly when using tree:0': 
+	# We should get the tree specified directly but not its blobs or subtrees.
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD:
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
+	git -C r1 rev-parse HEAD: >expected &&
+	test_cmp expected trees_and_blobs
+
+2abcb6db3990fe53c59fd41f9590643ae34427f0
+ok 9 - grab tree directly when using tree:0
+
+expecting success of 5317.10 'setup r2': 
+	git init r2 &&
+	for n in 1000 10000
+	do
+		printf "%"$n"s" X > r2/large.$n &&
+		git -C r2 add large.$n &&
+		git -C r2 commit -m "$n" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
+[main (root-commit) 0c54972] 1000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.1000
+[main fdc71e4] 10000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.10000
+ok 10 - setup r2
+
+expecting success of 5317.11 'verify blob count in normal packfile': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../all.pack &&
+
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 11 - verify blob count in normal packfile
+
+expecting success of 5317.12 'verify blob:limit=500 omits all blobs': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 12 - verify blob:limit=500 omits all blobs
+
+expecting success of 5317.13 'verify blob:limit=1000': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 13 - verify blob:limit=1000
+
+expecting success of 5317.14 'verify blob:limit=1001': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 14 - verify blob:limit=1001
+
+expecting success of 5317.15 'verify blob:limit=10001': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 15 - verify blob:limit=10001
+
+expecting success of 5317.16 'verify blob:limit=1k': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 16 - verify blob:limit=1k
+
+expecting success of 5317.17 'verify explicitly specifying oversized blob in input': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+caafb8a9cc92845f6f65afdea7e6fac6add3e5df
+ok 17 - verify explicitly specifying oversized blob in input
+
+expecting success of 5317.18 'verify blob:limit=1m': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 18 - verify blob:limit=1m
+
+expecting success of 5317.19 'verify normal and blob:limit packfiles have same commits/trees': 
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 19 - verify normal and blob:limit packfiles have same commits/trees
+
+expecting success of 5317.20 'verify small limit and big limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
+		--filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 20 - verify small limit and big limit results in small limit
+
+expecting success of 5317.21 'verify big limit and small limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
+		--filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 21 - verify big limit and small limit results in small limit
+
+expecting success of 5317.22 'setup r3': 
+	git init r3 &&
+	mkdir r3/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r3/$n &&
+		git -C r3 add $n &&
+		echo "This is file: dir1/$n" > r3/dir1/$n &&
+		git -C r3 add dir1/$n || return 1
+	done &&
+	git -C r3 commit -m "sparse" &&
+	echo dir1/ >pattern1 &&
+	echo sparse1 >pattern2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
+[main (root-commit) b18fcc1] sparse
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 22 - setup r3
+
+expecting success of 5317.23 'verify blob count in normal packfile': 
+	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r3 index-pack ../all.pack &&
+
+	git -C r3 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+c032f005b6a497478f1daa2fb324aa5c51224039
+ok 23 - verify blob count in normal packfile
+
+expecting success of 5317.24 'verify sparse:path=pattern1 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern1 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 24 - verify sparse:path=pattern1 fails
+
+expecting success of 5317.25 'verify sparse:path=pattern2 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern2 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 25 - verify sparse:path=pattern2 fails
+
+expecting success of 5317.26 'setup r4': 
+	git init r4 &&
+	mkdir r4/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r4/$n &&
+		git -C r4 add $n &&
+		echo "This is file: dir1/$n" > r4/dir1/$n &&
+		git -C r4 add dir1/$n || return 1
+	done &&
+	echo dir1/ >r4/pattern &&
+	git -C r4 add pattern &&
+	git -C r4 commit -m "pattern"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
+[main (root-commit) 94c5152] pattern
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 pattern
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 26 - setup r4
+
+expecting success of 5317.27 'verify blob count in normal packfile': 
+	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../all.pack &&
+
+	git -C r4 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+1eda0c5015c4170144f9c7ac96c56690163e1d85
+ok 27 - verify blob count in normal packfile
+
+expecting success of 5317.28 'verify sparse:oid=OID': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(test_parse_ls_files_stage_oids <staged) &&
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 28 - verify sparse:oid=OID
+
+expecting success of 5317.29 'verify sparse:oid=oid-ish': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 29 - verify sparse:oid=oid-ish
+
+expecting success of 5317.30 'setup r1 - delete loose blobs': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	for id in `sed "s|..|&/|" expected`
+	do
+		rm r1/.git/objects/$id || return 1
+	done
+
+ok 30 - setup r1 - delete loose blobs
+
+expecting success of 5317.31 'verify pack-objects fails w/ missing objects': 
+	test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 31 - verify pack-objects fails w/ missing objects
+
+expecting success of 5317.32 'verify pack-objects fails w/ --missing=error': 
+	test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 32 - verify pack-objects fails w/ --missing=error
+
+expecting success of 5317.33 'verify pack-objects w/ --missing=allow-any': 
+	git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
+	HEAD
+	EOF
+
+ok 33 - verify pack-objects w/ --missing=allow-any
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5323-pack-redundant.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5323-pack-redundant/.git/
 checking prerequisite: WITHOUT_BREAKING_CHANGES
@@ -302447,7 +302400,7 @@
 68c6c8c8538900694c32380ac1484201c8b60d8d
 4+0 records in
 4+0 records out
-4 bytes copied, 3.928e-05 s, 102 kB/s
+4 bytes copied, 3.6321e-05 s, 110 kB/s
 fatal: sha1 file '.git/objects/pack/pack-68c6c8c8538900694c32380ac1484201c8b60d8d.rev' validation error
 ok 4 - index-pack can verify reverse indexes
 
@@ -302580,7 +302533,7 @@
 
 5+0 records in
 5+0 records out
-5 bytes copied, 0.00286208 s, 1.7 kB/s
+5 bytes copied, 0.0065 s, 0.8 kB/s
 error: invalid checksum
 ok 12 - fsck catches invalid checksum
 
@@ -302590,7 +302543,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0193306 s, 0.1 kB/s
+1 byte copied, 3.776e-05 s, 26.5 kB/s
 error: invalid rev-index position at 0: 1 != 1793
 ok 13 - fsck catches invalid row position
 
@@ -302600,7 +302553,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.756e-05 s, 26.6 kB/s
+1 byte copied, 0.00750337 s, 0.1 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
 ok 14 - fsck catches invalid header: magic number
 
@@ -302610,7 +302563,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.372e-05 s, 29.7 kB/s
+1 byte copied, 0.011076 s, 0.1 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
 ok 15 - fsck catches invalid header: version
 
@@ -302620,7 +302573,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00232504 s, 0.4 kB/s
+1 byte copied, 3.68e-05 s, 27.2 kB/s
 error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported hash id 3
 ok 16 - fsck catches invalid header: hash function
 
@@ -302877,6 +302830,335 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5331-pack-objects-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/.git/
+expecting success of 5331.1 'setup for --stdin-packs tests': 
+	git init stdin-packs &&
+	(
+		cd stdin-packs &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		for id in A B C
+		do
+			git pack-objects .git/objects/pack/pack-$id \
+				--incremental --revs <<-EOF || exit 1
+			refs/tags/$id
+			EOF
+		done &&
+
+		ls -la .git/objects/pack
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+794781495799da912f5473db27abed9641406f96
+3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
+c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
+total 36
+drwxr-xr-x  2 pbuilder2 pbuilder2  220 Mar 17 13:23 .
+drwxr-xr-x 13 pbuilder2 pbuilder2  260 Mar 17 13:23 ..
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 17 13:23 pack-A-794781495799da912f5473db27abed9641406f96.idx
+-r--r--r--  1 pbuilder2 pbuilder2  210 Mar 17 13:23 pack-A-794781495799da912f5473db27abed9641406f96.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 17 13:23 pack-A-794781495799da912f5473db27abed9641406f96.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 17 13:23 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
+-r--r--r--  1 pbuilder2 pbuilder2  267 Mar 17 13:23 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 17 13:23 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Mar 17 13:23 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
+-r--r--r--  1 pbuilder2 pbuilder2  292 Mar 17 13:23 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Mar 17 13:23 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
+ok 1 - setup for --stdin-packs tests
+
+expecting success of 5331.2 '--stdin-packs with excluded packs': 
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		git pack-objects test --stdin-packs <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
+		) >expect.raw &&
+		git show-index <$(ls test-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+
+d79f0a91fe88b889c156c95980949119173ad813
+ok 2 - --stdin-packs with excluded packs
+
+expecting success of 5331.3 '--stdin-packs is incompatible with --filter': 
+	(
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --stdout \
+			--filter=blob:none </dev/null 2>err &&
+		test_grep "cannot use --filter with --stdin-packs" err
+	)
+
+fatal: cannot use --filter with --stdin-packs
+ok 3 - --stdin-packs is incompatible with --filter
+
+expecting success of 5331.4 '--stdin-packs is incompatible with --revs': 
+	(
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --revs out \
+			</dev/null 2>err &&
+		test_grep "cannot use internal rev list with --stdin-packs" err
+	)
+
+fatal: cannot use internal rev list with --stdin-packs
+ok 4 - --stdin-packs is incompatible with --revs
+
+expecting success of 5331.5 '--stdin-packs with loose objects': 
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		test_commit D && # loose
+
+		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+
+		) >expect.raw &&
+		ls -la . &&
+		git show-index <$(ls test2-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+
+[main 71a49b9] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
+total 60
+drwxr-xr-x 3 pbuilder2 pbuilder2  360 Mar 17 13:23 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Mar 17 13:23 ..
+drwxr-xr-x 7 pbuilder2 pbuilder2  240 Mar 17 13:23 .git
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 17 13:23 A.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 17 13:23 B.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 17 13:23 C.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Mar 17 13:23 D.t
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Mar 17 13:23 actual
+-rw-r--r-- 1 pbuilder2 pbuilder2  335 Mar 17 13:23 actual.raw
+-rw-r--r-- 1 pbuilder2 pbuilder2   55 Mar 17 13:23 err
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Mar 17 13:23 expect
+-rw-r--r-- 1 pbuilder2 pbuilder2  457 Mar 17 13:23 expect.raw
+-r--r--r-- 1 pbuilder2 pbuilder2 1240 Mar 17 13:23 test-d79f0a91fe88b889c156c95980949119173ad813.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  470 Mar 17 13:23 test-d79f0a91fe88b889c156c95980949119173ad813.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   76 Mar 17 13:23 test-d79f0a91fe88b889c156c95980949119173ad813.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Mar 17 13:23 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  693 Mar 17 13:23 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Mar 17 13:23 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
+ok 5 - --stdin-packs with loose objects
+
+expecting success of 5331.6 '--stdin-packs with broken links': 
+	(
+		cd stdin-packs &&
+
+		# make an unreachable object with a bogus parent
+		git cat-file -p HEAD >commit &&
+		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
+		git hash-object -w -t commit --stdin >in &&
+
+		git pack-objects .git/objects/pack/pack-D <in &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
+
+		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		$PACK_D
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+		) >expect.raw &&
+		git show-index <$(ls test3-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+
+1c529235d2f84e54e1f186c4d2b6c65a26299d38
+311b91635d22c7f6c52ccf0def9203e563de1a4e
+ok 6 - --stdin-packs with broken links
+
+expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
+	test_when_finished "rm -fr repo" &&
+
+	git init repo &&
+	(
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
+
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			basename .git/objects/pack/pack-*.pack
+		} >packfiles &&
+
+		git pack-objects --stdin-packs generated-pack <packfiles &&
+		packed_objects .git/objects/pack/pack-*.idx >expect &&
+		packed_objects generated-pack-*.idx >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
+ok 7 - pack-objects --stdin with duplicate packfile
+
+expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
+	test_when_finished "rm -fr repo" &&
+
+	git init repo &&
+	(
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
+
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
+		} >packfiles &&
+
+		git pack-objects --stdin-packs generated-pack <packfiles &&
+		packed_objects generated-pack-*.idx >packed-objects &&
+		test_must_be_empty packed-objects
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 8 - pack-objects --stdin with same packfile excluded and included
+
+expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
+	test_when_finished "rm -fr shared member" &&
+
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-objects" &&
+	git -C shared repack -ad &&
+	basename shared/.git/objects/pack/pack-*.pack >packfile &&
+
+	# Set up a repository that is connected to the shared repository. This
+	# repository has no objects on its own, but we still expect to be able
+	# to pack objects from its alternate.
+	git clone --shared shared member &&
+	git -C member pack-objects --stdin-packs generated-pack <packfile &&
+	test_cmp shared/.git/objects/pack/pack-*.pack member/generated-pack-*.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/shared/.git/
+[main (root-commit) 145e1e6] shared-objects
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-objects.t
+Cloning into 'member'...
+done.
+33d7aff4e675ff5bc1d48bcdab29cb013e53965b
+ok 9 - pack-objects --stdin with packfiles from alternate object database
+
+expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
+	test_when_finished "rm -fr shared member" &&
+
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-commit" &&
+	git -C shared repack -ad &&
+
+	# Set up a repository that is connected to the shared repository. This
+	# repository has a second packfile so that we can verify that it is
+	# possible to write packs that include packfiles from different object
+	# databases.
+	git clone --shared shared member &&
+	test_commit -C member "local-commit" &&
+	git -C member repack -dl &&
+
+	{
+		basename shared/.git/objects/pack/pack-*.pack &&
+		basename member/.git/objects/pack/pack-*.pack
+	} >packfiles &&
+
+	{
+		packed_objects shared/.git/objects/pack/pack-*.idx &&
+		packed_objects member/.git/objects/pack/pack-*.idx
+	} | sort >expected-objects &&
+
+	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
+	packed_objects member/generated-pack-*.idx >actual-objects &&
+	test_cmp expected-objects actual-objects
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/shared/.git/
+[main (root-commit) 4c151b8] shared-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-commit.t
+Cloning into 'member'...
+done.
+[main 7c14a26] local-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local-commit.t
+d3e539037cb74e50eb4452759efc2fac0ae5e17a
+ok 10 - pack-objects --stdin with packfiles from main and alternate object database
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5300-pack-object.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5300-pack-object/.git/
 expecting success of 5300.1 'setup': 
@@ -303275,7 +303557,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.532e-05 s, 28.3 kB/s
+1 byte copied, 0.0115189 s, 0.1 kB/s
 fatal: pack signature mismatch
 ok 27 - verify-pack catches a corrupted pack signature
 
@@ -303289,7 +303571,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.192e-05 s, 23.9 kB/s
+1 byte copied, 3.808e-05 s, 26.3 kB/s
 fatal: pack version 10 unsupported
 ok 28 - verify-pack catches a corrupted pack version
 
@@ -303303,7 +303585,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.768e-05 s, 26.5 kB/s
+1 byte copied, 3.96e-05 s, 25.3 kB/s
 fatal: pack has bad object at offset 12: unknown object type 0
 ok 29 - verify-pack catches a corrupted type/size of the 1st packed object data
 
@@ -303319,7 +303601,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 4.788e-05 s, 418 kB/s
+20 bytes copied, 0.0136289 s, 1.5 kB/s
 fatal: sha1 file 'test-3.idx' validation error
 ok 30 - verify-pack catches a corrupted sum of the index file itself
 
@@ -304058,333 +304340,1584 @@
 1..61
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5331-pack-objects-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/.git/
-expecting success of 5331.1 'setup for --stdin-packs tests': 
-	git init stdin-packs &&
-	(
-		cd stdin-packs &&
+*** t5302-pack-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5302-pack-index/.git/
+expecting success of 5302.1 'setup': 
+	rawsz=$(test_oid rawsz) &&
+	rm -rf .git &&
+	git init &&
+	git config pack.threads 1 &&
+	i=1 &&
+	while test $i -le 100
+	do
+		iii=$(printf "%03i" $i) &&
+		test-tool genrandom "bar" 200 > wide_delta_$iii &&
+		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
+		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
+		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
+		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
+		echo $iii >file_$iii &&
+		test-tool genrandom "$iii" 8192 >>file_$iii &&
+		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
+		i=$(expr $i + 1) || return 1
+	done &&
+	{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
+	git update-index --add file_101 &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) && {
+		echo $tree &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list &&
+	git update-ref HEAD $commit
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5302-pack-index/.git/
+ok 1 - setup
 
-		for id in A B C
-		do
-			git pack-objects .git/objects/pack/pack-$id \
-				--incremental --revs <<-EOF || exit 1
-			refs/tags/$id
-			EOF
-		done &&
+expecting success of 5302.2 'pack-objects with index version 1': 
+	pack1=$(git pack-objects --index-version=1 test-1 <obj-list) &&
+	git verify-pack -v "test-1-${pack1}.pack"
 
-		ls -la .git/objects/pack
-	)
+4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
+e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
+78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
+1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
+571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
+671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
+f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
+0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
+1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
+19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
+2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
+b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
+ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
+a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
+b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
+9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
+35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
+0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
+305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
+67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
+61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
+5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
+1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
+ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
+ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
+ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
+ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
+17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
+36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
+60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
+a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
+ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
+612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
+ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
+d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
+e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
+8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
+8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
+416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
+8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
+beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
+0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
+9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
+66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
+bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
+2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
+f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
+add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
+75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
+64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
+597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
+8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
+c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
+0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
+cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
+2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
+0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
+633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
+76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
+df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
+9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
+ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
+1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
+9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
+a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
+cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
+60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
+f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
+5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
+d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
+67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
+c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
+258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
+fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
+e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
+383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
+ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
+9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
+c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
+1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
+bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
+71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
+2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
+83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
+b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
+298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
+ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
+b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
+368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
+16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
+711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
+d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
+bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
+fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
+b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
+4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
+2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
+99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
+8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
+f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
+3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
+1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
+862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
+0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
+c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
+e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
+bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
+0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
+359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
+8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
+8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
+6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
+09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
+f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
+964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
+408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
+912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
+f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
+b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
+49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
+8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
+fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
+f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
+01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
+de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
+9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
+816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
+72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
+41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
+94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
+85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
+bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
+b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
+20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
+94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
+7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
+e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
+8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
+ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
+92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
+f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
+59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
+2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
+c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
+03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
+dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
+8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
+614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
+b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
+852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
+15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
+75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
+95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
+5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
+c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
+57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
+84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
+2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
+9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
+a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
+5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
+de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
+d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
+72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
+debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
+e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
+197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
+fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
+10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
+16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
+08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
+e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
+5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
+14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
+84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
+5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
+610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
+3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
+0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
+611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
+e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
+ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
+d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
+b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
+99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
+159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
+1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
+6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
+b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
+cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
+72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
+b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
+e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
+aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
+d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
+fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
+5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
+a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
+bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
+b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
+3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
+0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
+34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
+8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
+e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
+37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
+a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
+99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
+e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
+a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
+53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
+26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
+c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
+a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
+36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
+642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
+29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
+d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
+ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
+2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
+fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
+b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
+6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
+38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
+69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
+c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
+a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
+735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
+84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
+5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
+c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
+441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
+55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
+86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
+8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
+c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
+9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
+fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
+879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
+d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
+088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
+9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
+2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
+9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
+a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
+291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
+464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
+aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
+896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
+f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
+d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
+8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
+e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
+abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
+6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
+b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
+088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
+609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
+90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
+05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
+cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
+73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
+46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
+ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
+0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
+f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
+636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
+497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
+c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
+921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
+9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
+1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
+188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
+cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
+dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
+d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
+2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
+035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
+74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
+efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
+92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
+da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
+63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
+5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
+aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
+141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
+e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
+4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
+c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
+91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
+0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
+36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
+54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
+8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
+6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
+7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
+non delta: 112 objects
+chain length = 1: 110 objects
+chain length = 2: 10 objects
+chain length = 3: 10 objects
+chain length = 4: 10 objects
+chain length = 5: 10 objects
+chain length = 6: 10 objects
+chain length = 7: 10 objects
+chain length = 8: 10 objects
+chain length = 9: 10 objects
+test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
+ok 2 - pack-objects with index version 1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-794781495799da912f5473db27abed9641406f96
-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
-total 36
-drwxr-xr-x  2 pbuilder1 pbuilder1  220 Apr 19 19:20 .
-drwxr-xr-x 13 pbuilder1 pbuilder1  260 Apr 19 19:20 ..
--r--r--r--  1 pbuilder1 pbuilder1 1156 Apr 19 19:20 pack-A-794781495799da912f5473db27abed9641406f96.idx
--r--r--r--  1 pbuilder1 pbuilder1  210 Apr 19 19:20 pack-A-794781495799da912f5473db27abed9641406f96.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Apr 19 19:20 pack-A-794781495799da912f5473db27abed9641406f96.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Apr 19 19:20 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
--r--r--r--  1 pbuilder1 pbuilder1  267 Apr 19 19:20 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Apr 19 19:20 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Apr 19 19:20 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
--r--r--r--  1 pbuilder1 pbuilder1  292 Apr 19 19:20 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Apr 19 19:20 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
-ok 1 - setup for --stdin-packs tests
+expecting success of 5302.3 'pack-objects with index version 2': 
+	pack2=$(git pack-objects --index-version=2 test-2 <obj-list) &&
+	git verify-pack -v "test-2-${pack2}.pack"
 
-expecting success of 5331.2 '--stdin-packs with excluded packs': 
-	(
-		cd stdin-packs &&
+4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
+e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
+78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
+1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
+571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
+671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
+f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
+0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
+1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
+19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
+2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
+b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
+ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
+a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
+b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
+9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
+35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
+0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
+305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
+67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
+61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
+5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
+1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
+ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
+ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
+ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
+ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
+17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
+36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
+60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
+a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
+ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
+612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
+ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
+d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
+e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
+8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
+8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
+416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
+8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
+beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
+0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
+9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
+66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
+bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
+2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
+f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
+add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
+75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
+64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
+597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
+8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
+c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
+0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
+cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
+2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
+0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
+633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
+76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
+df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
+9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
+ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
+1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
+9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
+a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
+cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
+60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
+f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
+5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
+d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
+67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
+c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
+258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
+fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
+e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
+383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
+ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
+9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
+c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
+1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
+bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
+71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
+2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
+83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
+b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
+298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
+ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
+b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
+368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
+16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
+711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
+d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
+bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
+fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
+b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
+4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
+2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
+99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
+8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
+f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
+3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
+1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
+862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
+0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
+c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
+e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
+bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
+0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
+359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
+8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
+8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
+6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
+09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
+f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
+964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
+408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
+912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
+f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
+b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
+49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
+8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
+fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
+f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
+01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
+de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
+9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
+816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
+72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
+41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
+94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
+85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
+bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
+b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
+20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
+94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
+7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
+e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
+8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
+ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
+92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
+f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
+59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
+2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
+c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
+03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
+dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
+8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
+614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
+b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
+852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
+15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
+75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
+95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
+5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
+c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
+57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
+84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
+2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
+9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
+a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
+5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
+de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
+d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
+72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
+debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
+e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
+197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
+fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
+10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
+16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
+08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
+e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
+5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
+14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
+84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
+5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
+610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
+3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
+0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
+611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
+e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
+ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
+d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
+b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
+99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
+159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
+1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
+6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
+b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
+cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
+72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
+b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
+e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
+aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
+d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
+fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
+5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
+a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
+bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
+b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
+3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
+0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
+34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
+8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
+e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
+37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
+a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
+99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
+e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
+a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
+53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
+26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
+c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
+a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
+36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
+642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
+29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
+d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
+ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
+2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
+fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
+b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
+6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
+38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
+69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
+c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
+a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
+735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
+84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
+5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
+c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
+441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
+55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
+86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
+8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
+c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
+9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
+fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
+879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
+d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
+088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
+9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
+2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
+9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
+a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
+291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
+464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
+aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
+896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
+f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
+d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
+8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
+e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
+abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
+6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
+b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
+088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
+609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
+90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
+05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
+cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
+73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
+46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
+ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
+0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
+f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
+636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
+497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
+c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
+921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
+9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
+1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
+188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
+cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
+dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
+d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
+2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
+035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
+74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
+efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
+92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
+da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
+63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
+5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
+aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
+141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
+e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
+4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
+c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
+91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
+0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
+36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
+54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
+8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
+6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
+7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
+non delta: 112 objects
+chain length = 1: 110 objects
+chain length = 2: 10 objects
+chain length = 3: 10 objects
+chain length = 4: 10 objects
+chain length = 5: 10 objects
+chain length = 6: 10 objects
+chain length = 7: 10 objects
+chain length = 8: 10 objects
+chain length = 9: 10 objects
+test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
+ok 3 - pack-objects with index version 2
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+expecting success of 5302.4 'both packs should be identical': 
+	cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"
 
-		git pack-objects test --stdin-packs <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
+ok 4 - both packs should be identical
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
-		) >expect.raw &&
-		git show-index <$(ls test-*.idx) >actual.raw &&
+expecting success of 5302.5 'index v1 and index v2 should be different': 
+	! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 1, line 1
+ok 5 - index v1 and index v2 should be different
 
-d79f0a91fe88b889c156c95980949119173ad813
-ok 2 - --stdin-packs with excluded packs
+expecting success of 5302.6 'index-pack with index version 1': 
+	git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"
 
-expecting success of 5331.3 '--stdin-packs is incompatible with --filter': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --stdout \
-			--filter=blob:none </dev/null 2>err &&
-		test_grep "cannot use --filter with --stdin-packs" err
-	)
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 6 - index-pack with index version 1
 
-fatal: cannot use --filter with --stdin-packs
-ok 3 - --stdin-packs is incompatible with --filter
+expecting success of 5302.7 'index-pack with index version 2': 
+	git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"
 
-expecting success of 5331.4 '--stdin-packs is incompatible with --revs': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --revs out \
-			</dev/null 2>err &&
-		test_grep "cannot use internal rev list with --stdin-packs" err
-	)
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 7 - index-pack with index version 2
 
-fatal: cannot use internal rev list with --stdin-packs
-ok 4 - --stdin-packs is incompatible with --revs
+expecting success of 5302.8 'index-pack results should match pack-objects ones': 
+	cmp "test-1-${pack1}.idx" "1.idx" &&
+	cmp "test-2-${pack2}.idx" "2.idx"
 
-expecting success of 5331.5 '--stdin-packs with loose objects': 
-	(
-		cd stdin-packs &&
+ok 8 - index-pack results should match pack-objects ones
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+expecting success of 5302.9 'index-pack --verify on index version 1': 
+	git index-pack --verify "test-1-${pack1}.pack"
 
-		test_commit D && # loose
+ok 9 - index-pack --verify on index version 1
 
-		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
+expecting success of 5302.10 'index-pack --verify on index version 2': 
+	git index-pack --verify "test-2-${pack2}.pack"
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
+ok 10 - index-pack --verify on index version 2
 
-		) >expect.raw &&
-		ls -la . &&
-		git show-index <$(ls test2-*.idx) >actual.raw &&
+expecting success of 5302.11 'pack-objects --index-version=2, is not accepted': 
+	test_must_fail git pack-objects --index-version=2, test-3 <obj-list
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+fatal: bad index version '2,'
+ok 11 - pack-objects --index-version=2, is not accepted
 
-[main 71a49b9] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
-total 60
-drwxr-xr-x 3 pbuilder1 pbuilder1  360 Apr 19 19:20 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Apr 19 19:20 ..
-drwxr-xr-x 7 pbuilder1 pbuilder1  240 Apr 19 19:20 .git
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Apr 19 19:20 A.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Apr 19 19:20 B.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Apr 19 19:20 C.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Apr 19 19:20 D.t
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Apr 19 19:20 actual
--rw-r--r-- 1 pbuilder1 pbuilder1  335 Apr 19 19:20 actual.raw
--rw-r--r-- 1 pbuilder1 pbuilder1   55 Apr 19 19:20 err
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Apr 19 19:20 expect
--rw-r--r-- 1 pbuilder1 pbuilder1  457 Apr 19 19:20 expect.raw
--r--r--r-- 1 pbuilder1 pbuilder1 1240 Apr 19 19:20 test-d79f0a91fe88b889c156c95980949119173ad813.idx
--r--r--r-- 1 pbuilder1 pbuilder1  470 Apr 19 19:20 test-d79f0a91fe88b889c156c95980949119173ad813.pack
--r--r--r-- 1 pbuilder1 pbuilder1   76 Apr 19 19:20 test-d79f0a91fe88b889c156c95980949119173ad813.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Apr 19 19:20 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
--r--r--r-- 1 pbuilder1 pbuilder1  693 Apr 19 19:20 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Apr 19 19:20 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
-ok 5 - --stdin-packs with loose objects
+expecting success of 5302.12 'index v2: force some 64-bit offsets with pack-objects': 
+	pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)
 
-expecting success of 5331.6 '--stdin-packs with broken links': 
-	(
-		cd stdin-packs &&
+ok 12 - index v2: force some 64-bit offsets with pack-objects
 
-		# make an unreachable object with a bogus parent
-		git cat-file -p HEAD >commit &&
-		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
-		git hash-object -w -t commit --stdin >in &&
+expecting success of 5302.13 'index v2: verify a pack with some 64-bit offsets': 
+	git verify-pack -v "test-3-${pack3}.pack"
 
-		git pack-objects .git/objects/pack/pack-D <in &&
+4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
+e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
+78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
+1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
+571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
+671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
+f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
+0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
+1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
+19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
+2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
+b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
+ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
+a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
+b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
+9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
+35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
+0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
+305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
+67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
+61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
+5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
+1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
+ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
+ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
+ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
+ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
+17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
+36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
+60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
+a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
+ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
+612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
+ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
+d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
+e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
+8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
+8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
+416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
+8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
+beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
+0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
+9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
+66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
+bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
+2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
+f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
+add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
+75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
+64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
+597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
+8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
+c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
+0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
+cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
+2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
+0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
+633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
+76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
+df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
+9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
+ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
+1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
+9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
+a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
+cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
+60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
+f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
+5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
+d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
+67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
+c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
+258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
+fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
+e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
+383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
+ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
+9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
+c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
+1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
+bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
+71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
+2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
+83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
+b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
+298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
+ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
+b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
+368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
+16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
+711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
+d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
+bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
+fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
+b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
+4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
+2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
+99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
+8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
+f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
+3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
+1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
+862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
+0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
+c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
+e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
+bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
+0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
+359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
+8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
+8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
+6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
+09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
+f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
+964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
+408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
+912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
+f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
+b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
+49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
+8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
+fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
+f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
+01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
+de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
+9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
+816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
+72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
+41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
+94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
+85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
+bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
+b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
+20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
+94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
+7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
+e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
+8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
+ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
+92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
+f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
+59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
+2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
+c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
+03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
+dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
+8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
+614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
+b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
+852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
+15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
+75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
+95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
+5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
+c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
+57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
+84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
+2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
+9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
+a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
+5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
+de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
+d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
+72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
+debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
+e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
+197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
+fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
+10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
+16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
+08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
+e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
+5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
+14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
+84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
+5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
+610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
+3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
+0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
+611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
+e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
+ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
+d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
+b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
+99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
+159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
+1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
+6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
+b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
+cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
+72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
+b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
+e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
+aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
+d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
+fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
+5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
+a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
+bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
+b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
+3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
+0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
+34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
+8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
+e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
+37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
+a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
+99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
+e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
+a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
+53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
+26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
+c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
+a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
+36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
+642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
+29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
+d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
+ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
+2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
+fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
+b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
+6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
+38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
+69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
+c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
+a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
+735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
+84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
+5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
+c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
+441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
+55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
+86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
+8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
+c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
+9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
+fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
+879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
+d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
+088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
+9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
+2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
+9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
+a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
+291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
+464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
+aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
+896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
+f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
+d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
+8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
+e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
+abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
+6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
+b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
+088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
+609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
+90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
+05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
+cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
+73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
+46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
+ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
+0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
+f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
+636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
+497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
+c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
+921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
+9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
+1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
+188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
+cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
+dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
+d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
+2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
+035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
+74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
+efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
+92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
+da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
+63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
+5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
+aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
+141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
+e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
+4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
+c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
+91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
+0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
+36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
+54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
+8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
+6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
+7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
+non delta: 112 objects
+chain length = 1: 110 objects
+chain length = 2: 10 objects
+chain length = 3: 10 objects
+chain length = 4: 10 objects
+chain length = 5: 10 objects
+chain length = 6: 10 objects
+chain length = 7: 10 objects
+chain length = 8: 10 objects
+chain length = 9: 10 objects
+test-3-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
+ok 13 - index v2: verify a pack with some 64-bit offsets
 
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
-		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
+expecting success of 5302.14 '64-bit offsets: should be different from previous index v2 results': 
+	! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"
 
-		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		$PACK_D
-		EOF
+test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-3-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 8281, line 24
+ok 14 - 64-bit offsets: should be different from previous index v2 results
 
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
-		) >expect.raw &&
-		git show-index <$(ls test3-*.idx) >actual.raw &&
+expecting success of 5302.15 'index v2: force some 64-bit offsets with index-pack': 
+	git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"
 
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 15 - index v2: force some 64-bit offsets with index-pack
 
-1c529235d2f84e54e1f186c4d2b6c65a26299d38
-311b91635d22c7f6c52ccf0def9203e563de1a4e
-ok 6 - --stdin-packs with broken links
+expecting success of 5302.16 '64-bit offsets: index-pack result should match pack-objects one': 
+	cmp "test-3-${pack3}.idx" "3.idx"
 
-expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
-	test_when_finished "rm -fr repo" &&
+ok 16 - 64-bit offsets: index-pack result should match pack-objects one
 
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
+expecting success of 5302.17 'index-pack --verify on 64-bit offset v2 (cheat)': 
+	# This cheats by knowing which lower offset should still be encoded
+	# in 64-bit representation.
+	git index-pack --verify --index-version=2,0x40000 "test-3-${pack3}.pack"
 
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			basename .git/objects/pack/pack-*.pack
-		} >packfiles &&
+ok 17 - index-pack --verify on 64-bit offset v2 (cheat)
 
-		git pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects .git/objects/pack/pack-*.idx >expect &&
-		packed_objects generated-pack-*.idx >actual &&
-		test_cmp expect actual
-	)
+expecting success of 5302.18 'index-pack --verify on 64-bit offset v2': 
+	git index-pack --verify "test-3-${pack3}.pack"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
-ok 7 - pack-objects --stdin with duplicate packfile
+ok 18 - index-pack --verify on 64-bit offset v2
 
-expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
-	test_when_finished "rm -fr repo" &&
+expecting success of 5302.19 '[index v1] 1) stream pack to repository': 
+	git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
+	git prune-packed &&
+	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
+	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
+	cmp "test-1-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
 
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 19 - [index v1] 1) stream pack to repository
 
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
-		} >packfiles &&
+expecting success of 5302.20 '[index v1] 2) create a stealth corruption in a delta base reference': 
+	# This test assumes file_101 is a delta smaller than 16 bytes.
+	# It should be against file_100 but we substitute its base for file_099
+	sha1_101=$(git hash-object file_101) &&
+	sha1_099=$(git hash-object file_099) &&
+	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+	recordsz=$((rawsz + 4)) &&
+	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
+	       if=".git/objects/pack/pack-${pack1}.idx" \
+	       skip=$((4 + 256 * 4 + $nr_099 * recordsz)) \
+	       bs=1 count=$rawsz conv=notrunc &&
+	git cat-file blob $sha1_101 > file_101_foo1
 
-		git pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects generated-pack-*.idx >packed-objects &&
-		test_must_be_empty packed-objects
-	)
+20+0 records in
+20+0 records out
+20 bytes copied, 4.1361e-05 s, 484 kB/s
+ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 8 - pack-objects --stdin with same packfile excluded and included
+expecting success of 5302.21 '[index v1] 3) corrupted delta happily returned wrong data': 
+	test -f file_101_foo1 && ! cmp file_101 file_101_foo1
 
-expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
-	test_when_finished "rm -fr shared member" &&
+file_101 file_101_foo1 differ: char 5, line 2
+ok 21 - [index v1] 3) corrupted delta happily returned wrong data
 
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-objects" &&
-	git -C shared repack -ad &&
-	basename shared/.git/objects/pack/pack-*.pack >packfile &&
+expecting success of 5302.22 '[index v1] 4) confirm that the pack is actually corrupted': 
+	test_must_fail git fsck --full $commit
 
-	# Set up a repository that is connected to the shared repository. This
-	# repository has no objects on its own, but we still expect to be able
-	# to pack objects from its alternate.
-	git clone --shared shared member &&
-	git -C member pack-objects --stdin-packs generated-pack <packfile &&
-	test_cmp shared/.git/objects/pack/pack-*.pack member/generated-pack-*.pack
+error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
+error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
+ok 22 - [index v1] 4) confirm that the pack is actually corrupted
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 145e1e6] shared-objects
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-objects.t
-Cloning into 'member'...
-done.
-33d7aff4e675ff5bc1d48bcdab29cb013e53965b
-ok 9 - pack-objects --stdin with packfiles from alternate object database
+expecting success of 5302.23 '[index v1] 5) pack-objects happily reuses corrupted data': 
+	pack4=$(git pack-objects test-4 <obj-list) &&
+	test -f "test-4-${pack4}.pack"
 
-expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
-	test_when_finished "rm -fr shared member" &&
+ok 23 - [index v1] 5) pack-objects happily reuses corrupted data
 
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-commit" &&
-	git -C shared repack -ad &&
+expecting success of 5302.24 '[index v1] 6) newly created pack is BAD !': 
+	test_must_fail git verify-pack -v "test-4-${pack4}.pack"
 
-	# Set up a repository that is connected to the shared repository. This
-	# repository has a second packfile so that we can verify that it is
-	# possible to write packs that include packfiles from different object
-	# databases.
-	git clone --shared shared member &&
-	test_commit -C member "local-commit" &&
-	git -C member repack -dl &&
+4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
+e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
+78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
+1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
+571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
+671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
+f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
+0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
+1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
+19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
+2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
+b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
+ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
+a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
+b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
+9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
+35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
+0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
+305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
+67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
+61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
+5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
+1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
+ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
+ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
+ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
+ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
+17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
+36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
+60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
+a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
+ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
+612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
+ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
+d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
+e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
+8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
+8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
+416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
+8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
+beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
+0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
+9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
+66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
+bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
+2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
+f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
+add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
+75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
+64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
+597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
+8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
+c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
+0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
+cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
+2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
+0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
+633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
+76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
+df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
+9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
+ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
+1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
+9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
+a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
+cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
+60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
+f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
+5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
+d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
+67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
+c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
+258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
+fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
+e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
+383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
+ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
+9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
+c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
+1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
+bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
+71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
+2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
+83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
+b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
+298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
+ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
+b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
+368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
+16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
+711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
+d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
+bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
+fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
+b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
+4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
+2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
+99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
+8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
+f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
+3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
+1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
+862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
+0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
+c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
+e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
+bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
+0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
+359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
+8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
+8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
+6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
+09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
+f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
+964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
+408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
+912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
+f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
+b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
+49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
+8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
+fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
+f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
+01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
+de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
+9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
+816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
+72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
+41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
+94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
+85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
+bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
+b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
+20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
+94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
+7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
+e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
+8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
+ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
+92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
+f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
+59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
+2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
+c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
+03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
+dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
+8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
+614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
+b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
+852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
+15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
+75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
+95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
+5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
+c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
+57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
+84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
+2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
+9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
+a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
+5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
+de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
+d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
+72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
+debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
+e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
+197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
+fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
+10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
+16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
+08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
+e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
+5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
+14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
+84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
+5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
+610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
+3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
+0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
+611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
+e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
+ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
+d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
+b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
+99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
+159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
+1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
+6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
+b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
+cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
+72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
+b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
+e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
+aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
+d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
+fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
+5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
+a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
+bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
+b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
+3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
+51e0bb44b17501c6803ca30f299ad8e69b21c8c4 blob   12 41 844032 1 b302b77fd5595784b5e85e91f8b4314fff49a6a1
+34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
+8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
+e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
+37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
+a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
+99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
+e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
+a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
+53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
+26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
+c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
+a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
+36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
+642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
+29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
+d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
+ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
+2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
+fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
+b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
+6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
+38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
+69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
+c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
+a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
+735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
+84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
+5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
+c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
+441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
+55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
+86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
+8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
+c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
+9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
+fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
+879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
+a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
+d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
+088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
+9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
+2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
+9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
+a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
+291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
+464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
+aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
+896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
+f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
+d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
+8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
+e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
+abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
+6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
+b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
+088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
+609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
+90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
+05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
+cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
+73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
+46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
+ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
+0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
+f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
+636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
+497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
+c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
+921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
+9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
+1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
+188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
+cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
+dd39ffatal: sha1 file 'test-4-48a1956df258ba8b8a12e47466ef8e10ada5d680.idx' validation error
+8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
+d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
+ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
+d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
+2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
+035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
+74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
+efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
+92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
+da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
+63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
+5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
+aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
+141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
+e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
+4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
+c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
+91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
+0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
+36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
+54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
+8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
+6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
+7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
+non delta: 112 objects
+chain length = 1: 110 objects
+chain length = 2: 10 objects
+chain length = 3: 10 objects
+chain length = 4: 10 objects
+chain length = 5: 10 objects
+chain length = 6: 10 objects
+chain length = 7: 10 objects
+chain length = 8: 10 objects
+chain length = 9: 10 objects
+test-4-48a1956df258ba8b8a12e47466ef8e10ada5d680.pack: bad
+ok 24 - [index v1] 6) newly created pack is BAD !
 
-	{
-		basename shared/.git/objects/pack/pack-*.pack &&
-		basename member/.git/objects/pack/pack-*.pack
-	} >packfiles &&
+expecting success of 5302.25 '[index v2] 1) stream pack to repository': 
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git prune-packed &&
+	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
+	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
+	cmp "test-2-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
 
-	{
-		packed_objects shared/.git/objects/pack/pack-*.idx &&
-		packed_objects member/.git/objects/pack/pack-*.idx
-	} | sort >expected-objects &&
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 25 - [index v2] 1) stream pack to repository
 
-	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
-	packed_objects member/generated-pack-*.idx >actual-objects &&
-	test_cmp expected-objects actual-objects
+expecting success of 5302.26 '[index v2] 2) create a stealth corruption in a delta base reference': 
+	# This test assumes file_101 is a delta smaller than 16 bytes.
+	# It should be against file_100 but we substitute its base for file_099
+	sha1_101=$(git hash-object file_101) &&
+	sha1_099=$(git hash-object file_099) &&
+	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
+		if=".git/objects/pack/pack-${pack1}.idx" \
+		skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
+		bs=1 count=$rawsz conv=notrunc &&
+	git cat-file blob $sha1_101 > file_101_foo2
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 4c151b8] shared-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-commit.t
-Cloning into 'member'...
-done.
-[main 7c14a26] local-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local-commit.t
-d3e539037cb74e50eb4452759efc2fac0ae5e17a
-ok 10 - pack-objects --stdin with packfiles from main and alternate object database
+20+0 records in
+20+0 records out
+20 bytes copied, 5.0721e-05 s, 394 kB/s
+ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
 
-# passed all 10 test(s)
-1..10
+expecting success of 5302.27 '[index v2] 3) corrupted delta happily returned wrong data': 
+	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
+
+file_101 file_101_foo2 differ: char 5, line 2
+ok 27 - [index v2] 3) corrupted delta happily returned wrong data
+
+expecting success of 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
+	test_must_fail git fsck --full $commit
+
+error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
+error: index CRC mismatch for object 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack at offset 844032
+error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
+ok 28 - [index v2] 4) confirm that the pack is actually corrupted
+
+expecting success of 5302.29 '[index v2] 5) pack-objects refuses to reuse corrupted data': 
+	test_must_fail git pack-objects test-5 <obj-list &&
+	test_must_fail git pack-objects --no-reuse-object test-6 <obj-list
+
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+fatal: unable to read 0b968294884af115eb5a1b941b3dabd48470c3bb
+error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
+fatal: object 0b968294884af115eb5a1b941b3dabd48470c3bb cannot be read
+ok 29 - [index v2] 5) pack-objects refuses to reuse corrupted data
+
+expecting success of 5302.30 '[index v2] 6) verify-pack detects CRC mismatch': 
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
+	obj=$(git hash-object file_001) &&
+	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
+	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
+		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
+	 ( while read obj
+	   do git cat-file -p $obj >/dev/null || exit 1
+	   done <obj-list ) &&
+	test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
+
+pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+4+0 records in
+4+0 records out
+4 bytes copied, 4.216e-05 s, 94.9 kB/s
+fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
+ok 30 - [index v2] 6) verify-pack detects CRC mismatch
+
+expecting success of 5302.31 'running index-pack in the object store': 
+	rm -f .git/objects/pack/* &&
+	cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
+	(
+		cd .git/objects/pack &&
+		git index-pack pack-${pack1}.pack
+	) &&
+	test -f .git/objects/pack/pack-${pack1}.idx
+
+1c54d893dd9bf6645ecee2886ea72f2c2030bea1
+ok 31 - running index-pack in the object store
+
+expecting success of 5302.32 'index-pack --strict warns upon missing tagger in tag': 
+	sha=$(git rev-parse HEAD) &&
+	cat >wrong-tag <<EOF &&
+object $sha
+type commit
+tag guten tag
+
+This is an invalid tag.
+EOF
+
+	tag=$(git hash-object -t tag -w --stdin --literally <wrong-tag) &&
+	pack1=$(echo $tag $sha | git pack-objects tag-test) &&
+	echo remove tag object &&
+	thirtyeight=${tag#??} &&
+	rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
+	git index-pack --strict tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
+
+remove tag object
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 32 - index-pack --strict warns upon missing tagger in tag
+
+expecting success of 5302.33 'index-pack --fsck-objects also warns upon missing tagger in tag': 
+	git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
+
+67765b8cc9b2d3d6ffa408695798db10a387e826
+warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
+
+expecting success of 5302.34 'index-pack -v --stdin produces progress for both phases': 
+	pack=$(git pack-objects --all pack </dev/null) &&
+	GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
+	test_grep "Receiving objects" err &&
+	test_grep "Resolving deltas" err
+
+pack	37e69ad54edf78401749c7eaf0410858eb6a64ba
+Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 33.33 MiB/s, done.
+Resolving deltas:   0% (0/190)
Resolving deltas:   1% (2/190)
Resolving deltas:   2% (4/190)
Resolving deltas:   3% (6/190)
Resolving deltas:   4% (8/190)
Resolving deltas:   5% (10/190)
Resolving deltas:   6% (12/190)
Resolving deltas:   7% (14/190)
Resolving deltas:   8% (16/190)
Resolving deltas:   9% (18/190)
Resolving deltas:  10% (19/190)
Resolving deltas:  11% (21/190)
Resolving deltas:  12% (23/190)
Resolving deltas:  13% (25/190)
Resolving deltas:  14% (27/190)
Resolving deltas:  15% (29/190)
Resolving deltas:  16% (31/190)
Resolving deltas:  17% (33/190)
Resolving deltas:  18% (35/190)
Resolving deltas:  19% (37/190)
Resolving deltas:  20% (38/190)
Resolving deltas:  21% (40/190)
Resolving deltas:  22% (42/190)
Resolving deltas:  23% (44/190)
Resolving deltas:  24% (46/190)
Resolving deltas:  25% (48/190)
Resolving deltas:  26% (50/190)
Resolving deltas:  27% (52/190)
Resolving deltas:  28% (54/190)
Resolving deltas:  29% (56/190)
Resolving deltas:  30% (57/190)
Resolving deltas:  31% (59/190)
Resolving deltas:  32% (61/190)
Resolving deltas:  33% (63/190)
Resolving deltas:  34% (65/190)
Resolving deltas:  35% (67/190)
Resolving deltas:  36% (69/190)
Resolving deltas:  37% (71/190)
Resolving deltas:  38% (73/190)
Resolving deltas:  39% (75/190)
Resolving deltas:  40% (76/190)
Resolving deltas:  41% (78/190)
Resolving deltas:  42% (80/190)
Resolving deltas:  43% (82/190)
Resolving deltas:  44% (84/190)
Resolving deltas:  45% (86/190)
Resolving deltas:  46% (88/190)
Resolving deltas:  47% (90/190)
Resolving deltas:  48% (92/190)
Resolving deltas:  49% (94/190)
Resolving deltas:  50% (95/190)
Resolving deltas:  51% (97/190)
Resolving deltas:  52% (99/190)
Resolving deltas:  53% (101/190)
Resolving deltas:  54% (103/190)
Resolving deltas:  55% (105/190)
Resolving deltas:  56% (107/190)
Resolving deltas:  57% (109/190)
Resolving deltas:  58% (111/190)
Resolving deltas:  59% (113/190)
Resolving deltas:  60% (114/190)
Resolving deltas:  61% (116/190)
Resolving deltas:  62% (118/190)
Resolving deltas:  63% (120/190)
Resolving deltas:  64% (122/190)
Resolving deltas:  65% (124/190)
Resolving deltas:  66% (126/190)
Resolving deltas:  67% (128/190)
Resolving deltas:  68% (130/190)
Resolving deltas:  69% (132/190)
Resolving deltas:  70% (133/190)
Resolving deltas:  71% (135/190)
Resolving deltas:  72% (137/190)
Resolving deltas:  73% (139/190)
Resolving deltas:  74% (141/190)
Resolving deltas:  75% (143/190)
Resolving deltas:  76% (145/190)
Resolving deltas:  77% (147/190)
Resolving deltas:  78% (149/190)
Resolving deltas:  79% (151/190)
Resolving deltas:  80% (152/190)
Resolving deltas:  81% (154/190)
Resolving deltas:  82% (156/190)
Resolving deltas:  83% (158/190)
Resolving deltas:  84% (160/190)
Resolving deltas:  85% (162/190)
Resolving deltas:  86% (164/190)
Resolving deltas:  87% (166/190)
Resolving deltas:  88% (168/190)
Resolving deltas:  89% (170/190)
Resolving deltas:  90% (171/190)
Resolving deltas:  91% (173/190)
Resolving deltas:  92% (175/190)
Resolving deltas:  93% (177/190)
Resolving deltas:  94% (179/190)
Resolving deltas:  95% (181/190)
Resolving deltas:  96% (183/190)
Resolving deltas:  97% (185/190)
Resolving deltas:  98% (187/190)
Resolving deltas:  99% (189/190)
Resolving deltas: 100% (190/190)
Resolving deltas: 100% (190/190), done.
+ok 34 - index-pack -v --stdin produces progress for both phases
+
+expecting success of 5302.35 'too-large packs report the breach': 
+	pack=$(git pack-objects --all pack </dev/null) &&
+	sz="$(test_file_size pack-$pack.pack)" &&
+	test "$sz" -gt 20 &&
+	test_must_fail git index-pack --max-input-size=20 pack-$pack.pack 2>err &&
+	grep "maximum allowed size (20 bytes)" err
+
+fatal: pack exceeds maximum allowed size (20 bytes)
+ok 35 - too-large packs report the breach
+
+# passed all 35 test(s)
+1..35
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t4216-log-bloom.sh ***
@@ -305423,8 +306956,8 @@
 		git commit-graph write --reachable --changed-paths &&
 	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
 
-{"event":"data_json","sid":"20260419T192027.068371Z-H8d819085-P001e856a","thread":"main","time":"2026-04-19T19:20:27.080883Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.012709,"t_rel":0.000019,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
-{"event":"data_json","sid":"20260419T192027.116368Z-H8d819085-P001e8591","thread":"main","time":"2026-04-19T19:20:27.127138Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010970,"t_rel":0.000016,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
+{"event":"data_json","sid":"20250317T132318.214613Z-H5c947e1c-P00311bac","thread":"main","time":"2025-03-17T13:23:18.238934Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.024518,"t_rel":0.000022,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
+{"event":"data_json","sid":"20250317T132318.287593Z-H5c947e1c-P00311bda","thread":"main","time":"2025-03-17T13:23:18.302239Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.014832,"t_rel":0.000017,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
 ok 134 - persist filter settings
 
 expecting success of 4216.135 'correctly report changes over limit': 
@@ -305527,9 +307060,9 @@
  create mode 100644 foo.txt
  create mode 100644 foo/bar
  create mode 100644 mode/script.sh
-{"event":"data_json","sid":"20260419T192027.424985Z-H8d819085-P001e8674","thread":"main","time":"2026-04-19T19:20:27.431091Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.006313,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20260419T192027.424985Z-H8d819085-P001e8674","thread":"main","time":"2026-04-19T19:20:27.430928Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.006146,"t_rel":0.006146,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192027.424985Z-H8d819085-P001e8674","thread":"main","time":"2026-04-19T19:20:27.430962Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.006183,"t_rel":0.006183,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
+{"event":"data_json","sid":"20250317T132318.644156Z-H5c947e1c-P00311cc3","thread":"main","time":"2025-03-17T13:23:18.654333Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010388,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
+{"event":"data","sid":"20250317T132318.644156Z-H5c947e1c-P00311cc3","thread":"main","time":"2025-03-17T13:23:18.654178Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.010230,"t_rel":0.010230,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132318.644156Z-H5c947e1c-P00311cc3","thread":"main","time":"2025-03-17T13:23:18.654210Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.010267,"t_rel":0.010267,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
 [main 323b1c6] complicated
  Author: A U Thor <author@example.com>
  7 files changed, 4 insertions(+), 3 deletions(-)
@@ -305538,12 +307071,12 @@
  create mode 100644 foo
  delete mode 100644 foo/bar
  mode change 100644 => 100755 mode/script.sh
-{"event":"data_json","sid":"20260419T192027.996264Z-H8d819085-P001e8823","thread":"main","time":"2026-04-19T19:20:27.998286Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002228,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20260419T192027.996264Z-H8d819085-P001e8823","thread":"main","time":"2026-04-19T19:20:27.998121Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002060,"t_rel":0.002060,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192027.996264Z-H8d819085-P001e8823","thread":"main","time":"2026-04-19T19:20:27.998152Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002095,"t_rel":0.002095,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
-{"event":"data_json","sid":"20260419T192028.477187Z-H8d819085-P001e897f","thread":"main","time":"2026-04-19T19:20:28.487436Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010469,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
-{"event":"data","sid":"20260419T192028.477187Z-H8d819085-P001e897f","thread":"main","time":"2026-04-19T19:20:28.487264Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.010294,"t_rel":0.010294,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192028.477187Z-H8d819085-P001e897f","thread":"main","time":"2026-04-19T19:20:28.487295Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.010329,"t_rel":0.010329,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data_json","sid":"20250317T132319.335639Z-H5c947e1c-P00311ea3","thread":"main","time":"2025-03-17T13:23:19.353737Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.018282,"t_rel":0.000015,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
+{"event":"data","sid":"20250317T132319.335639Z-H5c947e1c-P00311ea3","thread":"main","time":"2025-03-17T13:23:19.353553Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.018095,"t_rel":0.018095,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132319.335639Z-H5c947e1c-P00311ea3","thread":"main","time":"2025-03-17T13:23:19.353583Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.018128,"t_rel":0.018128,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
+{"event":"data_json","sid":"20250317T132319.983519Z-H5c947e1c-P00312030","thread":"main","time":"2025-03-17T13:23:19.989637Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.006292,"t_rel":0.000015,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
+{"event":"data","sid":"20250317T132319.983519Z-H5c947e1c-P00312030","thread":"main","time":"2025-03-17T13:23:19.989454Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.006106,"t_rel":0.006106,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132319.983519Z-H5c947e1c-P00312030","thread":"main","time":"2025-03-17T13:23:19.989485Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.006141,"t_rel":0.006141,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 135 - correctly report changes over limit
 
 expecting success of 4216.136 'correctly report commits with no changed paths': 
@@ -305565,10 +307098,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4216-log-bloom/empty/.git/
 [main (root-commit) 9c26810] initial commit
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20260419T192028.969175Z-H8d819085-P001e8acb","thread":"main","time":"2026-04-19T19:20:28.970757Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001778,"t_rel":0.001778,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192028.969175Z-H8d819085-P001e8acb","thread":"main","time":"2026-04-19T19:20:28.970779Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001803,"t_rel":0.001803,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
-{"event":"data","sid":"20260419T192028.969175Z-H8d819085-P001e8acb","thread":"main","time":"2026-04-19T19:20:28.970784Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001808,"t_rel":0.001808,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
-{"event":"data","sid":"20260419T192028.969175Z-H8d819085-P001e8acb","thread":"main","time":"2026-04-19T19:20:28.970788Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001813,"t_rel":0.001813,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132320.660217Z-H5c947e1c-P00312211","thread":"main","time":"2025-03-17T13:23:20.665828Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.005800,"t_rel":0.005800,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132320.660217Z-H5c947e1c-P00312211","thread":"main","time":"2025-03-17T13:23:20.665850Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.005825,"t_rel":0.005825,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
+{"event":"data","sid":"20250317T132320.660217Z-H5c947e1c-P00312211","thread":"main","time":"2025-03-17T13:23:20.665855Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.005831,"t_rel":0.005831,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
+{"event":"data","sid":"20250317T132320.660217Z-H5c947e1c-P00312211","thread":"main","time":"2025-03-17T13:23:20.665860Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.005835,"t_rel":0.005835,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 136 - correctly report commits with no changed paths
 
 expecting success of 4216.137 'Bloom generation is limited by --max-new-filters': 
@@ -305600,10 +307133,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-filter
-{"event":"data","sid":"20260419T192029.396281Z-H8d819085-P001e8c00","thread":"main","time":"2026-04-19T19:20:29.398167Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002077,"t_rel":0.002077,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192029.396281Z-H8d819085-P001e8c00","thread":"main","time":"2026-04-19T19:20:29.398186Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002100,"t_rel":0.002100,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
-{"event":"data","sid":"20260419T192029.396281Z-H8d819085-P001e8c00","thread":"main","time":"2026-04-19T19:20:29.398191Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002105,"t_rel":0.002105,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260419T192029.396281Z-H8d819085-P001e8c00","thread":"main","time":"2026-04-19T19:20:29.398196Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002109,"t_rel":0.002109,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132321.155706Z-H5c947e1c-P00312375","thread":"main","time":"2025-03-17T13:23:21.177579Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.022070,"t_rel":0.022070,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132321.155706Z-H5c947e1c-P00312375","thread":"main","time":"2025-03-17T13:23:21.177616Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.022110,"t_rel":0.022110,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
+{"event":"data","sid":"20250317T132321.155706Z-H5c947e1c-P00312375","thread":"main","time":"2025-03-17T13:23:21.177623Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.022116,"t_rel":0.022116,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250317T132321.155706Z-H5c947e1c-P00312375","thread":"main","time":"2025-03-17T13:23:21.177628Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.022121,"t_rel":0.022121,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 137 - Bloom generation is limited by --max-new-filters
 
 expecting success of 4216.138 'Bloom generation backfills previously-skipped filters': 
@@ -305622,10 +307155,10 @@
 		test_filter_trunc_large 0 trace.event
 	)
 
-{"event":"data","sid":"20260419T192029.600090Z-H8d819085-P001e8cad","thread":"main","time":"2026-04-19T19:20:29.601940Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.002044,"t_rel":0.002044,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192029.600090Z-H8d819085-P001e8cad","thread":"main","time":"2026-04-19T19:20:29.601959Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002067,"t_rel":0.002067,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260419T192029.600090Z-H8d819085-P001e8cad","thread":"main","time":"2026-04-19T19:20:29.601965Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002072,"t_rel":0.002072,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260419T192029.600090Z-H8d819085-P001e8cad","thread":"main","time":"2026-04-19T19:20:29.601969Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002077,"t_rel":0.002077,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132321.343582Z-H5c947e1c-P00312418","thread":"main","time":"2025-03-17T13:23:21.349894Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.006505,"t_rel":0.006505,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132321.343582Z-H5c947e1c-P00312418","thread":"main","time":"2025-03-17T13:23:21.349913Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.006529,"t_rel":0.006529,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250317T132321.343582Z-H5c947e1c-P00312418","thread":"main","time":"2025-03-17T13:23:21.349918Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.006534,"t_rel":0.006534,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250317T132321.343582Z-H5c947e1c-P00312418","thread":"main","time":"2025-03-17T13:23:21.349923Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.006539,"t_rel":0.006539,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 138 - Bloom generation backfills previously-skipped filters
 
 expecting success of 4216.139 '--max-new-filters overrides configuration': 
@@ -305656,10 +307189,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"data","sid":"20260419T192029.952286Z-H8d819085-P001e8dd1","thread":"main","time":"2026-04-19T19:20:29.953987Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001890,"t_rel":0.001890,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192029.952286Z-H8d819085-P001e8dd1","thread":"main","time":"2026-04-19T19:20:29.954007Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001914,"t_rel":0.001914,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
-{"event":"data","sid":"20260419T192029.952286Z-H8d819085-P001e8dd1","thread":"main","time":"2026-04-19T19:20:29.954012Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001919,"t_rel":0.001919,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260419T192029.952286Z-H8d819085-P001e8dd1","thread":"main","time":"2026-04-19T19:20:29.954017Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001924,"t_rel":0.001924,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132321.755192Z-H5c947e1c-P00312575","thread":"main","time":"2025-03-17T13:23:21.756780Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001788,"t_rel":0.001788,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132321.755192Z-H5c947e1c-P00312575","thread":"main","time":"2025-03-17T13:23:21.756801Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001812,"t_rel":0.001812,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
+{"event":"data","sid":"20250317T132321.755192Z-H5c947e1c-P00312575","thread":"main","time":"2025-03-17T13:23:21.756806Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001817,"t_rel":0.001817,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250317T132321.755192Z-H5c947e1c-P00312575","thread":"main","time":"2025-03-17T13:23:21.756811Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001822,"t_rel":0.001822,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 139 - --max-new-filters overrides configuration
 
 expecting success of 4216.140 'Bloom generation backfills empty commits': 
@@ -305710,22 +307243,22 @@
  Author: A U Thor <author@example.com>
 [main 55bcad0] 6
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20260419T192030.344246Z-H8d819085-P001e8ef2","thread":"main","time":"2026-04-19T19:20:30.346048Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001982,"t_rel":0.001982,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192030.344246Z-H8d819085-P001e8ef2","thread":"main","time":"2026-04-19T19:20:30.346070Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.002007,"t_rel":0.002007,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260419T192030.344246Z-H8d819085-P001e8ef2","thread":"main","time":"2026-04-19T19:20:30.346075Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.002012,"t_rel":0.002012,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260419T192030.344246Z-H8d819085-P001e8ef2","thread":"main","time":"2026-04-19T19:20:30.346080Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.002017,"t_rel":0.002017,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260419T192030.472212Z-H8d819085-P001e8f5b","thread":"main","time":"2026-04-19T19:20:30.473900Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001863,"t_rel":0.001863,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192030.472212Z-H8d819085-P001e8f5b","thread":"main","time":"2026-04-19T19:20:30.473920Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001886,"t_rel":0.001886,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260419T192030.472212Z-H8d819085-P001e8f5b","thread":"main","time":"2026-04-19T19:20:30.473925Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001891,"t_rel":0.001891,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260419T192030.472212Z-H8d819085-P001e8f5b","thread":"main","time":"2026-04-19T19:20:30.473930Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001896,"t_rel":0.001896,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260419T192030.580197Z-H8d819085-P001e8faa","thread":"main","time":"2026-04-19T19:20:30.581887Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001867,"t_rel":0.001867,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20260419T192030.580197Z-H8d819085-P001e8faa","thread":"main","time":"2026-04-19T19:20:30.581907Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001890,"t_rel":0.001890,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20260419T192030.580197Z-H8d819085-P001e8faa","thread":"main","time":"2026-04-19T19:20:30.581912Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001896,"t_rel":0.001896,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20260419T192030.580197Z-H8d819085-P001e8faa","thread":"main","time":"2026-04-19T19:20:30.581917Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001901,"t_rel":0.001901,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20260419T192030.724237Z-H8d819085-P001e901c","thread":"main","time":"2026-04-19T19:20:30.725891Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001858,"t_rel":0.001858,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20260419T192030.724237Z-H8d819085-P001e901c","thread":"main","time":"2026-04-19T19:20:30.725915Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001886,"t_rel":0.001886,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
-{"event":"data","sid":"20260419T192030.724237Z-H8d819085-P001e901c","thread":"main","time":"2026-04-19T19:20:30.725921Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001892,"t_rel":0.001892,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20260419T192030.724237Z-H8d819085-P001e901c","thread":"main","time":"2026-04-19T19:20:30.725926Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001897,"t_rel":0.001897,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132322.389471Z-H5c947e1c-P00312755","thread":"main","time":"2025-03-17T13:23:22.391133Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001862,"t_rel":0.001862,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132322.389471Z-H5c947e1c-P00312755","thread":"main","time":"2025-03-17T13:23:22.391151Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001883,"t_rel":0.001883,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250317T132322.389471Z-H5c947e1c-P00312755","thread":"main","time":"2025-03-17T13:23:22.391156Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001889,"t_rel":0.001889,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250317T132322.389471Z-H5c947e1c-P00312755","thread":"main","time":"2025-03-17T13:23:22.391161Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001894,"t_rel":0.001894,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132322.499749Z-H5c947e1c-P003127c1","thread":"main","time":"2025-03-17T13:23:22.508951Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009398,"t_rel":0.009398,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132322.499749Z-H5c947e1c-P003127c1","thread":"main","time":"2025-03-17T13:23:22.508970Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.009420,"t_rel":0.009420,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250317T132322.499749Z-H5c947e1c-P003127c1","thread":"main","time":"2025-03-17T13:23:22.508975Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.009426,"t_rel":0.009426,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250317T132322.499749Z-H5c947e1c-P003127c1","thread":"main","time":"2025-03-17T13:23:22.508979Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.009430,"t_rel":0.009430,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132322.641736Z-H5c947e1c-P00312825","thread":"main","time":"2025-03-17T13:23:22.643449Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001924,"t_rel":0.001924,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20250317T132322.641736Z-H5c947e1c-P00312825","thread":"main","time":"2025-03-17T13:23:22.643468Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.001947,"t_rel":0.001947,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20250317T132322.641736Z-H5c947e1c-P00312825","thread":"main","time":"2025-03-17T13:23:22.643473Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.001953,"t_rel":0.001953,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20250317T132322.641736Z-H5c947e1c-P00312825","thread":"main","time":"2025-03-17T13:23:22.643479Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.001959,"t_rel":0.001959,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20250317T132322.747718Z-H5c947e1c-P00312873","thread":"main","time":"2025-03-17T13:23:22.757316Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.009795,"t_rel":0.009795,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20250317T132322.747718Z-H5c947e1c-P00312873","thread":"main","time":"2025-03-17T13:23:22.757343Z","file":"commit-graph.c","line":1785,"repo":1,"t_abs":0.009826,"t_rel":0.009826,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
+{"event":"data","sid":"20250317T132322.747718Z-H5c947e1c-P00312873","thread":"main","time":"2025-03-17T13:23:22.757349Z","file":"commit-graph.c","line":1787,"repo":1,"t_abs":0.009832,"t_rel":0.009832,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20250317T132322.747718Z-H5c947e1c-P00312873","thread":"main","time":"2025-03-17T13:23:22.757354Z","file":"commit-graph.c","line":1789,"repo":1,"t_abs":0.009837,"t_rel":0.009837,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 140 - Bloom generation backfills empty commits
 
 expecting success of 4216.141 'setup for mixed Bloom setting tests': 
@@ -305805,8 +307338,8 @@
 	test_must_be_empty err
 
 warning: disabling Bloom filters for commit-graph layer '012b593000b4075aa9fd8e011d8d65ec0907d392' due to incompatible settings
-{"event":"data_json","sid":"20260419T192031.268187Z-H8d819085-P001e91ce","thread":"main","time":"2026-04-19T19:20:31.270165Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002167,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
-19:20:31.354263 revision.c:677               | d0 | main                     | data_json    | r1  |  0.002142 |  0.002142 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
+{"event":"data_json","sid":"20250317T132323.483865Z-H5c947e1c-P00312abc","thread":"main","time":"2025-03-17T13:23:23.494074Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.010397,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
+13:23:23.630009 revision.c:677               | d0 | main                     | data_json    | r1  |  0.006442 |  0.006442 | bloom        | statistics:{"filter_not_present":0,"maybe":3,"definitely_not":0,"false_positive":0}
 ok 143 - merge graph layers with incompatible Bloom settings
 
 expecting success of 4216.144 'ensure Bloom filter with incompatible versions are ignored': 
@@ -305844,7 +307377,7 @@
 	grep "{\"hash_version\":2,\"num_hashes\":7,\"bits_per_entry\":10,\"max_changed_paths\":512" trace2.txt
 
 warning: disabling Bloom filters for commit-graph layer 'e338a7a1b4cfa5f6bcd31aea3e027df67d06442a' due to incompatible settings
-{"event":"data_json","sid":"20260419T192031.603867Z-H8d819085-P001e92e0","thread":"main","time":"2026-04-19T19:20:31.605889Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.002201,"t_rel":0.000012,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":2,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
+{"event":"data_json","sid":"20250317T132324.007994Z-H5c947e1c-P00312c33","thread":"main","time":"2025-03-17T13:23:24.026126Z","file":"commit-graph.c","line":1460,"repo":1,"t_abs":0.018317,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":2,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":512}}
 ok 144 - ensure Bloom filter with incompatible versions are ignored
 
 expecting success of 4216.145 'set up repo with high bit path, version 1 changed-path': 
@@ -305868,8 +307401,8 @@
 
 ok 146 - setup check value of version 1 changed-path
 
---- highbit1/expect	2026-04-19 19:20:31.783659440 +0000
-+++ highbit1/actual	2026-04-19 19:20:31.815659440 +0000
+--- highbit1/expect	2025-03-17 13:23:24.241488211 +0000
++++ highbit1/actual	2025-03-17 13:23:24.285488489 +0000
 @@ -1 +1 @@
 -52a9
 +c01f
@@ -306055,10 +307588,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\302\242"
-{"event":"data","sid":"20260419T192033.660227Z-H8d819085-P001e994d","thread":"main","time":"2026-04-19T19:20:33.661835Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001786,"t_rel":0.001786,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192033.660227Z-H8d819085-P001e994d","thread":"main","time":"2026-04-19T19:20:33.661867Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001821,"t_rel":0.001821,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20260419T192033.857193Z-H8d819085-P001e9a3b","thread":"main","time":"2026-04-19T19:20:33.858956Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001945,"t_rel":0.001945,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192033.857193Z-H8d819085-P001e9a3b","thread":"main","time":"2026-04-19T19:20:33.858991Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001984,"t_rel":0.001984,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250317T132326.452403Z-H5c947e1c-P00313498","thread":"main","time":"2025-03-17T13:23:26.453972Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001777,"t_rel":0.001777,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132326.452403Z-H5c947e1c-P00313498","thread":"main","time":"2025-03-17T13:23:26.454007Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001816,"t_rel":0.001816,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250317T132326.639902Z-H5c947e1c-P0031354d","thread":"main","time":"2025-03-17T13:23:26.657720Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.018003,"t_rel":0.018003,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132326.639902Z-H5c947e1c-P0031354d","thread":"main","time":"2025-03-17T13:23:26.657756Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.018043,"t_rel":0.018043,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
 ok 160 - when writing commit graph, do not reuse changed-path of another version
 
 expecting success of 4216.161 'when writing commit graph, reuse changed-path of another version where possible': 
@@ -306085,10 +307618,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-high-bits
-{"event":"data","sid":"20260419T192034.084799Z-H8d819085-P001e9b3b","thread":"main","time":"2026-04-19T19:20:34.086302Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001701,"t_rel":0.001701,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20260419T192034.084799Z-H8d819085-P001e9b3b","thread":"main","time":"2026-04-19T19:20:34.086337Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001739,"t_rel":0.001739,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
-{"event":"data","sid":"20260419T192034.201335Z-H8d819085-P001e9baa","thread":"main","time":"2026-04-19T19:20:34.202907Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001748,"t_rel":0.001748,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20260419T192034.201335Z-H8d819085-P001e9baa","thread":"main","time":"2026-04-19T19:20:34.202941Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001784,"t_rel":0.001784,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"1"}
+{"event":"data","sid":"20250317T132326.897809Z-H5c947e1c-P00313624","thread":"main","time":"2025-03-17T13:23:26.899319Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.001736,"t_rel":0.001736,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20250317T132326.897809Z-H5c947e1c-P00313624","thread":"main","time":"2025-03-17T13:23:26.899351Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.001771,"t_rel":0.001771,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"0"}
+{"event":"data","sid":"20250317T132326.983669Z-H5c947e1c-P00313670","thread":"main","time":"2025-03-17T13:23:26.997265Z","file":"commit-graph.c","line":1783,"repo":1,"t_abs":0.013767,"t_rel":0.013767,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20250317T132326.983669Z-H5c947e1c-P00313670","thread":"main","time":"2025-03-17T13:23:26.997302Z","file":"commit-graph.c","line":1791,"repo":1,"t_abs":0.013809,"t_rel":0.013809,"nesting":1,"category":"commit-graph","key":"filter-upgraded","value":"1"}
 ok 161 - when writing commit graph, reuse changed-path of another version where possible
 
 expecting success of 4216.162 'Bloom reader notices too-small data chunk': 
@@ -306136,1650 +307669,1205 @@
 1..165
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5302-pack-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5302-pack-index/.git/
-expecting success of 5302.1 'setup': 
-	rawsz=$(test_oid rawsz) &&
-	rm -rf .git &&
-	git init &&
-	git config pack.threads 1 &&
-	i=1 &&
-	while test $i -le 100
-	do
-		iii=$(printf "%03i" $i) &&
-		test-tool genrandom "bar" 200 > wide_delta_$iii &&
-		test-tool genrandom "baz $iii" 50 >> wide_delta_$iii &&
-		test-tool genrandom "foo"$i 100 > deep_delta_$iii &&
-		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
-		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
-		echo $iii >file_$iii &&
-		test-tool genrandom "$iii" 8192 >>file_$iii &&
-		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
-		i=$(expr $i + 1) || return 1
-	done &&
-	{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
-	git update-index --add file_101 &&
-	tree=$(git write-tree) &&
-	commit=$(git commit-tree $tree </dev/null) && {
-		echo $tree &&
-		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-	} >obj-list &&
-	git update-ref HEAD $commit
+*** t5334-incremental-multi-pack-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5334-incremental-multi-pack-index/.git/
+expecting success of 5334.1 'convert non-incremental MIDX to incremental': 
+	test_commit base &&
+	git repack -ad &&
+	git multi-pack-index write &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5302-pack-index/.git/
-ok 1 - setup
+	test_path_is_file $packdir/multi-pack-index &&
+	old_hash="$(midx_checksum $objdir)" &&
 
-expecting success of 5302.2 'pack-objects with index version 1': 
-	pack1=$(git pack-objects --index-version=1 test-1 <obj-list) &&
-	git verify-pack -v "test-1-${pack1}.pack"
+	test_commit other &&
+	git repack -d &&
+	git multi-pack-index write --incremental &&
 
-4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
-e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
-78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
-1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
-571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
-671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
-f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
-0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
-1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
-19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
-2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
-b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
-ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
-a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
-b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
-9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
-35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
-0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
-305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
-67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
-61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
-5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
-1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
-ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
-ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
-ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
-ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
-17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
-36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
-60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
-a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
-ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
-612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
-ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
-d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
-e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
-8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
-8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
-416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
-8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
-beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
-0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
-9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
-66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
-bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
-2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
-f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
-add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
-75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
-64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
-597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
-8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
-c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
-0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
-cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
-2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
-0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
-633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
-76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
-df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
-9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
-ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
-1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
-9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
-a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
-cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
-60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
-f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
-5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
-d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
-67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
-c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
-258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
-fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
-e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
-383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
-ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
-9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
-c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
-1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
-bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
-71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
-2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
-83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
-b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
-298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
-ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
-b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
-368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
-16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
-711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
-d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
-bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
-fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
-b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
-4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
-2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
-99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
-8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
-f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
-3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
-1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
-862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
-0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
-c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
-e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
-bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
-0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
-359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
-8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
-8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
-6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
-09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
-f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
-964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
-408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
-912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
-f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
-b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
-49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
-8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
-fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
-f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
-01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
-de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
-9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
-816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
-72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
-41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
-94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
-85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
-bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
-b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
-20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
-94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
-7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
-e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
-8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
-ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
-92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
-f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
-59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
-2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
-c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
-03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
-dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
-8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
-614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
-b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
-852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
-15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
-75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
-95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
-5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
-c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
-57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
-84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
-2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
-9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
-a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
-5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
-de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
-d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
-72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
-debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
-e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
-197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
-fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
-10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
-16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
-08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
-e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
-5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
-14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
-84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
-5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
-610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
-3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
-0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
-611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
-e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
-ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
-d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
-b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
-99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
-159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
-1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
-6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
-b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
-cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
-72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
-b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
-e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
-aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
-d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
-fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
-5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
-a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
-bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
-b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
-3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
-0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
-34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
-8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
-e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
-37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
-a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
-99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
-e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
-a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
-53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
-26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
-c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
-a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
-36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
-642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
-29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
-d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
-ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
-2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
-fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
-b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
-6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
-38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
-69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
-c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
-a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
-735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
-84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
-5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
-c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
-441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
-55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
-86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
-8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
-c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
-9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
-fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
-879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
-d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
-088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
-9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
-2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
-9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
-a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
-291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
-464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
-aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
-896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
-f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
-d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
-8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
-e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
-abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
-6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
-b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
-088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
-609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
-90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
-05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
-cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
-73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
-46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
-ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
-0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
-f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
-636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
-497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
-c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
-921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
-9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
-1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
-188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
-cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
-dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
-d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
-2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
-035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
-74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
-efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
-92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
-da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
-63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
-5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
-aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
-141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
-e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
-4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
-c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
-91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
-0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
-36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
-54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
-8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
-6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
-7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
-non delta: 112 objects
-chain length = 1: 110 objects
-chain length = 2: 10 objects
-chain length = 3: 10 objects
-chain length = 4: 10 objects
-chain length = 5: 10 objects
-chain length = 6: 10 objects
-chain length = 7: 10 objects
-chain length = 8: 10 objects
-chain length = 9: 10 objects
-test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
-ok 2 - pack-objects with index version 1
+	test_path_is_missing $packdir/multi-pack-index &&
+	test_path_is_file $midx_chain &&
+	test_line_count = 2 $midx_chain &&
+	grep $old_hash $midx_chain
 
-expecting success of 5302.3 'pack-objects with index version 2': 
-	pack2=$(git pack-objects --index-version=2 test-2 <obj-list) &&
-	git verify-pack -v "test-2-${pack2}.pack"
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master cabba2b] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+baa53bc5092bed50378fe9232ae7878828df2890
+ok 1 - convert non-incremental MIDX to incremental
 
-4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
-e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
-78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
-1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
-571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
-671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
-f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
-0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
-1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
-19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
-2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
-b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
-ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
-a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
-b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
-9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
-35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
-0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
-305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
-67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
-61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
-5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
-1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
-ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
-ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
-ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
-ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
-17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
-36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
-60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
-a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
-ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
-612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
-ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
-d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
-e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
-8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
-8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
-416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
-8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
-beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
-0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
-9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
-66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
-bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
-2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
-f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
-add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
-75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
-64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
-597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
-8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
-c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
-0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
-cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
-2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
-0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
-633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
-76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
-df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
-9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
-ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
-1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
-9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
-a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
-cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
-60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
-f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
-5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
-d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
-67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
-c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
-258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
-fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
-e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
-383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
-ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
-9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
-c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
-1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
-bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
-71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
-2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
-83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
-b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
-298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
-ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
-b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
-368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
-16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
-711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
-d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
-bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
-fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
-b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
-4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
-2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
-99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
-8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
-f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
-3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
-1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
-862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
-0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
-c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
-e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
-bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
-0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
-359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
-8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
-8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
-6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
-09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
-f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
-964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
-408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
-912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
-f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
-b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
-49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
-8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
-fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
-f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
-01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
-de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
-9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
-816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
-72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
-41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
-94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
-85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
-bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
-b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
-20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
-94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
-7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
-e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
-8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
-ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
-92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
-f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
-59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
-2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
-c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
-03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
-dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
-8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
-614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
-b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
-852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
-15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
-75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
-95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
-5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
-c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
-57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
-84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
-2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
-9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
-a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
-5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
-de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
-d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
-72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
-debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
-e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
-197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
-fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
-10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
-16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
-08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
-e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
-5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
-14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
-84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
-5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
-610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
-3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
-0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
-611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
-e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
-ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
-d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
-b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
-99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
-159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
-1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
-6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
-b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
-cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
-72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
-b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
-e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
-aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
-d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
-fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
-5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
-a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
-bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
-b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
-3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
-0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
-34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
-8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
-e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
-37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
-a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
-99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
-e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
-a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
-53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
-26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
-c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
-a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
-36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
-642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
-29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
-d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
-ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
-2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
-fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
-b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
-6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
-38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
-69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
-c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
-a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
-735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
-84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
-5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
-c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
-441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
-55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
-86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
-8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
-c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
-9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
-fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
-879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
-d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
-088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
-9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
-2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
-9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
-a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
-291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
-464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
-aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
-896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
-f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
-d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
-8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
-e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
-abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
-6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
-b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
-088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
-609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
-90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
-05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
-cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
-73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
-46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
-ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
-0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
-f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
-636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
-497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
-c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
-921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
-9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
-1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
-188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
-cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
-dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
-d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
-2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
-035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
-74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
-efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
-92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
-da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
-63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
-5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
-aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
-141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
-e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
-4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
-c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
-91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
-0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
-36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
-54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
-8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
-6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
-7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
-non delta: 112 objects
-chain length = 1: 110 objects
-chain length = 2: 10 objects
-chain length = 3: 10 objects
-chain length = 4: 10 objects
-chain length = 5: 10 objects
-chain length = 6: 10 objects
-chain length = 7: 10 objects
-chain length = 8: 10 objects
-chain length = 9: 10 objects
-test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
-ok 3 - pack-objects with index version 2
-
-expecting success of 5302.4 'both packs should be identical': 
-	cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"
-
-ok 4 - both packs should be identical
-
-expecting success of 5302.5 'index v1 and index v2 should be different': 
-	! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"
-
-test-1-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 1, line 1
-ok 5 - index v1 and index v2 should be different
-
-expecting success of 5302.6 'index-pack with index version 1': 
-	git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"
-
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 6 - index-pack with index version 1
-
-expecting success of 5302.7 'index-pack with index version 2': 
-	git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"
-
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 7 - index-pack with index version 2
-
-expecting success of 5302.8 'index-pack results should match pack-objects ones': 
-	cmp "test-1-${pack1}.idx" "1.idx" &&
-	cmp "test-2-${pack2}.idx" "2.idx"
-
-ok 8 - index-pack results should match pack-objects ones
-
-expecting success of 5302.9 'index-pack --verify on index version 1': 
-	git index-pack --verify "test-1-${pack1}.pack"
-
-ok 9 - index-pack --verify on index version 1
-
-expecting success of 5302.10 'index-pack --verify on index version 2': 
-	git index-pack --verify "test-2-${pack2}.pack"
-
-ok 10 - index-pack --verify on index version 2
-
-expecting success of 5302.11 'pack-objects --index-version=2, is not accepted': 
-	test_must_fail git pack-objects --index-version=2, test-3 <obj-list
-
-fatal: bad index version '2,'
-ok 11 - pack-objects --index-version=2, is not accepted
-
-expecting success of 5302.12 'index v2: force some 64-bit offsets with pack-objects': 
-	pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)
-
-ok 12 - index v2: force some 64-bit offsets with pack-objects
-
-expecting success of 5302.13 'index v2: verify a pack with some 64-bit offsets': 
-	git verify-pack -v "test-3-${pack3}.pack"
-
-4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
-e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
-78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
-1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
-571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
-671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
-f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
-0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
-1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
-19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
-2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
-b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
-ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
-a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
-b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
-9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
-35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
-0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
-305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
-67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
-61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
-5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
-1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
-ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
-ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
-ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
-ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
-17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
-36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
-60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
-a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
-ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
-612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
-ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
-d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
-e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
-8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
-8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
-416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
-8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
-beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
-0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
-9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
-66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
-bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
-2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
-f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
-add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
-75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
-64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
-597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
-8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
-c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
-0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
-cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
-2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
-0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
-633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
-76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
-df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
-9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
-ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
-1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
-9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
-a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
-cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
-60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
-f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
-5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
-d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
-67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
-c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
-258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
-fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
-e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
-383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
-ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
-9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
-c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
-1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
-bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
-71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
-2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
-83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
-b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
-298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
-ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
-b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
-368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
-16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
-711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
-d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
-bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
-fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
-b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
-4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
-2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
-99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
-8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
-f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
-3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
-1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
-862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
-0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
-c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
-e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
-bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
-0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
-359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
-8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
-8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
-6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
-09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
-f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
-964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
-408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
-912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
-f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
-b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
-49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
-8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
-fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
-f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
-01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
-de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
-9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
-816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
-72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
-41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
-94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
-85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
-bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
-b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
-20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
-94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
-7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
-e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
-8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
-ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
-92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
-f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
-59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
-2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
-c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
-03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
-dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
-8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
-614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
-b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
-852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
-15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
-75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
-95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
-5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
-c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
-57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
-84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
-2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
-9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
-a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
-5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
-de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
-d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
-72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
-debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
-e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
-197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
-fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
-10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
-16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
-08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
-e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
-5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
-14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
-84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
-5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
-610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
-3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
-0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
-611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
-e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
-ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
-d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
-b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
-99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
-159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
-1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
-6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
-b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
-cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
-72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
-b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
-e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
-aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
-d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
-fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
-5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
-a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
-bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
-b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
-3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
-0b968294884af115eb5a1b941b3dabd48470c3bb blob   12 41 844032 1 3927444e44b49dfa6cdc768298ae879ec298c45d
-34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
-8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
-e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
-37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
-a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
-99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
-e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
-a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
-53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
-26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
-c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
-a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
-36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
-642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
-29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
-d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
-ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
-2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
-fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
-b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
-6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
-38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
-69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
-c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
-a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
-735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
-84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
-5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
-c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
-441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
-55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
-86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
-8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
-c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
-9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
-fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
-879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
-d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
-088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
-9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
-2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
-9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
-a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
-291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
-464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
-aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
-896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
-f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
-d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
-8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
-e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
-abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
-6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
-b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
-088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
-609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
-90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
-05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
-cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
-73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
-46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
-ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
-0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
-f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
-636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
-497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
-c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
-921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
-9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
-1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
-188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
-cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
-dd39f8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
-d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
-2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
-035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
-74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
-efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
-92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
-da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
-63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
-5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
-aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
-141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
-e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
-4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
-c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
-91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
-0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
-36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
-54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
-8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
-6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
-7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
-non delta: 112 objects
-chain length = 1: 110 objects
-chain length = 2: 10 objects
-chain length = 3: 10 objects
-chain length = 4: 10 objects
-chain length = 5: 10 objects
-chain length = 6: 10 objects
-chain length = 7: 10 objects
-chain length = 8: 10 objects
-chain length = 9: 10 objects
-test-3-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack: ok
-ok 13 - index v2: verify a pack with some 64-bit offsets
-
-expecting success of 5302.14 '64-bit offsets: should be different from previous index v2 results': 
-	! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"
+expecting success of 5334.2 'check normal git operations: incremental MIDX': 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
+	
+ok 2 - check normal git operations: incremental MIDX
 
-test-2-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx test-3-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx differ: char 8281, line 24
-ok 14 - 64-bit offsets: should be different from previous index v2 results
+expecting success of 5334.3 'convert incremental to non-incremental': 
+	test_commit squash &&
+	git repack -d &&
+	git multi-pack-index write &&
 
-expecting success of 5302.15 'index v2: force some 64-bit offsets with index-pack': 
-	git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"
+	test_path_is_file $packdir/multi-pack-index &&
+	test_dir_is_empty $midxdir
 
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 15 - index v2: force some 64-bit offsets with index-pack
+[master 5c5d970] squash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 squash.t
+ok 3 - convert incremental to non-incremental
 
-expecting success of 5302.16 '64-bit offsets: index-pack result should match pack-objects one': 
-	cmp "test-3-${pack3}.idx" "3.idx"
+expecting success of 5334.4 'check normal git operations: non-incremental MIDX conversion': 
+		midx_git_two_modes "rev-list --objects --all" &&
+		midx_git_two_modes "log --raw" &&
+		midx_git_two_modes "count-objects --verbose" &&
+		midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
+		midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
+	
+ok 4 - check normal git operations: non-incremental MIDX conversion
 
-ok 16 - 64-bit offsets: index-pack result should match pack-objects one
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t4255-am-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/.git/
+expecting success of 4255.1 'am: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - am: added submodule creates empty directory
 
-expecting success of 5302.17 'index-pack --verify on 64-bit offset v2 (cheat)': 
-	# This cheats by knowing which lower offset should still be encoded
-	# in 64-bit representation.
-	git index-pack --verify --index-version=2,0x40000 "test-3-${pack3}.pack"
+expecting success of 4255.2 'am: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - am: added submodule leaves existing empty directory alone
 
-ok 17 - index-pack --verify on 64-bit offset v2 (cheat)
+expecting success of 4255.3 'am: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - am: replace tracked file with submodule creates empty directory
 
-expecting success of 5302.18 'index-pack --verify on 64-bit offset v2': 
-	git index-pack --verify "test-3-${pack3}.pack"
+expecting success of 4255.4 'am: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - am: replace directory with submodule
 
-ok 18 - index-pack --verify on 64-bit offset v2
+expecting success of 4255.5 'am: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 5 - am: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 5302.19 '[index v1] 1) stream pack to repository': 
-	git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
-	git prune-packed &&
-	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
-	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
-	cmp "test-1-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+expecting success of 4255.6 'am: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Revert "Add sub1"
+ok 6 - am: removed submodule leaves submodule containing a .git directory alone
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 19 - [index v1] 1) stream pack to repository
+expecting success of 4255.7 'am: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+ok 7 - am: replace submodule with a directory must fail
 
-expecting success of 5302.20 '[index v1] 2) create a stealth corruption in a delta base reference': 
-	# This test assumes file_101 is a delta smaller than 16 bytes.
-	# It should be against file_100 but we substitute its base for file_099
-	sha1_101=$(git hash-object file_101) &&
-	sha1_099=$(git hash-object file_099) &&
-	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
-	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
-	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
-	recordsz=$((rawsz + 4)) &&
-	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
-	       if=".git/objects/pack/pack-${pack1}.idx" \
-	       skip=$((4 + 256 * 4 + $nr_099 * recordsz)) \
-	       bs=1 count=$rawsz conv=notrunc &&
-	git cat-file blob $sha1_101 > file_101_foo1
+expecting success of 4255.8 'am: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Replace sub1 with directory
+Patch failed at 0001 Replace sub1 with directory
+ok 8 - am: replace submodule containing a .git directory with a directory must fail
 
-20+0 records in
-20+0 records out
-20 bytes copied, 4.588e-05 s, 436 kB/s
-ok 20 - [index v1] 2) create a stealth corruption in a delta base reference
+checking known breakage of 4255.9 'am: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 9 - am: replace submodule with a file must fail # TODO known breakage
 
-expecting success of 5302.21 '[index v1] 3) corrupted delta happily returned wrong data': 
-	test -f file_101_foo1 && ! cmp file_101 file_101_foo1
+checking known breakage of 4255.10 'am: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Replace sub1 with file
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-file_101 file_101_foo1 differ: char 5, line 2
-ok 21 - [index v1] 3) corrupted delta happily returned wrong data
+expecting success of 4255.11 'am: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - am: modified submodule does not update submodule work tree
 
-expecting success of 5302.22 '[index v1] 4) confirm that the pack is actually corrupted': 
-	test_must_fail git fsck --full $commit
+expecting success of 4255.12 'am: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Applying: Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - am: modified submodule does not update submodule work tree to invalid commit
 
-error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
-error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
-ok 22 - [index v1] 4) confirm that the pack is actually corrupted
+expecting success of 4255.13 'am: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - am: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 5302.23 '[index v1] 5) pack-objects happily reuses corrupted data': 
-	pack4=$(git pack-objects test-4 <obj-list) &&
-	test -f "test-4-${pack4}.pack"
+expecting success of 4255.14 'am: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: sub1: already exists in working directory
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Applying: Add sub1
+Patch failed at 0001 Add sub1
+ok 14 - am: added submodule doesn't remove untracked unignored file with same name
 
-ok 23 - [index v1] 5) pack-objects happily reuses corrupted data
+expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - am_3way: added submodule creates empty directory
 
-expecting success of 5302.24 '[index v1] 6) newly created pack is BAD !': 
-	test_must_fail git verify-pack -v "test-4-${pack4}.pack"
+expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - am_3way: added submodule leaves existing empty directory alone
 
-4307528f01beff143cd36a903cb8c9a9983a4c27 tree   12036 7200 12
-e43b5801e4ac39a512e5d9423fc272cf5c3343f9 blob   300 313 7212
-78fcb2fa30f448929fae32736f0fb56733d08746 blob   108 141 7525 1 e43b5801e4ac39a512e5d9423fc272cf5c3343f9
-1c547eac61c40965963e85a56c24991ab1a0e3ef blob   108 141 7666 2 78fcb2fa30f448929fae32736f0fb56733d08746
-571c7b54485960a9820927983c702eec1b41e91a blob   108 141 7807 3 1c547eac61c40965963e85a56c24991ab1a0e3ef
-671d8800ae6936f107d70de2dbec536afb47d89a blob   108 141 7948 4 571c7b54485960a9820927983c702eec1b41e91a
-f2377b316d0d92e3c29a2d6dba598ca02fb80e9c blob   108 141 8089 5 671d8800ae6936f107d70de2dbec536afb47d89a
-0483297992ed4cd5ab3b5790912b1f03598ea660 blob   108 141 8230 6 f2377b316d0d92e3c29a2d6dba598ca02fb80e9c
-1ddb0e1ff0db350df93807fda44ef75358d7ddb0 blob   108 141 8371 7 0483297992ed4cd5ab3b5790912b1f03598ea660
-19dec2e189cd33584d2173979aecea01b3c59904 blob   108 141 8512 8 1ddb0e1ff0db350df93807fda44ef75358d7ddb0
-2bc95d3b86ed1808b73d84f5c0287a61df979063 blob   108 141 8653 9 19dec2e189cd33584d2173979aecea01b3c59904
-b8f11d512203fd0260eb79edd5cfca416ca404cb blob   300 313 8794
-ef790963bda7ffd9e3556cf4211492680b34c2bf blob   108 141 9107 1 b8f11d512203fd0260eb79edd5cfca416ca404cb
-a854bd2ad779f987395c790d0aa378277a7d3216 blob   108 141 9248 2 ef790963bda7ffd9e3556cf4211492680b34c2bf
-b750a0431df80025eff766f0811e6a85e1dbc32a blob   108 141 9389 3 a854bd2ad779f987395c790d0aa378277a7d3216
-9e793c3eeb7402e17eafb61928b96648a54a8789 blob   108 141 9530 4 b750a0431df80025eff766f0811e6a85e1dbc32a
-35691bb59cfc8e5f0749a3c2df2d236150d7f7d1 blob   108 141 9671 5 9e793c3eeb7402e17eafb61928b96648a54a8789
-0df5edef6dcc6452cf814984a4d4ea23a8e41e3c blob   108 141 9812 6 35691bb59cfc8e5f0749a3c2df2d236150d7f7d1
-305f923c2d2e1fff9ec067b42443fff88aeebc67 blob   108 141 9953 7 0df5edef6dcc6452cf814984a4d4ea23a8e41e3c
-67db08cb82e0053ee51773fbf4bdc50094e03767 blob   108 141 10094 8 305f923c2d2e1fff9ec067b42443fff88aeebc67
-61a87ea87b8af074a75d0af78e77f2ed6141922c blob   108 141 10235 9 67db08cb82e0053ee51773fbf4bdc50094e03767
-5e69af01a42867f9be8213089efc57c6a1517976 blob   300 313 10376
-1280048552e2ee86127654132148d3c2e208b397 blob   108 141 10689 1 5e69af01a42867f9be8213089efc57c6a1517976
-ec86b748af33306ff620ebe591da28ed622c1b4d blob   108 141 10830 2 1280048552e2ee86127654132148d3c2e208b397
-ce83a0772693235f137100863f4217f9c6398a53 blob   108 141 10971 3 ec86b748af33306ff620ebe591da28ed622c1b4d
-ebd5d1af0d246aa4f8e288c539b906eb765d48e1 blob   108 141 11112 4 ce83a0772693235f137100863f4217f9c6398a53
-ef99659edf6a12a9320e29453d1e17054863c3d1 blob   108 141 11253 5 ebd5d1af0d246aa4f8e288c539b906eb765d48e1
-17dc4d50c25440e569d3c4dabf41bb562c9013fc blob   108 141 11394 6 ef99659edf6a12a9320e29453d1e17054863c3d1
-36a0964d29672133cea581290233bae77c3b8cca blob   108 141 11535 7 17dc4d50c25440e569d3c4dabf41bb562c9013fc
-60a658626764685c980311c6325263eabdbe0547 blob   108 141 11676 8 36a0964d29672133cea581290233bae77c3b8cca
-a7b6688d2a6f15e6f91d1701f64ca7da42a5a73a blob   108 141 11817 9 60a658626764685c980311c6325263eabdbe0547
-ef1259b944f1b0c4ade62c049c2ea41daf63ccc7 blob   300 313 11958
-612f382c01ffd0ea89c2a840cc683cfd1108628e blob   108 141 12271 1 ef1259b944f1b0c4ade62c049c2ea41daf63ccc7
-ba0b924be466e9d85f8ba5563211e570d12d2841 blob   108 141 12412 2 612f382c01ffd0ea89c2a840cc683cfd1108628e
-d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e blob   108 141 12553 3 ba0b924be466e9d85f8ba5563211e570d12d2841
-e80b417ea517c993f906556a00fa8acaceb559b4 blob   108 141 12694 4 d05e80ce75fe6189e1b08dfc5fb9bf0a1a6e544e
-8cc2e1974c339c43bd481c205ea0024b54dbcb83 blob   108 141 12835 5 e80b417ea517c993f906556a00fa8acaceb559b4
-8e57f0560c1135c5cdaca2c69094489ad6ddcdb0 blob   108 141 12976 6 8cc2e1974c339c43bd481c205ea0024b54dbcb83
-416013a155571063a96f1e443ee44a8ac3f09c1b blob   108 141 13117 7 8e57f0560c1135c5cdaca2c69094489ad6ddcdb0
-8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed blob   108 141 13258 8 416013a155571063a96f1e443ee44a8ac3f09c1b
-beb699952b6a188a54675c11696cb6a2652b5249 blob   108 141 13399 9 8dc7c392787f4ec7bb28c57bc6744a2b5f3122ed
-0f66db930e6ce643852ad45eb91dc203575fb5f4 blob   300 313 13540
-9a3a619d26a6e19b556d119d760b40a6397a9df4 blob   108 141 13853 1 0f66db930e6ce643852ad45eb91dc203575fb5f4
-66336af04f97cfd40474e8aa4cea2e25275b5f94 blob   108 141 13994 2 9a3a619d26a6e19b556d119d760b40a6397a9df4
-bf8886056d3abf37690115bfee10bf14ef5e4db9 blob   108 141 14135 3 66336af04f97cfd40474e8aa4cea2e25275b5f94
-2c1120aee9298045837641feab263b3655725aa3 blob   108 141 14276 4 bf8886056d3abf37690115bfee10bf14ef5e4db9
-f47f0d90220589a45dbccd06c8468eca7c04d70a blob   108 141 14417 5 2c1120aee9298045837641feab263b3655725aa3
-add63edc5ce2dd58ff7d66b153f44d03b0d93df2 blob   108 141 14558 6 f47f0d90220589a45dbccd06c8468eca7c04d70a
-75642e5399f1b51a33f0c6430af2fd997e4db578 blob   108 141 14699 7 add63edc5ce2dd58ff7d66b153f44d03b0d93df2
-64e473488413d66fe6e464b3f09827501eb353fe blob   108 141 14840 8 75642e5399f1b51a33f0c6430af2fd997e4db578
-597244daf249731fc922a26acfe6fb9ea3baca7f blob   108 141 14981 9 64e473488413d66fe6e464b3f09827501eb353fe
-8d5f6b41255c60ea8f44892b918a38eebe43de6b blob   300 313 15122
-c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94 blob   108 141 15435 1 8d5f6b41255c60ea8f44892b918a38eebe43de6b
-0246ff570c396c37ff08c0f5f9d88c84fc21a297 blob   108 141 15576 2 c26e8fbe6bd52d34b340f61780b6e3dd3b9bed94
-cff9bb4b47c1bc50205d6a793d8d02bee852a229 blob   108 141 15717 3 0246ff570c396c37ff08c0f5f9d88c84fc21a297
-2096ec927d087ee1076f1118e8fe48ab21a27bd7 blob   108 141 15858 4 cff9bb4b47c1bc50205d6a793d8d02bee852a229
-0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501 blob   108 141 15999 5 2096ec927d087ee1076f1118e8fe48ab21a27bd7
-633de7a70fe29cecb721bb5033573fbf175b31fc blob   108 141 16140 6 0ff6b3e6f0b0957b5b05a06d9b4580f0e1798501
-76db9ca0f1afa9c247d4c5a2fe60ca95154fd465 blob   108 141 16281 7 633de7a70fe29cecb721bb5033573fbf175b31fc
-df4c5c8e8e25621bba74f233d59c76e5810f8677 blob   108 141 16422 8 76db9ca0f1afa9c247d4c5a2fe60ca95154fd465
-9fc4cce844af6ed26932eb84045df0ab4a79f0b7 blob   108 141 16563 9 df4c5c8e8e25621bba74f233d59c76e5810f8677
-ef3ddda4c2922f10089dfed6436267b445d5b118 blob   300 313 16704
-1bdedd473270eef5c2c67c968ba1d5ee081013ee blob   108 141 17017 1 ef3ddda4c2922f10089dfed6436267b445d5b118
-9d28c1ea0790ee28b8c35bc3fe88629980708730 blob   108 141 17158 2 1bdedd473270eef5c2c67c968ba1d5ee081013ee
-a3264a35996ccaf722f869be8e379864e28ef561 blob   108 141 17299 3 9d28c1ea0790ee28b8c35bc3fe88629980708730
-cd6f1b15bb20b9c706f8f80c77b7c210921f0b26 blob   108 141 17440 4 a3264a35996ccaf722f869be8e379864e28ef561
-60601746c22df38cc0bcbce68f359fb2796d7569 blob   108 141 17581 5 cd6f1b15bb20b9c706f8f80c77b7c210921f0b26
-f15a3f5dae93709cce491d407dad343f9577d8c5 blob   108 141 17722 6 60601746c22df38cc0bcbce68f359fb2796d7569
-5dd384bbc7186571a9cccdba2ebaa794e87bfbdd blob   108 141 17863 7 f15a3f5dae93709cce491d407dad343f9577d8c5
-d18475904b78554f1fd6f96b4c1ad44e84edf873 blob   108 141 18004 8 5dd384bbc7186571a9cccdba2ebaa794e87bfbdd
-67728c76be3b7d5319ff2a93fc78aca0ff3824eb blob   108 141 18145 9 d18475904b78554f1fd6f96b4c1ad44e84edf873
-c1ec14f204e244f32aa93c66e3fb6a7d4f58c081 blob   300 313 18286
-258424ed6e5c4377a2aa55fb6d4818a3580291ad blob   108 141 18599 1 c1ec14f204e244f32aa93c66e3fb6a7d4f58c081
-fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2 blob   108 141 18740 2 258424ed6e5c4377a2aa55fb6d4818a3580291ad
-e1bfca166c2ff676f665fd3c58d7dea896ec48d7 blob   108 141 18881 3 fcaa7a21cb9d0b0aa84d2cbac5115d7c300739a2
-383c3c67e93cfd05d272b187e3af5c1e00bcae5c blob   108 141 19022 4 e1bfca166c2ff676f665fd3c58d7dea896ec48d7
-ad6a3267a9e0d49014eec133a5e968315e8ce834 blob   108 141 19163 5 383c3c67e93cfd05d272b187e3af5c1e00bcae5c
-9dfc592085bb14371890b41e48c98b220420669b blob   108 141 19304 6 ad6a3267a9e0d49014eec133a5e968315e8ce834
-c872afc7539f689178b7385010010ca7aef8f09a blob   108 141 19445 7 9dfc592085bb14371890b41e48c98b220420669b
-1bc038b18c5039a05e173da2fd2b65b3d34ccd2b blob   108 141 19586 8 c872afc7539f689178b7385010010ca7aef8f09a
-bdd7bd883f75c1726538851757168dc0dc33e222 blob   108 141 19727 9 1bc038b18c5039a05e173da2fd2b65b3d34ccd2b
-71529d6ca58922aa05603b6f2784f87cad8703cf blob   300 313 19868
-2bebfa6240e319a1c31951d05c8135f089fbbd29 blob   108 141 20181 1 71529d6ca58922aa05603b6f2784f87cad8703cf
-83fcb919ae7bc9a80912c9bfd5731acd36666480 blob   108 141 20322 2 2bebfa6240e319a1c31951d05c8135f089fbbd29
-b97506df40bbd212b52062b851cd88f04abb59b3 blob   108 141 20463 3 83fcb919ae7bc9a80912c9bfd5731acd36666480
-298dc4942c3b3db53d484ffa86b451755cd2125f blob   108 141 20604 4 b97506df40bbd212b52062b851cd88f04abb59b3
-ba11c807afc9699e7ea1cab791699bfd698c7e7d blob   108 141 20745 5 298dc4942c3b3db53d484ffa86b451755cd2125f
-b1281e620292c2e74d8770eb99f0b6871e4cca59 blob   108 141 20886 6 ba11c807afc9699e7ea1cab791699bfd698c7e7d
-368cd4d02a420764e0d31b35576f73b777c34604 blob   108 141 21027 7 b1281e620292c2e74d8770eb99f0b6871e4cca59
-16d1323e84e3d5b058ab2ac8245db85bc4606c88 blob   108 141 21168 8 368cd4d02a420764e0d31b35576f73b777c34604
-711d5e6b0d21b3aa205dcc960ec51475be8a25a5 blob   108 141 21309 9 16d1323e84e3d5b058ab2ac8245db85bc4606c88
-d174d532539487c9aedbbaf38d556061b5acf826 blob   300 313 21450
-bf5dcb9013df15ff0ae10e0682a92a7688a7720b blob   108 141 21763 1 d174d532539487c9aedbbaf38d556061b5acf826
-fb214b786310655bc8ee46d89ca9a04ec9aed0c3 blob   108 141 21904 2 bf5dcb9013df15ff0ae10e0682a92a7688a7720b
-b94140f4006d05e7e3822f5db19adc2b73a2cc05 blob   108 141 22045 3 fb214b786310655bc8ee46d89ca9a04ec9aed0c3
-4019b50c838197ca4b8d664a4164a183cac8ad11 blob   108 141 22186 4 b94140f4006d05e7e3822f5db19adc2b73a2cc05
-2826157afde0e74742115842ac2dddf5c3b5e23e blob   108 141 22327 5 4019b50c838197ca4b8d664a4164a183cac8ad11
-99556fcde6a0be62a72c8b0c6682576a1d596bea blob   108 141 22468 6 2826157afde0e74742115842ac2dddf5c3b5e23e
-8f5e7974c287b07f1cf8116485c4135340b807f3 blob   108 141 22609 7 99556fcde6a0be62a72c8b0c6682576a1d596bea
-f9982291dfe87a9def1b12d24f9ca9a024a9dd8e blob   108 141 22750 8 8f5e7974c287b07f1cf8116485c4135340b807f3
-3c5c0be699798d2f4fbe651051b9f17156f133c1 blob   108 141 22891 9 f9982291dfe87a9def1b12d24f9ca9a024a9dd8e
-1297547aab30f952af805d38f6f1c1930cb3117b blob   8196 8210 23032
-862f6954d9afd549b48fa2ef8e2f8ab96e309916 blob   8196 8210 31242
-0471b3b8ab8da19f3968dc238e9555f4e48ce858 blob   8196 8210 39452
-c80092496b80b5f21503b8c838dccfc1f2e2ddde blob   8196 8210 47662
-e5a12c79cec70d52817054c4b9ef321003c6755f blob   8196 8210 55872
-bf96a31446f37d8e57bb38a00797aa3af1f99370 blob   8196 8210 64082
-0508b858e01f0367552fb14722388ba48dbd36f7 blob   8196 8210 72292
-359017d1534767455090901a260985de1658d752 blob   8196 8210 80502
-8d06001a3d38390afa66576caa6c55c796e33835 blob   8196 8210 88712
-8162ceb825c07e3b1e17f5775665085da9b1e855 blob   8196 8210 96922
-6910c5a645c9fe7f6b728034566b1668f0677a8e blob   8196 8210 105132
-09ba511a995b8ea75067036d5c046f39052a3bd8 blob   8196 8210 113342
-f45d142313c7a5270a60c664bb463cddadc467c1 blob   8196 8210 121552
-964e51bf7d344bda71ea5e12dbd7bfb90120fcf0 blob   8196 8210 129762
-408dd031138139f6ac6f402988f960527871f71a blob   8196 8210 137972
-912fa0ec5536f31122e34577a4baf3b22d40de2a blob   8196 8210 146182
-f02359c44ca04a542cc5bf59aa5f1de6cd1d5a4c blob   8196 8210 154392
-b0566dd5d479c80c278bd5455c92aca689328471 blob   8196 8210 162602
-49d17d605f042c1e978a68f625be6ab6294fa8fa blob   8196 8210 170812
-8f744480abe8ad05bc419d1ab2e375b9c0fa3978 blob   8196 8210 179022
-fff3a3a92d2268a464dbdcd00fc055885ee3cba9 blob   8196 8210 187232
-f5fc0ff4afc14d9dfcb2580d3f438edd4cd8130a blob   8196 8210 195442
-01179d82b18c252824e20e190543e0e84950d820 blob   8196 8210 203652
-de3ed457f973b7ffb20edc36002c47a6e4b41066 blob   8196 8210 211862
-9c4e1f8c16d04d90a2217279240996276d617067 blob   8196 8210 220072
-816f18d19f433f5df9edbfb5547684b519fdeb3b blob   8196 8210 228282
-72e7428e5ee3797ca0bf955f723b915bee919c48 blob   8196 8210 236492
-41adb5af8e7f9737b16261fb0c224c7550c82f23 blob   8196 8210 244702
-94f5d368a7c4ea294c463dc45cf15d387fa83c4e blob   8196 8210 252912
-85fdf2eed169dbc1fe2d71439b589b0326dad12b blob   8196 8210 261122
-bab18d872e9183c6d450b326477205bb0cc081cb blob   8196 8210 269332
-b31fb3fb181512bc608b58cb33323d97ad6eac2f blob   8196 8210 277542
-20a9519106ab64bf043456a58b6bfb04f1c7b39d blob   8196 8210 285752
-94a015b2b6053f7a1d541969919e879bb2b75eef blob   8196 8210 293962
-7353550b9b0e1da4f68b9484dfad2634100a00cc blob   8196 8210 302172
-e28a360bcbd69ca1a0bb47834e640069c6672a8d blob   8196 8210 310382
-8e6ffc05856460c2e08c8e9d824bbf510d3c1b52 blob   8196 8210 318592
-ceade5760b1ba0bc11d4e4db6982ddf671495e58 blob   8196 8210 326802
-92534f38b94c1da321d88c9ab5af8c3e804c2507 blob   8196 8210 335012
-f5577acbfd83dddf90b2054d6cb5dce2df6d06ee blob   8196 8210 343222
-59a27076dc0a8989215a160d61ac401e41c05126 blob   8196 8210 351432
-2db6b919f253444b5437d8251e5d101d5a34e1b3 blob   8196 8210 359642
-c1c35c36d4300da28c0570746adaf2f5b0b015a3 blob   8196 8210 367852
-03a6f56dbbb556425ef8c43c31519b32eb5629a4 blob   8196 8210 376062
-dd6209d4c0c5d4f210a8d1bb4a4d314cf284dea9 blob   8196 8210 384272
-8c04fa425f4dfb4555b376e73d8f28d56b97a569 blob   8196 8210 392482
-614e235cd8ca8af7ccf402a92eb34baadaaa3f18 blob   8196 8210 400692
-b2f07ee5771d9e0de7166bc72a4a7ebce9830779 blob   8196 8210 408902
-852ba0cf084474c1b0b48052606ae27346a5b1a1 blob   8196 8210 417112
-15ff79f644a0596529eba0592017dce39e222b8e blob   8196 8210 425322
-75f67c0c230f8923db5831094b1cc67f61bf1734 blob   8196 8210 433532
-95b51158cd6365da9b10f1d8b06ba76dc5d5c5f1 blob   8196 8210 441742
-5217ce416b26a3d76191d873490110746d0e8a04 blob   8196 8210 449952
-c16eb68827fa5d6da73b320b431cf736c7a6a4af blob   8196 8210 458162
-57983aab7f7384626a6a1f9ec08fba1902dd11e5 blob   8196 8210 466372
-84e4d2ce637781776791c8e2cf4a9312a2783ceb blob   8196 8210 474582
-2175a1a9d8757b3836f5cc44c6af0297aea36709 blob   8196 8210 482792
-9b655d54faaf0a737a03731852f27cf6b552bcaf blob   8196 8210 491002
-a3233ba1323f07a0d68f6020e7209025819cfa13 blob   8196 8210 499212
-5a65a213ee0ebdc285c8e8eca24e9eda97f8a384 blob   8196 8210 507422
-de1679ebb44d3fe59e8d2378471b56db384fb181 blob   8196 8210 515632
-d2e455cc03081911f9ecd81245becd858d1e64ca blob   8196 8210 523842
-72826d3e97bc228616e06235566a0db59c94bd74 blob   8196 8210 532052
-debe389b3bdd62d96748db592e99cb0cc7b1b0f2 blob   8196 8210 540262
-e572e59eee8119f8fb58e8595ecd0c622f2d6e29 blob   8196 8210 548472
-197f45d948a36ac3762e5daf6ef4d43a5d969503 blob   8196 8210 556682
-fb294d29a9d045d5a46a9c00e53777b394ceb346 blob   8196 8210 564892
-10f7133774acbc162f5f79804744d64747eee380 blob   8196 8210 573102
-16b9dea85eab6d7e452bdea4889e24a8ad79afd5 blob   8196 8210 581312
-08a8cf223e5dc57504da3cd8eb56d33f276dc1b9 blob   8196 8210 589522
-e3332ff9a2540b45e599be0c7bca8bbe28af2b43 blob   8196 8210 597732
-5e1b961ae623672df764f64b737f332318d43baa blob   8196 8210 605942
-14caba1bc2835573f3c20b7f2e5fb638a08e12ee blob   8196 8210 614152
-84d1369c26d187b24dffe9029e81e119e4a374f5 blob   8196 8210 622362
-5ef3a0f4954ade2d5c290ccc4d791c3b219d89ea blob   8196 8210 630572
-610d16151ceb1dc4d5138f63ed410819a8b9161c blob   8196 8210 638782
-3545eb1f5549261267ab0577b94372e88b49731d blob   8196 8210 646992
-0d6e5c0388744cf82463ce1283ff99e863e9b26e blob   8196 8210 655202
-611261b75bd720d3433ea8975d555b1ac3e692bd blob   8196 8210 663412
-e25dc2ac80f9f78aa2809b5cd254ce47a51efbe5 blob   8196 8210 671622
-ea5a4b4fed0bab7beffd3c7fc6cc549df47017d7 blob   8196 8210 679832
-d68756996794df8c00dfcbf520662b14cb06958e blob   8196 8210 688042
-b5b44a475116c2d0054edf54c699909d5d583aac blob   8196 8210 696252
-99ff18078623c32b85a49cc8a03e3c58ee94eecb blob   8196 8210 704462
-159fdc73e63cf90624d128d87b8185154727714e blob   8196 8210 712672
-1f0ca97497381a196e53a7639ee769ed019469a3 blob   8196 8210 720882
-6dbed45fde708bb67e6b21bd55976483305f9e74 blob   8196 8210 729092
-b5ec32ad29b65e5742cd1857d17e92c2efc5da96 blob   8196 8210 737302
-cf823d111604e8a014e0702b5e15b242bb961c78 blob   8196 8210 745512
-72528baaeeba0d9c01da36a7a0add1ac49d860f2 blob   8196 8210 753722
-b976a8fd346486d78cdebeaa0b0ac200befca629 blob   8196 8210 761932
-e652cd97e9aae1523d892c1f417274dd26c3bcd3 blob   8196 8210 770142
-aa82432626cc08fb818a20aa62b607aa52e7b35d blob   8196 8210 778352
-d67069815168092ee0eadeab8177002bd0376b6f blob   8196 8210 786562
-fa7ca115eb82e14f0263990362d4fc27591e1143 blob   8196 8210 794772
-5cadb04c4d4ec953dffc528bf75561a6ae1c5820 blob   8196 8210 802982
-a769ce6dfe1abe1b6162627b2b5df89f4f7d4317 blob   8196 8210 811192
-bf265906aab0df90b6a4bdb1fe6f8088a9038435 blob   8196 8210 819402
-b302b77fd5595784b5e85e91f8b4314fff49a6a1 blob   8196 8210 827612
-3927444e44b49dfa6cdc768298ae879ec298c45d blob   8196 8210 835822
-51e0bb44b17501c6803ca30f299ad8e69b21c8c4 blob   12 41 844032 1 b302b77fd5595784b5e85e91f8b4314fff49a6a1
-34a68de99f94f6f9e437a288349602768eae4b92 blob   250 263 844073
-8517d36660dffb896fb4e283ad110023aaebaf1b blob   57 90 844336 1 34a68de99f94f6f9e437a288349602768eae4b92
-e3fc6633c069c8e246d77a408e4747c2852ba44a blob   57 90 844426 1 34a68de99f94f6f9e437a288349602768eae4b92
-37a071e55d1f2e07af146ca6017d98dd85beae68 blob   57 90 844516 1 34a68de99f94f6f9e437a288349602768eae4b92
-a8179a233b7aeeb7a450c5d321d4b73df936b64b blob   57 90 844606 1 34a68de99f94f6f9e437a288349602768eae4b92
-99e0b239888c8b71671fb948e41111876e61a3c2 blob   57 90 844696 1 34a68de99f94f6f9e437a288349602768eae4b92
-e26e04b4786bf6b0ec3c5d528e7002cd58e2401b blob   57 90 844786 1 34a68de99f94f6f9e437a288349602768eae4b92
-a6106f10ea80724dbc32b328d9892111589a2111 blob   57 90 844876 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1669a170780865ccd7645211c2e1cebdfb28aad blob   57 90 844966 1 34a68de99f94f6f9e437a288349602768eae4b92
-53a19e0c2c34ef1a4e1bbc9aa1cba4cb9bc2dd80 blob   57 90 845056 1 34a68de99f94f6f9e437a288349602768eae4b92
-26ff29a62e7a6359d3975813fd645af871576125 blob   57 90 845146 1 34a68de99f94f6f9e437a288349602768eae4b92
-c1d6b9953613f5732cd40d8cffbb2b746a71fb92 blob   57 90 845236 1 34a68de99f94f6f9e437a288349602768eae4b92
-a2bfcc19d1592c43af33617500394e1ac09e968c blob   57 90 845326 1 34a68de99f94f6f9e437a288349602768eae4b92
-36c0479c58cef0b9a10b56934ed42a862e1dcfe2 blob   57 90 845416 1 34a68de99f94f6f9e437a288349602768eae4b92
-642aa265517d66c88f030a2230eb97e77c973905 blob   57 90 845506 1 34a68de99f94f6f9e437a288349602768eae4b92
-29cd4721cd3cef7f5a2e032d6c2d6908427cd5af blob   57 90 845596 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae5ccb1578fbc399571f4f0132edd18c55b19ef0 blob   57 90 845686 1 34a68de99f94f6f9e437a288349602768eae4b92
-d22feecdd32e57af8fd88bda0fbde8fbb96d4f1c blob   57 90 845776 1 34a68de99f94f6f9e437a288349602768eae4b92
-ab2acc4bd273e799b56effc7e208a01814432ba5 blob   57 90 845866 1 34a68de99f94f6f9e437a288349602768eae4b92
-2d5f83c6857691045da554091b8f2d82477d9baf blob   57 90 845956 1 34a68de99f94f6f9e437a288349602768eae4b92
-fac99cd6f9219ee888b9382ee44a3b7932723b12 blob   57 90 846046 1 34a68de99f94f6f9e437a288349602768eae4b92
-b32b0ed27f34e4a9d7c4aab24dfa2d6c51b1c2eb blob   57 90 846136 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3f38fbdbe8f34acc61f3a325104e739a875a4b6 blob   57 90 846226 1 34a68de99f94f6f9e437a288349602768eae4b92
-6bc5c86eeb3dfcc3ca2343e39cc91dec35ddc90b blob   57 90 846316 1 34a68de99f94f6f9e437a288349602768eae4b92
-38897be9103dbc6aff7d1ecd15c1dc6c6d18b0a7 blob   57 90 846406 1 34a68de99f94f6f9e437a288349602768eae4b92
-69e0b8ef8cda369575b6801c6ed47daf09aa3c62 blob   57 90 846496 1 34a68de99f94f6f9e437a288349602768eae4b92
-c3e6c8cf465113a74926f3d5c73a3b400970643c blob   57 90 846586 1 34a68de99f94f6f9e437a288349602768eae4b92
-a31a03a60bad0896133e6e52982da2e7e22832ff blob   57 90 846676 1 34a68de99f94f6f9e437a288349602768eae4b92
-735fe835bee0cfa2d7ecc2f195c22de3e7b208b3 blob   57 90 846766 1 34a68de99f94f6f9e437a288349602768eae4b92
-84705bfd7a24eb59137fdc26c070c4329eee46a7 blob   57 90 846856 1 34a68de99f94f6f9e437a288349602768eae4b92
-5090e761c398db8c0b3fe1c0069535c3b7a9a575 blob   57 90 846946 1 34a68de99f94f6f9e437a288349602768eae4b92
-c5c8cc3525a17842c2e668d1499c7c2518202a87 blob   57 90 847036 1 34a68de99f94f6f9e437a288349602768eae4b92
-441d41902c4ccb987a866663ebbcc729fbcc4072 blob   57 90 847126 1 34a68de99f94f6f9e437a288349602768eae4b92
-55bc16727ba8a63a31eabd811cfc740dc423bab6 blob   57 90 847216 1 34a68de99f94f6f9e437a288349602768eae4b92
-86c6bd761eacb8a021246263994bf02d1163c7b5 blob   57 90 847306 1 34a68de99f94f6f9e437a288349602768eae4b92
-8812057b6f2583732f83db5bac543549cc621783 blob   57 90 847396 1 34a68de99f94f6f9e437a288349602768eae4b92
-c8043aaa6a70318be94ef87be98ea2c7de7f23f5 blob   57 90 847486 1 34a68de99f94f6f9e437a288349602768eae4b92
-9d48f3c2e700d81fbe46fbccc400bedc8666221a blob   57 90 847576 1 34a68de99f94f6f9e437a288349602768eae4b92
-fd68f118bfc99562e08bd153a3f1c604f1ac0124 blob   57 90 847666 1 34a68de99f94f6f9e437a288349602768eae4b92
-879bc6e196323012740d55b1e5bbd9937632ecf3 blob   57 90 847756 1 34a68de99f94f6f9e437a288349602768eae4b92
-a3ed4b758faeca44e89792c3f1b0536b685d0552 blob   57 90 847846 1 34a68de99f94f6f9e437a288349602768eae4b92
-d9dd72f666a9d30dee5cdd894ca365a82e965594 blob   57 90 847936 1 34a68de99f94f6f9e437a288349602768eae4b92
-088ddcb945af72c47348b65a63992c71b6b9dbe8 blob   57 90 848026 1 34a68de99f94f6f9e437a288349602768eae4b92
-9e7b55d50c530d08c120379e19bb1c1653bb3063 blob   57 90 848116 1 34a68de99f94f6f9e437a288349602768eae4b92
-2dfd9df0b22049f88e22ae86e4370155ecb23271 blob   57 90 848206 1 34a68de99f94f6f9e437a288349602768eae4b92
-9de2bb387fc8bf63dbc7a68cb22b9e8439896326 blob   57 90 848296 1 34a68de99f94f6f9e437a288349602768eae4b92
-a7eacc2c62dfd538c2948cce08cd217cc72a7140 blob   57 90 848386 1 34a68de99f94f6f9e437a288349602768eae4b92
-291b2d8c01a9bc50bc4605bc479a183193de2e45 blob   57 90 848476 1 34a68de99f94f6f9e437a288349602768eae4b92
-464adf43722b49bca34d8727d70db33c9ec70097 blob   57 90 848566 1 34a68de99f94f6f9e437a288349602768eae4b92
-aa6095774c04683081cad47f300324a88ea95f2e blob   57 90 848656 1 34a68de99f94f6f9e437a288349602768eae4b92
-896562b116d22c48f8872854123c523b76928061 blob   57 90 848746 1 34a68de99f94f6f9e437a288349602768eae4b92
-f01eb69ea9caabb9fe801ef0f1bfdfa4477e0e34 blob   57 90 848836 1 34a68de99f94f6f9e437a288349602768eae4b92
-d8603740ffe28d592c9d10ae2d6ec9dd0cf71949 blob   57 90 848926 1 34a68de99f94f6f9e437a288349602768eae4b92
-8eb88090ce51c8ce838b12302c761bbf806c3fcc blob   57 90 849016 1 34a68de99f94f6f9e437a288349602768eae4b92
-e961d288a95c209fe01ba42f01a18605eb5a85d3 blob   57 90 849106 1 34a68de99f94f6f9e437a288349602768eae4b92
-abd14d13fada2545825fdf71c5d4a22ebb60f697 blob   57 90 849196 1 34a68de99f94f6f9e437a288349602768eae4b92
-6a54ffedf41f419c66f6cd734a27ec5968f79b5a blob   57 90 849286 1 34a68de99f94f6f9e437a288349602768eae4b92
-b6fa6c3c025c4f875c78423ab993a9349cd964c5 blob   57 90 849376 1 34a68de99f94f6f9e437a288349602768eae4b92
-088e69e7ab273e35b4f63ecb1b915a3997f13dff blob   57 90 849466 1 34a68de99f94f6f9e437a288349602768eae4b92
-609652080c31409406c828cb996e41fa6a286654 blob   57 90 849556 1 34a68de99f94f6f9e437a288349602768eae4b92
-90d3d9b65a2f0c939f45a86f65192846e8066e7f blob   57 90 849646 1 34a68de99f94f6f9e437a288349602768eae4b92
-05b4f18d9841f7abb271e81accadea31c5416a71 blob   57 90 849736 1 34a68de99f94f6f9e437a288349602768eae4b92
-cfdd1e216211554d586bb3be233190457c5f5c0d blob   57 90 849826 1 34a68de99f94f6f9e437a288349602768eae4b92
-73375ca0591d6c17f37b9f287a7c19f368fc644f blob   57 90 849916 1 34a68de99f94f6f9e437a288349602768eae4b92
-46cd94a7854b7360f8f8a7e637e2575e707f7b04 blob   57 90 850006 1 34a68de99f94f6f9e437a288349602768eae4b92
-ec35852188f9e88aa67849934b0c50bd698fafef blob   57 90 850096 1 34a68de99f94f6f9e437a288349602768eae4b92
-0106e17481932f5c223fafadc1d26abc6adf40d6 blob   57 90 850186 1 34a68de99f94f6f9e437a288349602768eae4b92
-f846f988e45d97ac0163885e65920643f0029922 blob   57 90 850276 1 34a68de99f94f6f9e437a288349602768eae4b92
-636d415b097ff0c103e63d09d96aeb07fdad2045 blob   57 90 850366 1 34a68de99f94f6f9e437a288349602768eae4b92
-497017bb8901086d3120553a384f3500ceb86f2e blob   57 90 850456 1 34a68de99f94f6f9e437a288349602768eae4b92
-c50bc0b26b2336dbe90b9c7bdaa8d4cfb8f65638 blob   57 90 850546 1 34a68de99f94f6f9e437a288349602768eae4b92
-921538e73389e99e294938d8580ababdb639f140 blob   57 90 850636 1 34a68de99f94f6f9e437a288349602768eae4b92
-9ede1b01ec1751bf9ca9d5845ac005edc6935601 blob   57 90 850726 1 34a68de99f94f6f9e437a288349602768eae4b92
-1ba5df91f11a1011f4788bc4cc067743828dda41 blob   57 90 850816 1 34a68de99f94f6f9e437a288349602768eae4b92
-188728c24ca8cf687133dd0a5782e8819cee10a6 blob   57 90 850906 1 34a68de99f94f6f9e437a288349602768eae4b92
-cb0d0270d7c50e33aacd9a4247333622c62846a4 blob   57 90 850996 1 34a68de99f94f6f9e437a288349602768eae4b92
-dd39ffatal: sha1 file 'test-4-48a1956df258ba8b8a12e47466ef8e10ada5d680.idx' validation error
-8544a79066c925baca19ddc02623970efd1 blob   57 90 851086 1 34a68de99f94f6f9e437a288349602768eae4b92
-d0b35a20e2ffaa46d895d6296f555dd98956d536 blob   57 90 851176 1 34a68de99f94f6f9e437a288349602768eae4b92
-ae274e8cd31f35d743e68b3c8420e604386fc514 blob   57 90 851266 1 34a68de99f94f6f9e437a288349602768eae4b92
-d1ede5db04b30c10d395c13dec020c90320498b8 blob   57 90 851356 1 34a68de99f94f6f9e437a288349602768eae4b92
-2adace6c3082b12f42112482372696d66c36e4ae blob   57 90 851446 1 34a68de99f94f6f9e437a288349602768eae4b92
-035e7e54cee9eb197af435b6b6dcced489c233f6 blob   57 90 851536 1 34a68de99f94f6f9e437a288349602768eae4b92
-74aced6a3316fd8d726932ed908b035cd33afef6 blob   57 90 851626 1 34a68de99f94f6f9e437a288349602768eae4b92
-efbbfa01b16e997301bb440aad9c885321bb13d2 blob   57 90 851716 1 34a68de99f94f6f9e437a288349602768eae4b92
-92433746fe3340a5d4bc3f5487545f5167eaeaad blob   57 90 851806 1 34a68de99f94f6f9e437a288349602768eae4b92
-da7b351a2560fd44fe89fc6288c3efa72eace9eb blob   57 90 851896 1 34a68de99f94f6f9e437a288349602768eae4b92
-63176d3a0ae88aee86fa1b2b4390ed0850e67a9b blob   57 90 851986 1 34a68de99f94f6f9e437a288349602768eae4b92
-5e10cf16f2bf33110cf59f53d583527d676820e1 blob   57 90 852076 1 34a68de99f94f6f9e437a288349602768eae4b92
-aeb87caeb18972ad237d4c5628bfedb2dca51d47 blob   57 90 852166 1 34a68de99f94f6f9e437a288349602768eae4b92
-141df301ab1d7f9e40b90fb4435ec4ac40ae544d blob   57 90 852256 1 34a68de99f94f6f9e437a288349602768eae4b92
-e7172196f3fd2742cbe382daa02fd9641b9f6ffb blob   57 90 852346 1 34a68de99f94f6f9e437a288349602768eae4b92
-4e78d6c905bc6d0c06ad066400f0570a391f9385 blob   57 90 852436 1 34a68de99f94f6f9e437a288349602768eae4b92
-c096ccf827c047c3a20cfb1dd3fd5b0485ec2a0b blob   57 90 852526 1 34a68de99f94f6f9e437a288349602768eae4b92
-91c4bc3b3c200535d88f76e9e3566658cb7b2bfd blob   57 90 852616 1 34a68de99f94f6f9e437a288349602768eae4b92
-0b7888c3e508fe256fe859ba46c77d100abbce3f blob   57 90 852706 1 34a68de99f94f6f9e437a288349602768eae4b92
-36cfe418f3038689cd47b64845c6f24886f9ec73 blob   57 90 852796 1 34a68de99f94f6f9e437a288349602768eae4b92
-54c9d6ab199e99bdbba483ef1287e0cc31fc84b3 blob   57 90 852886 1 34a68de99f94f6f9e437a288349602768eae4b92
-8b64b7aafc16c177bcc58813c7a853f622feb10f blob   57 90 852976 1 34a68de99f94f6f9e437a288349602768eae4b92
-6ff2ccef89b04f0539f51c0ffcbe5f7bcf108ced blob   57 90 853066 1 34a68de99f94f6f9e437a288349602768eae4b92
-7b419ded53760b5dbe136c1ec83ef3f338fab544 blob   57 90 853156 1 34a68de99f94f6f9e437a288349602768eae4b92
-non delta: 112 objects
-chain length = 1: 110 objects
-chain length = 2: 10 objects
-chain length = 3: 10 objects
-chain length = 4: 10 objects
-chain length = 5: 10 objects
-chain length = 6: 10 objects
-chain length = 7: 10 objects
-chain length = 8: 10 objects
-chain length = 9: 10 objects
-test-4-48a1956df258ba8b8a12e47466ef8e10ada5d680.pack: bad
-ok 24 - [index v1] 6) newly created pack is BAD !
+expecting success of 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - am_3way: replace tracked file with submodule creates empty directory
 
-expecting success of 5302.25 '[index v2] 1) stream pack to repository': 
-	rm -f .git/objects/pack/* &&
-	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-	git prune-packed &&
-	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
-	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
-	cmp "test-2-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+expecting success of 4255.18 'am_3way: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - am_3way: replace directory with submodule
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 25 - [index v2] 1) stream pack to repository
+expecting success of 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 5302.26 '[index v2] 2) create a stealth corruption in a delta base reference': 
-	# This test assumes file_101 is a delta smaller than 16 bytes.
-	# It should be against file_100 but we substitute its base for file_099
-	sha1_101=$(git hash-object file_101) &&
-	sha1_099=$(git hash-object file_099) &&
-	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
-	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
-	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
-	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
-		if=".git/objects/pack/pack-${pack1}.idx" \
-		skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
-		bs=1 count=$rawsz conv=notrunc &&
-	git cat-file blob $sha1_101 > file_101_foo2
+expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
 
-20+0 records in
-20+0 records out
-20 bytes copied, 4.268e-05 s, 469 kB/s
-ok 26 - [index v2] 2) create a stealth corruption in a delta base reference
+checking known breakage of 4255.21 'am_3way: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
 
-expecting success of 5302.27 '[index v2] 3) corrupted delta happily returned wrong data': 
-	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
+checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
-file_101 file_101_foo2 differ: char 5, line 2
-ok 27 - [index v2] 3) corrupted delta happily returned wrong data
+checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
 
-expecting success of 5302.28 '[index v2] 4) confirm that the pack is actually corrupted': 
-	test_must_fail git fsck --full $commit
+checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-error: .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack pack checksum mismatch
-error: index CRC mismatch for object 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack at offset 844032
-error: packed 0b968294884af115eb5a1b941b3dabd48470c3bb from .git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.pack is corrupt
-ok 28 - [index v2] 4) confirm that the pack is actually corrupted
+expecting success of 4255.25 'am_3way: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Applying: Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - am_3way: modified submodule does not update submodule work tree
 
-expecting success of 5302.29 '[index v2] 5) pack-objects refuses to reuse corrupted data': 
-	test_must_fail git pack-objects test-5 <obj-list &&
-	test_must_fail git pack-objects --no-reuse-object test-6 <obj-list
+expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Applying: Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
 
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-fatal: unable to read 0b968294884af115eb5a1b941b3dabd48470c3bb
-error: bad packed object CRC for 0b968294884af115eb5a1b941b3dabd48470c3bb
-fatal: object 0b968294884af115eb5a1b941b3dabd48470c3bb cannot be read
-ok 29 - [index v2] 5) pack-objects refuses to reuse corrupted data
+expecting success of 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 5302.30 '[index v2] 6) verify-pack detects CRC mismatch': 
-	rm -f .git/objects/pack/* &&
-	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-	git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
-	obj=$(git hash-object file_001) &&
-	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
-	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
-	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
-		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
-	 ( while read obj
-	   do git cat-file -p $obj >/dev/null || exit 1
-	   done <obj-list ) &&
-	test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
+expecting success of 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+27611a5 Base
+virtual Add sub1
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Patch failed at 0001 Add sub1
+ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
 
-pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-4+0 records in
-4+0 records out
-4 bytes copied, 3.564e-05 s, 112 kB/s
-fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
-ok 30 - [index v2] 6) verify-pack detects CRC mismatch
+expecting success of 4255.29 'setup diff.submodule': 
+	test_commit one &&
+	INITIAL=$(git rev-parse HEAD) &&
 
-expecting success of 5302.31 'running index-pack in the object store': 
-	rm -f .git/objects/pack/* &&
-	cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
+	git init submodule &&
 	(
-		cd .git/objects/pack &&
-		git index-pack pack-${pack1}.pack
+		cd submodule &&
+		test_commit two &&
+		git rev-parse HEAD >../initial-submodule
 	) &&
-	test -f .git/objects/pack/pack-${pack1}.idx
-
-1c54d893dd9bf6645ecee2886ea72f2c2030bea1
-ok 31 - running index-pack in the object store
-
-expecting success of 5302.32 'index-pack --strict warns upon missing tagger in tag': 
-	sha=$(git rev-parse HEAD) &&
-	cat >wrong-tag <<EOF &&
-object $sha
-type commit
-tag guten tag
-
-This is an invalid tag.
-EOF
-
-	tag=$(git hash-object -t tag -w --stdin --literally <wrong-tag) &&
-	pack1=$(echo $tag $sha | git pack-objects tag-test) &&
-	echo remove tag object &&
-	thirtyeight=${tag#??} &&
-	rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
-	git index-pack --strict tag-test-${pack1}.pack 2>err &&
-	grep "^warning:.* expected .tagger. line" err
-
-remove tag object
-67765b8cc9b2d3d6ffa408695798db10a387e826
-warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 32 - index-pack --strict warns upon missing tagger in tag
-
-expecting success of 5302.33 'index-pack --fsck-objects also warns upon missing tagger in tag': 
-	git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
-	grep "^warning:.* expected .tagger. line" err
-
-67765b8cc9b2d3d6ffa408695798db10a387e826
-warning: object 954f1fc56e5be955c7818ab69b20a3374f351d82: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 33 - index-pack --fsck-objects also warns upon missing tagger in tag
-
-expecting success of 5302.34 'index-pack -v --stdin produces progress for both phases': 
-	pack=$(git pack-objects --all pack </dev/null) &&
-	GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
-	test_grep "Receiving objects" err &&
-	test_grep "Resolving deltas" err
-
-pack	37e69ad54edf78401749c7eaf0410858eb6a64ba
-Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 24.51 MiB/s, done.
-Resolving deltas:   0% (0/190)
Resolving deltas:   1% (2/190)
Resolving deltas:   2% (4/190)
Resolving deltas:   3% (6/190)
Resolving deltas:   4% (8/190)
Resolving deltas:   5% (10/190)
Resolving deltas:   6% (12/190)
Resolving deltas:   7% (14/190)
Resolving deltas:   8% (16/190)
Resolving deltas:   9% (18/190)
Resolving deltas:  10% (19/190)
Resolving deltas:  11% (21/190)
Resolving deltas:  12% (23/190)
Resolving deltas:  13% (25/190)
Resolving deltas:  14% (27/190)
Resolving deltas:  15% (29/190)
Resolving deltas:  16% (31/190)
Resolving deltas:  17% (33/190)
Resolving deltas:  18% (35/190)
Resolving deltas:  19% (37/190)
Resolving deltas:  20% (38/190)
Resolving deltas:  21% (40/190)
Resolving deltas:  22% (42/190)
Resolving deltas:  23% (44/190)
Resolving deltas:  24% (46/190)
Resolving deltas:  25% (48/190)
Resolving deltas:  26% (50/190)
Resolving deltas:  27% (52/190)
Resolving deltas:  28% (54/190)
Resolving deltas:  29% (56/190)
Resolving deltas:  30% (57/190)
Resolving deltas:  31% (59/190)
Resolving deltas:  32% (61/190)
Resolving deltas:  33% (63/190)
Resolving deltas:  34% (65/190)
Resolving deltas:  35% (67/190)
Resolving deltas:  36% (69/190)
Resolving deltas:  37% (71/190)
Resolving deltas:  38% (73/190)
Resolving deltas:  39% (75/190)
Resolving deltas:  40% (76/190)
Resolving deltas:  41% (78/190)
Resolving deltas:  42% (80/190)
Resolving deltas:  43% (82/190)
Resolving deltas:  44% (84/190)
Resolving deltas:  45% (86/190)
Resolving deltas:  46% (88/190)
Resolving deltas:  47% (90/190)
Resolving deltas:  48% (92/190)
Resolving deltas:  49% (94/190)
Resolving deltas:  50% (95/190)
Resolving deltas:  51% (97/190)
Resolving deltas:  52% (99/190)
Resolving deltas:  53% (101/190)
Resolving deltas:  54% (103/190)
Resolving deltas:  55% (105/190)
Resolving deltas:  56% (107/190)
Resolving deltas:  57% (109/190)
Resolving deltas:  58% (111/190)
Resolving deltas:  59% (113/190)
Resolving deltas:  60% (114/190)
Resolving deltas:  61% (116/190)
Resolving deltas:  62% (118/190)
Resolving deltas:  63% (120/190)
Resolving deltas:  64% (122/190)
Resolving deltas:  65% (124/190)
Resolving deltas:  66% (126/190)
Resolving deltas:  67% (128/190)
Resolving deltas:  68% (130/190)
Resolving deltas:  69% (132/190)
Resolving deltas:  70% (133/190)
Resolving deltas:  71% (135/190)
Resolving deltas:  72% (137/190)
Resolving deltas:  73% (139/190)
Resolving deltas:  74% (141/190)
Resolving deltas:  75% (143/190)
Resolving deltas:  76% (145/190)
Resolving deltas:  77% (147/190)
Resolving deltas:  78% (149/190)
Resolving deltas:  79% (151/190)
Resolving deltas:  80% (152/190)
Resolving deltas:  81% (154/190)
Resolving deltas:  82% (156/190)
Resolving deltas:  83% (158/190)
Resolving deltas:  84% (160/190)
Resolving deltas:  85% (162/190)
Resolving deltas:  86% (164/190)
Resolving deltas:  87% (166/190)
Resolving deltas:  88% (168/190)
Resolving deltas:  89% (170/190)
Resolving deltas:  90% (171/190)
Resolving deltas:  91% (173/190)
Resolving deltas:  92% (175/190)
Resolving deltas:  93% (177/190)
Resolving deltas:  94% (179/190)
Resolving deltas:  95% (181/190)
Resolving deltas:  96% (183/190)
Resolving deltas:  97% (185/190)
Resolving deltas:  98% (187/190)
Resolving deltas:  99% (189/190)
Resolving deltas: 100% (190/190)
Resolving deltas: 100% (190/190), done.
-ok 34 - index-pack -v --stdin produces progress for both phases
-
-expecting success of 5302.35 'too-large packs report the breach': 
-	pack=$(git pack-objects --all pack </dev/null) &&
-	sz="$(test_file_size pack-$pack.pack)" &&
-	test "$sz" -gt 20 &&
-	test_must_fail git index-pack --max-input-size=20 pack-$pack.pack 2>err &&
-	grep "maximum allowed size (20 bytes)" err
-
-fatal: pack exceeds maximum allowed size (20 bytes)
-ok 35 - too-large packs report the breach
-
-# passed all 35 test(s)
-1..35
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5334-incremental-multi-pack-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5334-incremental-multi-pack-index/.git/
-expecting success of 5334.1 'convert non-incremental MIDX to incremental': 
-	test_commit base &&
-	git repack -ad &&
-	git multi-pack-index write &&
-
-	test_path_is_file $packdir/multi-pack-index &&
-	old_hash="$(midx_checksum $objdir)" &&
+	git submodule add ./submodule &&
+	git commit -m first &&
 
-	test_commit other &&
-	git repack -d &&
-	git multi-pack-index write --incremental &&
+	(
+		cd submodule &&
+		test_commit three &&
+		git rev-parse HEAD >../first-submodule
+	) &&
+	git add submodule &&
+	git commit -m second &&
+	SECOND=$(git rev-parse HEAD) &&
 
-	test_path_is_missing $packdir/multi-pack-index &&
-	test_path_is_file $midx_chain &&
-	test_line_count = 2 $midx_chain &&
-	grep $old_hash $midx_chain
+	(
+		cd submodule &&
+		git mv two.t four.t &&
+		git commit -m "second submodule" &&
+		git rev-parse HEAD >../second-submodule
+	) &&
+	test_commit four &&
+	git add submodule &&
+	git commit --amend --no-edit &&
+	THIRD=$(git rev-parse HEAD) &&
+	git submodule update --init
 
-[master (root-commit) d1ff1c9] base
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master cabba2b] other
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule/.git/
+[master (root-commit) 274aeeb] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 other.t
-baa53bc5092bed50378fe9232ae7878828df2890
-ok 1 - convert non-incremental MIDX to incremental
+ create mode 100644 two.t
+Adding existing repo at 'submodule' to the index
+[master 8fb6b7a] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master 2b16875] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 7cdc426] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a623af5] second submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename two.t => four.t (100%)
+[master d6b9f1d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master be614db] four
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 four.t
+ok 29 - setup diff.submodule
 
-expecting success of 5334.2 'check normal git operations: incremental MIDX': 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
-	
-ok 2 - check normal git operations: incremental MIDX
+expecting success of 4255.30 'diff.submodule unset': 
+	test_unconfig diff.submodule &&
+	run_test $SECOND first-submodule
 
-expecting success of 5334.3 'convert incremental to non-incremental': 
-	test_commit squash &&
-	git repack -d &&
-	git multi-pack-index write &&
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 30 - diff.submodule unset
 
-	test_path_is_file $packdir/multi-pack-index &&
-	test_dir_is_empty $midxdir
+expecting success of 4255.31 'diff.submodule unset with extra file': 
+	test_unconfig diff.submodule &&
+	run_test $THIRD second-submodule
 
-[master 5c5d970] squash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 squash.t
-ok 3 - convert incremental to non-incremental
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 31 - diff.submodule unset with extra file
 
-expecting success of 5334.4 'check normal git operations: non-incremental MIDX conversion': 
-		midx_git_two_modes "rev-list --objects --all" &&
-		midx_git_two_modes "log --raw" &&
-		midx_git_two_modes "count-objects --verbose" &&
-		midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
-		midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
-	
-ok 4 - check normal git operations: non-incremental MIDX conversion
+expecting success of 4255.32 'diff.submodule=log': 
+	test_config diff.submodule log &&
+	run_test $SECOND first-submodule
 
-# passed all 4 test(s)
-1..4
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 32 - diff.submodule=log
+
+expecting success of 4255.33 'diff.submodule=log with extra file': 
+	test_config diff.submodule log &&
+	run_test $THIRD second-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 33 - diff.submodule=log with extra file
+
+# still have 6 known breakage(s)
+# passed all remaining 27 test(s)
+1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5332-multi-pack-reuse.sh ***
@@ -307805,16 +308893,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 B.t
-{"event":"data","sid":"20260419T192034.265776Z-H8d819085-P001e9bd9","thread":"main","time":"2026-04-19T19:20:34.275245Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.009666,"t_rel":0.009666,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192034.265776Z-H8d819085-P001e9bd9","thread":"main","time":"2026-04-19T19:20:34.275249Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.009670,"t_rel":0.009670,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132326.416048Z-H5c947e1c-P00313483","thread":"main","time":"2025-03-17T13:23:26.421949Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.006077,"t_rel":0.006077,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132326.416048Z-H5c947e1c-P00313483","thread":"main","time":"2025-03-17T13:23:26.421953Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.006082,"t_rel":0.006082,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 1 - preferred pack is reused for single-pack reuse
 
 expecting success of 5332.2 'multi-pack reuse is disabled by default': 
 	test_pack_objects_reused_all 3 1
 
-{"event":"data","sid":"20260419T192034.400264Z-H8d819085-P001e9c4d","thread":"main","time":"2026-04-19T19:20:34.401531Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001448,"t_rel":0.001448,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192034.400264Z-H8d819085-P001e9c4d","thread":"main","time":"2026-04-19T19:20:34.401535Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001452,"t_rel":0.001452,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132326.541740Z-H5c947e1c-P003134f7","thread":"main","time":"2025-03-17T13:23:26.542972Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001454,"t_rel":0.001454,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132326.541740Z-H5c947e1c-P003134f7","thread":"main","time":"2025-03-17T13:23:26.542976Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001458,"t_rel":0.001458,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 2 - multi-pack reuse is disabled by default
 
@@ -307823,8 +308911,8 @@
 
 	test_pack_objects_reused_all 6 2
 
-{"event":"data","sid":"20260419T192034.516070Z-H8d819085-P001e9cc4","thread":"main","time":"2026-04-19T19:20:34.517222Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001339,"t_rel":0.001339,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260419T192034.516070Z-H8d819085-P001e9cc4","thread":"main","time":"2026-04-19T19:20:34.517227Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001343,"t_rel":0.001343,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250317T132326.675715Z-H5c947e1c-P0031357d","thread":"main","time":"2025-03-17T13:23:26.676820Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001285,"t_rel":0.001285,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250317T132326.675715Z-H5c947e1c-P0031357d","thread":"main","time":"2025-03-17T13:23:26.676824Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001290,"t_rel":0.001290,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 3 - feature.experimental implies multi-pack reuse
 
@@ -307834,8 +308922,8 @@
 
 	test_pack_objects_reused_all 3 1
 
-{"event":"data","sid":"20260419T192034.656197Z-H8d819085-P001e9d50","thread":"main","time":"2026-04-19T19:20:34.657445Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001426,"t_rel":0.001426,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192034.656197Z-H8d819085-P001e9d50","thread":"main","time":"2026-04-19T19:20:34.657449Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001430,"t_rel":0.001430,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132326.829719Z-H5c947e1c-P003135ee","thread":"main","time":"2025-03-17T13:23:26.830884Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001389,"t_rel":0.001389,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132326.829719Z-H5c947e1c-P003135ee","thread":"main","time":"2025-03-17T13:23:26.830888Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001393,"t_rel":0.001393,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 de700bb9d264590842bcbfd30aa3296a833289e8
 ok 4 - multi-pack reuse can be disabled with feature.experimental
 
@@ -307861,16 +308949,16 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
-{"event":"data","sid":"20260419T192035.024270Z-H8d819085-P001e9ec2","thread":"main","time":"2026-04-19T19:20:35.025422Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001322,"t_rel":0.001322,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260419T192035.024270Z-H8d819085-P001e9ec2","thread":"main","time":"2026-04-19T19:20:35.025426Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001327,"t_rel":0.001327,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250317T132327.213488Z-H5c947e1c-P00313717","thread":"main","time":"2025-03-17T13:23:27.214670Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001409,"t_rel":0.001409,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250317T132327.213488Z-H5c947e1c-P00313717","thread":"main","time":"2025-03-17T13:23:27.214674Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001414,"t_rel":0.001414,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 530e5837dd3fc62e13d9275092d852592cab5851
 ok 6 - reuse all objects from subset of bitmapped packs
 
 expecting success of 5332.7 'reuse all objects from all packs': 
 	test_pack_objects_reused_all 9 3
 
-{"event":"data","sid":"20260419T192035.080143Z-H8d819085-P001e9ee5","thread":"main","time":"2026-04-19T19:20:35.081352Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001388,"t_rel":0.001388,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
-{"event":"data","sid":"20260419T192035.080143Z-H8d819085-P001e9ee5","thread":"main","time":"2026-04-19T19:20:35.081356Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001392,"t_rel":0.001392,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+{"event":"data","sid":"20250317T132327.275703Z-H5c947e1c-P00313744","thread":"main","time":"2025-03-17T13:23:27.276826Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001289,"t_rel":0.001289,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
+{"event":"data","sid":"20250317T132327.275703Z-H5c947e1c-P00313744","thread":"main","time":"2025-03-17T13:23:27.276830Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001293,"t_rel":0.001293,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
 1340c9de031f500be0a197f1242f00a34ed6e9b8
 ok 7 - reuse all objects from all packs
 
@@ -307918,8 +309006,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F.t
-{"event":"data","sid":"20260419T192035.760325Z-H8d819085-P001ea102","thread":"main","time":"2026-04-19T19:20:35.761562Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001424,"t_rel":0.001424,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192035.760325Z-H8d819085-P001ea102","thread":"main","time":"2026-04-19T19:20:35.761569Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001430,"t_rel":0.001430,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132327.991131Z-H5c947e1c-P0031399e","thread":"main","time":"2025-03-17T13:23:27.992309Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001344,"t_rel":0.001344,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132327.991131Z-H5c947e1c-P0031399e","thread":"main","time":"2025-03-17T13:23:27.992315Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001350,"t_rel":0.001350,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
 ok 8 - reuse objects from first pack with middle gap
 
@@ -307939,8 +309027,8 @@
 	test_pack_objects_reused 3 1 <in
 
 warning: unknown preferred pack: 'pack-.idx'
-{"event":"data","sid":"20260419T192035.908248Z-H8d819085-P001ea19c","thread":"main","time":"2026-04-19T19:20:35.909526Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001457,"t_rel":0.001457,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192035.908248Z-H8d819085-P001ea19c","thread":"main","time":"2026-04-19T19:20:35.909533Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001464,"t_rel":0.001464,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132328.151903Z-H5c947e1c-P00313a19","thread":"main","time":"2025-03-17T13:23:28.162773Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.011051,"t_rel":0.011051,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132328.151903Z-H5c947e1c-P00313a19","thread":"main","time":"2025-03-17T13:23:28.162780Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.011057,"t_rel":0.011057,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 cdf9ddd5f15e5bb16ac5756b24c63adf8a8cc1c1
 ok 9 - reuse objects from middle pack with middle gap
 
@@ -307995,8 +309083,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260419T192036.500538Z-H8d819085-P001ea374","thread":"main","time":"2026-04-19T19:20:36.501784Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001444,"t_rel":0.001444,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192036.500538Z-H8d819085-P001ea374","thread":"main","time":"2026-04-19T19:20:36.501790Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001450,"t_rel":0.001450,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132328.735544Z-H5c947e1c-P00313bea","thread":"main","time":"2025-03-17T13:23:28.736697Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001346,"t_rel":0.001346,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132328.735544Z-H5c947e1c-P00313bea","thread":"main","time":"2025-03-17T13:23:28.736703Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001352,"t_rel":0.001352,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 341840e0d76cb213079e38bae778b53364232eb5
 ok 10 - omit delta with uninteresting base (same pack)
 
@@ -308015,8 +309103,8 @@
 
 	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
 
-{"event":"data","sid":"20260419T192036.743038Z-H8d819085-P001ea472","thread":"main","time":"2026-04-19T19:20:36.744552Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001722,"t_rel":0.001722,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
-{"event":"data","sid":"20260419T192036.743038Z-H8d819085-P001ea472","thread":"main","time":"2026-04-19T19:20:36.744557Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001726,"t_rel":0.001726,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+{"event":"data","sid":"20250317T132329.003787Z-H5c947e1c-P00313cb9","thread":"main","time":"2025-03-17T13:23:29.017382Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.013779,"t_rel":0.013779,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
+{"event":"data","sid":"20250317T132329.003787Z-H5c947e1c-P00313cb9","thread":"main","time":"2025-03-17T13:23:29.017386Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.013783,"t_rel":0.013783,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
 def7cb61a9e70183adbf1acab0912d686622303a
 ok 11 - omit delta from uninteresting base (cross pack)
 
@@ -308045,8 +309133,8 @@
 
 	test_pack_objects_reused_all $(wc -l <expect) 1
 
-{"event":"data","sid":"20260419T192037.052439Z-H8d819085-P001ea596","thread":"main","time":"2026-04-19T19:20:37.067201Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.014941,"t_rel":0.014941,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20260419T192037.052439Z-H8d819085-P001ea596","thread":"main","time":"2026-04-19T19:20:37.067205Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.014946,"t_rel":0.014946,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+{"event":"data","sid":"20250317T132329.465631Z-H5c947e1c-P00313e1c","thread":"main","time":"2025-03-17T13:23:29.497697Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.032297,"t_rel":0.032297,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20250317T132329.465631Z-H5c947e1c-P00313e1c","thread":"main","time":"2025-03-17T13:23:29.497701Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.032301,"t_rel":0.032301,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
 48c334c15e539df3382db77f74c864a1d31091b9
 ok 12 - non-omitted delta in MIDX preferred pack
 
@@ -308077,8 +309165,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"data","sid":"20260419T192037.448393Z-H8d819085-P001ea719","thread":"main","time":"2026-04-19T19:20:37.449576Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001379,"t_rel":0.001379,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20260419T192037.448393Z-H8d819085-P001ea719","thread":"main","time":"2026-04-19T19:20:37.449580Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001383,"t_rel":0.001383,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250317T132329.983841Z-H5c947e1c-P00313f9a","thread":"main","time":"2025-03-17T13:23:29.984986Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001332,"t_rel":0.001332,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20250317T132329.983841Z-H5c947e1c-P00313f9a","thread":"main","time":"2025-03-17T13:23:29.984990Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001337,"t_rel":0.001337,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 b572b333cdb15dbb54fe65e0e1361617040627d7
 ok 13 - duplicate objects
 
@@ -308128,8 +309216,8 @@
 pack_report: pack_mapped              =      15727 /      15727
 ---------------------------------------------------------------------
 
-{"event":"data","sid":"20260419T192037.864478Z-H8d819085-P001ea8a7","thread":"main","time":"2026-04-19T19:20:37.866124Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.001847,"t_rel":0.001847,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
-{"event":"data","sid":"20260419T192037.864478Z-H8d819085-P001ea8a7","thread":"main","time":"2026-04-19T19:20:37.866128Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.001851,"t_rel":0.001851,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+{"event":"data","sid":"20250317T132330.415865Z-H5c947e1c-P00314100","thread":"main","time":"2025-03-17T13:23:30.425977Z","file":"builtin/pack-objects.c","line":4749,"repo":1,"t_abs":0.010296,"t_rel":0.010296,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"192"}
+{"event":"data","sid":"20250317T132330.415865Z-H5c947e1c-P00314100","thread":"main","time":"2025-03-17T13:23:30.425981Z","file":"builtin/pack-objects.c","line":4750,"repo":1,"t_abs":0.010300,"t_rel":0.010300,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
 1ebceb2b5297fe50c38004c13872ae869e743ceb
 ok 14 - duplicate objects with verbatim reuse
 
@@ -308137,6 +309225,84 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5402-post-merge-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5402-post-merge-hook/.git/
+expecting success of 5402.1 'setup': 
+	echo Data for commit0. >a &&
+	git update-index --add a &&
+	tree0=$(git write-tree) &&
+	commit0=$(echo setup | git commit-tree $tree0) &&
+	echo Changed data for commit1. >a &&
+	git update-index a &&
+	tree1=$(git write-tree) &&
+	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
+	git update-ref refs/heads/main $commit0 &&
+	git clone ./. clone1 &&
+	GIT_DIR=clone1/.git git update-index --add a &&
+	git clone ./. clone2 &&
+	GIT_DIR=clone2/.git git update-index --add a
+
+Cloning into 'clone1'...
+done.
+Cloning into 'clone2'...
+done.
+ok 1 - setup
+
+expecting success of 5402.2 'setup clone hooks': 
+	test_when_finished "rm -f hook" &&
+	cat >hook <<-\EOF &&
+	echo $@ >>$GIT_DIR/post-merge.args
+	EOF
+
+	test_hook --setup -C clone1 post-merge <hook &&
+	test_hook --setup -C clone2 post-merge <hook
+
+ok 2 - setup clone hooks
+
+expecting success of 5402.3 'post-merge does not run for up-to-date ': 
+	GIT_DIR=clone1/.git git merge $commit0 &&
+	! test -f clone1/.git/post-merge.args
+
+Already up to date.
+ok 3 - post-merge does not run for up-to-date 
+
+expecting success of 5402.4 'post-merge runs as expected ': 
+	GIT_DIR=clone1/.git git merge $commit1 &&
+	test -e clone1/.git/post-merge.args
+
+Updating e541488..8833ab1
+Fast-forward
+ a | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - post-merge runs as expected 
+
+expecting success of 5402.5 'post-merge from normal merge receives the right argument ': 
+	grep 0 clone1/.git/post-merge.args
+
+0
+ok 5 - post-merge from normal merge receives the right argument 
+
+expecting success of 5402.6 'post-merge from squash merge runs as expected ': 
+	GIT_DIR=clone2/.git git merge --squash $commit1 &&
+	test -e clone2/.git/post-merge.args
+
+Updating e541488..8833ab1
+Fast-forward
+Squash commit -- not updating HEAD
+ a | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - post-merge from squash merge runs as expected 
+
+expecting success of 5402.7 'post-merge from squash merge receives the right argument ': 
+	grep 1 clone2/.git/post-merge.args
+
+1
+ok 7 - post-merge from squash merge receives the right argument 
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5351-unpack-large-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5351-unpack-large-objects/.git/
 expecting success of 5351.1 'create large objects (1.5 MB) and PACK': 
@@ -309277,1214 +310443,114 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t4255-am-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/.git/
-expecting success of 4255.1 'am: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
+*** t5404-tracking-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.git/
+expecting success of 5404.1 'setup': 
+	echo 1 >file &&
+	git add file &&
+	git commit -m 1 &&
+	git branch b1 &&
+	git branch b2 &&
+	git branch b3 &&
+	git clone . aa &&
+	git checkout b1 &&
+	echo b1 >>file &&
+	git commit -a -m b1 &&
+	git checkout b2 &&
+	echo b2 >>file &&
+	git commit -a -m b2
+
+[main (root-commit) c663a66] 1
  Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_repo/sub1/sub2'...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'aa'...
 done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
+Switched to branch 'b1'
+[b1 30569e6] b1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+Switched to branch 'b2'
+[b2 f149455] b2
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - am: added submodule creates empty directory
-
-expecting success of 4255.2 'am: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - am: added submodule leaves existing empty directory alone
-
-expecting success of 4255.3 'am: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - am: replace tracked file with submodule creates empty directory
-
-expecting success of 4255.4 'am: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - am: replace directory with submodule
-
-expecting success of 4255.5 'am: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 5 - am: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 4255.6 'am: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Revert "Add sub1"
-ok 6 - am: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 4255.7 'am: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-ok 7 - am: replace submodule with a directory must fail
-
-expecting success of 4255.8 'am: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Replace sub1 with directory
-Patch failed at 0001 Replace sub1 with directory
-ok 8 - am: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 4255.9 'am: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 9 - am: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 4255.10 'am: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Replace sub1 with file
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 10 - am: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 4255.11 'am: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - am: modified submodule does not update submodule work tree
-
-expecting success of 4255.12 'am: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Applying: Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - am: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 4255.13 'am: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - am: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 4255.14 'am: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: sub1: already exists in working directory
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Applying: Add sub1
-Patch failed at 0001 Add sub1
-ok 14 - am: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - am_3way: added submodule creates empty directory
-
-expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - am_3way: added submodule leaves existing empty directory alone
-
-expecting success of 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - am_3way: replace tracked file with submodule creates empty directory
-
-expecting success of 4255.18 'am_3way: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - am_3way: replace directory with submodule
-
-expecting success of 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
-
-checking known breakage of 4255.21 'am_3way: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
-
-checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
-
-checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 4255.25 'am_3way: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Applying: Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - am_3way: modified submodule does not update submodule work tree
-
-expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Applying: Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-27611a5 Base
-virtual Add sub1
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Patch failed at 0001 Add sub1
-ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 4255.29 'setup diff.submodule': 
-	test_commit one &&
-	INITIAL=$(git rev-parse HEAD) &&
-
-	git init submodule &&
-	(
-		cd submodule &&
-		test_commit two &&
-		git rev-parse HEAD >../initial-submodule
-	) &&
-	git submodule add ./submodule &&
-	git commit -m first &&
-
-	(
-		cd submodule &&
-		test_commit three &&
-		git rev-parse HEAD >../first-submodule
-	) &&
-	git add submodule &&
-	git commit -m second &&
-	SECOND=$(git rev-parse HEAD) &&
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-	(
-		cd submodule &&
-		git mv two.t four.t &&
-		git commit -m "second submodule" &&
-		git rev-parse HEAD >../second-submodule
-	) &&
-	test_commit four &&
-	git add submodule &&
-	git commit --amend --no-edit &&
-	THIRD=$(git rev-parse HEAD) &&
-	git submodule update --init
+expecting success of 5404.2 'prepare pushable branches': 
+	cd aa &&
+	b1=$(git rev-parse origin/b1) &&
+	b2=$(git rev-parse origin/b2) &&
+	git checkout -b b1 origin/b1 &&
+	echo aa-b1 >>file &&
+	git commit -a -m aa-b1 &&
+	git checkout -b b2 origin/b2 &&
+	echo aa-b2 >>file &&
+	git commit -a -m aa-b2 &&
+	git checkout main &&
+	echo aa-main >>file &&
+	git commit -a -m aa-main
 
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t4255-am-submodule/submodule/.git/
-[master (root-commit) 274aeeb] two
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/b1'.
+[b1 568053f] aa-b1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Adding existing repo at 'submodule' to the index
-[master 8fb6b7a] first
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master 2b16875] three
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/b2'.
+[b2 4441e28] aa-b2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master 7cdc426] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master a623af5] second submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename two.t => four.t (100%)
-[master d6b9f1d] four
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+[main 5f550d5] aa-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master be614db] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 four.t
-ok 29 - setup diff.submodule
-
-expecting success of 4255.30 'diff.submodule unset': 
-	test_unconfig diff.submodule &&
-	run_test $SECOND first-submodule
-
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 30 - diff.submodule unset
-
-expecting success of 4255.31 'diff.submodule unset with extra file': 
-	test_unconfig diff.submodule &&
-	run_test $THIRD second-submodule
-
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 31 - diff.submodule unset with extra file
-
-expecting success of 4255.32 'diff.submodule=log': 
-	test_config diff.submodule log &&
-	run_test $SECOND first-submodule
-
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 32 - diff.submodule=log
-
-expecting success of 4255.33 'diff.submodule=log with extra file': 
-	test_config diff.submodule log &&
-	run_test $THIRD second-submodule
-
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 33 - diff.submodule=log with extra file
-
-# still have 6 known breakage(s)
-# passed all remaining 27 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5402-post-merge-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5402-post-merge-hook/.git/
-expecting success of 5402.1 'setup': 
-	echo Data for commit0. >a &&
-	git update-index --add a &&
-	tree0=$(git write-tree) &&
-	commit0=$(echo setup | git commit-tree $tree0) &&
-	echo Changed data for commit1. >a &&
-	git update-index a &&
-	tree1=$(git write-tree) &&
-	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
-	git update-ref refs/heads/main $commit0 &&
-	git clone ./. clone1 &&
-	GIT_DIR=clone1/.git git update-index --add a &&
-	git clone ./. clone2 &&
-	GIT_DIR=clone2/.git git update-index --add a
-
-Cloning into 'clone1'...
-done.
-Cloning into 'clone2'...
-done.
-ok 1 - setup
-
-expecting success of 5402.2 'setup clone hooks': 
-	test_when_finished "rm -f hook" &&
-	cat >hook <<-\EOF &&
-	echo $@ >>$GIT_DIR/post-merge.args
-	EOF
-
-	test_hook --setup -C clone1 post-merge <hook &&
-	test_hook --setup -C clone2 post-merge <hook
-
-ok 2 - setup clone hooks
+ok 2 - prepare pushable branches
 
-expecting success of 5402.3 'post-merge does not run for up-to-date ': 
-	GIT_DIR=clone1/.git git merge $commit0 &&
-	! test -f clone1/.git/post-merge.args
+expecting success of 5404.3 'mixed-success push returns error': 
+	test_must_fail git push origin :
 
-Already up to date.
-ok 3 - post-merge does not run for up-to-date 
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.
+   c663a66..5f550d5  main -> main
+ ! [rejected]        b1 -> b1 (fetch first)
+ ! [rejected]        b2 -> b2 (fetch first)
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.'
+hint: Updates were rejected because the remote contains work that you do not
+hint: have locally. This is usually caused by another repository pushing to
+hint: the same ref. If you want to integrate the remote changes, use
+hint: 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+ok 3 - mixed-success push returns error
 
-expecting success of 5402.4 'post-merge runs as expected ': 
-	GIT_DIR=clone1/.git git merge $commit1 &&
-	test -e clone1/.git/post-merge.args
+expecting success of 5404.4 'check tracking branches updated correctly after push': 
+	test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
 
-Updating e541488..8833ab1
-Fast-forward
- a | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - post-merge runs as expected 
+ok 4 - check tracking branches updated correctly after push
 
-expecting success of 5402.5 'post-merge from normal merge receives the right argument ': 
-	grep 0 clone1/.git/post-merge.args
+expecting success of 5404.5 'check tracking branches not updated for failed refs': 
+	test "$(git rev-parse origin/b1)" = "$b1" &&
+	test "$(git rev-parse origin/b2)" = "$b2"
 
-0
-ok 5 - post-merge from normal merge receives the right argument 
+ok 5 - check tracking branches not updated for failed refs
 
-expecting success of 5402.6 'post-merge from squash merge runs as expected ': 
-	GIT_DIR=clone2/.git git merge --squash $commit1 &&
-	test -e clone2/.git/post-merge.args
+expecting success of 5404.6 'deleted branches have their tracking branches removed': 
+	git push origin :b1 &&
+	test "$(git rev-parse origin/b1)" = "origin/b1"
 
-Updating e541488..8833ab1
-Fast-forward
-Squash commit -- not updating HEAD
- a | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - post-merge from squash merge runs as expected 
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.
+ - [deleted]         b1
+fatal: ambiguous argument 'origin/b1': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 6 - deleted branches have their tracking branches removed
 
-expecting success of 5402.7 'post-merge from squash merge receives the right argument ': 
-	grep 1 clone2/.git/post-merge.args
+expecting success of 5404.7 'already deleted tracking branches ignored': 
+	git branch -d -r origin/b3 &&
+	git push origin :b3 >output 2>&1 &&
+	! grep "^error: " output
 
-1
-ok 7 - post-merge from squash merge receives the right argument 
+Deleted remote-tracking branch origin/b3 (was c663a66).
+ok 7 - already deleted tracking branches ignored
 
 # passed all 7 test(s)
 1..7
@@ -310556,1827 +310622,1880 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5318-commit-graph.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/.git/
-expecting success of 5318.1 'usage': 
-	test_expect_code 129 git commit-graph write blah 2>err &&
-	test_expect_code 129 git commit-graph write verify
+*** t5329-pack-objects-cruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/.git/
+expecting success of 5329.1 'unreachable loose objects are packed (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-usage: git commit-graph write [--object-dir <dir>] [--append]
-                              [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits]
-                              [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]
-                              <split-options>
+			test_commit base &&
+			git repack -Ad &&
+			test_commit loose &&
 
-    --[no-]object-dir <dir>
-                          the object directory to store the graph
-    --[no-]reachable      start walk at all refs
-    --[no-]stdin-packs    scan pack-indexes listed by stdin for commits
-    --[no-]stdin-commits  start walk at commits listed by stdin
-    --[no-]append         include all commits already in the commit-graph file
-    --[no-]changed-paths  enable computation for changed paths
-    --split[=...]         allow writing an incremental commit-graph file
-    --[no-]max-commits <n>
-                          maximum number of commits in a non-base split commit-graph
-    --[no-]size-multiple <n>
-                          maximum ratio between two levels of a split commit-graph
-    --[no-]expire-time <expiry-date>
-                          only expire files older than a given date-time
-    --[no-]max-new-filters ...
-                          maximum number of changed-path Bloom filters to compute
-    --[no-]progress       force progress reporting
+			test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose:loose.t))" &&
+			test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose^{tree}))" &&
 
-ok 1 - usage
+			(
+				git rev-list --objects --no-object-names base..loose |
+				while read oid
+				do
+					path="$objdir/$(test_oid_to_path "$oid")" &&
+					printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" ||
+					echo "object list generation failed for $oid"
+				done |
+				sort -k1
+			) >expect &&
 
-expecting success of 5318.2 'usage shown without sub-command': 
-	test_expect_code 129 git commit-graph 2>err &&
-	grep usage: err
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			cruft="$(echo $keep | git pack-objects --cruft \
+				--cruft-expiration="$expire" $packdir/pack)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
 
-usage: git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]
-ok 2 - usage shown without sub-command
+			test_cmp expect actual
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master da180c9] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 1 - unreachable loose objects are packed (expire never)
 
-expecting success of 5318.3 'usage shown with an error on unknown sub-command': 
-	cat >expect <<-\EOF &&
-	error: unknown subcommand: `unknown'
-	EOF
-	test_expect_code 129 git commit-graph unknown 2>stderr &&
-	grep error stderr >actual &&
-	test_cmp expect actual
+expecting success of 5329.2 'unreachable packed objects are packed (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-ok 3 - usage shown with an error on unknown sub-command
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
 
-expecting success of 5318.4 'setup full repo': 
-	git init full
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			other="$(git pack-objects --delta-base-offset \
+				$packdir/pack <objects)" &&
+			git prune-packed &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/full/.git/
-ok 4 - setup full repo
+			test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
 
-expecting success of 5318.5 'tweak umask for modebit tests': 
-	umask 022
+			cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$other.pack
+			EOF
+			)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
 
-ok 5 - tweak umask for modebit tests
+			cut -d" " -f2 <actual.raw | sort -u >actual &&
 
-expecting success of 5318.6 'verify graph with no graph file': 
-	git -C full commit-graph verify
+			test_cmp expect actual
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[master 8c1110b] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+ok 2 - unreachable packed objects are packed (expire never)
 
-ok 6 - verify graph with no graph file
+expecting success of 5329.3 'unreachable cruft objects are repacked (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-expecting success of 5318.7 'write graph with no packs': 
-	git -C full commit-graph write --object-dir $objdir &&
-	test_path_is_missing full/$objdir/info/commit-graph
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
 
-ok 7 - write graph with no packs
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
 
-expecting success of 5318.8 'exit with correct error on bad input to --stdin-packs': 
-	echo doesnotexist >in &&
-	test_expect_code 1 git -C full commit-graph write --stdin-packs \
-		<in 2>stderr &&
-	test_grep "error adding pack" stderr
+			cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
+			git prune-packed &&
+			cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$cruft_a.pack
+			EOF
+			)" &&
 
-error: error adding pack .git/objects/pack/doesnotexist
-ok 8 - exit with correct error on bad input to --stdin-packs
+			test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
 
-expecting success of 5318.9 'create commits and repack': 
-	for i in $(test_seq 3)
-	do
-		test_commit -C full $i &&
-		git -C full branch commits/$i || return 1
-	done &&
-	git -C full repack
+			sort <expect.raw >expect &&
+			sort <actual.raw >actual &&
 
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
+			test_cmp expect actual
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ddc8575] 3
+ create mode 100644 packed.t
+[master 8c1110b] other
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 9 - create commits and repack
-
-expecting success of 5318.10 'check normal git operations: no graph': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 10 - check normal git operations: no graph
+ create mode 100644 other.t
+ok 3 - unreachable cruft objects are repacked (expire never)
 
-expecting success of 5318.11 'exit with correct error on bad input to --stdin-commits': 
-	# invalid, non-hex OID
-	echo HEAD | test_expect_code 1 git -C full commit-graph write \
-		--stdin-commits 2>stderr &&
-	test_grep "unexpected non-hex object ID: HEAD" stderr &&
-	# non-existent OID
-	echo $ZERO_OID | test_expect_code 1 git -C full commit-graph write \
-		--stdin-commits 2>stderr &&
-	test_grep "invalid object" stderr &&
-	# valid commit and tree OID
-	git -C full rev-parse HEAD HEAD^{tree} >in &&
-	git -C full commit-graph write --stdin-commits <in &&
-	graph_read_expect -C full 3 generation_data
+expecting success of 5329.4 'multiple cruft packs (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-error: unexpected non-hex object ID: HEAD
-error: invalid object: 0000000000000000000000000000000000000000
-ok 11 - exit with correct error on bad input to --stdin-commits
+			test_commit reachable &&
+			git repack -Ad &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
 
-expecting success of 5318.12 'write graph': 
-	git -C full commit-graph write &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 3 generation_data
+			test_commit cruft &&
+			loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
 
-ok 12 - write graph
+			# generate three copies of the cruft object in different
+			# cruft packs, each with a unique mtime:
+			#   - one expired (1000 seconds ago)
+			#   - two non-expired (one 1000 seconds in the future,
+			#     one 1500 seconds in the future)
+			test-tool chmtime =-1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-A <<-EOF &&
+			$keep
+			EOF
+			test-tool chmtime =+1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-B <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			EOF
+			test-tool chmtime =+1500 "$loose" &&
+			git pack-objects --cruft $packdir/pack-C <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			EOF
 
-expecting success of 5318.13 'write graph has correct permissions': 
-	test_path_is_file full/$objdir/info/commit-graph &&
-	echo "-r--r--r--" >expect &&
-	test_modebits full/$objdir/info/commit-graph >actual &&
-	test_cmp expect actual
+			# ensure the resulting cruft pack takes the most recent
+			# mtime among all copies
+			cruft="$(git pack-objects --cruft \
+				--cruft-expiration="$expire" \
+				$packdir/pack <<-EOF
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			-$(basename $(ls $packdir/pack-C-*.pack))
+			EOF
+			)" &&
 
-ok 13 - write graph has correct permissions
+			test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
 
-expecting success of 5318.14 'check normal git operations: graph exists': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+			sort expect.raw >expect &&
+			sort actual.raw >actual &&
+			test_cmp expect actual
+		)
 	
-ok 14 - check normal git operations: graph exists
-
-expecting success of 5318.15 'Add more commits': 
-	git -C full reset --hard commits/1 &&
-	for i in $(test_seq 4 5)
-	do
-		test_commit -C full $i &&
-		git -C full branch commits/$i || return 1
-	done &&
-	git -C full reset --hard commits/2 &&
-	for i in $(test_seq 6 7)
-	do
-		test_commit -C full $i &&
-		git -C full branch commits/$i || return 1
-	done &&
-	git -C full reset --hard commits/2 &&
-	git -C full merge commits/4 &&
-	git -C full branch merge/1 &&
-	git -C full reset --hard commits/4 &&
-	git -C full merge commits/6 &&
-	git -C full branch merge/2 &&
-	git -C full reset --hard commits/3 &&
-	git -C full merge commits/5 commits/7 &&
-	git -C full branch merge/3 &&
-	git -C full repack
-
-HEAD is now at d0dcf97 1
-[master 6efda21] 4
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 7ec8a1d] 5
+ create mode 100644 reachable.t
+[master 9401314] cruft
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 5.t
-HEAD is now at 82335b2 2
-[master 76c4cb0] 6
+ create mode 100644 cruft.t
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+ok 4 - multiple cruft packs (expire never)
+
+expecting success of 5329.5 'cruft packs tolerate missing trees (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit reachable &&
+			test_commit cruft &&
+
+			tree="$(git rev-parse cruft^{tree})" &&
+
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
+
+			# remove the unreachable tree, but leave the commit
+			# which has it as its root tree intact
+			rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
+
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[master 12a06f3] 7
+ create mode 100644 reachable.t
+[master 9401314] cruft
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 7.t
-HEAD is now at 82335b2 2
-Merge made by the 'ort' strategy.
- 4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-HEAD is now at 6efda21 4
-Merge made by the 'ort' strategy.
- 2.t | 1 +
- 6.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 2.t
- create mode 100644 6.t
-HEAD is now at ddc8575 3
-Trying simple merge with commits/5
-Trying simple merge with commits/7
-Merge made by the 'octopus' strategy.
- 4.t | 1 +
- 5.t | 1 +
- 6.t | 1 +
- 7.t | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
-ok 15 - Add more commits
-
-expecting success of 5318.16 'commit-graph write progress off for redirected stderr': 
-	git -C full commit-graph write 2>err &&
-	test_must_be_empty err
-
-ok 16 - commit-graph write progress off for redirected stderr
+ create mode 100644 cruft.t
+HEAD is now at 7dd88f0 reachable
+Deleted tag 'cruft' (was 9401314)
+1fd7610ee824e92e6acc1c916cc3150d13926e92
+ok 5 - cruft packs tolerate missing trees (expire never)
 
-expecting success of 5318.17 'commit-graph write force progress on for stderr': 
-	GIT_PROGRESS_DELAY=0 git -C full commit-graph write --progress 2>err &&
-	test_file_not_empty err
+expecting success of 5329.6 'cruft packs tolerate missing blobs (expire never)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-ok 17 - commit-graph write force progress on for stderr
+			test_commit reachable &&
+			test_commit cruft &&
 
-expecting success of 5318.18 'commit-graph write with the --no-progress option': 
-	git -C full commit-graph write --no-progress 2>err &&
-	test_must_be_empty err
+			blob="$(git rev-parse cruft:cruft.t)" &&
 
-ok 18 - commit-graph write with the --no-progress option
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
 
-expecting success of 5318.19 'commit-graph write --stdin-commits progress off for redirected stderr': 
-	git -C full rev-parse commits/5 >in &&
-	git -C full commit-graph write --stdin-commits <in 2>err &&
-	test_must_be_empty err
+			# remove the unreachable blob, but leave the commit (and
+			# the root tree of that commit) intact
+			rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
 
-ok 19 - commit-graph write --stdin-commits progress off for redirected stderr
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+[master 9401314] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+HEAD is now at 7dd88f0 reachable
+Deleted tag 'cruft' (was 9401314)
+9dad6aa6eb8f2eee78e507e20d4b2a6403f203ab
+ok 6 - cruft packs tolerate missing blobs (expire never)
 
-expecting success of 5318.20 'commit-graph write --stdin-commits force progress on for stderr': 
-	git -C full rev-parse commits/5 >in &&
-	GIT_PROGRESS_DELAY=0 git -C full commit-graph write --stdin-commits \
-		--progress <in 2>err &&
-	test_grep "Collecting commits from input" err
+expecting success of 5329.7 'unreachable loose objects are packed (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-Collecting commits from input: 1, done.
-ok 20 - commit-graph write --stdin-commits force progress on for stderr
+			test_commit base &&
+			git repack -Ad &&
+			test_commit loose &&
 
-expecting success of 5318.21 'commit-graph write --stdin-commits with the --no-progress option': 
-	git -C full rev-parse commits/5 >in &&
-	git -C full commit-graph write --stdin-commits --no-progress <in 2>err &&
-	test_must_be_empty err
+			test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose:loose.t))" &&
+			test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
+				$(git rev-parse loose^{tree}))" &&
 
-ok 21 - commit-graph write --stdin-commits with the --no-progress option
+			(
+				git rev-list --objects --no-object-names base..loose |
+				while read oid
+				do
+					path="$objdir/$(test_oid_to_path "$oid")" &&
+					printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" ||
+					echo "object list generation failed for $oid"
+				done |
+				sort -k1
+			) >expect &&
 
-expecting success of 5318.22 'commit-graph verify progress off for redirected stderr': 
-	git -C full commit-graph verify 2>err &&
-	test_must_be_empty err
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			cruft="$(echo $keep | git pack-objects --cruft \
+				--cruft-expiration="$expire" $packdir/pack)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
 
-ok 22 - commit-graph verify progress off for redirected stderr
+			test_cmp expect actual
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master da180c9] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 7 - unreachable loose objects are packed (expire 2.weeks.ago)
 
-expecting success of 5318.23 'commit-graph verify force progress on for stderr': 
-	GIT_PROGRESS_DELAY=0 git -C full commit-graph verify --progress 2>err &&
-	test_file_not_empty err
+expecting success of 5329.8 'unreachable packed objects are packed (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-ok 23 - commit-graph verify force progress on for stderr
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
 
-expecting success of 5318.24 'commit-graph verify with the --no-progress option': 
-	git -C full commit-graph verify --no-progress 2>err &&
-	test_must_be_empty err
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+			other="$(git pack-objects --delta-base-offset \
+				$packdir/pack <objects)" &&
+			git prune-packed &&
 
-ok 24 - commit-graph verify with the --no-progress option
+			test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
 
-expecting success of 5318.25 'write graph with merges': 
-	git -C full commit-graph write &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 10 "generation_data extra_edges"
+			cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$other.pack
+			EOF
+			)" &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
 
-ok 25 - write graph with merges
+			cut -d" " -f2 <actual.raw | sort -u >actual &&
 
-expecting success of 5318.26 'check normal git operations: merge 1 vs 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+			test_cmp expect actual
+		)
 	
-ok 26 - check normal git operations: merge 1 vs 2
-
-expecting success of 5318.27 'check normal git operations: merge 1 vs 3': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 27 - check normal git operations: merge 1 vs 3
-
-expecting success of 5318.28 'check normal git operations: merge 2 vs 3': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 28 - check normal git operations: merge 2 vs 3
-
-expecting success of 5318.29 'Add one more commit': 
-	test_commit -C full 8 &&
-	git -C full branch commits/8 &&
-	ls full/$objdir/pack | grep idx >existing-idx &&
-	git -C full repack &&
-	ls full/$objdir/pack| grep idx | grep -v -f existing-idx >new-idx
-
-[master 2c45687] 8
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 8.t
-ok 29 - Add one more commit
-
-expecting success of 5318.30 'check normal git operations: mixed mode, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 30 - check normal git operations: mixed mode, commit 8 vs merge 1
-
-expecting success of 5318.31 'check normal git operations: mixed mode, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 31 - check normal git operations: mixed mode, commit 8 vs merge 2
-
-expecting success of 5318.32 'write graph with new commit': 
-	git -C full commit-graph write &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 11 "generation_data extra_edges"
+ create mode 100644 packed.t
+[master 8c1110b] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+ok 8 - unreachable packed objects are packed (expire 2.weeks.ago)
 
-ok 32 - write graph with new commit
+expecting success of 5329.9 'unreachable cruft objects are repacked (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-expecting success of 5318.33 'check normal git operations: full graph, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 33 - check normal git operations: full graph, commit 8 vs merge 1
+			test_commit packed &&
+			git repack -Ad &&
+			test_commit other &&
 
-expecting success of 5318.34 'check normal git operations: full graph, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 34 - check normal git operations: full graph, commit 8 vs merge 2
+			git rev-list --objects --no-object-names packed.. >objects &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
 
-expecting success of 5318.35 'write graph with nothing new': 
-	git -C full commit-graph write &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 11 "generation_data extra_edges"
+			cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
+			git prune-packed &&
+			cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
+			$keep
+			-pack-$cruft_a.pack
+			EOF
+			)" &&
 
-ok 35 - write graph with nothing new
+			test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
 
-expecting success of 5318.36 'check normal git operations: cleared graph, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 36 - check normal git operations: cleared graph, commit 8 vs merge 1
+			sort <expect.raw >expect &&
+			sort <actual.raw >actual &&
 
-expecting success of 5318.37 'check normal git operations: cleared graph, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+			test_cmp expect actual
+		)
 	
-ok 37 - check normal git operations: cleared graph, commit 8 vs merge 2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[master 8c1110b] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+ok 9 - unreachable cruft objects are repacked (expire 2.weeks.ago)
 
-expecting success of 5318.38 'build graph from latest pack with closure': 
-	git -C full commit-graph write --stdin-packs <new-idx &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 9 "generation_data extra_edges"
+expecting success of 5329.10 'multiple cruft packs (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-ok 38 - build graph from latest pack with closure
+			test_commit reachable &&
+			git repack -Ad &&
+			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
 
-expecting success of 5318.39 'check normal git operations: graph from pack, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 39 - check normal git operations: graph from pack, commit 8 vs merge 1
+			test_commit cruft &&
+			loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
 
-expecting success of 5318.40 'check normal git operations: graph from pack, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 40 - check normal git operations: graph from pack, commit 8 vs merge 2
+			# generate three copies of the cruft object in different
+			# cruft packs, each with a unique mtime:
+			#   - one expired (1000 seconds ago)
+			#   - two non-expired (one 1000 seconds in the future,
+			#     one 1500 seconds in the future)
+			test-tool chmtime =-1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-A <<-EOF &&
+			$keep
+			EOF
+			test-tool chmtime =+1000 "$loose" &&
+			git pack-objects --cruft $packdir/pack-B <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			EOF
+			test-tool chmtime =+1500 "$loose" &&
+			git pack-objects --cruft $packdir/pack-C <<-EOF &&
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			EOF
 
-expecting success of 5318.41 'build graph from commits with closure': 
-	git -C full tag -a -m "merge" tag/merge merge/2 &&
-	git -C full rev-parse tag/merge >commits-in &&
-	git -C full rev-parse merge/1 >>commits-in &&
-	git -C full commit-graph write --stdin-commits <commits-in &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 6 "generation_data"
+			# ensure the resulting cruft pack takes the most recent
+			# mtime among all copies
+			cruft="$(git pack-objects --cruft \
+				--cruft-expiration="$expire" \
+				$packdir/pack <<-EOF
+			$keep
+			-$(basename $(ls $packdir/pack-A-*.pack))
+			-$(basename $(ls $packdir/pack-B-*.pack))
+			-$(basename $(ls $packdir/pack-C-*.pack))
+			EOF
+			)" &&
 
-ok 41 - build graph from commits with closure
+			test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
+			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
 
-expecting success of 5318.42 'check normal git operations: graph from commits, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+			sort expect.raw >expect &&
+			sort actual.raw >actual &&
+			test_cmp expect actual
+		)
 	
-ok 42 - check normal git operations: graph from commits, commit 8 vs merge 1
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+[master 9401314] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
+ok 10 - multiple cruft packs (expire 2.weeks.ago)
 
-expecting success of 5318.43 'check normal git operations: graph from commits, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 43 - check normal git operations: graph from commits, commit 8 vs merge 2
+expecting success of 5329.11 'cruft packs tolerate missing trees (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-expecting success of 5318.44 'build graph from commits with append': 
-	git -C full rev-parse merge/3 >in &&
-	git -C full commit-graph write --stdin-commits --append <in &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 10 "generation_data extra_edges"
+			test_commit reachable &&
+			test_commit cruft &&
 
-ok 44 - build graph from commits with append
+			tree="$(git rev-parse cruft^{tree})" &&
 
-expecting success of 5318.45 'check normal git operations: append graph, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 45 - check normal git operations: append graph, commit 8 vs merge 1
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
 
-expecting success of 5318.46 'check normal git operations: append graph, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 46 - check normal git operations: append graph, commit 8 vs merge 2
+			# remove the unreachable tree, but leave the commit
+			# which has it as its root tree intact
+			rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
 
-expecting success of 5318.47 'build graph using --reachable': 
-	git -C full commit-graph write --reachable &&
-	test_path_is_file full/$objdir/info/commit-graph &&
-	graph_read_expect -C full 11 "generation_data extra_edges"
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+[master 9401314] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+HEAD is now at 7dd88f0 reachable
+Deleted tag 'cruft' (was 9401314)
+1fd7610ee824e92e6acc1c916cc3150d13926e92
+ok 11 - cruft packs tolerate missing trees (expire 2.weeks.ago)
 
-ok 47 - build graph using --reachable
+expecting success of 5329.12 'cruft packs tolerate missing blobs (expire 2.weeks.ago)': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-expecting success of 5318.48 'check normal git operations: append graph, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 48 - check normal git operations: append graph, commit 8 vs merge 1
+			test_commit reachable &&
+			test_commit cruft &&
 
-expecting success of 5318.49 'check normal git operations: append graph, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 49 - check normal git operations: append graph, commit 8 vs merge 2
+			blob="$(git rev-parse cruft:cruft.t)" &&
 
-expecting success of 5318.50 'setup bare repo': 
-	git clone --bare --no-local full bare
+			git reset --hard reachable &&
+			git tag -d cruft &&
+			git reflog expire --all --expire=all &&
 
-Cloning into bare repository 'bare'...
-ok 50 - setup bare repo
+			# remove the unreachable blob, but leave the commit (and
+			# the root tree of that commit) intact
+			rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
 
-expecting success of 5318.51 'check normal git operations: bare repo, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+			git repack -Ad &&
+			basename $(ls $packdir/pack-*.pack) >in &&
+			git pack-objects --cruft --cruft-expiration="$expire" \
+				$packdir/pack <in
+		)
 	
-ok 51 - check normal git operations: bare repo, commit 8 vs merge 1
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+[master 9401314] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+HEAD is now at 7dd88f0 reachable
+Deleted tag 'cruft' (was 9401314)
+9dad6aa6eb8f2eee78e507e20d4b2a6403f203ab
+ok 12 - cruft packs tolerate missing blobs (expire 2.weeks.ago)
 
-expecting success of 5318.52 'check normal git operations: bare repo, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 52 - check normal git operations: bare repo, commit 8 vs merge 2
+expecting success of 5329.13 'cruft tags rescue tagged objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.53 'write graph in bare repo': 
-	git -C bare commit-graph write &&
-	test_path_is_file bare/objects/info/commit-graph &&
-	graph_read_expect -C bare 11 "generation_data extra_edges"
+		test_commit packed &&
+		git repack -Ad &&
 
-ok 53 - write graph in bare repo
+		test_commit tagged &&
+		git tag -a annotated -m tag &&
 
-expecting success of 5318.54 'check normal git operations: bare repo with graph, commit 8 vs merge 1': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 54 - check normal git operations: bare repo with graph, commit 8 vs merge 1
+		git rev-list --objects --no-object-names packed.. >objects &&
+		while read oid
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $oid)" || exit 1
+		done <objects &&
 
-expecting success of 5318.55 'check normal git operations: bare repo with graph, commit 8 vs merge 2': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 55 - check normal git operations: bare repo with graph, commit 8 vs merge 2
+		test-tool chmtime -500 \
+			"$objdir/$(test_oid_to_path $(git rev-parse annotated))" &&
 
-expecting success of 5318.56 'perform fast-forward merge in full repo': 
-	git -C full checkout -b merge-5-to-8 commits/5 &&
-	git -C full merge commits/8 &&
-	git -C full show-ref -s merge-5-to-8 >output &&
-	git -C full show-ref -s commits/8 >expect &&
-	test_cmp expect output
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+		cut -f1 -d" " <actual.raw | sort >actual &&
 
-Switched to a new branch 'merge-5-to-8'
-Updating 7ec8a1d..2c45687
-Fast-forward
- 2.t | 1 +
- 3.t | 1 +
- 6.t | 1 +
- 7.t | 1 +
- 8.t | 1 +
- 5 files changed, 5 insertions(+)
- create mode 100644 2.t
- create mode 100644 3.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
-ok 56 - perform fast-forward merge in full repo
+		(
+			cat objects &&
+			git rev-parse annotated
+		) >expect.raw &&
+		sort <expect.raw >expect &&
 
-expecting success of 5318.57 'check that gc computes commit-graph': 
-	test_commit -C full --no-tag blank &&
-	git -C full commit-graph write --reachable &&
-	cp full/$objdir/info/commit-graph commit-graph-before-gc &&
-	git -C full reset --hard HEAD~1 &&
-	test_config -C full gc.writeCommitGraph true &&
-	git -C full gc &&
-	cp full/$objdir/info/commit-graph commit-graph-after-gc &&
-	! test_cmp_bin commit-graph-before-gc commit-graph-after-gc &&
-	git -C full commit-graph write --reachable &&
-	test_cmp_bin commit-graph-after-gc full/$objdir/info/commit-graph
+		test_cmp expect actual &&
+		cat actual
+	)
 
-[merge-5-to-8 3cb8ab7] blank
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 blank.t
-HEAD is now at 2c45687 8
-commit-graph-before-gc commit-graph-after-gc differ: char 44, line 1
-ok 57 - check that gc computes commit-graph
+ create mode 100644 packed.t
+[master 1ce88f2] tagged
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tagged.t
+1ce88f2752d44a4c71b81cbcbb127c84f8df32e8
+6ae842110efefc995fd529f1bde08a3c608d4f6f
+9e5f42caf6e84faf4a2e509216e63116dc509059
+b4189c489bdfaa52374fe786bfbb416554531eb2
+ok 13 - cruft tags rescue tagged objects
 
-expecting success of 5318.58 'replace-objects invalidates commit-graph': 
-	test_when_finished rm -rf replace &&
-	git clone full replace &&
+expecting success of 5329.14 'cruft commits rescue parents, trees': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
-		cd replace &&
-		git commit-graph write --reachable &&
-		test_path_is_file .git/objects/info/commit-graph &&
-		git replace HEAD~1 HEAD~2 &&
-		graph_git_two_modes "commit-graph verify" &&
-		git -c core.commitGraph=false log >expect &&
-		git -c core.commitGraph=true log >actual &&
-		test_cmp expect actual &&
-		git commit-graph write --reachable &&
-		git -c core.commitGraph=false --no-replace-objects log >expect &&
-		git -c core.commitGraph=true --no-replace-objects log >actual &&
-		test_cmp expect actual &&
-		rm -rf .git/objects/info/commit-graph &&
-		git commit-graph write --reachable &&
-		test_path_is_file .git/objects/info/commit-graph
-	)
+		cd repo &&
 
-Cloning into 'replace'...
-done.
-ok 58 - replace-objects invalidates commit-graph
+		test_commit packed &&
+		git repack -Ad &&
 
-expecting success of 5318.59 'commit grafts invalidate commit-graph': 
-	test_when_finished rm -rf graft &&
-	git clone --template= full graft &&
-	(
-		cd graft &&
-		git commit-graph write --reachable &&
-		test_path_is_file .git/objects/info/commit-graph &&
-		H1=$(git rev-parse --verify HEAD~1) &&
-		H3=$(git rev-parse --verify HEAD~3) &&
-		mkdir .git/info &&
-		echo "$H1 $H3" >.git/info/grafts &&
-		git -c core.commitGraph=false log >expect &&
-		git -c core.commitGraph=true log >actual &&
-		test_cmp expect actual &&
-		git commit-graph write --reachable &&
-		git -c core.commitGraph=false --no-replace-objects log >expect &&
-		git -c core.commitGraph=true --no-replace-objects log >actual &&
-		test_cmp expect actual &&
-		rm -rf .git/objects/info/commit-graph &&
-		git commit-graph write --reachable &&
-		test_path_is_missing .git/objects/info/commit-graph
-	)
+		test_commit old &&
+		test_commit new &&
 
-Cloning into 'graft'...
-done.
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 59 - commit grafts invalidate commit-graph
+		git rev-list --objects --no-object-names packed..new >objects &&
+		while read object
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $object)" || exit 1
+		done <objects &&
+		test-tool chmtime +500 "$objdir/$(test_oid_to_path \
+			$(git rev-parse HEAD))" &&
 
-expecting success of 5318.60 'replace-objects invalidates commit-graph': 
-	test_when_finished rm -rf shallow &&
-	git clone --depth 2 "file://$TRASH_DIRECTORY/full" shallow &&
-	(
-		cd shallow &&
-		git commit-graph write --reachable &&
-		test_path_is_missing .git/objects/info/commit-graph &&
-		git fetch origin --unshallow &&
-		git commit-graph write --reachable &&
-		test_path_is_file .git/objects/info/commit-graph
-	)
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
 
-Cloning into 'shallow'...
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/full
- * [new tag]         1          -> 1
- * [new tag]         2          -> 2
- * [new tag]         3          -> 3
- * [new tag]         4          -> 4
- * [new tag]         5          -> 5
- * [new tag]         6          -> 6
- * [new tag]         7          -> 7
-ok 60 - replace-objects invalidates commit-graph
+		cut -d" " -f1 <actual.raw | sort >actual &&
+		sort <objects >expect &&
 
-expecting success of 5318.61 'warn on improper hash version': 
-	git init --object-format=sha1 sha1 &&
-	(
-		cd sha1 &&
-		test_commit 1 &&
-		git commit-graph write --reachable &&
-		mv .git/objects/info/commit-graph ../cg-sha1
-	) &&
-	git init --object-format=sha256 sha256 &&
-	(
-		cd sha256 &&
-		test_commit 1 &&
-		git commit-graph write --reachable &&
-		mv .git/objects/info/commit-graph ../cg-sha256
-	) &&
-	(
-		cd sha1 &&
-		mv ../cg-sha256 .git/objects/info/commit-graph &&
-		git log -1 2>err &&
-		test_grep "commit-graph hash version 2 does not match version 1" err
-	) &&
-	(
-		cd sha256 &&
-		mv ../cg-sha1 .git/objects/info/commit-graph &&
-		git log -1 2>err &&
-		test_grep "commit-graph hash version 1 does not match version 2" err
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/sha1/.git/
-[master (root-commit) 925a26a] 1
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/sha256/.git/
-[master (root-commit) 0aad349] 1
+ create mode 100644 packed.t
+[master 077a51a] old
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1.t
-commit 925a26a37e395ff2955d4b055019609371c1b39a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:22:13 2005 -0700
+ create mode 100644 old.t
+[master 3b97f54] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+ok 14 - cruft commits rescue parents, trees
 
-    1
-error: commit-graph hash version 2 does not match version 1
-commit 0aad349d0d3afe1f43be2153747988096ae6c4cbb6d6fbc01a428930a66ca375
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:22:13 2005 -0700
+expecting success of 5329.15 'cruft trees rescue sub-trees, blobs': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-    1
-error: commit-graph hash version 1 does not match version 2
-ok 61 - warn on improper hash version
+		test_commit packed &&
+		git repack -Ad &&
 
-checking prerequisite: TIME_IS_64BIT
+		mkdir -p dir/sub &&
+		echo foo >foo &&
+		echo bar >dir/bar &&
+		echo baz >dir/sub/baz &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
-)
-prerequisite TIME_IS_64BIT ok
-checking prerequisite: TIME_T_IS_64BIT
+		test_tick &&
+		git add . &&
+		git commit -m "pruned" &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
-)
-prerequisite TIME_T_IS_64BIT ok
-expecting success of 5318.62 'lower layers have overflow chunk': 
-	UNIX_EPOCH_ZERO="@0 +0000" &&
-	FUTURE_DATE="@4147483646 +0000" &&
-	rm -f full/.git/objects/info/commit-graph &&
-	test_commit -C full --date "$FUTURE_DATE" future-1 &&
-	test_commit -C full --date "$UNIX_EPOCH_ZERO" old-1 &&
-	git -C full commit-graph write --reachable &&
-	test_commit -C full --date "$FUTURE_DATE" future-2 &&
-	test_commit -C full --date "$UNIX_EPOCH_ZERO" old-2 &&
-	git -C full commit-graph write --reachable --split=no-merge &&
-	test_commit -C full extra &&
-	git -C full commit-graph write --reachable --split=no-merge &&
-	git -C full commit-graph write --reachable &&
-	graph_read_expect -C full 16 \
-		"generation_data generation_data_overflow extra_edges" &&
-	mv full/.git/objects/info/commit-graph commit-graph-upgraded &&
-	git -C full commit-graph write --reachable &&
-	graph_read_expect -C full 16 \
-		"generation_data generation_data_overflow extra_edges" &&
-	test_cmp full/.git/objects/info/commit-graph commit-graph-upgraded
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD^{tree}))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:foo))" &&
+		test-tool chmtime  -500 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/bar))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub))" &&
+		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub/baz))" &&
 
-[merge-5-to-8 8786bed] future-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 future-1.t
-[merge-5-to-8 c87886d] old-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old-1.t
-[merge-5-to-8 dc3ab15] future-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 future-2.t
-[merge-5-to-8 db7674a] old-2
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+		cut -f1 -d" " <actual.raw | sort >actual &&
+
+		git rev-parse HEAD:dir HEAD:dir/bar HEAD:dir/sub HEAD:dir/sub/baz >expect.raw &&
+		sort <expect.raw >expect &&
+
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 old-2.t
-[merge-5-to-8 4e9edc3] extra
+ create mode 100644 packed.t
+[master 13f11a8] pruned
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-ok 62 - lower layers have overflow chunk
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dir/bar
+ create mode 100644 dir/sub/baz
+ create mode 100644 foo
+ok 15 - cruft trees rescue sub-trees, blobs
 
-expecting success of 5318.63 'git commit-graph verify': 
-	git -C full rev-parse commits/8 >in &&
-	git -C full -c commitGraph.generationVersion=1 commit-graph write \
-		--stdin-commits <in &&
-	git -C full commit-graph verify >output &&
-	graph_read_expect -C full 9 extra_edges 1
+expecting success of 5329.16 'expired objects are pruned': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-ok 63 - git commit-graph verify
+		test_commit packed &&
+		git repack -Ad &&
 
-checking prerequisite: SANITY
+		test_commit pruned &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+		git rev-list --objects --no-object-names packed..pruned >objects &&
+		while read object
+		do
+			test-tool chmtime -1000 \
+				"$objdir/$(test_oid_to_path $object)" || exit 1
+		done <objects &&
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+		cruft="$(echo $keep | git pack-objects --cruft \
+			--cruft-expiration=750.seconds.ago \
+			$packdir/pack)" &&
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+		test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+		test_must_be_empty actual
+	)
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) e975c14] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[master 69e4b3a] pruned
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pruned.t
+ok 16 - expired objects are pruned
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 5318.64 'detect permission problem': 
-	corrupt_graph_setup &&
-	chmod 000 full/$objdir/info/commit-graph &&
-	corrupt_graph_verify "Could not open" "no-copy"
+expecting success of 5329.17 'repack --cruft generates a cruft pack': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-fatal: Could not open commit-graph '.git/objects/info/commit-graph': Permission denied
-?? expect
-?? output
-ok 64 - detect permission problem
+		test_commit reachable &&
+		git branch -M main &&
+		git checkout --orphan other &&
+		test_commit unreachable &&
 
-expecting success of 5318.65 'detect too small': 
-	corrupt_graph_setup &&
-	echo "a small graph" >full/$objdir/info/commit-graph &&
-	corrupt_graph_verify "too small"
+		git checkout main &&
+		git branch -D other &&
+		git tag -d unreachable &&
+		# objects are not cruft if they are contained in the reflogs
+		git reflog expire --all --expire=all &&
 
-error: commit-graph file is too small
-error: commit-graph file is too small
-?? expect
-?? output
-error: commit-graph file is too small
-ok 65 - detect too small
+		git rev-list --objects --all --no-object-names >reachable.raw &&
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+		sort <reachable.raw >reachable &&
+		comm -13 reachable objects >unreachable &&
 
-expecting success of 5318.66 'detect bad signature': 
-	corrupt_graph_and_verify 0 "\0" \
-		"graph signature"
+		git repack --cruft -d &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00720448 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.108e-05 s, 0.0 kB/s
-error: commit-graph signature 475048 does not match signature 43475048
-error: commit-graph signature 475048 does not match signature 43475048
-?? expect
-?? output
-error: commit-graph signature 475048 does not match signature 43475048
-ok 66 - detect bad signature
+		cruft=$(basename $(ls $packdir/pack-*.mtimes) .mtimes) &&
+		pack=$(basename $(ls $packdir/pack-*.pack | grep -v $cruft) .pack) &&
 
-expecting success of 5318.67 'detect bad version': 
-	corrupt_graph_and_verify $GRAPH_BYTE_VERSION "\02" \
-		"graph version"
+		git show-index <$packdir/$pack.idx >actual.raw &&
+		cut -f2 -d" " actual.raw | sort >actual &&
+		test_cmp reachable actual &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.0114904 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.348e-05 s, 0.0 kB/s
-error: commit-graph version 2 does not match version 1
-error: commit-graph version 2 does not match version 1
-?? expect
-?? output
-error: commit-graph version 2 does not match version 1
-ok 67 - detect bad version
+		git show-index <$packdir/$cruft.idx >actual.raw &&
+		cut -f2 -d" " actual.raw | sort >actual &&
+		test_cmp unreachable actual
+	)
 
-expecting success of 5318.68 'detect bad hash version': 
-	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \
-		"hash version"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+Switched to a new branch 'other'
+[other (root-commit) a613991] unreachable
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 reachable.t
+ create mode 100644 unreachable.t
+Switched to branch 'main'
+Deleted branch other (was a613991).
+Deleted tag 'unreachable' (was a613991)
+ok 17 - repack --cruft generates a cruft pack
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00725264 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.44e-05 s, 0.0 kB/s
-error: commit-graph hash version 3 does not match version 1
-error: commit-graph hash version 3 does not match version 1
-?? expect
-?? output
-error: commit-graph hash version 3 does not match version 1
-ok 68 - detect bad hash version
+expecting success of 5329.18 'loose objects mtimes upsert others': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.69 'detect low chunk count': 
-	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \
-		"final chunk has non-zero id"
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00359788 s, 0.3 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.284e-05 s, 0.0 kB/s
-error: final chunk has non-zero id 4f49444c
-error: final chunk has non-zero id 4f49444c
-?? expect
-?? output
-error: final chunk has non-zero id 4f49444c
-ok 69 - detect low chunk count
+		git checkout --orphan other &&
+		test_commit cruft &&
+		# incremental repack, leaving existing objects loose (so
+		# they can be "freshened")
+		git repack &&
 
-expecting success of 5318.70 'detect missing OID fanout chunk': 
-	corrupt_graph_and_verify $GRAPH_BYTE_OID_FANOUT_ID "\0" \
-		"commit-graph required OID fanout chunk missing or corrupted"
+		tip="$(git rev-parse cruft)" &&
+		path="$objdir/$(test_oid_to_path "$tip")" &&
+		test-tool chmtime --get +1000 "$path" >expect &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.764e-05 s, 26.6 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.184e-05 s, 0.0 kB/s
-error: commit-graph required OID fanout chunk missing or corrupted
-error: commit-graph required OID fanout chunk missing or corrupted
-?? expect
-?? output
-error: commit-graph required OID fanout chunk missing or corrupted
-ok 70 - detect missing OID fanout chunk
+		git checkout main &&
+		git branch -D other &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
 
-expecting success of 5318.71 'detect missing OID lookup chunk': 
-	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ID "\0" \
-		"commit-graph required OID lookup chunk missing or corrupted"
+		git repack --cruft -d &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00725808 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.468e-05 s, 0.0 kB/s
-error: commit-graph required OID lookup chunk missing or corrupted
-error: commit-graph required OID lookup chunk missing or corrupted
-?? expect
-?? output
-error: commit-graph required OID lookup chunk missing or corrupted
-ok 71 - detect missing OID lookup chunk
+		mtimes="$(basename $(ls $packdir/pack-*.mtimes))" &&
+		test-tool pack-mtimes "$mtimes" >actual.raw &&
+		grep "$tip" actual.raw | cut -d" " -f2 >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 5318.72 'detect missing commit data chunk': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATA_ID "\0" \
-		"commit-graph required commit data chunk missing or corrupted"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+Switched to a new branch 'other'
+[other (root-commit) 03feb6e] cruft
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 cruft.t
+ create mode 100644 reachable.t
+Switched to branch 'main'
+Deleted branch other (was 03feb6e).
+Deleted tag 'cruft' (was 03feb6e)
+ok 18 - loose objects mtimes upsert others
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.0001964 s, 5.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 1.844e-05 s, 0.0 kB/s
-error: commit-graph required commit data chunk missing or corrupted
-error: commit-graph required commit data chunk missing or corrupted
-?? expect
-?? output
-error: commit-graph required commit data chunk missing or corrupted
-ok 72 - detect missing commit data chunk
+expecting success of 5329.19 'expiring cruft objects with git gc': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.73 'detect incorrect fanout': 
-	corrupt_graph_and_verify $GRAPH_BYTE_FANOUT1 "\01" \
-		"fanout value"
+		test_commit reachable &&
+		git branch -M main &&
+		git checkout --orphan other &&
+		test_commit unreachable &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.912e-05 s, 25.6 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.32e-05 s, 0.0 kB/s
-error: commit-graph fanout values out of order
-error: commit-graph fanout values out of order
-error: commit-graph required OID fanout chunk missing or corrupted
-?? expect
-?? output
-error: commit-graph fanout values out of order
-error: commit-graph required OID fanout chunk missing or corrupted
-ok 73 - detect incorrect fanout
+		git checkout main &&
+		git branch -D other &&
+		git tag -d unreachable &&
+		# objects are not cruft if they are contained in the reflogs
+		git reflog expire --all --expire=all &&
 
-expecting success of 5318.74 'detect incorrect fanout final value': 
-	corrupt_graph_and_verify $GRAPH_BYTE_FANOUT2 "\01" \
-		"OID lookup chunk is the wrong size"
+		git rev-list --objects --all --no-object-names >reachable.raw &&
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+		sort <reachable.raw >reachable &&
+		comm -13 reachable objects >unreachable &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.0073768 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.156e-05 s, 0.0 kB/s
-error: commit-graph OID lookup chunk is the wrong size
-error: commit-graph OID lookup chunk is the wrong size
-error: commit-graph required OID lookup chunk missing or corrupted
-?? expect
-?? output
-error: commit-graph OID lookup chunk is the wrong size
-error: commit-graph required OID lookup chunk missing or corrupted
-ok 74 - detect incorrect fanout final value
+		# Write a cruft pack containing all unreachable objects.
+		git gc --cruft --prune="01-01-1980" &&
 
-expecting success of 5318.75 'detect incorrect OID order': 
-	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ORDER "\01" \
-		"incorrect OID order"
+		mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
+		test_path_is_file $mtimes &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00034712 s, 2.9 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.532e-05 s, 0.0 kB/s
-commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
-?? expect
-?? output
-ok 75 - detect incorrect OID order
+		# Prune all unreachable objects from the cruft pack.
+		git gc --cruft --prune=now &&
 
-expecting success of 5318.76 'detect OID not in object database': 
-	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_MISSING "\01" \
-		"from object database"
+		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.38e-05 s, 29.6 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.348e-05 s, 0.0 kB/s
-failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
-?? expect
-?? output
-ok 76 - detect OID not in object database
+		comm -23 unreachable objects >removed &&
+		test_cmp unreachable removed &&
+		test_path_is_missing $mtimes
+	)
 
-expecting success of 5318.77 'detect incorrect tree OID': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_TREE "\01" \
-		"root tree OID for commit"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+Switched to a new branch 'other'
+[other (root-commit) a613991] unreachable
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 reachable.t
+ create mode 100644 unreachable.t
+Switched to branch 'main'
+Deleted branch other (was a613991).
+Deleted tag 'unreachable' (was a613991)
+ok 19 - expiring cruft objects with git gc
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00026296 s, 3.8 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.14e-05 s, 0.0 kB/s
-root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
-?? expect
-?? output
-ok 77 - detect incorrect tree OID
+expecting success of 5329.20 'cruft packs are not included in geometric repack': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.78 'detect incorrect parent int-id': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_PARENT "\01" \
-		"invalid parent"
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00734952 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.272e-05 s, 0.0 kB/s
-fatal: invalid parent position 16777220
-?? expect
-?? output
-ok 78 - detect incorrect parent int-id
+		git checkout --orphan other &&
+		test_commit cruft &&
+		git repack -d &&
 
-expecting success of 5318.79 'detect extra parent int-id': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_EXTRA_PARENT "\00" \
-		"is too long"
+		git checkout main &&
+		git branch -D other &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.0003354 s, 3.0 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.508e-05 s, 0.0 kB/s
-commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
-?? expect
-?? output
-ok 79 - detect extra parent int-id
+		git repack --cruft &&
 
-expecting success of 5318.80 'detect wrong parent': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_WRONG_PARENT "\01" \
-		"commit-graph parent for"
+		find $packdir -type f | sort >before &&
+		git repack --geometric=2 -d &&
+		find $packdir -type f | sort >after &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.476e-05 s, 28.8 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.196e-05 s, 0.0 kB/s
-commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
-?? expect
-?? output
-ok 80 - detect wrong parent
+		test_cmp before after
+	)
 
-expecting success of 5318.81 'detect incorrect generation number': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\070" \
-		"generation for commit"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+Switched to a new branch 'other'
+[other (root-commit) 03feb6e] cruft
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 cruft.t
+ create mode 100644 reachable.t
+Switched to branch 'main'
+Deleted branch other (was 03feb6e).
+Deleted tag 'cruft' (was 03feb6e)
+Nothing new to pack.
+ok 20 - cruft packs are not included in geometric repack
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.0072 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.192e-05 s, 0.0 kB/s
-commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
-?? expect
-?? output
-ok 81 - detect incorrect generation number
+expecting success of 5329.21 'repack --geometric collects once-cruft objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.82 'detect incorrect commit date': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATE "\01" \
-		"commit date"
+		test_commit reachable &&
+		git repack -Ad &&
+		git branch -M main &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.548e-05 s, 28.2 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.752e-05 s, 0.0 kB/s
-commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
-?? expect
-?? output
-ok 82 - detect incorrect commit date
+		git checkout --orphan other &&
+		git rm -rf . &&
+		test_commit --no-tag cruft &&
+		cruft="$(git rev-parse HEAD)" &&
 
-expecting success of 5318.83 'detect incorrect parent for octopus merge': 
-	corrupt_graph_and_verify $GRAPH_BYTE_OCTOPUS "\01" \
-		"invalid parent"
+		git checkout main &&
+		git branch -D other &&
+		git reflog expire --all --expire=all &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00065492 s, 1.5 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.488e-05 s, 0.0 kB/s
-fatal: invalid parent position 16777216
-?? expect
-?? output
-ok 83 - detect incorrect parent for octopus merge
+		# Pack the objects created in the previous step into a cruft
+		# pack. Intentionally leave loose copies of those objects
+		# around so we can pick them up in a subsequent --geometric
+		# reapack.
+		git repack --cruft &&
 
-expecting success of 5318.84 'detect invalid checksum hash': 
-	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
-		"incorrect checksum"
+		# Now make those objects reachable, and ensure that they are
+		# packed into the new pack created via a --geometric repack.
+		git update-ref refs/heads/other $cruft &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00660316 s, 0.2 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.296e-05 s, 0.0 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-?? expect
-?? output
-ok 84 - detect invalid checksum hash
+		# Without this object, the set of unpacked objects is exactly
+		# the set of objects already in the cruft pack. Tweak that set
+		# to ensure we do not overwrite the cruft pack entirely.
+		test_commit reachable2 &&
 
-expecting success of 5318.85 'detect incorrect chunk count': 
-	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \
-		"commit-graph file is too small to hold [0-9]* chunks" \
-		$GRAPH_CHUNK_LOOKUP_OFFSET
+		find $packdir -name "pack-*.idx" | sort >before &&
+		git repack --geometric=2 -d &&
+		find $packdir -name "pack-*.idx" | sort >after &&
 
-1+0 records in
-1+0 records out
-1 byte copied, 0.00025852 s, 3.9 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.472e-05 s, 0.0 kB/s
-error: commit-graph file is too small to hold 255 chunks
-error: commit-graph file is too small to hold 255 chunks
-?? expect
-?? output
-error: commit-graph file is too small to hold 255 chunks
-ok 85 - detect incorrect chunk count
+		{
+			git rev-list --objects --no-object-names $cruft &&
+			git rev-list --objects --no-object-names reachable..reachable2
+		} >want.raw &&
+		sort want.raw >want &&
 
-expecting success of 5318.86 'detect mixed generation numbers (non-zero to zero)': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION_LAST "\0\0\0\0" \
-		"both zero and non-zero generations"
+		pack=$(comm -13 before after) &&
+		git show-index <$pack >objects.raw &&
 
-4+0 records in
-4+0 records out
-4 bytes copied, 4.548e-05 s, 88.0 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.412e-05 s, 0.0 kB/s
-commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
-?? expect
-?? output
-ok 86 - detect mixed generation numbers (non-zero to zero)
+		cut -d" " -f2 objects.raw | sort >got &&
 
-expecting success of 5318.87 'detect mixed generation numbers (zero to non-zero)': 
-	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\0\0\0\0" \
-		"both zero and non-zero generations"
+		test_cmp want got
+	)
 
-4+0 records in
-4+0 records out
-4 bytes copied, 3.728e-05 s, 107 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.804e-05 s, 0.0 kB/s
-commit-graph has both zero and non-zero generations (e.g., commits '12a06f3a2c235980d878903e940b0570ddda4359' and 'ddc8575ed6fc205127629848895ac35ba7529ace')
-?? expect
-?? output
-ok 87 - detect mixed generation numbers (zero to non-zero)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 7dd88f0] reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable.t
+Switched to a new branch 'other'
+rm 'reachable.t'
+[other (root-commit) 86057ae] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+Switched to branch 'main'
+Deleted branch other (was 86057ae).
+[main 2f90f70] reachable2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reachable2.t
+ok 21 - repack --geometric collects once-cruft objects
 
-expecting success of 5318.88 'git fsck (checks commit-graph when config set to true)': 
-	git -C full fsck &&
-	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
-		"incorrect checksum" &&
-	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
-	test_must_fail git -C full -c core.commitGraph=true fsck
+expecting success of 5329.22 'cruft repack with no reachable objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 3.74e-05 s, 26.7 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.536e-05 s, 0.0 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-?? expect
-?? output
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-the commit-graph file has incorrect checksum and is likely corrupt
-ok 88 - git fsck (checks commit-graph when config set to true)
+		test_commit base &&
+		git repack -ad &&
 
-expecting success of 5318.89 'git fsck (ignores commit-graph when config set to false)': 
-	git -C full fsck &&
-	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
-		"incorrect checksum" &&
-	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
-	git -C full -c core.commitGraph=false fsck
+		base="$(git rev-parse base)" &&
 
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 3.576e-05 s, 28.0 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.756e-05 s, 0.0 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-?? expect
-?? output
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-ok 89 - git fsck (ignores commit-graph when config set to false)
+		git for-each-ref --format="delete %(refname)" >in &&
+		git update-ref --stdin <in &&
+		git reflog expire --all --expire=all &&
+		rm -fr .git/index &&
 
-expecting success of 5318.90 'git fsck (checks commit-graph when config unset)': 
-	test_when_finished "git -C full config core.commitGraph true" &&
+		git repack --cruft -d &&
 
-	git -C full fsck &&
-	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
-		"incorrect checksum" &&
-	test_unconfig -C full core.commitGraph &&
-	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
-	test_must_fail git -C full fsck
+		git cat-file -t $base
+	)
 
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-1+0 records in
-1+0 records out
-1 byte copied, 0.00727364 s, 0.1 kB/s
-0+0 records in
-0+0 records out
-0 bytes copied, 2.48e-05 s, 0.0 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-?? expect
-?? output
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-the commit-graph file has incorrect checksum and is likely corrupt
-ok 90 - git fsck (checks commit-graph when config unset)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Nothing new to pack.
+commit
+ok 22 - cruft repack with no reachable objects
 
-expecting success of 5318.91 'git fsck shows commit-graph output with --progress': 
-	git -C "$TRASH_DIRECTORY/full" fsck --progress 2>err &&
-	grep "Verifying commits in commit graph" err
+expecting success of 5329.23 'cruft repack with --max-pack-size': 
+	git init max-pack-size &&
+	(
+		cd max-pack-size &&
+		test_commit base &&
 
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-Verifying commits in commit graph:  11% (1/9)
Verifying commits in commit graph:  22% (2/9)
Verifying commits in commit graph:  33% (3/9)
Verifying commits in commit graph:  44% (4/9)
Verifying commits in commit graph:  55% (5/9)
Verifying commits in commit graph:  66% (6/9)
Verifying commits in commit graph:  77% (7/9)
Verifying commits in commit graph:  88% (8/9)
Verifying commits in commit graph: 100% (9/9)
Verifying commits in commit graph: 100% (9/9), done.
-ok 91 - git fsck shows commit-graph output with --progress
+		# two cruft objects which exceed the maximum pack size
+		foo=$(write_blob foo 1048576) &&
+		bar=$(write_blob bar 1048576) &&
+		test-tool chmtime --get -1000 \
+			"$objdir/$(test_oid_to_path $foo)" >foo.mtime &&
+		test-tool chmtime --get -2000 \
+			"$objdir/$(test_oid_to_path $bar)" >bar.mtime &&
+		git repack --cruft --max-pack-size=1M &&
+		find $packdir -name "*.mtimes" >cruft &&
+		test_line_count = 2 cruft &&
 
-expecting success of 5318.92 'git fsck suppresses commit-graph output with --no-progress': 
-	git -C "$TRASH_DIRECTORY/full" fsck --no-progress 2>err &&
-	! grep "Verifying commits in commit graph" err
+		foo_mtimes="$(basename $(find_pack $foo) .idx).mtimes" &&
+		bar_mtimes="$(basename $(find_pack $bar) .idx).mtimes" &&
+		test-tool pack-mtimes $foo_mtimes >foo.actual &&
+		test-tool pack-mtimes $bar_mtimes >bar.actual &&
 
-dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
-dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
-ok 92 - git fsck suppresses commit-graph output with --no-progress
+		echo "$foo $(cat foo.mtime)" >foo.expect &&
+		echo "$bar $(cat bar.mtime)" >bar.expect &&
 
-expecting success of 5318.93 'setup non-the_repository tests': 
-	rm -rf repo &&
-	git init repo &&
-	test_commit -C repo one &&
-	test_commit -C repo two &&
-	git -C repo config core.commitGraph true &&
-	git -C repo rev-parse two | \
-		git -C repo commit-graph write --stdin-commits
+		test_cmp foo.expect foo.actual &&
+		test_cmp bar.expect bar.actual &&
+		test "$foo_mtimes" != "$bar_mtimes"
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-[master (root-commit) ac97c8d] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 4ae1176] two
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/max-pack-size/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 93 - setup non-the_repository tests
+ create mode 100644 base.t
+ok 23 - cruft repack with --max-pack-size
 
-expecting success of 5318.94 'parse_commit_in_graph works for non-the_repository': 
-	test-tool repository parse_commit_in_graph \
-		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
-	{
-		git -C repo log --pretty=format:"%ct " -1 &&
-		git -C repo rev-parse one
-	} >expect &&
-	test_cmp expect actual &&
+expecting success of 5329.24 'cruft repack with pack.packSizeLimit': 
+	(
+		cd max-pack-size &&
+		# repack everything back together to remove the existing cruft
+		# pack (but to keep its objects)
+		git repack -adk &&
+		git -c pack.packSizeLimit=1M repack --cruft &&
+		# ensure the same post condition is met when --max-pack-size
+		# would otherwise be inferred from the configuration
+		find $packdir -name "*.mtimes" >cruft &&
+		test_line_count = 2 cruft &&
+		for pack in $(cat cruft)
+		do
+			test-tool pack-mtimes "$(basename $pack)" >objects &&
+			test_line_count = 1 objects || return 1
+		done
+	)
 
-	test-tool repository parse_commit_in_graph \
-		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
-	git -C repo log --pretty="%ct" -1 one >expect &&
-	test_cmp expect actual
+ok 24 - cruft repack with pack.packSizeLimit
 
-ok 94 - parse_commit_in_graph works for non-the_repository
+expecting success of 5329.25 'cruft repack respects repack.cruftWindow': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-expecting success of 5318.95 'get_commit_tree_in_graph works for non-the_repository': 
-	test-tool repository get_commit_tree_in_graph \
-		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
-	git -C repo rev-parse two^{tree} >expect &&
-	test_cmp expect actual &&
+		test_commit base &&
 
-	test-tool repository get_commit_tree_in_graph \
-		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
-	git -C repo rev-parse one^{tree} >expect &&
-	test_cmp expect actual
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+		git -c pack.window=1 -c repack.cruftWindow=2 repack \
+		       --cruft --window=3 &&
 
-ok 95 - get_commit_tree_in_graph works for non-the_repository
+		grep "pack-objects.*--window=2.*--cruft" event.trace
+	)
 
-expecting success of 5318.96 'corrupt commit-graph write (broken parent)': 
-	rm -rf repo &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"child_start","sid":"20250317T132331.025454Z-H5c947e1c-P0031432f","thread":"main","time":"2025-03-17T13:23:31.042359Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-3228463-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20250317T132331.025454Z-H5c947e1c-P0031432f/20250317T132331.058250Z-H5c947e1c-P00314345","thread":"main","time":"2025-03-17T13:23:31.058314Z","file":"common-init.c","line":58,"t_abs":0.000244,"argv":["/build/reproducible-path/git-2.49.0+next.20250314/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-3228463-pack","--cruft","--honor-pack-keep","--non-empty"]}
+ok 25 - cruft repack respects repack.cruftWindow
+
+expecting success of 5329.26 'cruft repack respects --window by default': 
 	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
-		empty="$(git mktree </dev/null)" &&
-		cat >broken <<-EOF &&
-		tree $empty
-		parent $ZERO_OID
-		author whatever <whatever@example.com> 1234 -0000
-		committer whatever <whatever@example.com> 1234 -0000
 
-		broken commit
-		EOF
-		broken="$(git hash-object -w -t commit --literally broken)" &&
-		git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
-		test_must_fail git commit-graph write --stdin-commits \
-			<good 2>test_err &&
-		test_grep "unable to parse commit" test_err
+		test_commit base &&
+
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+		git -c pack.window=2 repack --cruft --window=3 &&
+
+		grep "pack-objects.*--window=3.*--cruft" event.trace
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-fatal: unable to parse commit 0000000000000000000000000000000000000000
-ok 96 - corrupt commit-graph write (broken parent)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"child_start","sid":"20250317T132331.302306Z-H5c947e1c-P0031441e","thread":"main","time":"2025-03-17T13:23:31.321320Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-3228702-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20250317T132331.302306Z-H5c947e1c-P0031441e/20250317T132331.338394Z-H5c947e1c-P00314453","thread":"main","time":"2025-03-17T13:23:31.338466Z","file":"common-init.c","line":58,"t_abs":0.000272,"argv":["/build/reproducible-path/git-2.49.0+next.20250314/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-3228702-pack","--cruft","--honor-pack-keep","--non-empty"]}
+ok 26 - cruft repack respects --window by default
 
-expecting success of 5318.97 'corrupt commit-graph write (missing tree)': 
-	rm -rf repo &&
+expecting success of 5329.27 'cruft repack respects --quiet': 
 	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
-		tree="$(git mktree </dev/null)" &&
-		cat >broken <<-EOF &&
-		parent $ZERO_OID
-		author whatever <whatever@example.com> 1234 -0000
-		committer whatever <whatever@example.com> 1234 -0000
 
-		broken commit
-		EOF
-		broken="$(git hash-object -w -t commit --literally broken)" &&
-		git commit-tree -p "$broken" -m "good" "$tree" >good &&
-		test_must_fail git commit-graph write --stdin-commits \
-			<good 2>test_err &&
-		test_grep "unable to parse commit" test_err
+		test_commit base &&
+		GIT_PROGRESS_DELAY=0 git repack --cruft --quiet 2>err &&
+		test_must_be_empty err
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-fatal: unable to parse commit 2b6f5e209fea0912fdff2d553964d7a56d9fd44d
-ok 97 - corrupt commit-graph write (missing tree)
-
-expecting success of 5318.98 'set up and verify repo with generation data overflow chunk': 
-	UNIX_EPOCH_ZERO="@0 +0000" &&
-	FUTURE_DATE="@2147483646 +0000" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 27 - cruft repack respects --quiet
 
+expecting success of 5329.28 'cruft --local drops unreachable objects': 
+	git init alternate &&
 	git init repo &&
+	test_when_finished "rm -fr alternate repo" &&
+
+	test_commit -C alternate base &&
+	# Pack all objects in alternate so that the cruft repack in "repo" sees
+	# the object it dropped due to `--local` as packed. Otherwise this
+	# object would not appear packed anywhere (since it is not packed in
+	# alternate and likewise not part of the cruft pack in the other repo
+	# because of `--local`).
+	git -C alternate repack -ad &&
+
 	(
 		cd repo &&
 
-		test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
-		test_commit 2 &&
-		test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
-		git commit-graph write --reachable &&
-		graph_read_expect 3 generation_data &&
-		test_commit --date "$FUTURE_DATE" 4 &&
-		test_commit 5 &&
-		test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
-		git branch left &&
-		git reset --hard 3 &&
-		test_commit 7 &&
-		test_commit --date "$FUTURE_DATE" 8 &&
-		test_commit 9 &&
-		git branch right &&
-		git reset --hard 3 &&
-		test_merge M left right &&
-		git commit-graph write --reachable &&
-		graph_read_expect 10 "generation_data generation_data_overflow" &&
-		git commit-graph verify
+		object="$(git -C ../alternate rev-parse HEAD:base.t)" &&
+		git -C ../alternate cat-file -p $object >contents &&
+
+		# Write some reachable objects and two unreachable ones: one
+		# that the alternate has and another that is unique.
+		test_commit other &&
+		git hash-object -w -t blob contents &&
+		cruft="$(echo cruft | git hash-object -w -t blob --stdin)" &&
+
+		( cd ../alternate/.git/objects && pwd ) \
+		       >.git/objects/info/alternates &&
+
+		test_path_is_file $objdir/$(test_oid_to_path $cruft) &&
+		test_path_is_file $objdir/$(test_oid_to_path $object) &&
+
+		git repack -d --cruft --local &&
+
+		test-tool pack-mtimes "$(basename $(ls $packdir/pack-*.mtimes))" \
+		       >objects &&
+		! grep $object objects &&
+		grep $cruft objects
 	)
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-[master (root-commit) 0131a52] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 4f95b2b] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master cc847a9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master 9e173a3] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master cab57f8] 5
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/alternate/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[master bbde0d8] 6
+ create mode 100644 base.t
+[master (root-commit) 5e824fb] other
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 6.t
-HEAD is now at cc847a9 3
-[master ba5c16d] 7
+ create mode 100644 other.t
+df967b96a579e45a18b8251732d16804b2e56a55
+822216280fd1de308f55f27cdd7a4196a8f5a189 1742217812
+ok 28 - cruft --local drops unreachable objects
+
+expecting success of 5329.29 'MIDX bitmaps tolerate reachable cruft objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit reachable &&
+		test_commit cruft &&
+		unreachable="$(git rev-parse cruft)" &&
+
+		git reset --hard $unreachable^ &&
+		git tag -d cruft &&
+		git reflog expire --all --expire=all &&
+
+		git repack --cruft -d &&
+
+		# resurrect the unreachable object via a new commit. the
+		# new commit will get selected for a bitmap, but be
+		# missing one of its parents from the selected packs.
+		git reset --hard $unreachable &&
+		test_commit resurrect &&
+
+		git repack --write-midx --write-bitmap-index --geometric=2 -d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 493cdad] reachable
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master 1aff441] 8
+ create mode 100644 reachable.t
+[master 40cbb3e] cruft
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 1ec2f73] 9
+ create mode 100644 cruft.t
+HEAD is now at 493cdad reachable
+Deleted tag 'cruft' (was 40cbb3e)
+HEAD is now at 40cbb3e cruft
+[master 8ec3079] resurrect
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 9.t
-HEAD is now at cc847a9 3
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- 4.t | 1 +
- 5.t | 1 +
- 6.t | 1 +
- 7.t | 1 +
- 8.t | 1 +
- 9.t | 1 +
- 6 files changed, 6 insertions(+)
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
- create mode 100644 9.t
-ok 98 - set up and verify repo with generation data overflow chunk
-
-expecting success of 5318.99 'check normal git operations: generation data overflow chunk repo': 
-		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
-		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
-		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
-	
-ok 99 - check normal git operations: generation data overflow chunk repo
+ create mode 100644 resurrect.t
+ok 29 - MIDX bitmaps tolerate reachable cruft objects
 
-expecting success of 5318.100 'overflow during generation version upgrade': 
-	git init overflow-v2-upgrade &&
+expecting success of 5329.30 'cruft objects are freshend via loose': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
-		cd overflow-v2-upgrade &&
+		cd repo &&
 
-		# This commit will have a date at two seconds past the Epoch,
-		# and a (v1) generation number of 1, since it is a root commit.
-		#
-		# The offset will then be computed as 1-2, which will underflow
-		# to 2^31, which is greater than the v2 offset small limit of
-		# 2^31-1.
-		#
-		# This is sufficient to need a large offset table for the v2
-		# generation numbers.
-		test_commit --date "@2 +0000" base &&
-		git repack -d &&
+		echo "cruft" >contents &&
+		blob="$(git hash-object -w -t blob contents)" &&
+		loose="$objdir/$(test_oid_to_path $blob)" &&
 
-		# Test that upgrading from generation v1 to v2 correctly
-		# produces the overflow table.
-		git -c commitGraph.generationVersion=1 commit-graph write &&
-		git -c commitGraph.generationVersion=2 commit-graph write \
-			--changed-paths &&
+		test_commit base &&
 
-		git rev-list --all
+		git repack --cruft -d &&
+
+		test_path_is_missing "$loose" &&
+		test-tool pack-mtimes "$(basename "$(ls $packdir/pack-*.mtimes)")" >cruft &&
+		grep "$blob" cruft &&
+
+		# write the same object again
+		git hash-object -w -t blob contents &&
+
+		test_path_is_file "$loose"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/overflow-v2-upgrade/.git/
-[master (root-commit) b89bafe] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 369f281] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-b89bafebd219ef84734f57391e155dcedaccac5c
-ok 100 - overflow during generation version upgrade
+822216280fd1de308f55f27cdd7a4196a8f5a189 1742217813
+822216280fd1de308f55f27cdd7a4196a8f5a189
+ok 30 - cruft objects are freshend via loose
 
-expecting success of 5318.101 'reader notices too-small oid fanout chunk': 
-	# make it big enough that the graph file is plausible,
-	# otherwise we hit an earlier check
-	check_corrupt_chunk OIDF clear $(printf "000000%02x" $(test_seq 250)) &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph oid fanout chunk is wrong size
-	error: commit-graph required OID fanout chunk missing or corrupted
-	EOF
-	test_cmp expect.err err
+expecting success of 5329.31 'gc.recentObjectsHook': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-ok 101 - reader notices too-small oid fanout chunk
+		# Create a handful of objects.
+		#
+		#   - one reachable commit, "base", designated for the reachable
+		#     pack
+		#   - one unreachable commit, "cruft.discard", which is marked
+		#     for deletion
+		#   - one unreachable commit, "cruft.old", which would be marked
+		#     for deletion, but is rescued as an extra cruft tip
+		#   - one unreachable commit, "cruft.new", which is not marked
+		#     for deletion
+		test_commit base &&
+		git branch -M main &&
 
-expecting success of 5318.102 'reader notices fanout/lookup table mismatch': 
-	check_corrupt_chunk OIDF 1020 "FFFFFFFF" &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph OID lookup chunk is the wrong size
-	error: commit-graph required OID lookup chunk missing or corrupted
-	EOF
-	test_cmp expect.err err
+		git checkout --orphan discard &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.discard &&
 
-ok 102 - reader notices fanout/lookup table mismatch
+		git checkout --orphan old &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.old &&
+		cruft_old="$(git rev-parse HEAD)" &&
 
-expecting success of 5318.103 'reader notices out-of-bounds fanout': 
-	# Rather than try to corrupt a specific hash, we will just
-	# wreck them all. But we cannot just set them all to 0xFFFFFFFF or
-	# similar, as they are used for hi/lo starts in a binary search (so if
-	# they are identical, that indicates that the search should abort
-	# immediately). Instead, we will give them high values that differ by
-	# 2^24, ensuring that any that are used would cause an out-of-bounds
-	# read.
-	check_corrupt_chunk OIDF 0 $(printf "%02x000000" $(test_seq 0 254)) &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph fanout values out of order
-	error: commit-graph required OID fanout chunk missing or corrupted
-	EOF
-	test_cmp expect.err err
+		git checkout --orphan new &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.new &&
+		cruft_new="$(git rev-parse HEAD)" &&
 
-ok 103 - reader notices out-of-bounds fanout
+		git checkout main &&
+		git branch -D discard old new &&
+		git reflog expire --all --expire=all &&
 
-expecting success of 5318.104 'reader notices too-small commit data chunk': 
-	check_corrupt_chunk CDAT clear 00000000 &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph commit data chunk is wrong size
-	error: commit-graph required commit data chunk missing or corrupted
-	EOF
-	test_cmp expect.err err
+		# mark cruft.old with an mtime that is many minutes
+		# older than the expiration period, and mark cruft.new
+		# with an mtime that is in the future (and thus not
+		# eligible for pruning).
+		test-tool chmtime -2000 "$objdir/$(test_oid_to_path $cruft_old)" &&
+		test-tool chmtime +1000 "$objdir/$(test_oid_to_path $cruft_new)" &&
 
-ok 104 - reader notices too-small commit data chunk
+		# Write the list of cruft objects we expect to
+		# accumulate, which is comprised of everything reachable
+		# from cruft.old and cruft.new, but not cruft.discard.
+		git rev-list --objects --no-object-names \
+			$cruft_old $cruft_new >cruft.raw &&
+		sort cruft.raw >cruft.expect &&
 
-expecting success of 5318.105 'reader notices out-of-bounds extra edge': 
-	check_corrupt_chunk EDGE clear &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph extra-edges pointer out of bounds
-	EOF
-	test_cmp expect.err err
+		# Write the script to list extra tips, which are limited
+		# to cruft.old, in this case.
+		write_script extra-tips <<-EOF &&
+		echo $cruft_old
+		EOF
+		git config gc.recentObjectsHook ./extra-tips &&
 
-ok 105 - reader notices out-of-bounds extra edge
+		git repack --cruft --cruft-expiration=now -d &&
 
-expecting success of 5318.106 'reader notices too-small generations chunk': 
-	check_corrupt_chunk GDA2 clear 00000000 &&
-	cat >expect.err <<-\EOF &&
-	error: commit-graph generations chunk is wrong size
-	EOF
-	test_cmp expect.err err
+		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
+		git show-index <${mtimes%.mtimes}.idx >cruft &&
+		cut -d" " -f2 cruft | sort >cruft.actual &&
+		test_cmp cruft.expect cruft.actual &&
 
-ok 106 - reader notices too-small generations chunk
+		# Ensure that the "old" objects are removed after
+		# dropping the gc.recentObjectsHook hook.
+		git config --unset gc.recentObjectsHook &&
+		git repack --cruft --cruft-expiration=now -d &&
 
-expecting success of 5318.107 'stale commit cannot be parsed when given directly': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-		test_commit A &&
-		test_commit B &&
-		git commit-graph write --reachable &&
+		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
+		git show-index <${mtimes%.mtimes}.idx >cruft &&
+		cut -d" " -f2 cruft | sort >cruft.actual &&
 
-		oid=$(git rev-parse B) &&
-		rm .git/objects/"$(test_oid_to_path "$oid")" &&
+		git rev-list --objects --no-object-names $cruft_new >cruft.raw &&
+		cp cruft.expect cruft.old &&
+		sort cruft.raw >cruft.expect &&
+		test_cmp cruft.expect cruft.actual &&
 
-		# Verify that it is possible to read the commit from the
-		# commit graph when not being paranoid, ...
-		git rev-list B &&
-		# ... but parsing the commit when double checking that
-		# it actually exists in the object database should fail.
-		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git rev-list -1 B
+		# ensure objects which are no longer in the cruft pack were
+		# removed from the repository
+		for object in $(comm -13 cruft.expect cruft.old)
+		do
+			test_must_fail git cat-file -t $object || return 1
+		done
 	)
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-[master ec9b0a6] A
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 369f281] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 4ce4c2d] B
+ create mode 100644 base.t
+Switched to a new branch 'discard'
+rm 'base.t'
+[discard (root-commit) 940beaa] cruft.discard
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-4ce4c2dd91e9274c0280f34899910be5280a212f
-ec9b0a6026410c76ea802a28c63306cae515d79c
-e232eea4162ac4a150df853660fe559b8f4c18a8
-1ec2f738fee7d641d5af591c8e66c54adf3125b2
-1aff441de16d4d24b3a26f415c0aacc14333ed39
-ba5c16dea715f21dda4de1a30b8ecf43d7d781f8
-bbde0d8f331bdc35c673bbf48300cd03e910b970
-cab57f810cdcf4a0498303b4ec70930c86897754
-9e173a30fffe69dccc60ccd93ebe58e2a34b0a58
-cc847a9bf65c437ae1ac983dc2dd6762256273b0
-4f95b2b0d79c5304fc4a714ae540929c9b303383
-0131a52e860a1b5c28428087ba172f3116f34c9c
-fatal: bad object B
-ok 107 - stale commit cannot be parsed when given directly
+ create mode 100644 cruft.discard.t
+Switched to a new branch 'old'
+rm 'cruft.discard.t'
+[old (root-commit) 8b04162] cruft.old
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.old.t
+Switched to a new branch 'new'
+rm 'cruft.old.t'
+[new (root-commit) 5fdf92f] cruft.new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.new.t
+Switched to branch 'main'
+Deleted branch discard (was 940beaa).
+Deleted branch old (was 8b04162).
+Deleted branch new (was 5fdf92f).
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+fatal: git cat-file: could not get object info
+ok 31 - gc.recentObjectsHook
 
-expecting success of 5318.108 'stale commit cannot be parsed when traversing graph': 
-	test_when_finished "rm -rf repo" &&
+expecting success of 5329.32 'multi-valued gc.recentObjectsHook': 
 	git init repo &&
+	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
-		git commit-graph write --reachable &&
+		test_commit base &&
+		git branch -M main &&
 
-		# Corrupt the repository by deleting the intermediate commit
-		# object. Commands should notice that this object is absent and
-		# thus that the repository is corrupt even if the commit graph
-		# exists.
-		oid=$(git rev-parse B) &&
-		rm .git/objects/"$(test_oid_to_path "$oid")" &&
+		git checkout --orphan cruft.a &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.a &&
+		cruft_a="$(git rev-parse HEAD)" &&
 
-		# Again, we should be able to parse the commit when not
-		# being paranoid about commit graph staleness...
-		git rev-parse HEAD~2 &&
-		# ... but fail when we are paranoid.
-		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git rev-parse HEAD~2 2>error &&
-		grep "error: commit $oid exists in commit-graph but not in the object database" error
+		git checkout --orphan cruft.b &&
+		git rm -fr . &&
+		test_commit --no-tag cruft.b &&
+		cruft_b="$(git rev-parse HEAD)" &&
+
+		git checkout main &&
+		git branch -D cruft.a cruft.b &&
+		git reflog expire --all --expire=all &&
+
+		echo "echo $cruft_a" | write_script extra-tips.a &&
+		echo "echo $cruft_b" | write_script extra-tips.b &&
+		echo "false" | write_script extra-tips.c &&
+
+		git rev-list --objects --no-object-names $cruft_a $cruft_b \
+			>cruft.raw &&
+		sort cruft.raw >cruft.expect &&
+
+		# ensure that each extra cruft tip is saved by its
+		# respective hook
+		git config --add gc.recentObjectsHook ./extra-tips.a &&
+		git config --add gc.recentObjectsHook ./extra-tips.b &&
+		git repack --cruft --cruft-expiration=now -d &&
+
+		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
+		git show-index <${mtimes%.mtimes}.idx >cruft &&
+		cut -d" " -f2 cruft | sort >cruft.actual &&
+		test_cmp cruft.expect cruft.actual &&
+
+		# ensure that a dirty exit halts cruft pack generation
+		git config --add gc.recentObjectsHook ./extra-tips.c &&
+		test_must_fail git repack --cruft --cruft-expiration=now -d 2>err &&
+		grep "unable to enumerate additional recent objects" err &&
+
+		# and that the existing cruft pack is left alone
+		test_path_is_file "$mtimes"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
-[master (root-commit) 3c1b37b] A
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 369f281] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master f3c5d37] B
+ create mode 100644 base.t
+Switched to a new branch 'cruft.a'
+rm 'base.t'
+[cruft.a (root-commit) 66c55c9] cruft.a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 6bb8ed6] C
+ create mode 100644 cruft.a.t
+Switched to a new branch 'cruft.b'
+rm 'cruft.a.t'
+[cruft.b (root-commit) 8ed764a] cruft.b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-3c1b37b341cf4e11f66c3e51699199663d78f843
-HEAD~2
-error: commit f3c5d3779f8e819fef7add26e472597097053fd4 exists in commit-graph but not in the object database
-error: commit f3c5d3779f8e819fef7add26e472597097053fd4 exists in commit-graph but not in the object database
-ok 108 - stale commit cannot be parsed when traversing graph
+ create mode 100644 cruft.b.t
+Switched to branch 'main'
+Deleted branch cruft.a (was 66c55c9).
+Deleted branch cruft.b (was 8ed764a).
+fatal: unable to enumerate additional recent objects
+ok 32 - multi-valued gc.recentObjectsHook
 
-# passed all 108 test(s)
-1..108
+expecting success of 5329.33 'additional cruft blobs via gc.recentObjectsHook': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit base &&
+
+		blob=$(echo "unreachable" | git hash-object -w --stdin) &&
+
+		# mark the unreachable blob we wrote above as having
+		# aged out of the retention period
+		test-tool chmtime -2000 "$objdir/$(test_oid_to_path $blob)" &&
+
+		# Write the script to list extra tips, which is just the
+		# extra blob as above.
+		write_script extra-tips <<-EOF &&
+		echo $blob
+		EOF
+		git config gc.recentObjectsHook ./extra-tips &&
+
+		git repack --cruft --cruft-expiration=now -d &&
+
+		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
+		git show-index <${mtimes%.mtimes}.idx >cruft &&
+		cut -d" " -f2 cruft >actual &&
+		echo $blob >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
+[master (root-commit) 369f281] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 33 - additional cruft blobs via gc.recentObjectsHook
+
+# passed all 33 test(s)
+1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5404-tracking-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.git/
-expecting success of 5404.1 'setup': 
+*** t5406-remote-rejects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5406-remote-rejects/.git/
+expecting success of 5406.1 'setup': 
+	test_hook update <<-\EOF &&
+	exit 1
+	EOF
 	echo 1 >file &&
 	git add file &&
 	git commit -m 1 &&
-	git branch b1 &&
-	git branch b2 &&
-	git branch b3 &&
-	git clone . aa &&
-	git checkout b1 &&
-	echo b1 >>file &&
-	git commit -a -m b1 &&
-	git checkout b2 &&
-	echo b2 >>file &&
-	git commit -a -m b2
+	git clone . child &&
+	cd child &&
+	echo 2 >file &&
+	git commit -a -m 2
 
-[main (root-commit) c663a66] 1
+[master (root-commit) c663a66] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-Cloning into 'aa'...
+Cloning into 'child'...
 done.
-Switched to branch 'b1'
-[b1 30569e6] b1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'b2'
-[b2 f149455] b2
+[master ee88fdb] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 5404.2 'prepare pushable branches': 
-	cd aa &&
-	b1=$(git rev-parse origin/b1) &&
-	b2=$(git rev-parse origin/b2) &&
-	git checkout -b b1 origin/b1 &&
-	echo aa-b1 >>file &&
-	git commit -a -m aa-b1 &&
-	git checkout -b b2 origin/b2 &&
-	echo aa-b2 >>file &&
-	git commit -a -m aa-b2 &&
-	git checkout main &&
-	echo aa-main >>file &&
-	git commit -a -m aa-main
+expecting success of 5406.2 'push reports error': test_must_fail git push 2>stderr
+ok 2 - push reports error
 
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/b1'.
-[b1 568053f] aa-b1
+expecting success of 5406.3 'individual ref reports error': grep rejected stderr
+ ! [remote rejected] master -> master (branch is currently checked out)
+ok 3 - individual ref reports error
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5403-post-checkout-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5403-post-checkout-hook/.git/
+expecting success of 5403.1 'setup': 
+	test_hook --setup post-checkout <<-\EOF &&
+	echo "$@" >.git/post-checkout.args
+	EOF
+	test_commit one &&
+	test_commit two &&
+	test_commit rebase-on-me &&
+	git reset --hard HEAD^ &&
+	test_commit three
+
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/b2'.
-[b2 4441e28] aa-b2
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Your branch is up to date with 'origin/main'.
-[main 5f550d5] aa-main
+ create mode 100644 two.t
+[main a193130] rebase-on-me
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 2 - prepare pushable branches
+ create mode 100644 rebase-on-me.t
+HEAD is now at 139b20d two
+[main a6f6257] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 1 - setup
 
-expecting success of 5404.3 'mixed-success push returns error': 
-	test_must_fail git push origin :
+expecting success of 5403.2 'post-checkout receives the right arguments with HEAD unchanged ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout main &&
+	read old new flag <.git/post-checkout.args &&
+	test $old = $new && test $flag = 1
 
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.
-   c663a66..5f550d5  main -> main
- ! [rejected]        b1 -> b1 (fetch first)
- ! [rejected]        b2 -> b2 (fetch first)
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.'
-hint: Updates were rejected because the remote contains work that you do not
-hint: have locally. This is usually caused by another repository pushing to
-hint: the same ref. If you want to integrate the remote changes, use
-hint: 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-ok 3 - mixed-success push returns error
+Already on 'main'
+ok 2 - post-checkout receives the right arguments with HEAD unchanged 
 
-expecting success of 5404.4 'check tracking branches updated correctly after push': 
-	test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
+expecting success of 5403.3 'post-checkout args are correct with git checkout -b ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout -b new1 &&
+	read old new flag <.git/post-checkout.args &&
+	test $old = $new && test $flag = 1
 
-ok 4 - check tracking branches updated correctly after push
+Switched to a new branch 'new1'
+ok 3 - post-checkout args are correct with git checkout -b 
 
-expecting success of 5404.5 'check tracking branches not updated for failed refs': 
-	test "$(git rev-parse origin/b1)" = "$b1" &&
-	test "$(git rev-parse origin/b2)" = "$b2"
+expecting success of 5403.4 'post-checkout receives the right args with HEAD changed ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout two &&
+	read old new flag <.git/post-checkout.args &&
+	test $old != $new && test $flag = 1
 
-ok 5 - check tracking branches not updated for failed refs
+Note: switching to 'two'.
 
-expecting success of 5404.6 'deleted branches have their tracking branches removed': 
-	git push origin :b1 &&
-	test "$(git rev-parse origin/b1)" = "origin/b1"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5404-tracking-branches/.
- - [deleted]         b1
-fatal: ambiguous argument 'origin/b1': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 6 - deleted branches have their tracking branches removed
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 5404.7 'already deleted tracking branches ignored': 
-	git branch -d -r origin/b3 &&
-	git push origin :b3 >output 2>&1 &&
-	! grep "^error: " output
+  git switch -c <new-branch-name>
 
-Deleted remote-tracking branch origin/b3 (was c663a66).
-ok 7 - already deleted tracking branches ignored
+Or undo this operation with:
 
-# passed all 7 test(s)
-1..7
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 139b20d two
+ok 4 - post-checkout receives the right args with HEAD changed 
+
+expecting success of 5403.5 'post-checkout receives the right args when not switching branches ': 
+	test_when_finished "rm -f .git/post-checkout.args" &&
+	git checkout main -- three.t &&
+	read old new flag <.git/post-checkout.args &&
+	test $old = $new && test $flag = 0
+
+ok 5 - post-checkout receives the right args when not switching branches 
+
+expecting success of 5403.6 'post-checkout is triggered on rebase --apply': 
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B rebase-test main &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev main $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	
+Previous HEAD position was 139b20d two
+Switched to a new branch 'rebase-test'
+First, rewinding head to replay your work on top of it...
+Applying: three
+ok 6 - post-checkout is triggered on rebase --apply
+
+expecting success of 5403.7 'post-checkout is triggered on rebase --apply with fast-forward': 
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B ff-rebase-test rebase-on-me^ &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev rebase-on-me^ $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	
+Switched to a new branch 'ff-rebase-test'
+First, rewinding head to replay your work on top of it...
+Fast-forwarded ff-rebase-test to rebase-on-me.
+ok 7 - post-checkout is triggered on rebase --apply with fast-forward
+
+expecting success of 5403.8 'rebase --apply fast-forward branch checkout runs post-checkout hook': 
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two  &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args HEAD rebase-fast-forward  &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev two $old &&
+		test_cmp_rev three $new &&
+		test $flag = 1
+	
+Note: switching to 'two'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 139b20d two
+Current branch rebase-fast-forward is up to date.
+fatal: no rebase in progress
+ok 8 - rebase --apply fast-forward branch checkout runs post-checkout hook
+
+expecting success of 5403.9 'rebase --apply checkout does not remove untracked files': 
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two &&
+		rm -f .git/post-checkout.args &&
+		echo untracked >three.t &&
+		test_when_finished "rm three.t" &&
+		test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
+		grep "untracked working tree files would be overwritten by checkout" err &&
+		test_path_is_missing .git/post-checkout.args
+
+
+Note: switching to 'two'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 139b20d two
+error: The following untracked working tree files would be overwritten by checkout:
+fatal: no rebase in progress
+ok 9 - rebase --apply checkout does not remove untracked files
+
+expecting success of 5403.10 'post-checkout is triggered on rebase --merge': 
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B rebase-test main &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev main $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	
+Previous HEAD position was 139b20d two
+Switched to and reset branch 'rebase-test'
+Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-test.
+ok 10 - post-checkout is triggered on rebase --merge
+
+expecting success of 5403.11 'post-checkout is triggered on rebase --merge with fast-forward': 
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git checkout -B ff-rebase-test rebase-on-me^ &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args rebase-on-me &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev rebase-on-me^ $old &&
+		test_cmp_rev rebase-on-me $new &&
+		test $flag = 1
+	
+Switched to and reset branch 'ff-rebase-test'
+Successfully rebased and updated refs/heads/ff-rebase-test.
+ok 11 - post-checkout is triggered on rebase --merge with fast-forward
+
+expecting success of 5403.12 'rebase --merge fast-forward branch checkout runs post-checkout hook': 
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two  &&
+		rm -f .git/post-checkout.args &&
+		git rebase $args HEAD rebase-fast-forward  &&
+		read old new flag <.git/post-checkout.args &&
+		test_cmp_rev two $old &&
+		test_cmp_rev three $new &&
+		test $flag = 1
+	
+Note: switching to 'two'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 139b20d two
+Current branch rebase-fast-forward is up to date.
+fatal: no rebase in progress
+ok 12 - rebase --merge fast-forward branch checkout runs post-checkout hook
+
+expecting success of 5403.13 'rebase --merge checkout does not remove untracked files': 
+		test_when_finished "test_might_fail git rebase --abort" &&
+		test_when_finished "rm -f .git/post-checkout.args" &&
+		git update-ref refs/heads/rebase-fast-forward three &&
+		git checkout two &&
+		rm -f .git/post-checkout.args &&
+		echo untracked >three.t &&
+		test_when_finished "rm three.t" &&
+		test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
+		grep "untracked working tree files would be overwritten by checkout" err &&
+		test_path_is_missing .git/post-checkout.args
+
+
+Note: switching to 'two'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 139b20d two
+error: The following untracked working tree files would be overwritten by checkout:
+fatal: no rebase in progress
+ok 13 - rebase --merge checkout does not remove untracked files
+
+expecting success of 5403.14 'post-checkout hook is triggered by clone': 
+	mkdir -p templates/hooks &&
+	write_script templates/hooks/post-checkout <<-\EOF &&
+	echo "$@" >"$GIT_DIR/post-checkout.args"
+	EOF
+	git clone --template=templates . clone3 &&
+	test -f clone3/.git/post-checkout.args
+
+Cloning into 'clone3'...
+done.
+Note: switching to '139b20d8e6c5b496de61f033f642d0e3dbff528d'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+ok 14 - post-checkout hook is triggered by clone
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5319-multi-pack-index.sh ***
@@ -312880,7 +312999,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.828e-05 s, 26.1 kB/s
+1 byte copied, 3.32e-05 s, 30.1 kB/s
 fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
 ok 31 - verify bad signature
 
@@ -312890,7 +313009,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00409916 s, 0.2 kB/s
+1 byte copied, 0.00708017 s, 0.1 kB/s
 fatal: multi-pack-index version 0 not recognized
 ok 32 - verify bad version
 
@@ -312900,7 +313019,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00027832 s, 3.6 kB/s
+1 byte copied, 0.0136562 s, 0.1 kB/s
 error: multi-pack-index hash version 3 does not match version 1
 ok 33 - verify bad OID version
 
@@ -312910,7 +313029,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.152e-05 s, 24.1 kB/s
+1 byte copied, 3.4361e-05 s, 29.1 kB/s
 error: final chunk has non-zero id 4f494446
 ok 34 - verify truncated chunk count
 
@@ -312920,7 +313039,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00363076 s, 0.3 kB/s
+1 byte copied, 0.000470643 s, 2.1 kB/s
 error: terminating chunk id appears earlier than expected
 ok 35 - verify extended chunk count
 
@@ -312930,7 +313049,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.04e-05 s, 24.8 kB/s
+1 byte copied, 0.0187796 s, 0.1 kB/s
 fatal: multi-pack-index required pack-name chunk missing or corrupted
 ok 36 - verify missing required chunk
 
@@ -312940,7 +313059,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00722268 s, 0.1 kB/s
+1 byte copied, 3.536e-05 s, 28.3 kB/s
 error: improper chunk offset(s) 100000000000048 and 2d4
 ok 37 - verify invalid chunk offset
 
@@ -312950,7 +313069,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00365004 s, 0.3 kB/s
+1 byte copied, 4.024e-05 s, 24.9 kB/s
 fatal: multi-pack-index pack names out of order: 'tezt-2-0994129a102d56705c119b91822cbd6ef1599f8f.idx' before 'test-a10c8cef352773b1f1b38ecc868f417f3d6029c9.idx'
 ok 38 - verify packnames out of order
 
@@ -312960,7 +313079,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0002946 s, 3.4 kB/s
+1 byte copied, 0.0149347 s, 0.1 kB/s
 failed to load pack in position 0
 failed to load pack entry for oid[41] = 8f94df605db2ec0d0bb7962abbc87d8d1b2f6f00
 ok 39 - verify packnames out of order
@@ -312971,7 +313090,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.752e-05 s, 26.7 kB/s
+1 byte copied, 0.00776625 s, 0.1 kB/s
 error: oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
 ok 40 - verify oid fanout out of order
 
@@ -312981,7 +313100,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.908e-05 s, 25.6 kB/s
+1 byte copied, 0.000603924 s, 1.7 kB/s
 oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
 ok 41 - verify oid lookup out of order
 
@@ -312991,7 +313110,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.0115741 s, 0.1 kB/s
+1 byte copied, 0.00653504 s, 0.2 kB/s
 fatal: bad pack-int-id: 1797 (12 total packs)
 ok 42 - verify incorrect pack-int-id
 
@@ -313001,7 +313120,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.768e-05 s, 26.5 kB/s
+1 byte copied, 3.7561e-05 s, 26.6 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 ok 43 - verify incorrect offset
 
@@ -313015,7 +313134,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.168e-05 s, 24.0 kB/s
+1 byte copied, 4.0161e-05 s, 24.9 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 incorrect checksum
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
@@ -313046,7 +313165,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 0.00310824 s, 0.3 kB/s
+1 byte copied, 0.000464803 s, 2.2 kB/s
 incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
 warning: ignoring existing multi-pack-index; checksum mismatch
 ok 47 - corrupt MIDX is not reused
@@ -313059,7 +313178,7 @@
 
 10+0 records in
 10+0 records out
-10 bytes copied, 0.0073132 s, 1.4 kB/s
+10 bytes copied, 4.7121e-05 s, 212 kB/s
 incorrect checksum
 ok 48 - verify incorrect checksum
 
@@ -313145,21 +313264,21 @@
  1 file changed, 1 insertion(+)
  create mode 100644 4.t
 total 44
-drwxr-xr-x 2 pbuilder1 pbuilder1  300 Apr 19 19:20 .
-drwxr-xr-x 4 pbuilder1 pbuilder1   80 Apr 19 19:20 ..
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Apr 19 19:20 multi-pack-index
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Apr 19 19:20 multi-pack-index.bak
--r--r--r-- 1 pbuilder1 pbuilder1 1072 Apr 19 19:20 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Apr 19 19:20 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
--r--r--r-- 1 pbuilder1 pbuilder1   32 Apr 19 19:20 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
--r--r--r-- 1 pbuilder1 pbuilder1   52 Apr 19 19:20 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1156 Apr 19 19:20 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Apr 19 19:20 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
--r--r--r-- 1 pbuilder1 pbuilder1  211 Apr 19 19:20 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
--r--r--r-- 1 pbuilder1 pbuilder1   64 Apr 19 19:20 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Apr 19 19:20 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
--r--r--r-- 1 pbuilder1 pbuilder1  676 Apr 19 19:20 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Apr 19 19:20 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
+drwxr-xr-x 2 pbuilder2 pbuilder2  300 Mar 17 13:23 .
+drwxr-xr-x 4 pbuilder2 pbuilder2   80 Mar 17 13:23 ..
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Mar 17 13:23 multi-pack-index
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Mar 17 13:23 multi-pack-index.bak
+-r--r--r-- 1 pbuilder2 pbuilder2 1072 Mar 17 13:23 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Mar 17 13:23 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
+-r--r--r-- 1 pbuilder2 pbuilder2   32 Mar 17 13:23 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   52 Mar 17 13:23 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1156 Mar 17 13:23 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Mar 17 13:23 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
+-r--r--r-- 1 pbuilder2 pbuilder2  211 Mar 17 13:23 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   64 Mar 17 13:23 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Mar 17 13:23 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  676 Mar 17 13:23 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Mar 17 13:23 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
 ok 53 - repack preserves multi-pack-index when creating packs
 
 expecting success of 5319.54 'check normal git operations: after repack': 
@@ -313267,7 +313386,7 @@
 HEAD is now at 287f5d9
 1+0 records in
 1+0 records out
-1 byte copied, 3.484e-05 s, 28.7 kB/s
+1 byte copied, 3.5841e-05 s, 27.9 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5319-multi-pack-index/repo/.git/
 ok 60 - force some 64-bit offsets with pack-objects
 
@@ -313282,7 +313401,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.432e-05 s, 29.1 kB/s
+1 byte copied, 3.552e-05 s, 28.2 kB/s
 incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70c91 != c91
 ok 62 - verify incorrect 64-bit offset
 
@@ -313658,12 +313777,12 @@
 		test_line_count = 4 midx-list
 	)
 
--r--r--r-- 1 pbuilder1 pbuilder1 1173 Apr 19 19:20 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
--r--r--r-- 1 pbuilder1 pbuilder1 2239 Apr 19 19:20 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
--r--r--r-- 1 pbuilder1 pbuilder1 1385 Apr 19 19:20 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
--r--r--r-- 1 pbuilder1 pbuilder1  838 Apr 19 19:20 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
--r--r--r-- 1 pbuilder1 pbuilder1  560 Apr 19 19:20 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
--r--r--r-- 1 pbuilder1 pbuilder1 4587 Apr 19 19:20 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1173 Mar 17 13:23 .git/objects/pack/pack-9f73b959cfe08e36fd7f07d25de6069c4ad20450.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 2239 Mar 17 13:23 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1385 Mar 17 13:23 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  838 Mar 17 13:23 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  560 Mar 17 13:23 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 4587 Mar 17 13:23 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
 ok 74 - expire removes repacked packs
 
 expecting success of 5319.75 'expire works when adding new packs': 
@@ -314178,1880 +314297,1714 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5403-post-checkout-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5403-post-checkout-hook/.git/
-expecting success of 5403.1 'setup': 
-	test_hook --setup post-checkout <<-\EOF &&
-	echo "$@" >.git/post-checkout.args
-	EOF
-	test_commit one &&
-	test_commit two &&
-	test_commit rebase-on-me &&
-	git reset --hard HEAD^ &&
-	test_commit three
+*** t5318-commit-graph.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/.git/
+expecting success of 5318.1 'usage': 
+	test_expect_code 129 git commit-graph write blah 2>err &&
+	test_expect_code 129 git commit-graph write verify
 
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main a193130] rebase-on-me
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 rebase-on-me.t
-HEAD is now at 139b20d two
-[main a6f6257] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup
+usage: git commit-graph write [--object-dir <dir>] [--append]
+                              [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits]
+                              [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]
+                              <split-options>
 
-expecting success of 5403.2 'post-checkout receives the right arguments with HEAD unchanged ': 
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout main &&
-	read old new flag <.git/post-checkout.args &&
-	test $old = $new && test $flag = 1
+    --[no-]object-dir <dir>
+                          the object directory to store the graph
+    --[no-]reachable      start walk at all refs
+    --[no-]stdin-packs    scan pack-indexes listed by stdin for commits
+    --[no-]stdin-commits  start walk at commits listed by stdin
+    --[no-]append         include all commits already in the commit-graph file
+    --[no-]changed-paths  enable computation for changed paths
+    --split[=...]         allow writing an incremental commit-graph file
+    --[no-]max-commits <n>
+                          maximum number of commits in a non-base split commit-graph
+    --[no-]size-multiple <n>
+                          maximum ratio between two levels of a split commit-graph
+    --[no-]expire-time <expiry-date>
+                          only expire files older than a given date-time
+    --[no-]max-new-filters ...
+                          maximum number of changed-path Bloom filters to compute
+    --[no-]progress       force progress reporting
 
-Already on 'main'
-ok 2 - post-checkout receives the right arguments with HEAD unchanged 
+ok 1 - usage
 
-expecting success of 5403.3 'post-checkout args are correct with git checkout -b ': 
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout -b new1 &&
-	read old new flag <.git/post-checkout.args &&
-	test $old = $new && test $flag = 1
+expecting success of 5318.2 'usage shown without sub-command': 
+	test_expect_code 129 git commit-graph 2>err &&
+	grep usage: err
 
-Switched to a new branch 'new1'
-ok 3 - post-checkout args are correct with git checkout -b 
+usage: git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]
+ok 2 - usage shown without sub-command
 
-expecting success of 5403.4 'post-checkout receives the right args with HEAD changed ': 
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout two &&
-	read old new flag <.git/post-checkout.args &&
-	test $old != $new && test $flag = 1
+expecting success of 5318.3 'usage shown with an error on unknown sub-command': 
+	cat >expect <<-\EOF &&
+	error: unknown subcommand: `unknown'
+	EOF
+	test_expect_code 129 git commit-graph unknown 2>stderr &&
+	grep error stderr >actual &&
+	test_cmp expect actual
 
-Note: switching to 'two'.
+ok 3 - usage shown with an error on unknown sub-command
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 5318.4 'setup full repo': 
+	git init full
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/full/.git/
+ok 4 - setup full repo
 
-  git switch -c <new-branch-name>
+expecting success of 5318.5 'tweak umask for modebit tests': 
+	umask 022
 
-Or undo this operation with:
+ok 5 - tweak umask for modebit tests
 
-  git switch -
+expecting success of 5318.6 'verify graph with no graph file': 
+	git -C full commit-graph verify
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 6 - verify graph with no graph file
 
-HEAD is now at 139b20d two
-ok 4 - post-checkout receives the right args with HEAD changed 
+expecting success of 5318.7 'write graph with no packs': 
+	git -C full commit-graph write --object-dir $objdir &&
+	test_path_is_missing full/$objdir/info/commit-graph
 
-expecting success of 5403.5 'post-checkout receives the right args when not switching branches ': 
-	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout main -- three.t &&
-	read old new flag <.git/post-checkout.args &&
-	test $old = $new && test $flag = 0
+ok 7 - write graph with no packs
 
-ok 5 - post-checkout receives the right args when not switching branches 
+expecting success of 5318.8 'exit with correct error on bad input to --stdin-packs': 
+	echo doesnotexist >in &&
+	test_expect_code 1 git -C full commit-graph write --stdin-packs \
+		<in 2>stderr &&
+	test_grep "error adding pack" stderr
 
-expecting success of 5403.6 'post-checkout is triggered on rebase --apply': 
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git checkout -B rebase-test main &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args rebase-on-me &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev main $old &&
-		test_cmp_rev rebase-on-me $new &&
-		test $flag = 1
-	
-Previous HEAD position was 139b20d two
-Switched to a new branch 'rebase-test'
-First, rewinding head to replay your work on top of it...
-Applying: three
-ok 6 - post-checkout is triggered on rebase --apply
+error: error adding pack .git/objects/pack/doesnotexist
+ok 8 - exit with correct error on bad input to --stdin-packs
 
-expecting success of 5403.7 'post-checkout is triggered on rebase --apply with fast-forward': 
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git checkout -B ff-rebase-test rebase-on-me^ &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args rebase-on-me &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev rebase-on-me^ $old &&
-		test_cmp_rev rebase-on-me $new &&
-		test $flag = 1
-	
-Switched to a new branch 'ff-rebase-test'
-First, rewinding head to replay your work on top of it...
-Fast-forwarded ff-rebase-test to rebase-on-me.
-ok 7 - post-checkout is triggered on rebase --apply with fast-forward
+expecting success of 5318.9 'create commits and repack': 
+	for i in $(test_seq 3)
+	do
+		test_commit -C full $i &&
+		git -C full branch commits/$i || return 1
+	done &&
+	git -C full repack
 
-expecting success of 5403.8 'rebase --apply fast-forward branch checkout runs post-checkout hook': 
-		test_when_finished "test_might_fail git rebase --abort" &&
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git update-ref refs/heads/rebase-fast-forward three &&
-		git checkout two  &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args HEAD rebase-fast-forward  &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev two $old &&
-		test_cmp_rev three $new &&
-		test $flag = 1
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ddc8575] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+ok 9 - create commits and repack
+
+expecting success of 5318.10 'check normal git operations: no graph': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
 	
-Note: switching to 'two'.
+ok 10 - check normal git operations: no graph
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 5318.11 'exit with correct error on bad input to --stdin-commits': 
+	# invalid, non-hex OID
+	echo HEAD | test_expect_code 1 git -C full commit-graph write \
+		--stdin-commits 2>stderr &&
+	test_grep "unexpected non-hex object ID: HEAD" stderr &&
+	# non-existent OID
+	echo $ZERO_OID | test_expect_code 1 git -C full commit-graph write \
+		--stdin-commits 2>stderr &&
+	test_grep "invalid object" stderr &&
+	# valid commit and tree OID
+	git -C full rev-parse HEAD HEAD^{tree} >in &&
+	git -C full commit-graph write --stdin-commits <in &&
+	graph_read_expect -C full 3 generation_data
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+error: unexpected non-hex object ID: HEAD
+error: invalid object: 0000000000000000000000000000000000000000
+ok 11 - exit with correct error on bad input to --stdin-commits
 
-  git switch -c <new-branch-name>
+expecting success of 5318.12 'write graph': 
+	git -C full commit-graph write &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 3 generation_data
 
-Or undo this operation with:
+ok 12 - write graph
 
-  git switch -
+expecting success of 5318.13 'write graph has correct permissions': 
+	test_path_is_file full/$objdir/info/commit-graph &&
+	echo "-r--r--r--" >expect &&
+	test_modebits full/$objdir/info/commit-graph >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 13 - write graph has correct permissions
 
-HEAD is now at 139b20d two
-Current branch rebase-fast-forward is up to date.
-fatal: no rebase in progress
-ok 8 - rebase --apply fast-forward branch checkout runs post-checkout hook
+expecting success of 5318.14 'check normal git operations: graph exists': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 14 - check normal git operations: graph exists
 
-expecting success of 5403.9 'rebase --apply checkout does not remove untracked files': 
-		test_when_finished "test_might_fail git rebase --abort" &&
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git update-ref refs/heads/rebase-fast-forward three &&
-		git checkout two &&
-		rm -f .git/post-checkout.args &&
-		echo untracked >three.t &&
-		test_when_finished "rm three.t" &&
-		test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
-		grep "untracked working tree files would be overwritten by checkout" err &&
-		test_path_is_missing .git/post-checkout.args
+expecting success of 5318.15 'Add more commits': 
+	git -C full reset --hard commits/1 &&
+	for i in $(test_seq 4 5)
+	do
+		test_commit -C full $i &&
+		git -C full branch commits/$i || return 1
+	done &&
+	git -C full reset --hard commits/2 &&
+	for i in $(test_seq 6 7)
+	do
+		test_commit -C full $i &&
+		git -C full branch commits/$i || return 1
+	done &&
+	git -C full reset --hard commits/2 &&
+	git -C full merge commits/4 &&
+	git -C full branch merge/1 &&
+	git -C full reset --hard commits/4 &&
+	git -C full merge commits/6 &&
+	git -C full branch merge/2 &&
+	git -C full reset --hard commits/3 &&
+	git -C full merge commits/5 commits/7 &&
+	git -C full branch merge/3 &&
+	git -C full repack
 
+HEAD is now at d0dcf97 1
+[master 6efda21] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 7ec8a1d] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+HEAD is now at 82335b2 2
+[master 76c4cb0] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[master 12a06f3] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+HEAD is now at 82335b2 2
+Merge made by the 'ort' strategy.
+ 4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+HEAD is now at 6efda21 4
+Merge made by the 'ort' strategy.
+ 2.t | 1 +
+ 6.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 2.t
+ create mode 100644 6.t
+HEAD is now at ddc8575 3
+Trying simple merge with commits/5
+Trying simple merge with commits/7
+Merge made by the 'octopus' strategy.
+ 4.t | 1 +
+ 5.t | 1 +
+ 6.t | 1 +
+ 7.t | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 4.t
+ create mode 100644 5.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ok 15 - Add more commits
 
-Note: switching to 'two'.
+expecting success of 5318.16 'commit-graph write progress off for redirected stderr': 
+	git -C full commit-graph write 2>err &&
+	test_must_be_empty err
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 16 - commit-graph write progress off for redirected stderr
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 5318.17 'commit-graph write force progress on for stderr': 
+	GIT_PROGRESS_DELAY=0 git -C full commit-graph write --progress 2>err &&
+	test_file_not_empty err
 
-  git switch -c <new-branch-name>
+ok 17 - commit-graph write force progress on for stderr
 
-Or undo this operation with:
+expecting success of 5318.18 'commit-graph write with the --no-progress option': 
+	git -C full commit-graph write --no-progress 2>err &&
+	test_must_be_empty err
 
-  git switch -
+ok 18 - commit-graph write with the --no-progress option
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5318.19 'commit-graph write --stdin-commits progress off for redirected stderr': 
+	git -C full rev-parse commits/5 >in &&
+	git -C full commit-graph write --stdin-commits <in 2>err &&
+	test_must_be_empty err
 
-HEAD is now at 139b20d two
-error: The following untracked working tree files would be overwritten by checkout:
-fatal: no rebase in progress
-ok 9 - rebase --apply checkout does not remove untracked files
+ok 19 - commit-graph write --stdin-commits progress off for redirected stderr
 
-expecting success of 5403.10 'post-checkout is triggered on rebase --merge': 
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git checkout -B rebase-test main &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args rebase-on-me &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev main $old &&
-		test_cmp_rev rebase-on-me $new &&
-		test $flag = 1
-	
-Previous HEAD position was 139b20d two
-Switched to and reset branch 'rebase-test'
-Rebasing (1/1)
Successfully rebased and updated refs/heads/rebase-test.
-ok 10 - post-checkout is triggered on rebase --merge
+expecting success of 5318.20 'commit-graph write --stdin-commits force progress on for stderr': 
+	git -C full rev-parse commits/5 >in &&
+	GIT_PROGRESS_DELAY=0 git -C full commit-graph write --stdin-commits \
+		--progress <in 2>err &&
+	test_grep "Collecting commits from input" err
 
-expecting success of 5403.11 'post-checkout is triggered on rebase --merge with fast-forward': 
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git checkout -B ff-rebase-test rebase-on-me^ &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args rebase-on-me &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev rebase-on-me^ $old &&
-		test_cmp_rev rebase-on-me $new &&
-		test $flag = 1
-	
-Switched to and reset branch 'ff-rebase-test'
-Successfully rebased and updated refs/heads/ff-rebase-test.
-ok 11 - post-checkout is triggered on rebase --merge with fast-forward
+Collecting commits from input: 1, done.
+ok 20 - commit-graph write --stdin-commits force progress on for stderr
 
-expecting success of 5403.12 'rebase --merge fast-forward branch checkout runs post-checkout hook': 
-		test_when_finished "test_might_fail git rebase --abort" &&
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git update-ref refs/heads/rebase-fast-forward three &&
-		git checkout two  &&
-		rm -f .git/post-checkout.args &&
-		git rebase $args HEAD rebase-fast-forward  &&
-		read old new flag <.git/post-checkout.args &&
-		test_cmp_rev two $old &&
-		test_cmp_rev three $new &&
-		test $flag = 1
-	
-Note: switching to 'two'.
+expecting success of 5318.21 'commit-graph write --stdin-commits with the --no-progress option': 
+	git -C full rev-parse commits/5 >in &&
+	git -C full commit-graph write --stdin-commits --no-progress <in 2>err &&
+	test_must_be_empty err
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 21 - commit-graph write --stdin-commits with the --no-progress option
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 5318.22 'commit-graph verify progress off for redirected stderr': 
+	git -C full commit-graph verify 2>err &&
+	test_must_be_empty err
 
-  git switch -c <new-branch-name>
+ok 22 - commit-graph verify progress off for redirected stderr
 
-Or undo this operation with:
+expecting success of 5318.23 'commit-graph verify force progress on for stderr': 
+	GIT_PROGRESS_DELAY=0 git -C full commit-graph verify --progress 2>err &&
+	test_file_not_empty err
 
-  git switch -
+ok 23 - commit-graph verify force progress on for stderr
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5318.24 'commit-graph verify with the --no-progress option': 
+	git -C full commit-graph verify --no-progress 2>err &&
+	test_must_be_empty err
 
-HEAD is now at 139b20d two
-Current branch rebase-fast-forward is up to date.
-fatal: no rebase in progress
-ok 12 - rebase --merge fast-forward branch checkout runs post-checkout hook
+ok 24 - commit-graph verify with the --no-progress option
 
-expecting success of 5403.13 'rebase --merge checkout does not remove untracked files': 
-		test_when_finished "test_might_fail git rebase --abort" &&
-		test_when_finished "rm -f .git/post-checkout.args" &&
-		git update-ref refs/heads/rebase-fast-forward three &&
-		git checkout two &&
-		rm -f .git/post-checkout.args &&
-		echo untracked >three.t &&
-		test_when_finished "rm three.t" &&
-		test_must_fail git rebase $args HEAD rebase-fast-forward 2>err &&
-		grep "untracked working tree files would be overwritten by checkout" err &&
-		test_path_is_missing .git/post-checkout.args
+expecting success of 5318.25 'write graph with merges': 
+	git -C full commit-graph write &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 10 "generation_data extra_edges"
 
+ok 25 - write graph with merges
 
-Note: switching to 'two'.
+expecting success of 5318.26 'check normal git operations: merge 1 vs 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 26 - check normal git operations: merge 1 vs 2
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 5318.27 'check normal git operations: merge 1 vs 3': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 27 - check normal git operations: merge 1 vs 3
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 5318.28 'check normal git operations: merge 2 vs 3': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 28 - check normal git operations: merge 2 vs 3
 
-  git switch -c <new-branch-name>
+expecting success of 5318.29 'Add one more commit': 
+	test_commit -C full 8 &&
+	git -C full branch commits/8 &&
+	ls full/$objdir/pack | grep idx >existing-idx &&
+	git -C full repack &&
+	ls full/$objdir/pack| grep idx | grep -v -f existing-idx >new-idx
 
-Or undo this operation with:
+[master 2c45687] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+ok 29 - Add one more commit
 
-  git switch -
+expecting success of 5318.30 'check normal git operations: mixed mode, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 30 - check normal git operations: mixed mode, commit 8 vs merge 1
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5318.31 'check normal git operations: mixed mode, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 31 - check normal git operations: mixed mode, commit 8 vs merge 2
 
-HEAD is now at 139b20d two
-error: The following untracked working tree files would be overwritten by checkout:
-fatal: no rebase in progress
-ok 13 - rebase --merge checkout does not remove untracked files
+expecting success of 5318.32 'write graph with new commit': 
+	git -C full commit-graph write &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 11 "generation_data extra_edges"
 
-expecting success of 5403.14 'post-checkout hook is triggered by clone': 
-	mkdir -p templates/hooks &&
-	write_script templates/hooks/post-checkout <<-\EOF &&
-	echo "$@" >"$GIT_DIR/post-checkout.args"
-	EOF
-	git clone --template=templates . clone3 &&
-	test -f clone3/.git/post-checkout.args
+ok 32 - write graph with new commit
 
-Cloning into 'clone3'...
-done.
-Note: switching to '139b20d8e6c5b496de61f033f642d0e3dbff528d'.
+expecting success of 5318.33 'check normal git operations: full graph, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 33 - check normal git operations: full graph, commit 8 vs merge 1
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 5318.34 'check normal git operations: full graph, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 34 - check normal git operations: full graph, commit 8 vs merge 2
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 5318.35 'write graph with nothing new': 
+	git -C full commit-graph write &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 11 "generation_data extra_edges"
 
-  git switch -c <new-branch-name>
+ok 35 - write graph with nothing new
 
-Or undo this operation with:
+expecting success of 5318.36 'check normal git operations: cleared graph, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 36 - check normal git operations: cleared graph, commit 8 vs merge 1
 
-  git switch -
+expecting success of 5318.37 'check normal git operations: cleared graph, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 37 - check normal git operations: cleared graph, commit 8 vs merge 2
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5318.38 'build graph from latest pack with closure': 
+	git -C full commit-graph write --stdin-packs <new-idx &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 9 "generation_data extra_edges"
 
-ok 14 - post-checkout hook is triggered by clone
+ok 38 - build graph from latest pack with closure
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5329-pack-objects-cruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/.git/
-expecting success of 5329.1 'unreachable loose objects are packed (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.39 'check normal git operations: graph from pack, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 39 - check normal git operations: graph from pack, commit 8 vs merge 1
 
-			test_commit base &&
-			git repack -Ad &&
-			test_commit loose &&
+expecting success of 5318.40 'check normal git operations: graph from pack, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 40 - check normal git operations: graph from pack, commit 8 vs merge 2
 
-			test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
-				$(git rev-parse loose:loose.t))" &&
-			test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
-				$(git rev-parse loose^{tree}))" &&
+expecting success of 5318.41 'build graph from commits with closure': 
+	git -C full tag -a -m "merge" tag/merge merge/2 &&
+	git -C full rev-parse tag/merge >commits-in &&
+	git -C full rev-parse merge/1 >>commits-in &&
+	git -C full commit-graph write --stdin-commits <commits-in &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 6 "generation_data"
 
-			(
-				git rev-list --objects --no-object-names base..loose |
-				while read oid
-				do
-					path="$objdir/$(test_oid_to_path "$oid")" &&
-					printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" ||
-					echo "object list generation failed for $oid"
-				done |
-				sort -k1
-			) >expect &&
+ok 41 - build graph from commits with closure
 
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-			cruft="$(echo $keep | git pack-objects --cruft \
-				--cruft-expiration="$expire" $packdir/pack)" &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
+expecting success of 5318.42 'check normal git operations: graph from commits, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 42 - check normal git operations: graph from commits, commit 8 vs merge 1
 
-			test_cmp expect actual
-		)
+expecting success of 5318.43 'check normal git operations: graph from commits, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master da180c9] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 1 - unreachable loose objects are packed (expire never)
+ok 43 - check normal git operations: graph from commits, commit 8 vs merge 2
 
-expecting success of 5329.2 'unreachable packed objects are packed (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.44 'build graph from commits with append': 
+	git -C full rev-parse merge/3 >in &&
+	git -C full commit-graph write --stdin-commits --append <in &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 10 "generation_data extra_edges"
 
-			test_commit packed &&
-			git repack -Ad &&
-			test_commit other &&
+ok 44 - build graph from commits with append
 
-			git rev-list --objects --no-object-names packed.. >objects &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-			other="$(git pack-objects --delta-base-offset \
-				$packdir/pack <objects)" &&
-			git prune-packed &&
+expecting success of 5318.45 'check normal git operations: append graph, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 45 - check normal git operations: append graph, commit 8 vs merge 1
 
-			test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
+expecting success of 5318.46 'check normal git operations: append graph, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 46 - check normal git operations: append graph, commit 8 vs merge 2
 
-			cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
-			$keep
-			-pack-$other.pack
-			EOF
-			)" &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+expecting success of 5318.47 'build graph using --reachable': 
+	git -C full commit-graph write --reachable &&
+	test_path_is_file full/$objdir/info/commit-graph &&
+	graph_read_expect -C full 11 "generation_data extra_edges"
 
-			cut -d" " -f2 <actual.raw | sort -u >actual &&
+ok 47 - build graph using --reachable
 
-			test_cmp expect actual
-		)
+expecting success of 5318.48 'check normal git operations: append graph, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 8c1110b] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 2 - unreachable packed objects are packed (expire never)
-
-expecting success of 5329.3 'unreachable cruft objects are repacked (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-
-			test_commit packed &&
-			git repack -Ad &&
-			test_commit other &&
+ok 48 - check normal git operations: append graph, commit 8 vs merge 1
 
-			git rev-list --objects --no-object-names packed.. >objects &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+expecting success of 5318.49 'check normal git operations: append graph, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 49 - check normal git operations: append graph, commit 8 vs merge 2
 
-			cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
-			git prune-packed &&
-			cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
-			$keep
-			-pack-$cruft_a.pack
-			EOF
-			)" &&
+expecting success of 5318.50 'setup bare repo': 
+	git clone --bare --no-local full bare
 
-			test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
-			test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
+Cloning into bare repository 'bare'...
+ok 50 - setup bare repo
 
-			sort <expect.raw >expect &&
-			sort <actual.raw >actual &&
+expecting success of 5318.51 'check normal git operations: bare repo, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 51 - check normal git operations: bare repo, commit 8 vs merge 1
 
-			test_cmp expect actual
-		)
+expecting success of 5318.52 'check normal git operations: bare repo, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 8c1110b] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 3 - unreachable cruft objects are repacked (expire never)
+ok 52 - check normal git operations: bare repo, commit 8 vs merge 2
 
-expecting success of 5329.4 'multiple cruft packs (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.53 'write graph in bare repo': 
+	git -C bare commit-graph write &&
+	test_path_is_file bare/objects/info/commit-graph &&
+	graph_read_expect -C bare 11 "generation_data extra_edges"
 
-			test_commit reachable &&
-			git repack -Ad &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+ok 53 - write graph in bare repo
 
-			test_commit cruft &&
-			loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
+expecting success of 5318.54 'check normal git operations: bare repo with graph, commit 8 vs merge 1': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 54 - check normal git operations: bare repo with graph, commit 8 vs merge 1
 
-			# generate three copies of the cruft object in different
-			# cruft packs, each with a unique mtime:
-			#   - one expired (1000 seconds ago)
-			#   - two non-expired (one 1000 seconds in the future,
-			#     one 1500 seconds in the future)
-			test-tool chmtime =-1000 "$loose" &&
-			git pack-objects --cruft $packdir/pack-A <<-EOF &&
-			$keep
-			EOF
-			test-tool chmtime =+1000 "$loose" &&
-			git pack-objects --cruft $packdir/pack-B <<-EOF &&
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			EOF
-			test-tool chmtime =+1500 "$loose" &&
-			git pack-objects --cruft $packdir/pack-C <<-EOF &&
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			-$(basename $(ls $packdir/pack-B-*.pack))
-			EOF
+expecting success of 5318.55 'check normal git operations: bare repo with graph, commit 8 vs merge 2': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 55 - check normal git operations: bare repo with graph, commit 8 vs merge 2
 
-			# ensure the resulting cruft pack takes the most recent
-			# mtime among all copies
-			cruft="$(git pack-objects --cruft \
-				--cruft-expiration="$expire" \
-				$packdir/pack <<-EOF
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			-$(basename $(ls $packdir/pack-B-*.pack))
-			-$(basename $(ls $packdir/pack-C-*.pack))
-			EOF
-			)" &&
+expecting success of 5318.56 'perform fast-forward merge in full repo': 
+	git -C full checkout -b merge-5-to-8 commits/5 &&
+	git -C full merge commits/8 &&
+	git -C full show-ref -s merge-5-to-8 >output &&
+	git -C full show-ref -s commits/8 >expect &&
+	test_cmp expect output
 
-			test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+Switched to a new branch 'merge-5-to-8'
+Updating 7ec8a1d..2c45687
+Fast-forward
+ 2.t | 1 +
+ 3.t | 1 +
+ 6.t | 1 +
+ 7.t | 1 +
+ 8.t | 1 +
+ 5 files changed, 5 insertions(+)
+ create mode 100644 2.t
+ create mode 100644 3.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ create mode 100644 8.t
+ok 56 - perform fast-forward merge in full repo
 
-			sort expect.raw >expect &&
-			sort actual.raw >actual &&
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
+expecting success of 5318.57 'check that gc computes commit-graph': 
+	test_commit -C full --no-tag blank &&
+	git -C full commit-graph write --reachable &&
+	cp full/$objdir/info/commit-graph commit-graph-before-gc &&
+	git -C full reset --hard HEAD~1 &&
+	test_config -C full gc.writeCommitGraph true &&
+	git -C full gc &&
+	cp full/$objdir/info/commit-graph commit-graph-after-gc &&
+	! test_cmp_bin commit-graph-before-gc commit-graph-after-gc &&
+	git -C full commit-graph write --reachable &&
+	test_cmp_bin commit-graph-after-gc full/$objdir/info/commit-graph
+
+[merge-5-to-8 3cb8ab7] blank
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-ok 4 - multiple cruft packs (expire never)
+ create mode 100644 blank.t
+HEAD is now at 2c45687 8
+commit-graph-before-gc commit-graph-after-gc differ: char 44, line 1
+ok 57 - check that gc computes commit-graph
 
-expecting success of 5329.5 'cruft packs tolerate missing trees (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.58 'replace-objects invalidates commit-graph': 
+	test_when_finished rm -rf replace &&
+	git clone full replace &&
+	(
+		cd replace &&
+		git commit-graph write --reachable &&
+		test_path_is_file .git/objects/info/commit-graph &&
+		git replace HEAD~1 HEAD~2 &&
+		graph_git_two_modes "commit-graph verify" &&
+		git -c core.commitGraph=false log >expect &&
+		git -c core.commitGraph=true log >actual &&
+		test_cmp expect actual &&
+		git commit-graph write --reachable &&
+		git -c core.commitGraph=false --no-replace-objects log >expect &&
+		git -c core.commitGraph=true --no-replace-objects log >actual &&
+		test_cmp expect actual &&
+		rm -rf .git/objects/info/commit-graph &&
+		git commit-graph write --reachable &&
+		test_path_is_file .git/objects/info/commit-graph
+	)
 
-			test_commit reachable &&
-			test_commit cruft &&
+Cloning into 'replace'...
+done.
+ok 58 - replace-objects invalidates commit-graph
 
-			tree="$(git rev-parse cruft^{tree})" &&
+expecting success of 5318.59 'commit grafts invalidate commit-graph': 
+	test_when_finished rm -rf graft &&
+	git clone --template= full graft &&
+	(
+		cd graft &&
+		git commit-graph write --reachable &&
+		test_path_is_file .git/objects/info/commit-graph &&
+		H1=$(git rev-parse --verify HEAD~1) &&
+		H3=$(git rev-parse --verify HEAD~3) &&
+		mkdir .git/info &&
+		echo "$H1 $H3" >.git/info/grafts &&
+		git -c core.commitGraph=false log >expect &&
+		git -c core.commitGraph=true log >actual &&
+		test_cmp expect actual &&
+		git commit-graph write --reachable &&
+		git -c core.commitGraph=false --no-replace-objects log >expect &&
+		git -c core.commitGraph=true --no-replace-objects log >actual &&
+		test_cmp expect actual &&
+		rm -rf .git/objects/info/commit-graph &&
+		git commit-graph write --reachable &&
+		test_path_is_missing .git/objects/info/commit-graph
+	)
 
-			git reset --hard reachable &&
-			git tag -d cruft &&
-			git reflog expire --all --expire=all &&
+Cloning into 'graft'...
+done.
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 59 - commit grafts invalidate commit-graph
 
-			# remove the unreachable tree, but leave the commit
-			# which has it as its root tree intact
-			rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
+expecting success of 5318.60 'replace-objects invalidates commit-graph': 
+	test_when_finished rm -rf shallow &&
+	git clone --depth 2 "file://$TRASH_DIRECTORY/full" shallow &&
+	(
+		cd shallow &&
+		git commit-graph write --reachable &&
+		test_path_is_missing .git/objects/info/commit-graph &&
+		git fetch origin --unshallow &&
+		git commit-graph write --reachable &&
+		test_path_is_file .git/objects/info/commit-graph
+	)
 
-			git repack -Ad &&
-			basename $(ls $packdir/pack-*.pack) >in &&
-			git pack-objects --cruft --cruft-expiration="$expire" \
-				$packdir/pack <in
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
+Cloning into 'shallow'...
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/full
+ * [new tag]         1          -> 1
+ * [new tag]         2          -> 2
+ * [new tag]         3          -> 3
+ * [new tag]         4          -> 4
+ * [new tag]         5          -> 5
+ * [new tag]         6          -> 6
+ * [new tag]         7          -> 7
+ok 60 - replace-objects invalidates commit-graph
+
+expecting success of 5318.61 'warn on improper hash version': 
+	git init --object-format=sha1 sha1 &&
+	(
+		cd sha1 &&
+		test_commit 1 &&
+		git commit-graph write --reachable &&
+		mv .git/objects/info/commit-graph ../cg-sha1
+	) &&
+	git init --object-format=sha256 sha256 &&
+	(
+		cd sha256 &&
+		test_commit 1 &&
+		git commit-graph write --reachable &&
+		mv .git/objects/info/commit-graph ../cg-sha256
+	) &&
+	(
+		cd sha1 &&
+		mv ../cg-sha256 .git/objects/info/commit-graph &&
+		git log -1 2>err &&
+		test_grep "commit-graph hash version 2 does not match version 1" err
+	) &&
+	(
+		cd sha256 &&
+		mv ../cg-sha1 .git/objects/info/commit-graph &&
+		git log -1 2>err &&
+		test_grep "commit-graph hash version 1 does not match version 2" err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/sha1/.git/
+[master (root-commit) 925a26a] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
+ create mode 100644 1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/sha256/.git/
+[master (root-commit) 0aad349] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-HEAD is now at 7dd88f0 reachable
-Deleted tag 'cruft' (was 9401314)
-1fd7610ee824e92e6acc1c916cc3150d13926e92
-ok 5 - cruft packs tolerate missing trees (expire never)
+ create mode 100644 1.t
+commit 925a26a37e395ff2955d4b055019609371c1b39a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:22:13 2005 -0700
 
-expecting success of 5329.6 'cruft packs tolerate missing blobs (expire never)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+    1
+error: commit-graph hash version 2 does not match version 1
+commit 0aad349d0d3afe1f43be2153747988096ae6c4cbb6d6fbc01a428930a66ca375
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:22:13 2005 -0700
 
-			test_commit reachable &&
-			test_commit cruft &&
+    1
+error: commit-graph hash version 1 does not match version 2
+ok 61 - warn on improper hash version
 
-			blob="$(git rev-parse cruft:cruft.t)" &&
+checking prerequisite: TIME_IS_64BIT
 
-			git reset --hard reachable &&
-			git tag -d cruft &&
-			git reflog expire --all --expire=all &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_IS_64BIT" &&test-tool date is64bit
+)
+prerequisite TIME_IS_64BIT ok
+checking prerequisite: TIME_T_IS_64BIT
 
-			# remove the unreachable blob, but leave the commit (and
-			# the root tree of that commit) intact
-			rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TIME_T_IS_64BIT" &&test-tool date time_t-is64bit
+)
+prerequisite TIME_T_IS_64BIT ok
+expecting success of 5318.62 'lower layers have overflow chunk': 
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	FUTURE_DATE="@4147483646 +0000" &&
+	rm -f full/.git/objects/info/commit-graph &&
+	test_commit -C full --date "$FUTURE_DATE" future-1 &&
+	test_commit -C full --date "$UNIX_EPOCH_ZERO" old-1 &&
+	git -C full commit-graph write --reachable &&
+	test_commit -C full --date "$FUTURE_DATE" future-2 &&
+	test_commit -C full --date "$UNIX_EPOCH_ZERO" old-2 &&
+	git -C full commit-graph write --reachable --split=no-merge &&
+	test_commit -C full extra &&
+	git -C full commit-graph write --reachable --split=no-merge &&
+	git -C full commit-graph write --reachable &&
+	graph_read_expect -C full 16 \
+		"generation_data generation_data_overflow extra_edges" &&
+	mv full/.git/objects/info/commit-graph commit-graph-upgraded &&
+	git -C full commit-graph write --reachable &&
+	graph_read_expect -C full 16 \
+		"generation_data generation_data_overflow extra_edges" &&
+	test_cmp full/.git/objects/info/commit-graph commit-graph-upgraded
 
-			git repack -Ad &&
-			basename $(ls $packdir/pack-*.pack) >in &&
-			git pack-objects --cruft --cruft-expiration="$expire" \
-				$packdir/pack <in
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
+[merge-5-to-8 8786bed] future-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
+ create mode 100644 future-1.t
+[merge-5-to-8 c87886d] old-1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-HEAD is now at 7dd88f0 reachable
-Deleted tag 'cruft' (was 9401314)
-9dad6aa6eb8f2eee78e507e20d4b2a6403f203ab
-ok 6 - cruft packs tolerate missing blobs (expire never)
-
-expecting success of 5329.7 'unreachable loose objects are packed (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-
-			test_commit base &&
-			git repack -Ad &&
-			test_commit loose &&
-
-			test-tool chmtime +2000 "$objdir/$(test_oid_to_path \
-				$(git rev-parse loose:loose.t))" &&
-			test-tool chmtime +1000 "$objdir/$(test_oid_to_path \
-				$(git rev-parse loose^{tree}))" &&
-
-			(
-				git rev-list --objects --no-object-names base..loose |
-				while read oid
-				do
-					path="$objdir/$(test_oid_to_path "$oid")" &&
-					printf "%s %d\n" "$oid" "$(test-tool chmtime --get "$path")" ||
-					echo "object list generation failed for $oid"
-				done |
-				sort -k1
-			) >expect &&
-
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-			cruft="$(echo $keep | git pack-objects --cruft \
-				--cruft-expiration="$expire" $packdir/pack)" &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
-
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 old-1.t
+[merge-5-to-8 dc3ab15] future-2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master da180c9] loose
+ create mode 100644 future-2.t
+[merge-5-to-8 db7674a] old-2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 7 - unreachable loose objects are packed (expire 2.weeks.ago)
+ create mode 100644 old-2.t
+[merge-5-to-8 4e9edc3] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+ok 62 - lower layers have overflow chunk
 
-expecting success of 5329.8 'unreachable packed objects are packed (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.63 'git commit-graph verify': 
+	git -C full rev-parse commits/8 >in &&
+	git -C full -c commitGraph.generationVersion=1 commit-graph write \
+		--stdin-commits <in &&
+	git -C full commit-graph verify >output &&
+	graph_read_expect -C full 9 extra_edges 1
 
-			test_commit packed &&
-			git repack -Ad &&
-			test_commit other &&
+ok 63 - git commit-graph verify
 
-			git rev-list --objects --no-object-names packed.. >objects &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-			other="$(git pack-objects --delta-base-offset \
-				$packdir/pack <objects)" &&
-			git prune-packed &&
+checking prerequisite: SANITY
 
-			test-tool chmtime --get -100 "$packdir/pack-$other.pack" >expect &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-			cruft="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
-			$keep
-			-pack-$other.pack
-			EOF
-			)" &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
 
-			cut -d" " -f2 <actual.raw | sort -u >actual &&
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 8c1110b] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 8 - unreachable packed objects are packed (expire 2.weeks.ago)
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 5329.9 'unreachable cruft objects are repacked (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 5318.64 'detect permission problem': 
+	corrupt_graph_setup &&
+	chmod 000 full/$objdir/info/commit-graph &&
+	corrupt_graph_verify "Could not open" "no-copy"
 
-			test_commit packed &&
-			git repack -Ad &&
-			test_commit other &&
+fatal: Could not open commit-graph '.git/objects/info/commit-graph': Permission denied
+?? expect
+?? output
+ok 64 - detect permission problem
 
-			git rev-list --objects --no-object-names packed.. >objects &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+expecting success of 5318.65 'detect too small': 
+	corrupt_graph_setup &&
+	echo "a small graph" >full/$objdir/info/commit-graph &&
+	corrupt_graph_verify "too small"
 
-			cruft_a="$(echo $keep | git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack)" &&
-			git prune-packed &&
-			cruft_b="$(git pack-objects --cruft --cruft-expiration="$expire" $packdir/pack <<-EOF
-			$keep
-			-pack-$cruft_a.pack
-			EOF
-			)" &&
+error: commit-graph file is too small
+error: commit-graph file is too small
+?? expect
+?? output
+error: commit-graph file is too small
+ok 65 - detect too small
 
-			test-tool pack-mtimes "pack-$cruft_a.mtimes" >expect.raw &&
-			test-tool pack-mtimes "pack-$cruft_b.mtimes" >actual.raw &&
+expecting success of 5318.66 'detect bad signature': 
+	corrupt_graph_and_verify 0 "\0" \
+		"graph signature"
 
-			sort <expect.raw >expect &&
-			sort <actual.raw >actual &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.276e-05 s, 30.5 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.38e-05 s, 0.0 kB/s
+error: commit-graph signature 475048 does not match signature 43475048
+error: commit-graph signature 475048 does not match signature 43475048
+?? expect
+?? output
+error: commit-graph signature 475048 does not match signature 43475048
+ok 66 - detect bad signature
 
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 8c1110b] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 9 - unreachable cruft objects are repacked (expire 2.weeks.ago)
+expecting success of 5318.67 'detect bad version': 
+	corrupt_graph_and_verify $GRAPH_BYTE_VERSION "\02" \
+		"graph version"
 
-expecting success of 5329.10 'multiple cruft packs (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.00974382 s, 0.1 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 4.6361e-05 s, 0.0 kB/s
+error: commit-graph version 2 does not match version 1
+error: commit-graph version 2 does not match version 1
+?? expect
+?? output
+error: commit-graph version 2 does not match version 1
+ok 67 - detect bad version
 
-			test_commit reachable &&
-			git repack -Ad &&
-			keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
+expecting success of 5318.68 'detect bad hash version': 
+	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \
+		"hash version"
 
-			test_commit cruft &&
-			loose="$objdir/$(test_oid_to_path $(git rev-parse cruft))" &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.52e-05 s, 28.4 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.248e-05 s, 0.0 kB/s
+error: commit-graph hash version 3 does not match version 1
+error: commit-graph hash version 3 does not match version 1
+?? expect
+?? output
+error: commit-graph hash version 3 does not match version 1
+ok 68 - detect bad hash version
 
-			# generate three copies of the cruft object in different
-			# cruft packs, each with a unique mtime:
-			#   - one expired (1000 seconds ago)
-			#   - two non-expired (one 1000 seconds in the future,
-			#     one 1500 seconds in the future)
-			test-tool chmtime =-1000 "$loose" &&
-			git pack-objects --cruft $packdir/pack-A <<-EOF &&
-			$keep
-			EOF
-			test-tool chmtime =+1000 "$loose" &&
-			git pack-objects --cruft $packdir/pack-B <<-EOF &&
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			EOF
-			test-tool chmtime =+1500 "$loose" &&
-			git pack-objects --cruft $packdir/pack-C <<-EOF &&
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			-$(basename $(ls $packdir/pack-B-*.pack))
-			EOF
+expecting success of 5318.69 'detect low chunk count': 
+	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \
+		"final chunk has non-zero id"
 
-			# ensure the resulting cruft pack takes the most recent
-			# mtime among all copies
-			cruft="$(git pack-objects --cruft \
-				--cruft-expiration="$expire" \
-				$packdir/pack <<-EOF
-			$keep
-			-$(basename $(ls $packdir/pack-A-*.pack))
-			-$(basename $(ls $packdir/pack-B-*.pack))
-			-$(basename $(ls $packdir/pack-C-*.pack))
-			EOF
-			)" &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.0149362 s, 0.1 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.588e-05 s, 0.0 kB/s
+error: final chunk has non-zero id 4f49444c
+error: final chunk has non-zero id 4f49444c
+?? expect
+?? output
+error: final chunk has non-zero id 4f49444c
+ok 69 - detect low chunk count
 
-			test-tool pack-mtimes "$(basename $(ls $packdir/pack-C-*.mtimes))" >expect.raw &&
-			test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+expecting success of 5318.70 'detect missing OID fanout chunk': 
+	corrupt_graph_and_verify $GRAPH_BYTE_OID_FANOUT_ID "\0" \
+		"commit-graph required OID fanout chunk missing or corrupted"
 
-			sort expect.raw >expect &&
-			sort actual.raw >actual &&
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-2b7c68c41cc49f836d3f91ba2ee4f486d0939ca6
-ok 10 - multiple cruft packs (expire 2.weeks.ago)
+1+0 records in
+1+0 records out
+1 byte copied, 3.616e-05 s, 27.7 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.296e-05 s, 0.0 kB/s
+error: commit-graph required OID fanout chunk missing or corrupted
+error: commit-graph required OID fanout chunk missing or corrupted
+?? expect
+?? output
+error: commit-graph required OID fanout chunk missing or corrupted
+ok 70 - detect missing OID fanout chunk
 
-expecting success of 5329.11 'cruft packs tolerate missing trees (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.71 'detect missing OID lookup chunk': 
+	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ID "\0" \
+		"commit-graph required OID lookup chunk missing or corrupted"
 
-			test_commit reachable &&
-			test_commit cruft &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.824e-05 s, 26.2 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.548e-05 s, 0.0 kB/s
+error: commit-graph required OID lookup chunk missing or corrupted
+error: commit-graph required OID lookup chunk missing or corrupted
+?? expect
+?? output
+error: commit-graph required OID lookup chunk missing or corrupted
+ok 71 - detect missing OID lookup chunk
 
-			tree="$(git rev-parse cruft^{tree})" &&
+expecting success of 5318.72 'detect missing commit data chunk': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATA_ID "\0" \
+		"commit-graph required commit data chunk missing or corrupted"
 
-			git reset --hard reachable &&
-			git tag -d cruft &&
-			git reflog expire --all --expire=all &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.00508535 s, 0.2 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.62e-05 s, 0.0 kB/s
+error: commit-graph required commit data chunk missing or corrupted
+error: commit-graph required commit data chunk missing or corrupted
+?? expect
+?? output
+error: commit-graph required commit data chunk missing or corrupted
+ok 72 - detect missing commit data chunk
 
-			# remove the unreachable tree, but leave the commit
-			# which has it as its root tree intact
-			rm -fr "$objdir/$(test_oid_to_path "$tree")" &&
+expecting success of 5318.73 'detect incorrect fanout': 
+	corrupt_graph_and_verify $GRAPH_BYTE_FANOUT1 "\01" \
+		"fanout value"
 
-			git repack -Ad &&
-			basename $(ls $packdir/pack-*.pack) >in &&
-			git pack-objects --cruft --cruft-expiration="$expire" \
-				$packdir/pack <in
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-HEAD is now at 7dd88f0 reachable
-Deleted tag 'cruft' (was 9401314)
-1fd7610ee824e92e6acc1c916cc3150d13926e92
-ok 11 - cruft packs tolerate missing trees (expire 2.weeks.ago)
+1+0 records in
+1+0 records out
+1 byte copied, 3.5721e-05 s, 28.0 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.696e-05 s, 0.0 kB/s
+error: commit-graph fanout values out of order
+error: commit-graph fanout values out of order
+error: commit-graph required OID fanout chunk missing or corrupted
+?? expect
+?? output
+error: commit-graph fanout values out of order
+error: commit-graph required OID fanout chunk missing or corrupted
+ok 73 - detect incorrect fanout
 
-expecting success of 5329.12 'cruft packs tolerate missing blobs (expire 2.weeks.ago)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+expecting success of 5318.74 'detect incorrect fanout final value': 
+	corrupt_graph_and_verify $GRAPH_BYTE_FANOUT2 "\01" \
+		"OID lookup chunk is the wrong size"
 
-			test_commit reachable &&
-			test_commit cruft &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.000515483 s, 1.9 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.216e-05 s, 0.0 kB/s
+error: commit-graph OID lookup chunk is the wrong size
+error: commit-graph OID lookup chunk is the wrong size
+error: commit-graph required OID lookup chunk missing or corrupted
+?? expect
+?? output
+error: commit-graph OID lookup chunk is the wrong size
+error: commit-graph required OID lookup chunk missing or corrupted
+ok 74 - detect incorrect fanout final value
 
-			blob="$(git rev-parse cruft:cruft.t)" &&
+expecting success of 5318.75 'detect incorrect OID order': 
+	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_ORDER "\01" \
+		"incorrect OID order"
 
-			git reset --hard reachable &&
-			git tag -d cruft &&
-			git reflog expire --all --expire=all &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.00885454 s, 0.1 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.368e-05 s, 0.0 kB/s
+commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
+?? expect
+?? output
+ok 75 - detect incorrect OID order
 
-			# remove the unreachable blob, but leave the commit (and
-			# the root tree of that commit) intact
-			rm -fr "$objdir/$(test_oid_to_path "$blob")" &&
+expecting success of 5318.76 'detect OID not in object database': 
+	corrupt_graph_and_verify $GRAPH_BYTE_OID_LOOKUP_MISSING "\01" \
+		"from object database"
 
-			git repack -Ad &&
-			basename $(ls $packdir/pack-*.pack) >in &&
-			git pack-objects --cruft --cruft-expiration="$expire" \
-				$packdir/pack <in
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 9401314] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-HEAD is now at 7dd88f0 reachable
-Deleted tag 'cruft' (was 9401314)
-9dad6aa6eb8f2eee78e507e20d4b2a6403f203ab
-ok 12 - cruft packs tolerate missing blobs (expire 2.weeks.ago)
+1+0 records in
+1+0 records out
+1 byte copied, 0.00148401 s, 0.7 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.484e-05 s, 0.0 kB/s
+failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
+?? expect
+?? output
+ok 76 - detect OID not in object database
 
-expecting success of 5329.13 'cruft tags rescue tagged objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+expecting success of 5318.77 'detect incorrect tree OID': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_TREE "\01" \
+		"root tree OID for commit"
 
-		test_commit packed &&
-		git repack -Ad &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.0039111 s, 0.3 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.5201e-05 s, 0.0 kB/s
+root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
+?? expect
+?? output
+ok 77 - detect incorrect tree OID
 
-		test_commit tagged &&
-		git tag -a annotated -m tag &&
+expecting success of 5318.78 'detect incorrect parent int-id': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_PARENT "\01" \
+		"invalid parent"
 
-		git rev-list --objects --no-object-names packed.. >objects &&
-		while read oid
-		do
-			test-tool chmtime -1000 \
-				"$objdir/$(test_oid_to_path $oid)" || exit 1
-		done <objects &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.4841e-05 s, 28.7 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.2401e-05 s, 0.0 kB/s
+fatal: invalid parent position 16777220
+?? expect
+?? output
+ok 78 - detect incorrect parent int-id
 
-		test-tool chmtime -500 \
-			"$objdir/$(test_oid_to_path $(git rev-parse annotated))" &&
+expecting success of 5318.79 'detect extra parent int-id': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_EXTRA_PARENT "\00" \
+		"is too long"
 
-		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-		cruft="$(echo $keep | git pack-objects --cruft \
-			--cruft-expiration=750.seconds.ago \
-			$packdir/pack)" &&
-		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
-		cut -f1 -d" " <actual.raw | sort >actual &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.00676968 s, 0.1 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.296e-05 s, 0.0 kB/s
+commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
+?? expect
+?? output
+ok 79 - detect extra parent int-id
 
-		(
-			cat objects &&
-			git rev-parse annotated
-		) >expect.raw &&
-		sort <expect.raw >expect &&
+expecting success of 5318.80 'detect wrong parent': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_WRONG_PARENT "\01" \
+		"commit-graph parent for"
 
-		test_cmp expect actual &&
-		cat actual
-	)
+1+0 records in
+1+0 records out
+1 byte copied, 0.00368598 s, 0.3 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.224e-05 s, 0.0 kB/s
+commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
+?? expect
+?? output
+ok 80 - detect wrong parent
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 1ce88f2] tagged
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tagged.t
-1ce88f2752d44a4c71b81cbcbb127c84f8df32e8
-6ae842110efefc995fd529f1bde08a3c608d4f6f
-9e5f42caf6e84faf4a2e509216e63116dc509059
-b4189c489bdfaa52374fe786bfbb416554531eb2
-ok 13 - cruft tags rescue tagged objects
+expecting success of 5318.81 'detect incorrect generation number': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\070" \
+		"generation for commit"
 
-expecting success of 5329.14 'cruft commits rescue parents, trees': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.000691685 s, 1.4 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.384e-05 s, 0.0 kB/s
+commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
+?? expect
+?? output
+ok 81 - detect incorrect generation number
 
-		test_commit packed &&
-		git repack -Ad &&
+expecting success of 5318.82 'detect incorrect commit date': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_DATE "\01" \
+		"commit date"
 
-		test_commit old &&
-		test_commit new &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.52e-05 s, 28.4 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.496e-05 s, 0.0 kB/s
+commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
+?? expect
+?? output
+ok 82 - detect incorrect commit date
 
-		git rev-list --objects --no-object-names packed..new >objects &&
-		while read object
-		do
-			test-tool chmtime -1000 \
-				"$objdir/$(test_oid_to_path $object)" || exit 1
-		done <objects &&
-		test-tool chmtime +500 "$objdir/$(test_oid_to_path \
-			$(git rev-parse HEAD))" &&
+expecting success of 5318.83 'detect incorrect parent for octopus merge': 
+	corrupt_graph_and_verify $GRAPH_BYTE_OCTOPUS "\01" \
+		"invalid parent"
 
-		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-		cruft="$(echo $keep | git pack-objects --cruft \
-			--cruft-expiration=750.seconds.ago \
-			$packdir/pack)" &&
-		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.608e-05 s, 27.7 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.32e-05 s, 0.0 kB/s
+fatal: invalid parent position 16777216
+?? expect
+?? output
+ok 83 - detect incorrect parent for octopus merge
 
-		cut -d" " -f1 <actual.raw | sort >actual &&
-		sort <objects >expect &&
+expecting success of 5318.84 'detect invalid checksum hash': 
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum"
 
-		test_cmp expect actual
-	)
+1+0 records in
+1+0 records out
+1 byte copied, 3.764e-05 s, 26.6 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.344e-05 s, 0.0 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+?? expect
+?? output
+ok 84 - detect invalid checksum hash
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 077a51a] old
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 old.t
-[master 3b97f54] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-ok 14 - cruft commits rescue parents, trees
+expecting success of 5318.85 'detect incorrect chunk count': 
+	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \
+		"commit-graph file is too small to hold [0-9]* chunks" \
+		$GRAPH_CHUNK_LOOKUP_OFFSET
 
-expecting success of 5329.15 'cruft trees rescue sub-trees, blobs': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.86e-05 s, 25.9 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.384e-05 s, 0.0 kB/s
+error: commit-graph file is too small to hold 255 chunks
+error: commit-graph file is too small to hold 255 chunks
+?? expect
+?? output
+error: commit-graph file is too small to hold 255 chunks
+ok 85 - detect incorrect chunk count
 
-		test_commit packed &&
-		git repack -Ad &&
+expecting success of 5318.86 'detect mixed generation numbers (non-zero to zero)': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION_LAST "\0\0\0\0" \
+		"both zero and non-zero generations"
 
-		mkdir -p dir/sub &&
-		echo foo >foo &&
-		echo bar >dir/bar &&
-		echo baz >dir/sub/baz &&
+4+0 records in
+4+0 records out
+4 bytes copied, 4.292e-05 s, 93.2 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.592e-05 s, 0.0 kB/s
+commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
+?? expect
+?? output
+ok 86 - detect mixed generation numbers (non-zero to zero)
 
-		test_tick &&
-		git add . &&
-		git commit -m "pruned" &&
+expecting success of 5318.87 'detect mixed generation numbers (zero to non-zero)': 
+	corrupt_graph_and_verify $GRAPH_BYTE_COMMIT_GENERATION "\0\0\0\0" \
+		"both zero and non-zero generations"
 
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD))" &&
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD^{tree}))" &&
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:foo))" &&
-		test-tool chmtime  -500 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir))" &&
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/bar))" &&
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub))" &&
-		test-tool chmtime -1000 "$objdir/$(test_oid_to_path $(git rev-parse HEAD:dir/sub/baz))" &&
+4+0 records in
+4+0 records out
+4 bytes copied, 0.00901858 s, 0.4 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.508e-05 s, 0.0 kB/s
+commit-graph has both zero and non-zero generations (e.g., commits '12a06f3a2c235980d878903e940b0570ddda4359' and 'ddc8575ed6fc205127629848895ac35ba7529ace')
+?? expect
+?? output
+ok 87 - detect mixed generation numbers (zero to non-zero)
 
-		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-		cruft="$(echo $keep | git pack-objects --cruft \
-			--cruft-expiration=750.seconds.ago \
-			$packdir/pack)" &&
-		test-tool pack-mtimes "pack-$cruft.mtimes" >actual.raw &&
-		cut -f1 -d" " <actual.raw | sort >actual &&
+expecting success of 5318.88 'git fsck (checks commit-graph when config set to true)': 
+	git -C full fsck &&
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum" &&
+	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
+	test_must_fail git -C full -c core.commitGraph=true fsck
 
-		git rev-parse HEAD:dir HEAD:dir/bar HEAD:dir/sub HEAD:dir/sub/baz >expect.raw &&
-		sort <expect.raw >expect &&
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 0.00609876 s, 0.2 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.3441e-05 s, 0.0 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+?? expect
+?? output
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+the commit-graph file has incorrect checksum and is likely corrupt
+ok 88 - git fsck (checks commit-graph when config set to true)
 
-		test_cmp expect actual
-	)
+expecting success of 5318.89 'git fsck (ignores commit-graph when config set to false)': 
+	git -C full fsck &&
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum" &&
+	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
+	git -C full -c core.commitGraph=false fsck
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 13f11a8] pruned
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dir/bar
- create mode 100644 dir/sub/baz
- create mode 100644 foo
-ok 15 - cruft trees rescue sub-trees, blobs
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 3.392e-05 s, 29.5 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.216e-05 s, 0.0 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+?? expect
+?? output
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+ok 89 - git fsck (ignores commit-graph when config set to false)
 
-expecting success of 5329.16 'expired objects are pruned': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+expecting success of 5318.90 'git fsck (checks commit-graph when config unset)': 
+	test_when_finished "git -C full config core.commitGraph true" &&
 
-		test_commit packed &&
-		git repack -Ad &&
+	git -C full fsck &&
+	corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
+		"incorrect checksum" &&
+	test_unconfig -C full core.commitGraph &&
+	cp commit-graph-pre-write-test full/$objdir/info/commit-graph &&
+	test_must_fail git -C full fsck
 
-		test_commit pruned &&
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+1+0 records in
+1+0 records out
+1 byte copied, 0.000638804 s, 1.6 kB/s
+0+0 records in
+0+0 records out
+0 bytes copied, 2.216e-05 s, 0.0 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+?? expect
+?? output
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+the commit-graph file has incorrect checksum and is likely corrupt
+ok 90 - git fsck (checks commit-graph when config unset)
 
-		git rev-list --objects --no-object-names packed..pruned >objects &&
-		while read object
-		do
-			test-tool chmtime -1000 \
-				"$objdir/$(test_oid_to_path $object)" || exit 1
-		done <objects &&
+expecting success of 5318.91 'git fsck shows commit-graph output with --progress': 
+	git -C "$TRASH_DIRECTORY/full" fsck --progress 2>err &&
+	grep "Verifying commits in commit graph" err
 
-		keep="$(basename "$(ls $packdir/pack-*.pack)")" &&
-		cruft="$(echo $keep | git pack-objects --cruft \
-			--cruft-expiration=750.seconds.ago \
-			$packdir/pack)" &&
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+Verifying commits in commit graph:  11% (1/9)
Verifying commits in commit graph:  22% (2/9)
Verifying commits in commit graph:  33% (3/9)
Verifying commits in commit graph:  44% (4/9)
Verifying commits in commit graph:  55% (5/9)
Verifying commits in commit graph:  66% (6/9)
Verifying commits in commit graph:  77% (7/9)
Verifying commits in commit graph:  88% (8/9)
Verifying commits in commit graph: 100% (9/9)
Verifying commits in commit graph: 100% (9/9), done.
+ok 91 - git fsck shows commit-graph output with --progress
 
-		test-tool pack-mtimes "pack-$cruft.mtimes" >actual &&
-		test_must_be_empty actual
-	)
+expecting success of 5318.92 'git fsck suppresses commit-graph output with --no-progress': 
+	git -C "$TRASH_DIRECTORY/full" fsck --no-progress 2>err &&
+	! grep "Verifying commits in commit graph" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) e975c14] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master 69e4b3a] pruned
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pruned.t
-ok 16 - expired objects are pruned
+dangling commit 3cb8ab71edce420292e48b96b60231b7cf492d0e
+dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
+ok 92 - git fsck suppresses commit-graph output with --no-progress
 
-expecting success of 5329.17 'repack --cruft generates a cruft pack': 
+expecting success of 5318.93 'setup non-the_repository tests': 
+	rm -rf repo &&
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit reachable &&
-		git branch -M main &&
-		git checkout --orphan other &&
-		test_commit unreachable &&
-
-		git checkout main &&
-		git branch -D other &&
-		git tag -d unreachable &&
-		# objects are not cruft if they are contained in the reflogs
-		git reflog expire --all --expire=all &&
-
-		git rev-list --objects --all --no-object-names >reachable.raw &&
-		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
-		sort <reachable.raw >reachable &&
-		comm -13 reachable objects >unreachable &&
-
-		git repack --cruft -d &&
-
-		cruft=$(basename $(ls $packdir/pack-*.mtimes) .mtimes) &&
-		pack=$(basename $(ls $packdir/pack-*.pack | grep -v $cruft) .pack) &&
-
-		git show-index <$packdir/$pack.idx >actual.raw &&
-		cut -f2 -d" " actual.raw | sort >actual &&
-		test_cmp reachable actual &&
-
-		git show-index <$packdir/$cruft.idx >actual.raw &&
-		cut -f2 -d" " actual.raw | sort >actual &&
-		test_cmp unreachable actual
-	)
+	test_commit -C repo one &&
+	test_commit -C repo two &&
+	git -C repo config core.commitGraph true &&
+	git -C repo rev-parse two | \
+		git -C repo commit-graph write --stdin-commits
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+[master (root-commit) ac97c8d] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-Switched to a new branch 'other'
-[other (root-commit) a613991] unreachable
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 reachable.t
- create mode 100644 unreachable.t
-Switched to branch 'main'
-Deleted branch other (was a613991).
-Deleted tag 'unreachable' (was a613991)
-ok 17 - repack --cruft generates a cruft pack
-
-expecting success of 5329.18 'loose objects mtimes upsert others': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit reachable &&
-		git repack -Ad &&
-		git branch -M main &&
-
-		git checkout --orphan other &&
-		test_commit cruft &&
-		# incremental repack, leaving existing objects loose (so
-		# they can be "freshened")
-		git repack &&
-
-		tip="$(git rev-parse cruft)" &&
-		path="$objdir/$(test_oid_to_path "$tip")" &&
-		test-tool chmtime --get +1000 "$path" >expect &&
-
-		git checkout main &&
-		git branch -D other &&
-		git tag -d cruft &&
-		git reflog expire --all --expire=all &&
-
-		git repack --cruft -d &&
-
-		mtimes="$(basename $(ls $packdir/pack-*.mtimes))" &&
-		test-tool pack-mtimes "$mtimes" >actual.raw &&
-		grep "$tip" actual.raw | cut -d" " -f2 >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
+ create mode 100644 one.t
+[master 4ae1176] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-Switched to a new branch 'other'
-[other (root-commit) 03feb6e] cruft
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 cruft.t
- create mode 100644 reachable.t
-Switched to branch 'main'
-Deleted branch other (was 03feb6e).
-Deleted tag 'cruft' (was 03feb6e)
-ok 18 - loose objects mtimes upsert others
-
-expecting success of 5329.19 'expiring cruft objects with git gc': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit reachable &&
-		git branch -M main &&
-		git checkout --orphan other &&
-		test_commit unreachable &&
-
-		git checkout main &&
-		git branch -D other &&
-		git tag -d unreachable &&
-		# objects are not cruft if they are contained in the reflogs
-		git reflog expire --all --expire=all &&
-
-		git rev-list --objects --all --no-object-names >reachable.raw &&
-		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
-		sort <reachable.raw >reachable &&
-		comm -13 reachable objects >unreachable &&
+ create mode 100644 two.t
+ok 93 - setup non-the_repository tests
 
-		# Write a cruft pack containing all unreachable objects.
-		git gc --cruft --prune="01-01-1980" &&
+expecting success of 5318.94 'parse_commit_in_graph works for non-the_repository': 
+	test-tool repository parse_commit_in_graph \
+		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
+	{
+		git -C repo log --pretty=format:"%ct " -1 &&
+		git -C repo rev-parse one
+	} >expect &&
+	test_cmp expect actual &&
 
-		mtimes=$(ls .git/objects/pack/pack-*.mtimes) &&
-		test_path_is_file $mtimes &&
+	test-tool repository parse_commit_in_graph \
+		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
+	git -C repo log --pretty="%ct" -1 one >expect &&
+	test_cmp expect actual
 
-		# Prune all unreachable objects from the cruft pack.
-		git gc --cruft --prune=now &&
+ok 94 - parse_commit_in_graph works for non-the_repository
 
-		git cat-file --batch-all-objects --batch-check="%(objectname)" >objects &&
+expecting success of 5318.95 'get_commit_tree_in_graph works for non-the_repository': 
+	test-tool repository get_commit_tree_in_graph \
+		repo/.git repo "$(git -C repo rev-parse two)" >actual &&
+	git -C repo rev-parse two^{tree} >expect &&
+	test_cmp expect actual &&
 
-		comm -23 unreachable objects >removed &&
-		test_cmp unreachable removed &&
-		test_path_is_missing $mtimes
-	)
+	test-tool repository get_commit_tree_in_graph \
+		repo/.git repo "$(git -C repo rev-parse one)" >actual &&
+	git -C repo rev-parse one^{tree} >expect &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-Switched to a new branch 'other'
-[other (root-commit) a613991] unreachable
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 reachable.t
- create mode 100644 unreachable.t
-Switched to branch 'main'
-Deleted branch other (was a613991).
-Deleted tag 'unreachable' (was a613991)
-ok 19 - expiring cruft objects with git gc
+ok 95 - get_commit_tree_in_graph works for non-the_repository
 
-expecting success of 5329.20 'cruft packs are not included in geometric repack': 
+expecting success of 5318.96 'corrupt commit-graph write (broken parent)': 
+	rm -rf repo &&
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
+		empty="$(git mktree </dev/null)" &&
+		cat >broken <<-EOF &&
+		tree $empty
+		parent $ZERO_OID
+		author whatever <whatever@example.com> 1234 -0000
+		committer whatever <whatever@example.com> 1234 -0000
 
-		test_commit reachable &&
-		git repack -Ad &&
-		git branch -M main &&
-
-		git checkout --orphan other &&
-		test_commit cruft &&
-		git repack -d &&
-
-		git checkout main &&
-		git branch -D other &&
-		git tag -d cruft &&
-		git reflog expire --all --expire=all &&
-
-		git repack --cruft &&
-
-		find $packdir -type f | sort >before &&
-		git repack --geometric=2 -d &&
-		find $packdir -type f | sort >after &&
-
-		test_cmp before after
+		broken commit
+		EOF
+		broken="$(git hash-object -w -t commit --literally broken)" &&
+		git commit-tree -p "$broken" -m "good commit" "$empty" >good &&
+		test_must_fail git commit-graph write --stdin-commits \
+			<good 2>test_err &&
+		test_grep "unable to parse commit" test_err
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-Switched to a new branch 'other'
-[other (root-commit) 03feb6e] cruft
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 cruft.t
- create mode 100644 reachable.t
-Switched to branch 'main'
-Deleted branch other (was 03feb6e).
-Deleted tag 'cruft' (was 03feb6e)
-Nothing new to pack.
-ok 20 - cruft packs are not included in geometric repack
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+fatal: unable to parse commit 0000000000000000000000000000000000000000
+ok 96 - corrupt commit-graph write (broken parent)
 
-expecting success of 5329.21 'repack --geometric collects once-cruft objects': 
+expecting success of 5318.97 'corrupt commit-graph write (missing tree)': 
+	rm -rf repo &&
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
+		tree="$(git mktree </dev/null)" &&
+		cat >broken <<-EOF &&
+		parent $ZERO_OID
+		author whatever <whatever@example.com> 1234 -0000
+		committer whatever <whatever@example.com> 1234 -0000
 
-		test_commit reachable &&
-		git repack -Ad &&
-		git branch -M main &&
-
-		git checkout --orphan other &&
-		git rm -rf . &&
-		test_commit --no-tag cruft &&
-		cruft="$(git rev-parse HEAD)" &&
-
-		git checkout main &&
-		git branch -D other &&
-		git reflog expire --all --expire=all &&
-
-		# Pack the objects created in the previous step into a cruft
-		# pack. Intentionally leave loose copies of those objects
-		# around so we can pick them up in a subsequent --geometric
-		# reapack.
-		git repack --cruft &&
-
-		# Now make those objects reachable, and ensure that they are
-		# packed into the new pack created via a --geometric repack.
-		git update-ref refs/heads/other $cruft &&
-
-		# Without this object, the set of unpacked objects is exactly
-		# the set of objects already in the cruft pack. Tweak that set
-		# to ensure we do not overwrite the cruft pack entirely.
-		test_commit reachable2 &&
-
-		find $packdir -name "pack-*.idx" | sort >before &&
-		git repack --geometric=2 -d &&
-		find $packdir -name "pack-*.idx" | sort >after &&
-
-		{
-			git rev-list --objects --no-object-names $cruft &&
-			git rev-list --objects --no-object-names reachable..reachable2
-		} >want.raw &&
-		sort want.raw >want &&
-
-		pack=$(comm -13 before after) &&
-		git show-index <$pack >objects.raw &&
-
-		cut -d" " -f2 objects.raw | sort >got &&
-
-		test_cmp want got
+		broken commit
+		EOF
+		broken="$(git hash-object -w -t commit --literally broken)" &&
+		git commit-tree -p "$broken" -m "good" "$tree" >good &&
+		test_must_fail git commit-graph write --stdin-commits \
+			<good 2>test_err &&
+		test_grep "unable to parse commit" test_err
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 7dd88f0] reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-Switched to a new branch 'other'
-rm 'reachable.t'
-[other (root-commit) 86057ae] cruft
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-Switched to branch 'main'
-Deleted branch other (was 86057ae).
-[main 2f90f70] reachable2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 reachable2.t
-ok 21 - repack --geometric collects once-cruft objects
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+fatal: unable to parse commit 2b6f5e209fea0912fdff2d553964d7a56d9fd44d
+ok 97 - corrupt commit-graph write (missing tree)
+
+expecting success of 5318.98 'set up and verify repo with generation data overflow chunk': 
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	FUTURE_DATE="@2147483646 +0000" &&
 
-expecting success of 5329.22 'cruft repack with no reachable objects': 
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
 
-		test_commit base &&
-		git repack -ad &&
-
-		base="$(git rev-parse base)" &&
-
-		git for-each-ref --format="delete %(refname)" >in &&
-		git update-ref --stdin <in &&
-		git reflog expire --all --expire=all &&
-		rm -fr .git/index &&
-
-		git repack --cruft -d &&
-
-		git cat-file -t $base
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Nothing new to pack.
-commit
-ok 22 - cruft repack with no reachable objects
-
-expecting success of 5329.23 'cruft repack with --max-pack-size': 
-	git init max-pack-size &&
-	(
-		cd max-pack-size &&
-		test_commit base &&
-
-		# two cruft objects which exceed the maximum pack size
-		foo=$(write_blob foo 1048576) &&
-		bar=$(write_blob bar 1048576) &&
-		test-tool chmtime --get -1000 \
-			"$objdir/$(test_oid_to_path $foo)" >foo.mtime &&
-		test-tool chmtime --get -2000 \
-			"$objdir/$(test_oid_to_path $bar)" >bar.mtime &&
-		git repack --cruft --max-pack-size=1M &&
-		find $packdir -name "*.mtimes" >cruft &&
-		test_line_count = 2 cruft &&
-
-		foo_mtimes="$(basename $(find_pack $foo) .idx).mtimes" &&
-		bar_mtimes="$(basename $(find_pack $bar) .idx).mtimes" &&
-		test-tool pack-mtimes $foo_mtimes >foo.actual &&
-		test-tool pack-mtimes $bar_mtimes >bar.actual &&
-
-		echo "$foo $(cat foo.mtime)" >foo.expect &&
-		echo "$bar $(cat bar.mtime)" >bar.expect &&
-
-		test_cmp foo.expect foo.actual &&
-		test_cmp bar.expect bar.actual &&
-		test "$foo_mtimes" != "$bar_mtimes"
+		test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
+		test_commit 2 &&
+		test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
+		git commit-graph write --reachable &&
+		graph_read_expect 3 generation_data &&
+		test_commit --date "$FUTURE_DATE" 4 &&
+		test_commit 5 &&
+		test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
+		git branch left &&
+		git reset --hard 3 &&
+		test_commit 7 &&
+		test_commit --date "$FUTURE_DATE" 8 &&
+		test_commit 9 &&
+		git branch right &&
+		git reset --hard 3 &&
+		test_merge M left right &&
+		git commit-graph write --reachable &&
+		graph_read_expect 10 "generation_data generation_data_overflow" &&
+		git commit-graph verify
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/max-pack-size/.git/
-[master (root-commit) d1ff1c9] base
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+[master (root-commit) 0131a52] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 23 - cruft repack with --max-pack-size
-
-expecting success of 5329.24 'cruft repack with pack.packSizeLimit': 
-	(
-		cd max-pack-size &&
-		# repack everything back together to remove the existing cruft
-		# pack (but to keep its objects)
-		git repack -adk &&
-		git -c pack.packSizeLimit=1M repack --cruft &&
-		# ensure the same post condition is met when --max-pack-size
-		# would otherwise be inferred from the configuration
-		find $packdir -name "*.mtimes" >cruft &&
-		test_line_count = 2 cruft &&
-		for pack in $(cat cruft)
-		do
-			test-tool pack-mtimes "$(basename $pack)" >objects &&
-			test_line_count = 1 objects || return 1
-		done
-	)
-
-ok 24 - cruft repack with pack.packSizeLimit
-
-expecting success of 5329.25 'cruft repack respects repack.cruftWindow': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit base &&
-
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-		git -c pack.window=1 -c repack.cruftWindow=2 repack \
-		       --cruft --window=3 &&
-
-		grep "pack-objects.*--window=2.*--cruft" event.trace
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 1.t
+[master 4f95b2b] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-{"event":"child_start","sid":"20260419T192040.904494Z-H8d819085-P001eb3bc","thread":"main","time":"2026-04-19T19:20:40.912678Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-2012092-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20260419T192040.904494Z-H8d819085-P001eb3bc/20260419T192040.920531Z-H8d819085-P001eb3ce","thread":"main","time":"2026-04-19T19:20:40.920597Z","file":"common-init.c","line":58,"t_abs":0.000249,"argv":["/build/reproducible-path/git-2.49.0+next.20250314/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-2012092-pack","--cruft","--honor-pack-keep","--non-empty"]}
-ok 25 - cruft repack respects repack.cruftWindow
-
-expecting success of 5329.26 'cruft repack respects --window by default': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit base &&
-
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-		git -c pack.window=2 repack --cruft --window=3 &&
-
-		grep "pack-objects.*--window=3.*--cruft" event.trace
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 2.t
+[master cc847a9] 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-{"event":"child_start","sid":"20260419T192041.038937Z-H8d819085-P001eb44a","thread":"main","time":"2026-04-19T19:20:41.051291Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-2012234-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20260419T192041.038937Z-H8d819085-P001eb44a/20260419T192041.059670Z-H8d819085-P001eb45b","thread":"main","time":"2026-04-19T19:20:41.059740Z","file":"common-init.c","line":58,"t_abs":0.000249,"argv":["/build/reproducible-path/git-2.49.0+next.20250314/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-2012234-pack","--cruft","--honor-pack-keep","--non-empty"]}
-ok 26 - cruft repack respects --window by default
-
-expecting success of 5329.27 'cruft repack respects --quiet': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit base &&
-		GIT_PROGRESS_DELAY=0 git repack --cruft --quiet 2>err &&
-		test_must_be_empty err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 3.t
+[master 9e173a3] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 27 - cruft repack respects --quiet
-
-expecting success of 5329.28 'cruft --local drops unreachable objects': 
-	git init alternate &&
-	git init repo &&
-	test_when_finished "rm -fr alternate repo" &&
-
-	test_commit -C alternate base &&
-	# Pack all objects in alternate so that the cruft repack in "repo" sees
-	# the object it dropped due to `--local` as packed. Otherwise this
-	# object would not appear packed anywhere (since it is not packed in
-	# alternate and likewise not part of the cruft pack in the other repo
-	# because of `--local`).
-	git -C alternate repack -ad &&
-
-	(
-		cd repo &&
-
-		object="$(git -C ../alternate rev-parse HEAD:base.t)" &&
-		git -C ../alternate cat-file -p $object >contents &&
-
-		# Write some reachable objects and two unreachable ones: one
-		# that the alternate has and another that is unique.
-		test_commit other &&
-		git hash-object -w -t blob contents &&
-		cruft="$(echo cruft | git hash-object -w -t blob --stdin)" &&
-
-		( cd ../alternate/.git/objects && pwd ) \
-		       >.git/objects/info/alternates &&
-
-		test_path_is_file $objdir/$(test_oid_to_path $cruft) &&
-		test_path_is_file $objdir/$(test_oid_to_path $object) &&
-
-		git repack -d --cruft --local &&
-
-		test-tool pack-mtimes "$(basename $(ls $packdir/pack-*.mtimes))" \
-		       >objects &&
-		! grep $object objects &&
-		grep $cruft objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/alternate/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 4.t
+[master cab57f8] 5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master (root-commit) 5e824fb] other
+ create mode 100644 5.t
+[master bbde0d8] 6
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 other.t
-df967b96a579e45a18b8251732d16804b2e56a55
-822216280fd1de308f55f27cdd7a4196a8f5a189 1776626441
-ok 28 - cruft --local drops unreachable objects
-
-expecting success of 5329.29 'MIDX bitmaps tolerate reachable cruft objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit reachable &&
-		test_commit cruft &&
-		unreachable="$(git rev-parse cruft)" &&
-
-		git reset --hard $unreachable^ &&
-		git tag -d cruft &&
-		git reflog expire --all --expire=all &&
-
-		git repack --cruft -d &&
-
-		# resurrect the unreachable object via a new commit. the
-		# new commit will get selected for a bitmap, but be
-		# missing one of its parents from the selected packs.
-		git reset --hard $unreachable &&
-		test_commit resurrect &&
-
-		git repack --write-midx --write-bitmap-index --geometric=2 -d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 493cdad] reachable
+ create mode 100644 6.t
+HEAD is now at cc847a9 3
+[master ba5c16d] 7
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 reachable.t
-[master 40cbb3e] cruft
+ create mode 100644 7.t
+[master 1aff441] 8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-HEAD is now at 493cdad reachable
-Deleted tag 'cruft' (was 40cbb3e)
-HEAD is now at 40cbb3e cruft
-[master 8ec3079] resurrect
+ create mode 100644 8.t
+[master 1ec2f73] 9
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 resurrect.t
-ok 29 - MIDX bitmaps tolerate reachable cruft objects
-
-expecting success of 5329.30 'cruft objects are freshend via loose': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		echo "cruft" >contents &&
-		blob="$(git hash-object -w -t blob contents)" &&
-		loose="$objdir/$(test_oid_to_path $blob)" &&
+ create mode 100644 9.t
+HEAD is now at cc847a9 3
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ 4.t | 1 +
+ 5.t | 1 +
+ 6.t | 1 +
+ 7.t | 1 +
+ 8.t | 1 +
+ 9.t | 1 +
+ 6 files changed, 6 insertions(+)
+ create mode 100644 4.t
+ create mode 100644 5.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ create mode 100644 8.t
+ create mode 100644 9.t
+ok 98 - set up and verify repo with generation data overflow chunk
 
-		test_commit base &&
+expecting success of 5318.99 'check normal git operations: generation data overflow chunk repo': 
+		graph_git_two_modes "${DIR:+-C $DIR} log --oneline $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --topo-order $BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} log --graph $COMPARE..$BRANCH" &&
+		graph_git_two_modes "${DIR:+-C $DIR} branch -vv" &&
+		graph_git_two_modes "${DIR:+-C $DIR} merge-base -a $BRANCH $COMPARE"
+	
+ok 99 - check normal git operations: generation data overflow chunk repo
 
-		git repack --cruft -d &&
+expecting success of 5318.100 'overflow during generation version upgrade': 
+	git init overflow-v2-upgrade &&
+	(
+		cd overflow-v2-upgrade &&
 
-		test_path_is_missing "$loose" &&
-		test-tool pack-mtimes "$(basename "$(ls $packdir/pack-*.mtimes)")" >cruft &&
-		grep "$blob" cruft &&
+		# This commit will have a date at two seconds past the Epoch,
+		# and a (v1) generation number of 1, since it is a root commit.
+		#
+		# The offset will then be computed as 1-2, which will underflow
+		# to 2^31, which is greater than the v2 offset small limit of
+		# 2^31-1.
+		#
+		# This is sufficient to need a large offset table for the v2
+		# generation numbers.
+		test_commit --date "@2 +0000" base &&
+		git repack -d &&
 
-		# write the same object again
-		git hash-object -w -t blob contents &&
+		# Test that upgrading from generation v1 to v2 correctly
+		# produces the overflow table.
+		git -c commitGraph.generationVersion=1 commit-graph write &&
+		git -c commitGraph.generationVersion=2 commit-graph write \
+			--changed-paths &&
 
-		test_path_is_file "$loose"
+		git rev-list --all
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 369f281] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/overflow-v2-upgrade/.git/
+[master (root-commit) b89bafe] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-822216280fd1de308f55f27cdd7a4196a8f5a189 1776626442
-822216280fd1de308f55f27cdd7a4196a8f5a189
-ok 30 - cruft objects are freshend via loose
-
-expecting success of 5329.31 'gc.recentObjectsHook': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		# Create a handful of objects.
-		#
-		#   - one reachable commit, "base", designated for the reachable
-		#     pack
-		#   - one unreachable commit, "cruft.discard", which is marked
-		#     for deletion
-		#   - one unreachable commit, "cruft.old", which would be marked
-		#     for deletion, but is rescued as an extra cruft tip
-		#   - one unreachable commit, "cruft.new", which is not marked
-		#     for deletion
-		test_commit base &&
-		git branch -M main &&
-
-		git checkout --orphan discard &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.discard &&
-
-		git checkout --orphan old &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.old &&
-		cruft_old="$(git rev-parse HEAD)" &&
+b89bafebd219ef84734f57391e155dcedaccac5c
+ok 100 - overflow during generation version upgrade
 
-		git checkout --orphan new &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.new &&
-		cruft_new="$(git rev-parse HEAD)" &&
+expecting success of 5318.101 'reader notices too-small oid fanout chunk': 
+	# make it big enough that the graph file is plausible,
+	# otherwise we hit an earlier check
+	check_corrupt_chunk OIDF clear $(printf "000000%02x" $(test_seq 250)) &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph oid fanout chunk is wrong size
+	error: commit-graph required OID fanout chunk missing or corrupted
+	EOF
+	test_cmp expect.err err
 
-		git checkout main &&
-		git branch -D discard old new &&
-		git reflog expire --all --expire=all &&
+ok 101 - reader notices too-small oid fanout chunk
 
-		# mark cruft.old with an mtime that is many minutes
-		# older than the expiration period, and mark cruft.new
-		# with an mtime that is in the future (and thus not
-		# eligible for pruning).
-		test-tool chmtime -2000 "$objdir/$(test_oid_to_path $cruft_old)" &&
-		test-tool chmtime +1000 "$objdir/$(test_oid_to_path $cruft_new)" &&
+expecting success of 5318.102 'reader notices fanout/lookup table mismatch': 
+	check_corrupt_chunk OIDF 1020 "FFFFFFFF" &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph OID lookup chunk is the wrong size
+	error: commit-graph required OID lookup chunk missing or corrupted
+	EOF
+	test_cmp expect.err err
 
-		# Write the list of cruft objects we expect to
-		# accumulate, which is comprised of everything reachable
-		# from cruft.old and cruft.new, but not cruft.discard.
-		git rev-list --objects --no-object-names \
-			$cruft_old $cruft_new >cruft.raw &&
-		sort cruft.raw >cruft.expect &&
+ok 102 - reader notices fanout/lookup table mismatch
 
-		# Write the script to list extra tips, which are limited
-		# to cruft.old, in this case.
-		write_script extra-tips <<-EOF &&
-		echo $cruft_old
-		EOF
-		git config gc.recentObjectsHook ./extra-tips &&
+expecting success of 5318.103 'reader notices out-of-bounds fanout': 
+	# Rather than try to corrupt a specific hash, we will just
+	# wreck them all. But we cannot just set them all to 0xFFFFFFFF or
+	# similar, as they are used for hi/lo starts in a binary search (so if
+	# they are identical, that indicates that the search should abort
+	# immediately). Instead, we will give them high values that differ by
+	# 2^24, ensuring that any that are used would cause an out-of-bounds
+	# read.
+	check_corrupt_chunk OIDF 0 $(printf "%02x000000" $(test_seq 0 254)) &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph fanout values out of order
+	error: commit-graph required OID fanout chunk missing or corrupted
+	EOF
+	test_cmp expect.err err
 
-		git repack --cruft --cruft-expiration=now -d &&
+ok 103 - reader notices out-of-bounds fanout
 
-		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
-		git show-index <${mtimes%.mtimes}.idx >cruft &&
-		cut -d" " -f2 cruft | sort >cruft.actual &&
-		test_cmp cruft.expect cruft.actual &&
+expecting success of 5318.104 'reader notices too-small commit data chunk': 
+	check_corrupt_chunk CDAT clear 00000000 &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph commit data chunk is wrong size
+	error: commit-graph required commit data chunk missing or corrupted
+	EOF
+	test_cmp expect.err err
 
-		# Ensure that the "old" objects are removed after
-		# dropping the gc.recentObjectsHook hook.
-		git config --unset gc.recentObjectsHook &&
-		git repack --cruft --cruft-expiration=now -d &&
+ok 104 - reader notices too-small commit data chunk
 
-		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
-		git show-index <${mtimes%.mtimes}.idx >cruft &&
-		cut -d" " -f2 cruft | sort >cruft.actual &&
+expecting success of 5318.105 'reader notices out-of-bounds extra edge': 
+	check_corrupt_chunk EDGE clear &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph extra-edges pointer out of bounds
+	EOF
+	test_cmp expect.err err
 
-		git rev-list --objects --no-object-names $cruft_new >cruft.raw &&
-		cp cruft.expect cruft.old &&
-		sort cruft.raw >cruft.expect &&
-		test_cmp cruft.expect cruft.actual &&
+ok 105 - reader notices out-of-bounds extra edge
 
-		# ensure objects which are no longer in the cruft pack were
-		# removed from the repository
-		for object in $(comm -13 cruft.expect cruft.old)
-		do
-			test_must_fail git cat-file -t $object || return 1
-		done
-	)
+expecting success of 5318.106 'reader notices too-small generations chunk': 
+	check_corrupt_chunk GDA2 clear 00000000 &&
+	cat >expect.err <<-\EOF &&
+	error: commit-graph generations chunk is wrong size
+	EOF
+	test_cmp expect.err err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 369f281] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'discard'
-rm 'base.t'
-[discard (root-commit) 940beaa] cruft.discard
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.discard.t
-Switched to a new branch 'old'
-rm 'cruft.discard.t'
-[old (root-commit) 8b04162] cruft.old
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.old.t
-Switched to a new branch 'new'
-rm 'cruft.old.t'
-[new (root-commit) 5fdf92f] cruft.new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.new.t
-Switched to branch 'main'
-Deleted branch discard (was 940beaa).
-Deleted branch old (was 8b04162).
-Deleted branch new (was 5fdf92f).
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-fatal: git cat-file: could not get object info
-ok 31 - gc.recentObjectsHook
+ok 106 - reader notices too-small generations chunk
 
-expecting success of 5329.32 'multi-valued gc.recentObjectsHook': 
+expecting success of 5318.107 'stale commit cannot be parsed when given directly': 
+	test_when_finished "rm -rf repo" &&
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
+		test_commit A &&
+		test_commit B &&
+		git commit-graph write --reachable &&
 
-		test_commit base &&
-		git branch -M main &&
-
-		git checkout --orphan cruft.a &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.a &&
-		cruft_a="$(git rev-parse HEAD)" &&
-
-		git checkout --orphan cruft.b &&
-		git rm -fr . &&
-		test_commit --no-tag cruft.b &&
-		cruft_b="$(git rev-parse HEAD)" &&
-
-		git checkout main &&
-		git branch -D cruft.a cruft.b &&
-		git reflog expire --all --expire=all &&
-
-		echo "echo $cruft_a" | write_script extra-tips.a &&
-		echo "echo $cruft_b" | write_script extra-tips.b &&
-		echo "false" | write_script extra-tips.c &&
-
-		git rev-list --objects --no-object-names $cruft_a $cruft_b \
-			>cruft.raw &&
-		sort cruft.raw >cruft.expect &&
-
-		# ensure that each extra cruft tip is saved by its
-		# respective hook
-		git config --add gc.recentObjectsHook ./extra-tips.a &&
-		git config --add gc.recentObjectsHook ./extra-tips.b &&
-		git repack --cruft --cruft-expiration=now -d &&
-
-		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
-		git show-index <${mtimes%.mtimes}.idx >cruft &&
-		cut -d" " -f2 cruft | sort >cruft.actual &&
-		test_cmp cruft.expect cruft.actual &&
-
-		# ensure that a dirty exit halts cruft pack generation
-		git config --add gc.recentObjectsHook ./extra-tips.c &&
-		test_must_fail git repack --cruft --cruft-expiration=now -d 2>err &&
-		grep "unable to enumerate additional recent objects" err &&
+		oid=$(git rev-parse B) &&
+		rm .git/objects/"$(test_oid_to_path "$oid")" &&
 
-		# and that the existing cruft pack is left alone
-		test_path_is_file "$mtimes"
+		# Verify that it is possible to read the commit from the
+		# commit graph when not being paranoid, ...
+		git rev-list B &&
+		# ... but parsing the commit when double checking that
+		# it actually exists in the object database should fail.
+		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git rev-list -1 B
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 369f281] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'cruft.a'
-rm 'base.t'
-[cruft.a (root-commit) 66c55c9] cruft.a
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+[master ec9b0a6] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.a.t
-Switched to a new branch 'cruft.b'
-rm 'cruft.a.t'
-[cruft.b (root-commit) 8ed764a] cruft.b
+ create mode 100644 A.t
+[master 4ce4c2d] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.b.t
-Switched to branch 'main'
-Deleted branch cruft.a (was 66c55c9).
-Deleted branch cruft.b (was 8ed764a).
-fatal: unable to enumerate additional recent objects
-ok 32 - multi-valued gc.recentObjectsHook
+ create mode 100644 B.t
+4ce4c2dd91e9274c0280f34899910be5280a212f
+ec9b0a6026410c76ea802a28c63306cae515d79c
+e232eea4162ac4a150df853660fe559b8f4c18a8
+1ec2f738fee7d641d5af591c8e66c54adf3125b2
+1aff441de16d4d24b3a26f415c0aacc14333ed39
+ba5c16dea715f21dda4de1a30b8ecf43d7d781f8
+bbde0d8f331bdc35c673bbf48300cd03e910b970
+cab57f810cdcf4a0498303b4ec70930c86897754
+9e173a30fffe69dccc60ccd93ebe58e2a34b0a58
+cc847a9bf65c437ae1ac983dc2dd6762256273b0
+4f95b2b0d79c5304fc4a714ae540929c9b303383
+0131a52e860a1b5c28428087ba172f3116f34c9c
+fatal: bad object B
+ok 107 - stale commit cannot be parsed when given directly
 
-expecting success of 5329.33 'additional cruft blobs via gc.recentObjectsHook': 
+expecting success of 5318.108 'stale commit cannot be parsed when traversing graph': 
+	test_when_finished "rm -rf repo" &&
 	git init repo &&
-	test_when_finished "rm -fr repo" &&
 	(
 		cd repo &&
 
-		test_commit base &&
-
-		blob=$(echo "unreachable" | git hash-object -w --stdin) &&
-
-		# mark the unreachable blob we wrote above as having
-		# aged out of the retention period
-		test-tool chmtime -2000 "$objdir/$(test_oid_to_path $blob)" &&
-
-		# Write the script to list extra tips, which is just the
-		# extra blob as above.
-		write_script extra-tips <<-EOF &&
-		echo $blob
-		EOF
-		git config gc.recentObjectsHook ./extra-tips &&
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+		git commit-graph write --reachable &&
 
-		git repack --cruft --cruft-expiration=now -d &&
+		# Corrupt the repository by deleting the intermediate commit
+		# object. Commands should notice that this object is absent and
+		# thus that the repository is corrupt even if the commit graph
+		# exists.
+		oid=$(git rev-parse B) &&
+		rm .git/objects/"$(test_oid_to_path "$oid")" &&
 
-		mtimes="$(ls .git/objects/pack/pack-*.mtimes)" &&
-		git show-index <${mtimes%.mtimes}.idx >cruft &&
-		cut -d" " -f2 cruft >actual &&
-		echo $blob >expect &&
-		test_cmp expect actual
+		# Again, we should be able to parse the commit when not
+		# being paranoid about commit graph staleness...
+		git rev-parse HEAD~2 &&
+		# ... but fail when we are paranoid.
+		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git rev-parse HEAD~2 2>error &&
+		grep "error: commit $oid exists in commit-graph but not in the object database" error
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5329-pack-objects-cruft/repo/.git/
-[master (root-commit) 369f281] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5318-commit-graph/repo/.git/
+[master (root-commit) 3c1b37b] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 33 - additional cruft blobs via gc.recentObjectsHook
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5406-remote-rejects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5406-remote-rejects/.git/
-expecting success of 5406.1 'setup': 
-	test_hook update <<-\EOF &&
-	exit 1
-	EOF
-	echo 1 >file &&
-	git add file &&
-	git commit -m 1 &&
-	git clone . child &&
-	cd child &&
-	echo 2 >file &&
-	git commit -a -m 2
-
-[master (root-commit) c663a66] 1
+ create mode 100644 A.t
+[master f3c5d37] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'child'...
-done.
-[master ee88fdb] 2
+ create mode 100644 B.t
+[master 6bb8ed6] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 5406.2 'push reports error': test_must_fail git push 2>stderr
-ok 2 - push reports error
-
-expecting success of 5406.3 'individual ref reports error': grep rejected stderr
- ! [remote rejected] master -> master (branch is currently checked out)
-ok 3 - individual ref reports error
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+3c1b37b341cf4e11f66c3e51699199663d78f843
+HEAD~2
+error: commit f3c5d3779f8e819fef7add26e472597097053fd4 exists in commit-graph but not in the object database
+error: commit f3c5d3779f8e819fef7add26e472597097053fd4 exists in commit-graph but not in the object database
+ok 108 - stale commit cannot be parsed when traversing graph
 
-# passed all 3 test(s)
-1..3
+# passed all 108 test(s)
+1..108
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5410-receive-pack-alternates.sh ***
@@ -316109,6 +316062,326 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5408-send-pack-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/.git/
+expecting success of 5408.1 'setup refs': 
+	cat >refs <<-\EOF &&
+	refs/heads/A
+	refs/heads/C
+	refs/tags/D
+	refs/heads/B
+	refs/tags/E
+	EOF
+	for i in $(cat refs); do
+		create_ref $i || return 1
+	done
+
+ok 1 - setup refs
+
+expecting success of 5408.2 'refs on cmdline': 
+	clear_remote &&
+	git send-pack remote.git $(cat refs) &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> A
+ * [new branch]      C -> C
+ * [new tag]         D -> D
+ * [new branch]      B -> B
+ * [new tag]         E -> E
+ok 2 - refs on cmdline
+
+expecting success of 5408.3 'refs over stdin': 
+	clear_remote &&
+	git send-pack remote.git --stdin <refs &&
+	for i in $(cat refs); do
+		verify_push $i || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> A
+ * [new branch]      C -> C
+ * [new tag]         D -> D
+ * [new branch]      B -> B
+ * [new tag]         E -> E
+ok 3 - refs over stdin
+
+expecting success of 5408.4 'stdin lines are full refspecs': 
+	clear_remote &&
+	echo "A:other" >input &&
+	git send-pack remote.git --stdin <input &&
+	verify_push refs/heads/A refs/heads/other
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      A -> other
+ok 4 - stdin lines are full refspecs
+
+expecting success of 5408.5 'stdin mixed with cmdline': 
+	clear_remote &&
+	echo A >input &&
+	git send-pack remote.git --stdin B <input &&
+	verify_push A &&
+	verify_push B
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+To remote.git
+ * [new branch]      B -> B
+ * [new branch]      A -> A
+ok 5 - stdin mixed with cmdline
+
+expecting success of 5408.6 'cmdline refs written in order': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git A:foo B:foo &&
+	verify_push A foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ ! [remote rejected] A -> foo (failed to update ref)
+ ! [remote failure]  B -> foo (remote failed to report status)
+ok 6 - cmdline refs written in order
+
+expecting success of 5408.7 '--stdin refs come after cmdline': 
+	clear_remote &&
+	echo A:foo >input &&
+	test_must_fail git send-pack remote.git --stdin B:foo <input &&
+	verify_push B foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
+To remote.git
+ ! [remote rejected] B -> foo (failed to update ref)
+ ! [remote failure]  A -> foo (remote failed to report status)
+ok 7 - --stdin refs come after cmdline
+
+expecting success of 5408.8 'refspecs and --mirror do not mix (cmdline)': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror $(cat refs)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--mirror] [--dry-run] [--force]
+                     [--receive-pack=<git-receive-pack>]
+                     [--verbose] [--thin] [--atomic]
+                     [--[no-]signed | --signed=(true|false|if-asked)]
+                     [<host>:]<directory> (--all | <ref>...)
+
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]receive-pack <receive-pack>
+                          receive pack program
+    --[no-]exec <receive-pack>
+                          receive pack program
+    --[no-]remote <remote>
+                          remote name
+    --[no-]all            push all refs
+    -n, --[no-]dry-run    dry run
+    --[no-]mirror         mirror all refs
+    -f, --[no-]force      force updates
+    --[no-]signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --[no-]push-option <server-specific>
+                          option to transmit
+    --[no-]progress       force progress reporting
+    --[no-]thin           use thin pack
+    --[no-]atomic         request atomic transaction on remote side
+    --[no-]stateless-rpc  use stateless RPC protocol
+    --[no-]stdin          read refs from stdin
+    --[no-]helper-status  print status from remote helper
+    --[no-]force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+    --[no-]force-if-includes
+                          require remote updates to be integrated locally
+
+ok 8 - refspecs and --mirror do not mix (cmdline)
+
+expecting success of 5408.9 'refspecs and --mirror do not mix (stdin)': 
+	clear_remote &&
+	test_must_fail git send-pack remote.git --mirror --stdin <refs
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
+usage: git send-pack [--mirror] [--dry-run] [--force]
+                     [--receive-pack=<git-receive-pack>]
+                     [--verbose] [--thin] [--atomic]
+                     [--[no-]signed | --signed=(true|false|if-asked)]
+                     [<host>:]<directory> (--all | <ref>...)
+
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]receive-pack <receive-pack>
+                          receive pack program
+    --[no-]exec <receive-pack>
+                          receive pack program
+    --[no-]remote <remote>
+                          remote name
+    --[no-]all            push all refs
+    -n, --[no-]dry-run    dry run
+    --[no-]mirror         mirror all refs
+    -f, --[no-]force      force updates
+    --[no-]signed[=(yes|no|if-asked)]
+                          GPG sign the push
+    --[no-]push-option <server-specific>
+                          option to transmit
+    --[no-]progress       force progress reporting
+    --[no-]thin           use thin pack
+    --[no-]atomic         request atomic transaction on remote side
+    --[no-]stateless-rpc  use stateless RPC protocol
+    --[no-]stdin          read refs from stdin
+    --[no-]helper-status  print status from remote helper
+    --[no-]force-with-lease[=<refname>:<expect>]
+                          require old value of ref to be at this value
+    --[no-]force-if-includes
+                          require remote updates to be integrated locally
+
+ok 9 - refspecs and --mirror do not mix (stdin)
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5409-colorize-remote-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5409-colorize-remote-messages/.git/
+expecting success of 5409.1 'setup': 
+	test_hook --setup update <<-\EOF &&
+	echo error: error
+	echo ERROR: also highlighted
+	echo hint: hint
+	echo hinting: not highlighted
+	echo success: success
+	echo warning: warning
+	echo prefixerror: error
+	echo " " "error: leading space"
+	echo "    "
+	echo Err
+	echo SUCCESS
+	exit 0
+	EOF
+	echo 1 >file &&
+	git add file &&
+	git commit -m 1 &&
+	git clone . child &&
+	(
+		cd child &&
+		test_commit message2 file content2
+	)
+
+[master (root-commit) c663a66] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'child'...
+done.
+[master 9f21087] message2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 5409.2 'keywords': 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/keywords 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded &&
+	grep "<YELLOW>hint<RESET>:" decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded &&
+	grep "<BOLD;GREEN>SUCCESS<RESET>" decoded &&
+	grep "<BOLD;YELLOW>warning<RESET>:" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+remote: <YELLOW>hint<RESET>: hint        
+remote: <BOLD;GREEN>success<RESET>: success        
+remote: <BOLD;GREEN>SUCCESS<RESET>        
+remote: <BOLD;YELLOW>warning<RESET>: warning        
+ok 2 - keywords
+
+expecting success of 5409.3 'whole words at line start': 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/whole-words 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<YELLOW>hint<RESET>:" decoded &&
+	grep "hinting: not highlighted" decoded &&
+	grep "prefixerror: error" decoded
+
+remote: <YELLOW>hint<RESET>: hint        
+remote: hinting: not highlighted        
+remote: prefixerror: error        
+ok 3 - whole words at line start
+
+expecting success of 5409.4 'short line': 
+	git -C child -c color.remote=always push -f origin HEAD:short-line 2>output &&
+	test_decode_color <output >decoded &&
+	grep "remote: Err" decoded
+
+remote: Err        
+ok 4 - short line
+
+expecting success of 5409.5 'case-insensitive': 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded &&
+	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+remote: <BOLD;RED>ERROR<RESET>: also highlighted        
+ok 5 - case-insensitive
+
+expecting success of 5409.6 'leading space': 
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
+	test_decode_color <output >decoded &&
+	grep "  <BOLD;RED>error<RESET>: leading space" decoded
+
+remote:   <BOLD;RED>error<RESET>: leading space        
+ok 6 - leading space
+
+expecting success of 5409.7 'spaces only': 
+	git -C child -c color.remote=always push -f origin HEAD:only-space 2>output &&
+	test_decode_color <output >decoded &&
+	grep "remote:     " decoded
+
+remote:             
+ok 7 - spaces only
+
+expecting success of 5409.8 'no coloring for redirected output': 
+	git --git-dir child/.git push -f origin HEAD:refs/heads/redirected-output 2>output &&
+	test_decode_color <output >decoded &&
+	grep "error: error" decoded
+
+remote: error: error        
+remote: prefixerror: error        
+ok 8 - no coloring for redirected output
+
+expecting success of 5409.9 'push with customized color': 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BLUE>error<RESET>:" decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BLUE>error<RESET>: error        
+remote:   <BLUE>error<RESET>: leading space        
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 9 - push with customized color
+
+expecting success of 5409.10 'error in customized color': 
+	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;GREEN>success<RESET>:" decoded
+
+remote: <BOLD;GREEN>success<RESET>: success        
+ok 10 - error in customized color
+
+expecting success of 5409.11 'fallback to color.ui': 
+	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
+	test_decode_color <output >decoded &&
+	grep "<BOLD;RED>error<RESET>: error" decoded
+
+remote: <BOLD;RED>error<RESET>: error        
+ok 11 - fallback to color.ui
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5333-pseudo-merge-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5333-pseudo-merge-bitmaps/.git/
 expecting success of 5333.1 'setup': 
@@ -316156,8 +316429,8 @@
 	test_must_be_empty merges &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20260419T192036.460354Z-H8d819085-P001ea358","thread":"main","time":"2026-04-19T19:20:36.488106Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.027933,"t_rel":0.027933,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
-{"event":"data","sid":"20260419T192036.460354Z-H8d819085-P001ea358","thread":"main","time":"2026-04-19T19:20:36.488114Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.027941,"t_rel":0.027941,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"0"}
+{"event":"data","sid":"20250317T132328.186323Z-H5c947e1c-P00313a24","thread":"main","time":"2025-03-17T13:23:28.201054Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.014933,"t_rel":0.014933,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"0"}
+{"event":"data","sid":"20250317T132328.186323Z-H5c947e1c-P00313a24","thread":"main","time":"2025-03-17T13:23:28.201062Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.014941,"t_rel":0.014941,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"0"}
 ok 2 - bitmap traversal without pseudo-merges
 
 expecting success of 5333.3 'pseudo-merges accurately represent their objects': 
@@ -316195,8 +316468,8 @@
 	test_pseudo_merges_cascades 1 <trace2.txt &&
 	test_cmp expect actual
 
-{"event":"data","sid":"20260419T192037.868583Z-H8d819085-P001ea8af","thread":"main","time":"2026-04-19T19:20:37.888517Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.020129,"t_rel":0.020129,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20260419T192037.868583Z-H8d819085-P001ea8af","thread":"main","time":"2026-04-19T19:20:37.888524Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.020136,"t_rel":0.020136,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250317T132329.887684Z-H5c947e1c-P00313f47","thread":"main","time":"2025-03-17T13:23:29.910538Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.023026,"t_rel":0.023026,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20250317T132329.887684Z-H5c947e1c-P00313f47","thread":"main","time":"2025-03-17T13:23:29.910546Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.023034,"t_rel":0.023034,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
 ok 4 - bitmap traversal with pseudo-merges
 
 expecting success of 5333.5 'stale bitmap traversal with pseudo-merges': 
@@ -316215,8 +316488,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260419T192038.048398Z-H8d819085-P001ea96d","thread":"main","time":"2026-04-19T19:20:38.056093Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.007893,"t_rel":0.007893,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
-{"event":"data","sid":"20260419T192038.048398Z-H8d819085-P001ea96d","thread":"main","time":"2026-04-19T19:20:38.056107Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.007908,"t_rel":0.007908,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250317T132330.183760Z-H5c947e1c-P0031402a","thread":"main","time":"2025-03-17T13:23:30.211261Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.027690,"t_rel":0.027690,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"8"}
+{"event":"data","sid":"20250317T132330.183760Z-H5c947e1c-P0031402a","thread":"main","time":"2025-03-17T13:23:30.211273Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.027703,"t_rel":0.027703,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
 ok 5 - stale bitmap traversal with pseudo-merges
 
 expecting success of 5333.6 'bitmapPseudoMerge.sampleRate adjusts commit selection rate': 
@@ -316761,8 +317034,8 @@
 		test_cmp expect actual
 	)
 
-{"event":"data","sid":"20260419T192045.404409Z-H8d819085-P001ec2b1","thread":"main","time":"2026-04-19T19:20:45.416542Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.012323,"t_rel":0.012323,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20260419T192045.404409Z-H8d819085-P001ec2b1","thread":"main","time":"2026-04-19T19:20:45.416549Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.012330,"t_rel":0.012330,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250317T132338.563667Z-H5c947e1c-P00315c0d","thread":"main","time":"2025-03-17T13:23:38.579729Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.016234,"t_rel":0.016234,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20250317T132338.563667Z-H5c947e1c-P00315c0d","thread":"main","time":"2025-03-17T13:23:38.579737Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.016242,"t_rel":0.016242,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
 ok 13 - pseudo-merge overlap traversal
 
 expecting success of 5333.14 'pseudo-merge overlap stale traversal': 
@@ -316785,8 +317058,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-{"event":"data","sid":"20260419T192045.632045Z-H8d819085-P001ec36e","thread":"main","time":"2026-04-19T19:20:45.638256Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.006393,"t_rel":0.006393,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
-{"event":"data","sid":"20260419T192045.632045Z-H8d819085-P001ec36e","thread":"main","time":"2026-04-19T19:20:45.638269Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.006407,"t_rel":0.006407,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
+{"event":"data","sid":"20250317T132338.863924Z-H5c947e1c-P00315d14","thread":"main","time":"2025-03-17T13:23:38.876987Z","file":"pack-bitmap.c","line":2036,"repo":1,"t_abs":0.013251,"t_rel":0.013251,"nesting":1,"category":"bitmap","key":"pseudo_merges_satisfied","value":"2"}
+{"event":"data","sid":"20250317T132338.863924Z-H5c947e1c-P00315d14","thread":"main","time":"2025-03-17T13:23:38.876996Z","file":"pack-bitmap.c","line":2038,"repo":1,"t_abs":0.013261,"t_rel":0.013261,"nesting":1,"category":"bitmap","key":"pseudo_merges_cascades","value":"1"}
 ok 14 - pseudo-merge overlap stale traversal
 
 expecting success of 5333.15 'pseudo-merge reuse': 
@@ -316899,7 +317172,7 @@
 pack_report: pack_mapped              =      55372 /      55372
 ---------------------------------------------------------------------
 
-{"event":"data","sid":"20260419T192046.544684Z-H8d819085-P001ec68a/20260419T192046.564105Z-H8d819085-P001ec695","thread":"main","time":"2026-04-19T19:20:46.648368Z","file":"pack-bitmap-write.c","line":651,"repo":1,"t_abs":0.084451,"t_rel":0.003119,"nesting":2,"category":"pack-bitmap-write","key":"building_bitmaps_pseudo_merge_reused","value":"1"}
+{"event":"data","sid":"20250317T132339.807688Z-H5c947e1c-P00316038/20250317T132339.831507Z-H5c947e1c-P0031604a","thread":"main","time":"2025-03-17T13:23:39.896143Z","file":"pack-bitmap-write.c","line":651,"repo":1,"t_abs":0.064819,"t_rel":0.002937,"nesting":2,"category":"pack-bitmap-write","key":"building_bitmaps_pseudo_merge_reused","value":"1"}
 ok 15 - pseudo-merge reuse
 
 expecting success of 5333.16 'empty pseudo-merge group': 
@@ -316978,326 +317251,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5408-send-pack-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/.git/
-expecting success of 5408.1 'setup refs': 
-	cat >refs <<-\EOF &&
-	refs/heads/A
-	refs/heads/C
-	refs/tags/D
-	refs/heads/B
-	refs/tags/E
-	EOF
-	for i in $(cat refs); do
-		create_ref $i || return 1
-	done
-
-ok 1 - setup refs
-
-expecting success of 5408.2 'refs on cmdline': 
-	clear_remote &&
-	git send-pack remote.git $(cat refs) &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> A
- * [new branch]      C -> C
- * [new tag]         D -> D
- * [new branch]      B -> B
- * [new tag]         E -> E
-ok 2 - refs on cmdline
-
-expecting success of 5408.3 'refs over stdin': 
-	clear_remote &&
-	git send-pack remote.git --stdin <refs &&
-	for i in $(cat refs); do
-		verify_push $i || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> A
- * [new branch]      C -> C
- * [new tag]         D -> D
- * [new branch]      B -> B
- * [new tag]         E -> E
-ok 3 - refs over stdin
-
-expecting success of 5408.4 'stdin lines are full refspecs': 
-	clear_remote &&
-	echo "A:other" >input &&
-	git send-pack remote.git --stdin <input &&
-	verify_push refs/heads/A refs/heads/other
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      A -> other
-ok 4 - stdin lines are full refspecs
-
-expecting success of 5408.5 'stdin mixed with cmdline': 
-	clear_remote &&
-	echo A >input &&
-	git send-pack remote.git --stdin B <input &&
-	verify_push A &&
-	verify_push B
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-To remote.git
- * [new branch]      B -> B
- * [new branch]      A -> A
-ok 5 - stdin mixed with cmdline
-
-expecting success of 5408.6 'cmdline refs written in order': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git A:foo B:foo &&
-	verify_push A foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- ! [remote rejected] A -> foo (failed to update ref)
- ! [remote failure]  B -> foo (remote failed to report status)
-ok 6 - cmdline refs written in order
-
-expecting success of 5408.7 '--stdin refs come after cmdline': 
-	clear_remote &&
-	echo A:foo >input &&
-	test_must_fail git send-pack remote.git --stdin B:foo <input &&
-	verify_push B foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-remote: error: cannot lock ref 'refs/heads/foo': reference already exists        
-To remote.git
- ! [remote rejected] B -> foo (failed to update ref)
- ! [remote failure]  A -> foo (remote failed to report status)
-ok 7 - --stdin refs come after cmdline
-
-expecting success of 5408.8 'refspecs and --mirror do not mix (cmdline)': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror $(cat refs)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--mirror] [--dry-run] [--force]
-                     [--receive-pack=<git-receive-pack>]
-                     [--verbose] [--thin] [--atomic]
-                     [--[no-]signed | --signed=(true|false|if-asked)]
-                     [<host>:]<directory> (--all | <ref>...)
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]receive-pack <receive-pack>
-                          receive pack program
-    --[no-]exec <receive-pack>
-                          receive pack program
-    --[no-]remote <remote>
-                          remote name
-    --[no-]all            push all refs
-    -n, --[no-]dry-run    dry run
-    --[no-]mirror         mirror all refs
-    -f, --[no-]force      force updates
-    --[no-]signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --[no-]push-option <server-specific>
-                          option to transmit
-    --[no-]progress       force progress reporting
-    --[no-]thin           use thin pack
-    --[no-]atomic         request atomic transaction on remote side
-    --[no-]stateless-rpc  use stateless RPC protocol
-    --[no-]stdin          read refs from stdin
-    --[no-]helper-status  print status from remote helper
-    --[no-]force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-    --[no-]force-if-includes
-                          require remote updates to be integrated locally
-
-ok 8 - refspecs and --mirror do not mix (cmdline)
-
-expecting success of 5408.9 'refspecs and --mirror do not mix (stdin)': 
-	clear_remote &&
-	test_must_fail git send-pack remote.git --mirror --stdin <refs
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5408-send-pack-stdin/remote.git/
-usage: git send-pack [--mirror] [--dry-run] [--force]
-                     [--receive-pack=<git-receive-pack>]
-                     [--verbose] [--thin] [--atomic]
-                     [--[no-]signed | --signed=(true|false|if-asked)]
-                     [<host>:]<directory> (--all | <ref>...)
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]receive-pack <receive-pack>
-                          receive pack program
-    --[no-]exec <receive-pack>
-                          receive pack program
-    --[no-]remote <remote>
-                          remote name
-    --[no-]all            push all refs
-    -n, --[no-]dry-run    dry run
-    --[no-]mirror         mirror all refs
-    -f, --[no-]force      force updates
-    --[no-]signed[=(yes|no|if-asked)]
-                          GPG sign the push
-    --[no-]push-option <server-specific>
-                          option to transmit
-    --[no-]progress       force progress reporting
-    --[no-]thin           use thin pack
-    --[no-]atomic         request atomic transaction on remote side
-    --[no-]stateless-rpc  use stateless RPC protocol
-    --[no-]stdin          read refs from stdin
-    --[no-]helper-status  print status from remote helper
-    --[no-]force-with-lease[=<refname>:<expect>]
-                          require old value of ref to be at this value
-    --[no-]force-if-includes
-                          require remote updates to be integrated locally
-
-ok 9 - refspecs and --mirror do not mix (stdin)
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5409-colorize-remote-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5409-colorize-remote-messages/.git/
-expecting success of 5409.1 'setup': 
-	test_hook --setup update <<-\EOF &&
-	echo error: error
-	echo ERROR: also highlighted
-	echo hint: hint
-	echo hinting: not highlighted
-	echo success: success
-	echo warning: warning
-	echo prefixerror: error
-	echo " " "error: leading space"
-	echo "    "
-	echo Err
-	echo SUCCESS
-	exit 0
-	EOF
-	echo 1 >file &&
-	git add file &&
-	git commit -m 1 &&
-	git clone . child &&
-	(
-		cd child &&
-		test_commit message2 file content2
-	)
-
-[master (root-commit) c663a66] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'child'...
-done.
-[master 9f21087] message2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 5409.2 'keywords': 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/keywords 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded &&
-	grep "<YELLOW>hint<RESET>:" decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded &&
-	grep "<BOLD;GREEN>SUCCESS<RESET>" decoded &&
-	grep "<BOLD;YELLOW>warning<RESET>:" decoded
-
-remote: <BOLD;RED>error<RESET>: error        
-remote: <YELLOW>hint<RESET>: hint        
-remote: <BOLD;GREEN>success<RESET>: success        
-remote: <BOLD;GREEN>SUCCESS<RESET>        
-remote: <BOLD;YELLOW>warning<RESET>: warning        
-ok 2 - keywords
-
-expecting success of 5409.3 'whole words at line start': 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/whole-words 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<YELLOW>hint<RESET>:" decoded &&
-	grep "hinting: not highlighted" decoded &&
-	grep "prefixerror: error" decoded
-
-remote: <YELLOW>hint<RESET>: hint        
-remote: hinting: not highlighted        
-remote: prefixerror: error        
-ok 3 - whole words at line start
-
-expecting success of 5409.4 'short line': 
-	git -C child -c color.remote=always push -f origin HEAD:short-line 2>output &&
-	test_decode_color <output >decoded &&
-	grep "remote: Err" decoded
-
-remote: Err        
-ok 4 - short line
-
-expecting success of 5409.5 'case-insensitive': 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded &&
-	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
-
-remote: <BOLD;RED>error<RESET>: error        
-remote: <BOLD;RED>ERROR<RESET>: also highlighted        
-ok 5 - case-insensitive
-
-expecting success of 5409.6 'leading space': 
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
-	test_decode_color <output >decoded &&
-	grep "  <BOLD;RED>error<RESET>: leading space" decoded
-
-remote:   <BOLD;RED>error<RESET>: leading space        
-ok 6 - leading space
-
-expecting success of 5409.7 'spaces only': 
-	git -C child -c color.remote=always push -f origin HEAD:only-space 2>output &&
-	test_decode_color <output >decoded &&
-	grep "remote:     " decoded
-
-remote:             
-ok 7 - spaces only
-
-expecting success of 5409.8 'no coloring for redirected output': 
-	git --git-dir child/.git push -f origin HEAD:refs/heads/redirected-output 2>output &&
-	test_decode_color <output >decoded &&
-	grep "error: error" decoded
-
-remote: error: error        
-remote: prefixerror: error        
-ok 8 - no coloring for redirected output
-
-expecting success of 5409.9 'push with customized color': 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BLUE>error<RESET>:" decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
-
-remote: <BLUE>error<RESET>: error        
-remote:   <BLUE>error<RESET>: leading space        
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 9 - push with customized color
-
-expecting success of 5409.10 'error in customized color': 
-	git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;GREEN>success<RESET>:" decoded
-
-remote: <BOLD;GREEN>success<RESET>: success        
-ok 10 - error in customized color
-
-expecting success of 5409.11 'fallback to color.ui': 
-	git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output &&
-	test_decode_color <output >decoded &&
-	grep "<BOLD;RED>error<RESET>: error" decoded
-
-remote: <BOLD;RED>error<RESET>: error        
-ok 11 - fallback to color.ui
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5502-quickfetch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5502-quickfetch/.git/
 expecting success of 5502.1 'setup': 
@@ -319736,7 +319689,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.0035534 s, 0.3 kB/s
+1 byte copied, 4.0801e-05 s, 24.5 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 17 - verify hashes along chain, even in shallow
 
@@ -319791,7 +319744,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.00736248 s, 0.1 kB/s
+1 byte copied, 3.552e-05 s, 28.2 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 20 - verify --shallow does not check base contents
 
@@ -319811,7 +319764,7 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.784e-05 s, 26.4 kB/s
+1 byte copied, 0.00754897 s, 0.1 kB/s
 warning: commit-graph chain does not match
 ok 21 - warn on base graph chunk incorrect
 
@@ -319833,11 +319786,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 0.00260892 s, 0.4 kB/s
+1 byte copied, 3.796e-05 s, 26.3 kB/s
 warning: invalid commit-graph chain: line 'a849e3566469ef6eec0d724b211560Ga5617cb1c' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 3.84e-05 s, 26.0 kB/s
+1 byte copied, 3.704e-05 s, 27.0 kB/s
 warning: unable to find all commit-graph files
 ok 22 - verify after commit-graph-chain corruption (base)
 
@@ -319859,11 +319812,11 @@
 done.
 1+0 records in
 1+0 records out
-1 byte copied, 3.968e-05 s, 25.2 kB/s
+1 byte copied, 0.00738485 s, 0.1 kB/s
 warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
 1+0 records in
 1+0 records out
-1 byte copied, 3.832e-05 s, 26.1 kB/s
+1 byte copied, 0.000542084 s, 1.8 kB/s
 warning: unable to find all commit-graph files
 ok 23 - verify after commit-graph-chain corruption (tip)
 
@@ -319908,7 +319861,7 @@
  create mode 100644 extra.t
 1+0 records in
 1+0 records out
-1 byte copied, 0.00323668 s, 0.3 kB/s
+1 byte copied, 0.00702564 s, 0.1 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ok 25 - verify across alternates
 
@@ -320993,6 +320946,100 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5507-remote-environment.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5507-remote-environment/.git/
+expecting success of 5507.1 'set up "remote" push situation': 
+	test_commit one &&
+	git config push.default current &&
+	git init remote
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5507-remote-environment/remote/.git/
+ok 1 - set up "remote" push situation
+
+expecting success of 5507.2 'set up fake ssh': 
+	GIT_SSH_COMMAND="f() {
+		cd \"\$TRASH_DIRECTORY\" &&
+		eval \"\$2\"
+	}; f" &&
+	export GIT_SSH_COMMAND &&
+	export TRASH_DIRECTORY
+
+ok 2 - set up fake ssh
+
+expecting success of 5507.3 'confirm default push fails': 
+	test_must_fail git push remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 3 - confirm default push fails
+
+expecting success of 5507.4 'config does not travel over same-machine push': 
+	test_must_fail git -c receive.denyCurrentBranch=false push remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'remote'
+ok 4 - config does not travel over same-machine push
+
+expecting success of 5507.5 'config does not travel over ssh push': 
+	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
+
+remote: error: refusing to update checked out branch: refs/heads/master        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To host:remote
+ ! [remote rejected] master -> master (branch is currently checked out)
+error: failed to push some refs to 'host:remote'
+ok 5 - config does not travel over ssh push
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5501-fetch-push-alternates.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5501-fetch-push-alternates/.git/
 expecting success of 5501.1 'setup': 
@@ -321366,100 +321413,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5507-remote-environment.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5507-remote-environment/.git/
-expecting success of 5507.1 'set up "remote" push situation': 
-	test_commit one &&
-	git config push.default current &&
-	git init remote
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5507-remote-environment/remote/.git/
-ok 1 - set up "remote" push situation
-
-expecting success of 5507.2 'set up fake ssh': 
-	GIT_SSH_COMMAND="f() {
-		cd \"\$TRASH_DIRECTORY\" &&
-		eval \"\$2\"
-	}; f" &&
-	export GIT_SSH_COMMAND &&
-	export TRASH_DIRECTORY
-
-ok 2 - set up fake ssh
-
-expecting success of 5507.3 'confirm default push fails': 
-	test_must_fail git push remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 3 - confirm default push fails
-
-expecting success of 5507.4 'config does not travel over same-machine push': 
-	test_must_fail git -c receive.denyCurrentBranch=false push remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'remote'
-ok 4 - config does not travel over same-machine push
-
-expecting success of 5507.5 'config does not travel over ssh push': 
-	test_must_fail git -c receive.denyCurrentBranch=false push host:remote
-
-remote: error: refusing to update checked out branch: refs/heads/master        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To host:remote
- ! [remote rejected] master -> master (branch is currently checked out)
-error: failed to push some refs to 'host:remote'
-ok 5 - config does not travel over ssh push
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5506-remote-groups.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5506-remote-groups/.git/
 expecting success of 5506.1 'setup': 
@@ -321646,1194 +321599,544 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5400-send-pack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/.git/
-expecting success of 5400.1 'setup': 
-	test_tick &&
-	mkdir mozart mozart/is &&
-	echo "Commit #0" >mozart/is/pink &&
-	git update-index --add mozart/is/pink &&
-	tree=$(git write-tree) &&
-	commit=$(echo "Commit #0" | git commit-tree $tree) &&
-	zero=$commit &&
-	parent=$zero &&
-	i=0 &&
-	while test $i -le $cnt
-	do
-		i=$(($i+1)) &&
-		test_tick &&
-		echo "Commit #$i" >mozart/is/pink &&
-		git update-index --add mozart/is/pink &&
-		tree=$(git write-tree) &&
-		commit=$(echo "Commit #$i" |
-			 git commit-tree $tree -p $parent) &&
-		git update-ref refs/tags/commit$i $commit &&
-		parent=$commit || return 1
-	done &&
-	git update-ref HEAD "$commit" &&
-	git clone ./. victim &&
-	( cd victim && git config receive.denyCurrentBranch warn && git log ) &&
-	git update-ref HEAD "$zero" &&
-	parent=$zero &&
-	i=0 &&
-	while test $i -le $cnt
-	do
-		i=$(($i+1)) &&
-		test_tick &&
-		echo "Rebase #$i" >mozart/is/pink &&
-		git update-index --add mozart/is/pink &&
-		tree=$(git write-tree) &&
-		commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
-		git update-ref refs/tags/rebase$i $commit &&
-		parent=$commit || return 1
-	done &&
-	git update-ref HEAD "$commit" &&
-	echo Rebase &&
-	git log
-Cloning into 'victim'...
-done.
-commit fbc850672173770f17d48f9f2dfcb286d30b70cb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:18:13 2005 -0700
-
-    Commit #65
-
-commit 940af75942cf34a9fc156d9dc79c8c370e4c3247
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:17:13 2005 -0700
-
-    Commit #64
-
-commit 1fe3a3ebbeaddd1e503ee516a5433a8ebe097112
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:16:13 2005 -0700
-
-    Commit #63
-
-commit 0c78ec36deec72f8c6d458db5b753249a5447dec
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:15:13 2005 -0700
-
-    Commit #62
-
-commit 0ad1da14d02ef96f2c1cb8403952ffddeaaca439
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:14:13 2005 -0700
-
-    Commit #61
-
-commit 15278e4b9b51ca8e00785fff5592d9ba7b8012ea
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:13:13 2005 -0700
-
-    Commit #60
-
-commit d92539d97407cae3ac62cdd1992188ce96a04699
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:12:13 2005 -0700
-
-    Commit #59
-
-commit eeddc69755cde0046432203191b431846124c36d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:11:13 2005 -0700
-
-    Commit #58
-
-commit 9481eb1cebd4e35080a85eaac0a389e436d174d9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:10:13 2005 -0700
-
-    Commit #57
-
-commit 9ab7d0c3f85908c1624cc58f67c236b2e5d53c5d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:09:13 2005 -0700
-
-    Commit #56
-
-commit 070f3c8d7d43c5b9df69498416664b994a36a3e7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:08:13 2005 -0700
-
-    Commit #55
-
-commit a2f3e1ffc14adb111494e37e857de5428da7230e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:07:13 2005 -0700
-
-    Commit #54
-
-commit 373ca332c114a8af8262474c0b750133d11c3467
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:06:13 2005 -0700
-
-    Commit #53
-
-commit abddf6c6693561aed51ed7308754360720399450
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:05:13 2005 -0700
-
-    Commit #52
-
-commit e9dc99c35123a1d9dd416eb32975f518f7e52776
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:04:13 2005 -0700
-
-    Commit #51
-
-commit 3efc54f7bd18addc186e565f051c1f57ae499205
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:03:13 2005 -0700
-
-    Commit #50
-
-commit 288f90defdf9f8fe6cafb95c4a53d41e3d2914bc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:02:13 2005 -0700
-
-    Commit #49
-
-commit 1dfae6503af0ff1c353be39162beb34744556d2d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:01:13 2005 -0700
-
-    Commit #48
-
-commit c21493faada856b0f2ac0b85de568ffd9f21ad09
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:00:13 2005 -0700
-
-    Commit #47
-
-commit 0e48e7bf42f7c84d1039794461501f4d3e6bef59
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:59:13 2005 -0700
-
-    Commit #46
-
-commit bb0ff093c62b37247e4b570e41e57fa123962ee8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:58:13 2005 -0700
-
-    Commit #45
-
-commit a2d17f74bfdf7acc0c40e3b228d57a4d68a9c01b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:57:13 2005 -0700
-
-    Commit #44
-
-commit cbac9fdcb0113800bc9ff62d8c1a0cfd61815b11
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:56:13 2005 -0700
-
-    Commit #43
-
-commit 13eff776535a4d90e14a5ba1239e3bb094fce3ef
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:55:13 2005 -0700
-
-    Commit #42
-
-commit b7592bd14654cc3f437db49791a176d29d3aa8f0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:54:13 2005 -0700
-
-    Commit #41
-
-commit 83b8bfc7c90441063b251721278b7e8f9c5a201a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:53:13 2005 -0700
-
-    Commit #40
-
-commit 0b9d55bbcb1a6033be38cb93b03d75e5a78f9c3f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:52:13 2005 -0700
-
-    Commit #39
-
-commit d453237bfb3140a104f4c3946b562e8b8e9cda13
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:51:13 2005 -0700
-
-    Commit #38
-
-commit 63c4e0264b89e227660dc2fbd7fc8077627ab28e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:50:13 2005 -0700
-
-    Commit #37
-
-commit 5df897dfd4814feea01849f65e8fc3e81d72728f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:49:13 2005 -0700
-
-    Commit #36
-
-commit 5e2d0ff7bcf7c8973b325689dd3604bd01d6b075
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:48:13 2005 -0700
-
-    Commit #35
-
-commit cbf881eb049d21325ff0fba1e98746e36f1d46a8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:47:13 2005 -0700
-
-    Commit #34
-
-commit b8a9eb0e7c8cff2ab2d65d53f5a568dc7b54d5b0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:46:13 2005 -0700
-
-    Commit #33
-
-commit 20db8c933b4ca134652d077a7a59a12f7653c3a4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:45:13 2005 -0700
-
-    Commit #32
-
-commit 738136f07b8bf1cff560dc0dbf4a18eee3b1de94
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:44:13 2005 -0700
-
-    Commit #31
-
-commit dd3f1b3396477b30b131d10831090cd58add8a2f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:43:13 2005 -0700
-
-    Commit #30
-
-commit e7bbe70cb14feebd4d4ceada22d700e1bdcb301f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:42:13 2005 -0700
-
-    Commit #29
-
-commit 7c932743e94bd2239c435bf5645dccb051f3c5fe
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:41:13 2005 -0700
-
-    Commit #28
-
-commit c3cca0936c775de13190616bf109b3992732f2e1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:40:13 2005 -0700
-
-    Commit #27
-
-commit 2eb3c6ccb3b91269a09de0d742aecfd52817f72f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:39:13 2005 -0700
-
-    Commit #26
-
-commit 0f219719c1472626b844e140343f904fa4972bcc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:38:13 2005 -0700
-
-    Commit #25
-
-commit 03c8ac629a12338cc02e81b17da6d7cb0e1a802b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:37:13 2005 -0700
-
-    Commit #24
-
-commit 99b081ae6f13358b2cff7faad1b3f2a4c347edad
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:36:13 2005 -0700
-
-    Commit #23
-
-commit 7206ff76323748a074c19dacc097d2ed3b96bfb2
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:35:13 2005 -0700
-
-    Commit #22
-
-commit 490ddb36dddfeffa7779829333c151cbbe9e7366
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:34:13 2005 -0700
-
-    Commit #21
-
-commit a73206b2f61cdf7bf21c8138c9900794f0eab9a5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:33:13 2005 -0700
-
-    Commit #20
-
-commit 01e16b5ab9e14247c98de5452a4be588930371be
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:32:13 2005 -0700
-
-    Commit #19
-
-commit 9c803e03a40e955e599e8ecb9131651832083f57
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:31:13 2005 -0700
-
-    Commit #18
-
-commit 6fc6ec72c6ce78e654a775f4f659411294f1d4e6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:30:13 2005 -0700
-
-    Commit #17
-
-commit b601a967eeee6cb91b552c6e43b4bafdf2b1c7ac
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:29:13 2005 -0700
-
-    Commit #16
-
-commit 1747235a5c3fa673cab96b05b46dd97adb0c00c8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:28:13 2005 -0700
-
-    Commit #15
-
-commit 26bc6342db340ab762645b0b3b83517623b4c675
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:27:13 2005 -0700
-
-    Commit #14
-
-commit b2f646eca1878e3000b6ceabd81b60ce604cb41e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:26:13 2005 -0700
-
-    Commit #13
-
-commit be3e57a8ad8950e367abdb48fe904d3f965e96fa
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:25:13 2005 -0700
-
-    Commit #12
-
-commit 838c59d0f1f2160aa980e1c58db52403effc9dc6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:24:13 2005 -0700
-
-    Commit #11
-
-commit 2d04f66a08825b9bd9631a379768ee94d9e35c94
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:23:13 2005 -0700
-
-    Commit #10
-
-commit 3b4907bf685c7f5694fd51989e990218a5844ee6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:22:13 2005 -0700
-
-    Commit #9
-
-commit e87f17a34ce327a5cef1309626784bc0bcc74743
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:21:13 2005 -0700
-
-    Commit #8
-
-commit b1248b7697c5ba5bd2099f38eee5728f05a07a2c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:20:13 2005 -0700
-
-    Commit #7
-
-commit a69e0e75ae4b3c7d5954f52f3dc1666d7facf114
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:19:13 2005 -0700
-
-    Commit #6
-
-commit d2559a7d1598c17fb8259ed9c923a40f242edbd7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:18:13 2005 -0700
-
-    Commit #5
-
-commit c45f8a131dd92e17228868c96e1b0b0b07693331
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
-
-    Commit #4
-
-commit 758f634f1b1a066097ec1ee3c9a4aedc0bfb3d46
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:16:13 2005 -0700
-
-    Commit #3
-
-commit 2285e440694323e1c325d1838d97abdecada8ade
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    Commit #2
-
-commit b86cdba23d2682dd459133f2efac8ea660f1dd5b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    Commit #1
-
-commit e8d9fe63116478156180f7026f6c181cc60432c5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    Commit #0
-Rebase
-commit b1a1c97e94b6388c108e195d28a3e89f00c81698
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:23:13 2005 -0700
-
-    Rebase #65
-
-commit b1a473533f3c7654e6aabe20b868f403cc4542c4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:22:13 2005 -0700
-
-    Rebase #64
-
-commit b44d0fc2fa543aae48a3e88ca2d4bb69b0808618
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:21:13 2005 -0700
-
-    Rebase #63
-
-commit bdb72969f88d60418acc3c5cb69f94a9254e4069
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:20:13 2005 -0700
-
-    Rebase #62
-
-commit f4846c914d90426d0aa7d9ae8c617e23aeb7aadc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:19:13 2005 -0700
-
-    Rebase #61
-
-commit 5513d6a596bf3937f715bf4c4fa240dae08c1183
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:18:13 2005 -0700
-
-    Rebase #60
-
-commit c17d7284cf4910e76deb07380fdb38db71d239c7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:17:13 2005 -0700
-
-    Rebase #59
-
-commit 61c422e7618c96824dffec2cbb0cc7ec1933e48e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:16:13 2005 -0700
-
-    Rebase #58
-
-commit 2d32b535df82e1d77ee22da27287e3a676723ef8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:15:13 2005 -0700
-
-    Rebase #57
-
-commit d8638fd41e1699aa201527ace01d2ba19815aceb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:14:13 2005 -0700
-
-    Rebase #56
-
-commit 04fe055c82dc9923f2be842c62ddf3325ed7e4c3
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:13:13 2005 -0700
-
-    Rebase #55
-
-commit 8b3228b708d50b5e797bb375d97082ec7afeace4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:12:13 2005 -0700
-
-    Rebase #54
-
-commit 5f4c3fe8ed7e4d32b60d7abb0e2af50d1343cca0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:11:13 2005 -0700
-
-    Rebase #53
-
-commit 7f88d5e9d36769f5c9c65bcdd6b74456be65794b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:10:13 2005 -0700
-
-    Rebase #52
-
-commit 54fa0318009bc334ce8aa9a83e559582a15df921
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:09:13 2005 -0700
-
-    Rebase #51
-
-commit 874533e6395fa245e3aad590c5b29b113c993d88
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:08:13 2005 -0700
-
-    Rebase #50
-
-commit dc1211213cf96c29abb9e65856f42adb8ae87f44
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:07:13 2005 -0700
-
-    Rebase #49
-
-commit ecc16305000cbf7e0e28eaefa037380923f54f2b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:06:13 2005 -0700
-
-    Rebase #48
-
-commit 22eb8b0dd79fa78df505878adb615b382c819795
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:05:13 2005 -0700
-
-    Rebase #47
-
-commit e658f744975d593f1d768ae6a252466f3d6f542e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:04:13 2005 -0700
-
-    Rebase #46
-
-commit 927e9cfe3212295919b60727098c2bcba986c37e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:03:13 2005 -0700
-
-    Rebase #45
-
-commit 8c6450200d3f0d8d334e87e0d8a8277a2f791251
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:02:13 2005 -0700
-
-    Rebase #44
-
-commit 63e19d3641a395e0933a71af193c8dab5ddf587a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:01:13 2005 -0700
-
-    Rebase #43
-
-commit dea9ca7996241bf8d256a6207334ab6cb0a2f16d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:00:13 2005 -0700
-
-    Rebase #42
-
-commit 026648f873caf2683546bb4a0bffc8293d8c2a73
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:59:13 2005 -0700
-
-    Rebase #41
-
-commit 614287fbf62149f243db150a29195ddd2552620e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:58:13 2005 -0700
-
-    Rebase #40
-
-commit 796c2f217a5f8738534fbb7febc3879590747fc2
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:57:13 2005 -0700
-
-    Rebase #39
-
-commit 5aaad3995be7c0de7d694ab11b764a400a4df57f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:56:13 2005 -0700
-
-    Rebase #38
-
-commit 313b77b49a4baf7c7fe8055753a71c38bdd38b47
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:55:13 2005 -0700
-
-    Rebase #37
-
-commit a59332167314137eb8af8837e16115c9680e018e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:54:13 2005 -0700
-
-    Rebase #36
-
-commit 0ab0d27b1668006e073534c69e62685f0f9fc4ab
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:53:13 2005 -0700
-
-    Rebase #35
-
-commit 43f966630635e7421592b1564d06becd4329fb7f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:52:13 2005 -0700
-
-    Rebase #34
-
-commit fe710d4f0305ee6cfcc29f08823ccc6a8eb2e78a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:51:13 2005 -0700
-
-    Rebase #33
-
-commit 58465df8a64cc8cf28c98afc18e920e03dad9ec8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:50:13 2005 -0700
-
-    Rebase #32
-
-commit 559f5ec230a71724d6ea3399c0216e52938cba74
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:49:13 2005 -0700
-
-    Rebase #31
-
-commit 423868ae9fccf8a50212b69677d9fe252065eb3b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:48:13 2005 -0700
-
-    Rebase #30
-
-commit d02b87bdc1b8e96ed634d52ddefb6b7db693b84b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:47:13 2005 -0700
-
-    Rebase #29
-
-commit 04e55758ac35dc63f899b6c3d526b2b802cee7c9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:46:13 2005 -0700
-
-    Rebase #28
-
-commit be5fbd2f45796936f2cfa86bb4dffe5b95013f0e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:45:13 2005 -0700
-
-    Rebase #27
-
-commit 213212c4ff3f0e681db0e061ed02dcc2e3902374
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:44:13 2005 -0700
-
-    Rebase #26
-
-commit 61a890331f2ecf786d50fa8248d4f86345569421
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:43:13 2005 -0700
-
-    Rebase #25
-
-commit a1bfffeeeb67da7d9433dd5d4dcc2876badda7de
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:42:13 2005 -0700
-
-    Rebase #24
-
-commit ade5cf07bd9f8a623762be2b83d5200fd4c23e78
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:41:13 2005 -0700
-
-    Rebase #23
-
-commit 541aba44d5797d319874b1d242c491aecd70072e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:40:13 2005 -0700
-
-    Rebase #22
+*** t5504-fetch-receive-strict.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/.git/
+expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
+	echo hello >greetings &&
+	git add greetings &&
+	git commit -m greetings &&
 
-commit 8ef186d480959ba1c1950497155e9db2bb5cf262
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:39:13 2005 -0700
+	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
+	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
+	echo $S >S &&
+	echo $X >X &&
+	cp .git/objects/$S .git/objects/$S.back &&
+	mv -f .git/objects/$X .git/objects/$S &&
 
-    Rebase #21
+	test_must_fail git fsck
 
-commit dd1cc8a79dd40f7d83223b2b2293062a17ed60ee
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:38:13 2005 -0700
+[main (root-commit) 1b9525e] greetings
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 greetings
+error: b023018cabc396e7692c70bbf5784a93d3f738ab: hash-path mismatch, found at: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
+bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
+missing blob ce013625030ba8dba906f756967f9e9ca394464a
+ok 1 - setup and inject "corrupt or missing" object
 
-    Rebase #20
+expecting success of 5504.2 'fetch without strict': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git main
+	)
 
-commit 60c8d8288c55de0f0dadd7f570f69a5bd9023e54
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:37:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+ok 2 - fetch without strict
 
-    Rebase #19
+expecting success of 5504.3 'fetch with !fetch.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git main
+	)
 
-commit 2720bed4e6e3a6011714b76356527f5626a8b7bf
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:36:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: ../.git did not send all necessary objects
+ok 3 - fetch with !fetch.fsckobjects
 
-    Rebase #18
+expecting success of 5504.4 'fetch with fetch.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects true &&
+		git config transfer.fsckobjects false &&
+		test_must_fail git fetch ../.git main
+	)
 
-commit e4946f6736764ebcc7b4392c98b1916f37a8151c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:35:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
+fatal: index-pack failed
+ok 4 - fetch with fetch.fsckobjects
 
-    Rebase #17
+expecting success of 5504.5 'fetch with transfer.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true &&
+		test_must_fail git fetch ../.git main
+	)
 
-commit f2a50e2577f679dd6edf5afa77fb0d331cf0e487
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:34:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
+fatal: index-pack failed
+ok 5 - fetch with transfer.fsckobjects
 
-    Rebase #16
+expecting success of 5504.6 'push without strict': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config fetch.fsckobjects false &&
+		git config transfer.fsckobjects false
+	) &&
+	cat >exp <<-\EOF &&
+	To dst
+	!	refs/heads/main:refs/heads/test	[remote rejected] (missing necessary objects)
+	Done
+	EOF
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
 
-commit ba62d05c67970ca150478a6e204c07876eb45310
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:33:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 6 - push without strict
 
-    Rebase #15
+expecting success of 5504.7 'push with !receive.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects false &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
 
-commit 16bbc537388506c6aa3568aec7a1c295ff664ad8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:32:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
+fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
+error: failed to push some refs to 'dst'
+ok 7 - push with !receive.fsckobjects
 
-    Rebase #14
+expecting success of 5504.8 'push with receive.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config receive.fsckobjects true &&
+		git config transfer.fsckobjects false
+	) &&
+	cat >exp <<-\EOF &&
+	To dst
+	!	refs/heads/main:refs/heads/test	[remote rejected] (unpacker error)
+	EOF
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
 
-commit 8ae96d45eca9358820adedc310a2bc6ff331a3e7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:31:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 8 - push with receive.fsckobjects
 
-    Rebase #13
+expecting success of 5504.9 'push with transfer.fsckobjects': 
+	rm -rf dst &&
+	git init dst &&
+	(
+		cd dst &&
+		git config transfer.fsckobjects true
+	) &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
+	test_cmp exp act
 
-commit 2557a8c044e16526b8261947e17623841a0d5a91
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:30:13 2005 -0700
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: object of unexpected type        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+ok 9 - push with transfer.fsckobjects
 
-    Rebase #12
+expecting success of 5504.10 'repair the "corrupt or missing" object': 
+	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
+	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
+	rm -rf .git/objects/$(cat X) &&
+	git fsck
 
-commit 3f1275e3115a421a76f0ccbd5dea35b7cf227ce9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:29:13 2005 -0700
+ok 10 - repair the "corrupt or missing" object
 
-    Rebase #11
+expecting success of 5504.11 'setup bogus commit': 
+	cat >bogus-commit <<-EOF &&
+	tree $EMPTY_TREE
+	author Bugs Bunny 1234567890 +0000
+	committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
 
-commit 6d31feb4517418400c8f76a834f7cff206a2b1ab
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:28:13 2005 -0700
+	This commit object intentionally broken
+	EOF
+	commit="$(git hash-object --literally -t commit -w --stdin <bogus-commit)"
 
-    Rebase #10
+ok 11 - setup bogus commit
 
-commit 054728ce53143ed538a80cc1db2f91642848d9d8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:27:13 2005 -0700
+expecting success of 5504.12 'fsck with no skipList input': 
+	test_must_fail git fsck 2>err &&
+	test_grep "missingEmail" err
 
-    Rebase #9
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 12 - fsck with no skipList input
 
-commit dbee1ce0dbeb64756fba483e99628287182a0be1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:26:13 2005 -0700
+expecting success of 5504.13 'setup sorted and unsorted skipLists': 
+	cat >SKIP.unsorted <<-EOF &&
+	$(test_oid 004)
+	$(test_oid 002)
+	$commit
+	$(test_oid 001)
+	$(test_oid 003)
+	EOF
+	sort SKIP.unsorted >SKIP.sorted
 
-    Rebase #8
+ok 13 - setup sorted and unsorted skipLists
 
-commit d174cc1075a864f5db77014609f7f9af0240ed0c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:25:13 2005 -0700
+expecting success of 5504.14 'fsck with sorted skipList': 
+	git -c fsck.skipList=SKIP.sorted fsck
 
-    Rebase #7
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 14 - fsck with sorted skipList
 
-commit 18b56d78fb5f32acd1d2a027c139cb14df278e1c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:24:13 2005 -0700
+expecting success of 5504.15 'fsck with unsorted skipList': 
+	git -c fsck.skipList=SKIP.unsorted fsck
 
-    Rebase #6
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 15 - fsck with unsorted skipList
 
-commit 754de5100e6921cb300704183c76e1c65e301beb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:23:13 2005 -0700
+expecting success of 5504.16 'fsck with invalid or bogus skipList input': 
+	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
+	test_must_fail git -c fsck.skipList -c fsck.missingEmail=ignore fsck 2>err &&
+	test_grep "unable to parse 'fsck.skiplist' from command-line config" err &&
+	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
+	test_grep "invalid object name: " err
 
-    Rebase #5
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+fatal: unable to parse 'fsck.skiplist' from command-line config
+fatal: could not open object name list: does-not-exist
+fatal: invalid object name: [core]
+ok 16 - fsck with invalid or bogus skipList input
 
-commit 9fe752390a117faf8d6f239358fa821b464ff14d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:22:13 2005 -0700
+expecting success of 5504.17 'fsck with other accepted skipList input (comments & empty lines)': 
+	cat >SKIP.with-comment <<-EOF &&
+	# Some bad commit
+	$(test_oid 001)
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
+	test_grep "missingEmail" err-with-comment &&
+	cat >SKIP.with-empty-line <<-EOF &&
+	$(test_oid 001)
 
-    Rebase #4
+	$(test_oid 002)
+	EOF
+	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
+	test_grep "missingEmail" err-with-empty-line
 
-commit 3e9bfb9468271e1707c357a5018af569c2a676d4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:21:13 2005 -0700
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+ok 17 - fsck with other accepted skipList input (comments & empty lines)
 
-    Rebase #3
+expecting success of 5504.18 'fsck no garbage output from comments & empty lines errors': 
+	test_line_count = 1 err-with-comment &&
+	test_line_count = 1 err-with-empty-line
 
-commit d15adbaa5fdd6b03140db45c714342b2023152fa
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:20:13 2005 -0700
+ok 18 - fsck no garbage output from comments & empty lines errors
 
-    Rebase #2
+expecting success of 5504.19 'fsck with invalid abbreviated skipList input': 
+	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
+	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
+	test_grep "^fatal: invalid object name: " err-abbreviated
 
-commit 82c2bc152fd9f785c269098549562d289347b2f8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:19:13 2005 -0700
+fatal: invalid object name: 6516fe4a6d0c92028617
+ok 19 - fsck with invalid abbreviated skipList input
 
-    Rebase #1
+expecting success of 5504.20 'fsck with exhaustive accepted skipList input (various types of comments etc.)': 
+	>SKIP.exhaustive &&
+	echo "# A commented line" >>SKIP.exhaustive &&
+	echo "" >>SKIP.exhaustive &&
+	echo " " >>SKIP.exhaustive &&
+	echo " # Comment after whitespace" >>SKIP.exhaustive &&
+	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
+	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
+	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
+	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
+	test_must_be_empty err
 
-commit e8d9fe63116478156180f7026f6c181cc60432c5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
+ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
 
-    Commit #0
-ok 1 - setup
+expecting success of 5504.21 'receive-pack with missing receive.fsck.skipList path': 
+	test_must_fail git -c receive.fsck.skipList receive-pack dst 2>err &&
+	test_grep "unable to parse 'receive.fsck.skiplist' from command-line config" err
 
-expecting success of 5400.2 'send-pack does not crash with -h': 
-	test_expect_code 129 git send-pack -h >usage &&
-	test_grep "[Uu]sage: git send-pack " usage &&
-	test_expect_code 129 nongit git send-pack -h >usage &&
-	test_grep "[Uu]sage: git send-pack " usage
+fatal: unable to parse 'receive.fsck.skiplist' from command-line config
+ok 21 - receive-pack with missing receive.fsck.skipList path
 
-usage: git send-pack [--mirror] [--dry-run] [--force]
-usage: git send-pack [--mirror] [--dry-run] [--force]
-ok 2 - send-pack does not crash with -h
+expecting success of 5504.22 'push with receive.fsck.skipList': 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckObjects true &&
+	test_must_fail git push --porcelain dst bogus &&
+	echo $commit >dst/.git/SKIP &&
 
-expecting success of 5400.3 'pack the source repository': 
-	git repack -a -d &&
-	git prune
+	# receive.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList SKIP &&
+	test_must_fail git push --porcelain dst bogus &&
 
-ok 3 - pack the source repository
+	# Invalid and/or bogus skipList input
+	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
+	test_must_fail git push --porcelain dst bogus &&
+	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	git --git-dir=dst/.git config receive.fsck.skipList config &&
+	test_must_fail git push --porcelain dst bogus 2>err &&
+	test_grep "invalid object name: " err &&
 
-expecting success of 5400.4 'pack the destination repository': 
-	(
-		cd victim &&
-		git repack -a -d &&
-		git prune
-	)
+	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
+	git push --porcelain dst bogus
 
-ok 4 - pack the destination repository
+To .
+ * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: could not open object name list: does-not-exist        
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: fatal: invalid object name: [core]        
+To dst
+*	refs/heads/bogus:refs/heads/bogus	[new branch]
+Done
+ok 22 - push with receive.fsck.skipList
 
-expecting success of 5400.5 'refuse pushing rewound head without --force': 
-	pushed_head=$(git rev-parse --verify main) &&
-	victim_orig=$(cd victim && git rev-parse --verify main) &&
-	test_must_fail git send-pack ./victim main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_head" = "$victim_orig" &&
-	# this should update
-	git send-pack --force ./victim main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_head" = "$pushed_head"
+expecting success of 5504.23 'fetch with fetch.fsck.skipList': 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckObjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	echo $commit >dst/.git/SKIP &&
 
-To ./victim
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ./victim
- + fbc8506...b1a1c97 main -> main (forced update)
-ok 5 - refuse pushing rewound head without --force
+	# fetch.fsck.* does not fall back on fsck.*
+	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
 
-expecting success of 5400.6 'push can be used to delete a ref': 
-	( cd victim && git branch extra main ) &&
-	git send-pack ./victim :extra main &&
-	( cd victim &&
-	  test_must_fail git rev-parse --verify extra )
+	# Invalid and/or bogus skipList input
+	test_must_fail git --git-dir=dst/.git -c fetch.fsck.skipList fetch \
+		"file://$(pwd)" $refspec 2>err &&
+	test_grep "unable to parse 'fetch.fsck.skiplist' from command-line config" err &&
+	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_grep "could not open.*: does-not-exist" err &&
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
+	test_grep "invalid object name: " err &&
 
-To ./victim
- - [deleted]         extra
-fatal: Needed a single revision
-ok 6 - push can be used to delete a ref
+	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
 
-expecting success of 5400.7 'refuse deleting push with denyDeletes': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	test_must_fail git send-pack ./victim :extra main
+Everything up-to-date
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+fatal: unable to parse 'fetch.fsck.skiplist' from command-line config
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+fatal: could not open object name list: does-not-exist
+fatal: invalid object name: [core]
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict
+ * [new branch]      bogus      -> bogus
+ok 23 - fetch with fetch.fsck.skipList
 
-error: branch 'extra' not found
-remote: error: denying ref deletion for refs/heads/extra        
-To ./victim
- ! [remote rejected] extra (deletion prohibited)
-ok 7 - refuse deleting push with denyDeletes
+expecting success of 5504.24 'fsck.<unknownmsg-id> dies': 
+	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
+	test_grep "Unhandled message id: whatever" err
 
-expecting success of 5400.8 'cannot override denyDeletes with git -c send-pack': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	test_must_fail git -c receive.denyDeletes=false \
-					send-pack ./victim :extra main
+fatal: Unhandled message id: whatever
+ok 24 - fsck.<unknownmsg-id> dies
 
-Deleted branch extra (was b1a1c97).
-remote: error: denying ref deletion for refs/heads/extra        
-To ./victim
- ! [remote rejected] extra (deletion prohibited)
-ok 8 - cannot override denyDeletes with git -c send-pack
+expecting success of 5504.25 'push with receive.fsck.missingEmail=warn': 
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	test_must_fail git push --porcelain dst bogus &&
 
-expecting success of 5400.9 'override denyDeletes with git -c receive-pack': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	git send-pack \
-		--receive-pack="git -c receive.denyDeletes=false receive-pack" \
-		./victim :extra main
+	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git push --porcelain dst bogus &&
 
-Deleted branch extra (was b1a1c97).
-To ./victim
- - [deleted]         extra
-ok 9 - override denyDeletes with git -c receive-pack
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		receive.fsck.whatEver error &&
 
-expecting success of 5400.10 'denyNonFastforwards trumps --force': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyNonFastforwards true
-	) &&
-	victim_orig=$(cd victim && git rev-parse --verify main) &&
-	test_must_fail git send-pack --force ./victim main^:main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_orig" = "$victim_head"
+	git --git-dir=dst/.git config \
+		receive.fsck.missingEmail warn &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_grep "skipping unknown msg id.*whatever" act &&
+	git --git-dir=dst/.git branch -D bogus &&
+	git --git-dir=dst/.git config --add \
+		receive.fsck.missingEmail ignore &&
+	git push --porcelain dst bogus >act 2>&1 &&
+	! grep "missingEmail" act
 
-error: branch 'extra' not found
-remote: warning: updating the current branch        
-remote: error: denying non-fast-forward refs/heads/main (you should pull first)        
-To ./victim
- ! [remote rejected] main^ -> main (non-fast-forward)
-ok 10 - denyNonFastforwards trumps --force
+Everything up-to-date
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: unpack-objects abnormal exit
+error: failed to push some refs to 'dst'
+To dst
+!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
+remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
+warning: skipping unknown msg id 'whatever'
+Deleted branch bogus (was 6516fe4).
+ok 25 - push with receive.fsck.missingEmail=warn
 
-expecting success of 5400.11 'send-pack --all sends all branches': 
-	# make sure we have at least 2 branches with different
-	# values, just to be thorough
-	git branch other-branch HEAD^ &&
+expecting success of 5504.26 'fetch with fetch.fsck.missingEmail=warn': 
+	refspec=refs/heads/bogus:refs/heads/bogus &&
+	git push . $commit:refs/heads/bogus &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
 
-	git init --bare all.git &&
-	git send-pack --all all.git &&
-	git for-each-ref refs/heads >expect &&
-	git -C all.git for-each-ref refs/heads >actual &&
-	test_cmp expect actual
+	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
+	git --git-dir=dst/.git config fsck.missingEmail warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/all.git/
-To all.git
- * [new branch]      main -> main
- * [new branch]      other-branch -> other-branch
-ok 11 - send-pack --all sends all branches
+	# receive.fsck.<unknownmsg-id> warns
+	git --git-dir=dst/.git config \
+		fetch.fsck.whatEver error &&
 
-expecting success of 5400.12 'push --all excludes remote-tracking hierarchy': 
-	mkdir parent &&
-	(
-		cd parent &&
-		git init && : >file && git add file && git commit -m add
-	) &&
-	git clone parent child &&
-	(
-		cd child && git push --all
-	) &&
-	(
-		cd parent &&
-		test -z "$(git for-each-ref refs/remotes/origin)"
-	)
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail warn &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	grep "missingEmail" act &&
+	test_grep "Skipping unknown msg id.*whatever" act &&
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.missingEmail ignore &&
+	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
+	! grep "missingEmail" act
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 9addffa] add
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Cloning into 'child'...
-done.
 Everything up-to-date
-ok 12 - push --all excludes remote-tracking hierarchy
-
-expecting success of 5400.13 'receive-pack runs auto-gc in remote repo': 
-	rm -rf parent child &&
-	git init parent &&
-	(
-		# Setup a repo with 2 packs
-		cd parent &&
-		echo "Some text" >file.txt &&
-		git add . &&
-		git commit -m "Initial commit" &&
-		git repack -adl &&
-		echo "Some more text" >>file.txt &&
-		git commit -a -m "Second commit" &&
-		git repack
-	) &&
-	cp -R parent child &&
-	(
-		# Set the child to auto-pack if more than one pack exists
-		cd child &&
-		git config gc.autopacklimit 1 &&
-		git config gc.autodetach false &&
-		git branch test_auto_gc &&
-		# And create a file that follows the temporary object naming
-		# convention for the auto-gc to remove
-		: >.git/objects/tmp_test_object &&
-		test-tool chmtime =-1209601 .git/objects/tmp_test_object
-	) &&
-	(
-		cd parent &&
-		echo "Even more text" >>file.txt &&
-		git commit -a -m "Third commit" &&
-		git send-pack ../child HEAD:refs/heads/test_auto_gc
-	) &&
-	test ! -e child/.git/objects/tmp_test_object
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) bdeab67] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-[main 5404fd0] Second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1f665f1] Third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To ../child
-   5404fd0..1f665f1  HEAD -> test_auto_gc
-ok 13 - receive-pack runs auto-gc in remote repo
-
-expecting success of 5400.14 'pushing explicit refspecs respects forcing': 
-	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify main) &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent \
-			refs/heads/main:refs/heads/main
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	test "$parent_orig" = "$parent_head" &&
-	(
-		cd child &&
-		git send-pack ../parent \
-			+refs/heads/main:refs/heads/main
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	child_head=$(cd child && git rev-parse --verify main) &&
-	test "$parent_head" = "$child_head"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-To ../parent
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ../parent
- + 43ab524...14eeca9 main -> main (forced update)
-ok 14 - pushing explicit refspecs respects forcing
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+fatal: index-pack failed
+warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
+warning: Skipping unknown msg id 'whatever'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+ok 26 - fetch with fetch.fsck.missingEmail=warn
 
-expecting success of 5400.15 'pushing wildcard refspecs respects forcing': 
-	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify main) &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent \
-			"refs/heads/*:refs/heads/*"
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	test "$parent_orig" = "$parent_head" &&
-	(
-		cd child &&
-		git send-pack ../parent \
-			"+refs/heads/*:refs/heads/*"
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	child_head=$(cd child && git rev-parse --verify main) &&
-	test "$parent_head" = "$child_head"
+expecting success of 5504.27 'receive.fsck.unterminatedHeader=warn triggers error': 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config receive.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		receive.fsck.unterminatedheader warn &&
+	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
+	grep "Cannot demote unterminatedheader" act
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-To ../parent
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ../parent
- + 43ab524...14eeca9 main -> main (forced update)
-ok 15 - pushing wildcard refspecs respects forcing
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 27 - receive.fsck.unterminatedHeader=warn triggers error
 
-expecting success of 5400.16 'deny pushing to delete current branch': 
-	rewound_push_setup &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent :refs/heads/main 2>errs
-	)
+expecting success of 5504.28 'fetch.fsck.unterminatedHeader=warn triggers error': 
+	rm -rf dst &&
+	git init dst &&
+	git --git-dir=dst/.git config fetch.fsckobjects true &&
+	git --git-dir=dst/.git config \
+		fetch.fsck.unterminatedheader warn &&
+	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
+	grep "Cannot demote unterminatedheader" act
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-ok 16 - deny pushing to delete current branch
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
+fatal: Cannot demote unterminatedheader to warn
+fatal: index-pack failed
+remote: fatal: Cannot demote unterminatedheader to warn        
+ok 28 - fetch.fsck.unterminatedHeader=warn triggers error
 
-expecting success of 5400.17 'receive-pack de-dupes .have lines': 
-	git init shared &&
-	git -C shared commit --allow-empty -m both &&
-	git clone -s shared fork &&
-	(
-		cd shared &&
-		git checkout -b only-shared &&
-		git commit --allow-empty -m only-shared &&
-		git update-ref refs/heads/foo HEAD
+expecting success of 5504.29 'badFilemode is not a strict error': 
+	git init --bare badmode.git &&
+	tree=$(
+		cd badmode.git &&
+		blob=$(echo blob | git hash-object -w --stdin | hex2oct) &&
+		printf "123456 foo\0${blob}" |
+		git hash-object -t tree --stdin -w --literally
 	) &&
 
-	# Notable things in this expectation:
-	#  - local refs are not de-duped
-	#  - .have does not duplicate locals
-	#  - .have does not duplicate itself
-	local=$(git -C fork rev-parse HEAD) &&
-	shared=$(git -C shared rev-parse only-shared) &&
-	cat >expect <<-EOF &&
-	$local refs/heads/main
-	$local refs/remotes/origin/HEAD
-	$local refs/remotes/origin/main
-	$shared .have
-	EOF
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
 
-	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
-	git push \
-		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
-		fork HEAD:foo &&
-	extract_ref_advertisement <trace >refs &&
-	test_cmp expect refs
+	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
+	grep "$tree: badFilemode" err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/shared/.git/
-[main (root-commit) 5285e17] both
- Author: A U Thor <author@example.com>
-Cloning into 'fork'...
-done.
-Switched to a new branch 'only-shared'
-[only-shared 53d9066] only-shared
- Author: A U Thor <author@example.com>
-To fork
- * [new branch]      HEAD -> foo
-ok 17 - receive-pack de-dupes .have lines
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/badmode.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst.git/
+remote: warning: object 278276cbf8114c5faab23d27287904183b155e9c: badFilemode: contains bad file modes        
+ok 29 - badFilemode is not a strict error
 
-# passed all 17 test(s)
-1..17
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5310-pack-bitmaps.sh ***
@@ -323139,8 +322442,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260419T192015.184265Z-H8d819085-P001e5ed6/20260419T192015.199671Z-H8d819085-P001e5ee9","thread":"main","time":"2026-04-19T19:20:15.253036Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.053571,"t_rel":0.000558,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260419T192015.184265Z-H8d819085-P001e5ed6/20260419T192015.199671Z-H8d819085-P001e5ee9","thread":"main","time":"2026-04-19T19:20:15.253054Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.053590,"t_rel":0.000577,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250317T132302.334194Z-H5c947e1c-P0030eda5/20250317T132302.346221Z-H5c947e1c-P0030edb7","thread":"main","time":"2025-03-17T13:23:02.435900Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.089867,"t_rel":0.000516,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250317T132302.334194Z-H5c947e1c-P0030eda5/20250317T132302.346221Z-H5c947e1c-P0030edb7","thread":"main","time":"2025-03-17T13:23:02.435917Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.089885,"t_rel":0.000534,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 5 - full repack creates bitmaps
 
 expecting success of 5310.6 'rev-list --test-bitmap verifies bitmaps': 
@@ -323677,7 +322980,7 @@
 	jgit --version
 
 )
-t5310-pack-bitmaps.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1010: jgit: command not found
 prerequisite JGIT not satisfied
 checking prerequisite: SHA1
 
@@ -323946,8 +323249,8 @@
 pack_report: pack_mapped              =      26915 /      26915
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:20:26.247659440 +0000
-+++ after	2026-04-19 19:20:26.355659440 +0000
+--- before	2025-03-17 13:23:15.089430371 +0000
++++ after	2025-03-17 13:23:15.281431584 +0000
 @@ -1 +1 @@
 -5856eb049fa881263aa3ba7ed2e5edbf7e1fbcac
 +6a6543fc00ae3e5f9847cf9ca452037bed353779
@@ -324040,10 +323343,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-e7044c3d0754f94d7cb91400d11711b5667d7a56
 5925c4e1ec8bac94f428d0e74df0e946acb72c2f
-{"event":"data","sid":"20260419T192027.168190Z-H8d819085-P001e85b3","thread":"main","time":"2026-04-19T19:20:27.169353Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001360,"t_rel":0.001360,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
-{"event":"data","sid":"20260419T192027.168190Z-H8d819085-P001e85b3","thread":"main","time":"2026-04-19T19:20:27.169377Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001387,"t_rel":0.001387,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+e7044c3d0754f94d7cb91400d11711b5667d7a56
+{"event":"data","sid":"20250317T132316.403603Z-H5c947e1c-P003116c1","thread":"main","time":"2025-03-17T13:23:16.404624Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001207,"t_rel":0.001207,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+{"event":"data","sid":"20250317T132316.403603Z-H5c947e1c-P003116c1","thread":"main","time":"2025-03-17T13:23:16.404646Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001232,"t_rel":0.001232,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
 ok 75 - complains about multiple pack bitmaps
 
 expecting success of 5310.76 'setup test repository': 
@@ -324320,8 +323623,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260419T192029.428266Z-H8d819085-P001e8c26/20260419T192029.436542Z-H8d819085-P001e8c31","thread":"main","time":"2026-04-19T19:20:29.509116Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.072754,"t_rel":0.000579,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260419T192029.428266Z-H8d819085-P001e8c26/20260419T192029.436542Z-H8d819085-P001e8c31","thread":"main","time":"2026-04-19T19:20:29.509133Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.072773,"t_rel":0.000598,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250317T132319.163727Z-H5c947e1c-P00311e15/20250317T132319.178424Z-H5c947e1c-P00311e22","thread":"main","time":"2025-03-17T13:23:19.239811Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.061587,"t_rel":0.000552,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250317T132319.163727Z-H5c947e1c-P00311e15/20250317T132319.178424Z-H5c947e1c-P00311e22","thread":"main","time":"2025-03-17T13:23:19.239830Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.061609,"t_rel":0.000574,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 79 - full repack creates bitmaps
 
 expecting success of 5310.80 'rev-list --test-bitmap verifies bitmaps': 
@@ -325104,8 +324407,8 @@
 pack_report: pack_mapped              =      26911 /      26911
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:20:40.111659440 +0000
-+++ after	2026-04-19 19:20:40.223659440 +0000
+--- before	2025-03-17 13:23:31.553534422 +0000
++++ after	2025-03-17 13:23:31.697535332 +0000
 @@ -1 +1 @@
 -a3caed54c4e80e89b950a3dc3137850a7de9e11a
 +6d88075ba6ae7fa70257e63b62d2182dc9825ed1
@@ -325198,10 +324501,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-d9be34f11dab75a3315b4361ae577329c4c5c312
 3cd8c16e652034892da5481183a4d7aa2f7803dc
-{"event":"data","sid":"20260419T192041.164667Z-H8d819085-P001eb4b0","thread":"main","time":"2026-04-19T19:20:41.165751Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001270,"t_rel":0.001270,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
-{"event":"data","sid":"20260419T192041.164667Z-H8d819085-P001eb4b0","thread":"main","time":"2026-04-19T19:20:41.165774Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001296,"t_rel":0.001296,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
+d9be34f11dab75a3315b4361ae577329c4c5c312
+{"event":"data","sid":"20250317T132332.767873Z-H5c947e1c-P003148c2","thread":"main","time":"2025-03-17T13:23:32.768968Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001299,"t_rel":0.001299,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
+{"event":"data","sid":"20250317T132332.767873Z-H5c947e1c-P003148c2","thread":"main","time":"2025-03-17T13:23:32.768993Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001327,"t_rel":0.001327,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
 ok 149 - complains about multiple pack bitmaps
 
 expecting success of 5310.150 'incremental repack fails when bitmaps are requested': 
@@ -325537,7 +324840,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.728445Z-H8d819085-P001eb6c0","thread":"main","time":"2026-04-19T19:20:41.729710Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250317T132333.339667Z-H5c947e1c-P00314a99","thread":"main","time":"2025-03-17T13:23:33.340879Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -325823,7 +325126,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.763097Z-H8d819085-P001eb6d3","thread":"main","time":"2026-04-19T19:20:41.764328Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250317T132333.387793Z-H5c947e1c-P00314aba","thread":"main","time":"2025-03-17T13:23:33.389027Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326109,7 +325412,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.784455Z-H8d819085-P001eb6e4","thread":"main","time":"2026-04-19T19:20:41.785778Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20250317T132333.449954Z-H5c947e1c-P00314ae5","thread":"main","time":"2025-03-17T13:23:33.451206Z","file":"pack-bitmap.c","line":1993,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326395,7 +325698,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.804814Z-H8d819085-P001eb700","thread":"main","time":"2026-04-19T19:20:41.806129Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250317T132333.491784Z-H5c947e1c-P00314b08","thread":"main","time":"2025-03-17T13:23:33.493029Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326681,7 +325984,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.839157Z-H8d819085-P001eb727","thread":"main","time":"2026-04-19T19:20:41.840385Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250317T132333.545425Z-H5c947e1c-P00314b32","thread":"main","time":"2025-03-17T13:23:33.546645Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -326967,7 +326270,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.863901Z-H8d819085-P001eb73a","thread":"main","time":"2026-04-19T19:20:41.865165Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250317T132333.591560Z-H5c947e1c-P00314b51","thread":"main","time":"2025-03-17T13:23:33.592729Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -327253,7 +326556,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20260419T192041.888528Z-H8d819085-P001eb75f","thread":"main","time":"2026-04-19T19:20:41.889817Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20250317T132333.624043Z-H5c947e1c-P00314b7c","thread":"main","time":"2025-03-17T13:23:33.625274Z","file":"pack-bitmap.c","line":1997,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 ok 152 - boundary-based traversal is used when requested
 
 expecting success of 5310.153 'left-right not confused by bitmap index': 
@@ -327544,8 +326847,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20260419T192044.604295Z-H8d819085-P001ec006/20260419T192044.616211Z-H8d819085-P001ec01d","thread":"main","time":"2026-04-19T19:20:44.689163Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.073163,"t_rel":0.000559,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20260419T192044.604295Z-H8d819085-P001ec006/20260419T192044.616211Z-H8d819085-P001ec01d","thread":"main","time":"2026-04-19T19:20:44.689181Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.073183,"t_rel":0.000579,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20250317T132336.528067Z-H5c947e1c-P00315511/20250317T132336.546357Z-H5c947e1c-P0031551c","thread":"main","time":"2025-03-17T13:23:36.623868Z","file":"pack-bitmap-write.c","line":418,"repo":1,"t_abs":0.077701,"t_rel":0.000775,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20250317T132336.528067Z-H5c947e1c-P00315511/20250317T132336.546357Z-H5c947e1c-P0031551c","thread":"main","time":"2025-03-17T13:23:36.623883Z","file":"pack-bitmap-write.c","line":420,"repo":1,"t_abs":0.077718,"t_rel":0.000792,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 158 - full repack creates bitmaps
 
 expecting success of 5310.159 'rev-list --test-bitmap verifies bitmaps': 
@@ -328328,8 +327631,8 @@
 pack_report: pack_mapped              =      26918 /      26918
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:20:55.991659440 +0000
-+++ after	2026-04-19 19:20:56.123659440 +0000
+--- before	2025-03-17 13:23:48.981644564 +0000
++++ after	2025-03-17 13:23:49.133645525 +0000
 @@ -1 +1 @@
 -37419f6d136228aef65f8c0814262f05f954d62a
 +ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
@@ -328422,10 +327725,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-92f77f689e270db411603dd57dea5c4d12ac65b6
 1a76757cab55a0d45b9ba975eda6eb7dca4f716d
-{"event":"data","sid":"20260419T192056.972350Z-H8d819085-P001ee8eb","thread":"main","time":"2026-04-19T19:20:56.973480Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001328,"t_rel":0.001328,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
-{"event":"data","sid":"20260419T192056.972350Z-H8d819085-P001ee8eb","thread":"main","time":"2026-04-19T19:20:56.973505Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001355,"t_rel":0.001355,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+92f77f689e270db411603dd57dea5c4d12ac65b6
+{"event":"data","sid":"20250317T132350.167668Z-H5c947e1c-P0031831b","thread":"main","time":"2025-03-17T13:23:50.168694Z","file":"pack-bitmap.c","line":520,"repo":1,"t_abs":0.001216,"t_rel":0.001216,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+{"event":"data","sid":"20250317T132350.167668Z-H5c947e1c-P0031831b","thread":"main","time":"2025-03-17T13:23:50.168717Z","file":"pack-bitmap.c","line":493,"repo":1,"t_abs":0.001242,"t_rel":0.001242,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
 ok 228 - complains about multiple pack bitmaps
 
 expecting success of 5310.229 'verify writing bitmap lookup table when enabled': 
@@ -328433,8 +327736,8 @@
 		git repack -ad &&
 	grep "\"label\":\"writing_lookup_table\"" trace2
 
-{"event":"region_enter","sid":"20260419T192057.084247Z-H8d819085-P001ee94c/20260419T192057.111518Z-H8d819085-P001ee963","thread":"main","time":"2026-04-19T19:20:57.181255Z","file":"pack-bitmap-write.c","line":963,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20260419T192057.084247Z-H8d819085-P001ee94c/20260419T192057.111518Z-H8d819085-P001ee963","thread":"main","time":"2026-04-19T19:20:57.181264Z","file":"pack-bitmap-write.c","line":990,"repo":1,"t_rel":0.000011,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20250317T132350.285729Z-H5c947e1c-P00318380/20250317T132350.306308Z-H5c947e1c-P0031838e","thread":"main","time":"2025-03-17T13:23:50.413892Z","file":"pack-bitmap-write.c","line":963,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20250317T132350.285729Z-H5c947e1c-P00318380/20250317T132350.306308Z-H5c947e1c-P0031838e","thread":"main","time":"2025-03-17T13:23:50.413902Z","file":"pack-bitmap-write.c","line":990,"repo":1,"t_rel":0.000011,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
 ok 229 - verify writing bitmap lookup table when enabled
 
 expecting success of 5310.230 'truncated bitmap fails gracefully (lookup table)': 
@@ -328457,582 +327760,1232 @@
 1..230
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5513-fetch-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5513-fetch-track/.git/
-expecting success of 5513.1 'setup': 
-	>file &&
-	git add . &&
+*** t5400-send-pack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/.git/
+expecting success of 5400.1 'setup': 
 	test_tick &&
-	git commit -m Initial &&
-	git branch b-0 &&
-	git branch b1 &&
-	git branch b/one &&
-	test_create_repo other &&
-	(
-		cd other &&
-		git config remote.origin.url .. &&
-		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
-	)
+	mkdir mozart mozart/is &&
+	echo "Commit #0" >mozart/is/pink &&
+	git update-index --add mozart/is/pink &&
+	tree=$(git write-tree) &&
+	commit=$(echo "Commit #0" | git commit-tree $tree) &&
+	zero=$commit &&
+	parent=$zero &&
+	i=0 &&
+	while test $i -le $cnt
+	do
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Commit #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Commit #$i" |
+			 git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/commit$i $commit &&
+		parent=$commit || return 1
+	done &&
+	git update-ref HEAD "$commit" &&
+	git clone ./. victim &&
+	( cd victim && git config receive.denyCurrentBranch warn && git log ) &&
+	git update-ref HEAD "$zero" &&
+	parent=$zero &&
+	i=0 &&
+	while test $i -le $cnt
+	do
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Rebase #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/rebase$i $commit &&
+		parent=$commit || return 1
+	done &&
+	git update-ref HEAD "$commit" &&
+	echo Rebase &&
+	git log
+Cloning into 'victim'...
+done.
+commit fbc850672173770f17d48f9f2dfcb286d30b70cb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:18:13 2005 -0700
 
-[master (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5513-fetch-track/other/.git/
-ok 1 - setup
+    Commit #65
 
-expecting success of 5513.2 'fetch': 
-	(
-		cd other && git fetch origin &&
-		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
-	)
+commit 940af75942cf34a9fc156d9dc79c8c370e4c3247
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:17:13 2005 -0700
 
-From ..
- * [new branch]      b/one      -> b/one
-ok 2 - fetch
+    Commit #64
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5504-fetch-receive-strict.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/.git/
-expecting success of 5504.1 'setup and inject "corrupt or missing" object': 
-	echo hello >greetings &&
-	git add greetings &&
-	git commit -m greetings &&
+commit 1fe3a3ebbeaddd1e503ee516a5433a8ebe097112
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:16:13 2005 -0700
 
-	S=$(git rev-parse :greetings | sed -e "s|^..|&/|") &&
-	X=$(echo bye | git hash-object -w --stdin | sed -e "s|^..|&/|") &&
-	echo $S >S &&
-	echo $X >X &&
-	cp .git/objects/$S .git/objects/$S.back &&
-	mv -f .git/objects/$X .git/objects/$S &&
+    Commit #63
 
-	test_must_fail git fsck
+commit 0c78ec36deec72f8c6d458db5b753249a5447dec
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:15:13 2005 -0700
 
-[main (root-commit) 1b9525e] greetings
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 greetings
-error: b023018cabc396e7692c70bbf5784a93d3f738ab: hash-path mismatch, found at: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
-bad sha1 file: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a.back
-missing blob ce013625030ba8dba906f756967f9e9ca394464a
-ok 1 - setup and inject "corrupt or missing" object
+    Commit #62
 
-expecting success of 5504.2 'fetch without strict': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git main
-	)
+commit 0ad1da14d02ef96f2c1cb8403952ffddeaaca439
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:14:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-ok 2 - fetch without strict
+    Commit #61
 
-expecting success of 5504.3 'fetch with !fetch.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git main
-	)
+commit 15278e4b9b51ca8e00785fff5592d9ba7b8012ea
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:13:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: ../.git did not send all necessary objects
-ok 3 - fetch with !fetch.fsckobjects
+    Commit #60
 
-expecting success of 5504.4 'fetch with fetch.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects true &&
-		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git main
-	)
+commit d92539d97407cae3ac62cdd1992188ce96a04699
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:12:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
-fatal: index-pack failed
-ok 4 - fetch with fetch.fsckobjects
+    Commit #59
 
-expecting success of 5504.5 'fetch with transfer.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git main
-	)
+commit eeddc69755cde0046432203191b431846124c36d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:11:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: did not receive expected object ce013625030ba8dba906f756967f9e9ca394464a
-fatal: index-pack failed
-ok 5 - fetch with transfer.fsckobjects
+    Commit #58
 
-expecting success of 5504.6 'push without strict': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config fetch.fsckobjects false &&
-		git config transfer.fsckobjects false
-	) &&
-	cat >exp <<-\EOF &&
-	To dst
-	!	refs/heads/main:refs/heads/test	[remote rejected] (missing necessary objects)
-	Done
-	EOF
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
+commit 9481eb1cebd4e35080a85eaac0a389e436d174d9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:10:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 6 - push without strict
+    Commit #57
 
-expecting success of 5504.7 'push with !receive.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects false &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
+commit 9ab7d0c3f85908c1624cc58f67c236b2e5d53c5d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:09:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'        
-fatal: missing blob object 'ce013625030ba8dba906f756967f9e9ca394464a'
-error: failed to push some refs to 'dst'
-ok 7 - push with !receive.fsckobjects
+    Commit #56
 
-expecting success of 5504.8 'push with receive.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config receive.fsckobjects true &&
-		git config transfer.fsckobjects false
-	) &&
-	cat >exp <<-\EOF &&
-	To dst
-	!	refs/heads/main:refs/heads/test	[remote rejected] (unpacker error)
-	EOF
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
+commit 070f3c8d7d43c5b9df69498416664b994a36a3e7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:08:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 8 - push with receive.fsckobjects
+    Commit #55
 
-expecting success of 5504.9 'push with transfer.fsckobjects': 
-	rm -rf dst &&
-	git init dst &&
-	(
-		cd dst &&
-		git config transfer.fsckobjects true
-	) &&
-	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
-	test_cmp exp act
+commit a2f3e1ffc14adb111494e37e857de5428da7230e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:07:13 2005 -0700
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: object of unexpected type        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-ok 9 - push with transfer.fsckobjects
+    Commit #54
 
-expecting success of 5504.10 'repair the "corrupt or missing" object': 
-	mv -f .git/objects/$(cat S) .git/objects/$(cat X) &&
-	mv .git/objects/$(cat S).back .git/objects/$(cat S) &&
-	rm -rf .git/objects/$(cat X) &&
-	git fsck
+commit 373ca332c114a8af8262474c0b750133d11c3467
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:06:13 2005 -0700
 
-ok 10 - repair the "corrupt or missing" object
+    Commit #53
 
-expecting success of 5504.11 'setup bogus commit': 
-	cat >bogus-commit <<-EOF &&
-	tree $EMPTY_TREE
-	author Bugs Bunny 1234567890 +0000
-	committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
+commit abddf6c6693561aed51ed7308754360720399450
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:05:13 2005 -0700
 
-	This commit object intentionally broken
-	EOF
-	commit="$(git hash-object --literally -t commit -w --stdin <bogus-commit)"
+    Commit #52
 
-ok 11 - setup bogus commit
+commit e9dc99c35123a1d9dd416eb32975f518f7e52776
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:04:13 2005 -0700
 
-expecting success of 5504.12 'fsck with no skipList input': 
-	test_must_fail git fsck 2>err &&
-	test_grep "missingEmail" err
+    Commit #51
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 12 - fsck with no skipList input
+commit 3efc54f7bd18addc186e565f051c1f57ae499205
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:03:13 2005 -0700
 
-expecting success of 5504.13 'setup sorted and unsorted skipLists': 
-	cat >SKIP.unsorted <<-EOF &&
-	$(test_oid 004)
-	$(test_oid 002)
-	$commit
-	$(test_oid 001)
-	$(test_oid 003)
-	EOF
-	sort SKIP.unsorted >SKIP.sorted
+    Commit #50
 
-ok 13 - setup sorted and unsorted skipLists
+commit 288f90defdf9f8fe6cafb95c4a53d41e3d2914bc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:02:13 2005 -0700
 
-expecting success of 5504.14 'fsck with sorted skipList': 
-	git -c fsck.skipList=SKIP.sorted fsck
+    Commit #49
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 14 - fsck with sorted skipList
+commit 1dfae6503af0ff1c353be39162beb34744556d2d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:01:13 2005 -0700
 
-expecting success of 5504.15 'fsck with unsorted skipList': 
-	git -c fsck.skipList=SKIP.unsorted fsck
+    Commit #48
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 15 - fsck with unsorted skipList
+commit c21493faada856b0f2ac0b85de568ffd9f21ad09
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:00:13 2005 -0700
 
-expecting success of 5504.16 'fsck with invalid or bogus skipList input': 
-	git -c fsck.skipList=/dev/null -c fsck.missingEmail=ignore fsck &&
-	test_must_fail git -c fsck.skipList -c fsck.missingEmail=ignore fsck 2>err &&
-	test_grep "unable to parse 'fsck.skiplist' from command-line config" err &&
-	test_must_fail git -c fsck.skipList=does-not-exist -c fsck.missingEmail=ignore fsck 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	test_must_fail git -c fsck.skipList=.git/config -c fsck.missingEmail=ignore fsck 2>err &&
-	test_grep "invalid object name: " err
+    Commit #47
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-fatal: unable to parse 'fsck.skiplist' from command-line config
-fatal: could not open object name list: does-not-exist
-fatal: invalid object name: [core]
-ok 16 - fsck with invalid or bogus skipList input
+commit 0e48e7bf42f7c84d1039794461501f4d3e6bef59
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:59:13 2005 -0700
 
-expecting success of 5504.17 'fsck with other accepted skipList input (comments & empty lines)': 
-	cat >SKIP.with-comment <<-EOF &&
-	# Some bad commit
-	$(test_oid 001)
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
-	test_grep "missingEmail" err-with-comment &&
-	cat >SKIP.with-empty-line <<-EOF &&
-	$(test_oid 001)
+    Commit #46
 
-	$(test_oid 002)
-	EOF
-	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
-	test_grep "missingEmail" err-with-empty-line
+commit bb0ff093c62b37247e4b570e41e57fa123962ee8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:58:13 2005 -0700
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-error in commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-ok 17 - fsck with other accepted skipList input (comments & empty lines)
+    Commit #45
 
-expecting success of 5504.18 'fsck no garbage output from comments & empty lines errors': 
-	test_line_count = 1 err-with-comment &&
-	test_line_count = 1 err-with-empty-line
+commit a2d17f74bfdf7acc0c40e3b228d57a4d68a9c01b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:57:13 2005 -0700
 
-ok 18 - fsck no garbage output from comments & empty lines errors
+    Commit #44
 
-expecting success of 5504.19 'fsck with invalid abbreviated skipList input': 
-	echo $commit | test_copy_bytes 20 >SKIP.abbreviated &&
-	test_must_fail git -c fsck.skipList=SKIP.abbreviated fsck 2>err-abbreviated &&
-	test_grep "^fatal: invalid object name: " err-abbreviated
+commit cbac9fdcb0113800bc9ff62d8c1a0cfd61815b11
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:56:13 2005 -0700
 
-fatal: invalid object name: 6516fe4a6d0c92028617
-ok 19 - fsck with invalid abbreviated skipList input
+    Commit #43
 
-expecting success of 5504.20 'fsck with exhaustive accepted skipList input (various types of comments etc.)': 
-	>SKIP.exhaustive &&
-	echo "# A commented line" >>SKIP.exhaustive &&
-	echo "" >>SKIP.exhaustive &&
-	echo " " >>SKIP.exhaustive &&
-	echo " # Comment after whitespace" >>SKIP.exhaustive &&
-	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
-	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
-	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
-	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
-	test_must_be_empty err
+commit 13eff776535a4d90e14a5ba1239e3bb094fce3ef
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:55:13 2005 -0700
 
-dangling commit 6516fe4a6d0c9202861748d549d2e2b20e5210c9
-ok 20 - fsck with exhaustive accepted skipList input (various types of comments etc.)
+    Commit #42
 
-expecting success of 5504.21 'receive-pack with missing receive.fsck.skipList path': 
-	test_must_fail git -c receive.fsck.skipList receive-pack dst 2>err &&
-	test_grep "unable to parse 'receive.fsck.skiplist' from command-line config" err
+commit b7592bd14654cc3f437db49791a176d29d3aa8f0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:54:13 2005 -0700
 
-fatal: unable to parse 'receive.fsck.skiplist' from command-line config
-ok 21 - receive-pack with missing receive.fsck.skipList path
+    Commit #41
 
-expecting success of 5504.22 'push with receive.fsck.skipList': 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckObjects true &&
-	test_must_fail git push --porcelain dst bogus &&
-	echo $commit >dst/.git/SKIP &&
+commit 83b8bfc7c90441063b251721278b7e8f9c5a201a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:53:13 2005 -0700
 
-	# receive.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList SKIP &&
-	test_must_fail git push --porcelain dst bogus &&
+    Commit #40
 
-	# Invalid and/or bogus skipList input
-	git --git-dir=dst/.git config receive.fsck.skipList /dev/null &&
-	test_must_fail git push --porcelain dst bogus &&
-	git --git-dir=dst/.git config receive.fsck.skipList does-not-exist &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	git --git-dir=dst/.git config receive.fsck.skipList config &&
-	test_must_fail git push --porcelain dst bogus 2>err &&
-	test_grep "invalid object name: " err &&
+commit 0b9d55bbcb1a6033be38cb93b03d75e5a78f9c3f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:52:13 2005 -0700
 
-	git --git-dir=dst/.git config receive.fsck.skipList SKIP &&
-	git push --porcelain dst bogus
+    Commit #39
 
-To .
- * [new branch]      6516fe4a6d0c9202861748d549d2e2b20e5210c9 -> bogus
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: could not open object name list: does-not-exist        
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: fatal: invalid object name: [core]        
-To dst
-*	refs/heads/bogus:refs/heads/bogus	[new branch]
-Done
-ok 22 - push with receive.fsck.skipList
+commit d453237bfb3140a104f4c3946b562e8b8e9cda13
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:51:13 2005 -0700
 
-expecting success of 5504.23 'fetch with fetch.fsck.skipList': 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckObjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	echo $commit >dst/.git/SKIP &&
+    Commit #38
 
-	# fetch.fsck.* does not fall back on fsck.*
-	git --git-dir=dst/.git config fsck.skipList dst/.git/SKIP &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+commit 63c4e0264b89e227660dc2fbd7fc8077627ab28e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:50:13 2005 -0700
 
-	# Invalid and/or bogus skipList input
-	test_must_fail git --git-dir=dst/.git -c fetch.fsck.skipList fetch \
-		"file://$(pwd)" $refspec 2>err &&
-	test_grep "unable to parse 'fetch.fsck.skiplist' from command-line config" err &&
-	git --git-dir=dst/.git config fetch.fsck.skipList /dev/null &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
-	git --git-dir=dst/.git config fetch.fsck.skipList does-not-exist &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_grep "could not open.*: does-not-exist" err &&
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/config &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec 2>err &&
-	test_grep "invalid object name: " err &&
+    Commit #37
 
-	git --git-dir=dst/.git config fetch.fsck.skipList dst/.git/SKIP &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec
+commit 5df897dfd4814feea01849f65e8fc3e81d72728f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:49:13 2005 -0700
 
-Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-fatal: unable to parse 'fetch.fsck.skiplist' from command-line config
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-fatal: could not open object name list: does-not-exist
-fatal: invalid object name: [core]
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict
- * [new branch]      bogus      -> bogus
-ok 23 - fetch with fetch.fsck.skipList
+    Commit #36
 
-expecting success of 5504.24 'fsck.<unknownmsg-id> dies': 
-	test_must_fail git -c fsck.whatEver=ignore fsck 2>err &&
-	test_grep "Unhandled message id: whatever" err
+commit 5e2d0ff7bcf7c8973b325689dd3604bd01d6b075
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:48:13 2005 -0700
 
-fatal: Unhandled message id: whatever
-ok 24 - fsck.<unknownmsg-id> dies
+    Commit #35
 
-expecting success of 5504.25 'push with receive.fsck.missingEmail=warn': 
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	test_must_fail git push --porcelain dst bogus &&
+commit cbf881eb049d21325ff0fba1e98746e36f1d46a8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:47:13 2005 -0700
 
-	# receive.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git push --porcelain dst bogus &&
+    Commit #34
 
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		receive.fsck.whatEver error &&
+commit b8a9eb0e7c8cff2ab2d65d53f5a568dc7b54d5b0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:46:13 2005 -0700
 
-	git --git-dir=dst/.git config \
-		receive.fsck.missingEmail warn &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_grep "skipping unknown msg id.*whatever" act &&
-	git --git-dir=dst/.git branch -D bogus &&
-	git --git-dir=dst/.git config --add \
-		receive.fsck.missingEmail ignore &&
-	git push --porcelain dst bogus >act 2>&1 &&
-	! grep "missingEmail" act
+    Commit #33
 
-Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: unpack-objects abnormal exit
-error: failed to push some refs to 'dst'
-To dst
-!	refs/heads/bogus:refs/heads/bogus	[remote rejected] (unpacker error)
-remote: warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email        
-warning: skipping unknown msg id 'whatever'
-Deleted branch bogus (was 6516fe4).
-ok 25 - push with receive.fsck.missingEmail=warn
+commit 20db8c933b4ca134652d077a7a59a12f7653c3a4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:45:13 2005 -0700
 
-expecting success of 5504.26 'fetch with fetch.fsck.missingEmail=warn': 
-	refspec=refs/heads/bogus:refs/heads/bogus &&
-	git push . $commit:refs/heads/bogus &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+    Commit #32
 
-	# fetch.fsck.<msg-id> does not fall back on fsck.<msg-id>
-	git --git-dir=dst/.git config fsck.missingEmail warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" $refspec &&
+commit 738136f07b8bf1cff560dc0dbf4a18eee3b1de94
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:44:13 2005 -0700
 
-	# receive.fsck.<unknownmsg-id> warns
-	git --git-dir=dst/.git config \
-		fetch.fsck.whatEver error &&
+    Commit #31
 
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail warn &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	grep "missingEmail" act &&
-	test_grep "Skipping unknown msg id.*whatever" act &&
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.missingEmail ignore &&
-	git --git-dir=dst/.git fetch "file://$(pwd)" $refspec >act 2>&1 &&
-	! grep "missingEmail" act
+commit dd3f1b3396477b30b131d10831090cd58add8a2f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:43:13 2005 -0700
+
+    Commit #30
+
+commit e7bbe70cb14feebd4d4ceada22d700e1bdcb301f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:42:13 2005 -0700
+
+    Commit #29
+
+commit 7c932743e94bd2239c435bf5645dccb051f3c5fe
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:41:13 2005 -0700
+
+    Commit #28
+
+commit c3cca0936c775de13190616bf109b3992732f2e1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:40:13 2005 -0700
+
+    Commit #27
+
+commit 2eb3c6ccb3b91269a09de0d742aecfd52817f72f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:39:13 2005 -0700
+
+    Commit #26
+
+commit 0f219719c1472626b844e140343f904fa4972bcc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:38:13 2005 -0700
+
+    Commit #25
+
+commit 03c8ac629a12338cc02e81b17da6d7cb0e1a802b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:37:13 2005 -0700
+
+    Commit #24
+
+commit 99b081ae6f13358b2cff7faad1b3f2a4c347edad
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:36:13 2005 -0700
+
+    Commit #23
+
+commit 7206ff76323748a074c19dacc097d2ed3b96bfb2
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:35:13 2005 -0700
+
+    Commit #22
+
+commit 490ddb36dddfeffa7779829333c151cbbe9e7366
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:34:13 2005 -0700
+
+    Commit #21
+
+commit a73206b2f61cdf7bf21c8138c9900794f0eab9a5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:33:13 2005 -0700
+
+    Commit #20
+
+commit 01e16b5ab9e14247c98de5452a4be588930371be
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:32:13 2005 -0700
+
+    Commit #19
+
+commit 9c803e03a40e955e599e8ecb9131651832083f57
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:31:13 2005 -0700
+
+    Commit #18
+
+commit 6fc6ec72c6ce78e654a775f4f659411294f1d4e6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:30:13 2005 -0700
+
+    Commit #17
+
+commit b601a967eeee6cb91b552c6e43b4bafdf2b1c7ac
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:29:13 2005 -0700
+
+    Commit #16
+
+commit 1747235a5c3fa673cab96b05b46dd97adb0c00c8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:28:13 2005 -0700
+
+    Commit #15
+
+commit 26bc6342db340ab762645b0b3b83517623b4c675
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:27:13 2005 -0700
+
+    Commit #14
+
+commit b2f646eca1878e3000b6ceabd81b60ce604cb41e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:26:13 2005 -0700
+
+    Commit #13
+
+commit be3e57a8ad8950e367abdb48fe904d3f965e96fa
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:25:13 2005 -0700
+
+    Commit #12
+
+commit 838c59d0f1f2160aa980e1c58db52403effc9dc6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:24:13 2005 -0700
+
+    Commit #11
+
+commit 2d04f66a08825b9bd9631a379768ee94d9e35c94
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:23:13 2005 -0700
+
+    Commit #10
+
+commit 3b4907bf685c7f5694fd51989e990218a5844ee6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:22:13 2005 -0700
+
+    Commit #9
+
+commit e87f17a34ce327a5cef1309626784bc0bcc74743
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:21:13 2005 -0700
+
+    Commit #8
+
+commit b1248b7697c5ba5bd2099f38eee5728f05a07a2c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:20:13 2005 -0700
+
+    Commit #7
+
+commit a69e0e75ae4b3c7d5954f52f3dc1666d7facf114
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:19:13 2005 -0700
+
+    Commit #6
+
+commit d2559a7d1598c17fb8259ed9c923a40f242edbd7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:18:13 2005 -0700
+
+    Commit #5
+
+commit c45f8a131dd92e17228868c96e1b0b0b07693331
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
+
+    Commit #4
+
+commit 758f634f1b1a066097ec1ee3c9a4aedc0bfb3d46
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:16:13 2005 -0700
+
+    Commit #3
+
+commit 2285e440694323e1c325d1838d97abdecada8ade
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    Commit #2
+
+commit b86cdba23d2682dd459133f2efac8ea660f1dd5b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    Commit #1
+
+commit e8d9fe63116478156180f7026f6c181cc60432c5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    Commit #0
+Rebase
+commit b1a1c97e94b6388c108e195d28a3e89f00c81698
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:23:13 2005 -0700
+
+    Rebase #65
+
+commit b1a473533f3c7654e6aabe20b868f403cc4542c4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:22:13 2005 -0700
+
+    Rebase #64
+
+commit b44d0fc2fa543aae48a3e88ca2d4bb69b0808618
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:21:13 2005 -0700
+
+    Rebase #63
+
+commit bdb72969f88d60418acc3c5cb69f94a9254e4069
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:20:13 2005 -0700
+
+    Rebase #62
+
+commit f4846c914d90426d0aa7d9ae8c617e23aeb7aadc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:19:13 2005 -0700
+
+    Rebase #61
+
+commit 5513d6a596bf3937f715bf4c4fa240dae08c1183
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:18:13 2005 -0700
+
+    Rebase #60
+
+commit c17d7284cf4910e76deb07380fdb38db71d239c7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:17:13 2005 -0700
 
+    Rebase #59
+
+commit 61c422e7618c96824dffec2cbb0cc7ec1933e48e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:16:13 2005 -0700
+
+    Rebase #58
+
+commit 2d32b535df82e1d77ee22da27287e3a676723ef8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:15:13 2005 -0700
+
+    Rebase #57
+
+commit d8638fd41e1699aa201527ace01d2ba19815aceb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:14:13 2005 -0700
+
+    Rebase #56
+
+commit 04fe055c82dc9923f2be842c62ddf3325ed7e4c3
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:13:13 2005 -0700
+
+    Rebase #55
+
+commit 8b3228b708d50b5e797bb375d97082ec7afeace4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:12:13 2005 -0700
+
+    Rebase #54
+
+commit 5f4c3fe8ed7e4d32b60d7abb0e2af50d1343cca0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:11:13 2005 -0700
+
+    Rebase #53
+
+commit 7f88d5e9d36769f5c9c65bcdd6b74456be65794b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:10:13 2005 -0700
+
+    Rebase #52
+
+commit 54fa0318009bc334ce8aa9a83e559582a15df921
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:09:13 2005 -0700
+
+    Rebase #51
+
+commit 874533e6395fa245e3aad590c5b29b113c993d88
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:08:13 2005 -0700
+
+    Rebase #50
+
+commit dc1211213cf96c29abb9e65856f42adb8ae87f44
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:07:13 2005 -0700
+
+    Rebase #49
+
+commit ecc16305000cbf7e0e28eaefa037380923f54f2b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:06:13 2005 -0700
+
+    Rebase #48
+
+commit 22eb8b0dd79fa78df505878adb615b382c819795
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:05:13 2005 -0700
+
+    Rebase #47
+
+commit e658f744975d593f1d768ae6a252466f3d6f542e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:04:13 2005 -0700
+
+    Rebase #46
+
+commit 927e9cfe3212295919b60727098c2bcba986c37e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:03:13 2005 -0700
+
+    Rebase #45
+
+commit 8c6450200d3f0d8d334e87e0d8a8277a2f791251
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:02:13 2005 -0700
+
+    Rebase #44
+
+commit 63e19d3641a395e0933a71af193c8dab5ddf587a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:01:13 2005 -0700
+
+    Rebase #43
+
+commit dea9ca7996241bf8d256a6207334ab6cb0a2f16d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:00:13 2005 -0700
+
+    Rebase #42
+
+commit 026648f873caf2683546bb4a0bffc8293d8c2a73
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:59:13 2005 -0700
+
+    Rebase #41
+
+commit 614287fbf62149f243db150a29195ddd2552620e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:58:13 2005 -0700
+
+    Rebase #40
+
+commit 796c2f217a5f8738534fbb7febc3879590747fc2
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:57:13 2005 -0700
+
+    Rebase #39
+
+commit 5aaad3995be7c0de7d694ab11b764a400a4df57f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:56:13 2005 -0700
+
+    Rebase #38
+
+commit 313b77b49a4baf7c7fe8055753a71c38bdd38b47
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:55:13 2005 -0700
+
+    Rebase #37
+
+commit a59332167314137eb8af8837e16115c9680e018e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:54:13 2005 -0700
+
+    Rebase #36
+
+commit 0ab0d27b1668006e073534c69e62685f0f9fc4ab
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:53:13 2005 -0700
+
+    Rebase #35
+
+commit 43f966630635e7421592b1564d06becd4329fb7f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:52:13 2005 -0700
+
+    Rebase #34
+
+commit fe710d4f0305ee6cfcc29f08823ccc6a8eb2e78a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:51:13 2005 -0700
+
+    Rebase #33
+
+commit 58465df8a64cc8cf28c98afc18e920e03dad9ec8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:50:13 2005 -0700
+
+    Rebase #32
+
+commit 559f5ec230a71724d6ea3399c0216e52938cba74
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:49:13 2005 -0700
+
+    Rebase #31
+
+commit 423868ae9fccf8a50212b69677d9fe252065eb3b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:48:13 2005 -0700
+
+    Rebase #30
+
+commit d02b87bdc1b8e96ed634d52ddefb6b7db693b84b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:47:13 2005 -0700
+
+    Rebase #29
+
+commit 04e55758ac35dc63f899b6c3d526b2b802cee7c9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:46:13 2005 -0700
+
+    Rebase #28
+
+commit be5fbd2f45796936f2cfa86bb4dffe5b95013f0e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:45:13 2005 -0700
+
+    Rebase #27
+
+commit 213212c4ff3f0e681db0e061ed02dcc2e3902374
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:44:13 2005 -0700
+
+    Rebase #26
+
+commit 61a890331f2ecf786d50fa8248d4f86345569421
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:43:13 2005 -0700
+
+    Rebase #25
+
+commit a1bfffeeeb67da7d9433dd5d4dcc2876badda7de
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:42:13 2005 -0700
+
+    Rebase #24
+
+commit ade5cf07bd9f8a623762be2b83d5200fd4c23e78
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:41:13 2005 -0700
+
+    Rebase #23
+
+commit 541aba44d5797d319874b1d242c491aecd70072e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:40:13 2005 -0700
+
+    Rebase #22
+
+commit 8ef186d480959ba1c1950497155e9db2bb5cf262
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:39:13 2005 -0700
+
+    Rebase #21
+
+commit dd1cc8a79dd40f7d83223b2b2293062a17ed60ee
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:38:13 2005 -0700
+
+    Rebase #20
+
+commit 60c8d8288c55de0f0dadd7f570f69a5bd9023e54
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:37:13 2005 -0700
+
+    Rebase #19
+
+commit 2720bed4e6e3a6011714b76356527f5626a8b7bf
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:36:13 2005 -0700
+
+    Rebase #18
+
+commit e4946f6736764ebcc7b4392c98b1916f37a8151c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:35:13 2005 -0700
+
+    Rebase #17
+
+commit f2a50e2577f679dd6edf5afa77fb0d331cf0e487
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:34:13 2005 -0700
+
+    Rebase #16
+
+commit ba62d05c67970ca150478a6e204c07876eb45310
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:33:13 2005 -0700
+
+    Rebase #15
+
+commit 16bbc537388506c6aa3568aec7a1c295ff664ad8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:32:13 2005 -0700
+
+    Rebase #14
+
+commit 8ae96d45eca9358820adedc310a2bc6ff331a3e7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:31:13 2005 -0700
+
+    Rebase #13
+
+commit 2557a8c044e16526b8261947e17623841a0d5a91
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:30:13 2005 -0700
+
+    Rebase #12
+
+commit 3f1275e3115a421a76f0ccbd5dea35b7cf227ce9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:29:13 2005 -0700
+
+    Rebase #11
+
+commit 6d31feb4517418400c8f76a834f7cff206a2b1ab
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:28:13 2005 -0700
+
+    Rebase #10
+
+commit 054728ce53143ed538a80cc1db2f91642848d9d8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:27:13 2005 -0700
+
+    Rebase #9
+
+commit dbee1ce0dbeb64756fba483e99628287182a0be1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:26:13 2005 -0700
+
+    Rebase #8
+
+commit d174cc1075a864f5db77014609f7f9af0240ed0c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:25:13 2005 -0700
+
+    Rebase #7
+
+commit 18b56d78fb5f32acd1d2a027c139cb14df278e1c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:24:13 2005 -0700
+
+    Rebase #6
+
+commit 754de5100e6921cb300704183c76e1c65e301beb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:23:13 2005 -0700
+
+    Rebase #5
+
+commit 9fe752390a117faf8d6f239358fa821b464ff14d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:22:13 2005 -0700
+
+    Rebase #4
+
+commit 3e9bfb9468271e1707c357a5018af569c2a676d4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:21:13 2005 -0700
+
+    Rebase #3
+
+commit d15adbaa5fdd6b03140db45c714342b2023152fa
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:20:13 2005 -0700
+
+    Rebase #2
+
+commit 82c2bc152fd9f785c269098549562d289347b2f8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:19:13 2005 -0700
+
+    Rebase #1
+
+commit e8d9fe63116478156180f7026f6c181cc60432c5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    Commit #0
+ok 1 - setup
+
+expecting success of 5400.2 'send-pack does not crash with -h': 
+	test_expect_code 129 git send-pack -h >usage &&
+	test_grep "[Uu]sage: git send-pack " usage &&
+	test_expect_code 129 nongit git send-pack -h >usage &&
+	test_grep "[Uu]sage: git send-pack " usage
+
+usage: git send-pack [--mirror] [--dry-run] [--force]
+usage: git send-pack [--mirror] [--dry-run] [--force]
+ok 2 - send-pack does not crash with -h
+
+expecting success of 5400.3 'pack the source repository': 
+	git repack -a -d &&
+	git prune
+
+ok 3 - pack the source repository
+
+expecting success of 5400.4 'pack the destination repository': 
+	(
+		cd victim &&
+		git repack -a -d &&
+		git prune
+	)
+
+ok 4 - pack the destination repository
+
+expecting success of 5400.5 'refuse pushing rewound head without --force': 
+	pushed_head=$(git rev-parse --verify main) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_head" = "$victim_orig" &&
+	# this should update
+	git send-pack --force ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_head" = "$pushed_head"
+
+To ./victim
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ./victim
+ + fbc8506...b1a1c97 main -> main (forced update)
+ok 5 - refuse pushing rewound head without --force
+
+expecting success of 5400.6 'push can be used to delete a ref': 
+	( cd victim && git branch extra main ) &&
+	git send-pack ./victim :extra main &&
+	( cd victim &&
+	  test_must_fail git rev-parse --verify extra )
+
+To ./victim
+ - [deleted]         extra
+fatal: Needed a single revision
+ok 6 - push can be used to delete a ref
+
+expecting success of 5400.7 'refuse deleting push with denyDeletes': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	test_must_fail git send-pack ./victim :extra main
+
+error: branch 'extra' not found
+remote: error: denying ref deletion for refs/heads/extra        
+To ./victim
+ ! [remote rejected] extra (deletion prohibited)
+ok 7 - refuse deleting push with denyDeletes
+
+expecting success of 5400.8 'cannot override denyDeletes with git -c send-pack': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	test_must_fail git -c receive.denyDeletes=false \
+					send-pack ./victim :extra main
+
+Deleted branch extra (was b1a1c97).
+remote: error: denying ref deletion for refs/heads/extra        
+To ./victim
+ ! [remote rejected] extra (deletion prohibited)
+ok 8 - cannot override denyDeletes with git -c send-pack
+
+expecting success of 5400.9 'override denyDeletes with git -c receive-pack': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	git send-pack \
+		--receive-pack="git -c receive.denyDeletes=false receive-pack" \
+		./victim :extra main
+
+Deleted branch extra (was b1a1c97).
+To ./victim
+ - [deleted]         extra
+ok 9 - override denyDeletes with git -c receive-pack
+
+expecting success of 5400.10 'denyNonFastforwards trumps --force': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyNonFastforwards true
+	) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack --force ./victim main^:main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_orig" = "$victim_head"
+
+error: branch 'extra' not found
+remote: warning: updating the current branch        
+remote: error: denying non-fast-forward refs/heads/main (you should pull first)        
+To ./victim
+ ! [remote rejected] main^ -> main (non-fast-forward)
+ok 10 - denyNonFastforwards trumps --force
+
+expecting success of 5400.11 'send-pack --all sends all branches': 
+	# make sure we have at least 2 branches with different
+	# values, just to be thorough
+	git branch other-branch HEAD^ &&
+
+	git init --bare all.git &&
+	git send-pack --all all.git &&
+	git for-each-ref refs/heads >expect &&
+	git -C all.git for-each-ref refs/heads >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/all.git/
+To all.git
+ * [new branch]      main -> main
+ * [new branch]      other-branch -> other-branch
+ok 11 - send-pack --all sends all branches
+
+expecting success of 5400.12 'push --all excludes remote-tracking hierarchy': 
+	mkdir parent &&
+	(
+		cd parent &&
+		git init && : >file && git add file && git commit -m add
+	) &&
+	git clone parent child &&
+	(
+		cd child && git push --all
+	) &&
+	(
+		cd parent &&
+		test -z "$(git for-each-ref refs/remotes/origin)"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 9addffa] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Cloning into 'child'...
+done.
 Everything up-to-date
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-error: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-fatal: fsck error in packed object
-fatal: index-pack failed
-warning: object 6516fe4a6d0c9202861748d549d2e2b20e5210c9: missingEmail: invalid author/committer line - missing email
-warning: Skipping unknown msg id 'whatever'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-ok 26 - fetch with fetch.fsck.missingEmail=warn
+ok 12 - push --all excludes remote-tracking hierarchy
 
-expecting success of 5504.27 'receive.fsck.unterminatedHeader=warn triggers error': 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config receive.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		receive.fsck.unterminatedheader warn &&
-	test_must_fail git push --porcelain dst HEAD >act 2>&1 &&
-	grep "Cannot demote unterminatedheader" act
+expecting success of 5400.13 'receive-pack runs auto-gc in remote repo': 
+	rm -rf parent child &&
+	git init parent &&
+	(
+		# Setup a repo with 2 packs
+		cd parent &&
+		echo "Some text" >file.txt &&
+		git add . &&
+		git commit -m "Initial commit" &&
+		git repack -adl &&
+		echo "Some more text" >>file.txt &&
+		git commit -a -m "Second commit" &&
+		git repack
+	) &&
+	cp -R parent child &&
+	(
+		# Set the child to auto-pack if more than one pack exists
+		cd child &&
+		git config gc.autopacklimit 1 &&
+		git config gc.autodetach false &&
+		git branch test_auto_gc &&
+		# And create a file that follows the temporary object naming
+		# convention for the auto-gc to remove
+		: >.git/objects/tmp_test_object &&
+		test-tool chmtime =-1209601 .git/objects/tmp_test_object
+	) &&
+	(
+		cd parent &&
+		echo "Even more text" >>file.txt &&
+		git commit -a -m "Third commit" &&
+		git send-pack ../child HEAD:refs/heads/test_auto_gc
+	) &&
+	test ! -e child/.git/objects/tmp_test_object
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 27 - receive.fsck.unterminatedHeader=warn triggers error
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) bdeab67] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+[main 5404fd0] Second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 1f665f1] Third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To ../child
+   5404fd0..1f665f1  HEAD -> test_auto_gc
+ok 13 - receive-pack runs auto-gc in remote repo
 
-expecting success of 5504.28 'fetch.fsck.unterminatedHeader=warn triggers error': 
-	rm -rf dst &&
-	git init dst &&
-	git --git-dir=dst/.git config fetch.fsckobjects true &&
-	git --git-dir=dst/.git config \
-		fetch.fsck.unterminatedheader warn &&
-	test_must_fail git --git-dir=dst/.git fetch "file://$(pwd)" HEAD &&
-	grep "Cannot demote unterminatedheader" act
+expecting success of 5400.14 'pushing explicit refspecs respects forcing': 
+	rewound_push_setup &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
+	(
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			refs/heads/main:refs/heads/main
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	test "$parent_orig" = "$parent_head" &&
+	(
+		cd child &&
+		git send-pack ../parent \
+			+refs/heads/main:refs/heads/main
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
+	test "$parent_head" = "$child_head"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst/.git/
-fatal: Cannot demote unterminatedheader to warn
-fatal: index-pack failed
-remote: fatal: Cannot demote unterminatedheader to warn        
-ok 28 - fetch.fsck.unterminatedHeader=warn triggers error
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 43ab524] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+To ../parent
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ../parent
+ + 43ab524...14eeca9 main -> main (forced update)
+ok 14 - pushing explicit refspecs respects forcing
 
-expecting success of 5504.29 'badFilemode is not a strict error': 
-	git init --bare badmode.git &&
-	tree=$(
-		cd badmode.git &&
-		blob=$(echo blob | git hash-object -w --stdin | hex2oct) &&
-		printf "123456 foo\0${blob}" |
-		git hash-object -t tree --stdin -w --literally
+expecting success of 5400.15 'pushing wildcard refspecs respects forcing': 
+	rewound_push_setup &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
+	(
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			"refs/heads/*:refs/heads/*"
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	test "$parent_orig" = "$parent_head" &&
+	(
+		cd child &&
+		git send-pack ../parent \
+			"+refs/heads/*:refs/heads/*"
 	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
+	test "$parent_head" = "$child_head"
 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 43ab524] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+To ../parent
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ../parent
+ + 43ab524...14eeca9 main -> main (forced update)
+ok 15 - pushing wildcard refspecs respects forcing
 
-	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
-	grep "$tree: badFilemode" err
+expecting success of 5400.16 'deny pushing to delete current branch': 
+	rewound_push_setup &&
+	(
+		cd child &&
+		test_must_fail git send-pack ../parent :refs/heads/main 2>errs
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/badmode.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5504-fetch-receive-strict/dst.git/
-remote: warning: object 278276cbf8114c5faab23d27287904183b155e9c: badFilemode: contains bad file modes        
-ok 29 - badFilemode is not a strict error
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 43ab524] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+ok 16 - deny pushing to delete current branch
 
-# passed all 29 test(s)
-1..29
+expecting success of 5400.17 'receive-pack de-dupes .have lines': 
+	git init shared &&
+	git -C shared commit --allow-empty -m both &&
+	git clone -s shared fork &&
+	(
+		cd shared &&
+		git checkout -b only-shared &&
+		git commit --allow-empty -m only-shared &&
+		git update-ref refs/heads/foo HEAD
+	) &&
+
+	# Notable things in this expectation:
+	#  - local refs are not de-duped
+	#  - .have does not duplicate locals
+	#  - .have does not duplicate itself
+	local=$(git -C fork rev-parse HEAD) &&
+	shared=$(git -C shared rev-parse only-shared) &&
+	cat >expect <<-EOF &&
+	$local refs/heads/main
+	$local refs/remotes/origin/HEAD
+	$local refs/remotes/origin/main
+	$shared .have
+	EOF
+
+	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
+	git push \
+		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
+		fork HEAD:foo &&
+	extract_ref_advertisement <trace >refs &&
+	test_cmp expect refs
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5400-send-pack/shared/.git/
+[main (root-commit) 5285e17] both
+ Author: A U Thor <author@example.com>
+Cloning into 'fork'...
+done.
+Switched to a new branch 'only-shared'
+[only-shared 53d9066] only-shared
+ Author: A U Thor <author@example.com>
+To fork
+ * [new branch]      HEAD -> foo
+ok 17 - receive-pack de-dupes .have lines
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5513-fetch-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5513-fetch-track/.git/
+expecting success of 5513.1 'setup': 
+	>file &&
+	git add . &&
+	test_tick &&
+	git commit -m Initial &&
+	git branch b-0 &&
+	git branch b1 &&
+	git branch b/one &&
+	test_create_repo other &&
+	(
+		cd other &&
+		git config remote.origin.url .. &&
+		git config remote.origin.fetch "+refs/heads/b/*:refs/remotes/b/*"
+	)
+
+[master (root-commit) 9d34b14] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5513-fetch-track/other/.git/
+ok 1 - setup
+
+expecting success of 5513.2 'fetch': 
+	(
+		cd other && git fetch origin &&
+		test "$(git for-each-ref --format="%(refname)")" = refs/remotes/b/one
+	)
+
+From ..
+ * [new branch]      b/one      -> b/one
+ok 2 - fetch
+
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5509-fetch-push-namespaces.sh ***
@@ -329618,8 +329571,8 @@
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2026-04-19 19:20:58.439659440 +0000
-+++ actual_err	2026-04-19 19:20:58.523659440 +0000
+--- exp_err	2025-03-17 13:23:51.569660920 +0000
++++ actual_err	2025-03-17 13:23:51.673661577 +0000
 @@ -1 +0,0 @@
 -From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5512-ls-remote/.git
 ok 17 - suppress "From <url>" with -q
@@ -330212,6 +330165,551 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5514-fetch-multiple.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/.git/
+expecting success of 5514.1 'setup': 
+	setup_repository one &&
+	setup_repository two &&
+	(
+		cd two && git branch another
+	) &&
+	git clone --mirror two three &&
+	git clone one test
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/one/.git/
+[main (root-commit) 9d34b14] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 2ce9c50] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/two/.git/
+[main (root-commit) 9d34b14] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 2ce9c50] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+Switched to branch 'main'
+Cloning into bare repository 'three'...
+done.
+Cloning into 'test'...
+done.
+ok 1 - setup
+
+expecting success of 5514.2 'git fetch --all': 
+	(cd test &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 git remote add three ../three &&
+	 git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp expect output)
+
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 2 - git fetch --all
+
+expecting success of 5514.3 'git fetch --all --no-write-fetch-head': 
+	(cd test &&
+	rm -f .git/FETCH_HEAD &&
+	git fetch --all --no-write-fetch-head &&
+	test_path_is_missing .git/FETCH_HEAD)
+
+Fetching origin
+Fetching one
+Fetching two
+Fetching three
+ok 3 - git fetch --all --no-write-fetch-head
+
+expecting success of 5514.4 'git fetch --all should continue if a remote has errors': 
+	(git clone one test2 &&
+	 cd test2 &&
+	 git remote add bad ../non-existing &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 git remote add three ../three &&
+	 test_must_fail git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp ../test/expect output)
+
+Cloning into 'test2'...
+done.
+Fetching origin
+Fetching bad
+fatal: '../non-existing' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+error: could not fetch bad
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 4 - git fetch --all should continue if a remote has errors
+
+expecting success of 5514.5 'git fetch --all does not allow non-option arguments': 
+	(cd test &&
+	 test_must_fail git fetch --all origin &&
+	 test_must_fail git fetch --all origin main)
+
+fatal: fetch --all does not take a repository argument
+fatal: fetch --all does not make sense with refspecs
+ok 5 - git fetch --all does not allow non-option arguments
+
+expecting success of 5514.6 'git fetch --multiple (but only one remote)': 
+	(git clone one test3 &&
+	 cd test3 &&
+	 git remote add three ../three &&
+	 git fetch --multiple three &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Cloning into 'test3'...
+done.
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 6 - git fetch --multiple (but only one remote)
+
+expecting success of 5514.7 'git fetch --multiple (two remotes)': 
+	(git clone one test4 &&
+	 cd test4 &&
+	 git remote rm origin &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
+	 git branch -r > output &&
+	 test_cmp ../expect output &&
+	 grep "built-in: git maintenance" trace >gc &&
+	 test_line_count = 1 gc
+	)
+
+Cloning into 'test4'...
+done.
+Fetching one
+Fetching two
+ok 7 - git fetch --multiple (two remotes)
+
+expecting success of 5514.8 'git fetch --multiple (bad remote names)': 
+	(cd test4 &&
+	 test_must_fail git fetch --multiple four)
+
+fatal: no such remote or remote group: four
+ok 8 - git fetch --multiple (bad remote names)
+
+expecting success of 5514.9 'git fetch --all (skipFetchAll)': 
+	(cd test4 &&
+	 for b in $(git branch -r | grep -v HEAD)
+	 do
+		git branch -r -d $b || exit 1
+	 done &&
+	 git remote add three ../three &&
+	 git config remote.three.skipFetchAll true &&
+	 git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Deleted remote-tracking branch one/main (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/main (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+ok 9 - git fetch --all (skipFetchAll)
+
+expecting success of 5514.10 'git fetch --multiple (ignoring skipFetchAll)': 
+	(cd test4 &&
+	 for b in $(git branch -r | grep -v HEAD)
+	 do
+		git branch -r -d $b || exit 1
+	 done &&
+	 git fetch --multiple one two three &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Deleted remote-tracking branch one/main (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/main (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 10 - git fetch --multiple (ignoring skipFetchAll)
+
+expecting success of 5514.11 'git fetch --all --no-tags': 
+	git clone one test5 &&
+	git clone test5 test6 &&
+	(cd test5 && git tag test-tag) &&
+	(
+		cd test6 &&
+		git fetch --all --no-tags &&
+		git tag >output
+	) &&
+	test_must_be_empty test6/output
+
+Cloning into 'test5'...
+done.
+Cloning into 'test6'...
+done.
+ok 11 - git fetch --all --no-tags
+
+expecting success of 5514.12 'git fetch --all --tags': 
+	echo test-tag >expect &&
+	git clone one test7 &&
+	git clone test7 test8 &&
+	(
+		cd test7 &&
+		test_commit test-tag &&
+		git reset --hard HEAD^
+	) &&
+	(
+		cd test8 &&
+		git fetch --all --tags &&
+		git tag >output
+	) &&
+	test_cmp expect test8/output
+
+Cloning into 'test7'...
+done.
+Cloning into 'test8'...
+done.
+[main 09d3cd3] test-tag
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-tag.t
+HEAD is now at 9d34b14 Initial
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/test7
+ * [new tag]         test-tag   -> test-tag
+ok 12 - git fetch --all --tags
+
+expecting success of 5514.13 'parallel': 
+	git remote add one ./bogus1 &&
+	git remote add two ./bogus2 &&
+
+	test_must_fail env GIT_TRACE="$PWD/trace" \
+		git fetch --jobs=2 --multiple one two 2>err &&
+	grep "preparing to run up to 2 tasks" trace &&
+	test_grep "could not fetch .one.*128" err &&
+	test_grep "could not fetch .two.*128" err
+
+Fetching one
+Fetching two
+run_processes_parallel: preparing to run up to 2 tasks
+could not fetch 'one' (exit code: 128)
+could not fetch 'two' (exit code: 128)
+ok 13 - parallel
+
+expecting success of 5514.14 'git fetch --multiple --jobs=0 picks a default': 
+	(cd test &&
+	 git fetch --multiple --jobs=0)
+
+ok 14 - git fetch --multiple --jobs=0 picks a default
+
+expecting success of 5514.15 'git fetch --all (works with fetch.all = true)': 
+		test_dir="test_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git fetch --all &&
+			create_fetch_all_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_fetch_all_true'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 15 - git fetch --all (works with fetch.all = true)
+
+expecting success of 5514.16 'git fetch --all (works with fetch.all = false)': 
+		test_dir="test_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git fetch --all &&
+			create_fetch_all_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_fetch_all_false'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 16 - git fetch --all (works with fetch.all = false)
+
+expecting success of 5514.17 'git fetch (fetch all remotes with fetch.all = true)': 
+	setup_test_clone test9 &&
+	(
+		cd test9 &&
+		git config fetch.all true &&
+		git fetch &&
+		git branch -r >actual &&
+		create_fetch_all_expect &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test9'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 17 - git fetch (fetch all remotes with fetch.all = true)
+
+expecting success of 5514.18 'git fetch one (explicit remote overrides fetch.all)': 
+	setup_test_clone test10 &&
+	(
+		cd test10 &&
+		git config fetch.all true &&
+		git fetch one &&
+		create_fetch_one_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test10'...
+done.
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+ok 18 - git fetch one (explicit remote overrides fetch.all)
+
+expecting success of 5514.19 'git config fetch.all false (fetch only default remote)': 
+	setup_test_clone test11 &&
+	(
+		cd test11 &&
+		git config fetch.all false &&
+		git remote set-url origin ../two &&
+		git fetch &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test11'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 19 - git config fetch.all false (fetch only default remote)
+
+expecting success of 5514.20 'git fetch --no-all (fetch only default remote with fetch.all = true)': 
+		test_dir="test_no_all_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git remote set-url origin ../two &&
+			git fetch --no-all &&
+			create_fetch_two_as_origin_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_no_all_fetch_all_true'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 20 - git fetch --no-all (fetch only default remote with fetch.all = true)
+
+expecting success of 5514.21 'git fetch --no-all (fetch only default remote with fetch.all = false)': 
+		test_dir="test_no_all_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git remote set-url origin ../two &&
+			git fetch --no-all &&
+			create_fetch_two_as_origin_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_no_all_fetch_all_false'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 21 - git fetch --no-all (fetch only default remote with fetch.all = false)
+
+expecting success of 5514.22 'git fetch --no-all (fetch only default remote without fetch.all)': 
+	setup_test_clone test12 &&
+	(
+		cd test12 &&
+		git config --unset-all fetch.all || true &&
+		git remote set-url origin ../two &&
+		git fetch --no-all &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test12'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 22 - git fetch --no-all (fetch only default remote without fetch.all)
+
+expecting success of 5514.23 'git fetch --all --no-all (fetch only default remote)': 
+	setup_test_clone test13 &&
+	(
+		cd test13 &&
+		git remote set-url origin ../two &&
+		git fetch --all --no-all &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test13'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 23 - git fetch --all --no-all (fetch only default remote)
+
+expecting success of 5514.24 'git fetch --no-all one (fetch only explicit remote)': 
+	setup_test_clone test14 &&
+	(
+		cd test14 &&
+		git fetch --no-all one &&
+		create_fetch_one_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test14'...
+done.
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+ok 24 - git fetch --no-all one (fetch only explicit remote)
+
+expecting success of 5514.25 'git fetch --no-all --all (fetch all remotes)': 
+	setup_test_clone test15 &&
+	(
+		cd test15 &&
+		git fetch --no-all --all &&
+		create_fetch_all_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
+	)
+
+Cloning into 'test15'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 25 - git fetch --no-all --all (fetch all remotes)
+
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5517-push-mirror.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5517-push-mirror/.git/
 expecting success of 5517.1 'push mirror creates new branches': 
@@ -330975,7 +331473,7 @@
 Found bitmap for '4b27f21bf7560051516fe49b50eb4063d0ea6f90'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260419T192026.101428Z-H8d819085-P001e8253","thread":"main","time":"2026-04-19T19:20:26.103454Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.002244,"t_rel":0.002244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132314.810301Z-H5c947e1c-P0031123c","thread":"main","time":"2025-03-17T13:23:14.811382Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001279,"t_rel":0.001279,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 4 - reverse index exists (rev)
 
 expecting success of 5327.5 'rev-list --test-bitmap verifies bitmaps': 
@@ -331470,18 +331968,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 4aa534e6 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260419T192026.101428Z-H8d819085-P001e8253","thread":"main","time":"2026-04-19T19:20:26.103454Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.002244,"t_rel":0.002244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192033.436172Z-H8d819085-P001e98a7","thread":"main","time":"2026-04-19T19:20:33.437326Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001328,"t_rel":0.001328,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132314.810301Z-H5c947e1c-P0031123c","thread":"main","time":"2025-03-17T13:23:14.811382Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001279,"t_rel":0.001279,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132324.343718Z-H5c947e1c-P00312d3d","thread":"main","time":"2025-03-17T13:23:24.344811Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001265,"t_rel":0.001265,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 49 - reverse index exists (rev)
 
 expecting success of 5327.50 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 checksum
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 4aa534e6 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 50 - rev-list --test-bitmap verifies bitmaps
@@ -332123,19 +332621,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 24365dde checksum
+Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260419T192026.101428Z-H8d819085-P001e8253","thread":"main","time":"2026-04-19T19:20:26.103454Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.002244,"t_rel":0.002244,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192033.436172Z-H8d819085-P001e98a7","thread":"main","time":"2026-04-19T19:20:33.437326Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001328,"t_rel":0.001328,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192040.984071Z-H8d819085-P001eb3f1","thread":"main","time":"2026-04-19T19:20:40.985195Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001318,"t_rel":0.001318,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132314.810301Z-H5c947e1c-P0031123c","thread":"main","time":"2025-03-17T13:23:14.811382Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001279,"t_rel":0.001279,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132324.343718Z-H5c947e1c-P00312d3d","thread":"main","time":"2025-03-17T13:23:24.344811Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001265,"t_rel":0.001265,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132332.997347Z-H5c947e1c-P00314980","thread":"main","time":"2025-03-17T13:23:32.998499Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.013452,"t_rel":0.013452,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 115 - reverse index exists (rev)
 
 expecting success of 5327.116 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 24365dde checksum
+Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 116 - rev-list --test-bitmap verifies bitmaps
@@ -332777,7 +333275,7 @@
 Found bitmap for 'db2803b34efd93d3448bc6cf028a889473ba3735'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260419T192047.954079Z-H8d819085-P001ecb32","thread":"main","time":"2026-04-19T19:20:47.955196Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001302,"t_rel":0.001302,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132340.331674Z-H5c947e1c-P003161f4","thread":"main","time":"2025-03-17T13:23:40.332704Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001218,"t_rel":0.001218,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 161 - reverse index exists (rev)
 
 expecting success of 5327.162 'rev-list --test-bitmap verifies bitmaps': 
@@ -333272,18 +333770,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260419T192047.954079Z-H8d819085-P001ecb32","thread":"main","time":"2026-04-19T19:20:47.955196Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001302,"t_rel":0.001302,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192055.492244Z-H8d819085-P001ee402","thread":"main","time":"2026-04-19T19:20:55.493405Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001338,"t_rel":0.001338,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132340.331674Z-H5c947e1c-P003161f4","thread":"main","time":"2025-03-17T13:23:40.332704Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001218,"t_rel":0.001218,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132349.487723Z-H5c947e1c-P003180bf","thread":"main","time":"2025-03-17T13:23:49.488861Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001324,"t_rel":0.001324,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 206 - reverse index exists (rev)
 
 expecting success of 5327.207 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
 ok 207 - rev-list --test-bitmap verifies bitmaps
@@ -333928,9 +334426,9 @@
 Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260419T192047.954079Z-H8d819085-P001ecb32","thread":"main","time":"2026-04-19T19:20:47.955196Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001302,"t_rel":0.001302,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192055.492244Z-H8d819085-P001ee402","thread":"main","time":"2026-04-19T19:20:55.493405Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001338,"t_rel":0.001338,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20260419T192102.332182Z-H8d819085-P001efc31","thread":"main","time":"2026-04-19T19:21:02.333372Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001364,"t_rel":0.001364,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132340.331674Z-H5c947e1c-P003161f4","thread":"main","time":"2025-03-17T13:23:40.332704Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001218,"t_rel":0.001218,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132349.487723Z-H5c947e1c-P003180bf","thread":"main","time":"2025-03-17T13:23:49.488861Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001324,"t_rel":0.001324,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20250317T132357.789490Z-H5c947e1c-P00319d4c","thread":"main","time":"2025-03-17T13:23:57.790633Z","file":"pack-revindex.c","line":383,"repo":1,"t_abs":0.001359,"t_rel":0.001359,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 272 - reverse index exists (rev)
 
 expecting success of 5327.273 'rev-list --test-bitmap verifies bitmaps': 
@@ -334300,551 +334798,6 @@
 1..314
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5514-fetch-multiple.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/.git/
-expecting success of 5514.1 'setup': 
-	setup_repository one &&
-	setup_repository two &&
-	(
-		cd two && git branch another
-	) &&
-	git clone --mirror two three &&
-	git clone one test
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/one/.git/
-[main (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 2ce9c50] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/two/.git/
-[main (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 2ce9c50] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-Switched to branch 'main'
-Cloning into bare repository 'three'...
-done.
-Cloning into 'test'...
-done.
-ok 1 - setup
-
-expecting success of 5514.2 'git fetch --all': 
-	(cd test &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp expect output)
-
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 2 - git fetch --all
-
-expecting success of 5514.3 'git fetch --all --no-write-fetch-head': 
-	(cd test &&
-	rm -f .git/FETCH_HEAD &&
-	git fetch --all --no-write-fetch-head &&
-	test_path_is_missing .git/FETCH_HEAD)
-
-Fetching origin
-Fetching one
-Fetching two
-Fetching three
-ok 3 - git fetch --all --no-write-fetch-head
-
-expecting success of 5514.4 'git fetch --all should continue if a remote has errors': 
-	(git clone one test2 &&
-	 cd test2 &&
-	 git remote add bad ../non-existing &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 test_must_fail git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../test/expect output)
-
-Cloning into 'test2'...
-done.
-Fetching origin
-Fetching bad
-fatal: '../non-existing' does not appear to be a git repository
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-error: could not fetch bad
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 4 - git fetch --all should continue if a remote has errors
-
-expecting success of 5514.5 'git fetch --all does not allow non-option arguments': 
-	(cd test &&
-	 test_must_fail git fetch --all origin &&
-	 test_must_fail git fetch --all origin main)
-
-fatal: fetch --all does not take a repository argument
-fatal: fetch --all does not make sense with refspecs
-ok 5 - git fetch --all does not allow non-option arguments
-
-expecting success of 5514.6 'git fetch --multiple (but only one remote)': 
-	(git clone one test3 &&
-	 cd test3 &&
-	 git remote add three ../three &&
-	 git fetch --multiple three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Cloning into 'test3'...
-done.
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 6 - git fetch --multiple (but only one remote)
-
-expecting success of 5514.7 'git fetch --multiple (two remotes)': 
-	(git clone one test4 &&
-	 cd test4 &&
-	 git remote rm origin &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
-	 git branch -r > output &&
-	 test_cmp ../expect output &&
-	 grep "built-in: git maintenance" trace >gc &&
-	 test_line_count = 1 gc
-	)
-
-Cloning into 'test4'...
-done.
-Fetching one
-Fetching two
-ok 7 - git fetch --multiple (two remotes)
-
-expecting success of 5514.8 'git fetch --multiple (bad remote names)': 
-	(cd test4 &&
-	 test_must_fail git fetch --multiple four)
-
-fatal: no such remote or remote group: four
-ok 8 - git fetch --multiple (bad remote names)
-
-expecting success of 5514.9 'git fetch --all (skipFetchAll)': 
-	(cd test4 &&
-	 for b in $(git branch -r | grep -v HEAD)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git remote add three ../three &&
-	 git config remote.three.skipFetchAll true &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Deleted remote-tracking branch one/main (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/main (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-ok 9 - git fetch --all (skipFetchAll)
-
-expecting success of 5514.10 'git fetch --multiple (ignoring skipFetchAll)': 
-	(cd test4 &&
-	 for b in $(git branch -r | grep -v HEAD)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git fetch --multiple one two three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Deleted remote-tracking branch one/main (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/main (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 10 - git fetch --multiple (ignoring skipFetchAll)
-
-expecting success of 5514.11 'git fetch --all --no-tags': 
-	git clone one test5 &&
-	git clone test5 test6 &&
-	(cd test5 && git tag test-tag) &&
-	(
-		cd test6 &&
-		git fetch --all --no-tags &&
-		git tag >output
-	) &&
-	test_must_be_empty test6/output
-
-Cloning into 'test5'...
-done.
-Cloning into 'test6'...
-done.
-ok 11 - git fetch --all --no-tags
-
-expecting success of 5514.12 'git fetch --all --tags': 
-	echo test-tag >expect &&
-	git clone one test7 &&
-	git clone test7 test8 &&
-	(
-		cd test7 &&
-		test_commit test-tag &&
-		git reset --hard HEAD^
-	) &&
-	(
-		cd test8 &&
-		git fetch --all --tags &&
-		git tag >output
-	) &&
-	test_cmp expect test8/output
-
-Cloning into 'test7'...
-done.
-Cloning into 'test8'...
-done.
-[main 09d3cd3] test-tag
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-tag.t
-HEAD is now at 9d34b14 Initial
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5514-fetch-multiple/test7
- * [new tag]         test-tag   -> test-tag
-ok 12 - git fetch --all --tags
-
-expecting success of 5514.13 'parallel': 
-	git remote add one ./bogus1 &&
-	git remote add two ./bogus2 &&
-
-	test_must_fail env GIT_TRACE="$PWD/trace" \
-		git fetch --jobs=2 --multiple one two 2>err &&
-	grep "preparing to run up to 2 tasks" trace &&
-	test_grep "could not fetch .one.*128" err &&
-	test_grep "could not fetch .two.*128" err
-
-Fetching one
-Fetching two
-run_processes_parallel: preparing to run up to 2 tasks
-could not fetch 'one' (exit code: 128)
-could not fetch 'two' (exit code: 128)
-ok 13 - parallel
-
-expecting success of 5514.14 'git fetch --multiple --jobs=0 picks a default': 
-	(cd test &&
-	 git fetch --multiple --jobs=0)
-
-ok 14 - git fetch --multiple --jobs=0 picks a default
-
-expecting success of 5514.15 'git fetch --all (works with fetch.all = true)': 
-		test_dir="test_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git fetch --all &&
-			create_fetch_all_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_fetch_all_true'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 15 - git fetch --all (works with fetch.all = true)
-
-expecting success of 5514.16 'git fetch --all (works with fetch.all = false)': 
-		test_dir="test_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git fetch --all &&
-			create_fetch_all_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_fetch_all_false'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 16 - git fetch --all (works with fetch.all = false)
-
-expecting success of 5514.17 'git fetch (fetch all remotes with fetch.all = true)': 
-	setup_test_clone test9 &&
-	(
-		cd test9 &&
-		git config fetch.all true &&
-		git fetch &&
-		git branch -r >actual &&
-		create_fetch_all_expect &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test9'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 17 - git fetch (fetch all remotes with fetch.all = true)
-
-expecting success of 5514.18 'git fetch one (explicit remote overrides fetch.all)': 
-	setup_test_clone test10 &&
-	(
-		cd test10 &&
-		git config fetch.all true &&
-		git fetch one &&
-		create_fetch_one_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test10'...
-done.
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-ok 18 - git fetch one (explicit remote overrides fetch.all)
-
-expecting success of 5514.19 'git config fetch.all false (fetch only default remote)': 
-	setup_test_clone test11 &&
-	(
-		cd test11 &&
-		git config fetch.all false &&
-		git remote set-url origin ../two &&
-		git fetch &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test11'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 19 - git config fetch.all false (fetch only default remote)
-
-expecting success of 5514.20 'git fetch --no-all (fetch only default remote with fetch.all = true)': 
-		test_dir="test_no_all_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git remote set-url origin ../two &&
-			git fetch --no-all &&
-			create_fetch_two_as_origin_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_no_all_fetch_all_true'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 20 - git fetch --no-all (fetch only default remote with fetch.all = true)
-
-expecting success of 5514.21 'git fetch --no-all (fetch only default remote with fetch.all = false)': 
-		test_dir="test_no_all_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git remote set-url origin ../two &&
-			git fetch --no-all &&
-			create_fetch_two_as_origin_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_no_all_fetch_all_false'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 21 - git fetch --no-all (fetch only default remote with fetch.all = false)
-
-expecting success of 5514.22 'git fetch --no-all (fetch only default remote without fetch.all)': 
-	setup_test_clone test12 &&
-	(
-		cd test12 &&
-		git config --unset-all fetch.all || true &&
-		git remote set-url origin ../two &&
-		git fetch --no-all &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test12'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 22 - git fetch --no-all (fetch only default remote without fetch.all)
-
-expecting success of 5514.23 'git fetch --all --no-all (fetch only default remote)': 
-	setup_test_clone test13 &&
-	(
-		cd test13 &&
-		git remote set-url origin ../two &&
-		git fetch --all --no-all &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test13'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 23 - git fetch --all --no-all (fetch only default remote)
-
-expecting success of 5514.24 'git fetch --no-all one (fetch only explicit remote)': 
-	setup_test_clone test14 &&
-	(
-		cd test14 &&
-		git fetch --no-all one &&
-		create_fetch_one_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test14'...
-done.
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-ok 24 - git fetch --no-all one (fetch only explicit remote)
-
-expecting success of 5514.25 'git fetch --no-all --all (fetch all remotes)': 
-	setup_test_clone test15 &&
-	(
-		cd test15 &&
-		git fetch --no-all --all &&
-		create_fetch_all_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test15'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 25 - git fetch --no-all --all (fetch all remotes)
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5522-pull-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5522-pull-symlink/.git/
 checking prerequisite: SYMLINKS
@@ -335919,85 +335872,6 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5529-push-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5529-push-errors/.git/
-expecting success of 5529.1 'setup commits': 
-	test_commit one
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup commits
-
-expecting success of 5529.2 'setup remote': 
-	git init --bare remote.git &&
-	git remote add origin remote.git
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5529-push-errors/remote.git/
-ok 2 - setup remote
-
-expecting success of 5529.3 'setup fake receive-pack': 
-	FAKE_RP_ROOT=$(pwd) &&
-	export FAKE_RP_ROOT &&
-	write_script fake-rp <<-\EOF &&
-	echo yes >"$FAKE_RP_ROOT"/rp-ran
-	exit 1
-	EOF
-	git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
-
-ok 3 - setup fake receive-pack
-
-expecting success of 5529.4 'detect missing branches early': 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin missing &&
-	test_cmp expect rp-ran
-
-error: src refspec missing does not match any
-error: failed to push some refs to 'remote.git'
-ok 4 - detect missing branches early
-
-expecting success of 5529.5 'detect missing sha1 expressions early': 
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin main~2:main &&
-	test_cmp expect rp-ran
-
-error: src refspec main~2 does not match any
-error: failed to push some refs to 'remote.git'
-ok 5 - detect missing sha1 expressions early
-
-expecting success of 5529.6 'detect empty remote with existing local ref': 
-	test_must_fail git push "" main 2> stderr &&
-	grep "fatal: bad repository ${SQ}${SQ}" stderr
-
-fatal: bad repository ''
-ok 6 - detect empty remote with existing local ref
-
-expecting success of 5529.7 'detect empty remote with targeted refspec': 
-	test_must_fail git push "" HEAD:refs/heads/main 2> stderr &&
-	grep "fatal: bad repository ${SQ}${SQ}" stderr
-
-fatal: bad repository ''
-ok 7 - detect empty remote with targeted refspec
-
-expecting success of 5529.8 'detect ambiguous refs early': 
-	git branch foo &&
-	git tag foo &&
-	echo no >rp-ran &&
-	echo no >expect &&
-	test_must_fail git push origin foo &&
-	test_cmp expect rp-ran
-
-error: src refspec foo matches more than one
-error: failed to push some refs to 'remote.git'
-ok 8 - detect ambiguous refs early
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5505-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5505-remote/.git/
 expecting success of 5505.1 'setup': 
@@ -336363,8 +336237,8 @@
 	test_cmp expect output
 
 error: src refspec refs/tags/lastbackup does not match any
---- expect	2026-04-19 19:20:56.699659440 +0000
-+++ output	2026-04-19 19:20:56.775659440 +0000
+--- expect	2025-03-17 13:23:50.385653437 +0000
++++ output	2025-03-17 13:23:50.457653892 +0000
 @@ -4,7 +4,7 @@
    HEAD branch: main
    Remote branches:
@@ -337200,8 +337074,8 @@
 warning: The global configuration remote.pushDefault in:
 	file:2
 now names the non-existent remote 'origin'
-{"event":"region_enter","sid":"20260419T192105.428351Z-H8d819085-P001f073d","thread":"main","time":"2026-04-19T19:21:05.429474Z","file":"progress.c","line":275,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
-{"event":"region_leave","sid":"20260419T192105.428351Z-H8d819085-P001f073d","thread":"main","time":"2026-04-19T19:21:05.442809Z","file":"progress.c","line":357,"repo":1,"t_rel":0.013336,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_enter","sid":"20250317T132359.758658Z-H5c947e1c-P0031a33a","thread":"main","time":"2025-03-17T13:23:59.759681Z","file":"progress.c","line":275,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_leave","sid":"20250317T132359.758658Z-H5c947e1c-P0031a33a","thread":"main","time":"2025-03-17T13:23:59.760768Z","file":"progress.c","line":357,"repo":1,"t_rel":0.001087,"nesting":1,"category":"progress","label":"Renaming remote references"}
 	pushRemote = upstream
 ok 68 - rename a remote
 
@@ -338070,6 +337944,85 @@
 1..123
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5529-push-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5529-push-errors/.git/
+expecting success of 5529.1 'setup commits': 
+	test_commit one
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup commits
+
+expecting success of 5529.2 'setup remote': 
+	git init --bare remote.git &&
+	git remote add origin remote.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5529-push-errors/remote.git/
+ok 2 - setup remote
+
+expecting success of 5529.3 'setup fake receive-pack': 
+	FAKE_RP_ROOT=$(pwd) &&
+	export FAKE_RP_ROOT &&
+	write_script fake-rp <<-\EOF &&
+	echo yes >"$FAKE_RP_ROOT"/rp-ran
+	exit 1
+	EOF
+	git config remote.origin.receivepack "\"\$FAKE_RP_ROOT/fake-rp\""
+
+ok 3 - setup fake receive-pack
+
+expecting success of 5529.4 'detect missing branches early': 
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin missing &&
+	test_cmp expect rp-ran
+
+error: src refspec missing does not match any
+error: failed to push some refs to 'remote.git'
+ok 4 - detect missing branches early
+
+expecting success of 5529.5 'detect missing sha1 expressions early': 
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin main~2:main &&
+	test_cmp expect rp-ran
+
+error: src refspec main~2 does not match any
+error: failed to push some refs to 'remote.git'
+ok 5 - detect missing sha1 expressions early
+
+expecting success of 5529.6 'detect empty remote with existing local ref': 
+	test_must_fail git push "" main 2> stderr &&
+	grep "fatal: bad repository ${SQ}${SQ}" stderr
+
+fatal: bad repository ''
+ok 6 - detect empty remote with existing local ref
+
+expecting success of 5529.7 'detect empty remote with targeted refspec': 
+	test_must_fail git push "" HEAD:refs/heads/main 2> stderr &&
+	grep "fatal: bad repository ${SQ}${SQ}" stderr
+
+fatal: bad repository ''
+ok 7 - detect empty remote with targeted refspec
+
+expecting success of 5529.8 'detect ambiguous refs early': 
+	git branch foo &&
+	git tag foo &&
+	echo no >rp-ran &&
+	echo no >expect &&
+	test_must_fail git push origin foo &&
+	test_cmp expect rp-ran
+
+error: src refspec foo matches more than one
+error: failed to push some refs to 'remote.git'
+ok 8 - detect ambiguous refs early
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5530-upload-pack-error.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5530-upload-pack-error/.git/
 expecting success of 5530.1 'setup and corrupt repository': 
@@ -338536,6 +338489,78 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5535-fetch-push-symref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5535-fetch-push-symref/.git/
+expecting success of 5535.1 'setup': 
+	test_commit one &&
+	git clone . src &&
+	git clone src dst1 &&
+	git clone src dst2 &&
+	test_commit two &&
+	( cd src && git pull )
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'src'...
+done.
+Cloning into 'dst1'...
+done.
+Cloning into 'dst2'...
+done.
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5535-fetch-push-symref/.
+   d79ce16..139b20d  master     -> origin/master
+ * [new tag]         two        -> two
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
+
+expecting success of 5535.2 'push': 
+	(
+		cd src &&
+		git push ../dst1 "refs/remotes/*:refs/remotes/*"
+	) &&
+	git ls-remote src "refs/remotes/*" >expect &&
+	git ls-remote dst1 "refs/remotes/*" >actual &&
+	test_cmp expect actual &&
+	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
+	( cd dst1 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
+	test_cmp expect actual
+
+To ../dst1
+   d79ce16..139b20d  origin/HEAD -> origin/HEAD
+   d79ce16..139b20d  origin/master -> origin/master
+ok 2 - push
+
+expecting success of 5535.3 'fetch': 
+	(
+		cd dst2 &&
+		git fetch ../src "refs/remotes/*:refs/remotes/*"
+	) &&
+	git ls-remote src "refs/remotes/*" >expect &&
+	git ls-remote dst2 "refs/remotes/*" >actual &&
+	test_cmp expect actual &&
+	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
+	( cd dst2 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
+	test_cmp expect actual
+
+From ../src
+   d79ce16..139b20d  origin/master -> origin/master
+ * [new tag]         two           -> two
+ok 3 - fetch
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5326-multi-pack-bitmaps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5326-multi-pack-bitmaps/.git/
 expecting success of 5326.1 'setup test_repository': 
@@ -338821,7 +338846,7 @@
 Found bitmap for '4b27f21bf7560051516fe49b50eb4063d0ea6f90'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260419T192025.690963Z-H8d819085-P001e80d6","thread":"main","time":"2026-04-19T19:20:25.692008Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001239,"t_rel":0.001239,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132313.575194Z-H5c947e1c-P00310eab","thread":"main","time":"2025-03-17T13:23:13.576270Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001289,"t_rel":0.001289,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 4 - reverse index exists (midx)
 
 expecting success of 5326.5 'rev-list --test-bitmap verifies bitmaps': 
@@ -339319,8 +339344,8 @@
 Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / b399ece2 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260419T192025.690963Z-H8d819085-P001e80d6","thread":"main","time":"2026-04-19T19:20:25.692008Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001239,"t_rel":0.001239,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192032.987594Z-H8d819085-P001e971c","thread":"main","time":"2026-04-19T19:20:32.988720Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001304,"t_rel":0.001304,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132313.575194Z-H5c947e1c-P00310eab","thread":"main","time":"2025-03-17T13:23:13.576270Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001289,"t_rel":0.001289,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132322.528996Z-H5c947e1c-P003127d2","thread":"main","time":"2025-03-17T13:23:22.535893Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.007075,"t_rel":0.007075,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 49 - reverse index exists (midx)
 
 expecting success of 5326.50 'rev-list --test-bitmap verifies bitmaps': 
@@ -340043,7 +340068,7 @@
 bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
 ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
 Bitmap v1 test (32 entries loaded)
-Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 128 bits / a7ce019c checksum
+Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 64 bits / 26205a9e checksum
 Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
 OK!
 Bitmap v1 test (32 entries loaded)
@@ -340342,9 +340367,9 @@
 Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / e99a0c7c checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260419T192025.690963Z-H8d819085-P001e80d6","thread":"main","time":"2026-04-19T19:20:25.692008Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001239,"t_rel":0.001239,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192032.987594Z-H8d819085-P001e971c","thread":"main","time":"2026-04-19T19:20:32.988720Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001304,"t_rel":0.001304,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192042.652493Z-H8d819085-P001eb9e5","thread":"main","time":"2026-04-19T19:20:42.653691Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001391,"t_rel":0.001391,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132313.575194Z-H5c947e1c-P00310eab","thread":"main","time":"2025-03-17T13:23:13.576270Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001289,"t_rel":0.001289,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132322.528996Z-H5c947e1c-P003127d2","thread":"main","time":"2025-03-17T13:23:22.535893Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.007075,"t_rel":0.007075,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132333.700363Z-H5c947e1c-P00314ba6","thread":"main","time":"2025-03-17T13:23:33.714771Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.014586,"t_rel":0.014586,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 125 - reverse index exists (midx)
 
 expecting success of 5326.126 'rev-list --test-bitmap verifies bitmaps': 
@@ -340808,8 +340833,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:20:48.331659440 +0000
-+++ after	2026-04-19 19:20:48.495659440 +0000
+--- before	2025-03-17 13:23:39.697585891 +0000
++++ after	2025-03-17 13:23:39.941587433 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -340934,8 +340959,8 @@
 pack_report: pack_mapped              =      26910 /      26910
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:20:49.619659440 +0000
-+++ after	2026-04-19 19:20:49.799659440 +0000
+--- before	2025-03-17 13:23:41.297596002 +0000
++++ after	2025-03-17 13:23:41.505597317 +0000
 @@ -1 +1 @@
 -fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
 +ddf14642c6faca04471beee86e605bcbfd21396e
@@ -341322,7 +341347,7 @@
 Found bitmap for 'db2803b34efd93d3448bc6cf028a889473ba3735'. 640 bits / 891eb351 checksum
 Verifying bitmap entries:   0% (1/343)
Verifying bitmap entries:   1% (4/343)
Verifying bitmap entries:   2% (7/343)
Verifying bitmap entries:   3% (11/343)
Verifying bitmap entries:   4% (14/343)
Verifying bitmap entries:   5% (18/343)
Verifying bitmap entries:   6% (21/343)
Verifying bitmap entries:   7% (25/343)
Verifying bitmap entries:   8% (28/343)
Verifying bitmap entries:   9% (31/343)
Verifying bitmap entries:  10% (35/343)
Verifying bitmap entries:  11% (38/343)
Verifying bitmap entries:  12% (42/343)
Verifying bitmap entries:  13% (45/343)
Verifying bitmap entries:  14% (49/343)
Verifying bitmap entries:  15% (52/343)
Verifying bitmap entries:  16% (55/343)
Verifying bitmap entries:  17% (59/343)
Verifying bitmap entries:  18% (62/343)
Verifying bitmap entries:  19% (66/343)
Verifying bitmap entries:  20% (69/343)
Verifying bitmap entries:  21% (73/343)
Verifying bitmap entries:  22% (76/343)
Verifying bitmap entries:  23% (79/343)
Verifying bitmap entries:  24% (83/343)
Verifying bitmap entries:  25% (86/343)
Verifying bitmap entries:  26% (90/343)
Verifying bitmap entries:  27% (93/343)
Verifying bitmap entries:  28% (97/343)
Verifying bitmap entries:  29% (100/343)
Verifying bitmap entries:  30% (103/343)
Verifying bitmap entries:  31% (107/343)
Verifying bitmap entries:  32% (110/343)
Verifying bitmap entries:  33% (114/343)
Verifying bitmap entries:  34% (117/343)
Verifying bitmap entries:  35% (121/343)
Verifying bitmap entries:  36% (124/343)
Verifying bitmap entries:  37% (127/343)
Verifying bitmap entries:  38% (131/343)
Verifying bitmap entries:  39% (134/343)
Verifying bitmap entries:  40% (138/343)
Verifying bitmap entries:  41% (141/343)
Verifying bitmap entries:  42% (145/343)
Verifying bitmap entries:  43% (148/343)
Verifying bitmap entries:  44% (151/343)
Verifying bitmap entries:  45% (155/343)
Verifying bitmap entries:  46% (158/343)
Verifying bitmap entries:  47% (162/343)
Verifying bitmap entries:  48% (165/343)
Verifying bitmap entries:  49% (169/343)
Verifying bitmap entries:  50% (172/343)
Verifying bitmap entries:  51% (175/343)
Verifying bitmap entries:  52% (179/343)
Verifying bitmap entries:  53% (182/343)
Verifying bitmap entries:  54% (186/343)
Verifying bitmap entries:  55% (189/343)
Verifying bitmap entries:  56% (193/343)
Verifying bitmap entries:  57% (196/343)
Verifying bitmap entries:  58% (199/343)
Verifying bitmap entries:  59% (203/343)
Verifying bitmap entries:  60% (206/343)
Verifying bitmap entries:  61% (210/343)
Verifying bitmap entries:  62% (213/343)
Verifying bitmap entries:  63% (217/343)
Verifying bitmap entries:  64% (220/343)
Verifying bitmap entries:  65% (223/343)
Verifying bitmap entries:  66% (227/343)
Verifying bitmap entries:  67% (230/343)
Verifying bitmap entries:  68% (234/343)
Verifying bitmap entries:  69% (237/343)
Verifying bitmap entries:  70% (241/343)
Verifying bitmap entries:  71% (244/343)
Verifying bitmap entries:  72% (247/343)
Verifying bitmap entries:  73% (251/343)
Verifying bitmap entries:  74% (254/343)
Verifying bitmap entries:  75% (258/343)
Verifying bitmap entries:  76% (261/343)
Verifying bitmap entries:  77% (265/343)
Verifying bitmap entries:  78% (268/343)
Verifying bitmap entries:  79% (271/343)
Verifying bitmap entries:  80% (275/343)
Verifying bitmap entries:  81% (278/343)
Verifying bitmap entries:  82% (282/343)
Verifying bitmap entries:  83% (285/343)
Verifying bitmap entries:  84% (289/343)
Verifying bitmap entries:  85% (292/343)
Verifying bitmap entries:  86% (295/343)
Verifying bitmap entries:  87% (299/343)
Verifying bitmap entries:  88% (302/343)
Verifying bitmap entries:  89% (306/343)
Verifying bitmap entries:  90% (309/343)
Verifying bitmap entries:  91% (313/343)
Verifying bitmap entries:  92% (316/343)
Verifying bitmap entries:  93% (319/343)
Verifying bitmap entries:  94% (323/343)
Verifying bitmap entries:  95% (326/343)
Verifying bitmap entries:  96% (330/343)
Verifying bitmap entries:  97% (333/343)
Verifying bitmap entries:  98% (337/343)
Verifying bitmap entries:  99% (340/343)
Verifying bitmap entries: 100% (343/343)
Verifying bitmap entries: 100% (343/343), done.
 OK!
-{"event":"data","sid":"20260419T192053.276145Z-H8d819085-P001edc54","thread":"main","time":"2026-04-19T19:20:53.277209Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132345.559738Z-H5c947e1c-P003172c8","thread":"main","time":"2025-03-17T13:23:45.560800Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001253,"t_rel":0.001253,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 178 - reverse index exists (midx)
 
 expecting success of 5326.179 'rev-list --test-bitmap verifies bitmaps': 
@@ -341820,8 +341845,8 @@
 Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / da6c1e68 checksum
 Verifying bitmap entries:   0% (1/422)
Verifying bitmap entries:   1% (5/422)
Verifying bitmap entries:   2% (9/422)
Verifying bitmap entries:   3% (13/422)
Verifying bitmap entries:   4% (17/422)
Verifying bitmap entries:   5% (22/422)
Verifying bitmap entries:   6% (26/422)
Verifying bitmap entries:   7% (30/422)
Verifying bitmap entries:   8% (34/422)
Verifying bitmap entries:   9% (38/422)
Verifying bitmap entries:  10% (43/422)
Verifying bitmap entries:  11% (47/422)
Verifying bitmap entries:  12% (51/422)
Verifying bitmap entries:  13% (55/422)
Verifying bitmap entries:  14% (60/422)
Verifying bitmap entries:  15% (64/422)
Verifying bitmap entries:  16% (68/422)
Verifying bitmap entries:  17% (72/422)
Verifying bitmap entries:  18% (76/422)
Verifying bitmap entries:  19% (81/422)
Verifying bitmap entries:  20% (85/422)
Verifying bitmap entries:  21% (89/422)
Verifying bitmap entries:  22% (93/422)
Verifying bitmap entries:  23% (98/422)
Verifying bitmap entries:  24% (102/422)
Verifying bitmap entries:  25% (106/422)
Verifying bitmap entries:  26% (110/422)
Verifying bitmap entries:  27% (114/422)
Verifying bitmap entries:  28% (119/422)
Verifying bitmap entries:  29% (123/422)
Verifying bitmap entries:  30% (127/422)
Verifying bitmap entries:  31% (131/422)
Verifying bitmap entries:  32% (136/422)
Verifying bitmap entries:  33% (140/422)
Verifying bitmap entries:  34% (144/422)
Verifying bitmap entries:  35% (148/422)
Verifying bitmap entries:  36% (152/422)
Verifying bitmap entries:  37% (157/422)
Verifying bitmap entries:  38% (161/422)
Verifying bitmap entries:  39% (165/422)
Verifying bitmap entries:  40% (169/422)
Verifying bitmap entries:  41% (174/422)
Verifying bitmap entries:  42% (178/422)
Verifying bitmap entries:  43% (182/422)
Verifying bitmap entries:  44% (186/422)
Verifying bitmap entries:  45% (190/422)
Verifying bitmap entries:  46% (195/422)
Verifying bitmap entries:  47% (199/422)
Verifying bitmap entries:  48% (203/422)
Verifying bitmap entries:  49% (207/422)
Verifying bitmap entries:  50% (211/422)
Verifying bitmap entries:  51% (216/422)
Verifying bitmap entries:  52% (220/422)
Verifying bitmap entries:  53% (224/422)
Verifying bitmap entries:  54% (228/422)
Verifying bitmap entries:  55% (233/422)
Verifying bitmap entries:  56% (237/422)
Verifying bitmap entries:  57% (241/422)
Verifying bitmap entries:  58% (245/422)
Verifying bitmap entries:  59% (249/422)
Verifying bitmap entries:  60% (254/422)
Verifying bitmap entries:  61% (258/422)
Verifying bitmap entries:  62% (262/422)
Verifying bitmap entries:  63% (266/422)
Verifying bitmap entries:  64% (271/422)
Verifying bitmap entries:  65% (275/422)
Verifying bitmap entries:  66% (279/422)
Verifying bitmap entries:  67% (283/422)
Verifying bitmap entries:  68% (287/422)
Verifying bitmap entries:  69% (292/422)
Verifying bitmap entries:  70% (296/422)
Verifying bitmap entries:  71% (300/422)
Verifying bitmap entries:  72% (304/422)
Verifying bitmap entries:  73% (309/422)
Verifying bitmap entries:  74% (313/422)
Verifying bitmap entries:  75% (317/422)
Verifying bitmap entries:  76% (321/422)
Verifying bitmap entries:  77% (325/422)
Verifying bitmap entries:  78% (330/422)
Verifying bitmap entries:  79% (334/422)
Verifying bitmap entries:  80% (338/422)
Verifying bitmap entries:  81% (342/422)
Verifying bitmap entries:  82% (347/422)
Verifying bitmap entries:  83% (351/422)
Verifying bitmap entries:  84% (355/422)
Verifying bitmap entries:  85% (359/422)
Verifying bitmap entries:  86% (363/422)
Verifying bitmap entries:  87% (368/422)
Verifying bitmap entries:  88% (372/422)
Verifying bitmap entries:  89% (376/422)
Verifying bitmap entries:  90% (380/422)
Verifying bitmap entries:  91% (385/422)
Verifying bitmap entries:  92% (389/422)
Verifying bitmap entries:  93% (393/422)
Verifying bitmap entries:  94% (397/422)
Verifying bitmap entries:  95% (401/422)
Verifying bitmap entries:  96% (406/422)
Verifying bitmap entries:  97% (410/422)
Verifying bitmap entries:  98% (414/422)
Verifying bitmap entries:  99% (418/422)
Verifying bitmap entries: 100% (422/422)
Verifying bitmap entries: 100% (422/422), done.
 OK!
-{"event":"data","sid":"20260419T192053.276145Z-H8d819085-P001edc54","thread":"main","time":"2026-04-19T19:20:53.277209Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192100.615572Z-H8d819085-P001ef594","thread":"main","time":"2026-04-19T19:21:00.616705Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001307,"t_rel":0.001307,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132345.559738Z-H5c947e1c-P003172c8","thread":"main","time":"2025-03-17T13:23:45.560800Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001253,"t_rel":0.001253,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132354.194160Z-H5c947e1c-P0031915f","thread":"main","time":"2025-03-17T13:23:54.195247Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001281,"t_rel":0.001281,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 223 - reverse index exists (midx)
 
 expecting success of 5326.224 'rev-list --test-bitmap verifies bitmaps': 
@@ -342840,19 +342865,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20260419T192053.276145Z-H8d819085-P001edc54","thread":"main","time":"2026-04-19T19:20:53.277209Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001241,"t_rel":0.001241,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192100.615572Z-H8d819085-P001ef594","thread":"main","time":"2026-04-19T19:21:00.616705Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001307,"t_rel":0.001307,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20260419T192109.048230Z-H8d819085-P001f13d5","thread":"main","time":"2026-04-19T19:21:09.049449Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001398,"t_rel":0.001398,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132345.559738Z-H5c947e1c-P003172c8","thread":"main","time":"2025-03-17T13:23:45.560800Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001253,"t_rel":0.001253,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132354.194160Z-H5c947e1c-P0031915f","thread":"main","time":"2025-03-17T13:23:54.195247Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001281,"t_rel":0.001281,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20250317T132405.445743Z-H5c947e1c-P0031b458","thread":"main","time":"2025-03-17T13:24:05.446874Z","file":"pack-revindex.c","line":377,"repo":1,"t_abs":0.001362,"t_rel":0.001362,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
 ok 299 - reverse index exists (midx)
 
 expecting success of 5326.300 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 300 - rev-list --test-bitmap verifies bitmaps
@@ -343309,8 +343334,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:21:14.139659440 +0000
-+++ after	2026-04-19 19:21:14.327659440 +0000
+--- before	2025-03-17 13:24:11.661787896 +0000
++++ after	2025-03-17 13:24:11.841789033 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -343435,8 +343460,8 @@
 pack_report: pack_mapped              =      26907 /      26907
 ---------------------------------------------------------------------
 
---- before	2026-04-19 19:21:15.327659440 +0000
-+++ after	2026-04-19 19:21:15.487659440 +0000
+--- before	2025-03-17 13:24:13.089796920 +0000
++++ after	2025-03-17 13:24:13.269798058 +0000
 @@ -1 +1 @@
 -a09427aadc45553b705d3a726a24ceeaa43874f0
 +e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
@@ -343559,8 +343584,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"region_enter","sid":"20260419T192116.588258Z-H8d819085-P001f2e20","thread":"main","time":"2026-04-19T19:21:16.590559Z","file":"pack-bitmap-write.c","line":963,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20260419T192116.588258Z-H8d819085-P001f2e20","thread":"main","time":"2026-04-19T19:21:16.602610Z","file":"pack-bitmap-write.c","line":990,"repo":1,"t_rel":0.012046,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_enter","sid":"20250317T132414.621880Z-H5c947e1c-P0031d20c","thread":"main","time":"2025-03-17T13:24:14.624012Z","file":"pack-bitmap-write.c","line":963,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20250317T132414.621880Z-H5c947e1c-P0031d20c","thread":"main","time":"2025-03-17T13:24:14.624017Z","file":"pack-bitmap-write.c","line":990,"repo":1,"t_rel":0.000006,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
 ok 349 - multi-pack-index write writes lookup table if enabled
 
 expecting success of 5326.350 'preferred pack change with existing MIDX bitmap': 
@@ -343773,7 +343798,7 @@
 pack_report: pack_used_ctr            =         23
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      75041 /      75041
+pack_report: pack_mapped              =      74956 /      74956
 ---------------------------------------------------------------------
 
 56c6da2da8b7069730f28602736aab04b11dccd3
@@ -343798,7 +343823,7 @@
 pack_report: pack_used_ctr            =         16
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      86114 /      86114
+pack_report: pack_mapped              =      96825 /      96825
 ---------------------------------------------------------------------
 
 Nothing new to pack.
@@ -343806,23 +343831,23 @@
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
 5+0 records in
 5+0 records out
-5 bytes copied, 3.676e-05 s, 136 kB/s
+5 bytes copied, 0.0035837 s, 1.4 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/pack-d37e43f1be095c3e09f5dfd51135342e055975f8.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-fe10b6bd149c7d54da95dcc6b975efafeaf4f36a.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 4.06e-05 s, 123 kB/s
+5 bytes copied, 4.352e-05 s, 115 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-c58e4dd97e7b3da6eaf39a78181902448dfb3382.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-3e39aefe41f407038f2bd2d4f512b19ad2c8d59f.bitmap' has invalid checksum
 5+0 records in
 5+0 records out
-5 bytes copied, 0.00029592 s, 16.9 kB/s
+5 bytes copied, 4.22e-05 s, 118 kB/s
 dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
 dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-c58e4dd97e7b3da6eaf39a78181902448dfb3382.bitmap' has invalid checksum
-error: bitmap file '.git/objects/pack/pack-d37e43f1be095c3e09f5dfd51135342e055975f8.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/multi-pack-index-3e39aefe41f407038f2bd2d4f512b19ad2c8d59f.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-fe10b6bd149c7d54da95dcc6b975efafeaf4f36a.bitmap' has invalid checksum
 ok 353 - git fsck correctly identifies good and bad bitmaps
 
 expecting success of 5326.354 'corrupt MIDX with bitmap causes fallback': 
@@ -343962,78 +343987,6 @@
 1..357
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5535-fetch-push-symref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5535-fetch-push-symref/.git/
-expecting success of 5535.1 'setup': 
-	test_commit one &&
-	git clone . src &&
-	git clone src dst1 &&
-	git clone src dst2 &&
-	test_commit two &&
-	( cd src && git pull )
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'src'...
-done.
-Cloning into 'dst1'...
-done.
-Cloning into 'dst2'...
-done.
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5535-fetch-push-symref/.
-   d79ce16..139b20d  master     -> origin/master
- * [new tag]         two        -> two
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - setup
-
-expecting success of 5535.2 'push': 
-	(
-		cd src &&
-		git push ../dst1 "refs/remotes/*:refs/remotes/*"
-	) &&
-	git ls-remote src "refs/remotes/*" >expect &&
-	git ls-remote dst1 "refs/remotes/*" >actual &&
-	test_cmp expect actual &&
-	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
-	( cd dst1 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
-	test_cmp expect actual
-
-To ../dst1
-   d79ce16..139b20d  origin/HEAD -> origin/HEAD
-   d79ce16..139b20d  origin/master -> origin/master
-ok 2 - push
-
-expecting success of 5535.3 'fetch': 
-	(
-		cd dst2 &&
-		git fetch ../src "refs/remotes/*:refs/remotes/*"
-	) &&
-	git ls-remote src "refs/remotes/*" >expect &&
-	git ls-remote dst2 "refs/remotes/*" >actual &&
-	test_cmp expect actual &&
-	( cd src && git symbolic-ref refs/remotes/origin/HEAD ) >expect &&
-	( cd dst2 && git symbolic-ref refs/remotes/origin/HEAD ) >actual &&
-	test_cmp expect actual
-
-From ../src
-   d79ce16..139b20d  origin/master -> origin/master
- * [new tag]         two           -> two
-ok 3 - fetch
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5536-fetch-conflicts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5536-fetch-conflicts/.git/
 expecting success of 5536.1 'setup': 
@@ -347517,6 +347470,21 @@
 1..178
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5539-fetch-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5539-fetch-http-shallow/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5528-push-default.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5528-push-default/.git/
 expecting success of 5528.1 'setup bare remotes': 
@@ -348126,21 +348094,6 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5539-fetch-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5539-fetch-http-shallow/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5520-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5520-pull/.git/
 expecting success of 5520.1 'setup': 
@@ -349831,6 +349784,152 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5546-receive-limits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/.git/
+expecting success of 5546.1 'create known-size (1024 bytes) commit': 
+	test-tool genrandom foo 1024 >one-k &&
+	git add one-k &&
+	test_commit one-k
+
+[master (root-commit) cba7046] one-k
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 one-k
+ create mode 100644 one-k.t
+ok 1 - create known-size (1024 bytes) commit
+
+expecting success of 5546.2 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 2 - prepare destination repository
+
+expecting success of 5546.3 'set unpacklimit to 1': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 3 - set unpacklimit to 1
+
+expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size (512 bytes)        
+error: remote unpack failed: index-pack abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 4 - setting receive.maxInputSize to 512 rejects push
+
+expecting success of 5546.5 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 5 - bumping limit to 4k allows push
+
+expecting success of 5546.6 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 6 - prepare destination repository (again)
+
+expecting success of 5546.7 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 7 - lifting the limit allows push
+
+expecting success of 5546.8 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 8 - prepare destination repository (once more)
+
+expecting success of 5546.9 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+count: 0
+ok 9 - receive trumps transfer
+
+expecting success of 5546.10 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 10 - prepare destination repository
+
+expecting success of 5546.11 'set unpacklimit to 10000': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 11 - set unpacklimit to 10000
+
+expecting success of 5546.12 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size        
+error: remote unpack failed: unpack-objects abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 12 - setting receive.maxInputSize to 512 rejects push
+
+expecting success of 5546.13 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 13 - bumping limit to 4k allows push
+
+expecting success of 5546.14 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 14 - prepare destination repository (again)
+
+expecting success of 5546.15 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 15 - lifting the limit allows push
+
+expecting success of 5546.16 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
+ok 16 - prepare destination repository (once more)
+
+expecting success of 5546.17 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+packs: 0
+ok 17 - receive trumps transfer
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5537-fetch-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5537-fetch-shallow/.git/
 expecting success of 5537.1 'setup': 
@@ -350252,167 +350351,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5546-receive-limits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/.git/
-expecting success of 5546.1 'create known-size (1024 bytes) commit': 
-	test-tool genrandom foo 1024 >one-k &&
-	git add one-k &&
-	test_commit one-k
-
-[master (root-commit) cba7046] one-k
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 one-k
- create mode 100644 one-k.t
-ok 1 - create known-size (1024 bytes) commit
-
-expecting success of 5546.2 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 2 - prepare destination repository
-
-expecting success of 5546.3 'set unpacklimit to 1': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 3 - set unpacklimit to 1
-
-expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size (512 bytes)        
-error: remote unpack failed: index-pack abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 4 - setting receive.maxInputSize to 512 rejects push
-
-expecting success of 5546.5 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 5 - bumping limit to 4k allows push
-
-expecting success of 5546.6 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 6 - prepare destination repository (again)
-
-expecting success of 5546.7 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 7 - lifting the limit allows push
-
-expecting success of 5546.8 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 8 - prepare destination repository (once more)
-
-expecting success of 5546.9 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-count: 0
-ok 9 - receive trumps transfer
-
-expecting success of 5546.10 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 10 - prepare destination repository
-
-expecting success of 5546.11 'set unpacklimit to 10000': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 11 - set unpacklimit to 10000
-
-expecting success of 5546.12 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size        
-error: remote unpack failed: unpack-objects abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 12 - setting receive.maxInputSize to 512 rejects push
-
-expecting success of 5546.13 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 13 - bumping limit to 4k allows push
-
-expecting success of 5546.14 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 14 - prepare destination repository (again)
-
-expecting success of 5546.15 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 15 - lifting the limit allows push
-
-expecting success of 5546.16 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5546-receive-limits/dest/
-ok 16 - prepare destination repository (once more)
-
-expecting success of 5546.17 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-packs: 0
-ok 17 - receive trumps transfer
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5549-fetch-push-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5549-fetch-push-http/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5547-push-quarantine.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5547-push-quarantine/.git/
 expecting success of 5547.1 'create picky dest repo': 
@@ -350529,6 +350467,21 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5549-fetch-push-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5549-fetch-push-http/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5515-fetch-merge-logic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5515-fetch-merge-logic/.git/
 expecting success of 5515.1 'setup': 
@@ -354191,465 +354144,6 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5554-noop-fetch-negotiator.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/.git/
-expecting success of 5554.1 'noop negotiator does not emit any "have"': 
-	rm -f trace &&
-
-	test_create_repo server &&
-	test_commit -C server to_fetch &&
-
-	test_create_repo client &&
-	test_commit -C client we_have &&
-
-	test_config -C client fetch.negotiationalgorithm noop &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
-
-	! grep "fetch> have" trace &&
-	grep "fetch> done" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/server/.git/
-[master (root-commit) 92dc17d] to_fetch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_fetch.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/client/.git/
-[master (root-commit) c20e644] we_have
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 we_have.t
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> done
-ok 1 - noop negotiator does not emit any "have"
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5548-push-porcelain.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/.git/
-expecting success of 5548.1 'setup upstream repository and workbench': 
-		setup_upstream "$upstream" &&
-		rm -rf workbench &&
-		git clone "$upstream" workbench &&
-		(
-			cd workbench &&
-			git update-ref refs/heads/main $A &&
-			git update-ref refs/heads/baz $A &&
-			git update-ref refs/heads/next $A &&
-			# Try to make a stable fixed width for abbreviated commit ID,
-			# this fixed-width oid will be replaced with "<OID>".
-			git config core.abbrev 7 &&
-			git config advice.pushUpdateRejected false
-		) &&
-		# The upstream repository provides services using the HTTP protocol.
-		if ! test "$upstream" = "upstream.git"
-		then
-			git -C workbench remote set-url origin "$HTTPD_URL/smart/upstream.git"
-		fi
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream-template.git/
-Cloning into 'tmp_work_dir'...
-warning: You appear to have cloned an empty repository.
-done.
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream-template.git
- * [new branch]      d9df4505cb3522088b9e29d6051ac16f1564154a -> main
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> foo
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> bar
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> baz
-Cloning into bare repository 'upstream.git'...
-done.
-Cloning into 'workbench'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-ok 1 - setup upstream repository and workbench
-
-expecting success of 5548.2 '.. git-push --porcelain (builtin protocol)': 
-		test_when_finished "setup_upstream \"$upstream\"" &&
-		test_must_fail git -C workbench push --porcelain origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-\EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-B> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-Cloning into bare repository 'upstream.git'...
-done.
-ok 2 - .. git-push --porcelain (builtin protocol)
-
-expecting success of 5548.3 '.. git-push --porcelain --force (builtin protocol)': 
-		test_when_finished "setup_upstream \"$upstream\"" &&
-		git -C workbench push --porcelain --force origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-Cloning into bare repository 'upstream.git'...
-done.
-ok 3 - .. git-push --porcelain --force (builtin protocol)
-
-expecting success of 5548.4 '.. git push --porcelain --atomic (builtin protocol)': 
-		test_when_finished "setup_upstream \"$upstream\"" &&
-		test_must_fail git -C workbench push --porcelain --atomic origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		> !	<COMMIT-B>:refs/heads/bar	[rejected] (atomic push failed)
-		> !	(delete):refs/heads/foo	[rejected] (atomic push failed)
-		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-		> !	refs/heads/next:refs/heads/next	[rejected] (atomic push failed)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-error: atomic push failed for ref refs/heads/main. status: 2
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-Cloning into bare repository 'upstream.git'...
-done.
-ok 4 - .. git push --porcelain --atomic (builtin protocol)
-
-expecting success of 5548.5 '.. pre-receive hook declined (builtin protocol)': 
-		test_when_finished "rm -f \"$upstream/hooks/pre-receive\" &&
-			setup_upstream \"$upstream\"" &&
-		test_hook --setup -C "$upstream" pre-receive <<-EOF &&
-			exit 1
-		EOF
-		test_must_fail git -C workbench push --porcelain --force origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		> !	<COMMIT-B>:refs/heads/bar	[remote rejected] (pre-receive hook declined)
-		> !	:refs/heads/foo	[remote rejected] (pre-receive hook declined)
-		> !	refs/heads/main:refs/heads/main	[remote rejected] (pre-receive hook declined)
-		> !	refs/heads/next:refs/heads/next	[remote rejected] (pre-receive hook declined)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-Cloning into bare repository 'upstream.git'...
-done.
-ok 5 - .. pre-receive hook declined (builtin protocol)
-
-expecting success of 5548.6 '.. non-fastforward push (builtin protocol)': 
-		test_when_finished "setup_upstream \"$upstream\"" &&
-		(
-			cd workbench &&
-			test_must_fail git push --porcelain origin \
-				main \
-				next
-		) >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-Cloning into bare repository 'upstream.git'...
-done.
-ok 6 - .. non-fastforward push (builtin protocol)
-
-expecting success of 5548.7 '.. git push --porcelain --atomic --force (builtin protocol)': 
-		git -C workbench push --porcelain --atomic --force origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-\EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-ok 7 - .. git push --porcelain --atomic --force (builtin protocol)
-
-expecting success of 5548.8 'setup upstream repository and workbench': 
-		setup_upstream "$upstream" &&
-		rm -rf workbench &&
-		git clone "$upstream" workbench &&
-		(
-			cd workbench &&
-			git update-ref refs/heads/main $A &&
-			git update-ref refs/heads/baz $A &&
-			git update-ref refs/heads/next $A &&
-			# Try to make a stable fixed width for abbreviated commit ID,
-			# this fixed-width oid will be replaced with "<OID>".
-			git config core.abbrev 7 &&
-			git config advice.pushUpdateRejected false
-		) &&
-		# The upstream repository provides services using the HTTP protocol.
-		if ! test "$upstream" = "upstream.git"
-		then
-			git -C workbench remote set-url origin "$HTTPD_URL/smart/upstream.git"
-		fi
-	
-Cloning into bare repository 'upstream.git'...
-done.
-Cloning into 'workbench'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-ok 8 - setup upstream repository and workbench
-
-expecting success of 5548.9 '.. git-push --porcelain --dry-run (builtin protocol)': 
-		test_must_fail git -C workbench push --porcelain --dry-run origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-ok 9 - .. git-push --porcelain --dry-run (builtin protocol)
-
-expecting success of 5548.10 '.. git-push --porcelain --dry-run --force (builtin protocol)': 
-		git -C workbench push --porcelain --dry-run --force origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-ok 10 - .. git-push --porcelain --dry-run --force (builtin protocol)
-
-expecting success of 5548.11 '.. git-push --porcelain --dry-run --atomic (builtin protocol)': 
-		test_must_fail git -C workbench push --porcelain --dry-run --atomic origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		> !	<COMMIT-B>:refs/heads/bar	[rejected] (atomic push failed)
-		> !	(delete):refs/heads/foo	[rejected] (atomic push failed)
-		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
-		> !	refs/heads/next:refs/heads/next	[rejected] (atomic push failed)
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-error: atomic push failed for ref refs/heads/main. status: 2
-error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
-ok 11 - .. git-push --porcelain --dry-run --atomic (builtin protocol)
-
-expecting success of 5548.12 '.. git-push --porcelain --dry-run --atomic --force (builtin protocol)': 
-		git -C workbench push --porcelain --dry-run --atomic --force origin \
-			main \
-			:refs/heads/foo \
-			$B:bar \
-			baz \
-			next >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> Done
-		EOF
-		test_cmp expect actual &&
-
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-A> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/foo
-		<COMMIT-B> refs/heads/main
-		EOF
-		test_cmp expect actual
-	
-ok 12 - .. git-push --porcelain --dry-run --atomic --force (builtin protocol)
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 12 test(s)
-# SKIP no web server found at ''
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5531-deep-submodule-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5531-deep-submodule-push/.git/
 expecting success of 5531.1 'setup': 
@@ -355320,9 +354814,9 @@
 to push them to a remote.
 
 fatal: Aborting.
-fatal: the remote end hung up unexpectedly
 ok 16 - push fails when commit on multiple branches if one branch has no remote
 
+fatal: the remote end hung up unexpectedly
 expecting success of 5531.17 'push succeeds if submodule has no remote and is on the first superproject commit': 
 	git init --bare a &&
 	git clone a a1 &&
@@ -355902,6 +355396,480 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5554-noop-fetch-negotiator.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/.git/
+expecting success of 5554.1 'noop negotiator does not emit any "have"': 
+	rm -f trace &&
+
+	test_create_repo server &&
+	test_commit -C server to_fetch &&
+
+	test_create_repo client &&
+	test_commit -C client we_have &&
+
+	test_config -C client fetch.negotiationalgorithm noop &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
+
+	! grep "fetch> have" trace &&
+	grep "fetch> done" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/server/.git/
+[master (root-commit) 92dc17d] to_fetch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_fetch.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/client/.git/
+[master (root-commit) c20e644] we_have
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 we_have.t
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5554-noop-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> done
+ok 1 - noop negotiator does not emit any "have"
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5548-push-porcelain.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/.git/
+expecting success of 5548.1 'setup upstream repository and workbench': 
+		setup_upstream "$upstream" &&
+		rm -rf workbench &&
+		git clone "$upstream" workbench &&
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $A &&
+			git update-ref refs/heads/baz $A &&
+			git update-ref refs/heads/next $A &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git config advice.pushUpdateRejected false
+		) &&
+		# The upstream repository provides services using the HTTP protocol.
+		if ! test "$upstream" = "upstream.git"
+		then
+			git -C workbench remote set-url origin "$HTTPD_URL/smart/upstream.git"
+		fi
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream-template.git/
+Cloning into 'tmp_work_dir'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream-template.git
+ * [new branch]      d9df4505cb3522088b9e29d6051ac16f1564154a -> main
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> foo
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> bar
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> baz
+Cloning into bare repository 'upstream.git'...
+done.
+Cloning into 'workbench'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+ok 1 - setup upstream repository and workbench
+
+expecting success of 5548.2 '.. git-push --porcelain (builtin protocol)': 
+		test_when_finished "setup_upstream \"$upstream\"" &&
+		test_must_fail git -C workbench push --porcelain origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-\EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-B> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+Cloning into bare repository 'upstream.git'...
+done.
+ok 2 - .. git-push --porcelain (builtin protocol)
+
+expecting success of 5548.3 '.. git-push --porcelain --force (builtin protocol)': 
+		test_when_finished "setup_upstream \"$upstream\"" &&
+		git -C workbench push --porcelain --force origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+Cloning into bare repository 'upstream.git'...
+done.
+ok 3 - .. git-push --porcelain --force (builtin protocol)
+
+expecting success of 5548.4 '.. git push --porcelain --atomic (builtin protocol)': 
+		test_when_finished "setup_upstream \"$upstream\"" &&
+		test_must_fail git -C workbench push --porcelain --atomic origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		> !	<COMMIT-B>:refs/heads/bar	[rejected] (atomic push failed)
+		> !	(delete):refs/heads/foo	[rejected] (atomic push failed)
+		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+		> !	refs/heads/next:refs/heads/next	[rejected] (atomic push failed)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+error: atomic push failed for ref refs/heads/main. status: 2
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+Cloning into bare repository 'upstream.git'...
+done.
+ok 4 - .. git push --porcelain --atomic (builtin protocol)
+
+expecting success of 5548.5 '.. pre-receive hook declined (builtin protocol)': 
+		test_when_finished "rm -f \"$upstream/hooks/pre-receive\" &&
+			setup_upstream \"$upstream\"" &&
+		test_hook --setup -C "$upstream" pre-receive <<-EOF &&
+			exit 1
+		EOF
+		test_must_fail git -C workbench push --porcelain --force origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		> !	<COMMIT-B>:refs/heads/bar	[remote rejected] (pre-receive hook declined)
+		> !	:refs/heads/foo	[remote rejected] (pre-receive hook declined)
+		> !	refs/heads/main:refs/heads/main	[remote rejected] (pre-receive hook declined)
+		> !	refs/heads/next:refs/heads/next	[remote rejected] (pre-receive hook declined)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+Cloning into bare repository 'upstream.git'...
+done.
+ok 5 - .. pre-receive hook declined (builtin protocol)
+
+expecting success of 5548.6 '.. non-fastforward push (builtin protocol)': 
+		test_when_finished "setup_upstream \"$upstream\"" &&
+		(
+			cd workbench &&
+			test_must_fail git push --porcelain origin \
+				main \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+Cloning into bare repository 'upstream.git'...
+done.
+ok 6 - .. non-fastforward push (builtin protocol)
+
+expecting success of 5548.7 '.. git push --porcelain --atomic --force (builtin protocol)': 
+		git -C workbench push --porcelain --atomic --force origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-\EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+ok 7 - .. git push --porcelain --atomic --force (builtin protocol)
+
+expecting success of 5548.8 'setup upstream repository and workbench': 
+		setup_upstream "$upstream" &&
+		rm -rf workbench &&
+		git clone "$upstream" workbench &&
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $A &&
+			git update-ref refs/heads/baz $A &&
+			git update-ref refs/heads/next $A &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git config advice.pushUpdateRejected false
+		) &&
+		# The upstream repository provides services using the HTTP protocol.
+		if ! test "$upstream" = "upstream.git"
+		then
+			git -C workbench remote set-url origin "$HTTPD_URL/smart/upstream.git"
+		fi
+	
+Cloning into bare repository 'upstream.git'...
+done.
+Cloning into 'workbench'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+ok 8 - setup upstream repository and workbench
+
+expecting success of 5548.9 '.. git-push --porcelain --dry-run (builtin protocol)': 
+		test_must_fail git -C workbench push --porcelain --dry-run origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+ok 9 - .. git-push --porcelain --dry-run (builtin protocol)
+
+expecting success of 5548.10 '.. git-push --porcelain --dry-run --force (builtin protocol)': 
+		git -C workbench push --porcelain --dry-run --force origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+ok 10 - .. git-push --porcelain --dry-run --force (builtin protocol)
+
+expecting success of 5548.11 '.. git-push --porcelain --dry-run --atomic (builtin protocol)': 
+		test_must_fail git -C workbench push --porcelain --dry-run --atomic origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		> !	<COMMIT-B>:refs/heads/bar	[rejected] (atomic push failed)
+		> !	(delete):refs/heads/foo	[rejected] (atomic push failed)
+		> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+		> !	refs/heads/next:refs/heads/next	[rejected] (atomic push failed)
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+error: atomic push failed for ref refs/heads/main. status: 2
+error: failed to push some refs to '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5548-push-porcelain/upstream.git'
+ok 11 - .. git-push --porcelain --dry-run --atomic (builtin protocol)
+
+expecting success of 5548.12 '.. git-push --porcelain --dry-run --atomic --force (builtin protocol)': 
+		git -C workbench push --porcelain --dry-run --atomic --force origin \
+			main \
+			:refs/heads/foo \
+			$B:bar \
+			baz \
+			next >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-A> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/foo
+		<COMMIT-B> refs/heads/main
+		EOF
+		test_cmp expect actual
+	
+ok 12 - .. git-push --porcelain --dry-run --atomic --force (builtin protocol)
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 12 test(s)
+# SKIP no web server found at ''
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5557-http-get.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5557-http-get/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5543-atomic-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5543-atomic-push/.git/
 expecting success of 5543.1 'atomic push works for a single branch': 
@@ -356431,21 +356399,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5557-http-get.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5557-http-get/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5555-http-smart-common.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5555-http-smart-common/.git/
 expecting success of 5555.1 'setup': 
@@ -358832,230 +358785,60 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5560-http-backend-noserver.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/.git/
-expecting success of 5560.1 'setup repository': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-
-	mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git --bare init &&
-	 : >objects/info/alternates &&
-	 : >objects/info/http-alternates
-	) &&
-	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public main:main &&
-
-	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git repack -a -d
-	) &&
+*** t5558-clone-bundle-uri.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/.git/
+expecting success of 5558.1 'fail to clone from non-existent file': 
+	test_when_finished rm -rf test &&
+	git clone --bundle-uri="$(pwd)/does-not-exist" . test 2>err &&
+	grep "failed to download bundle from URI" err
 
-	echo other >file &&
-	git add file &&
-	git commit -m two &&
-	git push public main:main &&
+warning: failed to download bundle from URI '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/does-not-exist'
+ok 1 - fail to clone from non-existent file
 
-	LOOSE_URL=$(find_file objects/??) &&
-	PACK_URL=$(find_file objects/pack/*.pack) &&
-	IDX_URL=$(find_file objects/pack/*.idx)
+expecting success of 5558.2 'fail to clone from non-bundle file': 
+	test_when_finished rm -rf test &&
+	echo bogus >bogus &&
+	git clone --bundle-uri="$(pwd)/bogus" . test 2>err &&
+	grep "is not a bundle" err
 
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git/
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git
- * [new branch]      main -> main
-[main 0149442] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git
-   f39a923..0149442  main -> main
-ok 1 - setup repository
+warning: file at URI '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/bogus' is not a bundle or bundle list
+ok 2 - fail to clone from non-bundle file
 
-expecting success of 5560.2 'direct refs/heads/main not found': 
-	GET refs/heads/main "404 Not Found"
+expecting success of 5558.3 'create bundle': 
+	git init clone-from &&
+	(
+		cd clone-from &&
+		git checkout -b topic &&
 
-ok 2 - direct refs/heads/main not found
+		test_commit A &&
+		git bundle create A.bundle topic &&
 
-expecting success of 5560.3 'static file is ok': 
-	get_static_files "200 OK"
+		test_commit B &&
+		git bundle create B.bundle topic &&
 
-ok 3 - static file is ok
+		# Create a bundle with reference pointing to non-existent object.
+		commit_a=$(git rev-parse A) &&
+		commit_b=$(git rev-parse B) &&
+		sed -e "/^$/q" -e "s/$commit_a /$commit_b /" \
+			<A.bundle >bad-header.bundle &&
+		convert_bundle_to_pack \
+			<A.bundle >>bad-header.bundle &&
 
-expecting success of 5560.4 'no export by default': 
-	get_static_files "404 Not Found"
+		tree_b=$(git rev-parse B^{tree}) &&
+		cat >data <<-EOF &&
+		tree $tree_b
+		parent $commit_b
+		author A U Thor
+		committer A U Thor
 
-ok 4 - no export by default
+		commit: this is a commit with bad emails
 
-expecting success of 5560.5 'export if git-daemon-export-ok': 
-        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 touch git-daemon-export-ok
-	) &&
-        get_static_files "200 OK"
-
-ok 5 - export if git-daemon-export-ok
-
-expecting success of 5560.6 'static file if http.getanyfile true is ok': 
-	config http.getanyfile true &&
-	get_static_files "200 OK"
-
-ok 6 - static file if http.getanyfile true is ok
-
-expecting success of 5560.7 'static file if http.getanyfile false fails': 
-	config http.getanyfile false &&
-	get_static_files "403 Forbidden"
-
-ok 7 - static file if http.getanyfile false fails
-
-expecting success of 5560.8 'http.uploadpack default enabled': 
-	GET info/refs?service=git-upload-pack "200 OK"  &&
-	POST git-upload-pack 0000 "200 OK"
-
-ok 8 - http.uploadpack default enabled
-
-expecting success of 5560.9 'http.uploadpack true': 
-	config http.uploadpack true &&
-	GET info/refs?service=git-upload-pack "200 OK" &&
-	POST git-upload-pack 0000 "200 OK"
-
-ok 9 - http.uploadpack true
-
-expecting success of 5560.10 'http.uploadpack false': 
-	config http.uploadpack false &&
-	GET info/refs?service=git-upload-pack "403 Forbidden" &&
-	POST git-upload-pack 0000 "403 Forbidden"
-
-ok 10 - http.uploadpack false
-
-expecting success of 5560.11 'http.receivepack default disabled': 
-	GET info/refs?service=git-receive-pack "403 Forbidden"  &&
-	POST git-receive-pack 0000 "403 Forbidden"
-
-ok 11 - http.receivepack default disabled
-
-expecting success of 5560.12 'http.receivepack true': 
-	config http.receivepack true &&
-	GET info/refs?service=git-receive-pack "200 OK" &&
-	POST git-receive-pack 0000 "200 OK"
-
-ok 12 - http.receivepack true
-
-expecting success of 5560.13 'http.receivepack false': 
-	config http.receivepack false &&
-	GET info/refs?service=git-receive-pack "403 Forbidden" &&
-	POST git-receive-pack 0000 "403 Forbidden"
-
-ok 13 - http.receivepack false
-
-expecting success of 5560.14 'http-backend blocks bad PATH_INFO': 
-	config http.getanyfile true &&
-
-	expect_aliased 0 /repo.git/HEAD &&
-
-	expect_aliased 1 /repo.git/../HEAD &&
-	expect_aliased 1 /../etc/passwd &&
-	expect_aliased 1 ../etc/passwd &&
-	expect_aliased 1 /etc//passwd &&
-	expect_aliased 1 /etc/./passwd &&
-	expect_aliased 1 //domain/data.txt
-
---- exp.err	2026-04-19 19:21:40.231659440 +0000
-+++ act.err	2026-04-19 19:21:40.215659440 +0000
-@@ -1 +0,0 @@
--fatal: '/repo.git/../HEAD': aliased
---- exp.err	2026-04-19 19:21:40.275659440 +0000
-+++ act.err	2026-04-19 19:21:40.275659440 +0000
-@@ -1 +1 @@
--fatal: '/../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
-\ No newline at end of file
---- exp.err	2026-04-19 19:21:40.315659440 +0000
-+++ act.err	2026-04-19 19:21:40.315659440 +0000
-@@ -1 +1 @@
--fatal: '../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
-\ No newline at end of file
---- exp.err	2026-04-19 19:21:40.359659440 +0000
-+++ act.err	2026-04-19 19:21:40.359659440 +0000
-@@ -1 +1 @@
--fatal: '/etc//passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//etc//passwd'
-\ No newline at end of file
---- exp.err	2026-04-19 19:21:40.411659440 +0000
-+++ act.err	2026-04-19 19:21:40.407659440 +0000
-@@ -1 +1 @@
--fatal: '/etc/./passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
-\ No newline at end of file
---- exp.err	2026-04-19 19:21:40.459659440 +0000
-+++ act.err	2026-04-19 19:21:40.455659440 +0000
-@@ -1 +1 @@
--fatal: '//domain/data.txt': aliased
-+Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
-\ No newline at end of file
-ok 14 - http-backend blocks bad PATH_INFO
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5558-clone-bundle-uri.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/.git/
-expecting success of 5558.1 'fail to clone from non-existent file': 
-	test_when_finished rm -rf test &&
-	git clone --bundle-uri="$(pwd)/does-not-exist" . test 2>err &&
-	grep "failed to download bundle from URI" err
-
-warning: failed to download bundle from URI '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/does-not-exist'
-ok 1 - fail to clone from non-existent file
-
-expecting success of 5558.2 'fail to clone from non-bundle file': 
-	test_when_finished rm -rf test &&
-	echo bogus >bogus &&
-	git clone --bundle-uri="$(pwd)/bogus" . test 2>err &&
-	grep "is not a bundle" err
-
-warning: file at URI '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/bogus' is not a bundle or bundle list
-ok 2 - fail to clone from non-bundle file
-
-expecting success of 5558.3 'create bundle': 
-	git init clone-from &&
-	(
-		cd clone-from &&
-		git checkout -b topic &&
-
-		test_commit A &&
-		git bundle create A.bundle topic &&
-
-		test_commit B &&
-		git bundle create B.bundle topic &&
-
-		# Create a bundle with reference pointing to non-existent object.
-		commit_a=$(git rev-parse A) &&
-		commit_b=$(git rev-parse B) &&
-		sed -e "/^$/q" -e "s/$commit_a /$commit_b /" \
-			<A.bundle >bad-header.bundle &&
-		convert_bundle_to_pack \
-			<A.bundle >>bad-header.bundle &&
-
-		tree_b=$(git rev-parse B^{tree}) &&
-		cat >data <<-EOF &&
-		tree $tree_b
-		parent $commit_b
-		author A U Thor
-		committer A U Thor
-
-		commit: this is a commit with bad emails
-
-		EOF
-		bad_commit=$(git hash-object --literally -t commit -w --stdin <data) &&
-		git branch bad $bad_commit &&
-		git bundle create bad-object.bundle bad &&
-		git update-ref -d refs/heads/bad
-	)
+		EOF
+		bad_commit=$(git hash-object --literally -t commit -w --stdin <data) &&
+		git branch bad $bad_commit &&
+		git bundle create bad-object.bundle bad &&
+		git update-ref -d refs/heads/bad
+	)
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5558-clone-bundle-uri/clone-from/.git/
 Switched to a new branch 'topic'
@@ -359559,6 +359342,176 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5560-http-backend-noserver.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/.git/
+expecting success of 5560.1 'setup repository': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+
+	mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git --bare init &&
+	 : >objects/info/alternates &&
+	 : >objects/info/http-alternates
+	) &&
+	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	git push public main:main &&
+
+	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git repack -a -d
+	) &&
+
+	echo other >file &&
+	git add file &&
+	git commit -m two &&
+	git push public main:main &&
+
+	LOOSE_URL=$(find_file objects/??) &&
+	PACK_URL=$(find_file objects/pack/*.pack) &&
+	IDX_URL=$(find_file objects/pack/*.idx)
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git/
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git
+ * [new branch]      main -> main
+[main 0149442] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/repo.git
+   f39a923..0149442  main -> main
+ok 1 - setup repository
+
+expecting success of 5560.2 'direct refs/heads/main not found': 
+	GET refs/heads/main "404 Not Found"
+
+ok 2 - direct refs/heads/main not found
+
+expecting success of 5560.3 'static file is ok': 
+	get_static_files "200 OK"
+
+ok 3 - static file is ok
+
+expecting success of 5560.4 'no export by default': 
+	get_static_files "404 Not Found"
+
+ok 4 - no export by default
+
+expecting success of 5560.5 'export if git-daemon-export-ok': 
+        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 touch git-daemon-export-ok
+	) &&
+        get_static_files "200 OK"
+
+ok 5 - export if git-daemon-export-ok
+
+expecting success of 5560.6 'static file if http.getanyfile true is ok': 
+	config http.getanyfile true &&
+	get_static_files "200 OK"
+
+ok 6 - static file if http.getanyfile true is ok
+
+expecting success of 5560.7 'static file if http.getanyfile false fails': 
+	config http.getanyfile false &&
+	get_static_files "403 Forbidden"
+
+ok 7 - static file if http.getanyfile false fails
+
+expecting success of 5560.8 'http.uploadpack default enabled': 
+	GET info/refs?service=git-upload-pack "200 OK"  &&
+	POST git-upload-pack 0000 "200 OK"
+
+ok 8 - http.uploadpack default enabled
+
+expecting success of 5560.9 'http.uploadpack true': 
+	config http.uploadpack true &&
+	GET info/refs?service=git-upload-pack "200 OK" &&
+	POST git-upload-pack 0000 "200 OK"
+
+ok 9 - http.uploadpack true
+
+expecting success of 5560.10 'http.uploadpack false': 
+	config http.uploadpack false &&
+	GET info/refs?service=git-upload-pack "403 Forbidden" &&
+	POST git-upload-pack 0000 "403 Forbidden"
+
+ok 10 - http.uploadpack false
+
+expecting success of 5560.11 'http.receivepack default disabled': 
+	GET info/refs?service=git-receive-pack "403 Forbidden"  &&
+	POST git-receive-pack 0000 "403 Forbidden"
+
+ok 11 - http.receivepack default disabled
+
+expecting success of 5560.12 'http.receivepack true': 
+	config http.receivepack true &&
+	GET info/refs?service=git-receive-pack "200 OK" &&
+	POST git-receive-pack 0000 "200 OK"
+
+ok 12 - http.receivepack true
+
+expecting success of 5560.13 'http.receivepack false': 
+	config http.receivepack false &&
+	GET info/refs?service=git-receive-pack "403 Forbidden" &&
+	POST git-receive-pack 0000 "403 Forbidden"
+
+ok 13 - http.receivepack false
+
+expecting success of 5560.14 'http-backend blocks bad PATH_INFO': 
+	config http.getanyfile true &&
+
+	expect_aliased 0 /repo.git/HEAD &&
+
+	expect_aliased 1 /repo.git/../HEAD &&
+	expect_aliased 1 /../etc/passwd &&
+	expect_aliased 1 ../etc/passwd &&
+	expect_aliased 1 /etc//passwd &&
+	expect_aliased 1 /etc/./passwd &&
+	expect_aliased 1 //domain/data.txt
+
+--- exp.err	2025-03-17 13:24:43.529989289 +0000
++++ act.err	2025-03-17 13:24:43.509989162 +0000
+@@ -1 +0,0 @@
+-fatal: '/repo.git/../HEAD': aliased
+--- exp.err	2025-03-17 13:24:43.593989693 +0000
++++ act.err	2025-03-17 13:24:43.589989668 +0000
+@@ -1 +1 @@
+-fatal: '/../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
+\ No newline at end of file
+--- exp.err	2025-03-17 13:24:43.637989971 +0000
++++ act.err	2025-03-17 13:24:43.637989971 +0000
+@@ -1 +1 @@
+-fatal: '../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
+\ No newline at end of file
+--- exp.err	2025-03-17 13:24:43.717990477 +0000
++++ act.err	2025-03-17 13:24:43.717990477 +0000
+@@ -1 +1 @@
+-fatal: '/etc//passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//etc//passwd'
+\ No newline at end of file
+--- exp.err	2025-03-17 13:24:43.785990906 +0000
++++ act.err	2025-03-17 13:24:43.785990906 +0000
+@@ -1 +1 @@
+-fatal: '/etc/./passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
+\ No newline at end of file
+--- exp.err	2025-03-17 13:24:43.857991362 +0000
++++ act.err	2025-03-17 13:24:43.853991336 +0000
+@@ -1 +1 @@
+-fatal: '//domain/data.txt': aliased
++Request not supported: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
+\ No newline at end of file
+ok 14 - http-backend blocks bad PATH_INFO
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5573-pull-verify-signatures.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5573-pull-verify-signatures/.git/
 checking prerequisite: GPG
@@ -360883,7 +360836,7 @@
 ok 3 - daemon rejects invalid --max-connections values
 
 Starting git daemon ...
-[2063272] Ready to rumble
+[3284567] Ready to rumble
 expecting success of 5570.4 'setup repository': 
 	git config push.default matching &&
 	echo content >file &&
@@ -360915,11 +360868,11 @@
 	check_verbose_connect &&
 	test_cmp file clone/file
 
-[2063669] Connection from 127.0.0.1:51804
-[2063669] Extended attribute "host": 127.0.0.1:5570
-[2063669] Extended attribute "protocol": version=2
-[2063669] Request upload-pack for '/repo.git'
-[2063272] [2063669] Disconnected
+[3284910] Connection from 127.0.0.1:43486
+[3284910] Extended attribute "host": 127.0.0.1:5570
+[3284910] Extended attribute "protocol": version=2
+[3284910] Request upload-pack for '/repo.git'
+[3284567] [3284910] Disconnected
 Looking up 127.0.0.1 ... done.
 Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
 Looking up 127.0.0.1 ... done.
@@ -360939,11 +360892,11 @@
  1 file changed, 1 insertion(+)
 To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git
    f39a923..5647d5f  main -> main
-[2064189] Connection from 127.0.0.1:51814
-[2064189] Extended attribute "host": 127.0.0.1:5570
-[2064189] Extended attribute "protocol": version=2
-[2064189] Request upload-pack for '/repo.git'
-[2063272] [2064189] Disconnected
+[3285282] Connection from 127.0.0.1:43490
+[3285282] Extended attribute "host": 127.0.0.1:5570
+[3285282] Extended attribute "protocol": version=2
+[3285282] Request upload-pack for '/repo.git'
+[3284567] [3285282] Disconnected
 Updating f39a923..5647d5f
 Fast-forward
  file | 1 +
@@ -360958,11 +360911,11 @@
 	(cd clone && git fetch -v) 2>stderr &&
 	check_verbose_connect
 
-[2064438] Connection from 127.0.0.1:51816
-[2064438] Extended attribute "host": 127.0.0.1:5570
-[2064438] Extended attribute "protocol": version=2
-[2064438] Request upload-pack for '/repo.git'
-[2063272] [2064438] Disconnected
+[3285554] Connection from 127.0.0.1:43500
+[3285554] Extended attribute "host": 127.0.0.1:5570
+[3285554] Extended attribute "protocol": version=2
+[3285554] Request upload-pack for '/repo.git'
+[3284567] [3285554] Disconnected
 Looking up 127.0.0.1 ... done.
 Connecting to 127.0.0.1 (port 5570) ... 127.0.0.1 done.
 Looking up 127.0.0.1 ... done.
@@ -360973,11 +360926,11 @@
 	(cd clone && git fetch 2>../stderr) &&
 	test_must_be_empty stderr
 
-[2064614] Connection from 127.0.0.1:51820
-[2064614] Extended attribute "host": 127.0.0.1:5570
-[2064614] Extended attribute "protocol": version=2
-[2064614] Request upload-pack for '/repo.git'
-[2063272] [2064614] Disconnected
+[3285722] Connection from 127.0.0.1:43964
+[3285722] Extended attribute "host": 127.0.0.1:5570
+[3285722] Extended attribute "protocol": version=2
+[3285722] Request upload-pack for '/repo.git'
+[3284567] [3285722] Disconnected
 ok 9 - no-op fetch without "-v" is quiet
 
 expecting success of 5570.10 'remote detects correct HEAD': 
@@ -360992,12 +360945,12 @@
 
 To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git
  * [new branch]      main -> other
-[2064923] Connection from 127.0.0.1:51834
-[2064923] Extended attribute "host": 127.0.0.1:5570
-[2064923] Extended attribute "protocol": version=2
-[2064923] Request upload-pack for '/repo.git'
+[3285993] Connection from 127.0.0.1:43966
+[3285993] Extended attribute "host": 127.0.0.1:5570
+[3285993] Extended attribute "protocol": version=2
+[3285993] Request upload-pack for '/repo.git'
 'origin/HEAD' is now created and points to 'main'
-[2063272] [2064923] Disconnected
+[3284567] [3285993] Disconnected
 ok 10 - remote detects correct HEAD
 
 expecting success of 5570.11 'prepare pack objects': 
@@ -361024,23 +360977,23 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 0.0113696 s, 22.5 kB/s
+256 bytes copied, 0.000524643 s, 488 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[2065204] Connection from 127.0.0.1:51844
-[2065204] Extended attribute "host": 127.0.0.1:5570
-[2065204] Extended attribute "protocol": version=2
-[2065204] Request upload-pack for '/repo_bad1.git'
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] Connection from 127.0.0.1:43970
+[3286262] Extended attribute "host": 127.0.0.1:5570
+[3286262] Extended attribute "protocol": version=2
+[3286262] Request upload-pack for '/repo_bad1.git'
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[3286262] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[3284567] [3286262] Disconnected (with error)
 fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[2065204] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[2063272] [2065204] Disconnected (with error)
 ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
 ok 12 - fetch notices corrupt pack
 
@@ -361061,23 +361014,23 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 3.56e-05 s, 7.2 MB/s
+256 bytes copied, 0.0069408 s, 36.9 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[2065448] Connection from 127.0.0.1:51852
-[2065448] Extended attribute "host": 127.0.0.1:5570
-[2065448] Extended attribute "protocol": version=2
-[2065448] Request upload-pack for '/repo_bad2.git'
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] Connection from 127.0.0.1:43980
+[3286512] Extended attribute "host": 127.0.0.1:5570
+[3286512] Extended attribute "protocol": version=2
+[3286512] Request upload-pack for '/repo_bad2.git'
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
 fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[2065448] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[2063272] [2065448] Disconnected (with error)
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[3286512] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[3284567] [3286512] Disconnected (with error)
 ok 13 - fetch notices corrupt idx
 
 expecting success of 5570.14 'client refuses to ask for repo with newline': 
@@ -361088,91 +361041,89 @@
 ok 14 - client refuses to ask for repo with newline
 
 expecting success of 5570.15 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
-[2065603] Connection from 127.0.0.1:51866
-[2065603] Extended attribute "host": 127.0.0.1:5570
-[2065603] Extended attribute "protocol": version=2
-[2065603] Request upload-pack for '/nowhere.git'
-[2065603] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[2063272] [2065603] Disconnected (with error)
+[3286666] Connection from 127.0.0.1:43986
+[3286666] Extended attribute "host": 127.0.0.1:5570
+[3286666] Extended attribute "protocol": version=2
+[3286666] Request upload-pack for '/nowhere.git'
+[3286666] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[3284567] [3286666] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /nowhere.git
 ok 15 - clone non-existent
 
 expecting success of 5570.16 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
-[2065692] Connection from 127.0.0.1:51880
-[2065692] Extended attribute "host": 127.0.0.1:5570
-[2065692] Request receive-pack for '/repo.git'
-[2065692] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git'
-[2063272] [2065692] Disconnected (with error)
+[3286747] Connection from 127.0.0.1:43996
+[3286747] Extended attribute "host": 127.0.0.1:5570
+[3286747] Request receive-pack for '/repo.git'
+[3286747] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git'
+[3284567] [3286747] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 16 - push disabled
 
 expecting success of 5570.17 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
-[2065776] Connection from 127.0.0.1:51886
-[2065776] Extended attribute "host": 127.0.0.1:5570
-[2065776] Extended attribute "protocol": version=2
-[2065776] Request upload-pack for '/repo.git'
-[2065776] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[2063272] [2065776] Disconnected (with error)
+[3286837] Connection from 127.0.0.1:44006
+[3286837] Extended attribute "host": 127.0.0.1:5570
+[3286837] Extended attribute "protocol": version=2
+[3286837] Request upload-pack for '/repo.git'
+[3286837] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[3284567] [3286837] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 17 - read access denied
 
 expecting success of 5570.18 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
-[2065869] Connection from 127.0.0.1:51900
-[2065869] Extended attribute "host": 127.0.0.1:5570
-[2065869] Extended attribute "protocol": version=2
-[2065869] Request upload-pack for '/repo.git'
-[2065869] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[2063272] [2065869] Disconnected (with error)
+[3286920] Connection from 127.0.0.1:44018
+[3286920] Extended attribute "host": 127.0.0.1:5570
+[3286920] Extended attribute "protocol": version=2
+[3286920] Request upload-pack for '/repo.git'
+[3286920] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[3284567] [3286920] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 18 - not exported
 
 Stopping git daemon ...
-Terminated
 Starting git daemon ...
-[2065984] Ready to rumble
+[3287016] Ready to rumble
 expecting success of 5570.19 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
-[2066024] Connection from 127.0.0.1:51916
-[2066024] Extended attribute "host": 127.0.0.1:5570
-[2066024] Extended attribute "protocol": version=2
-[2066024] Request upload-pack for '/nowhere.git'
-[2066024] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[2065984] [2066024] Disconnected (with error)
+[3287090] Connection from 127.0.0.1:44030
+[3287090] Extended attribute "host": 127.0.0.1:5570
+[3287090] Extended attribute "protocol": version=2
+[3287090] Request upload-pack for '/nowhere.git'
+[3287090] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[3287016] [3287090] Disconnected (with error)
 fatal: remote error: no such repository: /nowhere.git
 ok 19 - clone non-existent
 
 expecting success of 5570.20 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
-[2066108] Connection from 127.0.0.1:51922
-[2066108] Extended attribute "host": 127.0.0.1:5570
-[2066108] Request receive-pack for '/repo.git'
-[2066108] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git'
-[2065984] [2066108] Disconnected (with error)
+[3287173] Connection from 127.0.0.1:44032
+[3287173] Extended attribute "host": 127.0.0.1:5570
+[3287173] Request receive-pack for '/repo.git'
+[3287173] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git'
+[3287016] [3287173] Disconnected (with error)
 fatal: remote error: service not enabled: /repo.git
 ok 20 - push disabled
 
 expecting success of 5570.21 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
-[2066198] Connection from 127.0.0.1:51932
-[2066198] Extended attribute "host": 127.0.0.1:5570
-[2066198] Extended attribute "protocol": version=2
-[2066198] Request upload-pack for '/repo.git'
-[2066198] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[2065984] [2066198] Disconnected (with error)
+[3287252] Connection from 127.0.0.1:44046
+[3287252] Extended attribute "host": 127.0.0.1:5570
+[3287252] Extended attribute "protocol": version=2
+[3287252] Request upload-pack for '/repo.git'
+[3287252] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[3287016] [3287252] Disconnected (with error)
 fatal: remote error: no such repository: /repo.git
 ok 21 - read access denied
 
 expecting success of 5570.22 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
-[2066299] Connection from 127.0.0.1:51946
-[2066299] Extended attribute "host": 127.0.0.1:5570
-[2066299] Extended attribute "protocol": version=2
-[2066299] Request upload-pack for '/repo.git'
-[2066299] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[2065984] [2066299] Disconnected (with error)
+[3287331] Connection from 127.0.0.1:44058
+[3287331] Extended attribute "host": 127.0.0.1:5570
+[3287331] Extended attribute "protocol": version=2
+[3287331] Request upload-pack for '/repo.git'
+[3287331] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[3287016] [3287331] Disconnected (with error)
 fatal: remote error: repository not exported: /repo.git
 ok 22 - not exported
 
 Stopping git daemon ...
-Terminated
 Starting git daemon ...
-[2066416] Ready to rumble
+[3287432] Ready to rumble
 expecting success of 5570.23 'access repo via interpolated hostname': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
 	git init --bare "$repo" &&
@@ -361186,24 +361137,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
 To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
  * [new branch]      HEAD -> main
-[2066597] Connection from 127.0.0.1:51962
-[2066597] Extended attribute "host": localhost
-[2066597] Extended attribute "protocol": version=2
-[2066597] Request upload-pack for '/interp.git'
-[2066597] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[3287660] Connection from 127.0.0.1:44068
+[3287660] Extended attribute "host": localhost
+[3287660] Extended attribute "protocol": version=2
+[3287660] Request upload-pack for '/interp.git'
+[3287660] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-[2066416] [2066597] Disconnected
-[2066662] Connection from 127.0.0.1:51974
-[2066662] Extended attribute "host": LOCALHOST
-[2066662] Extended attribute "protocol": version=2
-[2066662] Request upload-pack for '/interp.git'
-[2066662] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[3287432] [3287660] Disconnected
+[3287730] Connection from 127.0.0.1:44072
+[3287730] Extended attribute "host": LOCALHOST
+[3287730] Extended attribute "protocol": version=2
+[3287730] Request upload-pack for '/interp.git'
+[3287730] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
+[3287432] [3287730] Disconnected
 ok 23 - access repo via interpolated hostname
 
-[2066416] [2066662] Disconnected
 expecting success of 5570.24 'hostname cannot break out of directory': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
 	git init --bare "$repo" &&
@@ -361216,13 +361167,13 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/escape.git/
 To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/../escape.git
  * [new branch]      HEAD -> main
-[2066882] Connection from 127.0.0.1:51982
-[2066882] Extended attribute "host": ..
-[2066882] Extended attribute "protocol": version=2
-[2066882] Request upload-pack for '/escape.git'
-[2066882] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo//escape.git'
-[2066882] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
-[2066416] [2066882] Disconnected (with error)
+[3287975] Connection from 127.0.0.1:44086
+[3287975] Extended attribute "host": ..
+[3287975] Extended attribute "protocol": version=2
+[3287975] Request upload-pack for '/escape.git'
+[3287975] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo//escape.git'
+[3287975] '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[3287432] [3287975] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /escape.git
 ok 24 - hostname cannot break out of directory
 
@@ -361249,19 +361200,152 @@
 	git -C "$repo" rev-parse main >expect &&
 	test_cmp expect actual
 
-[2067094] Connection from 127.0.0.1:51988
-[2067094] Extended attribute "host": localhost
-[2067094] Request upload-pack for '/interp.git'
-[2067094] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[2066416] [2067094] Disconnected
+[3288177] Connection from 127.0.0.1:44100
+[3288177] Extended attribute "host": localhost
+[3288177] Request upload-pack for '/interp.git'
+[3288177] Interpolated dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[3287432] [3288177] Disconnected
 ok 25 - hostname interpolation works after LF-stripping
 
 Stopping git daemon ...
-Terminated
 # passed all 25 test(s)
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5583-push-branches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5583-push-branches/.git/
+expecting success of 5583.1 'setup bare remote': 
+	git init --bare remote-1 &&
+	git -C remote-1 config gc.auto 0 &&
+	test_commit one &&
+	git push remote-1 HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5583-push-branches/remote-1/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To remote-1
+ * [new branch]      HEAD -> main
+ok 1 - setup bare remote
+
+expecting success of 5583.2 'setup different types of references': 
+	cat >refs <<-EOF &&
+	update refs/heads/branch-1 HEAD
+	update refs/heads/branch-2 HEAD
+	EOF
+
+	git tag -a -m "annotated" annotated-1 HEAD &&
+	git tag -a -m "annotated" annotated-2 HEAD &&
+	git update-ref --stdin < refs
+
+ok 2 - setup different types of references
+
+expecting success of 5583.3 '--all and --branches have the same behavior': 
+	test_when_finished "delete_refs remote-1 \
+			   refs/heads/branch-1 \
+			   refs/heads/branch-2" &&
+	git push remote-1 --all &&
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	$commit refs/heads/branch-1
+	$commit refs/heads/branch-2
+	$commit refs/heads/main
+	EOF
+
+	git -C remote-1 show-ref --heads >actual.all &&
+	delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 &&
+	git push remote-1 --branches &&
+	git -C remote-1 show-ref --heads >actual.branches &&
+	test_cmp actual.all actual.branches &&
+	test_cmp expect actual.all
+
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ok 3 - --all and --branches have the same behavior
+
+expecting success of 5583.4 '--all or --branches can not be combined with refspecs': 
+	test_must_fail git push remote-1 --all main >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches main >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "be combined with refspecs" actual.all
+
+fatal: --all can't be combined with refspecs
+ok 4 - --all or --branches can not be combined with refspecs
+
+expecting success of 5583.5 '--all or --branches can not be combined with --mirror': 
+	test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--all/--branches' and '--mirror' cannot be used together
+ok 5 - --all or --branches can not be combined with --mirror
+
+expecting success of 5583.6 '--all or --branches can not be combined with --tags': 
+	test_must_fail git push remote-1 --all --tags >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--tags' and '--all/--branches' cannot be used together
+ok 6 - --all or --branches can not be combined with --tags
+
+expecting success of 5583.7 '--all or --branches can not be combined with --delete': 
+	test_must_fail git push remote-1 --all --delete >actual.all 2>&1 &&
+	test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 &&
+	test_cmp actual.all actual.branches &&
+	grep "cannot be used together" actual.all
+
+fatal: options '--delete' and '--all/--branches' cannot be used together
+ok 7 - --all or --branches can not be combined with --delete
+
+expecting success of 5583.8 '--all or --branches combines with --follow-tags have same behavior': 
+	test_when_finished "delete_refs remote-1 \
+			   refs/heads/branch-1 \
+			   refs/heads/branch-2 \
+			   refs/tags/annotated-1 \
+			   refs/tags/annotated-2" &&
+	git push remote-1 --all --follow-tags &&
+	git -C remote-1 show-ref > actual.all &&
+	cat >expect <<-EOF &&
+	$commit refs/heads/branch-1
+	$commit refs/heads/branch-2
+	$commit refs/heads/main
+	$(git rev-parse annotated-1) refs/tags/annotated-1
+	$(git rev-parse annotated-2) refs/tags/annotated-2
+	EOF
+
+	delete_refs remote-1 \
+		    refs/heads/branch-1 \
+		    refs/heads/branch-2 \
+		    refs/tags/annotated-1 \
+		    refs/tags/annotated-2 &&
+	git push remote-1 --branches --follow-tags &&
+	git -C remote-1 show-ref >actual.branches &&
+	test_cmp actual.all actual.branches &&
+	test_cmp expect actual.all
+
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ * [new tag]         annotated-1 -> annotated-1
+ * [new tag]         annotated-2 -> annotated-2
+To remote-1
+ * [new branch]      branch-1 -> branch-1
+ * [new branch]      branch-2 -> branch-2
+ * [new tag]         annotated-1 -> annotated-1
+ * [new tag]         annotated-2 -> annotated-2
+ok 8 - --all or --branches combines with --follow-tags have same behavior
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5602-clone-remote-exec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5602-clone-remote-exec/.git/
 expecting success of 5602.1 'setup': 
@@ -361452,138 +361536,895 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5583-push-branches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5583-push-branches/.git/
-expecting success of 5583.1 'setup bare remote': 
-	git init --bare remote-1 &&
-	git -C remote-1 config gc.auto 0 &&
-	test_commit one &&
-	git push remote-1 HEAD
+*** t5582-fetch-negative-refspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.git/
+expecting success of 5582.1 'setup': 
+	echo >file original &&
+	git add file &&
+	git commit -a -m original
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5583-push-branches/remote-1/
-[main (root-commit) d79ce16] one
+[main (root-commit) 7fb3fb8] original
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To remote-1
- * [new branch]      HEAD -> main
-ok 1 - setup bare remote
+ create mode 100644 file
+ok 1 - setup
 
-expecting success of 5583.2 'setup different types of references': 
-	cat >refs <<-EOF &&
-	update refs/heads/branch-1 HEAD
-	update refs/heads/branch-2 HEAD
+expecting success of 5582.2 'clone and setup child repos': 
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one" &&
+		git switch -c alternate &&
+		echo >file updated again by one &&
+		git commit -a -m "updated by one again" &&
+		git switch main
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.main.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
+		git config --add remote.one.fetch ^refs/heads/alternate
+	) &&
+	git clone . three
+
+Cloning into 'one'...
+done.
+[main ffc8fdd] updated by one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'alternate'
+[alternate 8a3fcb7] updated by one again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Your branch is ahead of 'origin/main' by 1 commit.
+  (use "git push" to publish your local commits)
+Cloning into 'two'...
+done.
+Cloning into 'three'...
+done.
+ok 2 - clone and setup child repos
+
+expecting success of 5582.3 'fetch one': 
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	(
+		cd two &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git fetch one &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git rev-parse --verify refs/remotes/one/main &&
+		mine=$(git rev-parse refs/remotes/one/main) &&
+		his=$(cd ../one && git rev-parse refs/heads/main) &&
+		test "z$mine" = "z$his"
+	)
+
+[main 76a8623] updated by origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+From ../one/
+ * [new branch]      main       -> one/main
+fatal: Needed a single revision
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 3 - fetch one
+
+expecting success of 5582.4 'fetch with negative refspec on commandline': 
+	echo >file updated by origin again &&
+	git commit -a -m "updated by origin again" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main c0ae31c] updated by origin again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      alternate  -> one/alternate
+ok 4 - fetch with negative refspec on commandline
+
+expecting success of 5582.5 'fetch with negative sha1 refspec fails': 
+	echo >file updated by origin yet again &&
+	git commit -a -m "updated by origin yet again" &&
+	(
+		cd three &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
+	)
+
+[main e30c41c] updated by origin yet again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: invalid refspec '^ffc8fdde31e0177ad02216ab27bb483fc88169f2'
+ok 5 - fetch with negative sha1 refspec fails
+
+expecting success of 5582.6 'fetch with negative pattern refspec': 
+	echo >file updated by origin once more &&
+	git commit -a -m "updated by origin once more" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main c5395f8] updated by origin once more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - fetch with negative pattern refspec
+
+expecting success of 5582.7 'fetch with negative pattern refspec does not expand prefix': 
+	echo >file updated by origin another time &&
+	git commit -a -m "updated by origin another time" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		echo $alternate_in_one >expect &&
+		echo $main_in_one >>expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+
+[main b3d452f] updated by origin another time
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      main       -> one/main
+ok 7 - fetch with negative pattern refspec does not expand prefix
+
+expecting success of 5582.8 'fetch with negative refspec avoids duplicate conflict': 
+	(
+		cd one &&
+		git branch dups/a &&
+		git branch dups/b &&
+		git branch dups/c &&
+		git branch other/a &&
+		git rev-parse --verify refs/heads/other/a >../expect &&
+		git rev-parse --verify refs/heads/dups/b >>../expect &&
+		git rev-parse --verify refs/heads/dups/c >>../expect
+	) &&
+	(
+		cd three &&
+		git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
+		git rev-parse --verify refs/dups/a >../actual &&
+		git rev-parse --verify refs/dups/b >>../actual &&
+		git rev-parse --verify refs/dups/c >>../actual
+	) &&
+	test_cmp expect actual
+
+From ../one/
+ * [new branch]      dups/b     -> refs/dups/b
+ * [new branch]      dups/c     -> refs/dups/c
+ * [new branch]      other/a    -> refs/dups/a
+ok 8 - fetch with negative refspec avoids duplicate conflict
+
+expecting success of 5582.9 'push --prune with negative refspec': 
+	(
+		cd two &&
+		git branch prune/a &&
+		git branch prune/b &&
+		git branch prune/c &&
+		git push ../three refs/heads/prune/* &&
+		git branch -d prune/a &&
+		git branch -d prune/b &&
+		git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
+		test_cmp expect actual
+	)
+
+To ../three
+ * [new branch]      prune/a -> prune/a
+ * [new branch]      prune/b -> prune/b
+ * [new branch]      prune/c -> prune/c
+Deleted branch prune/a (was 7fb3fb8).
+Deleted branch prune/b (was 7fb3fb8).
+To ../three
+ - [deleted]         prune/a
+ok 9 - push --prune with negative refspec
+
+expecting success of 5582.10 'push --prune with negative refspec apply to the destination': 
+	(
+		cd two &&
+		git branch ours/a &&
+		git branch ours/b &&
+		git branch ours/c &&
+		git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
+		git branch -d ours/a &&
+		git branch -d ours/b &&
+		git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
+		test_cmp expect actual
+	)
+
+To ../three
+ * [new branch]      ours/a -> theirs/a
+ * [new branch]      ours/b -> theirs/b
+ * [new branch]      ours/c -> theirs/c
+Deleted branch ours/a (was 7fb3fb8).
+Deleted branch ours/b (was 7fb3fb8).
+To ../three
+ - [deleted]         theirs/a
+ok 10 - push --prune with negative refspec apply to the destination
+
+expecting success of 5582.11 'fetch --prune with negative refspec': 
+	(
+		cd two &&
+		git branch fetch/a &&
+		git branch fetch/b &&
+		git branch fetch/c
+	) &&
+	(
+		cd three &&
+		git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
+	) &&
+	(
+		cd two &&
+		git branch -d fetch/a &&
+		git branch -d fetch/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
+		test_cmp expect actual
+	)
+
+From ../two/
+ * [new branch]      fetch/a    -> copied/a
+ * [new branch]      fetch/b    -> copied/b
+ * [new branch]      fetch/c    -> copied/c
+Deleted branch fetch/a (was 7fb3fb8).
+Deleted branch fetch/b (was 7fb3fb8).
+From ../two/
+ - [deleted]         (none)     -> copied/a
+ = [up to date]      fetch/c    -> copied/c
+ok 11 - fetch --prune with negative refspec
+
+expecting success of 5582.12 'push with matching : and negative refspec': 
+	# Manually handle cleanup, since test_config is not
+	# prepared to take arbitrary options like --add
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# For convenience, we use "master" to refer to the name of
+	# the branch created by default in the following.
+	#
+	# Repositories two and one have branches other than "master"
+	# but they have no overlap---"master" is the only one that
+	# is shared between them.  And the master branch at two is
+	# behind the master branch at one by one commit.
+	git -C two config --add remote.one.push : &&
+
+	# A matching push tries to update master, fails due to non-ff
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed.
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+
+To ../one/.git/
+ ! [rejected]        main -> main (non-fast-forward)
+error: failed to push some refs to '../one/.git/'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. If you want to integrate the remote changes,
+hint: use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+Pushing to ../one/.git/
+Everything up-to-date
+ok 12 - push with matching : and negative refspec
+
+expecting success of 5582.13 'push with matching +: and negative refspec': 
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# The same set-up as above, whose side-effect was a no-op.
+	git -C two config --add remote.one.push +: &&
+
+	# The push refuses to update the "master" branch that is checked
+	# out in the "one" repository, even when it is forced with +:
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+
+remote: error: refusing to update checked out branch: refs/heads/main        
+remote: error: By default, updating the current branch in a non-bare repository        
+remote: is denied, because it will make the index and work tree inconsistent        
+remote: with what you pushed, and will require 'git reset --hard' to match        
+remote: the work tree to HEAD.        
+remote: 
+remote: You can set the 'receive.denyCurrentBranch' configuration variable        
+remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
+remote: its current branch; however, this is not recommended unless you        
+remote: arranged to update its work tree to match what you pushed in some        
+remote: other way.        
+remote: 
+remote: To squelch this message and still keep the default behaviour, set        
+remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
+To ../one/.git/
+ ! [remote rejected] main -> main (branch is currently checked out)
+error: failed to push some refs to '../one/.git/'
+Pushing to ../one/.git/
+Everything up-to-date
+ok 13 - push with matching +: and negative refspec
+
+expecting success of 5582.14 '--prefetch correctly modifies refspecs': 
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+	git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
+
+	git tag -a -m never never-fetch-tag HEAD &&
+
+	git branch bogus/fetched HEAD~1 &&
+	git branch bogus/ignore HEAD &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
+
+	# correctly handle when refspec set becomes empty
+	# after removing the refs/tags/* refspec.
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+
+	# The refspec for refs that are not fully qualified
+	# are filtered multiple times.
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
+
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.
+ * branch            main          -> FETCH_HEAD
+ * [new branch]      bogus/fetched -> refs/prefetch/bogus/fetched
+fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+never-fetch-tag
+c5395f864a4757fc219a4848a19568f14918687f
+fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/prefetch/bogus/ignore
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.
+ * branch            main       -> FETCH_HEAD
+fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+never-fetch-tag
+c5395f864a4757fc219a4848a19568f14918687f
+fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/prefetch/bogus/ignore
+ok 14 - --prefetch correctly modifies refspecs
+
+expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
+	git checkout bogus/fetched &&
+	test_commit extra &&
+
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --unset branch.main.remote &&
+	git -C one config remote.origin.fetch "+refs/tags/extra" &&
+	git -C one config remote.origin.skipfetchall true &&
+	git -C one config remote.origin.tagopt "--no-tags" &&
+
+	git -C one fetch --prefetch
+
+Switched to branch 'bogus/fetched'
+[bogus/fetched 8d8169a] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+ok 15 - --prefetch succeeds when refspec becomes empty
+
+expecting success of 5582.16 '--prefetch succeeds with empty command line refspec': 
+	git -C one fetch --prefetch origin +refs/tags/extra
+
+ok 16 - --prefetch succeeds with empty command line refspec
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5574-fetch-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/.git/
+expecting success of 5574.1 'fetch with invalid output format configuration': 
+	test_when_finished "rm -rf clone" &&
+	git clone . clone &&
+
+	test_must_fail git -C clone -c fetch.output fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	error: missing value for ${SQ}fetch.output${SQ}
+	fatal: unable to parse ${SQ}fetch.output${SQ} from command-line config
+	EOF
+	test_cmp expect actual.err &&
+
+	test_must_fail git -C clone -c fetch.output= fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}${SQ}
 	EOF
+	test_cmp expect actual.err &&
 
-	git tag -a -m "annotated" annotated-1 HEAD &&
-	git tag -a -m "annotated" annotated-2 HEAD &&
-	git update-ref --stdin < refs
+	test_must_fail git -C clone -c fetch.output=garbage fetch origin 2>actual.err &&
+	cat >expect <<-EOF &&
+	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}garbage${SQ}
+	EOF
+	test_cmp expect actual.err
 
-ok 2 - setup different types of references
+Cloning into 'clone'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 1 - fetch with invalid output format configuration
+
+expecting success of 5574.2 'fetch aligned output': 
+	git clone . full-output &&
+	test_commit looooooooooooong-tag &&
+	(
+		cd full-output &&
+		git -c fetch.output=full fetch origin >actual 2>&1 &&
+		grep -e "->" actual | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	main                 -> origin/main
+	looooooooooooong-tag -> looooooooooooong-tag
+	EOF
+	test_cmp expect actual
+
+Cloning into 'full-output'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) c62a462] looooooooooooong-tag
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 looooooooooooong-tag.t
+ok 2 - fetch aligned output
+
+expecting success of 5574.3 'fetch compact output': 
+	git clone . compact &&
+	test_commit extraaa &&
+	(
+		cd compact &&
+		git -c fetch.output=compact fetch origin >actual 2>&1 &&
+		grep -e "->" actual | cut -c 22- >../actual
+	) &&
+	cat >expect <<-\EOF &&
+	main       -> origin/*
+	extraaa    -> *
+	EOF
+	test_cmp expect actual
+
+Cloning into 'compact'...
+done.
+[main 7229363] extraaa
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extraaa.t
+ok 3 - fetch compact output
+
+expecting success of 5574.4 'setup for fetch porcelain output': 
+	# Set up a bunch of references that we can use to demonstrate different
+	# kinds of flag symbols in the output format.
+	test_commit commit-for-porcelain-output &&
+	MAIN_OLD=$(git rev-parse HEAD) &&
+	git branch "fast-forward" &&
+	git branch "deleted-branch" &&
+	git checkout -b force-updated &&
+	test_commit --no-tag force-update-old &&
+	FORCE_UPDATED_OLD=$(git rev-parse HEAD) &&
+	git checkout main &&
+
+	# Backup to preseed.git
+	git clone --mirror . preseed.git &&
+
+	# Continue changing our local references.
+	git branch new-branch &&
+	git branch -d deleted-branch &&
+	git checkout fast-forward &&
+	test_commit --no-tag fast-forward-new &&
+	FAST_FORWARD_NEW=$(git rev-parse HEAD) &&
+	git checkout force-updated &&
+	git reset --hard HEAD~ &&
+	test_commit --no-tag force-update-new &&
+	FORCE_UPDATED_NEW=$(git rev-parse HEAD)
+
+[main 4755660] commit-for-porcelain-output
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit-for-porcelain-output.t
+Switched to a new branch 'force-updated'
+[force-updated 9969fa4] force-update-old
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-update-old.t
+Switched to branch 'main'
+Cloning into bare repository 'preseed.git'...
+done.
+Deleted branch deleted-branch (was 4755660).
+Switched to branch 'fast-forward'
+[fast-forward 6181e78] fast-forward-new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fast-forward-new.t
+Switched to branch 'force-updated'
+HEAD is now at 4755660 commit-for-porcelain-output
+[force-updated 7157201] force-update-new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 force-update-new.t
+ok 4 - setup for fetch porcelain output
+
+expecting success of 5574.5 'fetch porcelain output ': 
+		test_when_finished "rm -rf porcelain" &&
+
+		# Clone and pre-seed the repositories. We fetch references into two
+		# namespaces so that we can test that rejected and force-updated
+		# references are reported properly.
+		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
+		git clone preseed.git porcelain &&
+		git -C porcelain fetch origin $opt $refspecs &&
+
+		cat >expect <<-EOF &&
+		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
+		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
+		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
+		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
+		EOF
+
+		# Change the URL of the repository to fetch different references.
+		git -C porcelain remote set-url origin .. &&
+
+		# Execute a dry-run fetch first. We do this to assert that the dry-run
+		# and non-dry-run fetches produces the same output. Execution of the
+		# fetch is expected to fail as we have a rejected reference update.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --dry-run --prune origin $refspecs >actual &&
+		test_cmp expect actual &&
+
+		# And now we perform a non-dry-run fetch.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --prune origin $refspecs >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_must_be_empty stderr
+	
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/preseed
+ * [new branch]      deleted-branch -> refs/unforced/deleted-branch
+ * [new branch]      fast-forward   -> refs/unforced/fast-forward
+ * [new branch]      force-updated  -> refs/unforced/force-updated
+ * [new branch]      main           -> refs/unforced/main
+ * [new branch]      deleted-branch -> refs/forced/deleted-branch
+ * [new branch]      fast-forward   -> refs/forced/fast-forward
+ * [new branch]      force-updated  -> refs/forced/force-updated
+ * [new branch]      main           -> refs/forced/main
+ok 5 - fetch porcelain output 
+
+expecting success of 5574.6 'fetch porcelain output (atomic)': 
+		test_when_finished "rm -rf porcelain" &&
+
+		# Clone and pre-seed the repositories. We fetch references into two
+		# namespaces so that we can test that rejected and force-updated
+		# references are reported properly.
+		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
+		git clone preseed.git porcelain &&
+		git -C porcelain fetch origin $opt $refspecs &&
+
+		cat >expect <<-EOF &&
+		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
+		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
+		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
+		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
+		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
+		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
+		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
+		EOF
+
+		# Change the URL of the repository to fetch different references.
+		git -C porcelain remote set-url origin .. &&
+
+		# Execute a dry-run fetch first. We do this to assert that the dry-run
+		# and non-dry-run fetches produces the same output. Execution of the
+		# fetch is expected to fail as we have a rejected reference update.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --dry-run --prune origin $refspecs >actual &&
+		test_cmp expect actual &&
+
+		# And now we perform a non-dry-run fetch.
+		test_must_fail git -C porcelain fetch $opt \
+			--porcelain --prune origin $refspecs >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_must_be_empty stderr
+	
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/preseed
+ * [new branch]      deleted-branch -> refs/unforced/deleted-branch
+ * [new branch]      fast-forward   -> refs/unforced/fast-forward
+ * [new branch]      force-updated  -> refs/unforced/force-updated
+ * [new branch]      main           -> refs/unforced/main
+ * [new branch]      deleted-branch -> refs/forced/deleted-branch
+ * [new branch]      fast-forward   -> refs/forced/fast-forward
+ * [new branch]      force-updated  -> refs/forced/force-updated
+ * [new branch]      main           -> refs/forced/main
+ok 6 - fetch porcelain output (atomic)
+
+expecting success of 5574.7 'fetch porcelain with multiple remotes': 
+	test_when_finished "rm -rf porcelain" &&
+
+	git switch --create multiple-remotes &&
+	git clone . porcelain &&
+	git -C porcelain remote add second-remote "$PWD" &&
+	git -C porcelain fetch second-remote &&
+
+	test_commit --no-tag multi-commit &&
+	old_commit=$(git rev-parse HEAD~) &&
+	new_commit=$(git rev-parse HEAD) &&
 
-expecting success of 5583.3 '--all and --branches have the same behavior': 
-	test_when_finished "delete_refs remote-1 \
-			   refs/heads/branch-1 \
-			   refs/heads/branch-2" &&
-	git push remote-1 --all &&
-	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
-	$commit refs/heads/branch-1
-	$commit refs/heads/branch-2
-	$commit refs/heads/main
+	  $old_commit $new_commit refs/remotes/origin/multiple-remotes
+	  $old_commit $new_commit refs/remotes/second-remote/multiple-remotes
 	EOF
 
-	git -C remote-1 show-ref --heads >actual.all &&
-	delete_refs remote-1 refs/heads/branch-1 refs/heads/branch-2 &&
-	git push remote-1 --branches &&
-	git -C remote-1 show-ref --heads >actual.branches &&
-	test_cmp actual.all actual.branches &&
-	test_cmp expect actual.all
+	git -C porcelain fetch --porcelain --all >actual 2>stderr &&
+	test_cmp expect actual &&
+	test_must_be_empty stderr
 
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
-ok 3 - --all and --branches have the same behavior
+Switched to a new branch 'multiple-remotes'
+Cloning into 'porcelain'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output
+ * [new branch]      fast-forward     -> second-remote/fast-forward
+ * [new branch]      force-updated    -> second-remote/force-updated
+ * [new branch]      main             -> second-remote/main
+ * [new branch]      multiple-remotes -> second-remote/multiple-remotes
+ * [new branch]      new-branch       -> second-remote/new-branch
+[multiple-remotes 9d09634] multi-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 multi-commit.t
+ok 7 - fetch porcelain with multiple remotes
 
-expecting success of 5583.4 '--all or --branches can not be combined with refspecs': 
-	test_must_fail git push remote-1 --all main >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches main >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "be combined with refspecs" actual.all
+expecting success of 5574.8 'fetch porcelain refuses to work with submodules': 
+	test_when_finished "rm -rf porcelain" &&
 
-fatal: --all can't be combined with refspecs
-ok 4 - --all or --branches can not be combined with refspecs
+	cat >expect <<-EOF &&
+	fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together
+	EOF
 
-expecting success of 5583.5 '--all or --branches can not be combined with --mirror': 
-	test_must_fail git push remote-1 --all --mirror >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --mirror >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
+	git init porcelain &&
+	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr &&
+	test_cmp expect stderr &&
 
-fatal: options '--all/--branches' and '--mirror' cannot be used together
-ok 5 - --all or --branches can not be combined with --mirror
+	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr &&
+	test_cmp expect stderr
 
-expecting success of 5583.6 '--all or --branches can not be combined with --tags': 
-	test_must_fail git push remote-1 --all --tags >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --tags >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/porcelain/.git/
+ok 8 - fetch porcelain refuses to work with submodules
 
-fatal: options '--tags' and '--all/--branches' cannot be used together
-ok 6 - --all or --branches can not be combined with --tags
+expecting success of 5574.9 'fetch porcelain overrides fetch.output config': 
+	test_when_finished "rm -rf porcelain" &&
 
-expecting success of 5583.7 '--all or --branches can not be combined with --delete': 
-	test_must_fail git push remote-1 --all --delete >actual.all 2>&1 &&
-	test_must_fail git push remote-1 --branches --delete >actual.branches 2>&1 &&
-	test_cmp actual.all actual.branches &&
-	grep "cannot be used together" actual.all
+	git switch --create config-override &&
+	git clone . porcelain &&
+	test_commit new-commit &&
+	old_commit=$(git rev-parse HEAD~) &&
+	new_commit=$(git rev-parse HEAD) &&
 
-fatal: options '--delete' and '--all/--branches' cannot be used together
-ok 7 - --all or --branches can not be combined with --delete
+	cat >expect <<-EOF &&
+	  $old_commit $new_commit refs/remotes/origin/config-override
+	* $ZERO_OID $new_commit refs/tags/new-commit
+	EOF
+
+	git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr &&
+	test_must_be_empty stderr &&
+	test_cmp expect stdout
+
+Switched to a new branch 'config-override'
+Cloning into 'porcelain'...
+done.
+[config-override ead9d61] new-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-commit.t
+ok 9 - fetch porcelain overrides fetch.output config
+
+expecting success of 5574.10 'fetch --no-porcelain overrides previous --porcelain': 
+	test_when_finished "rm -rf no-porcelain" &&
+
+	git switch --create no-porcelain &&
+	git clone . no-porcelain &&
+	test_commit --no-tag no-porcelain &&
+	old_commit=$(git rev-parse --short HEAD~) &&
+	new_commit=$(git rev-parse --short HEAD) &&
 
-expecting success of 5583.8 '--all or --branches combines with --follow-tags have same behavior': 
-	test_when_finished "delete_refs remote-1 \
-			   refs/heads/branch-1 \
-			   refs/heads/branch-2 \
-			   refs/tags/annotated-1 \
-			   refs/tags/annotated-2" &&
-	git push remote-1 --all --follow-tags &&
-	git -C remote-1 show-ref > actual.all &&
 	cat >expect <<-EOF &&
-	$commit refs/heads/branch-1
-	$commit refs/heads/branch-2
-	$commit refs/heads/main
-	$(git rev-parse annotated-1) refs/tags/annotated-1
-	$(git rev-parse annotated-2) refs/tags/annotated-2
+	From $(test-tool path-utils real_path .)/.
+	   $old_commit..$new_commit  no-porcelain -> origin/no-porcelain
 	EOF
 
-	delete_refs remote-1 \
-		    refs/heads/branch-1 \
-		    refs/heads/branch-2 \
-		    refs/tags/annotated-1 \
-		    refs/tags/annotated-2 &&
-	git push remote-1 --branches --follow-tags &&
-	git -C remote-1 show-ref >actual.branches &&
-	test_cmp actual.all actual.branches &&
-	test_cmp expect actual.all
+	git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr &&
+	test_cmp expect stderr &&
+	test_must_be_empty stdout
 
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
- * [new tag]         annotated-1 -> annotated-1
- * [new tag]         annotated-2 -> annotated-2
-To remote-1
- * [new branch]      branch-1 -> branch-1
- * [new branch]      branch-2 -> branch-2
- * [new tag]         annotated-1 -> annotated-1
- * [new tag]         annotated-2 -> annotated-2
-ok 8 - --all or --branches combines with --follow-tags have same behavior
+Switched to a new branch 'no-porcelain'
+Cloning into 'no-porcelain'...
+done.
+[no-porcelain cf8719e] no-porcelain
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-porcelain.t
+ok 10 - fetch --no-porcelain overrides previous --porcelain
 
-# passed all 8 test(s)
-1..8
+expecting success of 5574.11 'fetch output with HEAD': 
+	test_when_finished "rm -rf head" &&
+	git clone . head &&
+
+	git -C head fetch --dry-run origin HEAD >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * branch            HEAD       -> FETCH_HEAD
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch origin HEAD >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch --dry-run origin HEAD:foo >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * [new ref]         HEAD       -> foo
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C head fetch origin HEAD:foo >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err
+
+Cloning into 'head'...
+done.
+ok 11 - fetch output with HEAD
+
+expecting success of 5574.12 'fetch porcelain output with HEAD': 
+	test_when_finished "rm -rf head" &&
+	git clone . head &&
+	COMMIT_ID=$(git rev-parse HEAD) &&
+
+	git -C head fetch --porcelain --dry-run origin HEAD >actual &&
+	cat >expect <<-EOF &&
+	* $ZERO_OID $COMMIT_ID FETCH_HEAD
+	EOF
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain origin HEAD >actual &&
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain --dry-run origin HEAD:foo >actual &&
+	cat >expect <<-EOF &&
+	* $ZERO_OID $COMMIT_ID refs/heads/foo
+	EOF
+	test_cmp expect actual &&
+
+	git -C head fetch --porcelain origin HEAD:foo >actual &&
+	test_cmp expect actual
+
+Cloning into 'head'...
+done.
+ok 12 - fetch porcelain output with HEAD
+
+expecting success of 5574.13 'fetch output with object ID': 
+	test_when_finished "rm -rf object-id" &&
+	git clone . object-id &&
+	commit=$(git rev-parse HEAD) &&
+
+	git -C object-id fetch --dry-run origin $commit:object-id >actual.out 2>actual.err &&
+	cat >expect <<-EOF &&
+	From $(test-tool path-utils real_path .)/.
+	 * [new ref]         $commit -> object-id
+	EOF
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err &&
+
+	git -C object-id fetch origin $commit:object-id >actual.out 2>actual.err &&
+	test_must_be_empty actual.out &&
+	test_cmp expect actual.err
+
+Cloning into 'object-id'...
+done.
+ok 13 - fetch output with object ID
+
+expecting success of 5574.14 '--no-show-forced-updates': 
+	mkdir forced-updates &&
+	(
+		cd forced-updates &&
+		git init &&
+		test_commit 1 &&
+		test_commit 2
+	) &&
+	git clone forced-updates forced-update-clone &&
+	git clone forced-updates no-forced-update-clone &&
+	git -C forced-updates reset --hard HEAD~1 &&
+	(
+		cd forced-update-clone &&
+		git fetch --show-forced-updates origin 2>output &&
+		test_grep "(forced update)" output
+	) &&
+	(
+		cd no-forced-update-clone &&
+		git fetch --no-show-forced-updates origin 2>output &&
+		test_grep ! "(forced update)" output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/forced-updates/.git/
+[main (root-commit) 925a26a] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[main 3d049f7] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Cloning into 'forced-update-clone'...
+done.
+Cloning into 'no-forced-update-clone'...
+done.
+HEAD is now at 925a26a 1
+ + 3d049f7...925a26a main       -> origin/main  (forced update)
+ok 14 - --no-show-forced-updates
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5500-fetch-pack.sh ***
@@ -361705,7 +362546,7 @@
 remote: Counting objects:   0% (1/192)        
remote: Counting objects:   1% (2/192)        
remote: Counting objects:   2% (4/192)        
remote: Counting objects:   3% (6/192)        
remote: Counting objects:   4% (8/192)        
remote: Counting objects:   5% (10/192)        
remote: Counting objects:   6% (12/192)        
remote: Counting objects:   7% (14/192)        
remote: Counting objects:   8% (16/192)        
remote: Counting objects:   9% (18/192)        
remote: Counting objects:  10% (20/192)        
remote: Counting objects:  11% (22/192)        
remote: Counting objects:  12% (24/192)        
remote: Counting objects:  13% (25/192)        
remote: Counting objects:  14% (27/192)        
remote: Counting objects:  15% (29/192)        
remote: Counting objects:  16% (31/192)        
remote: Counting objects:  17% (33/192)        
remote: Counting objects:  18% (35/192)        
remote: Counting objects:  19% (37/192)        
remote: Counting objects:  20% (39/192)        
remote: Counting objects:  21% (41/192)        
remote: Counting objects:  22% (43/192)        
remote: Counting objects:  23% (45/192)        
remote: Counting objects:  24% (47/192)        
remote: Counting objects:  25% (48/192)        
remote: Counting objects:  26% (50/192)        
remote: Counting objects:  27% (52/192)        
remote: Counting objects:  28% (54/192)        
remote: Counting objects:  29% (56/192)        
remote: Counting objects:  30% (58/192)        
remote: Counting objects:  31% (60/192)        
remote: Counting objects:  32% (62/192)        
remote: Counting objects:  33% (64/192)        
remote: Counting objects:  34% (66/192)        
remote: Counting objects:  35% (68/192)        
remote: Counting objects:  36% (70/192)        
remote: Counting objects:  37% (72/192)        
remote: Counting objects:  38% (73/192)        
remote: Counting objects:  39% (75/192)        
remote: Counting objects:  40% (77/192)        
remote: Counting objects:  41% (79/192)        
remote: Counting objects:  42% (81/192)        
remote: Counting objects:  43% (83/192)        
remote: Counting objects:  44% (85/192)        
remote: Counting objects:  45% (87/192)        
remote: Counting objects:  46% (89/192)        
remote: Counting objects:  47% (91/192)        
remote: Counting objects:  48% (93/192)        
remote: Counting objects:  49% (95/192)        
remote: Counting objects:  50% (96/192)        
remote: Counting objects:  51% (98/192)        
remote: Counting objects:  52% (100/192)        
remote: Counting objects:  53% (102/192)        
remote: Counting objects:  54% (104/192)        
remote: Counting objects:  55% (106/192)        
remote: Counting objects:  56% (108/192)        
remote: Counting objects:  57% (110/192)        
remote: Counting objects:  58% (112/192)        
remote: Counting objects:  59% (114/192)        
remote: Counting objects:  60% (116/192)        
remote: Counting objects:  61% (118/192)        
remote: Counting objects:  62% (120/192)        
remote: Counting objects:  63% (121/192)        
remote: Counting objects:  64% (123/192)        
remote: Counting objects:  65% (125/192)        
remote: Counting objects:  66% (127/192)        
remote: Counting objects:  67% (129/192)        
remote: Counting objects:  68% (131/192)        
remote: Counting objects:  69% (133/192)        
remote: Counting objects:  70% (135/192)        
remote: Counting objects:  71% (137/192)        
remote: Counting objects:  72% (139/192)        
remote: Counting objects:  73% (141/192)        
remote: Counting objects:  74% (143/192)        
remote: Counting objects:  75% (144/192)        
remote: Counting objects:  76% (146/192)        
remote: Counting objects:  77% (148/192)        
remote: Counting objects:  78% (150/192)        
remote: Counting objects:  79% (152/192)        
remote: Counting objects:  80% (154/192)        
remote: Counting objects:  81% (156/192)        
remote: Counting objects:  82% (158/192)        
remote: Counting objects:  83% (160/192)        
remote: Counting objects:  84% (162/192)        
remote: Counting objects:  85% (164/192)        
remote: Counting objects:  86% (166/192)        
remote: Counting objects:  87% (168/192)        
remote: Counting objects:  88% (169/192)        
remote: Counting objects:  89% (171/192)        
remote: Counting objects:  90% (173/192)        
remote: Counting objects:  91% (175/192)        
remote: Counting objects:  92% (177/192)        
remote: Counting objects:  93% (179/192)        
remote: Counting objects:  94% (181/192)        
remote: Counting objects:  95% (183/192)        
remote: Counting objects:  96% (185/192)        
remote: Counting objects:  97% (187/192)        
remote: Counting objects:  98% (189/192)        
remote: Counting objects:  99% (191/192)        
remote: Counting objects: 100% (192/192)        
remote: Counting objects: 100% (192/192), done.        
 remote: Compressing objects:   1% (1/64)        
remote: Compressing objects:   3% (2/64)        
remote: Compressing objects:   4% (3/64)        
remote: Compressing objects:   6% (4/64)        
remote: Compressing objects:   7% (5/64)        
remote: Compressing objects:   9% (6/64)        
remote: Compressing objects:  10% (7/64)        
remote: Compressing objects:  12% (8/64)        
remote: Compressing objects:  14% (9/64)        
remote: Compressing objects:  15% (10/64)        
remote: Compressing objects:  17% (11/64)        
remote: Compressing objects:  18% (12/64)        
remote: Compressing objects:  20% (13/64)        
remote: Compressing objects:  21% (14/64)        
remote: Compressing objects:  23% (15/64)        
remote: Compressing objects:  25% (16/64)        
remote: Compressing objects:  26% (17/64)        
remote: Compressing objects:  28% (18/64)        
remote: Compressing objects:  29% (19/64)        
remote: Compressing objects:  31% (20/64)        
remote: Compressing objects:  32% (21/64)        
remote: Compressing objects:  34% (22/64)        
remote: Compressing objects:  35% (23/64)        
remote: Compressing objects:  37% (24/64)        
remote: Compressing objects:  39% (25/64)        
remote: Compressing objects:  40% (26/64)        
remote: Compressing objects:  42% (27/64)        
remote: Compressing objects:  43% (28/64)        
remote: Compressing objects:  45% (29/64)        
remote: Compressing objects:  46% (30/64)        
remote: Compressing objects:  48% (31/64)        
remote: Compressing objects:  50% (32/64)        
remote: Compressing objects:  51% (33/64)        
remote: Compressing objects:  53% (34/64)        
remote: Compressing objects:  54% (35/64)        
remote: Compressing objects:  56% (36/64)        
remote: Compressing objects:  57% (37/64)        
remote: Compressing objects:  59% (38/64)        
remote: Compressing objects:  60% (39/64)        
remote: Compressing objects:  62% (40/64)        
remote: Compressing objects:  64% (41/64)        
remote: Compressing objects:  65% (42/64)        
remote: Compressing objects:  67% (43/64)        
remote: Compressing objects:  68% (44/64)        
remote: Compressing objects:  70% (45/64)        
remote: Compressing objects:  71% (46/64)        
remote: Compressing objects:  73% (47/64)        
remote: Compressing objects:  75% (48/64)        
remote: Compressing objects:  76% (49/64)        
remote: Compressing objects:  78% (50/64)        
remote: Compressing objects:  79% (51/64)        
remote: Compressing objects:  81% (52/64)        
remote: Compressing objects:  82% (53/64)        
remote: Compressing objects:  84% (54/64)        
remote: Compressing objects:  85% (55/64)        
remote: Compressing objects:  87% (56/64)        
remote: Compressing objects:  89% (57/64)        
remote: Compressing objects:  90% (58/64)        
remote: Compressing objects:  92% (59/64)        
remote: Compressing objects:  93% (60/64)        
remote: Compressing objects:  95% (61/64)        
remote: Compressing objects:  96% (62/64)        
remote: Compressing objects:  98% (63/64)        
remote: Compressing objects: 100% (64/64)        
remote: Compressing objects: 100% (64/64), done.        
 Receiving objects:   0% (1/192)
Receiving objects:   1% (2/192)
Receiving objects:   2% (4/192)
Receiving objects:   3% (6/192)
Receiving objects:   4% (8/192)
Receiving objects:   5% (10/192)
Receiving objects:   6% (12/192)
Receiving objects:   7% (14/192)
Receiving objects:   8% (16/192)
Receiving objects:   9% (18/192)
Receiving objects:  10% (20/192)
Receiving objects:  11% (22/192)
Receiving objects:  12% (24/192)
Receiving objects:  13% (25/192)
Receiving objects:  14% (27/192)
Receiving objects:  15% (29/192)
Receiving objects:  16% (31/192)
Receiving objects:  17% (33/192)
Receiving objects:  18% (35/192)
Receiving objects:  19% (37/192)
Receiving objects:  20% (39/192)
Receiving objects:  21% (41/192)
Receiving objects:  22% (43/192)
Receiving objects:  23% (45/192)
Receiving objects:  24% (47/192)
Receiving objects:  25% (48/192)
Receiving objects:  26% (50/192)
remote: Total 192 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
Receiving objects:  97% (187/192)
Receiving objects:  98% (189/192)
Receiving objects:  99% (191/192)
Receiving objects: 100% (192/192)
Receiving objects: 100% (192/192), 16.30 KiB | 340.00 KiB/s, done.
+Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
Receiving objects:  97% (187/192)
Receiving objects:  98% (189/192)
Receiving objects:  99% (191/192)
Receiving objects: 100% (192/192)
Receiving objects: 100% (192/192), 16.30 KiB | 370.00 KiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
@@ -361781,8 +362622,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 origin/B
-{"event":"data_json","sid":"20260419T192058.751642Z-H8d819085-P001eef05","thread":"main","time":"2026-04-19T19:20:58.759797Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.008359,"t_rel":0.008359,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
-{"event":"data_json","sid":"20260419T192058.751642Z-H8d819085-P001eef05","thread":"main","time":"2026-04-19T19:20:58.759797Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.008359,"t_rel":0.008359,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132353.430885Z-H5c947e1c-P00318ebb","thread":"main","time":"2025-03-17T13:23:53.432407Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.001728,"t_rel":0.001728,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132353.430885Z-H5c947e1c-P00318ebb","thread":"main","time":"2025-03-17T13:23:53.432407Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.001728,"t_rel":0.001728,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
 ok 8 - single given branch clone
 
 expecting success of 5500.9 'clone shallow depth 1': 
@@ -361792,7 +362633,7 @@
 	grep \"fetch-info\".*\"depth\":1 shallow0/trace2_event
 
 Cloning into 'shallow0'...
-{"event":"data_json","sid":"20260419T192058.952656Z-H8d819085-P001eefb7","thread":"main","time":"2026-04-19T19:20:58.954499Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.002057,"t_rel":0.002057,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":2,"want-refs":0,"depth":1,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132353.651703Z-H5c947e1c-P00318f79","thread":"main","time":"2025-03-17T13:23:53.653421Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.001912,"t_rel":0.001912,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":2,"want-refs":0,"depth":1,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
 ok 9 - clone shallow depth 1
 
 expecting success of 5500.10 'clone shallow depth 1 with fsck': 
@@ -361925,8 +362766,8 @@
 Fast-forward
  test.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"data_json","sid":"20260419T192100.612341Z-H8d819085-P001ef58e/20260419T192100.631824Z-H8d819085-P001ef59e/20260419T192100.651539Z-H8d819085-P001ef5b7","thread":"main","time":"2026-04-19T19:21:00.667557Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.016227,"t_rel":0.016227,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
-{"event":"data_json","sid":"20260419T192100.612341Z-H8d819085-P001ef58e/20260419T192100.631824Z-H8d819085-P001ef59e/20260419T192100.651539Z-H8d819085-P001ef5b7","thread":"main","time":"2026-04-19T19:21:00.667557Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.016227,"t_rel":0.016227,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132355.571998Z-H5c947e1c-P00319613/20250317T132355.590246Z-H5c947e1c-P0031961e/20250317T132355.613500Z-H5c947e1c-P0031962e","thread":"main","time":"2025-03-17T13:23:55.624455Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.011182,"t_rel":0.011182,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132355.571998Z-H5c947e1c-P00319613/20250317T132355.590246Z-H5c947e1c-P0031961e/20250317T132355.613500Z-H5c947e1c-P0031962e","thread":"main","time":"2025-03-17T13:23:55.624455Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.011182,"t_rel":0.011182,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
 ok 24 - deepening pull in shallow repo
 
 expecting success of 5500.25 'clone shallow object count': 
@@ -362143,9 +362984,9 @@
 		grep \"fetch-info\".*\"depth\":2147483647 trace2_event
 	)
 
-{"event":"data_json","sid":"20260419T192100.612341Z-H8d819085-P001ef58e/20260419T192100.631824Z-H8d819085-P001ef59e/20260419T192100.651539Z-H8d819085-P001ef5b7","thread":"main","time":"2026-04-19T19:21:00.667557Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.016227,"t_rel":0.016227,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
-{"event":"data_json","sid":"20260419T192101.765903Z-H8d819085-P001efa0d/20260419T192101.783671Z-H8d819085-P001efa1f","thread":"main","time":"2026-04-19T19:21:01.788139Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.004695,"t_rel":0.004695,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":2,"want-refs":0,"depth":2147483647,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
-{"event":"data_json","sid":"20260419T192101.765903Z-H8d819085-P001efa0d/20260419T192101.783671Z-H8d819085-P001efa1f","thread":"main","time":"2026-04-19T19:21:01.788139Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.004695,"t_rel":0.004695,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":2,"want-refs":0,"depth":2147483647,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132355.571998Z-H5c947e1c-P00319613/20250317T132355.590246Z-H5c947e1c-P0031961e/20250317T132355.613500Z-H5c947e1c-P0031962e","thread":"main","time":"2025-03-17T13:23:55.624455Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.011182,"t_rel":0.011182,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":1,"want-refs":0,"depth":4,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132356.923823Z-H5c947e1c-P00319a8d/20250317T132356.939534Z-H5c947e1c-P00319a9e","thread":"main","time":"2025-03-17T13:23:56.955906Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.016570,"t_rel":0.016570,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":2,"want-refs":0,"depth":2147483647,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132356.923823Z-H5c947e1c-P00319a8d/20250317T132356.939534Z-H5c947e1c-P00319a9e","thread":"main","time":"2025-03-17T13:23:56.955906Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.016570,"t_rel":0.016570,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":2,"wants":2,"want-refs":0,"depth":2147483647,"shallows":2,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":null}}
 ok 34 - turn shallow to complete repository
 
 expecting success of 5500.35 'clone shallow without --no-single-branch': 
@@ -362456,7 +363297,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_fetch.t
-{"event":"data","sid":"20260419T192105.592409Z-H8d819085-P001f07d0","thread":"main","time":"2026-04-19T19:21:05.630169Z","file":"fetch-pack.c","line":1760,"repo":1,"t_abs":0.037981,"t_rel":0.010455,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
+{"event":"data","sid":"20250317T132402.023161Z-H5c947e1c-P0031aa6d","thread":"main","time":"2025-03-17T13:24:02.048538Z","file":"fetch-pack.c","line":1760,"repo":1,"t_abs":0.025592,"t_rel":0.006029,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"6"}
 remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 ok 44 - in_vain reset upon ACK
 
@@ -362744,10 +363585,10 @@
 remote: Enumerating objects: 267, done.        
 remote: Counting objects:   0% (1/267)        
remote: Counting objects:   1% (3/267)        
remote: Counting objects:   2% (6/267)        
remote: Counting objects:   3% (9/267)        
remote: Counting objects:   4% (11/267)        
remote: Counting objects:   5% (14/267)        
remote: Counting objects:   6% (17/267)        
remote: Counting objects:   7% (19/267)        
remote: Counting objects:   8% (22/267)        
remote: Counting objects:   9% (25/267)        
remote: Counting objects:  10% (27/267)        
remote: Counting objects:  11% (30/267)        
remote: Counting objects:  12% (33/267)        
remote: Counting objects:  13% (35/267)        
remote: Counting objects:  14% (38/267)        
remote: Counting objects:  15% (41/267)        
remote: Counting objects:  16% (43/267)        
remote: Counting objects:  17% (46/267)        
remote: Counting objects:  18% (49/267)        
remote: Counting objects:  19% (51/267)        
remote: Counting objects:  20% (54/267)        
remote: Counting objects:  21% (57/267)        
remote: Counting objects:  22% (59/267)        
remote: Counting objects:  23% (62/267)        
remote: Counting objects:  24% (65/267)        
remote: Counting objects:  25% (67/267)        
remote: Counting objects:  26% (70/267)        
remote: Counting objects:  27% (73/267)        
remote: Counting objects:  28% (75/267)        
remote: Counting objects:  29% (78/267)        
remote: Counting objects:  30% (81/267)        
remote: Counting objects:  31% (83/267)        
remote: Counting objects:  32% (86/267)        
remote: Counting objects:  33% (89/267)        
remote: Counting objects:  34% (91/267)        
remote: Counting objects:  35% (94/267)        
remote: Counting objects:  36% (97/267)        
remote: Counting objects:  37% (99/267)        
remote: Counting objects:  38% (102/267)        
remote: Counting objects:  39% (105/267)        
remote: Counting objects:  40% (107/267)        
remote: Counting objects:  41% (110/267)        
remote: Counting objects:  42% (113/267)        
remote: Counting objects:  43% (115/267)        
remote: Counting objects:  44% (118/267)        
remote: Counting objects:  45% (121/267)        
remote: Counting objects:  46% (123/267)        
remote: Counting objects:  47% (126/267)        
remote: Counting objects:  48% (129/267)        
remote: Counting objects:  49% (131/267)        
remote: Counting objects:  50% (134/267)        
remote: Counting objects:  51% (137/267)        
remote: Counting objects:  52% (139/267)        
remote: Counting objects:  53% (142/267)        
remote: Counting objects:  54% (145/267)        
remote: Counting objects:  55% (147/267)        
remote: Counting objects:  56% (150/267)        
remote: Counting objects:  57% (153/267)        
remote: Counting objects:  58% (155/267)        
remote: Counting objects:  59% (158/267)        
remote: Counting objects:  60% (161/267)        
remote: Counting objects:  61% (163/267)        
remote: Counting objects:  62% (166/267)        
remote: Counting objects:  63% (169/267)        
remote: Counting objects:  64% (171/267)        
remote: Counting objects:  65% (174/267)        
remote: Counting objects:  66% (177/267)        
remote: Counting objects:  67% (179/267)        
remote: Counting objects:  68% (182/267)        
remote: Counting objects:  69% (185/267)        
remote: Counting objects:  70% (187/267)        
remote: Counting objects:  71% (190/267)        
remote: Counting objects:  72% (193/267)        
remote: Counting objects:  73% (195/267)        
remote: Counting objects:  74% (198/267)        
remote: Counting objects:  75% (201/267)        
remote: Counting objects:  76% (203/267)        
remote: Counting objects:  77% (206/267)        
remote: Counting objects:  78% (209/267)        
remote: Counting objects:  79% (211/267)        
remote: Counting objects:  80% (214/267)        
remote: Counting objects:  81% (217/267)        
remote: Counting objects:  82% (219/267)        
remote: Counting objects:  83% (222/267)        
remote: Counting objects:  84% (225/267)        
remote: Counting objects:  85% (227/267)        
remote: Counting objects:  86% (230/267)        
remote: Counting objects:  87% (233/267)        
remote: Counting objects:  88% (235/267)        
remote: Counting objects:  89% (238/267)        
remote: Counting objects:  90% (241/267)        
remote: Counting objects:  91% (243/267)        
remote: Counting objects:  92% (246/267)        
remote: Counting objects:  93% (249/267)        
remote: Counting objects:  94% (251/267)        
remote: Counting objects:  95% (254/267)        
remote: Counting objects:  96% (257/267)        
remote: Counting objects:  97% (259/267)        
remote: Counting objects:  98% (262/267)        
remote: Counting objects:  99% (265/267)        
remote: Counting objects: 100% (267/267)        
remote: Counting objects: 100% (267/267), done.        
 remote: Compressing objects:   1% (1/96)        
remote: Compressing objects:   2% (2/96)        
remote: Compressing objects:   3% (3/96)        
remote: Compressing objects:   4% (4/96)        
remote: Compressing objects:   5% (5/96)        
remote: Compressing objects:   6% (6/96)        
remote: Compressing objects:   7% (7/96)        
remote: Compressing objects:   8% (8/96)        
remote: Compressing objects:   9% (9/96)        
remote: Compressing objects:  10% (10/96)        
remote: Compressing objects:  11% (11/96)        
remote: Compressing objects:  12% (12/96)        
remote: Compressing objects:  13% (13/96)        
remote: Compressing objects:  14% (14/96)        
remote: Compressing objects:  15% (15/96)        
remote: Compressing objects:  16% (16/96)        
remote: Compressing objects:  17% (17/96)        
remote: Compressing objects:  18% (18/96)        
remote: Compressing objects:  19% (19/96)        
remote: Compressing objects:  20% (20/96)        
remote: Compressing objects:  21% (21/96)        
remote: Compressing objects:  22% (22/96)        
remote: Compressing objects:  23% (23/96)        
remote: Compressing objects:  25% (24/96)        
remote: Compressing objects:  26% (25/96)        
remote: Compressing objects:  27% (26/96)        
remote: Compressing objects:  28% (27/96)        
remote: Compressing objects:  29% (28/96)        
remote: Compressing objects:  30% (29/96)        
remote: Compressing objects:  31% (30/96)        
remote: Compressing objects:  32% (31/96)        
remote: Compressing objects:  33% (32/96)        
remote: Compressing objects:  34% (33/96)        
remote: Compressing objects:  35% (34/96)        
remote: Compressing objects:  36% (35/96)        
remote: Compressing objects:  37% (36/96)        
remote: Compressing objects:  38% (37/96)        
remote: Compressing objects:  39% (38/96)        
remote: Compressing objects:  40% (39/96)        
remote: Compressing objects:  41% (40/96)        
remote: Compressing objects:  42% (41/96)        
remote: Compressing objects:  43% (42/96)        
remote: Compressing objects:  44% (43/96)        
remote: Compressing objects:  45% (44/96)        
remote: Compressing objects:  46% (45/96)        
remote: Compressing objects:  47% (46/96)        
remote: Compressing objects:  48% (47/96)        
remote: Compressing objects:  50% (48/96)        
remote: Compressing objects:  51% (49/96)        
remote: Compressing objects:  52% (50/96)        
remote: Compressing objects:  53% (51/96)        
remote: Compressing objects:  54% (52/96)        
remote: Compressing objects:  55% (53/96)        
remote: Compressing objects:  56% (54/96)        
remote: Compressing objects:  57% (55/96)        
remote: Compressing objects:  58% (56/96)        
remote: Compressing objects:  59% (57/96)        
remote: Compressing objects:  60% (58/96)        
remote: Compressing objects:  61% (59/96)        
remote: Compressing objects:  62% (60/96)        
remote: Compressing objects:  63% (61/96)        
remote: Compressing objects:  64% (62/96)        
remote: Compressing objects:  65% (63/96)        
remote: Compressing objects:  66% (64/96)        
remote: Compressing objects:  67% (65/96)        
remote: Compressing objects:  68% (66/96)        
remote: Compressing objects:  69% (67/96)        
remote: Compressing objects:  70% (68/96)        
remote: Compressing objects:  71% (69/96)        
remote: Compressing objects:  72% (70/96)        
remote: Compressing objects:  73% (71/96)        
remote: Compressing objects:  75% (72/96)        
remote: Compressing objects:  76% (73/96)        
remote: Compressing objects:  77% (74/96)        
remote: Compressing objects:  78% (75/96)        
remote: Compressing objects:  79% (76/96)        
remote: Compressing objects:  80% (77/96)        
remote: Compressing objects:  81% (78/96)        
remote: Compressing objects:  82% (79/96)        
remote: Compressing objects:  83% (80/96)        
remote: Compressing objects:  84% (81/96)        
remote: Compressing objects:  85% (82/96)        
remote: Compressing objects:  86% (83/96)        
remote: Compressing objects:  87% (84/96)        
remote: Compressing objects:  88% (85/96)        
remote: Compressing objects:  89% (86/96)        
remote: Compressing objects:  90% (87/96)        
remote: Compressing objects:  91% (88/96)        
remote: Compressing objects:  92% (89/96)        
remote: Compressing objects:  93% (90/96)        
remote: Compressing objects:  94% (91/96)        
remote: Compressing objects:  95% (92/96)        
remote: Compressing objects:  96% (93/96)        
remote: Compressing objects:  97% (94/96)        
remote: Compressing objects:  98% (95/96)        
remote: Compressing objects: 100% (96/96)        
remote: Compressing objects: 100% (96/96), done.        
-Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
remote: Total 267 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)        
-Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.47 KiB | 328.00 KiB/s, done.
-Resolving deltas:   0% (0/2)
Resolving deltas:  50% (1/2)
Resolving deltas: 100% (2/2)
Resolving deltas: 100% (2/2), done.
-keep	42424f5c5773e13b8d712a1ba00f22d6ab3c992c
+Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
+Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.41 KiB | 358.00 KiB/s, done.
+Resolving deltas:   0% (0/3)
Resolving deltas:  33% (1/3)
Resolving deltas:  66% (2/3)
Resolving deltas: 100% (3/3)
Resolving deltas: 100% (3/3), done.
+keep	af36a4e38ad65488701370467da12a1dc50c78d3
 70125409534829fdfcb67d82de93f86282574cb4 HEAD
 f85e353c1b377970afbb804118d9135948598eea refs/heads/A
 70125409534829fdfcb67d82de93f86282574cb4 refs/heads/B
@@ -364379,7 +365220,7 @@
 	test_cmp expected actual &&
 	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
 
-{"event":"data_json","sid":"20260419T192139.467771Z-H8d819085-P001f803b/20260419T192139.508258Z-H8d819085-P001f804d","thread":"main","time":"2026-04-19T19:21:39.512080Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.004030,"t_rel":0.004030,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":1,"wants":1,"want-refs":0,"depth":0,"shallows":1,"deepen-since":true,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20250317T132444.923793Z-H5c947e1c-P003227e1/20250317T132444.955663Z-H5c947e1c-P003227f1","thread":"main","time":"2025-03-17T13:24:44.973797Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.018329,"t_rel":0.018329,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":1,"wants":1,"want-refs":0,"depth":0,"shallows":1,"deepen-since":true,"deepen-not":0,"deepen-relative":false,"filter":null}}
 ok 363 - fetch shallow since ...
 
 expecting success of 5500.364 'clone shallow since selects no commits': 
@@ -364682,7 +365523,7 @@
 remote: Counting objects:  50% (1/2)        
remote: Counting objects: 100% (2/2)        
remote: Counting objects: 100% (2/2), done.        
 remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
-{"event":"data_json","sid":"20260419T192144.889925Z-H8d819085-P001f90a2/20260419T192144.911616Z-H8d819085-P001f90b1","thread":"main","time":"2026-04-19T19:21:44.922975Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.011559,"t_rel":0.011559,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":"blob:limit"}}
+{"event":"data_json","sid":"20250317T132451.806179Z-H5c947e1c-P0032397d/20250317T132451.822082Z-H5c947e1c-P00323989","thread":"main","time":"2025-03-17T13:24:51.841375Z","file":"upload-pack.c","line":1606,"repo":0,"t_abs":0.019511,"t_rel":0.019511,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":0,"wants":1,"want-refs":0,"depth":0,"shallows":0,"deepen-since":false,"deepen-not":0,"deepen-relative":false,"filter":"blob:limit"}}
 ok 374 - filtering by size
 
 expecting success of 5500.375 'filtering by size has no effect if support for it is not advertised': 
@@ -364747,902 +365588,6 @@
 1..376
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5582-fetch-negative-refspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.git/
-expecting success of 5582.1 'setup': 
-	echo >file original &&
-	git add file &&
-	git commit -a -m original
-
-[main (root-commit) 7fb3fb8] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5582.2 'clone and setup child repos': 
-	git clone . one &&
-	(
-		cd one &&
-		echo >file updated by one &&
-		git commit -a -m "updated by one" &&
-		git switch -c alternate &&
-		echo >file updated again by one &&
-		git commit -a -m "updated by one again" &&
-		git switch main
-	) &&
-	git clone . two &&
-	(
-		cd two &&
-		git config branch.main.remote one &&
-		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
-		git config --add remote.one.fetch ^refs/heads/alternate
-	) &&
-	git clone . three
-
-Cloning into 'one'...
-done.
-[main ffc8fdd] updated by one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'alternate'
-[alternate 8a3fcb7] updated by one again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 1 commit.
-  (use "git push" to publish your local commits)
-Cloning into 'two'...
-done.
-Cloning into 'three'...
-done.
-ok 2 - clone and setup child repos
-
-expecting success of 5582.3 'fetch one': 
-	echo >file updated by origin &&
-	git commit -a -m "updated by origin" &&
-	(
-		cd two &&
-		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
-		git fetch one &&
-		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
-		git rev-parse --verify refs/remotes/one/main &&
-		mine=$(git rev-parse refs/remotes/one/main) &&
-		his=$(cd ../one && git rev-parse refs/heads/main) &&
-		test "z$mine" = "z$his"
-	)
-
-[main 76a8623] updated by origin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-From ../one/
- * [new branch]      main       -> one/main
-fatal: Needed a single revision
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 3 - fetch one
-
-expecting success of 5582.4 'fetch with negative refspec on commandline': 
-	echo >file updated by origin again &&
-	git commit -a -m "updated by origin again" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		echo $alternate_in_one >expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main c0ae31c] updated by origin again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      alternate  -> one/alternate
-ok 4 - fetch with negative refspec on commandline
-
-expecting success of 5582.5 'fetch with negative sha1 refspec fails': 
-	echo >file updated by origin yet again &&
-	git commit -a -m "updated by origin yet again" &&
-	(
-		cd three &&
-		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
-		test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
-	)
-
-[main e30c41c] updated by origin yet again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: invalid refspec '^ffc8fdde31e0177ad02216ab27bb483fc88169f2'
-ok 5 - fetch with negative sha1 refspec fails
-
-expecting success of 5582.6 'fetch with negative pattern refspec': 
-	echo >file updated by origin once more &&
-	git commit -a -m "updated by origin once more" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		echo $alternate_in_one >expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main c5395f8] updated by origin once more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - fetch with negative pattern refspec
-
-expecting success of 5582.7 'fetch with negative pattern refspec does not expand prefix': 
-	echo >file updated by origin another time &&
-	git commit -a -m "updated by origin another time" &&
-	(
-		cd three &&
-		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
-		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
-		echo $alternate_in_one >expect &&
-		echo $main_in_one >>expect &&
-		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
-		cut -f -1 .git/FETCH_HEAD >actual &&
-		test_cmp expect actual
-	)
-
-[main b3d452f] updated by origin another time
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      main       -> one/main
-ok 7 - fetch with negative pattern refspec does not expand prefix
-
-expecting success of 5582.8 'fetch with negative refspec avoids duplicate conflict': 
-	(
-		cd one &&
-		git branch dups/a &&
-		git branch dups/b &&
-		git branch dups/c &&
-		git branch other/a &&
-		git rev-parse --verify refs/heads/other/a >../expect &&
-		git rev-parse --verify refs/heads/dups/b >>../expect &&
-		git rev-parse --verify refs/heads/dups/c >>../expect
-	) &&
-	(
-		cd three &&
-		git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
-		git rev-parse --verify refs/dups/a >../actual &&
-		git rev-parse --verify refs/dups/b >>../actual &&
-		git rev-parse --verify refs/dups/c >>../actual
-	) &&
-	test_cmp expect actual
-
-From ../one/
- * [new branch]      dups/b     -> refs/dups/b
- * [new branch]      dups/c     -> refs/dups/c
- * [new branch]      other/a    -> refs/dups/a
-ok 8 - fetch with negative refspec avoids duplicate conflict
-
-expecting success of 5582.9 'push --prune with negative refspec': 
-	(
-		cd two &&
-		git branch prune/a &&
-		git branch prune/b &&
-		git branch prune/c &&
-		git push ../three refs/heads/prune/* &&
-		git branch -d prune/a &&
-		git branch -d prune/b &&
-		git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
-		test_cmp expect actual
-	)
-
-To ../three
- * [new branch]      prune/a -> prune/a
- * [new branch]      prune/b -> prune/b
- * [new branch]      prune/c -> prune/c
-Deleted branch prune/a (was 7fb3fb8).
-Deleted branch prune/b (was 7fb3fb8).
-To ../three
- - [deleted]         prune/a
-ok 9 - push --prune with negative refspec
-
-expecting success of 5582.10 'push --prune with negative refspec apply to the destination': 
-	(
-		cd two &&
-		git branch ours/a &&
-		git branch ours/b &&
-		git branch ours/c &&
-		git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
-		git branch -d ours/a &&
-		git branch -d ours/b &&
-		git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
-		test_cmp expect actual
-	)
-
-To ../three
- * [new branch]      ours/a -> theirs/a
- * [new branch]      ours/b -> theirs/b
- * [new branch]      ours/c -> theirs/c
-Deleted branch ours/a (was 7fb3fb8).
-Deleted branch ours/b (was 7fb3fb8).
-To ../three
- - [deleted]         theirs/a
-ok 10 - push --prune with negative refspec apply to the destination
-
-expecting success of 5582.11 'fetch --prune with negative refspec': 
-	(
-		cd two &&
-		git branch fetch/a &&
-		git branch fetch/b &&
-		git branch fetch/c
-	) &&
-	(
-		cd three &&
-		git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
-	) &&
-	(
-		cd two &&
-		git branch -d fetch/a &&
-		git branch -d fetch/b
-	) &&
-	(
-		cd three &&
-		test_write_lines b c >expect &&
-		git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
-		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
-		test_cmp expect actual
-	)
-
-From ../two/
- * [new branch]      fetch/a    -> copied/a
- * [new branch]      fetch/b    -> copied/b
- * [new branch]      fetch/c    -> copied/c
-Deleted branch fetch/a (was 7fb3fb8).
-Deleted branch fetch/b (was 7fb3fb8).
-From ../two/
- - [deleted]         (none)     -> copied/a
- = [up to date]      fetch/c    -> copied/c
-ok 11 - fetch --prune with negative refspec
-
-expecting success of 5582.12 'push with matching : and negative refspec': 
-	# Manually handle cleanup, since test_config is not
-	# prepared to take arbitrary options like --add
-	test_when_finished "test_unconfig -C two remote.one.push" &&
-
-	# For convenience, we use "master" to refer to the name of
-	# the branch created by default in the following.
-	#
-	# Repositories two and one have branches other than "master"
-	# but they have no overlap---"master" is the only one that
-	# is shared between them.  And the master branch at two is
-	# behind the master branch at one by one commit.
-	git -C two config --add remote.one.push : &&
-
-	# A matching push tries to update master, fails due to non-ff
-	test_must_fail git -C two push one &&
-
-	# "master" may actually not be "master"---find it out.
-	current=$(git symbolic-ref HEAD) &&
-
-	# If master is in negative refspec, then the command will not attempt
-	# to push and succeed.
-	git -C two config --add remote.one.push "^$current" &&
-
-	# With "master" excluded, this push is a no-op.  Nothing gets
-	# pushed and it succeeds.
-	git -C two push -v one
-
-To ../one/.git/
- ! [rejected]        main -> main (non-fast-forward)
-error: failed to push some refs to '../one/.git/'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. If you want to integrate the remote changes,
-hint: use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-Pushing to ../one/.git/
-Everything up-to-date
-ok 12 - push with matching : and negative refspec
-
-expecting success of 5582.13 'push with matching +: and negative refspec': 
-	test_when_finished "test_unconfig -C two remote.one.push" &&
-
-	# The same set-up as above, whose side-effect was a no-op.
-	git -C two config --add remote.one.push +: &&
-
-	# The push refuses to update the "master" branch that is checked
-	# out in the "one" repository, even when it is forced with +:
-	test_must_fail git -C two push one &&
-
-	# "master" may actually not be "master"---find it out.
-	current=$(git symbolic-ref HEAD) &&
-
-	# If master is in negative refspec, then the command will not attempt
-	# to push and succeed
-	git -C two config --add remote.one.push "^$current" &&
-
-	# With "master" excluded, this push is a no-op.  Nothing gets
-	# pushed and it succeeds.
-	git -C two push -v one
-
-remote: error: refusing to update checked out branch: refs/heads/main        
-remote: error: By default, updating the current branch in a non-bare repository        
-remote: is denied, because it will make the index and work tree inconsistent        
-remote: with what you pushed, and will require 'git reset --hard' to match        
-remote: the work tree to HEAD.        
-remote: 
-remote: You can set the 'receive.denyCurrentBranch' configuration variable        
-remote: to 'ignore' or 'warn' in the remote repository to allow pushing into        
-remote: its current branch; however, this is not recommended unless you        
-remote: arranged to update its work tree to match what you pushed in some        
-remote: other way.        
-remote: 
-remote: To squelch this message and still keep the default behaviour, set        
-remote: 'receive.denyCurrentBranch' configuration variable to 'refuse'.        
-To ../one/.git/
- ! [remote rejected] main -> main (branch is currently checked out)
-error: failed to push some refs to '../one/.git/'
-Pushing to ../one/.git/
-Everything up-to-date
-ok 13 - push with matching +: and negative refspec
-
-expecting success of 5582.14 '--prefetch correctly modifies refspecs': 
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
-	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
-	git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
-
-	git tag -a -m never never-fetch-tag HEAD &&
-
-	git branch bogus/fetched HEAD~1 &&
-	git branch bogus/ignore HEAD &&
-
-	git -C one fetch --prefetch --no-tags &&
-	test_must_fail git -C one rev-parse never-fetch-tag &&
-	git -C one rev-parse refs/prefetch/bogus/fetched &&
-	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
-
-	# correctly handle when refspec set becomes empty
-	# after removing the refs/tags/* refspec.
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
-
-	git -C one fetch --prefetch --no-tags &&
-	test_must_fail git -C one rev-parse never-fetch-tag &&
-
-	# The refspec for refs that are not fully qualified
-	# are filtered multiple times.
-	git -C one rev-parse refs/prefetch/bogus/fetched &&
-	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
-
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.
- * branch            main          -> FETCH_HEAD
- * [new branch]      bogus/fetched -> refs/prefetch/bogus/fetched
-fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-never-fetch-tag
-c5395f864a4757fc219a4848a19568f14918687f
-fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/prefetch/bogus/ignore
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5582-fetch-negative-refspec/.
- * branch            main       -> FETCH_HEAD
-fatal: ambiguous argument 'never-fetch-tag': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-never-fetch-tag
-c5395f864a4757fc219a4848a19568f14918687f
-fatal: ambiguous argument 'refs/prefetch/bogus/ignore': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/prefetch/bogus/ignore
-ok 14 - --prefetch correctly modifies refspecs
-
-expecting success of 5582.15 '--prefetch succeeds when refspec becomes empty': 
-	git checkout bogus/fetched &&
-	test_commit extra &&
-
-	git -C one config --unset-all remote.origin.fetch &&
-	git -C one config --unset branch.main.remote &&
-	git -C one config remote.origin.fetch "+refs/tags/extra" &&
-	git -C one config remote.origin.skipfetchall true &&
-	git -C one config remote.origin.tagopt "--no-tags" &&
-
-	git -C one fetch --prefetch
-
-Switched to branch 'bogus/fetched'
-[bogus/fetched 8d8169a] extra
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-ok 15 - --prefetch succeeds when refspec becomes empty
-
-expecting success of 5582.16 '--prefetch succeeds with empty command line refspec': 
-	git -C one fetch --prefetch origin +refs/tags/extra
-
-ok 16 - --prefetch succeeds with empty command line refspec
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5574-fetch-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/.git/
-expecting success of 5574.1 'fetch with invalid output format configuration': 
-	test_when_finished "rm -rf clone" &&
-	git clone . clone &&
-
-	test_must_fail git -C clone -c fetch.output fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	error: missing value for ${SQ}fetch.output${SQ}
-	fatal: unable to parse ${SQ}fetch.output${SQ} from command-line config
-	EOF
-	test_cmp expect actual.err &&
-
-	test_must_fail git -C clone -c fetch.output= fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}${SQ}
-	EOF
-	test_cmp expect actual.err &&
-
-	test_must_fail git -C clone -c fetch.output=garbage fetch origin 2>actual.err &&
-	cat >expect <<-EOF &&
-	fatal: invalid value for ${SQ}fetch.output${SQ}: ${SQ}garbage${SQ}
-	EOF
-	test_cmp expect actual.err
-
-Cloning into 'clone'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - fetch with invalid output format configuration
-
-expecting success of 5574.2 'fetch aligned output': 
-	git clone . full-output &&
-	test_commit looooooooooooong-tag &&
-	(
-		cd full-output &&
-		git -c fetch.output=full fetch origin >actual 2>&1 &&
-		grep -e "->" actual | cut -c 22- >../actual
-	) &&
-	cat >expect <<-\EOF &&
-	main                 -> origin/main
-	looooooooooooong-tag -> looooooooooooong-tag
-	EOF
-	test_cmp expect actual
-
-Cloning into 'full-output'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) c62a462] looooooooooooong-tag
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 looooooooooooong-tag.t
-ok 2 - fetch aligned output
-
-expecting success of 5574.3 'fetch compact output': 
-	git clone . compact &&
-	test_commit extraaa &&
-	(
-		cd compact &&
-		git -c fetch.output=compact fetch origin >actual 2>&1 &&
-		grep -e "->" actual | cut -c 22- >../actual
-	) &&
-	cat >expect <<-\EOF &&
-	main       -> origin/*
-	extraaa    -> *
-	EOF
-	test_cmp expect actual
-
-Cloning into 'compact'...
-done.
-[main 7229363] extraaa
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extraaa.t
-ok 3 - fetch compact output
-
-expecting success of 5574.4 'setup for fetch porcelain output': 
-	# Set up a bunch of references that we can use to demonstrate different
-	# kinds of flag symbols in the output format.
-	test_commit commit-for-porcelain-output &&
-	MAIN_OLD=$(git rev-parse HEAD) &&
-	git branch "fast-forward" &&
-	git branch "deleted-branch" &&
-	git checkout -b force-updated &&
-	test_commit --no-tag force-update-old &&
-	FORCE_UPDATED_OLD=$(git rev-parse HEAD) &&
-	git checkout main &&
-
-	# Backup to preseed.git
-	git clone --mirror . preseed.git &&
-
-	# Continue changing our local references.
-	git branch new-branch &&
-	git branch -d deleted-branch &&
-	git checkout fast-forward &&
-	test_commit --no-tag fast-forward-new &&
-	FAST_FORWARD_NEW=$(git rev-parse HEAD) &&
-	git checkout force-updated &&
-	git reset --hard HEAD~ &&
-	test_commit --no-tag force-update-new &&
-	FORCE_UPDATED_NEW=$(git rev-parse HEAD)
-
-[main 4755660] commit-for-porcelain-output
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-porcelain-output.t
-Switched to a new branch 'force-updated'
-[force-updated 9969fa4] force-update-old
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-update-old.t
-Switched to branch 'main'
-Cloning into bare repository 'preseed.git'...
-done.
-Deleted branch deleted-branch (was 4755660).
-Switched to branch 'fast-forward'
-[fast-forward 6181e78] fast-forward-new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fast-forward-new.t
-Switched to branch 'force-updated'
-HEAD is now at 4755660 commit-for-porcelain-output
-[force-updated 7157201] force-update-new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 force-update-new.t
-ok 4 - setup for fetch porcelain output
-
-expecting success of 5574.5 'fetch porcelain output ': 
-		test_when_finished "rm -rf porcelain" &&
-
-		# Clone and pre-seed the repositories. We fetch references into two
-		# namespaces so that we can test that rejected and force-updated
-		# references are reported properly.
-		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
-		git clone preseed.git porcelain &&
-		git -C porcelain fetch origin $opt $refspecs &&
-
-		cat >expect <<-EOF &&
-		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
-		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
-		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
-		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
-		EOF
-
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
-
-		# Execute a dry-run fetch first. We do this to assert that the dry-run
-		# and non-dry-run fetches produces the same output. Execution of the
-		# fetch is expected to fail as we have a rejected reference update.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --dry-run --prune origin $refspecs >actual &&
-		test_cmp expect actual &&
-
-		# And now we perform a non-dry-run fetch.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --prune origin $refspecs >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_must_be_empty stderr
-	
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/preseed
- * [new branch]      deleted-branch -> refs/unforced/deleted-branch
- * [new branch]      fast-forward   -> refs/unforced/fast-forward
- * [new branch]      force-updated  -> refs/unforced/force-updated
- * [new branch]      main           -> refs/unforced/main
- * [new branch]      deleted-branch -> refs/forced/deleted-branch
- * [new branch]      fast-forward   -> refs/forced/fast-forward
- * [new branch]      force-updated  -> refs/forced/force-updated
- * [new branch]      main           -> refs/forced/main
-ok 5 - fetch porcelain output 
-
-expecting success of 5574.6 'fetch porcelain output (atomic)': 
-		test_when_finished "rm -rf porcelain" &&
-
-		# Clone and pre-seed the repositories. We fetch references into two
-		# namespaces so that we can test that rejected and force-updated
-		# references are reported properly.
-		refspecs="refs/heads/*:refs/unforced/* +refs/heads/*:refs/forced/*" &&
-		git clone preseed.git porcelain &&
-		git -C porcelain fetch origin $opt $refspecs &&
-
-		cat >expect <<-EOF &&
-		- $MAIN_OLD $ZERO_OID refs/forced/deleted-branch
-		- $MAIN_OLD $ZERO_OID refs/unforced/deleted-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/unforced/fast-forward
-		! $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/unforced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/unforced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/forced/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/forced/force-updated
-		* $ZERO_OID $MAIN_OLD refs/forced/new-branch
-		  $MAIN_OLD $FAST_FORWARD_NEW refs/remotes/origin/fast-forward
-		+ $FORCE_UPDATED_OLD $FORCE_UPDATED_NEW refs/remotes/origin/force-updated
-		* $ZERO_OID $MAIN_OLD refs/remotes/origin/new-branch
-		EOF
-
-		# Change the URL of the repository to fetch different references.
-		git -C porcelain remote set-url origin .. &&
-
-		# Execute a dry-run fetch first. We do this to assert that the dry-run
-		# and non-dry-run fetches produces the same output. Execution of the
-		# fetch is expected to fail as we have a rejected reference update.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --dry-run --prune origin $refspecs >actual &&
-		test_cmp expect actual &&
-
-		# And now we perform a non-dry-run fetch.
-		test_must_fail git -C porcelain fetch $opt \
-			--porcelain --prune origin $refspecs >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_must_be_empty stderr
-	
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/preseed
- * [new branch]      deleted-branch -> refs/unforced/deleted-branch
- * [new branch]      fast-forward   -> refs/unforced/fast-forward
- * [new branch]      force-updated  -> refs/unforced/force-updated
- * [new branch]      main           -> refs/unforced/main
- * [new branch]      deleted-branch -> refs/forced/deleted-branch
- * [new branch]      fast-forward   -> refs/forced/fast-forward
- * [new branch]      force-updated  -> refs/forced/force-updated
- * [new branch]      main           -> refs/forced/main
-ok 6 - fetch porcelain output (atomic)
-
-expecting success of 5574.7 'fetch porcelain with multiple remotes': 
-	test_when_finished "rm -rf porcelain" &&
-
-	git switch --create multiple-remotes &&
-	git clone . porcelain &&
-	git -C porcelain remote add second-remote "$PWD" &&
-	git -C porcelain fetch second-remote &&
-
-	test_commit --no-tag multi-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/multiple-remotes
-	  $old_commit $new_commit refs/remotes/second-remote/multiple-remotes
-	EOF
-
-	git -C porcelain fetch --porcelain --all >actual 2>stderr &&
-	test_cmp expect actual &&
-	test_must_be_empty stderr
-
-Switched to a new branch 'multiple-remotes'
-Cloning into 'porcelain'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output
- * [new branch]      fast-forward     -> second-remote/fast-forward
- * [new branch]      force-updated    -> second-remote/force-updated
- * [new branch]      main             -> second-remote/main
- * [new branch]      multiple-remotes -> second-remote/multiple-remotes
- * [new branch]      new-branch       -> second-remote/new-branch
-[multiple-remotes 9d09634] multi-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 multi-commit.t
-ok 7 - fetch porcelain with multiple remotes
-
-expecting success of 5574.8 'fetch porcelain refuses to work with submodules': 
-	test_when_finished "rm -rf porcelain" &&
-
-	cat >expect <<-EOF &&
-	fatal: options ${SQ}--porcelain${SQ} and ${SQ}--recurse-submodules${SQ} cannot be used together
-	EOF
-
-	git init porcelain &&
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=yes 2>stderr &&
-	test_cmp expect stderr &&
-
-	test_must_fail git -C porcelain fetch --porcelain --recurse-submodules=on-demand 2>stderr &&
-	test_cmp expect stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/porcelain/.git/
-ok 8 - fetch porcelain refuses to work with submodules
-
-expecting success of 5574.9 'fetch porcelain overrides fetch.output config': 
-	test_when_finished "rm -rf porcelain" &&
-
-	git switch --create config-override &&
-	git clone . porcelain &&
-	test_commit new-commit &&
-	old_commit=$(git rev-parse HEAD~) &&
-	new_commit=$(git rev-parse HEAD) &&
-
-	cat >expect <<-EOF &&
-	  $old_commit $new_commit refs/remotes/origin/config-override
-	* $ZERO_OID $new_commit refs/tags/new-commit
-	EOF
-
-	git -C porcelain -c fetch.output=compact fetch --porcelain >stdout 2>stderr &&
-	test_must_be_empty stderr &&
-	test_cmp expect stdout
-
-Switched to a new branch 'config-override'
-Cloning into 'porcelain'...
-done.
-[config-override ead9d61] new-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-commit.t
-ok 9 - fetch porcelain overrides fetch.output config
-
-expecting success of 5574.10 'fetch --no-porcelain overrides previous --porcelain': 
-	test_when_finished "rm -rf no-porcelain" &&
-
-	git switch --create no-porcelain &&
-	git clone . no-porcelain &&
-	test_commit --no-tag no-porcelain &&
-	old_commit=$(git rev-parse --short HEAD~) &&
-	new_commit=$(git rev-parse --short HEAD) &&
-
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	   $old_commit..$new_commit  no-porcelain -> origin/no-porcelain
-	EOF
-
-	git -C no-porcelain fetch --porcelain --no-porcelain >stdout 2>stderr &&
-	test_cmp expect stderr &&
-	test_must_be_empty stdout
-
-Switched to a new branch 'no-porcelain'
-Cloning into 'no-porcelain'...
-done.
-[no-porcelain cf8719e] no-porcelain
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-porcelain.t
-ok 10 - fetch --no-porcelain overrides previous --porcelain
-
-expecting success of 5574.11 'fetch output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
-
-	git -C head fetch --dry-run origin HEAD >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * branch            HEAD       -> FETCH_HEAD
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch origin HEAD >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch --dry-run origin HEAD:foo >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * [new ref]         HEAD       -> foo
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C head fetch origin HEAD:foo >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err
-
-Cloning into 'head'...
-done.
-ok 11 - fetch output with HEAD
-
-expecting success of 5574.12 'fetch porcelain output with HEAD': 
-	test_when_finished "rm -rf head" &&
-	git clone . head &&
-	COMMIT_ID=$(git rev-parse HEAD) &&
-
-	git -C head fetch --porcelain --dry-run origin HEAD >actual &&
-	cat >expect <<-EOF &&
-	* $ZERO_OID $COMMIT_ID FETCH_HEAD
-	EOF
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain origin HEAD >actual &&
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain --dry-run origin HEAD:foo >actual &&
-	cat >expect <<-EOF &&
-	* $ZERO_OID $COMMIT_ID refs/heads/foo
-	EOF
-	test_cmp expect actual &&
-
-	git -C head fetch --porcelain origin HEAD:foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'head'...
-done.
-ok 12 - fetch porcelain output with HEAD
-
-expecting success of 5574.13 'fetch output with object ID': 
-	test_when_finished "rm -rf object-id" &&
-	git clone . object-id &&
-	commit=$(git rev-parse HEAD) &&
-
-	git -C object-id fetch --dry-run origin $commit:object-id >actual.out 2>actual.err &&
-	cat >expect <<-EOF &&
-	From $(test-tool path-utils real_path .)/.
-	 * [new ref]         $commit -> object-id
-	EOF
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err &&
-
-	git -C object-id fetch origin $commit:object-id >actual.out 2>actual.err &&
-	test_must_be_empty actual.out &&
-	test_cmp expect actual.err
-
-Cloning into 'object-id'...
-done.
-ok 13 - fetch output with object ID
-
-expecting success of 5574.14 '--no-show-forced-updates': 
-	mkdir forced-updates &&
-	(
-		cd forced-updates &&
-		git init &&
-		test_commit 1 &&
-		test_commit 2
-	) &&
-	git clone forced-updates forced-update-clone &&
-	git clone forced-updates no-forced-update-clone &&
-	git -C forced-updates reset --hard HEAD~1 &&
-	(
-		cd forced-update-clone &&
-		git fetch --show-forced-updates origin 2>output &&
-		test_grep "(forced update)" output
-	) &&
-	(
-		cd no-forced-update-clone &&
-		git fetch --no-show-forced-updates origin 2>output &&
-		test_grep ! "(forced update)" output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5574-fetch-output/forced-updates/.git/
-[main (root-commit) 925a26a] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[main 3d049f7] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Cloning into 'forced-update-clone'...
-done.
-Cloning into 'no-forced-update-clone'...
-done.
-HEAD is now at 925a26a 1
- + 3d049f7...925a26a main       -> origin/main  (forced update)
-ok 14 - --no-show-forced-updates
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5608-clone-2gb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5608-clone-2gb/.git/
-1..0 # SKIP expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5603-clone-dirname.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5603-clone-dirname/.git/
 expecting success of 5603.1 'setup ssh wrapper': 
@@ -366075,6 +366020,11 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5608-clone-2gb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5608-clone-2gb/.git/
+1..0 # SKIP expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5605-clone-local.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5605-clone-local/.git/
 expecting success of 5605.1 'preparing origin repository': 
@@ -366351,91 +366301,6 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5609-clone-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/.git/
-expecting success of 5609.1 'setup': 
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file && git commit -m one &&
-	 git checkout -b two &&
-	 echo two >file && git add file && git commit -m two &&
-	 git checkout main) &&
-	mkdir empty &&
-	(cd empty && git init)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/parent/.git/
-[main (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'two'
-[two 2f98c16] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/empty/.git/
-ok 1 - setup
-
-expecting success of 5609.2 'vanilla clone chooses HEAD': 
-	git clone parent clone &&
-	(cd clone &&
-	 check_HEAD main &&
-	 check_file one
-	)
-
-Cloning into 'clone'...
-done.
-ok 2 - vanilla clone chooses HEAD
-
-expecting success of 5609.3 'clone -b chooses specified branch': 
-	git clone -b two parent clone-two &&
-	(cd clone-two &&
-	 check_HEAD two &&
-	 check_file two
-	)
-
-Cloning into 'clone-two'...
-done.
-ok 3 - clone -b chooses specified branch
-
-expecting success of 5609.4 'clone -b sets up tracking': 
-	(cd clone-two &&
-	 echo origin >expect &&
-	 git config branch.two.remote >actual &&
-	 echo refs/heads/two >>expect &&
-	 git config branch.two.merge >>actual &&
-	 test_cmp expect actual
-	)
-
-ok 4 - clone -b sets up tracking
-
-expecting success of 5609.5 'clone -b does not munge remotes/origin/HEAD': 
-	(cd clone-two &&
-	 echo refs/remotes/origin/main >expect &&
-	 git symbolic-ref refs/remotes/origin/HEAD >actual &&
-	 test_cmp expect actual
-	)
-
-ok 5 - clone -b does not munge remotes/origin/HEAD
-
-expecting success of 5609.6 'clone -b with bogus branch': 
-	test_must_fail git clone -b bogus parent clone-bogus
-
-Cloning into 'clone-bogus'...
-fatal: Remote branch bogus not found in upstream origin
-ok 6 - clone -b with bogus branch
-
-expecting success of 5609.7 'clone -b not allowed with empty repos': 
-	test_must_fail git clone -b branch empty clone-branch-empty
-
-Cloning into 'clone-branch-empty'...
-fatal: Remote branch branch not found in upstream origin
-ok 7 - clone -b not allowed with empty repos
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5607-clone-bundle.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5607-clone-bundle/.git/
 expecting success of 5607.1 'setup': 
@@ -366735,6 +366600,91 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5609-clone-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/.git/
+expecting success of 5609.1 'setup': 
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file && git commit -m one &&
+	 git checkout -b two &&
+	 echo two >file && git add file && git commit -m two &&
+	 git checkout main) &&
+	mkdir empty &&
+	(cd empty && git init)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/parent/.git/
+[main (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'two'
+[two 2f98c16] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5609-clone-branch/empty/.git/
+ok 1 - setup
+
+expecting success of 5609.2 'vanilla clone chooses HEAD': 
+	git clone parent clone &&
+	(cd clone &&
+	 check_HEAD main &&
+	 check_file one
+	)
+
+Cloning into 'clone'...
+done.
+ok 2 - vanilla clone chooses HEAD
+
+expecting success of 5609.3 'clone -b chooses specified branch': 
+	git clone -b two parent clone-two &&
+	(cd clone-two &&
+	 check_HEAD two &&
+	 check_file two
+	)
+
+Cloning into 'clone-two'...
+done.
+ok 3 - clone -b chooses specified branch
+
+expecting success of 5609.4 'clone -b sets up tracking': 
+	(cd clone-two &&
+	 echo origin >expect &&
+	 git config branch.two.remote >actual &&
+	 echo refs/heads/two >>expect &&
+	 git config branch.two.merge >>actual &&
+	 test_cmp expect actual
+	)
+
+ok 4 - clone -b sets up tracking
+
+expecting success of 5609.5 'clone -b does not munge remotes/origin/HEAD': 
+	(cd clone-two &&
+	 echo refs/remotes/origin/main >expect &&
+	 git symbolic-ref refs/remotes/origin/HEAD >actual &&
+	 test_cmp expect actual
+	)
+
+ok 5 - clone -b does not munge remotes/origin/HEAD
+
+expecting success of 5609.6 'clone -b with bogus branch': 
+	test_must_fail git clone -b bogus parent clone-bogus
+
+Cloning into 'clone-bogus'...
+fatal: Remote branch bogus not found in upstream origin
+ok 6 - clone -b with bogus branch
+
+expecting success of 5609.7 'clone -b not allowed with empty repos': 
+	test_must_fail git clone -b branch empty clone-branch-empty
+
+Cloning into 'clone-branch-empty'...
+fatal: Remote branch branch not found in upstream origin
+ok 7 - clone -b not allowed with empty repos
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5606-clone-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5606-clone-options/.git/
 expecting success of 5606.1 'setup': 
@@ -367217,170 +367167,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5611-clone-config/.git/
-expecting success of 5611.1 'clone -c sets config in cloned repo': 
-	rm -rf child &&
-	git clone -c core.foo=bar . child &&
-	echo bar >expect &&
-	git --git-dir=child/.git config core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - clone -c sets config in cloned repo
-
-expecting success of 5611.2 'clone -c can set multi-keys': 
-	rm -rf child &&
-	git clone -c core.foo=bar -c core.foo=baz . child &&
-	test_write_lines bar baz >expect &&
-	git --git-dir=child/.git config --get-all core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 2 - clone -c can set multi-keys
-
-expecting success of 5611.3 'clone -c can set multi-keys, including some empty': 
-	rm -rf child &&
-	git clone -c credential.helper= -c credential.helper=hi . child &&
-	printf "%s\n" "" hi >expect &&
-	git --git-dir=child/.git config --get-all credential.helper >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 3 - clone -c can set multi-keys, including some empty
-
-expecting success of 5611.4 'clone -c without a value is boolean true': 
-	rm -rf child &&
-	git clone -c core.foo . child &&
-	echo true >expect &&
-	git --git-dir=child/.git config --bool core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 4 - clone -c without a value is boolean true
-
-expecting success of 5611.5 'clone -c config is available during clone': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	rm -rf child &&
-	git clone -c core.autocrlf . child &&
-	printf "content\\r\\n" >expect &&
-	test_cmp expect child/file
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'child'...
-done.
-ok 5 - clone -c config is available during clone
-
-expecting success of 5611.6 'clone -c remote.origin.fetch=<refspec> works': 
-	rm -rf child &&
-	git update-ref refs/grab/it refs/heads/main &&
-	git update-ref refs/leave/out refs/heads/main &&
-	git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 6 - clone -c remote.origin.fetch=<refspec> works
-
-expecting success of 5611.7 'git -c remote.origin.fetch=<refspec> clone works': 
-	rm -rf child &&
-	git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 7 - git -c remote.origin.fetch=<refspec> clone works
-
-expecting success of 5611.8 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>': 
-	rm -rf child &&
-	git clone --origin=upstream \
-		  -c "remote.upstream.fetch=+refs/grab/*:refs/grab/*" \
-		  -c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
-		  . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/upstream/HEAD
-	refs/remotes/upstream/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 8 - clone -c remote.<remote>.fetch=<refspec> --origin=<name>
-
-expecting success of 5611.9 'set up shallow repository': 
-	git clone --depth=1 --no-local . shallow-repo
-
-Cloning into 'shallow-repo'...
-ok 9 - set up shallow repository
-
-expecting success of 5611.10 'clone.rejectshallow=true should reject cloning shallow repo': 
-	test_when_finished "rm -rf out" &&
-	test_must_fail git -c clone.rejectshallow=true clone --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git -c clone.rejectshallow=false clone --no-local shallow-repo out
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 10 - clone.rejectshallow=true should reject cloning shallow repo
-
-expecting success of 5611.11 'option --[no-]reject-shallow override clone.rejectshallow config': 
-	test_when_finished "rm -rf out" &&
-	test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 11 - option --[no-]reject-shallow override clone.rejectshallow config
-
-expecting success of 5611.12 'clone.rejectshallow=true should succeed cloning normal repo': 
-	test_when_finished "rm -rf out" &&
-	git -c clone.rejectshallow=true clone --no-local . out
-
-Cloning into 'out'...
-ok 12 - clone.rejectshallow=true should succeed cloning normal repo
-
-ok 13 # skip clone -c core.hideDotFiles (missing MINGW)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5604-clone-reference.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5604-clone-reference/.git/
 expecting success of 5604.1 'preparing first repository': 
@@ -367918,6 +367704,170 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5611-clone-config/.git/
+expecting success of 5611.1 'clone -c sets config in cloned repo': 
+	rm -rf child &&
+	git clone -c core.foo=bar . child &&
+	echo bar >expect &&
+	git --git-dir=child/.git config core.foo >actual &&
+	test_cmp expect actual
+
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 1 - clone -c sets config in cloned repo
+
+expecting success of 5611.2 'clone -c can set multi-keys': 
+	rm -rf child &&
+	git clone -c core.foo=bar -c core.foo=baz . child &&
+	test_write_lines bar baz >expect &&
+	git --git-dir=child/.git config --get-all core.foo >actual &&
+	test_cmp expect actual
+
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 2 - clone -c can set multi-keys
+
+expecting success of 5611.3 'clone -c can set multi-keys, including some empty': 
+	rm -rf child &&
+	git clone -c credential.helper= -c credential.helper=hi . child &&
+	printf "%s\n" "" hi >expect &&
+	git --git-dir=child/.git config --get-all credential.helper >actual &&
+	test_cmp expect actual
+
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 3 - clone -c can set multi-keys, including some empty
+
+expecting success of 5611.4 'clone -c without a value is boolean true': 
+	rm -rf child &&
+	git clone -c core.foo . child &&
+	echo true >expect &&
+	git --git-dir=child/.git config --bool core.foo >actual &&
+	test_cmp expect actual
+
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 4 - clone -c without a value is boolean true
+
+expecting success of 5611.5 'clone -c config is available during clone': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+	rm -rf child &&
+	git clone -c core.autocrlf . child &&
+	printf "content\\r\\n" >expect &&
+	test_cmp expect child/file
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'child'...
+done.
+ok 5 - clone -c config is available during clone
+
+expecting success of 5611.6 'clone -c remote.origin.fetch=<refspec> works': 
+	rm -rf child &&
+	git update-ref refs/grab/it refs/heads/main &&
+	git update-ref refs/leave/out refs/heads/main &&
+	git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
+	git -C child for-each-ref --format="%(refname)" >actual &&
+
+	cat >expect <<-\EOF &&
+	refs/grab/it
+	refs/heads/main
+	refs/remotes/origin/HEAD
+	refs/remotes/origin/main
+	EOF
+	test_cmp expect actual
+
+Cloning into 'child'...
+done.
+ok 6 - clone -c remote.origin.fetch=<refspec> works
+
+expecting success of 5611.7 'git -c remote.origin.fetch=<refspec> clone works': 
+	rm -rf child &&
+	git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
+	git -C child for-each-ref --format="%(refname)" >actual &&
+
+	cat >expect <<-\EOF &&
+	refs/grab/it
+	refs/heads/main
+	refs/remotes/origin/HEAD
+	refs/remotes/origin/main
+	EOF
+	test_cmp expect actual
+
+Cloning into 'child'...
+done.
+ok 7 - git -c remote.origin.fetch=<refspec> clone works
+
+expecting success of 5611.8 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>': 
+	rm -rf child &&
+	git clone --origin=upstream \
+		  -c "remote.upstream.fetch=+refs/grab/*:refs/grab/*" \
+		  -c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
+		  . child &&
+	git -C child for-each-ref --format="%(refname)" >actual &&
+
+	cat >expect <<-\EOF &&
+	refs/grab/it
+	refs/heads/main
+	refs/remotes/upstream/HEAD
+	refs/remotes/upstream/main
+	EOF
+	test_cmp expect actual
+
+Cloning into 'child'...
+done.
+ok 8 - clone -c remote.<remote>.fetch=<refspec> --origin=<name>
+
+expecting success of 5611.9 'set up shallow repository': 
+	git clone --depth=1 --no-local . shallow-repo
+
+Cloning into 'shallow-repo'...
+ok 9 - set up shallow repository
+
+expecting success of 5611.10 'clone.rejectshallow=true should reject cloning shallow repo': 
+	test_when_finished "rm -rf out" &&
+	test_must_fail git -c clone.rejectshallow=true clone --no-local shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git -c clone.rejectshallow=false clone --no-local shallow-repo out
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'out'...
+ok 10 - clone.rejectshallow=true should reject cloning shallow repo
+
+expecting success of 5611.11 'option --[no-]reject-shallow override clone.rejectshallow config': 
+	test_when_finished "rm -rf out" &&
+	test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'out'...
+ok 11 - option --[no-]reject-shallow override clone.rejectshallow config
+
+expecting success of 5611.12 'clone.rejectshallow=true should succeed cloning normal repo': 
+	test_when_finished "rm -rf out" &&
+	git -c clone.rejectshallow=true clone --no-local . out
+
+Cloning into 'out'...
+ok 12 - clone.rejectshallow=true should succeed cloning normal repo
+
+ok 13 # skip clone -c core.hideDotFiles (missing MINGW)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5615-alternate-env.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5615-alternate-env/.git/
 expecting success of 5615.1 'create alternate repositories': 
@@ -368476,8 +368426,8 @@
 	! test_cmp expect actual &&
 	test_line_count = 2 actual
 
---- expect	2026-04-19 19:21:53.523659440 +0000
-+++ actual	2026-04-19 19:21:53.515659440 +0000
+--- expect	2025-03-17 13:25:00.534096745 +0000
++++ actual	2025-03-17 13:25:00.518096644 +0000
 @@ -1,2 +1,2 @@
  0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
 -5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
@@ -370428,6 +370378,267 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5620-backfill.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/.git/
+expecting success of 5620.1 'setup repo for object creation': 
+	echo "{print \$1}" >print_1.awk &&
+	echo "{print \$2}" >print_2.awk &&
+
+	git init src &&
+
+	mkdir -p src/a/b/c &&
+	mkdir -p src/d/e &&
+
+	for i in 1 2
+	do
+		for n in 1 2 3 4
+		do
+			echo "Version $i of file $n" > src/file.$n.txt &&
+			echo "Version $i of file a/$n" > src/a/file.$n.txt &&
+			echo "Version $i of file a/b/$n" > src/a/b/file.$n.txt &&
+			echo "Version $i of file a/b/c/$n" > src/a/b/c/file.$n.txt &&
+			echo "Version $i of file d/$n" > src/d/file.$n.txt &&
+			echo "Version $i of file d/e/$n" > src/d/e/file.$n.txt &&
+			git -C src add . &&
+			git -C src commit -m "Iteration $n" || return 1
+		done
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/src/.git/
+[main (root-commit) 3666995] Iteration 1
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 a/b/c/file.1.txt
+ create mode 100644 a/b/file.1.txt
+ create mode 100644 a/file.1.txt
+ create mode 100644 d/e/file.1.txt
+ create mode 100644 d/file.1.txt
+ create mode 100644 file.1.txt
+[main 314662f] Iteration 2
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 a/b/c/file.2.txt
+ create mode 100644 a/b/file.2.txt
+ create mode 100644 a/file.2.txt
+ create mode 100644 d/e/file.2.txt
+ create mode 100644 d/file.2.txt
+ create mode 100644 file.2.txt
+[main f90715b] Iteration 3
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 a/b/c/file.3.txt
+ create mode 100644 a/b/file.3.txt
+ create mode 100644 a/file.3.txt
+ create mode 100644 d/e/file.3.txt
+ create mode 100644 d/file.3.txt
+ create mode 100644 file.3.txt
+[main faea7bc] Iteration 4
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 a/b/c/file.4.txt
+ create mode 100644 a/b/file.4.txt
+ create mode 100644 a/file.4.txt
+ create mode 100644 d/e/file.4.txt
+ create mode 100644 d/file.4.txt
+ create mode 100644 file.4.txt
+[main aa700d9] Iteration 1
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+[main da8cfa4] Iteration 2
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+[main a0d7b2c] Iteration 3
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+[main 410b841] Iteration 4
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+ok 1 - setup repo for object creation
+
+expecting success of 5620.2 'setup bare clone for server': 
+	git clone --bare "file://$(pwd)/src" srv.bare &&
+	git -C srv.bare config --local uploadpack.allowfilter 1 &&
+	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+
+Cloning into bare repository 'srv.bare'...
+ok 2 - setup bare clone for server
+
+expecting success of 5620.3 'do partial clone 1, backfill gets all objects': 
+	git clone --no-checkout --filter=blob:none	\
+		--single-branch --branch=main 		\
+		"file://$(pwd)/srv.bare" backfill1 &&
+
+	# Backfill with no options gets everything reachable from HEAD.
+	GIT_TRACE2_EVENT="$(pwd)/backfill-file-trace" git \
+		-C backfill1 backfill &&
+
+	# We should have engaged the partial clone machinery
+	test_trace2_data promisor fetch_count 48 <backfill-file-trace &&
+
+	# No more missing objects!
+	git -C backfill1 rev-list --quiet --objects --missing=print HEAD >revs2 &&
+	test_line_count = 0 revs2
+
+Cloning into 'backfill1'...
+{"event":"data","sid":"20250317T132505.254299Z-H5c947e1c-P00325b5a","thread":"main","time":"2025-03-17T13:25:05.278951Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.024847,"t_rel":0.024847,"nesting":1,"category":"promisor","key":"fetch_count","value":"48"}
+ok 3 - do partial clone 1, backfill gets all objects
+
+expecting success of 5620.4 'do partial clone 2, backfill min batch size': 
+	git clone --no-checkout --filter=blob:none	\
+		--single-branch --branch=main 		\
+		"file://$(pwd)/srv.bare" backfill2 &&
+
+	GIT_TRACE2_EVENT="$(pwd)/batch-trace" git \
+		-C backfill2 backfill --min-batch-size=20 &&
+
+	# Batches were used
+	test_trace2_data promisor fetch_count 20 <batch-trace >matches &&
+	test_line_count = 2 matches &&
+	test_trace2_data promisor fetch_count 8 <batch-trace &&
+
+	# No more missing objects!
+	git -C backfill2 rev-list --quiet --objects --missing=print HEAD >revs2 &&
+	test_line_count = 0 revs2
+
+Cloning into 'backfill2'...
+{"event":"data","sid":"20250317T132505.554275Z-H5c947e1c-P00325c52","thread":"main","time":"2025-03-17T13:25:05.810170Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.256082,"t_rel":0.256082,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
+ok 4 - do partial clone 2, backfill min batch size
+
+expecting success of 5620.5 'backfill --sparse without sparse-checkout fails': 
+	git init not-sparse &&
+	test_must_fail git -C not-sparse backfill --sparse 2>err &&
+	grep "problem loading sparse-checkout" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/not-sparse/.git/
+error: problem loading sparse-checkout
+ok 5 - backfill --sparse without sparse-checkout fails
+
+expecting success of 5620.6 'backfill --sparse': 
+	git clone --sparse --filter=blob:none		\
+		--single-branch --branch=main 		\
+		"file://$(pwd)/srv.bare" backfill3 &&
+
+	# Initial checkout includes four files at root.
+	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 44 missing &&
+
+	# Initial sparse-checkout is just the files at root, so we get the
+	# older versions of the four files at tip.
+	GIT_TRACE2_EVENT="$(pwd)/sparse-trace1" git \
+		-C backfill3 backfill --sparse &&
+	test_trace2_data promisor fetch_count 4 <sparse-trace1 &&
+	test_trace2_data path-walk paths 5 <sparse-trace1 &&
+	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 40 missing &&
+
+	# Expand the sparse-checkout to include d recursively. This
+	# engages the algorithm to skip the trees for a. Note that
+	# the "sparse-checkout set" command downloads the objects at tip
+	# to satisfy the current checkout.
+	git -C backfill3 sparse-checkout set d &&
+	GIT_TRACE2_EVENT="$(pwd)/sparse-trace2" git \
+		-C backfill3 backfill --sparse &&
+	test_trace2_data promisor fetch_count 8 <sparse-trace2 &&
+	test_trace2_data path-walk paths 15 <sparse-trace2 &&
+	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 24 missing &&
+
+	# Disabling the --sparse option (on by default) will download everything
+	git -C backfill3 backfill --no-sparse &&
+	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 0 missing
+
+Cloning into 'backfill3'...
+{"event":"data","sid":"20250317T132506.587236Z-H5c947e1c-P00325f60","thread":"main","time":"2025-03-17T13:25:06.611217Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.024178,"t_rel":0.024178,"nesting":1,"category":"promisor","key":"fetch_count","value":"4"}
+{"event":"data","sid":"20250317T132506.587236Z-H5c947e1c-P00325f60","thread":"main","time":"2025-03-17T13:25:06.588452Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001416,"t_rel":0.000112,"nesting":2,"category":"path-walk","key":"paths","value":"5"}
+{"event":"data","sid":"20250317T132507.011760Z-H5c947e1c-P00326077","thread":"main","time":"2025-03-17T13:25:07.051078Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.039507,"t_rel":0.039507,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
+{"event":"data","sid":"20250317T132507.011760Z-H5c947e1c-P00326077","thread":"main","time":"2025-03-17T13:25:07.013067Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001497,"t_rel":0.000203,"nesting":2,"category":"path-walk","key":"paths","value":"15"}
+ok 6 - backfill --sparse
+
+expecting success of 5620.7 'backfill --sparse without cone mode (positive)': 
+	git clone --no-checkout --filter=blob:none		\
+		--single-branch --branch=main 		\
+		"file://$(pwd)/srv.bare" backfill4 &&
+
+	# No blobs yet
+	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 48 missing &&
+
+	# Define sparse-checkout by filename regardless of parent directory.
+	# This downloads 6 blobs to satisfy the checkout.
+	git -C backfill4 sparse-checkout set --no-cone "**/file.1.txt" &&
+	git -C backfill4 checkout main &&
+
+	# Track new blob count
+	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 42 missing &&
+
+	GIT_TRACE2_EVENT="$(pwd)/no-cone-trace1" git \
+		-C backfill4 backfill --sparse &&
+	test_trace2_data promisor fetch_count 6 <no-cone-trace1 &&
+
+	# This walk needed to visit all directories to search for these paths.
+	test_trace2_data path-walk paths 12 <no-cone-trace1 &&
+	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 36 missing
+
+Cloning into 'backfill4'...
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+{"event":"data","sid":"20250317T132508.077251Z-H5c947e1c-P0032633c","thread":"main","time":"2025-03-17T13:25:08.094156Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.017119,"t_rel":0.017119,"nesting":1,"category":"promisor","key":"fetch_count","value":"6"}
+{"event":"data","sid":"20250317T132508.077251Z-H5c947e1c-P0032633c","thread":"main","time":"2025-03-17T13:25:08.078635Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001601,"t_rel":0.000229,"nesting":2,"category":"path-walk","key":"paths","value":"12"}
+ok 7 - backfill --sparse without cone mode (positive)
+
+expecting success of 5620.8 'backfill --sparse without cone mode (negative)': 
+	git clone --no-checkout --filter=blob:none		\
+		--single-branch --branch=main 		\
+		"file://$(pwd)/srv.bare" backfill5 &&
+
+	# No blobs yet
+	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 48 missing &&
+
+	# Define sparse-checkout by filename regardless of parent directory.
+	# This downloads 18 blobs to satisfy the checkout
+	git -C backfill5 sparse-checkout set --no-cone "**/file*" "!**/file.1.txt" &&
+	git -C backfill5 checkout main &&
+
+	# Track new blob count
+	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 30 missing &&
+
+	GIT_TRACE2_EVENT="$(pwd)/no-cone-trace2" git \
+		-C backfill5 backfill --sparse &&
+	test_trace2_data promisor fetch_count 18 <no-cone-trace2 &&
+
+	# This walk needed to visit all directories to search for these paths, plus
+	# 12 extra "file.?.txt" paths than the previous test.
+	test_trace2_data path-walk paths 24 <no-cone-trace2 &&
+	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
+	test_line_count = 12 missing
+
+Cloning into 'backfill5'...
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+{"event":"data","sid":"20250317T132508.755741Z-H5c947e1c-P00326501","thread":"main","time":"2025-03-17T13:25:08.802561Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.047022,"t_rel":0.047022,"nesting":1,"category":"promisor","key":"fetch_count","value":"18"}
+{"event":"data","sid":"20250317T132508.755741Z-H5c947e1c-P00326501","thread":"main","time":"2025-03-17T13:25:08.777473Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.021931,"t_rel":0.020611,"nesting":2,"category":"path-walk","key":"paths","value":"24"}
+ok 8 - backfill --sparse without cone mode (negative)
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 8 test(s)
+# SKIP no web server found at ''
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5614-clone-submodules-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5614-clone-submodules-shallow/.git/
 expecting success of 5614.1 'setup': 
@@ -370630,6 +370841,448 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5700-protocol-v1.sh ***
+checking prerequisite: PIPE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
+
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[3300122] Ready to rumble
+expecting success of 5700.1 'create repo to be served by git-daemon': 
+	git init "$daemon_parent" &&
+	test_commit -C "$daemon_parent" one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/repo/parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - create repo to be served by git-daemon
+
+expecting success of 5700.2 'clone with git:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "clone> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+[3300233] Connection from 127.0.0.1:55650
+[3300233] Extended attribute "host": 127.0.0.1:5700
+[3300233] Extended attribute "protocol": version=1
+[3300233] Request upload-pack for '/parent'
+[3300122] [3300233] Disconnected
+packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        clone< version 1
+ok 2 - clone with git:// using protocol v1
+
+expecting success of 5700.3 'fetch with git:// using protocol v1': 
+	test_commit -C "$daemon_parent" two &&
+
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		fetch 2>log &&
+
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[3300494] Connection from 127.0.0.1:55656
+[3300494] Extended attribute "host": 127.0.0.1:5700
+[3300494] Extended attribute "protocol": version=1
+[3300494] Request upload-pack for '/parent'
+[3300122] [3300494] Disconnected
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        fetch< version 1
+ok 3 - fetch with git:// using protocol v1
+
+expecting success of 5700.4 'pull with git:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		pull 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[3300713] Connection from 127.0.0.1:55672
+[3300713] Extended attribute "host": 127.0.0.1:5700
+[3300713] Extended attribute "protocol": version=1
+[3300713] Request upload-pack for '/parent'
+[3300122] [3300713] Disconnected
+Updating d79ce16..139b20d
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:        fetch< version 1
+ok 4 - pull with git:// using protocol v1
+
+expecting success of 5700.5 'push with git:// using protocol v1': 
+	test_commit -C daemon_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Client requested to use protocol v1
+	grep "push> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[3301036] Connection from 127.0.0.1:55686
+[3301036] Extended attribute "host": 127.0.0.1:5700
+[3301036] Extended attribute "protocol": version=1
+[3301036] Request receive-pack for '/parent'
+[3300122] [3301036] Disconnected
+packet:         push> git-receive-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
+packet:         push< version 1
+ok 5 - push with git:// using protocol v1
+
+Stopping git daemon ...
+expecting success of 5700.6 'create repo to be served by file:// transport': 
+	git init file_parent &&
+	test_commit -C file_parent one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/file_parent/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 6 - create repo to be served by file:// transport
+
+expecting success of 5700.7 'clone with file:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "file://$(pwd)/file_parent" file_child 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+packet:        clone< version 1
+ok 7 - clone with file:// using protocol v1
+
+expecting success of 5700.8 'fetch with file:// using protocol v1': 
+	test_commit -C file_parent two &&
+
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		fetch 2>log &&
+
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 8 - fetch with file:// using protocol v1
+
+expecting success of 5700.9 'pull with file:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		pull 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+Updating af0b45c..1dd7f79
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 9 - pull with file:// using protocol v1
+
+expecting success of 5700.10 'push with file:// using protocol v1': 
+	test_commit -C file_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main a136e4a] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+packet:         push< version 1
+ok 10 - push with file:// using protocol v1
+
+expecting success of 5700.11 'cloning branchless tagless but not refless remote': 
+	rm -rf server client &&
+
+	git -c init.defaultbranch=main init server &&
+	echo foo >server/foo.txt &&
+	git -C server add foo.txt &&
+	git -C server commit -m "message" &&
+	git -C server update-ref refs/notbranch/alsonottag HEAD &&
+	git -C server checkout --detach &&
+	git -C server branch -D main &&
+	git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
+
+	git -c protocol.version=1 clone "file://$(pwd)/server" client
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/server/.git/
+[main (root-commit) 271cf0d] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.txt
+HEAD is now at 271cf0d message
+Deleted branch main (was 271cf0d).
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+ok 11 - cloning branchless tagless but not refless remote
+
+expecting success of 5700.12 'setup ssh wrapper': 
+	GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
+	export GIT_SSH &&
+	GIT_SSH_VARIANT=ssh &&
+	export GIT_SSH_VARIANT &&
+	export TRASH_DIRECTORY &&
+	>"$TRASH_DIRECTORY"/ssh-output
+
+ok 12 - setup ssh wrapper
+
+expecting success of 5700.13 'create repo to be served by ssh:// transport': 
+	git init ssh_parent &&
+	test_commit -C ssh_parent one
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/ssh_parent/.git/
+[main (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 13 - create repo to be served by ssh:// transport
+
+expecting success of 5700.14 'clone with ssh:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+		clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "clone< version 1" log
+
+packet:        clone< version 1
+ok 14 - clone with ssh:// using protocol v1
+
+expecting success of 5700.15 'fetch with ssh:// using protocol v1': 
+	test_commit -C ssh_parent two &&
+
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		fetch 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s origin/main >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+[main 738d2f7] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 15 - fetch with ssh:// using protocol v1
+
+expecting success of 5700.16 'pull with ssh:// using protocol v1': 
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		pull 2>log &&
+	expect_ssh git-upload-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
+
+Updating 06e07da..738d2f7
+Fast-forward
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 16 - pull with ssh:// using protocol v1
+
+expecting success of 5700.17 'push with ssh:// using protocol v1': 
+	test_commit -C ssh_child three &&
+
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		push origin HEAD:client_branch 2>log &&
+	expect_ssh git-receive-pack &&
+
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
+
+	# Server responded using protocol v1
+	grep "push< version 1" log
+
+[main 05cc2ac] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+packet:         push< version 1
+ok 17 - push with ssh:// using protocol v1
+
+expecting success of 5700.18 'clone propagates object-format from empty repo': 
+	test_when_finished "rm -fr src256 dst256" &&
+
+	echo sha256 >expect &&
+	git init --object-format=sha256 src256 &&
+	git clone --no-local src256 dst256 &&
+	git -C dst256 rev-parse --show-object-format >actual &&
+
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/src256/.git/
+Cloning into 'dst256'...
+warning: You appear to have cloned an empty repository.
+ok 18 - clone propagates object-format from empty repo
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 18 test(s)
+# SKIP no web server found at ''
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5704-protocol-violations.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5704-protocol-violations/.git/
+expecting success of 5704.1 'extra delim packet in v2 ls-refs args': 
+	{
+		packetize command=ls-refs &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_grep "expected flush after ls-refs arguments" err
+
+000eversion 2
+002cagent=git/2.49.0.395.g12beb8f557c-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: expected flush after ls-refs arguments
+ok 1 - extra delim packet in v2 ls-refs args
+
+expecting success of 5704.2 'extra delim packet in v2 fetch args': 
+	{
+		packetize command=fetch &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_grep "expected flush after fetch arguments" err
+
+000eversion 2
+002cagent=git/2.49.0.395.g12beb8f557c-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: expected flush after fetch arguments
+ok 2 - extra delim packet in v2 fetch args
+
+expecting success of 5704.3 'bogus symref in v0 capabilities': 
+	test_commit foo &&
+	oid=$(git rev-parse HEAD) &&
+	dst=refs/heads/foo &&
+	{
+		printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
+			"$oid" "$GIT_DEFAULT_HASH" "$dst" |
+			test-tool pkt-line pack-raw-stdin &&
+		printf "0000"
+	} >input &&
+	git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
+	printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
+	test_cmp expect actual
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 3 - bogus symref in v0 capabilities
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5701-git-serve.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5701-git-serve/.git/
 expecting success of 5701.1 'setup to generate files with expected content': 
@@ -371090,1257 +371743,356 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5620-backfill.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/.git/
-expecting success of 5620.1 'setup repo for object creation': 
-	echo "{print \$1}" >print_1.awk &&
-	echo "{print \$2}" >print_2.awk &&
-
-	git init src &&
+*** t5601-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/.git/
+expecting success of 5601.1 'setup': 
 
-	mkdir -p src/a/b/c &&
-	mkdir -p src/d/e &&
+	rm -fr .git &&
+	test_create_repo src &&
+	(
+		cd src &&
+		>file &&
+		git add file &&
+		git commit -m initial &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m updated
+	)
 
-	for i in 1 2
-	do
-		for n in 1 2 3 4
-		do
-			echo "Version $i of file $n" > src/file.$n.txt &&
-			echo "Version $i of file a/$n" > src/a/file.$n.txt &&
-			echo "Version $i of file a/b/$n" > src/a/b/file.$n.txt &&
-			echo "Version $i of file a/b/c/$n" > src/a/b/c/file.$n.txt &&
-			echo "Version $i of file d/$n" > src/d/file.$n.txt &&
-			echo "Version $i of file d/e/$n" > src/d/e/file.$n.txt &&
-			git -C src add . &&
-			git -C src commit -m "Iteration $n" || return 1
-		done
-	done
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/src/.git/
-[main (root-commit) 3666995] Iteration 1
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 a/b/c/file.1.txt
- create mode 100644 a/b/file.1.txt
- create mode 100644 a/file.1.txt
- create mode 100644 d/e/file.1.txt
- create mode 100644 d/file.1.txt
- create mode 100644 file.1.txt
-[main 314662f] Iteration 2
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 a/b/c/file.2.txt
- create mode 100644 a/b/file.2.txt
- create mode 100644 a/file.2.txt
- create mode 100644 d/e/file.2.txt
- create mode 100644 d/file.2.txt
- create mode 100644 file.2.txt
-[main f90715b] Iteration 3
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 a/b/c/file.3.txt
- create mode 100644 a/b/file.3.txt
- create mode 100644 a/file.3.txt
- create mode 100644 d/e/file.3.txt
- create mode 100644 d/file.3.txt
- create mode 100644 file.3.txt
-[main faea7bc] Iteration 4
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 a/b/c/file.4.txt
- create mode 100644 a/b/file.4.txt
- create mode 100644 a/file.4.txt
- create mode 100644 d/e/file.4.txt
- create mode 100644 d/file.4.txt
- create mode 100644 file.4.txt
-[main aa700d9] Iteration 1
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 deletions(-)
-[main da8cfa4] Iteration 2
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 deletions(-)
-[main a0d7b2c] Iteration 3
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/src/.git/
+[main (root-commit) 6ce5622] initial
  Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 deletions(-)
-[main 410b841] Iteration 4
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 6be483f] updated
  Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+), 6 deletions(-)
-ok 1 - setup repo for object creation
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-expecting success of 5620.2 'setup bare clone for server': 
-	git clone --bare "file://$(pwd)/src" srv.bare &&
-	git -C srv.bare config --local uploadpack.allowfilter 1 &&
-	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+expecting success of 5601.2 'clone with excess parameters (1)': 
 
-Cloning into bare repository 'srv.bare'...
-ok 2 - setup bare clone for server
+	rm -fr dst &&
+	test_must_fail git clone -n src dst junk
 
-expecting success of 5620.3 'do partial clone 1, backfill gets all objects': 
-	git clone --no-checkout --filter=blob:none	\
-		--single-branch --branch=main 		\
-		"file://$(pwd)/srv.bare" backfill1 &&
 
-	# Backfill with no options gets everything reachable from HEAD.
-	GIT_TRACE2_EVENT="$(pwd)/backfill-file-trace" git \
-		-C backfill1 backfill &&
+fatal: Too many arguments.
 
-	# We should have engaged the partial clone machinery
-	test_trace2_data promisor fetch_count 48 <backfill-file-trace &&
+usage: git clone [<options>] [--] <repo> [<dir>]
 
-	# No more missing objects!
-	git -C backfill1 rev-list --quiet --objects --missing=print HEAD >revs2 &&
-	test_line_count = 0 revs2
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]progress       force progress reporting
+    --[no-]reject-shallow don't clone shallow repository
+    -n, --no-checkout     don't create a checkout
+    --checkout            opposite of --no-checkout
+    --[no-]bare           create a bare repository
+    --[no-]mirror         create a mirror repository (implies --bare)
+    -l, --[no-]local      to clone from a local repository
+    --no-hardlinks        don't use local hardlinks, always copy
+    --hardlinks           opposite of --no-hardlinks
+    -s, --[no-]shared     setup as shared repository
+    --[no-]recurse-submodules[=<pathspec>]
+                          initialize submodules in the clone
+    --[no-]recursive ...  alias of --recurse-submodules
+    -j, --[no-]jobs <n>   number of submodules cloned in parallel
+    --[no-]template <template-directory>
+                          directory from which templates will be used
+    --[no-]reference <repo>
+                          reference repository
+    --[no-]reference-if-able <repo>
+                          reference repository
+    --[no-]dissociate     use --reference only while cloning
+    -o, --[no-]origin <name>
+                          use <name> instead of 'origin' to track upstream
+    -b, --[no-]branch <branch>
+                          checkout <branch> instead of the remote's HEAD
+    --[no-]revision <rev> clone single revision <rev> and check out
+    -u, --[no-]upload-pack <path>
+                          path to git-upload-pack on the remote
+    --[no-]depth <depth>  create a shallow clone of that depth
+    --[no-]shallow-since <time>
+                          create a shallow clone since a specific time
+    --[no-]shallow-exclude <ref>
+                          deepen history of shallow clone, excluding ref
+    --[no-]single-branch  clone only one branch, HEAD or --branch
+    --[no-]tags           clone tags, and make later fetches not to follow them
+    --[no-]shallow-submodules
+                          any cloned submodules will be shallow
+    --[no-]separate-git-dir <gitdir>
+                          separate git dir from working tree
+    --[no-]ref-format <format>
+                          specify the reference format to use
+    -c, --[no-]config <key=value>
+                          set config inside the new repository
+    --[no-]server-option <server-specific>
+                          option to transmit
+    -4, --ipv4            use IPv4 addresses only
+    -6, --ipv6            use IPv6 addresses only
+    --[no-]filter <args>  object filtering
+    --[no-]also-filter-submodules
+                          apply partial clone filters to submodules
+    --[no-]remote-submodules
+                          any cloned submodules will use their remote-tracking branch
+    --[no-]sparse         initialize sparse-checkout file to include only files at root
+    --[no-]bundle-uri <uri>
+                          a URI for downloading bundles before fetching from origin remote
 
-Cloning into 'backfill1'...
-{"event":"data","sid":"20260419T192157.655707Z-H8d819085-P001fba6d","thread":"main","time":"2026-04-19T19:21:57.668586Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.013070,"t_rel":0.013070,"nesting":1,"category":"promisor","key":"fetch_count","value":"48"}
-ok 3 - do partial clone 1, backfill gets all objects
+ok 2 - clone with excess parameters (1)
 
-expecting success of 5620.4 'do partial clone 2, backfill min batch size': 
-	git clone --no-checkout --filter=blob:none	\
-		--single-branch --branch=main 		\
-		"file://$(pwd)/srv.bare" backfill2 &&
+expecting success of 5601.3 'clone with excess parameters (2)': 
 
-	GIT_TRACE2_EVENT="$(pwd)/batch-trace" git \
-		-C backfill2 backfill --min-batch-size=20 &&
+	rm -fr dst &&
+	test_must_fail git clone -n "file://$(pwd)/src" dst junk
 
-	# Batches were used
-	test_trace2_data promisor fetch_count 20 <batch-trace >matches &&
-	test_line_count = 2 matches &&
-	test_trace2_data promisor fetch_count 8 <batch-trace &&
 
-	# No more missing objects!
-	git -C backfill2 rev-list --quiet --objects --missing=print HEAD >revs2 &&
-	test_line_count = 0 revs2
+fatal: Too many arguments.
 
-Cloning into 'backfill2'...
-{"event":"data","sid":"20260419T192157.993064Z-H8d819085-P001fbba5","thread":"main","time":"2026-04-19T19:21:58.196601Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.203757,"t_rel":0.203757,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
-ok 4 - do partial clone 2, backfill min batch size
+usage: git clone [<options>] [--] <repo> [<dir>]
 
-expecting success of 5620.5 'backfill --sparse without sparse-checkout fails': 
-	git init not-sparse &&
-	test_must_fail git -C not-sparse backfill --sparse 2>err &&
-	grep "problem loading sparse-checkout" err
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
+    --[no-]progress       force progress reporting
+    --[no-]reject-shallow don't clone shallow repository
+    -n, --no-checkout     don't create a checkout
+    --checkout            opposite of --no-checkout
+    --[no-]bare           create a bare repository
+    --[no-]mirror         create a mirror repository (implies --bare)
+    -l, --[no-]local      to clone from a local repository
+    --no-hardlinks        don't use local hardlinks, always copy
+    --hardlinks           opposite of --no-hardlinks
+    -s, --[no-]shared     setup as shared repository
+    --[no-]recurse-submodules[=<pathspec>]
+                          initialize submodules in the clone
+    --[no-]recursive ...  alias of --recurse-submodules
+    -j, --[no-]jobs <n>   number of submodules cloned in parallel
+    --[no-]template <template-directory>
+                          directory from which templates will be used
+    --[no-]reference <repo>
+                          reference repository
+    --[no-]reference-if-able <repo>
+                          reference repository
+    --[no-]dissociate     use --reference only while cloning
+    -o, --[no-]origin <name>
+                          use <name> instead of 'origin' to track upstream
+    -b, --[no-]branch <branch>
+                          checkout <branch> instead of the remote's HEAD
+    --[no-]revision <rev> clone single revision <rev> and check out
+    -u, --[no-]upload-pack <path>
+                          path to git-upload-pack on the remote
+    --[no-]depth <depth>  create a shallow clone of that depth
+    --[no-]shallow-since <time>
+                          create a shallow clone since a specific time
+    --[no-]shallow-exclude <ref>
+                          deepen history of shallow clone, excluding ref
+    --[no-]single-branch  clone only one branch, HEAD or --branch
+    --[no-]tags           clone tags, and make later fetches not to follow them
+    --[no-]shallow-submodules
+                          any cloned submodules will be shallow
+    --[no-]separate-git-dir <gitdir>
+                          separate git dir from working tree
+    --[no-]ref-format <format>
+                          specify the reference format to use
+    -c, --[no-]config <key=value>
+                          set config inside the new repository
+    --[no-]server-option <server-specific>
+                          option to transmit
+    -4, --ipv4            use IPv4 addresses only
+    -6, --ipv6            use IPv6 addresses only
+    --[no-]filter <args>  object filtering
+    --[no-]also-filter-submodules
+                          apply partial clone filters to submodules
+    --[no-]remote-submodules
+                          any cloned submodules will use their remote-tracking branch
+    --[no-]sparse         initialize sparse-checkout file to include only files at root
+    --[no-]bundle-uri <uri>
+                          a URI for downloading bundles before fetching from origin remote
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5620-backfill/not-sparse/.git/
-error: problem loading sparse-checkout
-ok 5 - backfill --sparse without sparse-checkout fails
+ok 3 - clone with excess parameters (2)
 
-expecting success of 5620.6 'backfill --sparse': 
-	git clone --sparse --filter=blob:none		\
-		--single-branch --branch=main 		\
-		"file://$(pwd)/srv.bare" backfill3 &&
+expecting success of 5601.4 'output from clone': 
+	rm -fr dst &&
+	git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
+	test $(grep Clon output | wc -l) = 1
 
-	# Initial checkout includes four files at root.
-	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 44 missing &&
+ok 4 - output from clone
 
-	# Initial sparse-checkout is just the files at root, so we get the
-	# older versions of the four files at tip.
-	GIT_TRACE2_EVENT="$(pwd)/sparse-trace1" git \
-		-C backfill3 backfill --sparse &&
-	test_trace2_data promisor fetch_count 4 <sparse-trace1 &&
-	test_trace2_data path-walk paths 5 <sparse-trace1 &&
-	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 40 missing &&
+expecting success of 5601.5 'output from clone with core.abbrev does not crash': 
+	rm -fr dst &&
+	echo "Cloning into ${SQ}dst${SQ}..." >expect &&
+	git -c core.abbrev=12 clone -n "file://$(pwd)/src" dst >actual 2>&1 &&
+	test_cmp expect actual
 
-	# Expand the sparse-checkout to include d recursively. This
-	# engages the algorithm to skip the trees for a. Note that
-	# the "sparse-checkout set" command downloads the objects at tip
-	# to satisfy the current checkout.
-	git -C backfill3 sparse-checkout set d &&
-	GIT_TRACE2_EVENT="$(pwd)/sparse-trace2" git \
-		-C backfill3 backfill --sparse &&
-	test_trace2_data promisor fetch_count 8 <sparse-trace2 &&
-	test_trace2_data path-walk paths 15 <sparse-trace2 &&
-	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 24 missing &&
+ok 5 - output from clone with core.abbrev does not crash
 
-	# Disabling the --sparse option (on by default) will download everything
-	git -C backfill3 backfill --no-sparse &&
-	git -C backfill3 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 0 missing
+expecting success of 5601.6 'clone does not keep pack': 
 
-Cloning into 'backfill3'...
-{"event":"data","sid":"20260419T192158.811592Z-H8d819085-P001fbeaf","thread":"main","time":"2026-04-19T19:21:58.832489Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.021089,"t_rel":0.021089,"nesting":1,"category":"promisor","key":"fetch_count","value":"4"}
-{"event":"data","sid":"20260419T192158.811592Z-H8d819085-P001fbeaf","thread":"main","time":"2026-04-19T19:21:58.812874Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001477,"t_rel":0.000115,"nesting":2,"category":"path-walk","key":"paths","value":"5"}
-{"event":"data","sid":"20260419T192159.167735Z-H8d819085-P001fc000","thread":"main","time":"2026-04-19T19:21:59.184462Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.016928,"t_rel":0.016928,"nesting":1,"category":"promisor","key":"fetch_count","value":"8"}
-{"event":"data","sid":"20260419T192159.167735Z-H8d819085-P001fc000","thread":"main","time":"2026-04-19T19:21:59.169192Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001659,"t_rel":0.000257,"nesting":2,"category":"path-walk","key":"paths","value":"15"}
-ok 6 - backfill --sparse
+	rm -fr dst &&
+	git clone -n "file://$(pwd)/src" dst &&
+	! test -f dst/file &&
+	! (echo dst/.git/objects/pack/pack-* | grep "\.keep")
 
-expecting success of 5620.7 'backfill --sparse without cone mode (positive)': 
-	git clone --no-checkout --filter=blob:none		\
-		--single-branch --branch=main 		\
-		"file://$(pwd)/srv.bare" backfill4 &&
 
-	# No blobs yet
-	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 48 missing &&
+Cloning into 'dst'...
+ok 6 - clone does not keep pack
 
-	# Define sparse-checkout by filename regardless of parent directory.
-	# This downloads 6 blobs to satisfy the checkout.
-	git -C backfill4 sparse-checkout set --no-cone "**/file.1.txt" &&
-	git -C backfill4 checkout main &&
+expecting success of 5601.7 'clone checks out files': 
 
-	# Track new blob count
-	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 42 missing &&
+	rm -fr dst &&
+	git clone src dst &&
+	test -f dst/file
 
-	GIT_TRACE2_EVENT="$(pwd)/no-cone-trace1" git \
-		-C backfill4 backfill --sparse &&
-	test_trace2_data promisor fetch_count 6 <no-cone-trace1 &&
 
-	# This walk needed to visit all directories to search for these paths.
-	test_trace2_data path-walk paths 12 <no-cone-trace1 &&
-	git -C backfill4 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 36 missing
+Cloning into 'dst'...
+done.
+ok 7 - clone checks out files
 
-Cloning into 'backfill4'...
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-{"event":"data","sid":"20260419T192159.872341Z-H8d819085-P001fc27d","thread":"main","time":"2026-04-19T19:21:59.888550Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.016404,"t_rel":0.016404,"nesting":1,"category":"promisor","key":"fetch_count","value":"6"}
-{"event":"data","sid":"20260419T192159.872341Z-H8d819085-P001fc27d","thread":"main","time":"2026-04-19T19:21:59.873811Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001667,"t_rel":0.000246,"nesting":2,"category":"path-walk","key":"paths","value":"12"}
-ok 7 - backfill --sparse without cone mode (positive)
+expecting success of 5601.8 'clone respects GIT_WORK_TREE': 
 
-expecting success of 5620.8 'backfill --sparse without cone mode (negative)': 
-	git clone --no-checkout --filter=blob:none		\
-		--single-branch --branch=main 		\
-		"file://$(pwd)/srv.bare" backfill5 &&
+	GIT_WORK_TREE=worktree git clone src bare &&
+	test -f bare/config &&
+	test -f worktree/file
 
-	# No blobs yet
-	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 48 missing &&
 
-	# Define sparse-checkout by filename regardless of parent directory.
-	# This downloads 18 blobs to satisfy the checkout
-	git -C backfill5 sparse-checkout set --no-cone "**/file*" "!**/file.1.txt" &&
-	git -C backfill5 checkout main &&
+Cloning into 'bare'...
+done.
+ok 8 - clone respects GIT_WORK_TREE
 
-	# Track new blob count
-	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 30 missing &&
+expecting success of 5601.9 'clone from hooks': 
 
-	GIT_TRACE2_EVENT="$(pwd)/no-cone-trace2" git \
-		-C backfill5 backfill --sparse &&
-	test_trace2_data promisor fetch_count 18 <no-cone-trace2 &&
+	test_create_repo r0 &&
+	cd r0 &&
+	test_commit initial &&
+	cd .. &&
+	git init r1 &&
+	cd r1 &&
+	test_hook pre-commit <<-\EOF &&
+	git clone ../r0 ../r2
+	exit 1
+	EOF
+	: >file &&
+	git add file &&
+	test_must_fail git commit -m invoke-hook &&
+	cd .. &&
+	test_cmp r0/.git/HEAD r2/.git/HEAD &&
+	test_cmp r0/initial.t r2/initial.t
 
-	# This walk needed to visit all directories to search for these paths, plus
-	# 12 extra "file.?.txt" paths than the previous test.
-	test_trace2_data path-walk paths 24 <no-cone-trace2 &&
-	git -C backfill5 rev-list --quiet --objects --missing=print HEAD >missing &&
-	test_line_count = 12 missing
 
-Cloning into 'backfill5'...
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-{"event":"data","sid":"20260419T192200.464418Z-H8d819085-P001fc480","thread":"main","time":"2026-04-19T19:22:00.484363Z","file":"promisor-remote.c","line":55,"repo":1,"t_abs":0.020153,"t_rel":0.020153,"nesting":1,"category":"promisor","key":"fetch_count","value":"18"}
-{"event":"data","sid":"20260419T192200.464418Z-H8d819085-P001fc480","thread":"main","time":"2026-04-19T19:22:00.465984Z","file":"path-walk.c","line":588,"repo":1,"t_abs":0.001775,"t_rel":0.000299,"nesting":2,"category":"path-walk","key":"paths","value":"24"}
-ok 8 - backfill --sparse without cone mode (negative)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/r0/.git/
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/r1/.git/
+Cloning into '../r2'...
+done.
+ok 9 - clone from hooks
 
-checking prerequisite: NOT_ROOT
+expecting success of 5601.10 'clone creates intermediate directories': 
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	git clone src long/path/to/dst &&
+	test -f long/path/to/dst/file
 
-)
-prerequisite NOT_ROOT ok
-# passed all 8 test(s)
-# SKIP no web server found at ''
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5700-protocol-v1.sh ***
-checking prerequisite: PIPE
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
+Cloning into 'long/path/to/dst'...
+done.
+ok 10 - clone creates intermediate directories
 
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[2078789] Ready to rumble
-expecting success of 5700.1 'create repo to be served by git-daemon': 
-	git init "$daemon_parent" &&
-	test_commit -C "$daemon_parent" one
+expecting success of 5601.11 'clone creates intermediate directories for bare repo': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/repo/parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - create repo to be served by git-daemon
+	git clone --bare src long/path/to/bare/dst &&
+	test -f long/path/to/bare/dst/config
 
-expecting success of 5700.2 'clone with git:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
 
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
+Cloning into bare repository 'long/path/to/bare/dst'...
+done.
+ok 11 - clone creates intermediate directories for bare repo
 
-	# Client requested to use protocol v1
-	grep "clone> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "clone< version 1" log
+expecting success of 5601.12 'clone --mirror': 
 
-[2078917] Connection from 127.0.0.1:47848
-[2078917] Extended attribute "host": 127.0.0.1:5700
-[2078917] Extended attribute "protocol": version=1
-[2078917] Request upload-pack for '/parent'
-[2078789] [2078917] Disconnected
-packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        clone< version 1
-ok 2 - clone with git:// using protocol v1
+	git clone --mirror src mirror &&
+	test -f mirror/HEAD &&
+	test ! -f mirror/file &&
+	FETCH="$(cd mirror && git config remote.origin.fetch)" &&
+	test "+refs/*:refs/*" = "$FETCH" &&
+	MIRROR="$(cd mirror && git config --bool remote.origin.mirror)" &&
+	test "$MIRROR" = true
 
-expecting success of 5700.3 'fetch with git:// using protocol v1': 
-	test_commit -C "$daemon_parent" two &&
 
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		fetch 2>log &&
+Cloning into bare repository 'mirror'...
+done.
+ok 12 - clone --mirror
 
-	git -C daemon_child log -1 --format=%s origin/main >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
+expecting success of 5601.13 'clone --mirror with detached HEAD': 
 
-	# Client requested to use protocol v1
-	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
+	( cd src && git checkout HEAD^ && git rev-parse HEAD >../expected ) &&
+	git clone --mirror src mirror.detached &&
+	( cd src && git checkout - ) &&
+	GIT_DIR=mirror.detached git rev-parse HEAD >actual &&
+	test_cmp expected actual
 
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[2079188] Connection from 127.0.0.1:47862
-[2079188] Extended attribute "host": 127.0.0.1:5700
-[2079188] Extended attribute "protocol": version=1
-[2079188] Request upload-pack for '/parent'
-[2078789] [2079188] Disconnected
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        fetch< version 1
-ok 3 - fetch with git:// using protocol v1
 
-expecting success of 5700.4 'pull with git:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		pull 2>log &&
+Note: switching to 'HEAD^'.
 
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	# Client requested to use protocol v1
-	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[2079446] Connection from 127.0.0.1:47864
-[2079446] Extended attribute "host": 127.0.0.1:5700
-[2079446] Extended attribute "protocol": version=1
-[2079446] Request upload-pack for '/parent'
-[2078789] [2079446] Disconnected
-Updating d79ce16..139b20d
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:        fetch< version 1
-ok 4 - pull with git:// using protocol v1
+  git switch -c <new-branch-name>
 
-expecting success of 5700.5 'push with git:// using protocol v1': 
-	test_commit -C daemon_child three &&
+Or undo this operation with:
 
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
+  git switch -
 
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# Client requested to use protocol v1
-	grep "push> .*\\\0\\\0version=1\\\0$" log &&
-	# Server responded using protocol v1
-	grep "push< version 1" log
+HEAD is now at 6ce5622 initial
+Cloning into bare repository 'mirror.detached'...
+done.
+Previous HEAD position was 6ce5622 initial
+Switched to branch 'main'
+ok 13 - clone --mirror with detached HEAD
 
-[main 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[2079682] Connection from 127.0.0.1:47870
-[2079682] Extended attribute "host": 127.0.0.1:5700
-[2079682] Extended attribute "protocol": version=1
-[2079682] Request receive-pack for '/parent'
-[2078789] [2079682] Disconnected
-packet:         push> git-receive-pack /parent\0host=127.0.0.1:5700\0\0version=1\0
-packet:         push< version 1
-ok 5 - push with git:// using protocol v1
+expecting success of 5601.14 'clone --bare with detached HEAD': 
 
-Stopping git daemon ...
-Terminated
-expecting success of 5700.6 'create repo to be served by file:// transport': 
-	git init file_parent &&
-	test_commit -C file_parent one
+	( cd src && git checkout HEAD^ && git rev-parse HEAD >../expected ) &&
+	git clone --bare src bare.detached &&
+	( cd src && git checkout - ) &&
+	GIT_DIR=bare.detached git rev-parse HEAD >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/file_parent/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 6 - create repo to be served by file:// transport
 
-expecting success of 5700.7 'clone with file:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "file://$(pwd)/file_parent" file_child 2>log &&
+Note: switching to 'HEAD^'.
 
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	# Server responded using protocol v1
-	grep "clone< version 1" log
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-packet:        clone< version 1
-ok 7 - clone with file:// using protocol v1
+  git switch -c <new-branch-name>
 
-expecting success of 5700.8 'fetch with file:// using protocol v1': 
-	test_commit -C file_parent two &&
+Or undo this operation with:
 
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		fetch 2>log &&
+  git switch -
 
-	git -C file_child log -1 --format=%s origin/main >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
+HEAD is now at 6ce5622 initial
+Cloning into bare repository 'bare.detached'...
+done.
+Previous HEAD position was 6ce5622 initial
+Switched to branch 'main'
+ok 14 - clone --bare with detached HEAD
 
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 8 - fetch with file:// using protocol v1
+expecting success of 5601.15 'clone --bare names the local repository <name>.git': 
 
-expecting success of 5700.9 'pull with file:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		pull 2>log &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-Updating af0b45c..1dd7f79
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 9 - pull with file:// using protocol v1
-
-expecting success of 5700.10 'push with file:// using protocol v1': 
-	test_commit -C file_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "push< version 1" log
-
-[main a136e4a] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-packet:         push< version 1
-ok 10 - push with file:// using protocol v1
-
-expecting success of 5700.11 'cloning branchless tagless but not refless remote': 
-	rm -rf server client &&
-
-	git -c init.defaultbranch=main init server &&
-	echo foo >server/foo.txt &&
-	git -C server add foo.txt &&
-	git -C server commit -m "message" &&
-	git -C server update-ref refs/notbranch/alsonottag HEAD &&
-	git -C server checkout --detach &&
-	git -C server branch -D main &&
-	git -C server symbolic-ref HEAD refs/heads/nonexistentbranch &&
-
-	git -c protocol.version=1 clone "file://$(pwd)/server" client
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/server/.git/
-[main (root-commit) 271cf0d] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.txt
-HEAD is now at 271cf0d message
-Deleted branch main (was 271cf0d).
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-ok 11 - cloning branchless tagless but not refless remote
-
-expecting success of 5700.12 'setup ssh wrapper': 
-	GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
-	export GIT_SSH &&
-	GIT_SSH_VARIANT=ssh &&
-	export GIT_SSH_VARIANT &&
-	export TRASH_DIRECTORY &&
-	>"$TRASH_DIRECTORY"/ssh-output
-
-ok 12 - setup ssh wrapper
-
-expecting success of 5700.13 'create repo to be served by ssh:// transport': 
-	git init ssh_parent &&
-	test_commit -C ssh_parent one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/ssh_parent/.git/
-[main (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 13 - create repo to be served by ssh:// transport
-
-expecting success of 5700.14 'clone with ssh:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -c protocol.version=1 \
-		clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "clone< version 1" log
-
-packet:        clone< version 1
-ok 14 - clone with ssh:// using protocol v1
-
-expecting success of 5700.15 'fetch with ssh:// using protocol v1': 
-	test_commit -C ssh_parent two &&
-
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		fetch 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s origin/main >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-[main 738d2f7] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 15 - fetch with ssh:// using protocol v1
-
-expecting success of 5700.16 'pull with ssh:// using protocol v1': 
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		pull 2>log &&
-	expect_ssh git-upload-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "fetch< version 1" log
-
-Updating 06e07da..738d2f7
-Fast-forward
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-packet:        fetch< version 1
-ok 16 - pull with ssh:// using protocol v1
-
-expecting success of 5700.17 'push with ssh:// using protocol v1': 
-	test_commit -C ssh_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
-		push origin HEAD:client_branch 2>log &&
-	expect_ssh git-receive-pack &&
-
-	git -C ssh_child log -1 --format=%s >actual &&
-	git -C ssh_parent log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v1
-	grep "push< version 1" log
-
-[main 05cc2ac] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-packet:         push< version 1
-ok 17 - push with ssh:// using protocol v1
-
-expecting success of 5700.18 'clone propagates object-format from empty repo': 
-	test_when_finished "rm -fr src256 dst256" &&
-
-	echo sha256 >expect &&
-	git init --object-format=sha256 src256 &&
-	git clone --no-local src256 dst256 &&
-	git -C dst256 rev-parse --show-object-format >actual &&
-
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5700-protocol-v1/src256/.git/
-Cloning into 'dst256'...
-warning: You appear to have cloned an empty repository.
-ok 18 - clone propagates object-format from empty repo
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 18 test(s)
-# SKIP no web server found at ''
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5704-protocol-violations.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5704-protocol-violations/.git/
-expecting success of 5704.1 'extra delim packet in v2 ls-refs args': 
-	{
-		packetize command=ls-refs &&
-		packetize "object-format=$(test_oid algo)" &&
-		printf 0001 &&
-		# protocol expects 0000 flush here
-		printf 0001
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack . <input 2>err &&
-	test_grep "expected flush after ls-refs arguments" err
-
-000eversion 2
-002cagent=git/2.49.0.395.g12beb8f557c-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: expected flush after ls-refs arguments
-ok 1 - extra delim packet in v2 ls-refs args
-
-expecting success of 5704.2 'extra delim packet in v2 fetch args': 
-	{
-		packetize command=fetch &&
-		packetize "object-format=$(test_oid algo)" &&
-		printf 0001 &&
-		# protocol expects 0000 flush here
-		printf 0001
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack . <input 2>err &&
-	test_grep "expected flush after fetch arguments" err
-
-000eversion 2
-002cagent=git/2.49.0.395.g12beb8f557c-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: expected flush after fetch arguments
-ok 2 - extra delim packet in v2 fetch args
-
-expecting success of 5704.3 'bogus symref in v0 capabilities': 
-	test_commit foo &&
-	oid=$(git rev-parse HEAD) &&
-	dst=refs/heads/foo &&
-	{
-		printf "%s HEAD\0symref object-format=%s symref=HEAD:%s\n" \
-			"$oid" "$GIT_DEFAULT_HASH" "$dst" |
-			test-tool pkt-line pack-raw-stdin &&
-		printf "0000"
-	} >input &&
-	git ls-remote --symref --upload-pack="cat input; read junk;:" . >actual &&
-	printf "ref: %s\tHEAD\n%s\tHEAD\n" "$dst" "$oid" >expect &&
-	test_cmp expect actual
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 3 - bogus symref in v0 capabilities
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5730-protocol-v2-bundle-uri-file.sh ***
-expecting success of 5730.1 'setup protocol v2 file:// tests': 
-	git init "$BUNDLE_URI_PARENT" &&
-	test_commit -C "$BUNDLE_URI_PARENT" one &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5730-protocol-v2-bundle-uri-file/file_parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - setup protocol v2 file:// tests
-
-expecting success of 5730.2 'connect with file:// using protocol v2: no bundle-uri': 
-	test_when_finished "rm -f log" &&
-	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
-	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	! grep bundle-uri log
-
-packet:    ls-remote< version 2
-ok 2 - connect with file:// using protocol v2: no bundle-uri
-
-expecting success of 5730.3 'connect with file:// using protocol v2: have bundle-uri': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c protocol.version=2 \
-		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log
-
-packet:    ls-remote< version 2
-packet:    ls-remote< bundle-uri
-ok 3 - connect with file:// using protocol v2: have bundle-uri
-
-expecting success of 5730.4 'clone with file:// using protocol v2: request bundle-uris': 
-	test_when_finished "rm -rf log* cloned*" &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=false \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log &&
-
-	# Client did not issue bundle-uri command
-	! grep "> command=bundle-uri" log &&
-
-	GIT_TRACE_PACKET="$PWD/log" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone "$BUNDLE_URI_REPO_URI" cloned2 \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log &&
-
-	# Client issued bundle-uri command
-	grep "> command=bundle-uri" log &&
-
-	GIT_TRACE_PACKET="$PWD/log3" \
-	git \
-		-c transfer.bundleURI=true \
-		-c protocol.version=2 \
-		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
-		"$BUNDLE_URI_REPO_URI" cloned3 \
-		>actual 2>err &&
-
-	# Server responded using protocol v2
-	grep "< version 2" log3 &&
-
-	# Server advertised bundle-uri capability
-	grep "< bundle-uri" log3 &&
-
-	# Client did not issue bundle-uri command (--bundle-uri override)
-	! grep "> command=bundle-uri" log3
-
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< version 2
-packet:        clone< version 2
-packet:        clone< bundle-uri
-packet:        clone< bundle-uri
-packet:        clone> command=bundle-uri
-packet:        clone< version 2
-packet:        clone< bundle-uri
-ok 4 - clone with file:// using protocol v2: request bundle-uris
-
-expecting success of 5730.5 'enable transfer.bundleURI for remaining tests': 
-	git config --global transfer.bundleURI true
-
-ok 5 - enable transfer.bundleURI for remaining tests
-
-expecting success of 5730.6 'test bundle-uri with file:// using protocol v2': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-ok 6 - test bundle-uri with file:// using protocol v2
-
-expecting success of 5730.7 'test bundle-uri with file:// using protocol v2 and extra data': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
-
-	# Extra data should be ignored
-	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "only"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-ok 7 - test bundle-uri with file:// using protocol v2 and extra data
-
-expecting success of 5730.8 'test bundle-uri with file:// using protocol v2 with list': 
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
-	test_config -C "$BUNDLE_URI_PARENT" \
-		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
-
-	# All data about bundle URIs
-	cat >expect <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "bundle1"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
-	[bundle "bundle2"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
-	[bundle "bundle3"]
-		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
-	EOF
-
-	test-tool bundle-uri \
-		ls-remote \
-		"$BUNDLE_URI_REPO_URI" \
-		>actual &&
-	test_cmp_config_output expect actual
-
-ok 8 - test bundle-uri with file:// using protocol v2 with list
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5601-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/.git/
-expecting success of 5601.1 'setup': 
-
-	rm -fr .git &&
-	test_create_repo src &&
-	(
-		cd src &&
-		>file &&
-		git add file &&
-		git commit -m initial &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m updated
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/src/.git/
-[main (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 6be483f] updated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 5601.2 'clone with excess parameters (1)': 
-
-	rm -fr dst &&
-	test_must_fail git clone -n src dst junk
-
-
-fatal: Too many arguments.
-
-usage: git clone [<options>] [--] <repo> [<dir>]
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]progress       force progress reporting
-    --[no-]reject-shallow don't clone shallow repository
-    -n, --no-checkout     don't create a checkout
-    --checkout            opposite of --no-checkout
-    --[no-]bare           create a bare repository
-    --[no-]mirror         create a mirror repository (implies --bare)
-    -l, --[no-]local      to clone from a local repository
-    --no-hardlinks        don't use local hardlinks, always copy
-    --hardlinks           opposite of --no-hardlinks
-    -s, --[no-]shared     setup as shared repository
-    --[no-]recurse-submodules[=<pathspec>]
-                          initialize submodules in the clone
-    --[no-]recursive ...  alias of --recurse-submodules
-    -j, --[no-]jobs <n>   number of submodules cloned in parallel
-    --[no-]template <template-directory>
-                          directory from which templates will be used
-    --[no-]reference <repo>
-                          reference repository
-    --[no-]reference-if-able <repo>
-                          reference repository
-    --[no-]dissociate     use --reference only while cloning
-    -o, --[no-]origin <name>
-                          use <name> instead of 'origin' to track upstream
-    -b, --[no-]branch <branch>
-                          checkout <branch> instead of the remote's HEAD
-    --[no-]revision <rev> clone single revision <rev> and check out
-    -u, --[no-]upload-pack <path>
-                          path to git-upload-pack on the remote
-    --[no-]depth <depth>  create a shallow clone of that depth
-    --[no-]shallow-since <time>
-                          create a shallow clone since a specific time
-    --[no-]shallow-exclude <ref>
-                          deepen history of shallow clone, excluding ref
-    --[no-]single-branch  clone only one branch, HEAD or --branch
-    --[no-]tags           clone tags, and make later fetches not to follow them
-    --[no-]shallow-submodules
-                          any cloned submodules will be shallow
-    --[no-]separate-git-dir <gitdir>
-                          separate git dir from working tree
-    --[no-]ref-format <format>
-                          specify the reference format to use
-    -c, --[no-]config <key=value>
-                          set config inside the new repository
-    --[no-]server-option <server-specific>
-                          option to transmit
-    -4, --ipv4            use IPv4 addresses only
-    -6, --ipv6            use IPv6 addresses only
-    --[no-]filter <args>  object filtering
-    --[no-]also-filter-submodules
-                          apply partial clone filters to submodules
-    --[no-]remote-submodules
-                          any cloned submodules will use their remote-tracking branch
-    --[no-]sparse         initialize sparse-checkout file to include only files at root
-    --[no-]bundle-uri <uri>
-                          a URI for downloading bundles before fetching from origin remote
-
-ok 2 - clone with excess parameters (1)
-
-expecting success of 5601.3 'clone with excess parameters (2)': 
-
-	rm -fr dst &&
-	test_must_fail git clone -n "file://$(pwd)/src" dst junk
-
-
-fatal: Too many arguments.
-
-usage: git clone [<options>] [--] <repo> [<dir>]
-
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
-    --[no-]progress       force progress reporting
-    --[no-]reject-shallow don't clone shallow repository
-    -n, --no-checkout     don't create a checkout
-    --checkout            opposite of --no-checkout
-    --[no-]bare           create a bare repository
-    --[no-]mirror         create a mirror repository (implies --bare)
-    -l, --[no-]local      to clone from a local repository
-    --no-hardlinks        don't use local hardlinks, always copy
-    --hardlinks           opposite of --no-hardlinks
-    -s, --[no-]shared     setup as shared repository
-    --[no-]recurse-submodules[=<pathspec>]
-                          initialize submodules in the clone
-    --[no-]recursive ...  alias of --recurse-submodules
-    -j, --[no-]jobs <n>   number of submodules cloned in parallel
-    --[no-]template <template-directory>
-                          directory from which templates will be used
-    --[no-]reference <repo>
-                          reference repository
-    --[no-]reference-if-able <repo>
-                          reference repository
-    --[no-]dissociate     use --reference only while cloning
-    -o, --[no-]origin <name>
-                          use <name> instead of 'origin' to track upstream
-    -b, --[no-]branch <branch>
-                          checkout <branch> instead of the remote's HEAD
-    --[no-]revision <rev> clone single revision <rev> and check out
-    -u, --[no-]upload-pack <path>
-                          path to git-upload-pack on the remote
-    --[no-]depth <depth>  create a shallow clone of that depth
-    --[no-]shallow-since <time>
-                          create a shallow clone since a specific time
-    --[no-]shallow-exclude <ref>
-                          deepen history of shallow clone, excluding ref
-    --[no-]single-branch  clone only one branch, HEAD or --branch
-    --[no-]tags           clone tags, and make later fetches not to follow them
-    --[no-]shallow-submodules
-                          any cloned submodules will be shallow
-    --[no-]separate-git-dir <gitdir>
-                          separate git dir from working tree
-    --[no-]ref-format <format>
-                          specify the reference format to use
-    -c, --[no-]config <key=value>
-                          set config inside the new repository
-    --[no-]server-option <server-specific>
-                          option to transmit
-    -4, --ipv4            use IPv4 addresses only
-    -6, --ipv6            use IPv6 addresses only
-    --[no-]filter <args>  object filtering
-    --[no-]also-filter-submodules
-                          apply partial clone filters to submodules
-    --[no-]remote-submodules
-                          any cloned submodules will use their remote-tracking branch
-    --[no-]sparse         initialize sparse-checkout file to include only files at root
-    --[no-]bundle-uri <uri>
-                          a URI for downloading bundles before fetching from origin remote
-
-ok 3 - clone with excess parameters (2)
-
-expecting success of 5601.4 'output from clone': 
-	rm -fr dst &&
-	git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
-	test $(grep Clon output | wc -l) = 1
-
-ok 4 - output from clone
-
-expecting success of 5601.5 'output from clone with core.abbrev does not crash': 
-	rm -fr dst &&
-	echo "Cloning into ${SQ}dst${SQ}..." >expect &&
-	git -c core.abbrev=12 clone -n "file://$(pwd)/src" dst >actual 2>&1 &&
-	test_cmp expect actual
-
-ok 5 - output from clone with core.abbrev does not crash
-
-expecting success of 5601.6 'clone does not keep pack': 
-
-	rm -fr dst &&
-	git clone -n "file://$(pwd)/src" dst &&
-	! test -f dst/file &&
-	! (echo dst/.git/objects/pack/pack-* | grep "\.keep")
-
-
-Cloning into 'dst'...
-ok 6 - clone does not keep pack
-
-expecting success of 5601.7 'clone checks out files': 
-
-	rm -fr dst &&
-	git clone src dst &&
-	test -f dst/file
-
-
-Cloning into 'dst'...
-done.
-ok 7 - clone checks out files
-
-expecting success of 5601.8 'clone respects GIT_WORK_TREE': 
-
-	GIT_WORK_TREE=worktree git clone src bare &&
-	test -f bare/config &&
-	test -f worktree/file
-
-
-Cloning into 'bare'...
-done.
-ok 8 - clone respects GIT_WORK_TREE
-
-expecting success of 5601.9 'clone from hooks': 
-
-	test_create_repo r0 &&
-	cd r0 &&
-	test_commit initial &&
-	cd .. &&
-	git init r1 &&
-	cd r1 &&
-	test_hook pre-commit <<-\EOF &&
-	git clone ../r0 ../r2
-	exit 1
-	EOF
-	: >file &&
-	git add file &&
-	test_must_fail git commit -m invoke-hook &&
-	cd .. &&
-	test_cmp r0/.git/HEAD r2/.git/HEAD &&
-	test_cmp r0/initial.t r2/initial.t
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/r0/.git/
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5601-clone/r1/.git/
-Cloning into '../r2'...
-done.
-ok 9 - clone from hooks
-
-expecting success of 5601.10 'clone creates intermediate directories': 
-
-	git clone src long/path/to/dst &&
-	test -f long/path/to/dst/file
-
-
-Cloning into 'long/path/to/dst'...
-done.
-ok 10 - clone creates intermediate directories
-
-expecting success of 5601.11 'clone creates intermediate directories for bare repo': 
-
-	git clone --bare src long/path/to/bare/dst &&
-	test -f long/path/to/bare/dst/config
-
-
-Cloning into bare repository 'long/path/to/bare/dst'...
-done.
-ok 11 - clone creates intermediate directories for bare repo
-
-expecting success of 5601.12 'clone --mirror': 
-
-	git clone --mirror src mirror &&
-	test -f mirror/HEAD &&
-	test ! -f mirror/file &&
-	FETCH="$(cd mirror && git config remote.origin.fetch)" &&
-	test "+refs/*:refs/*" = "$FETCH" &&
-	MIRROR="$(cd mirror && git config --bool remote.origin.mirror)" &&
-	test "$MIRROR" = true
-
-
-Cloning into bare repository 'mirror'...
-done.
-ok 12 - clone --mirror
-
-expecting success of 5601.13 'clone --mirror with detached HEAD': 
-
-	( cd src && git checkout HEAD^ && git rev-parse HEAD >../expected ) &&
-	git clone --mirror src mirror.detached &&
-	( cd src && git checkout - ) &&
-	GIT_DIR=mirror.detached git rev-parse HEAD >actual &&
-	test_cmp expected actual
-
-
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ce5622 initial
-Cloning into bare repository 'mirror.detached'...
-done.
-Previous HEAD position was 6ce5622 initial
-Switched to branch 'main'
-ok 13 - clone --mirror with detached HEAD
-
-expecting success of 5601.14 'clone --bare with detached HEAD': 
-
-	( cd src && git checkout HEAD^ && git rev-parse HEAD >../expected ) &&
-	git clone --bare src bare.detached &&
-	( cd src && git checkout - ) &&
-	GIT_DIR=bare.detached git rev-parse HEAD >actual &&
-	test_cmp expected actual
-
-
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ce5622 initial
-Cloning into bare repository 'bare.detached'...
-done.
-Previous HEAD position was 6ce5622 initial
-Switched to branch 'main'
-ok 14 - clone --bare with detached HEAD
-
-expecting success of 5601.15 'clone --bare names the local repository <name>.git': 
-
-	git clone --bare src &&
-	test -d src.git
+	git clone --bare src &&
+	test -d src.git
 
 
 Cloning into bare repository 'src.git'...
@@ -373528,6 +373280,217 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5730-protocol-v2-bundle-uri-file.sh ***
+expecting success of 5730.1 'setup protocol v2 file:// tests': 
+	git init "$BUNDLE_URI_PARENT" &&
+	test_commit -C "$BUNDLE_URI_PARENT" one &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs true
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5730-protocol-v2-bundle-uri-file/file_parent/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 1 - setup protocol v2 file:// tests
+
+expecting success of 5730.2 'connect with file:// using protocol v2: no bundle-uri': 
+	test_when_finished "rm -f log" &&
+	test_when_finished "git -C \"$BUNDLE_URI_PARENT\" config uploadpack.advertiseBundleURIs true" &&
+	git -C "$BUNDLE_URI_PARENT" config uploadpack.advertiseBundleURIs false &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	! grep bundle-uri log
+
+packet:    ls-remote< version 2
+ok 2 - connect with file:// using protocol v2: no bundle-uri
+
+expecting success of 5730.3 'connect with file:// using protocol v2: have bundle-uri': 
+	test_when_finished "rm -f log" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log
+
+packet:    ls-remote< version 2
+packet:    ls-remote< bundle-uri
+ok 3 - connect with file:// using protocol v2: have bundle-uri
+
+expecting success of 5730.4 'clone with file:// using protocol v2: request bundle-uris': 
+	test_when_finished "rm -rf log* cloned*" &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=false \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client did not issue bundle-uri command
+	! grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned2 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
+
+	# Client issued bundle-uri command
+	grep "> command=bundle-uri" log &&
+
+	GIT_TRACE_PACKET="$PWD/log3" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone --bundle-uri="$BUNDLE_URI_BUNDLE_URI" \
+		"$BUNDLE_URI_REPO_URI" cloned3 \
+		>actual 2>err &&
+
+	# Server responded using protocol v2
+	grep "< version 2" log3 &&
+
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log3 &&
+
+	# Client did not issue bundle-uri command (--bundle-uri override)
+	! grep "> command=bundle-uri" log3
+
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< version 2
+packet:        clone< version 2
+packet:        clone< bundle-uri
+packet:        clone< bundle-uri
+packet:        clone> command=bundle-uri
+packet:        clone< version 2
+packet:        clone< bundle-uri
+ok 4 - clone with file:// using protocol v2: request bundle-uris
+
+expecting success of 5730.5 'enable transfer.bundleURI for remaining tests': 
+	git config --global transfer.bundleURI true
+
+ok 5 - enable transfer.bundleURI for remaining tests
+
+expecting success of 5730.6 'test bundle-uri with file:// using protocol v2': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 6 - test bundle-uri with file:// using protocol v2
+
+expecting success of 5730.7 'test bundle-uri with file:// using protocol v2 and extra data': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.only.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED" &&
+
+	# Extra data should be ignored
+	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 7 - test bundle-uri with file:// using protocol v2 and extra data
+
+expecting success of 5730.8 'test bundle-uri with file:// using protocol v2 with list': 
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle1.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle2.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl" &&
+	test_config -C "$BUNDLE_URI_PARENT" \
+		bundle.bundle3.uri "$BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl" &&
+
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "bundle1"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-1.bdl
+	[bundle "bundle2"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-2.bdl
+	[bundle "bundle3"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED-3.bdl
+	EOF
+
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
+	test_cmp_config_output expect actual
+
+ok 8 - test bundle-uri with file:// using protocol v2 with list
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5732-protocol-v2-bundle-uri-http.sh ***
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5731-protocol-v2-bundle-uri-git.sh ***
 checking prerequisite: PIPE
 
@@ -373541,7 +373504,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[2084014] Ready to rumble
+[3305672] Ready to rumble
 expecting success of 5731.1 'setup protocol v2 git:// tests': 
 	git init "$BUNDLE_URI_PARENT" &&
 	test_commit -C "$BUNDLE_URI_PARENT" one &&
@@ -373570,11 +373533,11 @@
 
 	! grep bundle-uri log
 
-[2084177] Connection from 127.0.0.1:53460
-[2084177] Extended attribute "host": 127.0.0.1:5731
-[2084177] Extended attribute "protocol": version=2
-[2084177] Request upload-pack for '/parent'
-[2084014] [2084177] Disconnected
+[3305854] Connection from 127.0.0.1:52600
+[3305854] Extended attribute "host": 127.0.0.1:5731
+[3305854] Extended attribute "protocol": version=2
+[3305854] Request upload-pack for '/parent'
+[3305672] [3305854] Disconnected
 packet:    ls-remote< version 2
 ok 2 - connect with git:// using protocol v2: no bundle-uri
 
@@ -373593,11 +373556,11 @@
 	# Server advertised bundle-uri capability
 	grep "< bundle-uri" log
 
-[2084308] Connection from 127.0.0.1:53472
-[2084308] Extended attribute "host": 127.0.0.1:5731
-[2084308] Extended attribute "protocol": version=2
-[2084308] Request upload-pack for '/parent'
-[2084014] [2084308] Disconnected
+[3305975] Connection from 127.0.0.1:52616
+[3305975] Extended attribute "host": 127.0.0.1:5731
+[3305975] Extended attribute "protocol": version=2
+[3305975] Request upload-pack for '/parent'
+[3305672] [3305975] Disconnected
 packet:    ls-remote< version 2
 packet:    ls-remote< bundle-uri
 ok 3 - connect with git:// using protocol v2: have bundle-uri
@@ -373654,28 +373617,28 @@
 	# Client did not issue bundle-uri command (--bundle-uri override)
 	! grep "> command=bundle-uri" log3
 
-[2084438] Connection from 127.0.0.1:53482
-[2084438] Extended attribute "host": 127.0.0.1:5731
-[2084438] Extended attribute "protocol": version=2
-[2084438] Request upload-pack for '/parent'
-[2084014] [2084438] Disconnected
+[3306072] Connection from 127.0.0.1:52630
+[3306072] Extended attribute "host": 127.0.0.1:5731
+[3306072] Extended attribute "protocol": version=2
+[3306072] Request upload-pack for '/parent'
+[3305672] [3306072] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
-[2084592] Connection from 127.0.0.1:53486
-[2084592] Extended attribute "host": 127.0.0.1:5731
-[2084592] Extended attribute "protocol": version=2
-[2084592] Request upload-pack for '/parent'
-[2084014] [2084592] Disconnected
+[3306220] Connection from 127.0.0.1:52644
+[3306220] Extended attribute "host": 127.0.0.1:5731
+[3306220] Extended attribute "protocol": version=2
+[3306220] Request upload-pack for '/parent'
+[3305672] [3306220] Disconnected
 packet:        clone< version 2
 packet:        clone< version 2
 packet:        clone< bundle-uri
 packet:        clone< bundle-uri
 packet:        clone> command=bundle-uri
-[2084752] Connection from 127.0.0.1:53488
-[2084752] Extended attribute "host": 127.0.0.1:5731
-[2084752] Extended attribute "protocol": version=2
-[2084752] Request upload-pack for '/parent'
-[2084014] [2084752] Disconnected
+[3306385] Connection from 127.0.0.1:52650
+[3306385] Extended attribute "host": 127.0.0.1:5731
+[3306385] Extended attribute "protocol": version=2
+[3306385] Request upload-pack for '/parent'
+[3305672] [3306385] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
 ok 4 - clone with git:// using protocol v2: request bundle-uris
@@ -373704,11 +373667,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[2084997] Connection from 127.0.0.1:53500
-[2084997] Extended attribute "host": 127.0.0.1:5731
-[2084997] Extended attribute "protocol": version=2
-[2084997] Request upload-pack for '/parent'
-[2084014] [2084997] Disconnected
+[3306607] Connection from 127.0.0.1:52652
+[3306607] Extended attribute "host": 127.0.0.1:5731
+[3306607] Extended attribute "protocol": version=2
+[3306607] Request upload-pack for '/parent'
+[3305672] [3306607] Disconnected
 ok 6 - test bundle-uri with git:// using protocol v2
 
 expecting success of 5731.7 'test bundle-uri with git:// using protocol v2 and extra data': 
@@ -373733,11 +373696,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[2085254] Connection from 127.0.0.1:53504
-[2085254] Extended attribute "host": 127.0.0.1:5731
-[2085254] Extended attribute "protocol": version=2
-[2085254] Request upload-pack for '/parent'
-[2084014] [2085254] Disconnected
+[3306836] Connection from 127.0.0.1:52668
+[3306836] Extended attribute "host": 127.0.0.1:5731
+[3306836] Extended attribute "protocol": version=2
+[3306836] Request upload-pack for '/parent'
+[3305672] [3306836] Disconnected
 ok 7 - test bundle-uri with git:// using protocol v2 and extra data
 
 expecting success of 5731.8 'test bundle-uri with git:// using protocol v2 with list': 
@@ -373767,33 +373730,18 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[2085538] Connection from 127.0.0.1:53516
-[2085538] Extended attribute "host": 127.0.0.1:5731
-[2085538] Extended attribute "protocol": version=2
-[2085538] Request upload-pack for '/parent'
-[2084014] [2085538] Disconnected
+[3307027] Connection from 127.0.0.1:52676
+[3307027] Extended attribute "host": 127.0.0.1:5731
+[3307027] Extended attribute "protocol": version=2
+[3307027] Request upload-pack for '/parent'
+[3305672] [3307027] Disconnected
 ok 8 - test bundle-uri with git:// using protocol v2 with list
 
 Stopping git daemon ...
-Terminated
 # passed all 8 test(s)
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5732-protocol-v2-bundle-uri-http.sh ***
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5526-fetch-submodules.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5526-fetch-submodules/.git/
 expecting success of 5526.1 'setup': 
@@ -375657,305 +375605,6 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5750-bundle-uri-parse.sh ***
-expecting success of 5750.1 'bundle_uri_parse_line() just URIs': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
-	bundle.two.uri=https://example.com/bundle.bdl
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
-
-	test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 1 - bundle_uri_parse_line() just URIs
-
-expecting success of 5750.2 'bundle_uri_parse_line(): relative URIs': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=bundle.bdl
-	bundle.two.uri=../bundle.bdl
-	bundle.three.uri=sub/dir/bundle.bdl
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/sub/dir/bundle.bdl
-	EOF
-
-	test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 2 - bundle_uri_parse_line(): relative URIs
-
-expecting success of 5750.3 'bundle_uri_parse_line(): relative URIs and parent paths': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=bundle.bdl
-	bundle.two.uri=../bundle.bdl
-	bundle.three.uri=../../bundle.bdl
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/../bundle.bdl
-	EOF
-
-	# TODO: We would prefer if parsing a bundle list would not cause
-	# a die() and instead would give a warning and allow the rest of
-	# a Git command to continue. This test_must_fail is necessary for
-	# now until the interface for relative_url() allows for reporting
-	# an error instead of die()ing.
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	grep "fatal: cannot strip one component off url" err
-
-fatal: cannot strip one component off url '.'
-ok 3 - bundle_uri_parse_line(): relative URIs and parent paths
-
-expecting success of 5750.4 'bundle_uri_parse_line() parsing edge cases: empty key or value': 
-	cat >in <<-\EOF &&
-	=bogus-value
-	bogus-key=
-	EOF
-
-	cat >err.expect <<-EOF &&
-	error: bundle-uri: line has empty key or value
-	error: bad line: '=bogus-value'
-	error: bundle-uri: line has empty key or value
-	error: bad line: 'bogus-key='
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
-
-ok 4 - bundle_uri_parse_line() parsing edge cases: empty key or value
-
-expecting success of 5750.5 'bundle_uri_parse_line() parsing edge cases: empty lines': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
-
-	bundle.two.uri=https://example.com/bundle.bdl
-
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
-
-	cat >err.expect <<-\EOF &&
-	error: bundle-uri: got an empty line
-	error: bad line: ''
-	error: bundle-uri: got an empty line
-	error: bad line: ''
-	EOF
-
-	# We fail, but try to continue parsing regardless
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
-
-ok 5 - bundle_uri_parse_line() parsing edge cases: empty lines
-
-expecting success of 5750.6 'bundle_uri_parse_line() parsing edge cases: duplicate lines': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
-	bundle.two.uri=https://example.com/bundle.bdl
-	bundle.one.uri=https://example.com/bundle-2.bdl
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
-
-	cat >err.expect <<-\EOF &&
-	error: bad line: 'bundle.one.uri=https://example.com/bundle-2.bdl'
-	EOF
-
-	# We fail, but try to continue parsing regardless
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
-
-ok 6 - bundle_uri_parse_line() parsing edge cases: duplicate lines
-
-expecting success of 5750.7 'parse config format: just URIs': 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
-
-	test-tool bundle-uri parse-config expect >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 7 - parse config format: just URIs
-
-expecting success of 5750.8 'parse config format: relative URIs': 
-	cat >in <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = bundle.bdl
-	[bundle "two"]
-		uri = ../bundle.bdl
-	[bundle "three"]
-		uri = sub/dir/bundle.bdl
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/sub/dir/bundle.bdl
-	EOF
-
-	test-tool bundle-uri parse-config in >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 8 - parse config format: relative URIs
-
-expecting success of 5750.9 'parse config format edge cases: empty key or value': 
-	cat >in1 <<-\EOF &&
-	= bogus-value
-	EOF
-
-	cat >err1 <<-EOF &&
-	error: bad config line 1 in file in1
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-config in1 >actual 2>err &&
-	test_cmp err1 err &&
-	test_cmp_config_output expect actual &&
-
-	cat >in2 <<-\EOF &&
-	bogus-key =
-	EOF
-
-	cat >err2 <<-EOF &&
-	error: bad config line 1 in file in2
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-config in2 >actual 2>err &&
-	test_cmp err2 err &&
-	test_cmp_config_output expect actual
-
-ok 9 - parse config format edge cases: empty key or value
-
-expecting success of 5750.10 'parse config format: creationToken heuristic': 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-		heuristic = creationToken
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-		creationToken = 123456
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-		creationToken = 12345678901234567890
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-		creationToken = 1
-	EOF
-
-	test-tool bundle-uri parse-config expect >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 10 - parse config format: creationToken heuristic
-
-expecting success of 5750.11 'parse config format edge cases: creationToken heuristic': 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-		heuristic = creationToken
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-		creationToken = bogus
-	EOF
-
-	test-tool bundle-uri parse-config expect >actual 2>err &&
-	grep "could not parse bundle list key creationToken with value 'bogus'" err
-
-warning: could not parse bundle list key creationToken with value 'bogus'
-ok 11 - parse config format edge cases: creationToken heuristic
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5705-session-id-in-capabilities.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/.git/
 expecting success of 5705.1 'setup repos for session ID capability tests': 
@@ -376118,8 +375767,8 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192204.592220Z-H8d819085-P001fd1d3","thread":"main","time":"2026-04-19T19:22:04.618701Z","file":"transport.c","line":379,"t_abs":0.026692,"t_rel":0.025561,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192204.592220Z-H8d819085-P001fd1d3/20260419T192204.613791Z-H8d819085-P001fd1ed"}
-{"event":"data","sid":"20260419T192204.592220Z-H8d819085-P001fd1d3/20260419T192204.613791Z-H8d819085-P001fd1ed","thread":"main","time":"2026-04-19T19:22:04.619433Z","file":"upload-pack.c","line":1173,"t_abs":0.005823,"t_rel":0.005823,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192204.592220Z-H8d819085-P001fd1d3"}
+{"event":"data","sid":"20250317T132514.761493Z-H5c947e1c-P00327367","thread":"main","time":"2025-03-17T13:25:14.789245Z","file":"transport.c","line":379,"t_abs":0.027973,"t_rel":0.026869,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132514.761493Z-H5c947e1c-P00327367/20250317T132514.787421Z-H5c947e1c-P0032737c"}
+{"event":"data","sid":"20250317T132514.761493Z-H5c947e1c-P00327367/20250317T132514.787421Z-H5c947e1c-P0032737c","thread":"main","time":"2025-03-17T13:25:14.804104Z","file":"upload-pack.c","line":1173,"t_abs":0.016860,"t_rel":0.016860,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132514.761493Z-H5c947e1c-P00327367"}
 ok 9 - session IDs advertised (fetch v0)
 
 expecting success of 5705.10 'session IDs advertised (push v0)': 
@@ -376144,8 +375793,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260419T192204.974689Z-H8d819085-P001fd308","thread":"main","time":"2026-04-19T19:22:05.011456Z","file":"transport.c","line":379,"t_abs":0.036997,"t_rel":0.035976,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192204.974689Z-H8d819085-P001fd308/20260419T192205.007613Z-H8d819085-P001fd32e"}
-{"event":"data","sid":"20260419T192204.974689Z-H8d819085-P001fd308/20260419T192205.007613Z-H8d819085-P001fd32e","thread":"main","time":"2026-04-19T19:22:05.014656Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.007245,"t_rel":0.007245,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192204.974689Z-H8d819085-P001fd308"}
+{"event":"data","sid":"20250317T132515.415900Z-H5c947e1c-P003274dc","thread":"main","time":"2025-03-17T13:25:15.444881Z","file":"transport.c","line":379,"t_abs":0.029170,"t_rel":0.028231,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132515.415900Z-H5c947e1c-P003274dc/20250317T132515.444160Z-H5c947e1c-P003274e7"}
+{"event":"data","sid":"20250317T132515.415900Z-H5c947e1c-P003274dc/20250317T132515.444160Z-H5c947e1c-P003274e7","thread":"main","time":"2025-03-17T13:25:15.453180Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.009217,"t_rel":0.009217,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132515.415900Z-H5c947e1c-P003274dc"}
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 10 - session IDs advertised (push v0)
@@ -376163,8 +375812,8 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192205.360231Z-H8d819085-P001fd455","thread":"main","time":"2026-04-19T19:22:05.385092Z","file":"connect.c","line":178,"t_abs":0.025048,"t_rel":0.023953,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
-{"event":"data","sid":"20260419T192205.360231Z-H8d819085-P001fd455/20260419T192205.384108Z-H8d819085-P001fd474","thread":"main","time":"2026-04-19T19:22:05.384642Z","file":"protocol.c","line":80,"t_abs":0.000740,"t_rel":0.000740,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20250317T132516.003419Z-H5c947e1c-P003275ec","thread":"main","time":"2025-03-17T13:25:16.051181Z","file":"connect.c","line":178,"t_abs":0.047939,"t_rel":0.046908,"nesting":3,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20250317T132516.003419Z-H5c947e1c-P003275ec/20250317T132516.050269Z-H5c947e1c-P0032760e","thread":"main","time":"2025-03-17T13:25:16.050771Z","file":"protocol.c","line":80,"t_abs":0.000716,"t_rel":0.000716,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
 ok 11 - client & server log negotiated version (v0)
 
 expecting success of 5705.12 'session IDs advertised (fetch v1)': 
@@ -376180,8 +375829,8 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192205.572987Z-H8d819085-P001fd515","thread":"main","time":"2026-04-19T19:22:05.608547Z","file":"transport.c","line":379,"t_abs":0.035788,"t_rel":0.034663,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192205.572987Z-H8d819085-P001fd515/20260419T192205.607591Z-H8d819085-P001fd531"}
-{"event":"data","sid":"20260419T192205.572987Z-H8d819085-P001fd515/20260419T192205.607591Z-H8d819085-P001fd531","thread":"main","time":"2026-04-19T19:22:05.614648Z","file":"upload-pack.c","line":1173,"t_abs":0.007259,"t_rel":0.007259,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192205.572987Z-H8d819085-P001fd515"}
+{"event":"data","sid":"20250317T132516.241184Z-H5c947e1c-P003276a0","thread":"main","time":"2025-03-17T13:25:16.252480Z","file":"transport.c","line":379,"t_abs":0.011499,"t_rel":0.010426,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132516.241184Z-H5c947e1c-P003276a0/20250317T132516.251543Z-H5c947e1c-P003276a6"}
+{"event":"data","sid":"20250317T132516.241184Z-H5c947e1c-P003276a0/20250317T132516.251543Z-H5c947e1c-P003276a6","thread":"main","time":"2025-03-17T13:25:16.258004Z","file":"upload-pack.c","line":1173,"t_abs":0.006655,"t_rel":0.006655,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132516.241184Z-H5c947e1c-P003276a0"}
 ok 12 - session IDs advertised (fetch v1)
 
 expecting success of 5705.13 'session IDs advertised (push v1)': 
@@ -376206,8 +375855,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260419T192206.021688Z-H8d819085-P001fd69b","thread":"main","time":"2026-04-19T19:22:06.046693Z","file":"transport.c","line":379,"t_abs":0.025187,"t_rel":0.024249,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192206.021688Z-H8d819085-P001fd69b/20260419T192206.043884Z-H8d819085-P001fd6be"}
-{"event":"data","sid":"20260419T192206.021688Z-H8d819085-P001fd69b/20260419T192206.043884Z-H8d819085-P001fd6be","thread":"main","time":"2026-04-19T19:22:06.050653Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.006961,"t_rel":0.006961,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192206.021688Z-H8d819085-P001fd69b"}
+{"event":"data","sid":"20250317T132516.735781Z-H5c947e1c-P003277d7","thread":"main","time":"2025-03-17T13:25:16.760274Z","file":"transport.c","line":379,"t_abs":0.024686,"t_rel":0.023745,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132516.735781Z-H5c947e1c-P003277d7/20250317T132516.759542Z-H5c947e1c-P003277e9"}
+{"event":"data","sid":"20250317T132516.735781Z-H5c947e1c-P003277d7/20250317T132516.759542Z-H5c947e1c-P003277e9","thread":"main","time":"2025-03-17T13:25:16.777176Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.017829,"t_rel":0.017829,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132516.735781Z-H5c947e1c-P003277d7"}
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 13 - session IDs advertised (push v1)
@@ -376225,8 +375874,8 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192206.372206Z-H8d819085-P001fd7cc","thread":"main","time":"2026-04-19T19:22:06.394733Z","file":"connect.c","line":178,"t_abs":0.022701,"t_rel":0.021636,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
-{"event":"data","sid":"20260419T192206.372206Z-H8d819085-P001fd7cc/20260419T192206.392003Z-H8d819085-P001fd7db","thread":"main","time":"2026-04-19T19:22:06.392496Z","file":"protocol.c","line":80,"t_abs":0.000688,"t_rel":0.000688,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20250317T132517.138473Z-H5c947e1c-P003278e6","thread":"main","time":"2025-03-17T13:25:17.165173Z","file":"connect.c","line":178,"t_abs":0.026875,"t_rel":0.025868,"nesting":3,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20250317T132517.138473Z-H5c947e1c-P003278e6/20250317T132517.160908Z-H5c947e1c-P003278eb","thread":"main","time":"2025-03-17T13:25:17.161403Z","file":"protocol.c","line":80,"t_abs":0.000674,"t_rel":0.000674,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
 ok 14 - client & server log negotiated version (v1)
 
 expecting success of 5705.15 'session IDs advertised (fetch v2)': 
@@ -376242,8 +375891,8 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192206.624133Z-H8d819085-P001fd891","thread":"main","time":"2026-04-19T19:22:06.650914Z","file":"transport.c","line":362,"t_abs":0.026969,"t_rel":0.025853,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192206.624133Z-H8d819085-P001fd891/20260419T192206.647629Z-H8d819085-P001fd8aa"}
-{"event":"data","sid":"20260419T192206.624133Z-H8d819085-P001fd891/20260419T192206.647629Z-H8d819085-P001fd8aa","thread":"main","time":"2026-04-19T19:22:06.651759Z","file":"serve.c","line":89,"t_abs":0.004347,"t_rel":0.004347,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192206.624133Z-H8d819085-P001fd891"}
+{"event":"data","sid":"20250317T132517.427611Z-H5c947e1c-P003279c8","thread":"main","time":"2025-03-17T13:25:17.444328Z","file":"transport.c","line":362,"t_abs":0.016902,"t_rel":0.015875,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132517.427611Z-H5c947e1c-P003279c8/20250317T132517.443691Z-H5c947e1c-P003279cd"}
+{"event":"data","sid":"20250317T132517.427611Z-H5c947e1c-P003279c8/20250317T132517.443691Z-H5c947e1c-P003279cd","thread":"main","time":"2025-03-17T13:25:17.457999Z","file":"serve.c","line":89,"t_abs":0.014488,"t_rel":0.014488,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132517.427611Z-H5c947e1c-P003279c8"}
 ok 15 - session IDs advertised (fetch v2)
 
 expecting success of 5705.16 'session IDs advertised (push v2)': 
@@ -376268,8 +375917,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20260419T192207.075268Z-H8d819085-P001fda02","thread":"main","time":"2026-04-19T19:22:07.097755Z","file":"transport.c","line":379,"t_abs":0.022706,"t_rel":0.021692,"nesting":3,"category":"transfer","key":"server-sid","value":"20260419T192207.075268Z-H8d819085-P001fda02/20260419T192207.095630Z-H8d819085-P001fda19"}
-{"event":"data","sid":"20260419T192207.075268Z-H8d819085-P001fda02/20260419T192207.095630Z-H8d819085-P001fda19","thread":"main","time":"2026-04-19T19:22:07.099098Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.003670,"t_rel":0.003670,"nesting":1,"category":"transfer","key":"client-sid","value":"20260419T192207.075268Z-H8d819085-P001fda02"}
+{"event":"data","sid":"20250317T132518.037502Z-H5c947e1c-P00327b43","thread":"main","time":"2025-03-17T13:25:18.051534Z","file":"transport.c","line":379,"t_abs":0.014261,"t_rel":0.013269,"nesting":3,"category":"transfer","key":"server-sid","value":"20250317T132518.037502Z-H5c947e1c-P00327b43/20250317T132518.050826Z-H5c947e1c-P00327b56"}
+{"event":"data","sid":"20250317T132518.037502Z-H5c947e1c-P00327b43/20250317T132518.050826Z-H5c947e1c-P00327b56","thread":"main","time":"2025-03-17T13:25:18.065172Z","file":"builtin/receive-pack.c","line":2141,"t_abs":0.014531,"t_rel":0.014531,"nesting":1,"category":"transfer","key":"client-sid","value":"20250317T132518.037502Z-H5c947e1c-P00327b43"}
 To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 16 - session IDs advertised (push v2)
@@ -376287,14 +375936,456 @@
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20260419T192207.456258Z-H8d819085-P001fdb45","thread":"main","time":"2026-04-19T19:22:07.498691Z","file":"connect.c","line":178,"t_abs":0.042620,"t_rel":0.041501,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
-{"event":"data","sid":"20260419T192207.456258Z-H8d819085-P001fdb45/20260419T192207.491616Z-H8d819085-P001fdb6a","thread":"main","time":"2026-04-19T19:22:07.492126Z","file":"protocol.c","line":80,"t_abs":0.000719,"t_rel":0.000719,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20250317T132518.479778Z-H5c947e1c-P00327c62","thread":"main","time":"2025-03-17T13:25:18.496145Z","file":"connect.c","line":178,"t_abs":0.016549,"t_rel":0.015518,"nesting":3,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20250317T132518.479778Z-H5c947e1c-P00327c62/20250317T132518.495558Z-H5c947e1c-P00327c6f","thread":"main","time":"2025-03-17T13:25:18.495996Z","file":"protocol.c","line":80,"t_abs":0.000633,"t_rel":0.000633,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
 ok 17 - client & server log negotiated version (v2)
 
 # passed all 17 test(s)
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5750-bundle-uri-parse.sh ***
+expecting success of 5750.1 'bundle_uri_parse_line() just URIs': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+	bundle.two.uri=https://example.com/bundle.bdl
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 1 - bundle_uri_parse_line() just URIs
+
+expecting success of 5750.2 'bundle_uri_parse_line(): relative URIs': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=bundle.bdl
+	bundle.two.uri=../bundle.bdl
+	bundle.three.uri=sub/dir/bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/sub/dir/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 2 - bundle_uri_parse_line(): relative URIs
+
+expecting success of 5750.3 'bundle_uri_parse_line(): relative URIs and parent paths': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=bundle.bdl
+	bundle.two.uri=../bundle.bdl
+	bundle.three.uri=../../bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/../bundle.bdl
+	EOF
+
+	# TODO: We would prefer if parsing a bundle list would not cause
+	# a die() and instead would give a warning and allow the rest of
+	# a Git command to continue. This test_must_fail is necessary for
+	# now until the interface for relative_url() allows for reporting
+	# an error instead of die()ing.
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	grep "fatal: cannot strip one component off url" err
+
+fatal: cannot strip one component off url '.'
+ok 3 - bundle_uri_parse_line(): relative URIs and parent paths
+
+expecting success of 5750.4 'bundle_uri_parse_line() parsing edge cases: empty key or value': 
+	cat >in <<-\EOF &&
+	=bogus-value
+	bogus-key=
+	EOF
+
+	cat >err.expect <<-EOF &&
+	error: bundle-uri: line has empty key or value
+	error: bad line: '=bogus-value'
+	error: bundle-uri: line has empty key or value
+	error: bad line: 'bogus-key='
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 4 - bundle_uri_parse_line() parsing edge cases: empty key or value
+
+expecting success of 5750.5 'bundle_uri_parse_line() parsing edge cases: empty lines': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+
+	bundle.two.uri=https://example.com/bundle.bdl
+
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
+
+	cat >err.expect <<-\EOF &&
+	error: bundle-uri: got an empty line
+	error: bad line: ''
+	error: bundle-uri: got an empty line
+	error: bad line: ''
+	EOF
+
+	# We fail, but try to continue parsing regardless
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 5 - bundle_uri_parse_line() parsing edge cases: empty lines
+
+expecting success of 5750.6 'bundle_uri_parse_line() parsing edge cases: duplicate lines': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+	bundle.two.uri=https://example.com/bundle.bdl
+	bundle.one.uri=https://example.com/bundle-2.bdl
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
+
+	cat >err.expect <<-\EOF &&
+	error: bad line: 'bundle.one.uri=https://example.com/bundle-2.bdl'
+	EOF
+
+	# We fail, but try to continue parsing regardless
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 6 - bundle_uri_parse_line() parsing edge cases: duplicate lines
+
+expecting success of 5750.7 'parse config format: just URIs': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 7 - parse config format: just URIs
+
+expecting success of 5750.8 'parse config format: relative URIs': 
+	cat >in <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = bundle.bdl
+	[bundle "two"]
+		uri = ../bundle.bdl
+	[bundle "three"]
+		uri = sub/dir/bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/sub/dir/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-config in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 8 - parse config format: relative URIs
+
+expecting success of 5750.9 'parse config format edge cases: empty key or value': 
+	cat >in1 <<-\EOF &&
+	= bogus-value
+	EOF
+
+	cat >err1 <<-EOF &&
+	error: bad config line 1 in file in1
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-config in1 >actual 2>err &&
+	test_cmp err1 err &&
+	test_cmp_config_output expect actual &&
+
+	cat >in2 <<-\EOF &&
+	bogus-key =
+	EOF
+
+	cat >err2 <<-EOF &&
+	error: bad config line 1 in file in2
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-config in2 >actual 2>err &&
+	test_cmp err2 err &&
+	test_cmp_config_output expect actual
+
+ok 9 - parse config format edge cases: empty key or value
+
+expecting success of 5750.10 'parse config format: creationToken heuristic': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+		creationToken = 123456
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+		creationToken = 12345678901234567890
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+		creationToken = 1
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 10 - parse config format: creationToken heuristic
+
+expecting success of 5750.11 'parse config format edge cases: creationToken heuristic': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+		creationToken = bogus
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	grep "could not parse bundle list key creationToken with value 'bogus'" err
+
+warning: could not parse bundle list key creationToken with value 'bogus'
+ok 11 - parse config format edge cases: creationToken heuristic
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5802-connect-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/.git/
+expecting success of 5802.1 'setup': 
+	git config --global protocol.ext.allow user &&
+	test_tick &&
+	git commit --allow-empty -m initial &&
+	test_tick &&
+	git commit --allow-empty -m second &&
+	test_tick &&
+	git commit --allow-empty -m third &&
+	test_tick &&
+	git tag -a -m "tip three" three &&
+
+	test_tick &&
+	git commit --allow-empty -m fourth
+
+[master (root-commit) 66fe8b3] initial
+ Author: A U Thor <author@example.com>
+[master 5ce2b00] second
+ Author: A U Thor <author@example.com>
+[master 8019b76] third
+ Author: A U Thor <author@example.com>
+[master b0c6cf2] fourth
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 5802.2 'clone': 
+	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
+	git clone "ext::sh -c %S% ." dst &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git config remote.origin.url "ext::sh -c $cmd" &&
+		git for-each-ref refs/heads/ refs/tags/
+	) >actual &&
+	test_cmp expect actual
+
+Cloning into 'dst'...
+ok 2 - clone
+
+expecting success of 5802.3 'update following tag': 
+	test_tick &&
+	git commit --allow-empty -m fifth &&
+	test_tick &&
+	git tag -a -m "tip five" five &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+[master a643494] fifth
+ Author: A U Thor <author@example.com>
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+   b0c6cf2..a643494  master     -> origin/master
+ * [new tag]         five       -> five
+Updating b0c6cf2..a643494
+Fast-forward
+ok 3 - update following tag
+
+expecting success of 5802.4 'update backfilled tag': 
+	test_tick &&
+	git commit --allow-empty -m sixth &&
+	test_tick &&
+	git tag -a -m "tip two" two three^1 &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+[master 06b114e] sixth
+ Author: A U Thor <author@example.com>
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+   a643494..06b114e  master     -> origin/master
+ * [new tag]         two        -> two
+Updating a643494..06b114e
+Fast-forward
+ok 4 - update backfilled tag
+
+expecting success of 5802.5 'update backfilled tag without primary transfer': 
+	test_tick &&
+	git tag -a -m "tip one " one two^1 &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+ * [new tag]         one        -> one
+Already up to date.
+ok 5 - update backfilled tag without primary transfer
+
+expecting success of 5802.6 'set up fake git-daemon': 
+	mkdir remote &&
+	git init --bare remote/one.git &&
+	mkdir remote/host &&
+	git init --bare remote/host/two.git &&
+	write_script fake-daemon <<-\EOF &&
+	git daemon --inetd \
+		--informative-errors \
+		--export-all \
+		--base-path="$TRASH_DIRECTORY/remote" \
+		--interpolated-path="$TRASH_DIRECTORY/remote/%H%D" \
+		"$TRASH_DIRECTORY/remote"
+	EOF
+	export TRASH_DIRECTORY &&
+	PATH=$TRASH_DIRECTORY:$PATH
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/remote/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/remote/host/two.git/
+ok 6 - set up fake git-daemon
+
+expecting success of 5802.7 'ext command can connect to git daemon (no vhost)': 
+	rm -rf dst &&
+	git clone "ext::fake-daemon %G/one.git" dst
+
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+ok 7 - ext command can connect to git daemon (no vhost)
+
+expecting success of 5802.8 'ext command can connect to git daemon (vhost)': 
+	rm -rf dst &&
+	git clone "ext::fake-daemon %G/two.git %Vhost" dst
+
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+ok 8 - ext command can connect to git daemon (vhost)
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5703-upload-pack-ref-in-want.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5703-upload-pack-ref-in-want/.git/
 expecting success of 5703.1 'setup repository': 
@@ -376559,7 +376650,7 @@
  * [new ref]         2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5 -> actual
  * [new tag]         d                                        -> d
  * [new tag]         b                                        -> b
-{"event":"data","sid":"20260419T192204.328406Z-H8d819085-P001fd0fc","thread":"main","time":"2026-04-19T19:22:04.360916Z","file":"fetch-pack.c","line":1760,"repo":1,"t_abs":0.032701,"t_rel":0.001895,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
+{"event":"data","sid":"20250317T132515.143779Z-H5c947e1c-P00327450","thread":"main","time":"2025-03-17T13:25:15.191697Z","file":"fetch-pack.c","line":1760,"repo":1,"t_abs":0.048120,"t_rel":0.001640,"nesting":3,"category":"negotiation_v2","key":"total_rounds","value":"2"}
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
@@ -376863,149 +376954,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5802-connect-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/.git/
-expecting success of 5802.1 'setup': 
-	git config --global protocol.ext.allow user &&
-	test_tick &&
-	git commit --allow-empty -m initial &&
-	test_tick &&
-	git commit --allow-empty -m second &&
-	test_tick &&
-	git commit --allow-empty -m third &&
-	test_tick &&
-	git tag -a -m "tip three" three &&
-
-	test_tick &&
-	git commit --allow-empty -m fourth
-
-[master (root-commit) 66fe8b3] initial
- Author: A U Thor <author@example.com>
-[master 5ce2b00] second
- Author: A U Thor <author@example.com>
-[master 8019b76] third
- Author: A U Thor <author@example.com>
-[master b0c6cf2] fourth
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 5802.2 'clone': 
-	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
-	git clone "ext::sh -c %S% ." dst &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git config remote.origin.url "ext::sh -c $cmd" &&
-		git for-each-ref refs/heads/ refs/tags/
-	) >actual &&
-	test_cmp expect actual
-
-Cloning into 'dst'...
-ok 2 - clone
-
-expecting success of 5802.3 'update following tag': 
-	test_tick &&
-	git commit --allow-empty -m fifth &&
-	test_tick &&
-	git tag -a -m "tip five" five &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-[master a643494] fifth
- Author: A U Thor <author@example.com>
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
-   b0c6cf2..a643494  master     -> origin/master
- * [new tag]         five       -> five
-Updating b0c6cf2..a643494
-Fast-forward
-ok 3 - update following tag
-
-expecting success of 5802.4 'update backfilled tag': 
-	test_tick &&
-	git commit --allow-empty -m sixth &&
-	test_tick &&
-	git tag -a -m "tip two" two three^1 &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-[master 06b114e] sixth
- Author: A U Thor <author@example.com>
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
-   a643494..06b114e  master     -> origin/master
- * [new tag]         two        -> two
-Updating a643494..06b114e
-Fast-forward
-ok 4 - update backfilled tag
-
-expecting success of 5802.5 'update backfilled tag without primary transfer': 
-	test_tick &&
-	git tag -a -m "tip one " one two^1 &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
- * [new tag]         one        -> one
-Already up to date.
-ok 5 - update backfilled tag without primary transfer
-
-expecting success of 5802.6 'set up fake git-daemon': 
-	mkdir remote &&
-	git init --bare remote/one.git &&
-	mkdir remote/host &&
-	git init --bare remote/host/two.git &&
-	write_script fake-daemon <<-\EOF &&
-	git daemon --inetd \
-		--informative-errors \
-		--export-all \
-		--base-path="$TRASH_DIRECTORY/remote" \
-		--interpolated-path="$TRASH_DIRECTORY/remote/%H%D" \
-		"$TRASH_DIRECTORY/remote"
-	EOF
-	export TRASH_DIRECTORY &&
-	PATH=$TRASH_DIRECTORY:$PATH
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/remote/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5802-connect-helper/remote/host/two.git/
-ok 6 - set up fake git-daemon
-
-expecting success of 5802.7 'ext command can connect to git daemon (no vhost)': 
-	rm -rf dst &&
-	git clone "ext::fake-daemon %G/one.git" dst
-
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-ok 7 - ext command can connect to git daemon (no vhost)
-
-expecting success of 5802.8 'ext command can connect to git daemon (vhost)': 
-	rm -rf dst &&
-	git clone "ext::fake-daemon %G/two.git %Vhost" dst
-
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-ok 8 - ext command can connect to git daemon (vhost)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5812-proto-disable-http.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5812-proto-disable-http/.git/
 checking prerequisite: NOT_ROOT
@@ -377366,7 +377314,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[2089102] Ready to rumble
+[3309943] Ready to rumble
 expecting success of 5811.1 'create git-accessible repo': 
 	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
 	test_commit one &&
@@ -377393,11 +377341,11 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-[2089459] Connection from 127.0.0.1:60524
-[2089459] Extended attribute "host": 127.0.0.1:5811
-[2089459] Extended attribute "protocol": version=2
-[2089459] Request upload-pack for '/repo.git'
-[2089102] [2089459] Disconnected
+[3310207] Connection from 127.0.0.1:50180
+[3310207] Extended attribute "host": 127.0.0.1:5811
+[3310207] Extended attribute "protocol": version=2
+[3310207] Request upload-pack for '/repo.git'
+[3309943] [3310207] Disconnected
 ok 2 - clone git:// (enabled)
 
 expecting success of 5811.3 'fetch git:// (enabled)': 
@@ -377408,13 +377356,13 @@
 			git fetch
 		)
 	
-[2089592] Connection from 127.0.0.1:60532
-[2089592] Extended attribute "host": 127.0.0.1:5811
-[2089592] Extended attribute "protocol": version=2
-[2089592] Request upload-pack for '/repo.git'
+[3310310] Connection from 127.0.0.1:50196
+[3310310] Extended attribute "host": 127.0.0.1:5811
+[3310310] Extended attribute "protocol": version=2
+[3310310] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[2089102] [2089592] Disconnected
+[3309943] [3310310] Disconnected
 ok 3 - fetch git:// (enabled)
 
 expecting success of 5811.4 'push git:// (enabled)': 
@@ -377425,12 +377373,12 @@
 			git push origin HEAD:pushed
 		)
 	
-[2089687] Connection from 127.0.0.1:60548
-[2089687] Extended attribute "host": 127.0.0.1:5811
-[2089687] Request receive-pack for '/repo.git'
-[2089102] [2089687] Disconnected
+[3310426] Connection from 127.0.0.1:50204
+[3310426] Extended attribute "host": 127.0.0.1:5811
+[3310426] Request receive-pack for '/repo.git'
 To git://127.0.0.1:5811/repo.git
  * [new branch]      HEAD -> pushed
+[3309943] [3310426] Disconnected
 ok 4 - push git:// (enabled)
 
 expecting success of 5811.5 'push git:// (disabled)': 
@@ -377487,35 +377435,35 @@
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[2090050] Connection from 127.0.0.1:60554
-[2090050] Extended attribute "host": 127.0.0.1:5811
-[2090050] Extended attribute "protocol": version=2
-[2090050] Request upload-pack for '/repo.git'
-[2089102] [2090050] Disconnected
+[3310765] Connection from 127.0.0.1:50214
+[3310765] Extended attribute "host": 127.0.0.1:5811
+[3310765] Extended attribute "protocol": version=2
+[3310765] Request upload-pack for '/repo.git'
+[3309943] [3310765] Disconnected
 ok 9 - clone git:// (enabled with config)
 
 expecting success of 5811.10 'fetch git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=always fetch
 	
-[2090192] Connection from 127.0.0.1:60566
-[2090192] Extended attribute "host": 127.0.0.1:5811
-[2090192] Extended attribute "protocol": version=2
-[2090192] Request upload-pack for '/repo.git'
+[3310871] Connection from 127.0.0.1:50220
+[3310871] Extended attribute "host": 127.0.0.1:5811
+[3310871] Extended attribute "protocol": version=2
+[3310871] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[2089102] [2090192] Disconnected
+[3309943] [3310871] Disconnected
 ok 10 - fetch git:// (enabled)
 
 expecting success of 5811.11 'push git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
 	
-[2090323] Connection from 127.0.0.1:60568
-[2090323] Extended attribute "host": 127.0.0.1:5811
-[2090323] Request receive-pack for '/repo.git'
+[3310960] Connection from 127.0.0.1:50224
+[3310960] Extended attribute "host": 127.0.0.1:5811
+[3310960] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 11 - push git:// (enabled)
 
-[2089102] [2090323] Disconnected
+[3309943] [3310960] Disconnected
 expecting success of 5811.12 'push git:// (disabled)': 
 		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
 	
@@ -377541,35 +377489,35 @@
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[2090470] Connection from 127.0.0.1:60580
-[2090470] Extended attribute "host": 127.0.0.1:5811
-[2090470] Extended attribute "protocol": version=2
-[2090470] Request upload-pack for '/repo.git'
-[2089102] [2090470] Disconnected
+[3311112] Connection from 127.0.0.1:50226
+[3311112] Extended attribute "host": 127.0.0.1:5811
+[3311112] Extended attribute "protocol": version=2
+[3311112] Request upload-pack for '/repo.git'
+[3309943] [3311112] Disconnected
 ok 15 - clone git:// (enabled)
 
 expecting success of 5811.16 'fetch git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-[2090617] Connection from 127.0.0.1:60588
-[2090617] Extended attribute "host": 127.0.0.1:5811
-[2090617] Extended attribute "protocol": version=2
-[2090617] Request upload-pack for '/repo.git'
+[3311232] Connection from 127.0.0.1:50228
+[3311232] Extended attribute "host": 127.0.0.1:5811
+[3311232] Extended attribute "protocol": version=2
+[3311232] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[2089102] [2090617] Disconnected
+[3309943] [3311232] Disconnected
 ok 16 - fetch git:// (enabled)
 
 expecting success of 5811.17 'push git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
-[2090717] Connection from 127.0.0.1:60598
-[2090717] Extended attribute "host": 127.0.0.1:5811
-[2090717] Request receive-pack for '/repo.git'
+[3311356] Connection from 127.0.0.1:50234
+[3311356] Extended attribute "host": 127.0.0.1:5811
+[3311356] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 17 - push git:// (enabled)
 
-[2089102] [2090717] Disconnected
+[3309943] [3311356] Disconnected
 expecting success of 5811.18 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -377610,35 +377558,35 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[2090881] Connection from 127.0.0.1:60610
-[2090881] Extended attribute "host": 127.0.0.1:5811
-[2090881] Extended attribute "protocol": version=2
-[2090881] Request upload-pack for '/repo.git'
-[2089102] [2090881] Disconnected
+[3311538] Connection from 127.0.0.1:43966
+[3311538] Extended attribute "host": 127.0.0.1:5811
+[3311538] Extended attribute "protocol": version=2
+[3311538] Request upload-pack for '/repo.git'
+[3309943] [3311538] Disconnected
 ok 21 - clone git:// (enabled)
 
 expecting success of 5811.22 'fetch git:// (enabled)': 
 		test_config_global protocol.allow always &&
 		git -C tmp.git fetch
 	
-[2091072] Connection from 127.0.0.1:60614
-[2091072] Extended attribute "host": 127.0.0.1:5811
-[2091072] Extended attribute "protocol": version=2
-[2091072] Request upload-pack for '/repo.git'
+[3311680] Connection from 127.0.0.1:43982
+[3311680] Extended attribute "host": 127.0.0.1:5811
+[3311680] Extended attribute "protocol": version=2
+[3311680] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[2089102] [2091072] Disconnected
+[3309943] [3311680] Disconnected
 ok 22 - fetch git:// (enabled)
 
 expecting success of 5811.23 'push git:// (enabled)': 
 		test_config_global protocol.allow always &&
 		git -C tmp.git push origin HEAD:pushed
 	
-[2091235] Connection from 127.0.0.1:60620
-[2091235] Extended attribute "host": 127.0.0.1:5811
-[2091235] Request receive-pack for '/repo.git'
+[3311814] Connection from 127.0.0.1:43986
+[3311814] Extended attribute "host": 127.0.0.1:5811
+[3311814] Request receive-pack for '/repo.git'
 Everything up-to-date
-[2089102] [2091235] Disconnected
+[3309943] [3311814] Disconnected
 ok 23 - push git:// (enabled)
 
 expecting success of 5811.24 'push git:// (disabled)': 
@@ -377665,279 +377613,10 @@
 ok 26 - clone git:// (disabled)
 
 Stopping git daemon ...
-Terminated
 # passed all 26 test(s)
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5814-proto-disable-ext.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5814-proto-disable-ext/.git/
-expecting success of 5814.1 'setup ext wrapper': 
-		write_script fake-remote <<-\EOF &&
-		echo >&2 "fake-remote: $*"
-		cd "$TRASH_DIRECTORY/remote" &&
-		eval "$*"
-		EOF
-		PATH=$TRASH_DIRECTORY:$PATH &&
-		export TRASH_DIRECTORY
-	
-ok 1 - setup ext wrapper
-
-expecting success of 5814.2 'setup repository to clone': 
-	test_commit one &&
-	mkdir remote &&
-	git init --bare remote/repo.git &&
-	git push remote/repo.git HEAD
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
-To remote/repo.git
- * [new branch]      HEAD -> master
-ok 2 - setup repository to clone
-
-expecting success of 5814.3 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 3 - clone remote-helper (enabled)
-
-expecting success of 5814.4 'fetch remote-helper (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 4 - fetch remote-helper (enabled)
-
-expecting success of 5814.5 'push remote-helper (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-fake-remote: git-receive-pack repo.git
-To ext::fake-remote %S repo.git
- * [new branch]      HEAD -> pushed
-ok 5 - push remote-helper (enabled)
-
-expecting success of 5814.6 'push remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'ext' not allowed
-ok 6 - push remote-helper (disabled)
-
-expecting success of 5814.7 'fetch remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'ext' not allowed
-ok 7 - fetch remote-helper (disabled)
-
-expecting success of 5814.8 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 8 - clone remote-helper (disabled)
-
-expecting success of 5814.9 'clone remote-helper (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 9 - clone remote-helper (env var has precedence)
-
-expecting success of 5814.10 'clone remote-helper (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 10 - clone remote-helper (enabled with config)
-
-expecting success of 5814.11 'fetch remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - fetch remote-helper (enabled)
-
-expecting success of 5814.12 'push remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 12 - push remote-helper (enabled)
-
-expecting success of 5814.13 'push remote-helper (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'ext' not allowed
-ok 13 - push remote-helper (disabled)
-
-expecting success of 5814.14 'fetch remote-helper (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'ext' not allowed
-ok 14 - fetch remote-helper (disabled)
-
-expecting success of 5814.15 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 15 - clone remote-helper (disabled)
-
-expecting success of 5814.16 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 16 - clone remote-helper (enabled)
-
-expecting success of 5814.17 'fetch remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 17 - fetch remote-helper (enabled)
-
-expecting success of 5814.18 'push remote-helper (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 18 - push remote-helper (enabled)
-
-expecting success of 5814.19 'push remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'ext' not allowed
-ok 19 - push remote-helper (disabled)
-
-expecting success of 5814.20 'fetch remote-helper (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'ext' not allowed
-ok 20 - fetch remote-helper (disabled)
-
-expecting success of 5814.21 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 21 - clone remote-helper (disabled)
-
-expecting success of 5814.22 'clone remote-helper (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fake-remote: git-upload-pack repo.git
-ok 22 - clone remote-helper (enabled)
-
-expecting success of 5814.23 'fetch remote-helper (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-fake-remote: git-upload-pack repo.git
-From ext::fake-remote %S repo
- * branch            HEAD       -> FETCH_HEAD
-ok 23 - fetch remote-helper (enabled)
-
-expecting success of 5814.24 'push remote-helper (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-fake-remote: git-receive-pack repo.git
-Everything up-to-date
-ok 24 - push remote-helper (enabled)
-
-expecting success of 5814.25 'push remote-helper (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'ext' not allowed
-ok 25 - push remote-helper (disabled)
-
-expecting success of 5814.26 'fetch remote-helper (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'ext' not allowed
-ok 26 - fetch remote-helper (disabled)
-
-expecting success of 5814.27 'clone remote-helper (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ext' not allowed
-ok 27 - clone remote-helper (disabled)
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5810-proto-disable-local.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5810-proto-disable-local/.git/
 expecting success of 5810.1 'setup repository to clone': 
@@ -378429,148 +378108,272 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5900-repo-selection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/.git/
-expecting success of 5900.1 'find .git dir in worktree': 
-	reset &&
-	make_tree foo &&
-	get foo &&
-	check foo
+*** t5814-proto-disable-ext.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5814-proto-disable-ext/.git/
+expecting success of 5814.1 'setup ext wrapper': 
+		write_script fake-remote <<-\EOF &&
+		echo >&2 "fake-remote: $*"
+		cd "$TRASH_DIRECTORY/remote" &&
+		eval "$*"
+		EOF
+		PATH=$TRASH_DIRECTORY:$PATH &&
+		export TRASH_DIRECTORY
+	
+ok 1 - setup ext wrapper
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
+expecting success of 5814.2 'setup repository to clone': 
+	test_commit one &&
+	mkdir remote &&
+	git init --bare remote/repo.git &&
+	git push remote/repo.git HEAD
+
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 1 - find .git dir in worktree
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5814-proto-disable-ext/remote/repo.git/
+To remote/repo.git
+ * [new branch]      HEAD -> master
+ok 2 - setup repository to clone
 
-expecting success of 5900.2 'automagically add .git suffix': 
-	reset &&
-	make_bare foo.git &&
-	get foo &&
-	check foo.git
+expecting success of 5814.3 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 3 - clone remote-helper (enabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
+expecting success of 5814.4 'fetch remote-helper (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 2 - automagically add .git suffix
+ok 4 - fetch remote-helper (enabled)
 
-expecting success of 5900.3 'automagically add .git suffix to worktree': 
-	reset &&
-	make_tree foo.git &&
-	get foo &&
-	check foo.git
+expecting success of 5814.5 'push remote-helper (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+fake-remote: git-receive-pack repo.git
+To ext::fake-remote %S repo.git
+ * [new branch]      HEAD -> pushed
+ok 5 - push remote-helper (enabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/.git/
-[master (root-commit) 98b6c1b] foo.git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.git.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 3 - automagically add .git suffix to worktree
+expecting success of 5814.6 'push remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'ext' not allowed
+ok 6 - push remote-helper (disabled)
 
-expecting success of 5900.4 'prefer worktree foo over bare foo.git': 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
+expecting success of 5814.7 'fetch remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'ext' not allowed
+ok 7 - fetch remote-helper (disabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 4 - prefer worktree foo over bare foo.git
+expecting success of 5814.8 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 8 - clone remote-helper (disabled)
 
-expecting success of 5900.5 'prefer bare foo over bare foo.git': 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo &&
-	check foo
+expecting success of 5814.9 'clone remote-helper (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 9 - clone remote-helper (env var has precedence)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
+expecting success of 5814.10 'clone remote-helper (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 10 - clone remote-helper (enabled with config)
+
+expecting success of 5814.11 'fetch remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 5 - prefer bare foo over bare foo.git
+ok 11 - fetch remote-helper (enabled)
 
-expecting success of 5900.6 'disambiguate with full foo.git': 
-	reset &&
-	make_bare foo &&
-	make_bare foo.git &&
-	get foo.git &&
-	check foo.git
+expecting success of 5814.12 'push remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 12 - push remote-helper (enabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
- * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 6 - disambiguate with full foo.git
+expecting success of 5814.13 'push remote-helper (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'ext' not allowed
+ok 13 - push remote-helper (disabled)
 
-expecting success of 5900.7 'we are not fooled by non-git foo directory': 
-	reset &&
-	make_bare foo.git &&
-	mkdir foo &&
-	get foo &&
-	check foo.git
+expecting success of 5814.14 'fetch remote-helper (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'ext' not allowed
+ok 14 - fetch remote-helper (disabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
+expecting success of 5814.15 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 15 - clone remote-helper (disabled)
+
+expecting success of 5814.16 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 16 - clone remote-helper (enabled)
+
+expecting success of 5814.17 'fetch remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 7 - we are not fooled by non-git foo directory
+ok 17 - fetch remote-helper (enabled)
 
-expecting success of 5900.8 'prefer inner .git over outer bare': 
-	reset &&
-	make_tree foo &&
-	make_bare foo.git &&
-	mv foo/.git foo.git &&
-	get foo.git &&
-	check foo
+expecting success of 5814.18 'push remote-helper (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 18 - push remote-helper (enabled)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
-From ../foo
+expecting success of 5814.19 'push remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'ext' not allowed
+ok 19 - push remote-helper (disabled)
+
+expecting success of 5814.20 'fetch remote-helper (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'ext' not allowed
+ok 20 - fetch remote-helper (disabled)
+
+expecting success of 5814.21 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 21 - clone remote-helper (disabled)
+
+expecting success of 5814.22 'clone remote-helper (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fake-remote: git-upload-pack repo.git
+ok 22 - clone remote-helper (enabled)
+
+expecting success of 5814.23 'fetch remote-helper (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+fake-remote: git-upload-pack repo.git
+From ext::fake-remote %S repo
  * branch            HEAD       -> FETCH_HEAD
-Cloning into 'clone'...
-done.
-ok 8 - prefer inner .git over outer bare
+ok 23 - fetch remote-helper (enabled)
 
-# passed all 8 test(s)
-1..8
+expecting success of 5814.24 'push remote-helper (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+fake-remote: git-receive-pack repo.git
+Everything up-to-date
+ok 24 - push remote-helper (enabled)
+
+expecting success of 5814.25 'push remote-helper (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'ext' not allowed
+ok 25 - push remote-helper (disabled)
+
+expecting success of 5814.26 'fetch remote-helper (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'ext' not allowed
+ok 26 - fetch remote-helper (disabled)
+
+expecting success of 5814.27 'clone remote-helper (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ext' not allowed
+ok 27 - clone remote-helper (disabled)
+
+# passed all 27 test(s)
+1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5815-submodule-protos.sh ***
@@ -378689,6 +378492,229 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6001-rev-list-graft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6001-rev-list-graft/.git/
+expecting success of 6001.1 'setup': 
+	mkdir subdir &&
+	echo >fileA fileA &&
+	echo >subdir/fileB fileB &&
+	git add fileA subdir/fileB &&
+	git commit -a -m "Initial in one history." &&
+	A0=$(git rev-parse --verify HEAD) &&
+
+	echo >fileA fileA modified &&
+	git commit -a -m "Second in one history." &&
+	A1=$(git rev-parse --verify HEAD) &&
+
+	echo >subdir/fileB fileB modified &&
+	git commit -a -m "Third in one history." &&
+	A2=$(git rev-parse --verify HEAD) &&
+
+	git update-ref -d refs/heads/main &&
+	rm -f .git/index &&
+
+	echo >fileA fileA again &&
+	echo >subdir/fileB fileB again &&
+	git add fileA subdir/fileB &&
+	git commit -a -m "Initial in alternate history." &&
+	B0=$(git rev-parse --verify HEAD) &&
+
+	echo >fileA fileA modified in alternate history &&
+	git commit -a -m "Second in alternate history." &&
+	B1=$(git rev-parse --verify HEAD) &&
+
+	echo >subdir/fileB fileB modified in alternate history &&
+	git commit -a -m "Third in alternate history." &&
+	B2=$(git rev-parse --verify HEAD) &&
+	: done
+
+[main (root-commit) ef139ee] Initial in one history.
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 subdir/fileB
+[main c65f681] Second in one history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 65ed2c0] Third in one history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main (root-commit) 0d82fde] Initial in alternate history.
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA
+ create mode 100644 subdir/fileB
+[main a28d994] Second in alternate history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5e838f4] Third in alternate history.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6001.2 'without grafts': 
+		rm -f .git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 2 - without grafts
+
+expecting success of 6001.3 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 3 - with grafts
+
+expecting success of 6001.4 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 4 - without grafts, with pathlimit
+
+expecting success of 6001.5 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 5 - with grafts, with pathlimit
+
+expecting success of 6001.6 'without grafts': 
+		rm -f .git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 6 - without grafts
+
+expecting success of 6001.7 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 7 - with grafts
+
+expecting success of 6001.8 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 8 - without grafts, with pathlimit
+
+expecting success of 6001.9 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 9 - with grafts, with pathlimit
+
+expecting success of 6001.10 'without grafts': 
+		rm -f .git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 10 - without grafts
+
+expecting success of 6001.11 'with grafts': 
+		mkdir -p .git/info &&
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 11 - with grafts
+
+expecting success of 6001.12 'without grafts, with pathlimit': 
+		rm -f .git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
+	
+ok 12 - without grafts, with pathlimit
+
+expecting success of 6001.13 'with grafts, with pathlimit': 
+		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
+		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
+	
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 13 - with grafts, with pathlimit
+
+expecting success of 6001.14 'show advice that grafts are deprecated': 
+	git show HEAD 2>err &&
+	test_grep "git replace" err &&
+	test_config advice.graftFileDeprecated false &&
+	git show HEAD 2>err &&
+	test_grep ! "git replace" err
+
+commit 5e838f46836efb51cd27c11e568fb921733be212
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third in alternate history.
+
+diff --git a/subdir/fileB b/subdir/fileB
+index 2da7ce9..8e5449e 100644
+--- a/subdir/fileB
++++ b/subdir/fileB
+@@ -1 +1 @@
+-fileB again
++fileB modified in alternate history
+hint: Please use "git replace --convert-graft-file"
+commit 5e838f46836efb51cd27c11e568fb921733be212
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third in alternate history.
+
+diff --git a/subdir/fileB b/subdir/fileB
+index 2da7ce9..8e5449e 100644
+--- a/subdir/fileB
++++ b/subdir/fileB
+@@ -1 +1 @@
+-fileB again
++fileB modified in alternate history
+ok 14 - show advice that grafts are deprecated
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6000-rev-list-misc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6000-rev-list-misc/.git/
 expecting success of 6000.1 'setup': 
@@ -378920,227 +378946,148 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6001-rev-list-graft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6001-rev-list-graft/.git/
-expecting success of 6001.1 'setup': 
-	mkdir subdir &&
-	echo >fileA fileA &&
-	echo >subdir/fileB fileB &&
-	git add fileA subdir/fileB &&
-	git commit -a -m "Initial in one history." &&
-	A0=$(git rev-parse --verify HEAD) &&
-
-	echo >fileA fileA modified &&
-	git commit -a -m "Second in one history." &&
-	A1=$(git rev-parse --verify HEAD) &&
-
-	echo >subdir/fileB fileB modified &&
-	git commit -a -m "Third in one history." &&
-	A2=$(git rev-parse --verify HEAD) &&
-
-	git update-ref -d refs/heads/main &&
-	rm -f .git/index &&
-
-	echo >fileA fileA again &&
-	echo >subdir/fileB fileB again &&
-	git add fileA subdir/fileB &&
-	git commit -a -m "Initial in alternate history." &&
-	B0=$(git rev-parse --verify HEAD) &&
-
-	echo >fileA fileA modified in alternate history &&
-	git commit -a -m "Second in alternate history." &&
-	B1=$(git rev-parse --verify HEAD) &&
-
-	echo >subdir/fileB fileB modified in alternate history &&
-	git commit -a -m "Third in alternate history." &&
-	B2=$(git rev-parse --verify HEAD) &&
-	: done
+*** t5900-repo-selection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/.git/
+expecting success of 5900.1 'find .git dir in worktree': 
+	reset &&
+	make_tree foo &&
+	get foo &&
+	check foo
 
-[main (root-commit) ef139ee] Initial in one history.
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA
- create mode 100644 subdir/fileB
-[main c65f681] Second in one history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 65ed2c0] Third in one history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main (root-commit) 0d82fde] Initial in alternate history.
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA
- create mode 100644 subdir/fileB
-[main a28d994] Second in alternate history.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 5e838f4] Third in alternate history.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6001.2 'without grafts': 
-		rm -f .git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 2 - without grafts
-
-expecting success of 6001.3 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 3 - with grafts
-
-expecting success of 6001.4 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 4 - without grafts, with pathlimit
-
-expecting success of 6001.5 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check basic 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 5 - with grafts, with pathlimit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 1 - find .git dir in worktree
 
-expecting success of 6001.6 'without grafts': 
-		rm -f .git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 6 - without grafts
+expecting success of 5900.2 'automagically add .git suffix': 
+	reset &&
+	make_bare foo.git &&
+	get foo &&
+	check foo.git
 
-expecting success of 6001.7 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 7 - with grafts
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 2 - automagically add .git suffix
 
-expecting success of 6001.8 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 8 - without grafts, with pathlimit
+expecting success of 5900.3 'automagically add .git suffix to worktree': 
+	reset &&
+	make_tree foo.git &&
+	get foo &&
+	check foo.git
 
-expecting success of 6001.9 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 9 - with grafts, with pathlimit
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/.git/
+[master (root-commit) 98b6c1b] foo.git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.git.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 3 - automagically add .git suffix to worktree
 
-expecting success of 6001.10 'without grafts': 
-		rm -f .git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 10 - without grafts
+expecting success of 5900.4 'prefer worktree foo over bare foo.git': 
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
 
-expecting success of 6001.11 'with grafts': 
-		mkdir -p .git/info &&
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 -- 5e838f46836efb51cd27c11e568fb921733be212 a28d9941a368a3739ddc8a9c67a28dd90a0ca669 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 c65f681a6ac45210ce25db8c004222384015f12d ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 11 - with grafts
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 4 - prefer worktree foo over bare foo.git
 
-expecting success of 6001.12 'without grafts, with pathlimit': 
-		rm -f .git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f
-	
-ok 12 - without grafts, with pathlimit
+expecting success of 5900.5 'prefer bare foo over bare foo.git': 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo &&
+	check foo
 
-expecting success of 6001.13 'with grafts, with pathlimit': 
-		echo '0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985' >.git/info/grafts &&
-		check parents-raw 5e838f46836efb51cd27c11e568fb921733be212 subdir -- 5e838f46836efb51cd27c11e568fb921733be212 0d82fdeb5973938bdc4012a78789c9db5c3ee79f 65ed2c0025a333574f7366e073f53446a5f69985 ef139eef4eb52908138e45ec41c423805177fd0d
-	
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 13 - with grafts, with pathlimit
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 5 - prefer bare foo over bare foo.git
 
-expecting success of 6001.14 'show advice that grafts are deprecated': 
-	git show HEAD 2>err &&
-	test_grep "git replace" err &&
-	test_config advice.graftFileDeprecated false &&
-	git show HEAD 2>err &&
-	test_grep ! "git replace" err
+expecting success of 5900.6 'disambiguate with full foo.git': 
+	reset &&
+	make_bare foo &&
+	make_bare foo.git &&
+	get foo.git &&
+	check foo.git
 
-commit 5e838f46836efb51cd27c11e568fb921733be212
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 6 - disambiguate with full foo.git
 
-    Third in alternate history.
+expecting success of 5900.7 'we are not fooled by non-git foo directory': 
+	reset &&
+	make_bare foo.git &&
+	mkdir foo &&
+	get foo &&
+	check foo.git
 
-diff --git a/subdir/fileB b/subdir/fileB
-index 2da7ce9..8e5449e 100644
---- a/subdir/fileB
-+++ b/subdir/fileB
-@@ -1 +1 @@
--fileB again
-+fileB modified in alternate history
-hint: Please use "git replace --convert-graft-file"
-commit 5e838f46836efb51cd27c11e568fb921733be212
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 7 - we are not fooled by non-git foo directory
 
-    Third in alternate history.
+expecting success of 5900.8 'prefer inner .git over outer bare': 
+	reset &&
+	make_tree foo &&
+	make_bare foo.git &&
+	mv foo/.git foo.git &&
+	get foo.git &&
+	check foo
 
-diff --git a/subdir/fileB b/subdir/fileB
-index 2da7ce9..8e5449e 100644
---- a/subdir/fileB
-+++ b/subdir/fileB
-@@ -1 +1 @@
--fileB again
-+fileB modified in alternate history
-ok 14 - show advice that grafts are deprecated
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5900-repo-selection/fetch/
+From ../foo
+ * branch            HEAD       -> FETCH_HEAD
+Cloning into 'clone'...
+done.
+ok 8 - prefer inner .git over outer bare
 
-# passed all 14 test(s)
-1..14
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6004-rev-list-path-optim.sh ***
@@ -379269,2753 +379216,536 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5813-proto-disable-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/.git/
-expecting success of 5813.1 'setup ssh wrapper': 
-		write_script ssh-wrapper <<-\EOF &&
-		echo >&2 "ssh: $*"
-		host=$1; shift
-		cd "$TRASH_DIRECTORY/$host" &&
-		eval "$*"
-		EOF
-		GIT_SSH="$PWD/ssh-wrapper" &&
-		export GIT_SSH &&
-		export TRASH_DIRECTORY
-	
-ok 1 - setup ssh wrapper
-
-expecting success of 5813.2 'setup repository to clone': 
-	test_commit one &&
-	mkdir remote &&
-	git init --bare remote/repo.git &&
-	git push remote/repo.git HEAD
+*** t5510-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.git/
+expecting success of 5510.1 'setup': 
+	echo >file original &&
+	git add file &&
+	git commit -a -m original &&
+	git branch -M main
 
-[master (root-commit) d79ce16] one
+[master (root-commit) 7fb3fb8] original
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git/
-To remote/repo.git
- * [new branch]      HEAD -> master
-ok 2 - setup repository to clone
-
-expecting success of 5813.3 'clone host:path (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack 'repo.git'
-ok 3 - clone host:path (enabled)
-
-expecting success of 5813.4 'fetch host:path (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-ssh: remote git-upload-pack 'repo.git'
-From remote:repo
- * branch            HEAD       -> FETCH_HEAD
-ok 4 - fetch host:path (enabled)
+ create mode 100644 file
+ok 1 - setup
 
-expecting success of 5813.5 'push host:path (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-ssh: remote git-receive-pack 'repo.git'
-To remote:repo.git
- * [new branch]      HEAD -> pushed
-ok 5 - push host:path (enabled)
+expecting success of 5510.2 'clone and setup child repos': 
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one"
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.main.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch refs/heads/main:refs/heads/one
+	) &&
+	git clone . three &&
+	(
+		cd three &&
+		git config set remote.two.url ../two/.git/ &&
+		git config set remote.two.fetch refs/heads/main:refs/heads/two &&
+		git config set --append remote.two.fetch refs/heads/one:refs/heads/one &&
+		git config set branch.main.remote two &&
+		git config set branch.main.merge refs/heads/one
+	) &&
+	git clone . bundle &&
+	git clone . seven
 
-expecting success of 5813.6 'push host:path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 6 - push host:path (disabled)
+Cloning into 'one'...
+done.
+[main ffc8fdd] updated by one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'two'...
+done.
+Cloning into 'three'...
+done.
+Cloning into 'bundle'...
+done.
+Cloning into 'seven'...
+done.
+ok 2 - clone and setup child repos
 
-expecting success of 5813.7 'fetch host:path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 7 - fetch host:path (disabled)
+expecting success of 5510.3 'fetch test': 
+	cd "$D" &&
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	cd two &&
+	git fetch &&
+	git rev-parse --verify refs/heads/one &&
+	mine=$(git rev-parse refs/heads/one) &&
+	his=$(cd ../one && git rev-parse refs/heads/main) &&
+	test "z$mine" = "z$his"
 
-expecting success of 5813.8 'clone host:path (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 8 - clone host:path (disabled)
+[main 76a8623] updated by origin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From ../one/
+ * [new branch]      main       -> one
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 3 - fetch test
 
-expecting success of 5813.9 'clone host:path (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 9 - clone host:path (env var has precedence)
+expecting success of 5510.4 'fetch test for-merge': 
+	cd "$D" &&
+	cd three &&
+	git fetch &&
+	git rev-parse --verify refs/heads/two &&
+	git rev-parse --verify refs/heads/one &&
+	main_in_two=$(cd ../two && git rev-parse main) &&
+	one_in_two=$(cd ../two && git rev-parse one) &&
+	{
+		echo "$one_in_two	" &&
+		echo "$main_in_two	not-for-merge"
+	} >expected &&
+	cut -f -2 .git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+From ../two/
+ * [new branch]      one        -> one
+ * [new branch]      main       -> two
+7fb3fb8404d71a4825bdde839cc3884a77651888
+ffc8fdde31e0177ad02216ab27bb483fc88169f2
+ok 4 - fetch test for-merge
 
-expecting success of 5813.10 'clone host:path (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack 'repo.git'
-ok 10 - clone host:path (enabled with config)
+expecting success of 5510.5 'fetch test remote HEAD': 
+	cd "$D" &&
+	cd two &&
+	git fetch &&
+	git rev-parse --verify refs/remotes/origin/HEAD &&
+	git rev-parse --verify refs/remotes/origin/main &&
+	head=$(git rev-parse refs/remotes/origin/HEAD) &&
+	branch=$(git rev-parse refs/remotes/origin/main) &&
+	test "z$head" = "z$branch"
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+ok 5 - fetch test remote HEAD
 
-expecting success of 5813.11 'fetch host:path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-ssh: remote git-upload-pack 'repo.git'
-From remote:repo
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - fetch host:path (enabled)
+expecting success of 5510.6 'fetch test remote HEAD in bare repository': 
+	test_when_finished rm -rf barerepo &&
+	(
+		cd "$D" &&
+		git init --bare barerepo &&
+		cd barerepo &&
+		git remote add upstream ../two &&
+		git fetch upstream &&
+		git rev-parse --verify refs/remotes/upstream/HEAD &&
+		git rev-parse --verify refs/remotes/upstream/main &&
+		head=$(git rev-parse refs/remotes/upstream/HEAD) &&
+		branch=$(git rev-parse refs/remotes/upstream/main) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.12 'push host:path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-ssh: remote git-receive-pack 'repo.git'
-Everything up-to-date
-ok 12 - push host:path (enabled)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/barerepo/
+From ../two
+ * [new branch]      main       -> upstream/main
+ * [new branch]      one        -> upstream/one
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+ok 6 - fetch test remote HEAD in bare repository
 
-expecting success of 5813.13 'push host:path (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 13 - push host:path (disabled)
+expecting success of 5510.7 'fetch test remote HEAD change': 
+	cd "$D" &&
+	cd two &&
+	git switch -c other &&
+	git push -u origin other &&
+	git rev-parse --verify refs/remotes/origin/HEAD &&
+	git rev-parse --verify refs/remotes/origin/main &&
+	git rev-parse --verify refs/remotes/origin/other &&
+	git remote set-head origin other &&
+	git fetch &&
+	head=$(git rev-parse refs/remotes/origin/HEAD) &&
+	branch=$(git rev-parse refs/remotes/origin/other) &&
+	test "z$head" = "z$branch"
+Switched to a new branch 'other'
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ * [new branch]      other -> other
+branch 'other' set up to track 'origin/other'.
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+   7fb3fb8..76a8623  main       -> origin/main
+ok 7 - fetch test remote HEAD change
 
-expecting success of 5813.14 'fetch host:path (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'ssh' not allowed
-ok 14 - fetch host:path (disabled)
+expecting success of 5510.8 'fetch test followRemoteHEAD never': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git config set remote.origin.followRemoteHEAD "never" &&
+		git fetch &&
+		test_must_fail git rev-parse --verify refs/remotes/origin/HEAD
+	)
 
-expecting success of 5813.15 'clone host:path (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 15 - clone host:path (disabled)
+fatal: Needed a single revision
+ok 8 - fetch test followRemoteHEAD never
 
-expecting success of 5813.16 'clone host:path (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack 'repo.git'
-ok 16 - clone host:path (enabled)
+expecting success of 5510.9 'fetch test followRemoteHEAD warn no change': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git fetch >output &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have ${SQ}other${SQ} locally." >expect &&
+		test_cmp expect output &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.17 'fetch host:path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-ssh: remote git-upload-pack 'repo.git'
-From remote:repo
- * branch            HEAD       -> FETCH_HEAD
-ok 17 - fetch host:path (enabled)
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
+hint: will disable the warning until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 9 - fetch test followRemoteHEAD warn no change
 
-expecting success of 5813.18 'push host:path (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-ssh: remote git-receive-pack 'repo.git'
-Everything up-to-date
-ok 18 - push host:path (enabled)
+expecting success of 5510.10 'fetch test followRemoteHEAD warn create': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		output=$(git fetch) &&
+		test "z" = "z$output" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/main) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.19 'push host:path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 19 - push host:path (disabled)
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 10 - fetch test followRemoteHEAD warn create
 
-expecting success of 5813.20 'fetch host:path (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 20 - fetch host:path (disabled)
+expecting success of 5510.11 'fetch test followRemoteHEAD warn detached': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
+		git update-ref refs/remotes/origin/HEAD HEAD &&
+		HEAD=$(git log --pretty="%H") &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		git fetch >output &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have a detached HEAD pointing to" \
+			"${SQ}${HEAD}${SQ} locally." >expect &&
+		test_cmp expect output
+	)
 
-expecting success of 5813.21 'clone host:path (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 21 - clone host:path (disabled)
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
+hint: will disable the warning until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 11 - fetch test followRemoteHEAD warn detached
 
-expecting success of 5813.22 'clone host:path (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack 'repo.git'
-ok 22 - clone host:path (enabled)
+expecting success of 5510.12 'fetch test followRemoteHEAD warn quiet': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn" &&
+		output=$(git fetch --quiet) &&
+		test "z" = "z$output" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.23 'fetch host:path (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-ssh: remote git-upload-pack 'repo.git'
-From remote:repo
- * branch            HEAD       -> FETCH_HEAD
-ok 23 - fetch host:path (enabled)
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 12 - fetch test followRemoteHEAD warn quiet
 
-expecting success of 5813.24 'push host:path (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-ssh: remote git-receive-pack 'repo.git'
-Everything up-to-date
-ok 24 - push host:path (enabled)
+expecting success of 5510.13 'fetch test followRemoteHEAD warn-if-not-branch branch is same': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn-if-not-main" &&
+		actual=$(git fetch) &&
+		test "z" = "z$actual" &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.25 'push host:path (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 25 - push host:path (disabled)
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 13 - fetch test followRemoteHEAD warn-if-not-branch branch is same
 
-expecting success of 5813.26 'fetch host:path (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'ssh' not allowed
-ok 26 - fetch host:path (disabled)
+expecting success of 5510.14 'fetch test followRemoteHEAD warn-if-not-branch branch is different': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "warn-if-not-some/different-branch" &&
+		git fetch >actual &&
+		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
+			"but we have ${SQ}other${SQ} locally." >expect &&
+		test_cmp expect actual &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/other) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.27 'clone host:path (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 27 - clone host:path (disabled)
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+hint: Run 'git remote set-head origin main' to follow the change, or set
+hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
+hint: if you do not want to see this message. Specifically running
+hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
+hint: will disable the warning until the remote changes HEAD to something else.
+hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
+ok 14 - fetch test followRemoteHEAD warn-if-not-branch branch is different
 
-expecting success of 5813.28 'clone ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 28 - clone ssh:// (enabled)
+expecting success of 5510.15 'fetch test followRemoteHEAD always': 
+	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
+	(
+		cd "$D" &&
+		cd two &&
+		git rev-parse --verify refs/remotes/origin/other &&
+		git remote set-head origin other &&
+		git rev-parse --verify refs/remotes/origin/HEAD &&
+		git rev-parse --verify refs/remotes/origin/main &&
+		git config set remote.origin.followRemoteHEAD "always" &&
+		git fetch &&
+		head=$(git rev-parse refs/remotes/origin/HEAD) &&
+		branch=$(git rev-parse refs/remotes/origin/main) &&
+		test "z$head" = "z$branch"
+	)
 
-expecting success of 5813.29 'fetch ssh:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 29 - fetch ssh:// (enabled)
+7fb3fb8404d71a4825bdde839cc3884a77651888
+7fb3fb8404d71a4825bdde839cc3884a77651888
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 15 - fetch test followRemoteHEAD always
 
-expecting success of 5813.30 'push ssh:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 30 - push ssh:// (enabled)
+expecting success of 5510.16 'fetch --prune on its own works as expected': 
+	cd "$D" &&
+	git clone . prune &&
+	cd prune &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-expecting success of 5813.31 'push ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 31 - push ssh:// (disabled)
+	git fetch --prune origin &&
+	test_must_fail git rev-parse origin/extrabranch
 
-expecting success of 5813.32 'fetch ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 32 - fetch ssh:// (disabled)
+Cloning into 'prune'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/extrabranch
+fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/extrabranch
+ok 16 - fetch --prune on its own works as expected
 
-expecting success of 5813.33 'clone ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 33 - clone ssh:// (disabled)
+expecting success of 5510.17 'fetch --prune with a branch name keeps branches': 
+	cd "$D" &&
+	git clone . prune-branch &&
+	cd prune-branch &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-expecting success of 5813.34 'clone ssh:// (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 34 - clone ssh:// (env var has precedence)
+	git fetch --prune origin main &&
+	git rev-parse origin/extrabranch
 
-expecting success of 5813.35 'clone ssh:// (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 35 - clone ssh:// (enabled with config)
+Cloning into 'prune-branch'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 17 - fetch --prune with a branch name keeps branches
 
-expecting success of 5813.36 'fetch ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 36 - fetch ssh:// (enabled)
+expecting success of 5510.18 'fetch --prune with a namespace keeps other namespaces': 
+	cd "$D" &&
+	git clone . prune-namespace &&
+	cd prune-namespace &&
 
-expecting success of 5813.37 'push ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 37 - push ssh:// (enabled)
+	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
+	git rev-parse origin/main
 
-expecting success of 5813.38 'push ssh:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 38 - push ssh:// (disabled)
+Cloning into 'prune-namespace'...
+done.
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 18 - fetch --prune with a namespace keeps other namespaces
 
-expecting success of 5813.39 'fetch ssh:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'ssh' not allowed
-ok 39 - fetch ssh:// (disabled)
+expecting success of 5510.19 'fetch --prune handles overlapping refspecs': 
+	cd "$D" &&
+	git update-ref refs/pull/42/head main &&
+	git clone . prune-overlapping &&
+	cd prune-overlapping &&
+	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
 
-expecting success of 5813.40 'clone ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 40 - clone ssh:// (disabled)
+	git fetch --prune origin &&
+	git rev-parse origin/main &&
+	git rev-parse origin/pr/42 &&
 
-expecting success of 5813.41 'clone ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 41 - clone ssh:// (enabled)
+	git config --unset-all remote.origin.fetch &&
+	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
+	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
 
-expecting success of 5813.42 'fetch ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 42 - fetch ssh:// (enabled)
+	git fetch --prune origin &&
+	git rev-parse origin/main &&
+	git rev-parse origin/pr/42
 
-expecting success of 5813.43 'push ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 43 - push ssh:// (enabled)
+Cloning into 'prune-overlapping'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ * [new ref]         refs/pull/42/head -> origin/pr/42
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 19 - fetch --prune handles overlapping refspecs
 
-expecting success of 5813.44 'push ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 44 - push ssh:// (disabled)
+expecting success of 5510.20 'fetch --prune --tags prunes branches but not tags': 
+	cd "$D" &&
+	git clone . prune-tags &&
+	cd prune-tags &&
+	git tag sometag main &&
+	# Create what looks like a remote-tracking branch from an earlier
+	# fetch that has since been deleted from the remote:
+	git update-ref refs/remotes/origin/fake-remote main &&
 
-expecting success of 5813.45 'fetch ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 45 - fetch ssh:// (disabled)
+	git fetch --prune --tags origin &&
+	git rev-parse origin/main &&
+	test_must_fail git rev-parse origin/fake-remote &&
+	git rev-parse sometag
 
-expecting success of 5813.46 'clone ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 46 - clone ssh:// (disabled)
+Cloning into 'prune-tags'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/fake-remote
+76a8623cbad8bd56c933c6f20106742c826dad9e
+fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+origin/fake-remote
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 20 - fetch --prune --tags prunes branches but not tags
 
-expecting success of 5813.47 'clone ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 47 - clone ssh:// (enabled)
+expecting success of 5510.21 'fetch --prune --tags with branch does not prune other things': 
+	cd "$D" &&
+	git clone . prune-tags-branch &&
+	cd prune-tags-branch &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-expecting success of 5813.48 'fetch ssh:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 48 - fetch ssh:// (enabled)
+	git fetch --prune --tags origin main &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
 
-expecting success of 5813.49 'push ssh:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 49 - push ssh:// (enabled)
+Cloning into 'prune-tags-branch'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ * branch            main       -> FETCH_HEAD
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 21 - fetch --prune --tags with branch does not prune other things
 
-expecting success of 5813.50 'push ssh:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 50 - push ssh:// (disabled)
+expecting success of 5510.22 'fetch --prune --tags with refspec prunes based on refspec': 
+	cd "$D" &&
+	git clone . prune-tags-refspec &&
+	cd prune-tags-refspec &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/foo/otherbranch main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-expecting success of 5813.51 'fetch ssh:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'ssh' not allowed
-ok 51 - fetch ssh:// (disabled)
+	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
+	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
+	git rev-parse origin/extrabranch &&
+	git rev-parse sometag
 
-expecting success of 5813.52 'clone ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 52 - clone ssh:// (disabled)
+Cloning into 'prune-tags-refspec'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/foo/otherbranch
+fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/origin/foo/otherbranch
+76a8623cbad8bd56c933c6f20106742c826dad9e
+76a8623cbad8bd56c933c6f20106742c826dad9e
+ok 22 - fetch --prune --tags with refspec prunes based on refspec
 
-expecting success of 5813.53 'clone git+ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 53 - clone git+ssh:// (enabled)
+expecting success of 5510.23 'fetch --tags gets tags even without a configured remote': 
+	REMOTE="$(pwd)/test_tag_1" &&
+	git init test_tag_1 &&
+	(
+		cd test_tag_1 &&
+		test_commit foo
+	) &&
+	git init test_tag_2 &&
+	(
+		cd test_tag_2 &&
+		git fetch --tags "file://$REMOTE" &&
+		echo "foo" >expect &&
+		git tag >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 5813.54 'fetch git+ssh:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git fetch
-		)
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1/.git/
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_2/.git/
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1
  * branch            HEAD       -> FETCH_HEAD
-ok 54 - fetch git+ssh:// (enabled)
+ * [new tag]         foo        -> foo
+ok 23 - fetch --tags gets tags even without a configured remote
 
-expecting success of 5813.55 'push git+ssh:// (enabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=$proto &&
-			export GIT_ALLOW_PROTOCOL &&
-			git push origin HEAD:pushed
-		)
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 55 - push git+ssh:// (enabled)
+expecting success of 5510.24 'fetch --prune fails to delete branches': 
+	cd "$D" &&
+	git clone . prune-fail &&
+	cd prune-fail &&
+	git update-ref refs/remotes/origin/extrabranch main &&
+	git pack-refs --all &&
+	: this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
+	>.git/packed-refs.new &&
 
-expecting success of 5813.56 'push git+ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 56 - push git+ssh:// (disabled)
+	test_must_fail git fetch --prune origin
 
-expecting success of 5813.57 'fetch git+ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 57 - fetch git+ssh:// (disabled)
+Cloning into 'prune-fail'...
+done.
+error: could not delete reference refs/remotes/origin/extrabranch: unable to create file /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-fail/.git/packed-refs.new: File exists
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
+ - [deleted]         (none)     -> origin/extrabranch
+ok 24 - fetch --prune fails to delete branches
 
-expecting success of 5813.58 'clone git+ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 58 - clone git+ssh:// (disabled)
-
-expecting success of 5813.59 'clone git+ssh:// (env var has precedence)': 
-		rm -rf tmp.git &&
-		(
-			GIT_ALLOW_PROTOCOL=none &&
-			export GIT_ALLOW_PROTOCOL &&
-			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
-			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 59 - clone git+ssh:// (env var has precedence)
-
-expecting success of 5813.60 'clone git+ssh:// (enabled with config)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 60 - clone git+ssh:// (enabled with config)
-
-expecting success of 5813.61 'fetch git+ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 61 - fetch git+ssh:// (enabled)
-
-expecting success of 5813.62 'push git+ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 62 - push git+ssh:// (enabled)
-
-expecting success of 5813.63 'push git+ssh:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 63 - push git+ssh:// (disabled)
-
-expecting success of 5813.64 'fetch git+ssh:// (disabled)': 
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
-	
-fatal: transport 'ssh' not allowed
-ok 64 - fetch git+ssh:// (disabled)
-
-expecting success of 5813.65 'clone git+ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 65 - clone git+ssh:// (disabled)
-
-expecting success of 5813.66 'clone git+ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 66 - clone git+ssh:// (enabled)
-
-expecting success of 5813.67 'fetch git+ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 67 - fetch git+ssh:// (enabled)
-
-expecting success of 5813.68 'push git+ssh:// (enabled)': 
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 68 - push git+ssh:// (enabled)
-
-expecting success of 5813.69 'push git+ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 69 - push git+ssh:// (disabled)
-
-expecting success of 5813.70 'fetch git+ssh:// (disabled)': 
-		(
-			cd tmp.git &&
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user fetch
-		)
-	
-fatal: transport 'ssh' not allowed
-ok 70 - fetch git+ssh:// (disabled)
-
-expecting success of 5813.71 'clone git+ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		(
-			GIT_PROTOCOL_FROM_USER=0 &&
-			export GIT_PROTOCOL_FROM_USER &&
-			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
-		)
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 71 - clone git+ssh:// (disabled)
-
-expecting success of 5813.72 'clone git+ssh:// (enabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow always &&
-		git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-ok 72 - clone git+ssh:// (enabled)
-
-expecting success of 5813.73 'fetch git+ssh:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
-	
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
- * branch            HEAD       -> FETCH_HEAD
-ok 73 - fetch git+ssh:// (enabled)
-
-expecting success of 5813.74 'push git+ssh:// (enabled)': 
-		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
-	
-ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
-Everything up-to-date
-ok 74 - push git+ssh:// (enabled)
-
-expecting success of 5813.75 'push git+ssh:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
-	
-fatal: transport 'ssh' not allowed
-ok 75 - push git+ssh:// (disabled)
-
-expecting success of 5813.76 'fetch git+ssh:// (disabled)': 
-		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
-	
-fatal: transport 'ssh' not allowed
-ok 76 - fetch git+ssh:// (disabled)
-
-expecting success of 5813.77 'clone git+ssh:// (disabled)': 
-		rm -rf tmp.git &&
-		test_config_global protocol.allow never &&
-		test_must_fail git clone --bare "$url" tmp.git
-	
-Cloning into bare repository 'tmp.git'...
-fatal: transport 'ssh' not allowed
-ok 77 - clone git+ssh:// (disabled)
-
-expecting success of 5813.78 'hostnames starting with dash are rejected': 
-	test_must_fail git clone ssh://-remote/repo.git dash-host 2>stderr &&
-	! grep ^ssh: stderr
-
-ok 78 - hostnames starting with dash are rejected
-
-expecting success of 5813.79 'setup repo with dash': 
-	git init --bare remote/-repo.git &&
-	git push remote/-repo.git HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/-repo.git/
-To remote/-repo.git
- * [new branch]      HEAD -> master
-ok 79 - setup repo with dash
-
-expecting success of 5813.80 'repo names starting with dash are rejected': 
-	test_must_fail git clone remote:-repo.git dash-path 2>stderr &&
-	! grep ^ssh: stderr
-
-ok 80 - repo names starting with dash are rejected
-
-expecting success of 5813.81 'full paths still work': 
-	git clone "remote:$PWD/remote/-repo.git" dash-path
-
-Cloning into 'dash-path'...
-ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/-repo.git'
-ok 81 - full paths still work
-
-# passed all 81 test(s)
-1..81
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5702-protocol-v2.sh ***
-checking prerequisite: PIPE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
-
-)
-prerequisite PIPE ok
-Starting git daemon ...
-[2081213] Ready to rumble
-expecting success of 5702.1 'create repo to be served by git-daemon': 
-	git init "$daemon_parent" &&
-	test_commit -C "$daemon_parent" one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/repo/parent/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - create repo to be served by git-daemon
-
-expecting success of 5702.2 'list refs with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
-
-	# Client requested to use protocol v2
-	grep "ls-remote> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	grep "ls-remote< version 2" log &&
-
-	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
-	test_cmp expect actual
-
-[2081338] Connection from 127.0.0.1:54138
-[2081338] Extended attribute "host": 127.0.0.1:5702
-[2081338] Extended attribute "protocol": version=2
-[2081338] Request upload-pack for '/parent'
-[2081213] [2081338] Disconnected
-packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
-packet:    ls-remote< version 2
-[2081433] Connection from 127.0.0.1:54154
-[2081433] Extended attribute "host": 127.0.0.1:5702
-[2081433] Extended attribute "protocol": version=2
-[2081433] Request upload-pack for '/parent'
-[2081213] [2081433] Disconnected
-ok 2 - list refs with git:// using protocol v2
-
-expecting success of 5702.3 'ref advertisement is filtered with ls-remote using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
-
-	cat >expect <<-EOF &&
-	$(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
-	EOF
-
-	test_cmp expect actual
-
-[2081561] Connection from 127.0.0.1:54164
-[2081561] Extended attribute "host": 127.0.0.1:5702
-[2081561] Extended attribute "protocol": version=2
-[2081561] Request upload-pack for '/parent'
-[2081213] [2081561] Disconnected
-ok 3 - ref advertisement is filtered with ls-remote using protocol v2
-
-expecting success of 5702.4 'clone with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		clone "$GIT_DAEMON_URL/parent" daemon_child &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v2
-	grep "clone> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	grep "clone< version 2" log
-
-Cloning into 'daemon_child'...
-[2081754] Connection from 127.0.0.1:54166
-[2081754] Extended attribute "host": 127.0.0.1:5702
-[2081754] Extended attribute "protocol": version=2
-[2081754] Request upload-pack for '/parent'
-[2081213] [2081754] Disconnected
-packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
-packet:        clone< version 2
-ok 4 - clone with git:// using protocol v2
-
-expecting success of 5702.5 'fetch with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	test_commit -C "$daemon_parent" two &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
-		fetch &&
-
-	git -C daemon_child log -1 --format=%s origin/main >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v2
-	grep "fetch> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	grep "fetch< version 2" log
-
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[2082061] Connection from 127.0.0.1:54168
-[2082061] Extended attribute "host": 127.0.0.1:5702
-[2082061] Extended attribute "protocol": version=2
-[2082061] Request upload-pack for '/parent'
-[2081213] [2082061] Disconnected
-From git://127.0.0.1:5702/parent
-   d79ce16..139b20d  main       -> origin/main
- * [new tag]         two        -> two
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
-packet:        fetch< version 2
-ok 5 - fetch with git:// using protocol v2
-
-expecting success of 5702.6 'fetch by hash without tag following with protocol v2 does not list refs': 
-	test_when_finished "rm -f log" &&
-
-	test_commit -C "$daemon_parent" two_a &&
-	git -C "$daemon_parent" rev-parse two_a >two_a_hash &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
-		fetch --no-tags origin $(cat two_a_hash) &&
-
-	grep "fetch< version 2" log &&
-	! grep "fetch> command=ls-refs" log
-
-[main 7e9f7d0] two_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_a.t
-[2082420] Connection from 127.0.0.1:54184
-[2082420] Extended attribute "host": 127.0.0.1:5702
-[2082420] Extended attribute "protocol": version=2
-[2082420] Request upload-pack for '/parent'
-[2081213] [2082420] Disconnected
-From git://127.0.0.1:5702/parent
- * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
-packet:        fetch< version 2
-ok 6 - fetch by hash without tag following with protocol v2 does not list refs
-
-expecting success of 5702.7 'pull with git:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
-		pull &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v2
-	grep "fetch> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	grep "fetch< version 2" log
-
-[2082612] Connection from 127.0.0.1:54196
-[2082612] Extended attribute "host": 127.0.0.1:5702
-[2082612] Extended attribute "protocol": version=2
-[2082612] Request upload-pack for '/parent'
-From git://127.0.0.1:5702/parent
-   139b20d..7e9f7d0  main       -> origin/main
- * [new tag]         two_a      -> two_a
-[2081213] [2082612] Disconnected
-Updating d79ce16..7e9f7d0
-Fast-forward
- two.t   | 1 +
- two_a.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 two.t
- create mode 100644 two_a.t
-packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
-packet:        fetch< version 2
-ok 7 - pull with git:// using protocol v2
-
-expecting success of 5702.8 'push with git:// and a config of v2 does not request v2': 
-	test_when_finished "rm -f log" &&
-
-	# Till v2 for push is designed, make sure that if a client has
-	# protocol.version configured to use v2, that the client instead falls
-	# back and uses v0.
-
-	test_commit -C daemon_child three &&
-
-	# Push to another branch, as the target repository has the
-	# main branch checked out and we cannot push into it.
-	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
-		push origin HEAD:client_branch &&
-
-	git -C daemon_child log -1 --format=%s >actual &&
-	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
-	test_cmp expect actual &&
-
-	# Client requested to use protocol v2
-	! grep "push> .*\\\0\\\0version=2\\\0$" log &&
-	# Server responded using protocol v2
-	! grep "push< version 2" log
-
-[main 166f565] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[2082906] Connection from 127.0.0.1:54210
-[2082906] Extended attribute "host": 127.0.0.1:5702
-[2082906] Request receive-pack for '/parent'
-To git://127.0.0.1:5702/parent
- * [new branch]      HEAD -> client_branch
-[2081213] [2082906] Disconnected
-ok 8 - push with git:// and a config of v2 does not request v2
-
-Stopping git daemon ...
-Terminated
-expecting success of 5702.9 'create repo to be served by file:// transport': 
-	git init file_parent &&
-	test_commit -C file_parent one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent/.git/
-[main (root-commit) 6f4b17f] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 9 - create repo to be served by file:// transport
-
-expecting success of 5702.10 'list refs with file:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote --symref "file://$(pwd)/file_parent" >actual &&
-
-	# Server responded using protocol v2
-	grep "ls-remote< version 2" log &&
-
-	git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
-	test_cmp expect actual
-
-packet:    ls-remote< version 2
-ok 10 - list refs with file:// using protocol v2
-
-expecting success of 5702.11 'ref advertisement is filtered with ls-remote using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote "file://$(pwd)/file_parent" main >actual &&
-
-	cat >expect <<-EOF &&
-	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
-	EOF
-
-	test_cmp expect actual
-
-ok 11 - ref advertisement is filtered with ls-remote using protocol v2
-
-expecting success of 5702.12 'server-options are sent when using ls-remote': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote -o hello -o world "file://$(pwd)/file_parent" main >actual &&
-
-	cat >expect <<-EOF &&
-	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
-	EOF
-
-	test_cmp expect actual &&
-	grep "server-option=hello" log &&
-	grep "server-option=world" log
-
-packet:    ls-remote> server-option=hello
-packet:  upload-pack< server-option=hello
-packet:    ls-remote> server-option=world
-packet:  upload-pack< server-option=world
-ok 12 - server-options are sent when using ls-remote
-
-expecting success of 5702.13 'server-options from configuration are used by ls-remote': 
-	test_when_finished "rm -rf log myclone" &&
-	git clone "file://$(pwd)/file_parent" myclone &&
-	cat >expect <<-EOF &&
-	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
-	EOF
-
-	# Default server options from configuration are used
-	git -C myclone config --add remote.origin.serverOption foo &&
-	git -C myclone config --add remote.origin.serverOption bar &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		ls-remote origin main >actual &&
-	test_cmp expect actual &&
-	test_grep "ls-remote> server-option=foo" log &&
-	test_grep "ls-remote> server-option=bar" log &&
-	rm -f log &&
-
-	# Empty value of remote.<name>.serverOption clears the list
-	git -C myclone config --add remote.origin.serverOption "" &&
-	git -C myclone config --add remote.origin.serverOption tar &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		ls-remote origin main >actual &&
-	test_cmp expect actual &&
-	test_grep "ls-remote> server-option=tar" log &&
-	test_grep ! "ls-remote> server-option=foo" log &&
-	test_grep ! "ls-remote> server-option=bar" log &&
-	rm -f log &&
-
-	# Server option from command line overrides those from configuration
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		ls-remote -o hello -o world origin main >actual &&
-	test_cmp expect actual &&
-	test_grep "ls-remote> server-option=hello" log &&
-	test_grep "ls-remote> server-option=world" log &&
-	test_grep ! "ls-remote> server-option=tar" log
-
-Cloning into 'myclone'...
-packet:    ls-remote> server-option=foo
-packet:    ls-remote> server-option=bar
-packet:    ls-remote> server-option=tar
-packet:    ls-remote> server-option=hello
-packet:    ls-remote> server-option=world
-ok 13 - server-options from configuration are used by ls-remote
-
-expecting success of 5702.14 'warn if using server-option with ls-remote with legacy protocol': 
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
-		ls-remote -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
-
-	test_grep "see protocol.version in" err &&
-	test_grep "server options require protocol version 2 or later" err
-
-hint: see protocol.version in 'git help config' for more details
-fatal: server options require protocol version 2 or later
-ok 14 - warn if using server-option with ls-remote with legacy protocol
-
-expecting success of 5702.15 'clone with file:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		clone "file://$(pwd)/file_parent" file_child &&
-
-	git -C file_child log -1 --format=%s >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v2
-	grep "clone< version 2" log &&
-
-	# Client sent ref-prefixes to filter the ref-advertisement
-	grep "ref-prefix HEAD" log &&
-	grep "ref-prefix refs/heads/" log &&
-	grep "ref-prefix refs/tags/" log
-
-Cloning into 'file_child'...
-packet:        clone< version 2
-packet:        clone> ref-prefix HEAD
-packet:  upload-pack< ref-prefix HEAD
-packet:        clone> ref-prefix refs/heads/
-packet:  upload-pack< ref-prefix refs/heads/
-packet:        clone> ref-prefix refs/tags/
-packet:  upload-pack< ref-prefix refs/tags/
-ok 15 - clone with file:// using protocol v2
-
-expecting success of 5702.16 'clone of empty repo propagates name of default branch': 
-	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=main -c protocol.version=2 \
-		clone "file://$(pwd)/file_empty_parent" file_empty_child &&
-	echo refs/heads/mydefaultbranch >expect &&
-	git -C file_empty_child symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
-Cloning into 'file_empty_child'...
-warning: You appear to have cloned an empty repository.
-ok 16 - clone of empty repo propagates name of default branch
-
-expecting success of 5702.17 '...but not if explicitly forbidden by config': 
-	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
-	test_config -C file_empty_parent lsrefs.unborn ignore &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=main -c protocol.version=2 \
-		clone "file://$(pwd)/file_empty_parent" file_empty_child &&
-	echo refs/heads/main >expect &&
-	git -C file_empty_child symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
-Cloning into 'file_empty_child'...
-warning: You appear to have cloned an empty repository.
-ok 17 - ...but not if explicitly forbidden by config
-
-expecting success of 5702.18 'bare clone propagates empty default branch': 
-	test_when_finished "rm -rf file_empty_parent file_empty_child.git" &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=main -c protocol.version=2 \
-		clone --bare \
-		"file://$(pwd)/file_empty_parent" file_empty_child.git &&
-	echo "refs/heads/mydefaultbranch" >expect &&
-	git -C file_empty_child.git symbolic-ref HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
-Cloning into bare repository 'file_empty_child.git'...
-warning: You appear to have cloned an empty repository.
-ok 18 - bare clone propagates empty default branch
-
-expecting success of 5702.19 'clone propagates unborn HEAD from non-empty repo': 
-	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
-
-	git init file_unborn_parent &&
-	(
-		cd file_unborn_parent &&
-		git checkout -b branchwithstuff &&
-		test_commit --no-tag stuff &&
-		git symbolic-ref HEAD refs/heads/mydefaultbranch
-	) &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=main -c protocol.version=2 \
-		clone "file://$(pwd)/file_unborn_parent" \
-		file_unborn_child 2>stderr &&
-	echo "refs/heads/mydefaultbranch" >expect &&
-	git -C file_unborn_child symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	grep "warning: remote HEAD refers to nonexistent ref" stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
-Switched to a new branch 'branchwithstuff'
-[branchwithstuff (root-commit) 3e54c7d] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stuff.t
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-ok 19 - clone propagates unborn HEAD from non-empty repo
-
-expecting success of 5702.20 'clone propagates object-format from empty repo': 
-	test_when_finished "rm -fr src256 dst256" &&
-
-	echo sha256 >expect &&
-	git init --object-format=sha256 src256 &&
-	git clone src256 dst256 &&
-	git -C dst256 rev-parse --show-object-format >actual &&
-
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/src256/.git/
-Cloning into 'dst256'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 20 - clone propagates object-format from empty repo
-
-expecting success of 5702.21 'bare clone propagates unborn HEAD from non-empty repo': 
-	test_when_finished "rm -rf file_unborn_parent file_unborn_child.git" &&
-
-	git init file_unborn_parent &&
-	(
-		cd file_unborn_parent &&
-		git checkout -b branchwithstuff &&
-		test_commit --no-tag stuff &&
-		git symbolic-ref HEAD refs/heads/mydefaultbranch
-	) &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=main -c protocol.version=2 \
-		clone --bare "file://$(pwd)/file_unborn_parent" \
-		file_unborn_child.git 2>stderr &&
-	echo "refs/heads/mydefaultbranch" >expect &&
-	git -C file_unborn_child.git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	! grep "warning:" stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
-Switched to a new branch 'branchwithstuff'
-[branchwithstuff (root-commit) 3e54c7d] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stuff.t
-ok 21 - bare clone propagates unborn HEAD from non-empty repo
-
-expecting success of 5702.22 'defaulted HEAD uses remote branch if available': 
-	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
-
-	git init file_unborn_parent &&
-	(
-		cd file_unborn_parent &&
-		git config lsrefs.unborn ignore &&
-		git checkout -b branchwithstuff &&
-		test_commit --no-tag stuff &&
-		git symbolic-ref HEAD refs/heads/mydefaultbranch
-	) &&
-
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=branchwithstuff -c protocol.version=2 \
-		clone "file://$(pwd)/file_unborn_parent" \
-		file_unborn_child 2>stderr &&
-	echo "refs/heads/branchwithstuff" >expect &&
-	git -C file_unborn_child symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	test_path_is_file file_unborn_child/stuff.t &&
-	! grep "warning:" stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
-Switched to a new branch 'branchwithstuff'
-[branchwithstuff (root-commit) 3e54c7d] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stuff.t
-ok 22 - defaulted HEAD uses remote branch if available
-
-expecting success of 5702.23 'fetch with file:// using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	test_commit -C file_parent two &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch origin &&
-
-	git -C file_child log -1 --format=%s origin/main >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	# Server responded using protocol v2
-	grep "fetch< version 2" log
-
-[main 5c4888c] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
-   6f4b17f..5c4888c  main       -> origin/main
- * [new tag]         two        -> two
-packet:        fetch< version 2
-ok 23 - fetch with file:// using protocol v2
-
-expecting success of 5702.24 'ref advertisement is filtered during fetch using protocol v2': 
-	test_when_finished "rm -f log" &&
-
-	test_commit -C file_parent three &&
-	git -C file_parent branch unwanted-branch three &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch origin main &&
-
-	git -C file_child log -1 --format=%s origin/main >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	grep "refs/heads/main" log &&
-	! grep "refs/heads/unwanted-branch" log
-
-[main 3fa1c23] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * branch            main       -> FETCH_HEAD
-   5c4888c..3fa1c23  main       -> origin/main
-packet:        fetch> ref-prefix refs/heads/main
-packet:  upload-pack< ref-prefix refs/heads/main
-packet:  upload-pack> 3fa1c2361a0cae4d34ddb1469c03fc84cd2e36bb refs/heads/main
-packet:        fetch< 3fa1c2361a0cae4d34ddb1469c03fc84cd2e36bb refs/heads/main
-ok 24 - ref advertisement is filtered during fetch using protocol v2
-
-expecting success of 5702.25 'server-options are sent when fetching': 
-	test_when_finished "rm -f log" &&
-
-	test_commit -C file_parent four &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch -o hello -o world origin main &&
-
-	git -C file_child log -1 --format=%s origin/main >actual &&
-	git -C file_parent log -1 --format=%s >expect &&
-	test_cmp expect actual &&
-
-	grep "server-option=hello" log &&
-	grep "server-option=world" log
-
-[main acc6f16] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * branch            main       -> FETCH_HEAD
-   3fa1c23..acc6f16  main       -> origin/main
-packet:        fetch> server-option=hello
-packet:  upload-pack< server-option=hello
-packet:        fetch> server-option=hello
-packet:  upload-pack< server-option=hello
-packet:        fetch> server-option=world
-packet:  upload-pack< server-option=world
-packet:        fetch> server-option=world
-packet:  upload-pack< server-option=world
-ok 25 - server-options are sent when fetching
-
-expecting success of 5702.26 'server-options are sent when fetch multiple remotes': 
-	test_when_finished "rm -f log server_options_sent" &&
-	git clone "file://$(pwd)/file_parent" child_multi_remotes &&
-	git -C child_multi_remotes remote add another "file://$(pwd)/file_parent" &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C child_multi_remotes -c protocol.version=2 \
-		fetch -o hello --all &&
-	grep "fetch> server-option=hello" log >server_options_sent &&
-	test_line_count = 2 server_options_sent
-
-Cloning into 'child_multi_remotes'...
-Fetching origin
-Fetching another
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * [new branch]      main            -> another/main
- * [new branch]      unwanted-branch -> another/unwanted-branch
-ok 26 - server-options are sent when fetch multiple remotes
-
-expecting success of 5702.27 'server-options from configuration are used by git-fetch': 
-	test_when_finished "rm -rf log myclone" &&
-	git clone "file://$(pwd)/file_parent" myclone &&
-	git -C file_parent log -1 --format=%s >expect &&
-
-	# Default server options from configuration are used
-	git -C myclone config --add remote.origin.serverOption foo &&
-	git -C myclone config --add remote.origin.serverOption bar &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		fetch origin main &&
-	git -C myclone log -1 --format=%s origin/main >actual &&
-	test_cmp expect actual &&
-	test_grep "fetch> server-option=foo" log &&
-	test_grep "fetch> server-option=bar" log &&
-	rm -f log &&
-
-	# Empty value of remote.<name>.serverOption clears the list
-	git -C myclone config --add remote.origin.serverOption "" &&
-	git -C myclone config --add remote.origin.serverOption tar &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		fetch origin main &&
-	git -C myclone log -1 --format=%s origin/main >actual &&
-	test_cmp expect actual &&
-	test_grep "fetch> server-option=tar" log &&
-	test_grep ! "fetch> server-option=foo" log &&
-	test_grep ! "fetch> server-option=bar" log &&
-	rm -f log &&
-
-	# Server option from command line overrides those from configuration
-	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
-		fetch -o hello -o world origin main &&
-	git -C myclone log -1 --format=%s origin/main >actual &&
-	test_cmp expect actual &&
-	test_grep "fetch> server-option=hello" log &&
-	test_grep "fetch> server-option=world" log &&
-	test_grep ! "fetch> server-option=tar" log
-
-Cloning into 'myclone'...
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * branch            main       -> FETCH_HEAD
-packet:        fetch> server-option=foo
-packet:        fetch> server-option=bar
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * branch            main       -> FETCH_HEAD
-packet:        fetch> server-option=tar
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * branch            main       -> FETCH_HEAD
-packet:        fetch> server-option=hello
-packet:        fetch> server-option=world
-ok 27 - server-options from configuration are used by git-fetch
-
-expecting success of 5702.28 'warn if using server-option with fetch with legacy protocol': 
-	test_when_finished "rm -rf temp_child" &&
-
-	git init temp_child &&
-
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
-		fetch -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
-
-	test_grep "see protocol.version in" err &&
-	test_grep "server options require protocol version 2 or later" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/temp_child/.git/
-hint: see protocol.version in 'git help config' for more details
-fatal: server options require protocol version 2 or later
-ok 28 - warn if using server-option with fetch with legacy protocol
-
-expecting success of 5702.29 'server-options are sent when cloning': 
-	test_when_finished "rm -rf log myclone" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		clone --server-option=hello --server-option=world \
-		"file://$(pwd)/file_parent" myclone &&
-
-	grep "server-option=hello" log &&
-	grep "server-option=world" log
-
-Cloning into 'myclone'...
-packet:        clone> server-option=hello
-packet:  upload-pack< server-option=hello
-packet:        clone> server-option=hello
-packet:  upload-pack< server-option=hello
-packet:        clone> server-option=world
-packet:  upload-pack< server-option=world
-packet:        clone> server-option=world
-packet:  upload-pack< server-option=world
-ok 29 - server-options are sent when cloning
-
-expecting success of 5702.30 'server-options from configuration are used by git-clone': 
-	test_when_finished "rm -rf log myclone" &&
-
-	# Default server options from configuration are used
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
-		clone "file://$(pwd)/file_parent" myclone &&
-	test_grep "clone> server-option=foo" log &&
-	test_grep "clone> server-option=bar" log &&
-	rm -rf log myclone &&
-
-	# Empty value of remote.<name>.serverOption clears the list
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
-		-c remote.origin.serverOption= -c remote.origin.serverOption=tar \
-		clone "file://$(pwd)/file_parent" myclone &&
-	test_grep "clone> server-option=tar" log &&
-	test_grep ! "clone> server-option=foo" log &&
-	test_grep ! "clone> server-option=bar" log &&
-	rm -rf log myclone &&
-
-	# Server option from command line overrides those from configuration
-	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		-c remote.origin.serverOption=tar \
-		clone --server-option=hello --server-option=world \
-		"file://$(pwd)/file_parent" myclone &&
-	test_grep "clone> server-option=hello" log &&
-	test_grep "clone> server-option=world" log &&
-	test_grep ! "clone> server-option=tar" log
-
-Cloning into 'myclone'...
-packet:        clone> server-option=foo
-packet:        clone> server-option=foo
-packet:        clone> server-option=bar
-packet:        clone> server-option=bar
-Cloning into 'myclone'...
-packet:        clone> server-option=tar
-packet:        clone> server-option=tar
-Cloning into 'myclone'...
-packet:        clone> server-option=hello
-packet:        clone> server-option=hello
-packet:        clone> server-option=world
-packet:        clone> server-option=world
-ok 30 - server-options from configuration are used by git-clone
-
-expecting success of 5702.31 'warn if using server-option with clone with legacy protocol': 
-	test_when_finished "rm -rf myclone" &&
-
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
-		clone --server-option=hello --server-option=world \
-		"file://$(pwd)/file_parent" myclone 2>err &&
-
-	test_grep "see protocol.version in" err &&
-	test_grep "server options require protocol version 2 or later" err
-
-hint: see protocol.version in 'git help config' for more details
-fatal: server options require protocol version 2 or later
-ok 31 - warn if using server-option with clone with legacy protocol
-
-expecting success of 5702.32 'server-option configuration with legacy protocol is ok': 
-	test_when_finished "rm -rf myclone" &&
-
-	env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
-		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
-		clone "file://$(pwd)/file_parent" myclone
-
-Cloning into 'myclone'...
-ok 32 - server-option configuration with legacy protocol is ok
-
-expecting success of 5702.33 'invalid server-option configuration': 
-	test_when_finished "rm -rf myclone" &&
-
-	test_must_fail git -c protocol.version=2 \
-		-c remote.origin.serverOption \
-		clone "file://$(pwd)/file_parent" myclone 2>err &&
-	test_grep "error: missing value for 'remote.origin.serveroption'" err
-
-error: missing value for 'remote.origin.serveroption'
-ok 33 - invalid server-option configuration
-
-expecting success of 5702.34 'upload-pack respects config using protocol v2': 
-	git init server &&
-	write_script server/.git/hook <<-\EOF &&
-		touch hookout
-		"$@"
-	EOF
-	test_commit -C server one &&
-
-	test_config_global uploadpack.packobjectshook ./hook &&
-	test_path_is_missing server/.git/hookout &&
-	git -c protocol.version=2 clone "file://$(pwd)/server" client &&
-	test_path_is_file server/.git/hookout
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 0ba3da9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'client'...
-ok 34 - upload-pack respects config using protocol v2
-
-expecting success of 5702.35 'setup filter tests': 
-	rm -rf server client &&
-	git init server &&
-
-	# 1 commit to create a file, and 1 commit to modify it
-	test_commit -C server message1 a.txt &&
-	test_commit -C server message2 a.txt &&
-	git -C server config protocol.version 2 &&
-	git -C server config uploadpack.allowfilter 1 &&
-	git -C server config uploadpack.allowanysha1inwant 1 &&
-	git -C server config protocol.version 2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 9f9a637] message1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.txt
-[main 3b911b1] message2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 35 - setup filter tests
-
-expecting success of 5702.36 'partial clone': 
-	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
-		clone --filter=blob:none "file://$(pwd)/server" client &&
-	grep "version 2" trace &&
-
-	# Ensure that the old version of the file is missing
-	git -C client rev-list --quiet --objects --missing=print main \
-		>observed.oids &&
-	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
-
-	# Ensure that client passes fsck
-	git -C client fsck
-
-Cloning into 'client'...
-packet:  upload-pack> version 2
-packet:        clone< version 2
-packet:  upload-pack> version 2
-packet:        fetch< version 2
-?8045c300940c3b486923ccfc4dc22e72d1a10616
-ok 36 - partial clone
-
-expecting success of 5702.37 'dynamically fetch missing object': 
-	rm "$(pwd)/trace" &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		cat-file -p $(git -C server rev-parse message1:a.txt) &&
-	grep "version 2" trace
-
-message1
-packet:  upload-pack> version 2
-packet:        fetch< version 2
-ok 37 - dynamically fetch missing object
-
-expecting success of 5702.38 'when dynamically fetching missing object, do not list refs': 
-	! grep "git> command=ls-refs" trace
-
-ok 38 - when dynamically fetching missing object, do not list refs
-
-expecting success of 5702.39 'partial fetch': 
-	rm -rf client "$(pwd)/trace" &&
-	git init client &&
-	SERVER="file://$(pwd)/server" &&
-
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch --filter=blob:none "$SERVER" main:refs/heads/other &&
-	grep "version 2" trace &&
-
-	# Ensure that the old version of the file is missing
-	git -C client rev-list --quiet --objects --missing=print other \
-		>observed.oids &&
-	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
-
-	# Ensure that client passes fsck
-	git -C client fsck
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * [new branch]      main       -> other
- * [new tag]         message2   -> message2
- * [new tag]         message1   -> message1
-packet:  upload-pack> version 2
-packet:        fetch< version 2
-?8045c300940c3b486923ccfc4dc22e72d1a10616
-notice: HEAD points to an unborn branch (main)
-ok 39 - partial fetch
-
-expecting success of 5702.40 'do not advertise filter if not configured to do so': 
-	SERVER="file://$(pwd)/server" &&
-
-	rm "$(pwd)/trace" &&
-	git -C server config uploadpack.allowfilter 1 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
-		ls-remote "$SERVER" &&
-	grep "fetch=.*filter" trace &&
-
-	rm "$(pwd)/trace" &&
-	git -C server config uploadpack.allowfilter 0 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
-		ls-remote "$SERVER" &&
-	grep "fetch=" trace >fetch_capabilities &&
-	! grep filter fetch_capabilities
-
-3b911b1bf820401c718047588b81902d5b7458b9	HEAD
-3b911b1bf820401c718047588b81902d5b7458b9	refs/heads/main
-9f9a637008eb8a901bafbb20928b41749ad6d174	refs/tags/message1
-3b911b1bf820401c718047588b81902d5b7458b9	refs/tags/message2
-packet:  upload-pack> fetch=shallow wait-for-done filter
-packet:    ls-remote< fetch=shallow wait-for-done filter
-3b911b1bf820401c718047588b81902d5b7458b9	HEAD
-3b911b1bf820401c718047588b81902d5b7458b9	refs/heads/main
-9f9a637008eb8a901bafbb20928b41749ad6d174	refs/tags/message1
-3b911b1bf820401c718047588b81902d5b7458b9	refs/tags/message2
-ok 40 - do not advertise filter if not configured to do so
-
-expecting success of 5702.41 'partial clone warns if filter is not advertised': 
-	rm -rf client &&
-	git -C server config uploadpack.allowfilter 0 &&
-	git -c protocol.version=2 \
-		clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
-	test_grep "filtering not recognized by server, ignoring" err
-
-warning: filtering not recognized by server, ignoring
-ok 41 - partial clone warns if filter is not advertised
-
-expecting success of 5702.42 'even with handcrafted request, filter does not work if not advertised': 
-	git -C server config uploadpack.allowfilter 0 &&
-
-	# Custom request that tries to filter even though it is not advertised.
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	object-format=$(test_oid algo)
-	0001
-	want $(git -C server rev-parse main)
-	filter blob:none
-	0000
-	EOF
-
-	test_must_fail test-tool -C server serve-v2 --stateless-rpc \
-		<in >/dev/null 2>err &&
-	grep "unexpected line: .filter blob:none." err &&
-
-	# Exercise to ensure that if advertised, filter works
-	git -C server config uploadpack.allowfilter 1 &&
-	test-tool -C server serve-v2 --stateless-rpc <in >/dev/null
-
-fatal: unexpected line: 'filter blob:none'
-ok 42 - even with handcrafted request, filter does not work if not advertised
-
-expecting success of 5702.43 'default refspec is used to filter ref when fetchcing': 
-	test_when_finished "rm -f log" &&
-
-	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch origin &&
-
-	git -C file_child log -1 --format=%s three >actual &&
-	git -C file_parent log -1 --format=%s three >expect &&
-	test_cmp expect actual &&
-
-	grep "ref-prefix refs/heads/" log &&
-	grep "ref-prefix refs/tags/" log
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
- * [new branch]      unwanted-branch -> origin/unwanted-branch
- * [new tag]         four            -> four
- * [new tag]         three           -> three
-packet:        fetch> ref-prefix refs/heads/
-packet:        fetch> ref-prefix refs/heads/main
-packet:  upload-pack< ref-prefix refs/heads/
-packet:  upload-pack< ref-prefix refs/heads/main
-packet:        fetch> ref-prefix refs/tags/
-packet:  upload-pack< ref-prefix refs/tags/
-ok 43 - default refspec is used to filter ref when fetchcing
-
-expecting success of 5702.44 'fetch supports various ways of have lines': 
-	rm -rf server client trace &&
-	git init server &&
-	test_commit -C server dwim &&
-	TREE=$(git -C server rev-parse HEAD^{tree}) &&
-	git -C server tag exact \
-		$(git -C server commit-tree -m a "$TREE") &&
-	git -C server tag dwim-unwanted \
-		$(git -C server commit-tree -m b "$TREE") &&
-	git -C server tag exact-unwanted \
-		$(git -C server commit-tree -m c "$TREE") &&
-	git -C server tag prefix1 \
-		$(git -C server commit-tree -m d "$TREE") &&
-	git -C server tag prefix2 \
-		$(git -C server commit-tree -m e "$TREE") &&
-	git -C server tag fetch-by-sha1 \
-		$(git -C server commit-tree -m f "$TREE") &&
-	git -C server tag completely-unrelated \
-		$(git -C server commit-tree -m g "$TREE") &&
-
-	git init client &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch "file://$(pwd)/server" \
-		dwim \
-		refs/tags/exact \
-		refs/tags/prefix*:refs/tags/prefix* \
-		"$(git -C server rev-parse fetch-by-sha1)" &&
-
-	# Ensure that the appropriate prefixes are sent (using a sample)
-	grep "fetch> ref-prefix dwim" trace &&
-	grep "fetch> ref-prefix refs/heads/dwim" trace &&
-	grep "fetch> ref-prefix refs/tags/prefix" trace &&
-
-	# Ensure that the correct objects are returned
-	git -C client cat-file -e $(git -C server rev-parse dwim) &&
-	git -C client cat-file -e $(git -C server rev-parse exact) &&
-	git -C client cat-file -e $(git -C server rev-parse prefix1) &&
-	git -C client cat-file -e $(git -C server rev-parse prefix2) &&
-	git -C client cat-file -e $(git -C server rev-parse fetch-by-sha1) &&
-	test_must_fail git -C client cat-file -e \
-		$(git -C server rev-parse dwim-unwanted) &&
-	test_must_fail git -C client cat-file -e \
-		$(git -C server rev-parse exact-unwanted) &&
-	test_must_fail git -C client cat-file -e \
-		$(git -C server rev-parse completely-unrelated)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 7f427d6] dwim
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dwim.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * tag               dwim          -> FETCH_HEAD
- * tag               exact         -> FETCH_HEAD
- * [new tag]         prefix1       -> prefix1
- * [new tag]         prefix2       -> prefix2
- * branch            6e00395e552e1231e0d9bf16c819be5a25ec09bf -> FETCH_HEAD
- * [new tag]         dwim          -> dwim
- * [new tag]         exact         -> exact
- * [new tag]         fetch-by-sha1 -> fetch-by-sha1
-packet:        fetch> ref-prefix dwim
-packet:        fetch> ref-prefix refs/heads/dwim
-packet:        fetch> ref-prefix refs/tags/prefix
-ok 44 - fetch supports various ways of have lines
-
-expecting success of 5702.45 'fetch supports include-tag and tag following': 
-	rm -rf server client trace &&
-	git init server &&
-
-	test_commit -C server to_fetch &&
-	git -C server tag -a annotated_tag -m message &&
-
-	git init client &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch "$(pwd)/server" to_fetch:to_fetch &&
-
-	grep "fetch> ref-prefix to_fetch" trace &&
-	grep "fetch> ref-prefix refs/tags/" trace &&
-	grep "fetch> include-tag" trace &&
-
-	git -C client cat-file -e $(git -C client rev-parse annotated_tag)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 23facce] to_fetch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_fetch.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * [new tag]         to_fetch      -> to_fetch
- * [new tag]         annotated_tag -> annotated_tag
- * [new tag]         to_fetch      -> to_fetch
-packet:        fetch> ref-prefix to_fetch
-packet:        fetch> ref-prefix refs/tags/to_fetch
-packet:        fetch> ref-prefix refs/tags/
-packet:        fetch> include-tag
-ok 45 - fetch supports include-tag and tag following
-
-expecting success of 5702.46 'upload-pack respects client shallows': 
-	rm -rf server client trace &&
-
-	git init server &&
-	test_commit -C server base &&
-	test_commit -C server client_has &&
-
-	git clone --depth=1 "file://$(pwd)/server" client &&
-
-	# Add extra commits to the client so that the whole fetch takes more
-	# than 1 request (due to negotiation)
-	test_commit_bulk -C client --id=c 32 &&
-
-	git -C server checkout -b newbranch base &&
-	test_commit -C server client_wants &&
-
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch origin newbranch &&
-	# Ensure that protocol v2 is used
-	grep "fetch< version 2" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 7011515] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main 35d129e] client_has
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_has.t
-Cloning into 'client'...
-35d129e7baa6ee4831bcbeb900efe4a30c2ed8b7
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           96 (         0 duplicates                  )
-      blobs  :           32 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           32 (         0 duplicates         31 deltas of         31 attempts)
-      commits:           32 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:             34
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =         37
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7448 /       7448
----------------------------------------------------------------------
-
-Your branch is ahead of 'origin/main' by 32 commits.
-  (use "git push" to publish your local commits)
-Switched to a new branch 'newbranch'
-[newbranch c382fc6] client_wants
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 client_wants.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * branch            newbranch  -> FETCH_HEAD
-packet:        fetch< version 2
-ok 46 - upload-pack respects client shallows
-
-expecting success of 5702.47 'ensure that multiple fetches in same process from a shallow repo works': 
-	rm -rf server client trace &&
-
-	test_create_repo server &&
-	test_commit -C server one &&
-	test_commit -C server two &&
-	test_commit -C server three &&
-	git clone --shallow-exclude two "file://$(pwd)/server" client &&
-
-	git -C server tag -a -m "an annotated tag" twotag two &&
-
-	# Triggers tag following (thus, 2 fetches in one process)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch --shallow-exclude one origin &&
-	# Ensure that protocol v2 is used
-	grep "fetch< version 2" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 1581e3e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 5680d21] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main 94705d7] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into 'client'...
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * [new tag]         two        -> two
- * [new tag]         twotag     -> twotag
-packet:        fetch< version 2
-packet:        fetch< version 2
-ok 47 - ensure that multiple fetches in same process from a shallow repo works
-
-expecting success of 5702.48 'deepen-relative': 
-	rm -rf server client trace &&
-
-	test_create_repo server &&
-	test_commit -C server one &&
-	test_commit -C server two &&
-	test_commit -C server three &&
-	git clone --depth 1 "file://$(pwd)/server" client &&
-	test_commit -C server four &&
-
-	# Sanity check that only "three" is downloaded
-	git -C client log --pretty=tformat:%s main >actual &&
-	echo three >expected &&
-	test_cmp expected actual &&
-
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch --deepen=1 origin &&
-	# Ensure that protocol v2 is used
-	grep "fetch< version 2" trace &&
-
-	git -C client log --pretty=tformat:%s origin/main >actual &&
-	cat >expected <<-\EOF &&
-	four
-	three
-	two
-	EOF
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 3735e1b] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 581c9db] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main f6e0668] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Cloning into 'client'...
-[main e79f779] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
-   f6e0668..e79f779  main       -> origin/main
- * [new tag]         four       -> four
- * [new tag]         two        -> two
-packet:        fetch< version 2
-packet:        fetch< version 2
-ok 48 - deepen-relative
-
-expecting success of 5702.49 'usage: --negotiate-only without --negotiation-tip': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
-
-	setup_negotiate_only "$SERVER" "$URI" &&
-
-	cat >err.expect <<-\EOF &&
-	fatal: --negotiate-only needs one or more --negotiation-tip=*
-	EOF
-
-	test_must_fail git -c protocol.version=2 -C client fetch \
-		--negotiate-only \
-		origin 2>err.actual &&
-	test_cmp err.expect err.actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 7e477a7] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 862b305] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Cloning into 'client'...
-[main 8803147] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 49 - usage: --negotiate-only without --negotiation-tip
-
-expecting success of 5702.50 'usage: --negotiate-only with --recurse-submodules': 
-	cat >err.expect <<-\EOF &&
-	fatal: options '--negotiate-only' and '--recurse-submodules' cannot be used together
-	EOF
-
-	test_must_fail git -c protocol.version=2 -C client fetch \
-		--negotiate-only \
-		--recurse-submodules \
-		origin 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 50 - usage: --negotiate-only with --recurse-submodules
-
-expecting success of 5702.51 'file:// --negotiate-only': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
-
-	setup_negotiate_only "$SERVER" "$URI" &&
-
-	git -c protocol.version=2 -C client fetch \
-		--no-tags \
-		--negotiate-only \
-		--negotiation-tip=$(git -C client rev-parse HEAD) \
-		origin >out &&
-	COMMON=$(git -C "$SERVER" rev-parse two) &&
-	grep "$COMMON" out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 6a4c2ac] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 2944a1a] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Cloning into 'client'...
-[main 55428b5] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-2944a1ad614badae9d56b41b50bb5706f4126c41
-ok 51 - file:// --negotiate-only
-
-expecting success of 5702.52 'file:// --negotiate-only with protocol v0': 
-	SERVER="server" &&
-	URI="file://$(pwd)/server" &&
-
-	setup_negotiate_only "$SERVER" "$URI" &&
-
-	test_must_fail git -c protocol.version=0 -C client fetch \
-		--no-tags \
-		--negotiate-only \
-		--negotiation-tip=$(git -C client rev-parse HEAD) \
-		origin 2>err &&
-	test_grep "negotiate-only requires protocol v2" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
-[main (root-commit) 2472fbc] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 6b8fd04] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Cloning into 'client'...
-[main 27885d4] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-warning: --negotiate-only requires protocol v2
-ok 52 - file:// --negotiate-only with protocol v0
-
-expecting success of 5702.53 'push with custom path does not request v2': 
-	rm -f env.trace &&
-	git -C client push \
-		--receive-pack="env >../env.trace; git-receive-pack" \
-		origin HEAD:refs/heads/custom-push-test &&
-	test_path_is_file env.trace &&
-	! grep ^GIT_PROTOCOL env.trace
-
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * [new branch]      HEAD -> custom-push-test
-ok 53 - push with custom path does not request v2
-
-expecting success of 5702.54 'fetch with custom path does request v2': 
-	rm -f env.trace &&
-	git -C client fetch \
-		--upload-pack="env >../env.trace; git-upload-pack" \
-		origin HEAD &&
-	grep ^GIT_PROTOCOL=version=2 env.trace
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
- * branch            HEAD       -> FETCH_HEAD
-GIT_PROTOCOL=version=2
-ok 54 - fetch with custom path does request v2
-
-expecting success of 5702.55 'archive with custom path does not request v2': 
-	rm -f env.trace &&
-	git -C client archive \
-		--exec="env >../env.trace; git-upload-archive" \
-		--remote=origin \
-		HEAD >/dev/null &&
-	test_path_is_file env.trace &&
-	! grep ^GIT_PROTOCOL env.trace
-
-ok 55 - archive with custom path does not request v2
-
-expecting success of 5702.56 'reject client packfile-uris if not advertised': 
-	{
-		packetize command=fetch &&
-		packetize object-format=$(test_oid algo) &&
-		printf 0001 &&
-		packetize packfile-uris https &&
-		packetize done &&
-		printf 0000
-	} >input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git upload-pack client <input &&
-	test_must_fail env GIT_PROTOCOL=version=2 \
-		git -c uploadpack.blobpackfileuri \
-		upload-pack client <input &&
-	GIT_PROTOCOL=version=2 \
-		git -c uploadpack.blobpackfileuri=anything \
-		upload-pack client <input
-
-000eversion 2
-002cagent=git/2.49.0.395.g12beb8f557c-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-002cagent=git/2.49.0.395.g12beb8f557c-Linux
-0013ls-refs=unborn
-0020fetch=shallow wait-for-done
-0012server-option
-0017object-format=sha1
-0000fatal: unexpected line: 'packfile-uris https'
-000eversion 2
-002cagent=git/2.49.0.395.g12beb8f557c-Linux
-0013ls-refs=unborn
-002efetch=shallow wait-for-done packfile-uris
-0012server-option
-0017object-format=sha1
-0000ok 56 - reject client packfile-uris if not advertised
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 56 test(s)
-# SKIP no web server found at ''
-1..56
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5510-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.git/
-expecting success of 5510.1 'setup': 
-	echo >file original &&
-	git add file &&
-	git commit -a -m original &&
-	git branch -M main
-
-[master (root-commit) 7fb3fb8] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 5510.2 'clone and setup child repos': 
-	git clone . one &&
-	(
-		cd one &&
-		echo >file updated by one &&
-		git commit -a -m "updated by one"
-	) &&
-	git clone . two &&
-	(
-		cd two &&
-		git config branch.main.remote one &&
-		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch refs/heads/main:refs/heads/one
-	) &&
-	git clone . three &&
-	(
-		cd three &&
-		git config set remote.two.url ../two/.git/ &&
-		git config set remote.two.fetch refs/heads/main:refs/heads/two &&
-		git config set --append remote.two.fetch refs/heads/one:refs/heads/one &&
-		git config set branch.main.remote two &&
-		git config set branch.main.merge refs/heads/one
-	) &&
-	git clone . bundle &&
-	git clone . seven
-
-Cloning into 'one'...
-done.
-[main ffc8fdd] updated by one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'two'...
-done.
-Cloning into 'three'...
-done.
-Cloning into 'bundle'...
-done.
-Cloning into 'seven'...
-done.
-ok 2 - clone and setup child repos
-
-expecting success of 5510.3 'fetch test': 
-	cd "$D" &&
-	echo >file updated by origin &&
-	git commit -a -m "updated by origin" &&
-	cd two &&
-	git fetch &&
-	git rev-parse --verify refs/heads/one &&
-	mine=$(git rev-parse refs/heads/one) &&
-	his=$(cd ../one && git rev-parse refs/heads/main) &&
-	test "z$mine" = "z$his"
-
-[main 76a8623] updated by origin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From ../one/
- * [new branch]      main       -> one
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 3 - fetch test
-
-expecting success of 5510.4 'fetch test for-merge': 
-	cd "$D" &&
-	cd three &&
-	git fetch &&
-	git rev-parse --verify refs/heads/two &&
-	git rev-parse --verify refs/heads/one &&
-	main_in_two=$(cd ../two && git rev-parse main) &&
-	one_in_two=$(cd ../two && git rev-parse one) &&
-	{
-		echo "$one_in_two	" &&
-		echo "$main_in_two	not-for-merge"
-	} >expected &&
-	cut -f -2 .git/FETCH_HEAD >actual &&
-	test_cmp expected actual
-From ../two/
- * [new branch]      one        -> one
- * [new branch]      main       -> two
-7fb3fb8404d71a4825bdde839cc3884a77651888
-ffc8fdde31e0177ad02216ab27bb483fc88169f2
-ok 4 - fetch test for-merge
-
-expecting success of 5510.5 'fetch test remote HEAD': 
-	cd "$D" &&
-	cd two &&
-	git fetch &&
-	git rev-parse --verify refs/remotes/origin/HEAD &&
-	git rev-parse --verify refs/remotes/origin/main &&
-	head=$(git rev-parse refs/remotes/origin/HEAD) &&
-	branch=$(git rev-parse refs/remotes/origin/main) &&
-	test "z$head" = "z$branch"
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-ok 5 - fetch test remote HEAD
-
-expecting success of 5510.6 'fetch test remote HEAD in bare repository': 
-	test_when_finished rm -rf barerepo &&
-	(
-		cd "$D" &&
-		git init --bare barerepo &&
-		cd barerepo &&
-		git remote add upstream ../two &&
-		git fetch upstream &&
-		git rev-parse --verify refs/remotes/upstream/HEAD &&
-		git rev-parse --verify refs/remotes/upstream/main &&
-		head=$(git rev-parse refs/remotes/upstream/HEAD) &&
-		branch=$(git rev-parse refs/remotes/upstream/main) &&
-		test "z$head" = "z$branch"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/barerepo/
-From ../two
- * [new branch]      main       -> upstream/main
- * [new branch]      one        -> upstream/one
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-ok 6 - fetch test remote HEAD in bare repository
-
-expecting success of 5510.7 'fetch test remote HEAD change': 
-	cd "$D" &&
-	cd two &&
-	git switch -c other &&
-	git push -u origin other &&
-	git rev-parse --verify refs/remotes/origin/HEAD &&
-	git rev-parse --verify refs/remotes/origin/main &&
-	git rev-parse --verify refs/remotes/origin/other &&
-	git remote set-head origin other &&
-	git fetch &&
-	head=$(git rev-parse refs/remotes/origin/HEAD) &&
-	branch=$(git rev-parse refs/remotes/origin/other) &&
-	test "z$head" = "z$branch"
-Switched to a new branch 'other'
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- * [new branch]      other -> other
-branch 'other' set up to track 'origin/other'.
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
-   7fb3fb8..76a8623  main       -> origin/main
-ok 7 - fetch test remote HEAD change
-
-expecting success of 5510.8 'fetch test followRemoteHEAD never': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git config set remote.origin.followRemoteHEAD "never" &&
-		git fetch &&
-		test_must_fail git rev-parse --verify refs/remotes/origin/HEAD
-	)
-
-fatal: Needed a single revision
-ok 8 - fetch test followRemoteHEAD never
-
-expecting success of 5510.9 'fetch test followRemoteHEAD warn no change': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git fetch >output &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have ${SQ}other${SQ} locally." >expect &&
-		test_cmp expect output &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
-hint: will disable the warning until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 9 - fetch test followRemoteHEAD warn no change
-
-expecting success of 5510.10 'fetch test followRemoteHEAD warn create': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		output=$(git fetch) &&
-		test "z" = "z$output" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/main) &&
-		test "z$head" = "z$branch"
-	)
-
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 10 - fetch test followRemoteHEAD warn create
-
-expecting success of 5510.11 'fetch test followRemoteHEAD warn detached': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git update-ref --no-deref -d refs/remotes/origin/HEAD &&
-		git update-ref refs/remotes/origin/HEAD HEAD &&
-		HEAD=$(git log --pretty="%H") &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		git fetch >output &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have a detached HEAD pointing to" \
-			"${SQ}${HEAD}${SQ} locally." >expect &&
-		test_cmp expect output
-	)
-
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
-hint: will disable the warning until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 11 - fetch test followRemoteHEAD warn detached
-
-expecting success of 5510.12 'fetch test followRemoteHEAD warn quiet': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn" &&
-		output=$(git fetch --quiet) &&
-		test "z" = "z$output" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 12 - fetch test followRemoteHEAD warn quiet
-
-expecting success of 5510.13 'fetch test followRemoteHEAD warn-if-not-branch branch is same': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn-if-not-main" &&
-		actual=$(git fetch) &&
-		test "z" = "z$actual" &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 13 - fetch test followRemoteHEAD warn-if-not-branch branch is same
-
-expecting success of 5510.14 'fetch test followRemoteHEAD warn-if-not-branch branch is different': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "warn-if-not-some/different-branch" &&
-		git fetch >actual &&
-		echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
-			"but we have ${SQ}other${SQ} locally." >expect &&
-		test_cmp expect actual &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/other) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-hint: Run 'git remote set-head origin main' to follow the change, or set
-hint: 'remote.origin.followRemoteHEAD' configuration option to a different value
-hint: if you do not want to see this message. Specifically running
-hint: 'git config set remote.origin.followRemoteHEAD warn-if-not-branch-main'
-hint: will disable the warning until the remote changes HEAD to something else.
-hint: Disable this message with "git config set advice.fetchRemoteHEADWarn false"
-ok 14 - fetch test followRemoteHEAD warn-if-not-branch branch is different
-
-expecting success of 5510.15 'fetch test followRemoteHEAD always': 
-	test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
-	(
-		cd "$D" &&
-		cd two &&
-		git rev-parse --verify refs/remotes/origin/other &&
-		git remote set-head origin other &&
-		git rev-parse --verify refs/remotes/origin/HEAD &&
-		git rev-parse --verify refs/remotes/origin/main &&
-		git config set remote.origin.followRemoteHEAD "always" &&
-		git fetch &&
-		head=$(git rev-parse refs/remotes/origin/HEAD) &&
-		branch=$(git rev-parse refs/remotes/origin/main) &&
-		test "z$head" = "z$branch"
-	)
-
-7fb3fb8404d71a4825bdde839cc3884a77651888
-7fb3fb8404d71a4825bdde839cc3884a77651888
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 15 - fetch test followRemoteHEAD always
-
-expecting success of 5510.16 'fetch --prune on its own works as expected': 
-	cd "$D" &&
-	git clone . prune &&
-	cd prune &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-
-	git fetch --prune origin &&
-	test_must_fail git rev-parse origin/extrabranch
-
-Cloning into 'prune'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/extrabranch
-fatal: ambiguous argument 'origin/extrabranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/extrabranch
-ok 16 - fetch --prune on its own works as expected
-
-expecting success of 5510.17 'fetch --prune with a branch name keeps branches': 
-	cd "$D" &&
-	git clone . prune-branch &&
-	cd prune-branch &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-
-	git fetch --prune origin main &&
-	git rev-parse origin/extrabranch
-
-Cloning into 'prune-branch'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 17 - fetch --prune with a branch name keeps branches
-
-expecting success of 5510.18 'fetch --prune with a namespace keeps other namespaces': 
-	cd "$D" &&
-	git clone . prune-namespace &&
-	cd prune-namespace &&
-
-	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
-	git rev-parse origin/main
-
-Cloning into 'prune-namespace'...
-done.
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 18 - fetch --prune with a namespace keeps other namespaces
-
-expecting success of 5510.19 'fetch --prune handles overlapping refspecs': 
-	cd "$D" &&
-	git update-ref refs/pull/42/head main &&
-	git clone . prune-overlapping &&
-	cd prune-overlapping &&
-	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
-
-	git fetch --prune origin &&
-	git rev-parse origin/main &&
-	git rev-parse origin/pr/42 &&
-
-	git config --unset-all remote.origin.fetch &&
-	git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
-	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
-
-	git fetch --prune origin &&
-	git rev-parse origin/main &&
-	git rev-parse origin/pr/42
-
-Cloning into 'prune-overlapping'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- * [new ref]         refs/pull/42/head -> origin/pr/42
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 19 - fetch --prune handles overlapping refspecs
-
-expecting success of 5510.20 'fetch --prune --tags prunes branches but not tags': 
-	cd "$D" &&
-	git clone . prune-tags &&
-	cd prune-tags &&
-	git tag sometag main &&
-	# Create what looks like a remote-tracking branch from an earlier
-	# fetch that has since been deleted from the remote:
-	git update-ref refs/remotes/origin/fake-remote main &&
-
-	git fetch --prune --tags origin &&
-	git rev-parse origin/main &&
-	test_must_fail git rev-parse origin/fake-remote &&
-	git rev-parse sometag
-
-Cloning into 'prune-tags'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/fake-remote
-76a8623cbad8bd56c933c6f20106742c826dad9e
-fatal: ambiguous argument 'origin/fake-remote': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-origin/fake-remote
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 20 - fetch --prune --tags prunes branches but not tags
-
-expecting success of 5510.21 'fetch --prune --tags with branch does not prune other things': 
-	cd "$D" &&
-	git clone . prune-tags-branch &&
-	cd prune-tags-branch &&
-	git tag sometag main &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-
-	git fetch --prune --tags origin main &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
-
-Cloning into 'prune-tags-branch'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- * branch            main       -> FETCH_HEAD
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 21 - fetch --prune --tags with branch does not prune other things
-
-expecting success of 5510.22 'fetch --prune --tags with refspec prunes based on refspec': 
-	cd "$D" &&
-	git clone . prune-tags-refspec &&
-	cd prune-tags-refspec &&
-	git tag sometag main &&
-	git update-ref refs/remotes/origin/foo/otherbranch main &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-
-	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
-	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
-	git rev-parse origin/extrabranch &&
-	git rev-parse sometag
-
-Cloning into 'prune-tags-refspec'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/foo/otherbranch
-fatal: ambiguous argument 'refs/remotes/origin/foo/otherbranch': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/origin/foo/otherbranch
-76a8623cbad8bd56c933c6f20106742c826dad9e
-76a8623cbad8bd56c933c6f20106742c826dad9e
-ok 22 - fetch --prune --tags with refspec prunes based on refspec
-
-expecting success of 5510.23 'fetch --tags gets tags even without a configured remote': 
-	REMOTE="$(pwd)/test_tag_1" &&
-	git init test_tag_1 &&
-	(
-		cd test_tag_1 &&
-		test_commit foo
-	) &&
-	git init test_tag_2 &&
-	(
-		cd test_tag_2 &&
-		git fetch --tags "file://$REMOTE" &&
-		echo "foo" >expect &&
-		git tag >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1/.git/
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_2/.git/
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-tags-refspec/test_tag_1
- * branch            HEAD       -> FETCH_HEAD
- * [new tag]         foo        -> foo
-ok 23 - fetch --tags gets tags even without a configured remote
-
-expecting success of 5510.24 'fetch --prune fails to delete branches': 
-	cd "$D" &&
-	git clone . prune-fail &&
-	cd prune-fail &&
-	git update-ref refs/remotes/origin/extrabranch main &&
-	git pack-refs --all &&
-	: this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds  &&
-	>.git/packed-refs.new &&
-
-	test_must_fail git fetch --prune origin
-
-Cloning into 'prune-fail'...
-done.
-error: could not delete reference refs/remotes/origin/extrabranch: unable to create file /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/prune-fail/.git/packed-refs.new: File exists
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5510-fetch/.
- - [deleted]         (none)     -> origin/extrabranch
-ok 24 - fetch --prune fails to delete branches
-
-expecting success of 5510.25 'fetch --atomic works with a single branch': 
-	test_when_finished "rm -rf \"$D\"/atomic" &&
+expecting success of 5510.25 'fetch --atomic works with a single branch': 
+	test_when_finished "rm -rf \"$D\"/atomic" &&
 
 	cd "$D" &&
 	git clone . atomic &&
@@ -390311,6 +388041,774 @@
 1..199
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5813-proto-disable-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/.git/
+expecting success of 5813.1 'setup ssh wrapper': 
+		write_script ssh-wrapper <<-\EOF &&
+		echo >&2 "ssh: $*"
+		host=$1; shift
+		cd "$TRASH_DIRECTORY/$host" &&
+		eval "$*"
+		EOF
+		GIT_SSH="$PWD/ssh-wrapper" &&
+		export GIT_SSH &&
+		export TRASH_DIRECTORY
+	
+ok 1 - setup ssh wrapper
+
+expecting success of 5813.2 'setup repository to clone': 
+	test_commit one &&
+	mkdir remote &&
+	git init --bare remote/repo.git &&
+	git push remote/repo.git HEAD
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git/
+To remote/repo.git
+ * [new branch]      HEAD -> master
+ok 2 - setup repository to clone
+
+expecting success of 5813.3 'clone host:path (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack 'repo.git'
+ok 3 - clone host:path (enabled)
+
+expecting success of 5813.4 'fetch host:path (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+ssh: remote git-upload-pack 'repo.git'
+From remote:repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 4 - fetch host:path (enabled)
+
+expecting success of 5813.5 'push host:path (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+ssh: remote git-receive-pack 'repo.git'
+To remote:repo.git
+ * [new branch]      HEAD -> pushed
+ok 5 - push host:path (enabled)
+
+expecting success of 5813.6 'push host:path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 6 - push host:path (disabled)
+
+expecting success of 5813.7 'fetch host:path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 7 - fetch host:path (disabled)
+
+expecting success of 5813.8 'clone host:path (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 8 - clone host:path (disabled)
+
+expecting success of 5813.9 'clone host:path (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 9 - clone host:path (env var has precedence)
+
+expecting success of 5813.10 'clone host:path (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack 'repo.git'
+ok 10 - clone host:path (enabled with config)
+
+expecting success of 5813.11 'fetch host:path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+ssh: remote git-upload-pack 'repo.git'
+From remote:repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 11 - fetch host:path (enabled)
+
+expecting success of 5813.12 'push host:path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+ssh: remote git-receive-pack 'repo.git'
+Everything up-to-date
+ok 12 - push host:path (enabled)
+
+expecting success of 5813.13 'push host:path (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 13 - push host:path (disabled)
+
+expecting success of 5813.14 'fetch host:path (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'ssh' not allowed
+ok 14 - fetch host:path (disabled)
+
+expecting success of 5813.15 'clone host:path (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 15 - clone host:path (disabled)
+
+expecting success of 5813.16 'clone host:path (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack 'repo.git'
+ok 16 - clone host:path (enabled)
+
+expecting success of 5813.17 'fetch host:path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+ssh: remote git-upload-pack 'repo.git'
+From remote:repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 17 - fetch host:path (enabled)
+
+expecting success of 5813.18 'push host:path (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+ssh: remote git-receive-pack 'repo.git'
+Everything up-to-date
+ok 18 - push host:path (enabled)
+
+expecting success of 5813.19 'push host:path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 19 - push host:path (disabled)
+
+expecting success of 5813.20 'fetch host:path (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 20 - fetch host:path (disabled)
+
+expecting success of 5813.21 'clone host:path (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 21 - clone host:path (disabled)
+
+expecting success of 5813.22 'clone host:path (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack 'repo.git'
+ok 22 - clone host:path (enabled)
+
+expecting success of 5813.23 'fetch host:path (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+ssh: remote git-upload-pack 'repo.git'
+From remote:repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 23 - fetch host:path (enabled)
+
+expecting success of 5813.24 'push host:path (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+ssh: remote git-receive-pack 'repo.git'
+Everything up-to-date
+ok 24 - push host:path (enabled)
+
+expecting success of 5813.25 'push host:path (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 25 - push host:path (disabled)
+
+expecting success of 5813.26 'fetch host:path (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'ssh' not allowed
+ok 26 - fetch host:path (disabled)
+
+expecting success of 5813.27 'clone host:path (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 27 - clone host:path (disabled)
+
+expecting success of 5813.28 'clone ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 28 - clone ssh:// (enabled)
+
+expecting success of 5813.29 'fetch ssh:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 29 - fetch ssh:// (enabled)
+
+expecting success of 5813.30 'push ssh:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 30 - push ssh:// (enabled)
+
+expecting success of 5813.31 'push ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 31 - push ssh:// (disabled)
+
+expecting success of 5813.32 'fetch ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 32 - fetch ssh:// (disabled)
+
+expecting success of 5813.33 'clone ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 33 - clone ssh:// (disabled)
+
+expecting success of 5813.34 'clone ssh:// (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 34 - clone ssh:// (env var has precedence)
+
+expecting success of 5813.35 'clone ssh:// (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 35 - clone ssh:// (enabled with config)
+
+expecting success of 5813.36 'fetch ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 36 - fetch ssh:// (enabled)
+
+expecting success of 5813.37 'push ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 37 - push ssh:// (enabled)
+
+expecting success of 5813.38 'push ssh:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 38 - push ssh:// (disabled)
+
+expecting success of 5813.39 'fetch ssh:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'ssh' not allowed
+ok 39 - fetch ssh:// (disabled)
+
+expecting success of 5813.40 'clone ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 40 - clone ssh:// (disabled)
+
+expecting success of 5813.41 'clone ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 41 - clone ssh:// (enabled)
+
+expecting success of 5813.42 'fetch ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 42 - fetch ssh:// (enabled)
+
+expecting success of 5813.43 'push ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 43 - push ssh:// (enabled)
+
+expecting success of 5813.44 'push ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 44 - push ssh:// (disabled)
+
+expecting success of 5813.45 'fetch ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 45 - fetch ssh:// (disabled)
+
+expecting success of 5813.46 'clone ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 46 - clone ssh:// (disabled)
+
+expecting success of 5813.47 'clone ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 47 - clone ssh:// (enabled)
+
+expecting success of 5813.48 'fetch ssh:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 48 - fetch ssh:// (enabled)
+
+expecting success of 5813.49 'push ssh:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 49 - push ssh:// (enabled)
+
+expecting success of 5813.50 'push ssh:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 50 - push ssh:// (disabled)
+
+expecting success of 5813.51 'fetch ssh:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'ssh' not allowed
+ok 51 - fetch ssh:// (disabled)
+
+expecting success of 5813.52 'clone ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 52 - clone ssh:// (disabled)
+
+expecting success of 5813.53 'clone git+ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 53 - clone git+ssh:// (enabled)
+
+expecting success of 5813.54 'fetch git+ssh:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git fetch
+		)
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 54 - fetch git+ssh:// (enabled)
+
+expecting success of 5813.55 'push git+ssh:// (enabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=$proto &&
+			export GIT_ALLOW_PROTOCOL &&
+			git push origin HEAD:pushed
+		)
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 55 - push git+ssh:// (enabled)
+
+expecting success of 5813.56 'push git+ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 56 - push git+ssh:// (disabled)
+
+expecting success of 5813.57 'fetch git+ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 57 - fetch git+ssh:// (disabled)
+
+expecting success of 5813.58 'clone git+ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 58 - clone git+ssh:// (disabled)
+
+expecting success of 5813.59 'clone git+ssh:// (env var has precedence)': 
+		rm -rf tmp.git &&
+		(
+			GIT_ALLOW_PROTOCOL=none &&
+			export GIT_ALLOW_PROTOCOL &&
+			test_must_fail git -c protocol.allow=always clone --bare "$url" tmp.git &&
+			test_must_fail git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 59 - clone git+ssh:// (env var has precedence)
+
+expecting success of 5813.60 'clone git+ssh:// (enabled with config)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 60 - clone git+ssh:// (enabled with config)
+
+expecting success of 5813.61 'fetch git+ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 61 - fetch git+ssh:// (enabled)
+
+expecting success of 5813.62 'push git+ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 62 - push git+ssh:// (enabled)
+
+expecting success of 5813.63 'push git+ssh:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 63 - push git+ssh:// (disabled)
+
+expecting success of 5813.64 'fetch git+ssh:// (disabled)': 
+		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+	
+fatal: transport 'ssh' not allowed
+ok 64 - fetch git+ssh:// (disabled)
+
+expecting success of 5813.65 'clone git+ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		test_must_fail git -c protocol.$proto.allow=never clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 65 - clone git+ssh:// (disabled)
+
+expecting success of 5813.66 'clone git+ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 66 - clone git+ssh:// (enabled)
+
+expecting success of 5813.67 'fetch git+ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 67 - fetch git+ssh:// (enabled)
+
+expecting success of 5813.68 'push git+ssh:// (enabled)': 
+		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 68 - push git+ssh:// (enabled)
+
+expecting success of 5813.69 'push git+ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user push origin HEAD:pushed
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 69 - push git+ssh:// (disabled)
+
+expecting success of 5813.70 'fetch git+ssh:// (disabled)': 
+		(
+			cd tmp.git &&
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user fetch
+		)
+	
+fatal: transport 'ssh' not allowed
+ok 70 - fetch git+ssh:// (disabled)
+
+expecting success of 5813.71 'clone git+ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		(
+			GIT_PROTOCOL_FROM_USER=0 &&
+			export GIT_PROTOCOL_FROM_USER &&
+			test_must_fail git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
+		)
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 71 - clone git+ssh:// (disabled)
+
+expecting success of 5813.72 'clone git+ssh:// (enabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow always &&
+		git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+ok 72 - clone git+ssh:// (enabled)
+
+expecting success of 5813.73 'fetch git+ssh:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git fetch
+	
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+From git+ssh://remote/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo
+ * branch            HEAD       -> FETCH_HEAD
+ok 73 - fetch git+ssh:// (enabled)
+
+expecting success of 5813.74 'push git+ssh:// (enabled)': 
+		test_config_global protocol.allow always &&
+		git -C tmp.git push origin HEAD:pushed
+	
+ssh: remote git-receive-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/repo.git'
+Everything up-to-date
+ok 74 - push git+ssh:// (enabled)
+
+expecting success of 5813.75 'push git+ssh:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git push origin HEAD:pushed
+	
+fatal: transport 'ssh' not allowed
+ok 75 - push git+ssh:// (disabled)
+
+expecting success of 5813.76 'fetch git+ssh:// (disabled)': 
+		test_config_global protocol.allow never &&
+		test_must_fail git -C tmp.git fetch
+	
+fatal: transport 'ssh' not allowed
+ok 76 - fetch git+ssh:// (disabled)
+
+expecting success of 5813.77 'clone git+ssh:// (disabled)': 
+		rm -rf tmp.git &&
+		test_config_global protocol.allow never &&
+		test_must_fail git clone --bare "$url" tmp.git
+	
+Cloning into bare repository 'tmp.git'...
+fatal: transport 'ssh' not allowed
+ok 77 - clone git+ssh:// (disabled)
+
+expecting success of 5813.78 'hostnames starting with dash are rejected': 
+	test_must_fail git clone ssh://-remote/repo.git dash-host 2>stderr &&
+	! grep ^ssh: stderr
+
+ok 78 - hostnames starting with dash are rejected
+
+expecting success of 5813.79 'setup repo with dash': 
+	git init --bare remote/-repo.git &&
+	git push remote/-repo.git HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/-repo.git/
+To remote/-repo.git
+ * [new branch]      HEAD -> master
+ok 79 - setup repo with dash
+
+expecting success of 5813.80 'repo names starting with dash are rejected': 
+	test_must_fail git clone remote:-repo.git dash-path 2>stderr &&
+	! grep ^ssh: stderr
+
+ok 80 - repo names starting with dash are rejected
+
+expecting success of 5813.81 'full paths still work': 
+	git clone "remote:$PWD/remote/-repo.git" dash-path
+
+Cloning into 'dash-path'...
+ssh: remote git-upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5813-proto-disable-ssh/remote/-repo.git'
+ok 81 - full paths still work
+
+# passed all 81 test(s)
+1..81
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t5801-remote-helpers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5801-remote-helpers/.git/
 expecting success of 5801.1 'setup repository': 
@@ -390596,8 +389094,8 @@
  1 file changed, 1 insertion(+)
 warning: Not updating refs/heads/new (new tip a81a4147c0db7a0bc38d047c3205b7c3ac8fc9c5 does not contain 9a8e2abfa604731e07ce2fb257109eb918e2280b)
 Everything up-to-date
---- expect	2026-04-19 19:22:12.139659440 +0000
-+++ actual	2026-04-19 19:22:12.151659440 +0000
+--- expect	2025-03-17 13:25:26.534261049 +0000
++++ actual	2025-03-17 13:25:26.546261125 +0000
 @@ -1 +1 @@
 -899057158430267bac82448fb89f21aa89c35cb0
 +9a8e2abfa604731e07ce2fb257109eb918e2280b
@@ -390985,6232 +389483,3060 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6008-rev-list-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6008-rev-list-submodule/.git/
-expecting success of 6008.1 'setup': 
-	: > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo 1 > file &&
-	test_tick &&
-	git commit -m second file &&
-	echo 2 > file &&
-	test_tick &&
-	git commit -m third file &&
+*** t5702-protocol-v2.sh ***
+checking prerequisite: PIPE
 
-	rm .git/index &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
 
-	: > super-file &&
-	git add super-file &&
-	git -c protocol.file.allow=always submodule add "$(pwd)" sub &&
-	git symbolic-ref HEAD refs/heads/super &&
-	test_tick &&
-	git commit -m super-initial &&
-	echo 1 > super-file &&
-	test_tick &&
-	git commit -m super-first super-file &&
-	echo 2 > super-file &&
-	test_tick &&
-	git commit -m super-second super-file
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[3302967] Ready to rumble
+expecting success of 5702.1 'create repo to be served by git-daemon': 
+	git init "$daemon_parent" &&
+	test_commit -C "$daemon_parent" one
 
-[main (root-commit) 1bd44cb] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 534ad2c] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1795412] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6008-rev-list-submodule/sub'...
-done.
-[super (root-commit) 1217e42] super-initial
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 100644 super-file
-[super 1b6e421] super-first
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/repo/parent/.git/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[super b8a96a3] super-second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ create mode 100644 one.t
+ok 1 - create repo to be served by git-daemon
 
-expecting success of 6008.2 'Ilari's test': 
-	git rev-list --objects super main ^super^
+expecting success of 5702.2 'list refs with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-b8a96a3432630314673128fdf0dcc5b765a6db9f
-17954123b4d2a45f7e0fec2fea14972db2b90a1f
-534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
-1bd44cb9d13204b0fe1958db0082f5028a16eb3a
-cf9fd161052a471dbdc4582bcfa173b09c7751dc 
-0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
-d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
-f27c6ae26adb8396d3861976ba268f87ad8afa0b 
-df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
-ok 2 - Ilari's test
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6011-rev-list-with-bad-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6011-rev-list-with-bad-commit/.git/
-expecting success of 6011.1 'setup': 
-   git init &&
-   git config core.compression 0 &&
-   git config core.logallrefupdates false &&
-   echo "foo" > foo &&
-   git add foo &&
-   git commit -m "first commit" &&
-   echo "bar" > bar &&
-   git add bar &&
-   git commit -m "second commit" &&
-   echo "baz" > baz &&
-   git add baz &&
-   git commit -m "third commit" &&
-   echo "foo again" >> foo &&
-   git add foo &&
-   git commit -m "fourth commit" &&
-   git repack -a -f -d
-   
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6011-rev-list-with-bad-commit/.git/
-[master (root-commit) 1e22a2b] first commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 869767e] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 53fc376] third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 baz
-[master 59070cc] fourth commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
+	# Client requested to use protocol v2
+	grep "ls-remote> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	grep "ls-remote< version 2" log &&
 
-expecting success of 6011.2 'verify number of revisions': 
-   revs=$(git rev-list --all | wc -l) &&
-   test $revs -eq 4 &&
-   first_commit=$(git rev-parse HEAD~3)
-   
-ok 2 - verify number of revisions
+	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
+	test_cmp expect actual
 
-expecting success of 6011.3 'corrupt second commit object': 
-   perl -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
-   test_must_fail git fsck --full
-   
-error: .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack pack checksum mismatch
-error: index CRC mismatch for object 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
-error: inflate: data stream error (incorrect data check)
-error: cannot unpack 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
-dangling tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c
-dangling commit 1e22a2b921014905366810d999b3d3a3e9514320
-ok 3 - corrupt second commit object
+[3303136] Connection from 127.0.0.1:52432
+[3303136] Extended attribute "host": 127.0.0.1:5702
+[3303136] Extended attribute "protocol": version=2
+[3303136] Request upload-pack for '/parent'
+[3302967] [3303136] Disconnected
+packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
+packet:    ls-remote< version 2
+[3303234] Connection from 127.0.0.1:52442
+[3303234] Extended attribute "host": 127.0.0.1:5702
+[3303234] Extended attribute "protocol": version=2
+[3303234] Request upload-pack for '/parent'
+[3302967] [3303234] Disconnected
+ok 2 - list refs with git:// using protocol v2
 
-expecting success of 6011.4 'rev-list should fail': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
+expecting success of 5702.3 'ref advertisement is filtered with ls-remote using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-error: inflate: data stream error (incorrect data check)
-error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
-fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
-ok 4 - rev-list should fail
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
 
-expecting success of 6011.5 'git repack _MUST_ fail': 
-   test_must_fail git repack -a -f -d
-   
-error: inflate: data stream error (incorrect data check)
-error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
-fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
-ok 5 - git repack _MUST_ fail
+	cat >expect <<-EOF &&
+	$(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
+	EOF
 
-expecting success of 6011.6 'first commit is still available': 
-   git log $first_commit
-   
-commit 1e22a2b921014905366810d999b3d3a3e9514320
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+	test_cmp expect actual
 
-    first commit
-ok 6 - first commit is still available
+[3303329] Connection from 127.0.0.1:52458
+[3303329] Extended attribute "host": 127.0.0.1:5702
+[3303329] Extended attribute "protocol": version=2
+[3303329] Request upload-pack for '/parent'
+[3302967] [3303329] Disconnected
+ok 3 - ref advertisement is filtered with ls-remote using protocol v2
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6013-rev-list-reverse-parents.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6013-rev-list-reverse-parents/.git/
-expecting success of 6013.1 'set up --reverse example': 
-	commit one &&
-	git tag root &&
-	commit two &&
-	git checkout -b side HEAD^ &&
-	commit three &&
-	git checkout main &&
-	git merge -s ours side &&
-	commit five
-	
-[main (root-commit) 86412ff] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 4931c53] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-[side 0fcb03e] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Merge made by the 'ours' strategy.
-[main 2ed4a76] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up --reverse example
+expecting success of 5702.4 'clone with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 6013.2 '--reverse --parents --full-history combines correctly': 
-	git rev-list --parents --full-history main -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --reverse --parents --full-history main -- foo \
-		> actual &&
-	test_cmp expected actual
-	
-ok 2 - --reverse --parents --full-history combines correctly
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		clone "$GIT_DAEMON_URL/parent" daemon_child &&
 
-expecting success of 6013.3 '--boundary does too': 
-	git rev-list --boundary --parents --full-history main ^root -- foo |
-		perl -e "print reverse <>" > expected &&
-	git rev-list --boundary --reverse --parents --full-history \
-		main ^root -- foo > actual &&
-	test_cmp expected actual
-	
-ok 3 - --boundary does too
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6007-rev-list-cherry-pick-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
-expecting success of 6007.1 'setup': 
-	echo Hallo > foo &&
-	git add foo &&
-	test_tick &&
-	git commit -m "A" &&
-	git tag A &&
-	git checkout -b branch &&
-	echo Bello > foo &&
-	echo Cello > bar &&
-	git add foo bar &&
-	test_tick &&
-	git commit -m "C" &&
-	git tag C &&
-	echo Dello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "E" &&
-	git tag E &&
-	git checkout main &&
-	git checkout branch foo &&
-	test_tick &&
-	git commit -m "B" &&
-	git tag B &&
-	echo Cello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "D" &&
-	git tag D &&
-	echo Nello > bar &&
-	git add bar &&
-	test_tick &&
-	git commit -m "F" &&
-	git tag F
+	# Client requested to use protocol v2
+	grep "clone> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	grep "clone< version 2" log
 
-[main (root-commit) 87a5b85] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to a new branch 'branch'
-[branch d81b112] C
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 bar
-[branch 50f946e] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Updated 1 path from 75417d5
-[main 9e00a87] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9c68531] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 555ccf5] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+Cloning into 'daemon_child'...
+[3303508] Connection from 127.0.0.1:52462
+[3303508] Extended attribute "host": 127.0.0.1:5702
+[3303508] Extended attribute "protocol": version=2
+[3303508] Request upload-pack for '/parent'
+[3302967] [3303508] Disconnected
+packet:        clone> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
+packet:        clone< version 2
+ok 4 - clone with git:// using protocol v2
 
-expecting success of 6007.2 '--left-right': 
-	git rev-list --left-right B...C > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+expecting success of 5702.5 'fetch with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-ok 2 - --left-right
+	test_commit -C "$daemon_parent" two &&
 
-expecting success of 6007.3 '--count': 
-	git rev-list --count B...C > actual &&
-	test "$(cat actual)" = 2
+	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
+		fetch &&
 
-ok 3 - --count
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 6007.4 '--cherry-pick foo comes up empty': 
-	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
+	# Client requested to use protocol v2
+	grep "fetch> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	grep "fetch< version 2" log
 
-ok 4 - --cherry-pick foo comes up empty
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[3303755] Connection from 127.0.0.1:52472
+[3303755] Extended attribute "host": 127.0.0.1:5702
+[3303755] Extended attribute "protocol": version=2
+[3303755] Request upload-pack for '/parent'
+[3302967] [3303755] Disconnected
+From git://127.0.0.1:5702/parent
+   d79ce16..139b20d  main       -> origin/main
+ * [new tag]         two        -> two
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
+packet:        fetch< version 2
+ok 5 - fetch with git:// using protocol v2
 
-expecting success of 6007.5 '--cherry-pick bar does not come up empty': 
-	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+expecting success of 5702.6 'fetch by hash without tag following with protocol v2 does not list refs': 
+	test_when_finished "rm -f log" &&
 
-ok 5 - --cherry-pick bar does not come up empty
+	test_commit -C "$daemon_parent" two_a &&
+	git -C "$daemon_parent" rev-parse two_a >two_a_hash &&
 
-expecting success of 6007.6 'bar does not come up empty': 
-	git rev-list --left-right B...C -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
+		fetch --no-tags origin $(cat two_a_hash) &&
 
-ok 6 - bar does not come up empty
+	grep "fetch< version 2" log &&
+	! grep "fetch> command=ls-refs" log
 
-expecting success of 6007.7 '--cherry-pick bar does not come up empty (II)': 
-	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+[main 7e9f7d0] two_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two_a.t
+[3304128] Connection from 127.0.0.1:52476
+[3304128] Extended attribute "host": 127.0.0.1:5702
+[3304128] Extended attribute "protocol": version=2
+[3304128] Request upload-pack for '/parent'
+[3302967] [3304128] Disconnected
+From git://127.0.0.1:5702/parent
+ * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
+packet:        fetch< version 2
+ok 6 - fetch by hash without tag following with protocol v2 does not list refs
 
-ok 7 - --cherry-pick bar does not come up empty (II)
+expecting success of 5702.7 'pull with git:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 6007.8 'name-rev multiple --refs combine inclusive': 
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
+		pull &&
 
-ok 8 - name-rev multiple --refs combine inclusive
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 6007.9 'name-rev --refs excludes non-matched patterns': 
-	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+	# Client requested to use protocol v2
+	grep "fetch> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	grep "fetch< version 2" log
 
-ok 9 - name-rev --refs excludes non-matched patterns
+[3304319] Connection from 127.0.0.1:52488
+[3304319] Extended attribute "host": 127.0.0.1:5702
+[3304319] Extended attribute "protocol": version=2
+[3304319] Request upload-pack for '/parent'
+From git://127.0.0.1:5702/parent
+   139b20d..7e9f7d0  main       -> origin/main
+ * [new tag]         two_a      -> two_a
+[3302967] [3304319] Disconnected
+Updating d79ce16..7e9f7d0
+Fast-forward
+ two.t   | 1 +
+ two_a.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 two.t
+ create mode 100644 two_a.t
+packet:        fetch> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
+packet:        fetch< version 2
+ok 7 - pull with git:// using protocol v2
 
-expecting success of 6007.10 'name-rev --exclude excludes matched patterns': 
-	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
-	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
-		<actual >actual.named &&
-	test_cmp expect actual.named
+expecting success of 5702.8 'push with git:// and a config of v2 does not request v2': 
+	test_when_finished "rm -f log" &&
 
-ok 10 - name-rev --exclude excludes matched patterns
+	# Till v2 for push is designed, make sure that if a client has
+	# protocol.version configured to use v2, that the client instead falls
+	# back and uses v0.
 
-expecting success of 6007.11 'name-rev --no-refs clears the refs list': 
-	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
-		<expect >actual &&
-	test_cmp expect actual
+	test_commit -C daemon_child three &&
 
-ok 11 - name-rev --no-refs clears the refs list
+	# Push to another branch, as the target repository has the
+	# main branch checked out and we cannot push into it.
+	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
+		push origin HEAD:client_branch &&
 
-expecting success of 6007.12 '--cherry-mark': 
-	git rev-list --cherry-mark F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
 
-ok 12 - --cherry-mark
+	# Client requested to use protocol v2
+	! grep "push> .*\\\0\\\0version=2\\\0$" log &&
+	# Server responded using protocol v2
+	! grep "push< version 2" log
 
-expecting success of 6007.13 '--cherry-mark --left-right': 
-	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+[main 166f565] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[3304600] Connection from 127.0.0.1:52492
+[3304600] Extended attribute "host": 127.0.0.1:5702
+[3304600] Request receive-pack for '/parent'
+To git://127.0.0.1:5702/parent
+ * [new branch]      HEAD -> client_branch
+[3302967] [3304600] Disconnected
+ok 8 - push with git:// and a config of v2 does not request v2
 
-ok 13 - --cherry-mark --left-right
+Stopping git daemon ...
+expecting success of 5702.9 'create repo to be served by file:// transport': 
+	git init file_parent &&
+	test_commit -C file_parent one
 
-expecting success of 6007.14 '--cherry-pick --right-only': 
-	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent/.git/
+[main (root-commit) 6f4b17f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+ok 9 - create repo to be served by file:// transport
 
-ok 14 - --cherry-pick --right-only
+expecting success of 5702.10 'list refs with file:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 6007.15 '--cherry-pick --left-only': 
-	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote --symref "file://$(pwd)/file_parent" >actual &&
 
-ok 15 - --cherry-pick --left-only
+	# Server responded using protocol v2
+	grep "ls-remote< version 2" log &&
 
-expecting success of 6007.16 '--cherry': 
-	git rev-list --cherry F...E -- bar > actual &&
-	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
-		< actual > actual.named &&
-	test_cmp expect actual.named
+	git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
+	test_cmp expect actual
 
-ok 16 - --cherry
+packet:    ls-remote< version 2
+ok 10 - list refs with file:// using protocol v2
 
-expecting success of 6007.17 '--cherry --count': 
-	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp expect actual
+expecting success of 5702.11 'ref advertisement is filtered with ls-remote using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-ok 17 - --cherry --count
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote "file://$(pwd)/file_parent" main >actual &&
+
+	cat >expect <<-EOF &&
+	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
+	EOF
 
-expecting success of 6007.18 '--cherry-mark --count': 
-	git rev-list --cherry-mark --count F...E -- bar > actual &&
 	test_cmp expect actual
 
-ok 18 - --cherry-mark --count
+ok 11 - ref advertisement is filtered with ls-remote using protocol v2
 
-expecting success of 6007.19 '--cherry-mark --left-right --count': 
-	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
-	test_cmp expect actual
+expecting success of 5702.12 'server-options are sent when using ls-remote': 
+	test_when_finished "rm -f log" &&
 
-ok 19 - --cherry-mark --left-right --count
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote -o hello -o world "file://$(pwd)/file_parent" main >actual &&
 
-expecting success of 6007.20 '--cherry-pick with independent, but identical branches': 
-	git symbolic-ref HEAD refs/heads/independent &&
-	rm .git/index &&
-	echo Hallo > foo &&
-	git add foo &&
-	test_tick &&
-	git commit -m "independent" &&
-	echo Bello > foo &&
-	test_tick &&
-	git commit -m "independent, too" foo &&
-	test -z "$(git rev-list --left-right --cherry-pick \
-		HEAD...main -- foo)"
+	cat >expect <<-EOF &&
+	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
+	EOF
 
-[independent (root-commit) 5da548c] independent
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[independent de095d9] independent, too
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - --cherry-pick with independent, but identical branches
+	test_cmp expect actual &&
+	grep "server-option=hello" log &&
+	grep "server-option=world" log
 
-expecting success of 6007.21 '--count --left-right': 
-	git rev-list --count --left-right C...D > actual &&
-	test_cmp expect actual
+packet:    ls-remote> server-option=hello
+packet:  upload-pack< server-option=hello
+packet:    ls-remote> server-option=world
+packet:  upload-pack< server-option=world
+ok 12 - server-options are sent when using ls-remote
 
-ok 21 - --count --left-right
+expecting success of 5702.13 'server-options from configuration are used by ls-remote': 
+	test_when_finished "rm -rf log myclone" &&
+	git clone "file://$(pwd)/file_parent" myclone &&
+	cat >expect <<-EOF &&
+	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
+	EOF
 
-expecting success of 6007.22 '--cherry-pick with duplicates on each side': 
-	git checkout -b dup-orig &&
-	test_commit dup-base &&
-	git revert dup-base &&
-	git cherry-pick dup-base &&
-	git checkout -b dup-side HEAD~3 &&
-	test_tick &&
-	git cherry-pick -3 dup-orig &&
-	git rev-list --cherry-pick dup-orig...dup-side >actual &&
-	test_must_be_empty actual
+	# Default server options from configuration are used
+	git -C myclone config --add remote.origin.serverOption foo &&
+	git -C myclone config --add remote.origin.serverOption bar &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		ls-remote origin main >actual &&
+	test_cmp expect actual &&
+	test_grep "ls-remote> server-option=foo" log &&
+	test_grep "ls-remote> server-option=bar" log &&
+	rm -f log &&
 
-Switched to a new branch 'dup-orig'
-[dup-orig eb9d72c] dup-base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-[dup-orig 92ef1a2] Revert "dup-base"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 dup-base.t
-[dup-orig 3f88b9e] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-Switched to a new branch 'dup-side'
-[dup-side d37dce7] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-[dup-side 5e0bb86] Revert "dup-base"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 dup-base.t
-[dup-side c48d64d] dup-base
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 dup-base.t
-ok 22 - --cherry-pick with duplicates on each side
+	# Empty value of remote.<name>.serverOption clears the list
+	git -C myclone config --add remote.origin.serverOption "" &&
+	git -C myclone config --add remote.origin.serverOption tar &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		ls-remote origin main >actual &&
+	test_cmp expect actual &&
+	test_grep "ls-remote> server-option=tar" log &&
+	test_grep ! "ls-remote> server-option=foo" log &&
+	test_grep ! "ls-remote> server-option=bar" log &&
+	rm -f log &&
 
-expecting success of 6007.23 '--cherry-pick avoids looking at full diffs': 
-	git checkout -b shy-diff &&
-	test_commit dont-look-at-me &&
-	echo Hello >dont-look-at-me.t &&
-	test_tick &&
-	git commit -m tip dont-look-at-me.t &&
-	git checkout -b mainline HEAD^ &&
-	test_commit to-cherry-pick &&
-	remove_loose_object shy-diff^:dont-look-at-me.t &&
-	git rev-list --cherry-pick ...shy-diff
+	# Server option from command line overrides those from configuration
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		ls-remote -o hello -o world origin main >actual &&
+	test_cmp expect actual &&
+	test_grep "ls-remote> server-option=hello" log &&
+	test_grep "ls-remote> server-option=world" log &&
+	test_grep ! "ls-remote> server-option=tar" log
 
-Switched to a new branch 'shy-diff'
-[shy-diff 694eab7] dont-look-at-me
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dont-look-at-me.t
-[shy-diff 065751b] tip
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'mainline'
-[mainline edb671e] to-cherry-pick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-cherry-pick.t
-edb671edd4843042c1e4b762a9eb9a82125402aa
-065751bb4ac05081d62425d3a9670d9d9102f001
-ok 23 - --cherry-pick avoids looking at full diffs
+Cloning into 'myclone'...
+packet:    ls-remote> server-option=foo
+packet:    ls-remote> server-option=bar
+packet:    ls-remote> server-option=tar
+packet:    ls-remote> server-option=hello
+packet:    ls-remote> server-option=world
+ok 13 - server-options from configuration are used by ls-remote
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6014-rev-list-all.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6014-rev-list-all/.git/
-expecting success of 6014.1 'setup': 
+expecting success of 5702.14 'warn if using server-option with ls-remote with legacy protocol': 
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
+		ls-remote -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
 
-	commit one &&
-	commit two &&
-	git checkout HEAD^ &&
-	commit detached
+	test_grep "see protocol.version in" err &&
+	test_grep "server options require protocol version 2 or later" err
 
+hint: see protocol.version in 'git help config' for more details
+fatal: server options require protocol version 2 or later
+ok 14 - warn if using server-option with ls-remote with legacy protocol
 
-[master (root-commit) 86412ff] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 4931c53] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'HEAD^'.
+expecting success of 5702.15 'clone with file:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		clone "file://$(pwd)/file_parent" file_child &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-  git switch -c <new-branch-name>
+	# Server responded using protocol v2
+	grep "clone< version 2" log &&
 
-Or undo this operation with:
+	# Client sent ref-prefixes to filter the ref-advertisement
+	grep "ref-prefix HEAD" log &&
+	grep "ref-prefix refs/heads/" log &&
+	grep "ref-prefix refs/tags/" log
 
-  git switch -
+Cloning into 'file_child'...
+packet:        clone< version 2
+packet:        clone> ref-prefix HEAD
+packet:  upload-pack< ref-prefix HEAD
+packet:        clone> ref-prefix refs/heads/
+packet:  upload-pack< ref-prefix refs/heads/
+packet:        clone> ref-prefix refs/tags/
+packet:  upload-pack< ref-prefix refs/tags/
+ok 15 - clone with file:// using protocol v2
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 5702.16 'clone of empty repo propagates name of default branch': 
+	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
 
-HEAD is now at 86412ff one
-[detached HEAD 13d8fe0] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
 
-expecting success of 6014.2 'rev-list --all lists detached HEAD': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone "file://$(pwd)/file_empty_parent" file_empty_child &&
+	echo refs/heads/mydefaultbranch >expect &&
+	git -C file_empty_child symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-	test 3 = $(git rev-list --all | wc -l)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
+Cloning into 'file_empty_child'...
+warning: You appear to have cloned an empty repository.
+ok 16 - clone of empty repo propagates name of default branch
 
+expecting success of 5702.17 '...but not if explicitly forbidden by config': 
+	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
 
-ok 2 - rev-list --all lists detached HEAD
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
+	test_config -C file_empty_parent lsrefs.unborn ignore &&
 
-expecting success of 6014.3 'repack does not lose detached HEAD': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone "file://$(pwd)/file_empty_parent" file_empty_child &&
+	echo refs/heads/main >expect &&
+	git -C file_empty_child symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-	git gc &&
-	git prune --expire=now &&
-	git show HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
+Cloning into 'file_empty_child'...
+warning: You appear to have cloned an empty repository.
+ok 17 - ...but not if explicitly forbidden by config
 
+expecting success of 5702.18 'bare clone propagates empty default branch': 
+	test_when_finished "rm -rf file_empty_parent file_empty_child.git" &&
 
-commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
 
-    detached
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone --bare \
+		"file://$(pwd)/file_empty_parent" file_empty_child.git &&
+	echo "refs/heads/mydefaultbranch" >expect &&
+	git -C file_empty_child.git symbolic-ref HEAD >actual &&
+	test_cmp expect actual
 
-diff --git a/foo b/foo
-index 5626abf..9aa4e2b 100644
---- a/foo
-+++ b/foo
-@@ -1 +1 @@
--one
-+detached
-ok 3 - repack does not lose detached HEAD
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_empty_parent/.git/
+Cloning into bare repository 'file_empty_child.git'...
+warning: You appear to have cloned an empty repository.
+ok 18 - bare clone propagates empty default branch
 
-expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
-	test_must_fail git rev-list --graph --no-walk HEAD
+expecting success of 5702.19 'clone propagates unborn HEAD from non-empty repo': 
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
 
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 4 - rev-list --graph --no-walk is forbidden
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6006-rev-list-format.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6006-rev-list-format/.git/
-expecting success of 6006.1 'setup': 
-	: >foo &&
-	git add foo &&
-	git config i18n.commitEncoding $test_encoding &&
-	echo "$added_iso88591" | git commit -F - &&
-	head1=$(git rev-parse --verify HEAD) &&
-	head1_short=$(git rev-parse --verify --short $head1) &&
-	head1_short4=$(git rev-parse --verify --short=4 $head1) &&
-	tree1=$(git rev-parse --verify HEAD:) &&
-	tree1_short=$(git rev-parse --verify --short $tree1) &&
-	echo "$changed" > foo &&
-	echo "$changed_iso88591" | git commit -a -F - &&
-	head2=$(git rev-parse --verify HEAD) &&
-	head2_short=$(git rev-parse --verify --short $head2) &&
-	head2_short4=$(git rev-parse --verify --short=4 $head2) &&
-	tree2=$(git rev-parse --verify HEAD:) &&
-	tree2_short=$(git rev-parse --verify --short $tree2) &&
-	git config --unset i18n.commitEncoding
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child 2>stderr &&
+	echo "refs/heads/mydefaultbranch" >expect &&
+	git -C file_unborn_child symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	grep "warning: remote HEAD refers to nonexistent ref" stderr
 
-[main (root-commit) 75bad09] added (hinzugefügt) foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-[main 7e50ed9] changed (geändert) foo
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
+Switched to a new branch 'branchwithstuff'
+[branchwithstuff (root-commit) 3e54c7d] stuff
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup
+ create mode 100644 stuff.t
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+ok 19 - clone propagates unborn HEAD from non-empty repo
 
-expecting success of 6006.2 'format percent': 
-		git rev-list  --pretty=format:'%%h' main >output.percent &&
-		test_cmp expect.percent output.percent
-	
-ok 2 - format percent
+expecting success of 5702.20 'clone propagates object-format from empty repo': 
+	test_when_finished "rm -fr src256 dst256" &&
 
-expecting success of 6006.3 'format hash': 
-		git rev-list  --pretty=format:'%H%n%h' main >output.hash &&
-		test_cmp expect.hash output.hash
-	
-ok 3 - format hash
+	echo sha256 >expect &&
+	git init --object-format=sha256 src256 &&
+	git clone src256 dst256 &&
+	git -C dst256 rev-parse --show-object-format >actual &&
 
-expecting success of 6006.4 'format hash-no-header': 
-		git rev-list  --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header &&
-		test_cmp expect.hash-no-header output.hash-no-header
-	
-ok 4 - format hash-no-header
+	test_cmp expect actual
 
-expecting success of 6006.5 'format hash-no-header-abbrev': 
-		git rev-list  --abbrev-commit --abbrev=0 --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header-abbrev &&
-		test_cmp expect.hash-no-header-abbrev output.hash-no-header-abbrev
-	
-ok 5 - format hash-no-header-abbrev
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/src256/.git/
+Cloning into 'dst256'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 20 - clone propagates object-format from empty repo
 
-expecting success of 6006.6 'format tree': 
-		git rev-list  --pretty=format:'%T%n%t' main >output.tree &&
-		test_cmp expect.tree output.tree
-	
-ok 6 - format tree
+expecting success of 5702.21 'bare clone propagates unborn HEAD from non-empty repo': 
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child.git" &&
 
-expecting success of 6006.7 'format parents': 
-		git rev-list  --pretty=format:'%P%n%p' main >output.parents &&
-		test_cmp expect.parents output.parents
-	
-ok 7 - format parents
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
 
-expecting success of 6006.8 'format author': 
-		git rev-list  --pretty=format:'%an%n%ae%n%al%n%ad%n%aD%n%at' main >output.author &&
-		test_cmp expect.author output.author
-	
-ok 8 - format author
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone --bare "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child.git 2>stderr &&
+	echo "refs/heads/mydefaultbranch" >expect &&
+	git -C file_unborn_child.git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	! grep "warning:" stderr
 
-expecting success of 6006.9 'format committer': 
-		git rev-list  --pretty=format:'%cn%n%ce%n%cl%n%cd%n%cD%n%ct' main >output.committer &&
-		test_cmp expect.committer output.committer
-	
-ok 9 - format committer
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
+Switched to a new branch 'branchwithstuff'
+[branchwithstuff (root-commit) 3e54c7d] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 stuff.t
+ok 21 - bare clone propagates unborn HEAD from non-empty repo
 
-expecting success of 6006.10 'format encoding': 
-		git rev-list  --pretty=format:'%e' main >output.encoding &&
-		test_cmp expect.encoding output.encoding
-	
-ok 10 - format encoding
+expecting success of 5702.22 'defaulted HEAD uses remote branch if available': 
+	test_when_finished "rm -rf file_unborn_parent file_unborn_child" &&
 
-expecting success of 6006.11 'format subject': 
-		git rev-list  --pretty=format:'%s' main >output.subject &&
-		test_cmp expect.subject output.subject
-	
-ok 11 - format subject
+	git init file_unborn_parent &&
+	(
+		cd file_unborn_parent &&
+		git config lsrefs.unborn ignore &&
+		git checkout -b branchwithstuff &&
+		test_commit --no-tag stuff &&
+		git symbolic-ref HEAD refs/heads/mydefaultbranch
+	) &&
 
-expecting success of 6006.12 'format subject-truncated': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.subject-truncated &&
-		test_cmp expect.subject-truncated output.subject-truncated
-	
-ok 12 - format subject-truncated
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=branchwithstuff -c protocol.version=2 \
+		clone "file://$(pwd)/file_unborn_parent" \
+		file_unborn_child 2>stderr &&
+	echo "refs/heads/branchwithstuff" >expect &&
+	git -C file_unborn_child symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	test_path_is_file file_unborn_child/stuff.t &&
+	! grep "warning:" stderr
 
-expecting success of 6006.13 'format body': 
-		git rev-list  --pretty=format:'%b' main >output.body &&
-		test_cmp expect.body output.body
-	
-ok 13 - format body
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_unborn_parent/.git/
+Switched to a new branch 'branchwithstuff'
+[branchwithstuff (root-commit) 3e54c7d] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 stuff.t
+ok 22 - defaulted HEAD uses remote branch if available
 
-expecting success of 6006.14 'format raw-body': 
-		git rev-list  --pretty=format:'%B' main >output.raw-body &&
-		test_cmp expect.raw-body output.raw-body
-	
-ok 14 - format raw-body
+expecting success of 5702.23 'fetch with file:// using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 6006.15 'format raw-body-no-header': 
-		git rev-list  --no-commit-header --pretty=format:'%B' main >output.raw-body-no-header &&
-		test_cmp expect.raw-body-no-header output.raw-body-no-header
-	
-ok 15 - format raw-body-no-header
+	test_commit -C file_parent two &&
 
-expecting success of 6006.16 'pretty oneline (without --no-commit-header)': 
-		git rev-list  --pretty='oneline' main >output.oneline &&
-		test_cmp expect.oneline output.oneline
-	
-ok 16 - pretty oneline (without --no-commit-header)
+	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
+		fetch origin &&
 
-expecting success of 6006.17 'pretty oneline (with --no-commit-header)': 
-		git rev-list  --no-commit-header --pretty='oneline' main >output.oneline &&
-		test_cmp expect.oneline output.oneline
-	
-ok 17 - pretty oneline (with --no-commit-header)
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 6006.18 'pretty short (without --no-commit-header)': 
-		git rev-list  --pretty='short' main >output.short &&
-		test_cmp expect.short output.short
-	
-ok 18 - pretty short (without --no-commit-header)
+	# Server responded using protocol v2
+	grep "fetch< version 2" log
 
-expecting success of 6006.19 'pretty short (with --no-commit-header)': 
-		git rev-list  --no-commit-header --pretty='short' main >output.short &&
-		test_cmp expect.short output.short
-	
-ok 19 - pretty short (with --no-commit-header)
+[main 5c4888c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+   6f4b17f..5c4888c  main       -> origin/main
+ * [new tag]         two        -> two
+packet:        fetch< version 2
+ok 23 - fetch with file:// using protocol v2
 
-expecting success of 6006.20 'basic colors': 
-	cat >expect <<-EOF &&
-	commit $head2
-	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
-	EOF
-	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
-	git rev-list --color --format="$format" -1 main >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+expecting success of 5702.24 'ref advertisement is filtered during fetch using protocol v2': 
+	test_when_finished "rm -f log" &&
 
-ok 20 - basic colors
+	test_commit -C file_parent three &&
+	git -C file_parent branch unwanted-branch three &&
 
-expecting success of 6006.21 '%S is not a placeholder for rev-list yet': 
-	git rev-list --format="%S" -1 main | grep "%S"
+	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
+		fetch origin main &&
 
-%S
-ok 21 - %S is not a placeholder for rev-list yet
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 6006.22 'advanced colors': 
-	cat >expect <<-EOF &&
-	commit $head2
-	<BOLD;RED;BYELLOW>foo<RESET>
-	EOF
-	format="%C(red yellow bold)foo%C(reset)" &&
-	git rev-list --color --format="$format" -1 main >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
+	grep "refs/heads/main" log &&
+	! grep "refs/heads/unwanted-branch" log
 
-ok 22 - advanced colors
+[main 3fa1c23] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * branch            main       -> FETCH_HEAD
+   5c4888c..3fa1c23  main       -> origin/main
+packet:        fetch> ref-prefix refs/heads/main
+packet:  upload-pack< ref-prefix refs/heads/main
+packet:  upload-pack> 3fa1c2361a0cae4d34ddb1469c03fc84cd2e36bb refs/heads/main
+packet:        fetch< 3fa1c2361a0cae4d34ddb1469c03fc84cd2e36bb refs/heads/main
+ok 24 - ref advertisement is filtered during fetch using protocol v2
 
-expecting success of 6006.23 '%Cred does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 23 - %Cred does not enable color by default
+expecting success of 5702.25 'server-options are sent when fetching': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 6006.24 '%Cred enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 24 - %Cred enables colors for color.diff
+	test_commit -C file_parent four &&
 
-expecting success of 6006.25 '%Cred enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 25 - %Cred enables colors for color.ui
+	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
+		fetch -o hello -o world origin main &&
 
-expecting success of 6006.26 '%Cred respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 26 - %Cred respects --color
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 6006.27 '%Cred respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 27 - %Cred respects --no-color
+	grep "server-option=hello" log &&
+	grep "server-option=world" log
 
-checking prerequisite: TTY
+[main acc6f16] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * branch            main       -> FETCH_HEAD
+   3fa1c23..acc6f16  main       -> origin/main
+packet:        fetch> server-option=hello
+packet:  upload-pack< server-option=hello
+packet:        fetch> server-option=hello
+packet:  upload-pack< server-option=hello
+packet:        fetch> server-option=world
+packet:  upload-pack< server-option=world
+packet:        fetch> server-option=world
+packet:  upload-pack< server-option=world
+ok 25 - server-options are sent when fetching
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+expecting success of 5702.26 'server-options are sent when fetch multiple remotes': 
+	test_when_finished "rm -f log server_options_sent" &&
+	git clone "file://$(pwd)/file_parent" child_multi_remotes &&
+	git -C child_multi_remotes remote add another "file://$(pwd)/file_parent" &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C child_multi_remotes -c protocol.version=2 \
+		fetch -o hello --all &&
+	grep "fetch> server-option=hello" log >server_options_sent &&
+	test_line_count = 2 server_options_sent
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+Cloning into 'child_multi_remotes'...
+Fetching origin
+Fetching another
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * [new branch]      main            -> another/main
+ * [new branch]      unwanted-branch -> another/unwanted-branch
+ok 26 - server-options are sent when fetch multiple remotes
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+expecting success of 5702.27 'server-options from configuration are used by git-fetch': 
+	test_when_finished "rm -rf log myclone" &&
+	git clone "file://$(pwd)/file_parent" myclone &&
+	git -C file_parent log -1 --format=%s >expect &&
 
-)
-prerequisite TTY ok
-expecting success of 6006.28 '%Cred respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 28 - %Cred respects --color=auto (stdout is tty)
+	# Default server options from configuration are used
+	git -C myclone config --add remote.origin.serverOption foo &&
+	git -C myclone config --add remote.origin.serverOption bar &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		fetch origin main &&
+	git -C myclone log -1 --format=%s origin/main >actual &&
+	test_cmp expect actual &&
+	test_grep "fetch> server-option=foo" log &&
+	test_grep "fetch> server-option=bar" log &&
+	rm -f log &&
 
-expecting success of 6006.29 '%Cred respects --color=auto (stdout not tty)': 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 29 - %Cred respects --color=auto (stdout not tty)
+	# Empty value of remote.<name>.serverOption clears the list
+	git -C myclone config --add remote.origin.serverOption "" &&
+	git -C myclone config --add remote.origin.serverOption tar &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		fetch origin main &&
+	git -C myclone log -1 --format=%s origin/main >actual &&
+	test_cmp expect actual &&
+	test_grep "fetch> server-option=tar" log &&
+	test_grep ! "fetch> server-option=foo" log &&
+	test_grep ! "fetch> server-option=bar" log &&
+	rm -f log &&
 
-expecting success of 6006.30 '%C(...) does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 30 - %C(...) does not enable color by default
+	# Server option from command line overrides those from configuration
+	GIT_TRACE_PACKET="$(pwd)/log" git -C myclone -c protocol.version=2 \
+		fetch -o hello -o world origin main &&
+	git -C myclone log -1 --format=%s origin/main >actual &&
+	test_cmp expect actual &&
+	test_grep "fetch> server-option=hello" log &&
+	test_grep "fetch> server-option=world" log &&
+	test_grep ! "fetch> server-option=tar" log
 
-expecting success of 6006.31 '%C(...) enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 31 - %C(...) enables colors for color.diff
+Cloning into 'myclone'...
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * branch            main       -> FETCH_HEAD
+packet:        fetch> server-option=foo
+packet:        fetch> server-option=bar
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * branch            main       -> FETCH_HEAD
+packet:        fetch> server-option=tar
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * branch            main       -> FETCH_HEAD
+packet:        fetch> server-option=hello
+packet:        fetch> server-option=world
+ok 27 - server-options from configuration are used by git-fetch
 
-expecting success of 6006.32 '%C(...) enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 32 - %C(...) enables colors for color.ui
+expecting success of 5702.28 'warn if using server-option with fetch with legacy protocol': 
+	test_when_finished "rm -rf temp_child" &&
 
-expecting success of 6006.33 '%C(...) respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 33 - %C(...) respects --color
+	git init temp_child &&
 
-expecting success of 6006.34 '%C(...) respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 34 - %C(...) respects --no-color
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
+		fetch -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
 
-expecting success of 6006.35 '%C(...) respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 35 - %C(...) respects --color=auto (stdout is tty)
+	test_grep "see protocol.version in" err &&
+	test_grep "server options require protocol version 2 or later" err
 
-expecting success of 6006.36 '%C(...) respects --color=auto (stdout not tty)': 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 36 - %C(...) respects --color=auto (stdout not tty)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/temp_child/.git/
+hint: see protocol.version in 'git help config' for more details
+fatal: server options require protocol version 2 or later
+ok 28 - warn if using server-option with fetch with legacy protocol
 
-expecting success of 6006.37 '%C(auto,...) does not enable color by default': 
-		git log --format=$color -1 >actual &&
-		has_no_color actual
-	
-ok 37 - %C(auto,...) does not enable color by default
+expecting success of 5702.29 'server-options are sent when cloning': 
+	test_when_finished "rm -rf log myclone" &&
 
-expecting success of 6006.38 '%C(auto,...) enables colors for color.diff': 
-		git -c color.diff=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 38 - %C(auto,...) enables colors for color.diff
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		clone --server-option=hello --server-option=world \
+		"file://$(pwd)/file_parent" myclone &&
 
-expecting success of 6006.39 '%C(auto,...) enables colors for color.ui': 
-		git -c color.ui=always log --format=$color -1 >actual &&
-		has_color actual
-	
-ok 39 - %C(auto,...) enables colors for color.ui
+	grep "server-option=hello" log &&
+	grep "server-option=world" log
 
-expecting success of 6006.40 '%C(auto,...) respects --color': 
-		git log --format=$color -1 --color >actual &&
-		has_color actual
-	
-ok 40 - %C(auto,...) respects --color
+Cloning into 'myclone'...
+packet:        clone> server-option=hello
+packet:  upload-pack< server-option=hello
+packet:        clone> server-option=hello
+packet:  upload-pack< server-option=hello
+packet:        clone> server-option=world
+packet:  upload-pack< server-option=world
+packet:        clone> server-option=world
+packet:  upload-pack< server-option=world
+ok 29 - server-options are sent when cloning
 
-expecting success of 6006.41 '%C(auto,...) respects --no-color': 
-		git -c color.ui=always log --format=$color -1 --no-color >actual &&
-		has_no_color actual
-	
-ok 41 - %C(auto,...) respects --no-color
+expecting success of 5702.30 'server-options from configuration are used by git-clone': 
+	test_when_finished "rm -rf log myclone" &&
 
-expecting success of 6006.42 '%C(auto,...) respects --color=auto (stdout is tty)': 
-		test_terminal git log --format=$color -1 --color=auto >actual &&
-		has_color actual
-	
-ok 42 - %C(auto,...) respects --color=auto (stdout is tty)
+	# Default server options from configuration are used
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
+		clone "file://$(pwd)/file_parent" myclone &&
+	test_grep "clone> server-option=foo" log &&
+	test_grep "clone> server-option=bar" log &&
+	rm -rf log myclone &&
 
-expecting success of 6006.43 '%C(auto,...) respects --color=auto (stdout not tty)': 
-		(
-			TERM=vt100 && export TERM &&
-			git log --format=$color -1 --color=auto >actual &&
-			has_no_color actual
-		)
-	
-ok 43 - %C(auto,...) respects --color=auto (stdout not tty)
+	# Empty value of remote.<name>.serverOption clears the list
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
+		-c remote.origin.serverOption= -c remote.origin.serverOption=tar \
+		clone "file://$(pwd)/file_parent" myclone &&
+	test_grep "clone> server-option=tar" log &&
+	test_grep ! "clone> server-option=foo" log &&
+	test_grep ! "clone> server-option=bar" log &&
+	rm -rf log myclone &&
 
-expecting success of 6006.44 '%C(always,...) enables color even without tty': 
-	git log --format=$ALWAYS_COLOR -1 >actual &&
-	has_color actual
+	# Server option from command line overrides those from configuration
+	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
+		-c remote.origin.serverOption=tar \
+		clone --server-option=hello --server-option=world \
+		"file://$(pwd)/file_parent" myclone &&
+	test_grep "clone> server-option=hello" log &&
+	test_grep "clone> server-option=world" log &&
+	test_grep ! "clone> server-option=tar" log
 
-ok 44 - %C(always,...) enables color even without tty
+Cloning into 'myclone'...
+packet:        clone> server-option=foo
+packet:        clone> server-option=foo
+packet:        clone> server-option=bar
+packet:        clone> server-option=bar
+Cloning into 'myclone'...
+packet:        clone> server-option=tar
+packet:        clone> server-option=tar
+Cloning into 'myclone'...
+packet:        clone> server-option=hello
+packet:        clone> server-option=hello
+packet:        clone> server-option=world
+packet:        clone> server-option=world
+ok 30 - server-options from configuration are used by git-clone
 
-expecting success of 6006.45 '%C(auto) respects --color': 
-	git log --color --format="%C(auto)%H" -1 >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
-	test_cmp expect actual
+expecting success of 5702.31 'warn if using server-option with clone with legacy protocol': 
+	test_when_finished "rm -rf myclone" &&
 
-ok 45 - %C(auto) respects --color
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
+		clone --server-option=hello --server-option=world \
+		"file://$(pwd)/file_parent" myclone 2>err &&
 
-expecting success of 6006.46 '%C(auto) respects --no-color': 
-	git log --no-color --format="%C(auto)%H" -1 >actual &&
-	git rev-parse HEAD >expect &&
-	test_cmp expect actual
+	test_grep "see protocol.version in" err &&
+	test_grep "server options require protocol version 2 or later" err
 
-ok 46 - %C(auto) respects --no-color
+hint: see protocol.version in 'git help config' for more details
+fatal: server options require protocol version 2 or later
+ok 31 - warn if using server-option with clone with legacy protocol
 
-expecting success of 6006.47 'rev-list %C(auto,...) respects --color': 
-	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
-		-1 HEAD >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat >expect <<-EOF &&
-	commit $(git rev-parse HEAD)
-	<GREEN>foo<RESET>
-	EOF
-	test_cmp expect actual
+expecting success of 5702.32 'server-option configuration with legacy protocol is ok': 
+	test_when_finished "rm -rf myclone" &&
 
-ok 47 - rev-list %C(auto,...) respects --color
+	env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
+		-c remote.origin.serverOption=foo -c remote.origin.serverOption=bar \
+		clone "file://$(pwd)/file_parent" myclone
 
-expecting success of 6006.48 'setup complex body': 
-	git config i18n.commitencoding $test_encoding &&
-	echo change2 >foo && git commit -a -F commit-msg &&
-	head3=$(git rev-parse --verify HEAD) &&
-	head3_short=$(git rev-parse --short $head3)
+Cloning into 'myclone'...
+ok 32 - server-option configuration with legacy protocol is ok
 
-[main 79c1a11] Test printing of complex bodies
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 48 - setup complex body
+expecting success of 5702.33 'invalid server-option configuration': 
+	test_when_finished "rm -rf myclone" &&
 
-expecting success of 6006.49 'format complex-encoding': 
-		git rev-list  --pretty=format:'%e' main >output.complex-encoding &&
-		test_cmp expect.complex-encoding output.complex-encoding
-	
-ok 49 - format complex-encoding
+	test_must_fail git -c protocol.version=2 \
+		-c remote.origin.serverOption \
+		clone "file://$(pwd)/file_parent" myclone 2>err &&
+	test_grep "error: missing value for 'remote.origin.serveroption'" err
 
-expecting success of 6006.50 'format complex-subject': 
-		git rev-list  --pretty=format:'%s' main >output.complex-subject &&
-		test_cmp expect.complex-subject output.complex-subject
-	
-ok 50 - format complex-subject
+error: missing value for 'remote.origin.serveroption'
+ok 33 - invalid server-option configuration
 
-expecting success of 6006.51 'format complex-subject-trunc': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-trunc &&
-		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
-	
-ok 51 - format complex-subject-trunc
+expecting success of 5702.34 'upload-pack respects config using protocol v2': 
+	git init server &&
+	write_script server/.git/hook <<-\EOF &&
+		touch hookout
+		"$@"
+	EOF
+	test_commit -C server one &&
 
-expecting success of 6006.52 'format complex-subject-mtrunc': 
-		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-mtrunc &&
-		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
-	
-ok 52 - format complex-subject-mtrunc
+	test_config_global uploadpack.packobjectshook ./hook &&
+	test_path_is_missing server/.git/hookout &&
+	git -c protocol.version=2 clone "file://$(pwd)/server" client &&
+	test_path_is_file server/.git/hookout
 
-expecting success of 6006.53 'format complex-subject-ltrunc': 
-		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-ltrunc &&
-		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
-	
-ok 53 - format complex-subject-ltrunc
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 0ba3da9] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Cloning into 'client'...
+ok 34 - upload-pack respects config using protocol v2
 
-expecting success of 6006.54 'setup expected messages (for test %b)': 
-	cat <<-EOF >expected.utf-8 &&
-	commit $head3
-	This commit message is much longer than the others,
-	and it will be encoded in $test_encoding. We should therefore
-	include an ISO8859 character: ¡bueno!
+expecting success of 5702.35 'setup filter tests': 
+	rm -rf server client &&
+	git init server &&
 
-	commit $head2
-	commit $head1
-	EOF
-	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
+	# 1 commit to create a file, and 1 commit to modify it
+	test_commit -C server message1 a.txt &&
+	test_commit -C server message2 a.txt &&
+	git -C server config protocol.version 2 &&
+	git -C server config uploadpack.allowfilter 1 &&
+	git -C server config uploadpack.allowanysha1inwant 1 &&
+	git -C server config protocol.version 2
 
-ok 54 - setup expected messages (for test %b)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 9f9a637] message1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.txt
+[main 3b911b1] message2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 35 - setup filter tests
 
-expecting success of 6006.55 'format complex-body': 
-		git rev-list  --pretty=format:'%b' main >output.complex-body &&
-		test_cmp expect.complex-body output.complex-body
-	
-ok 55 - format complex-body
+expecting success of 5702.36 'partial clone': 
+	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+		clone --filter=blob:none "file://$(pwd)/server" client &&
+	grep "version 2" trace &&
 
-expecting success of 6006.56 'format complex-subject-commitencoding-unset': 
-		git rev-list  --pretty=format:'%s' main >output.complex-subject-commitencoding-unset &&
-		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
-	
-ok 56 - format complex-subject-commitencoding-unset
+	# Ensure that the old version of the file is missing
+	git -C client rev-list --quiet --objects --missing=print main \
+		>observed.oids &&
+	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
 
-expecting success of 6006.57 'format complex-subject-commitencoding-unset-trunc': 
-		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-commitencoding-unset-trunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
-	
-ok 57 - format complex-subject-commitencoding-unset-trunc
+	# Ensure that client passes fsck
+	git -C client fsck
 
-expecting success of 6006.58 'format complex-subject-commitencoding-unset-mtrunc': 
-		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-commitencoding-unset-mtrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
-	
-ok 58 - format complex-subject-commitencoding-unset-mtrunc
+Cloning into 'client'...
+packet:  upload-pack> version 2
+packet:        clone< version 2
+packet:  upload-pack> version 2
+packet:        fetch< version 2
+?8045c300940c3b486923ccfc4dc22e72d1a10616
+ok 36 - partial clone
 
-expecting success of 6006.59 'format complex-subject-commitencoding-unset-ltrunc': 
-		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-commitencoding-unset-ltrunc &&
-		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
-	
-ok 59 - format complex-subject-commitencoding-unset-ltrunc
+expecting success of 5702.37 'dynamically fetch missing object': 
+	rm "$(pwd)/trace" &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		cat-file -p $(git -C server rev-parse message1:a.txt) &&
+	grep "version 2" trace
 
-expecting success of 6006.60 'format complex-body-commitencoding-unset': 
-		git rev-list  --pretty=format:'%b' main >output.complex-body-commitencoding-unset &&
-		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
-	
-ok 60 - format complex-body-commitencoding-unset
+message1
+packet:  upload-pack> version 2
+packet:        fetch< version 2
+ok 37 - dynamically fetch missing object
 
-expecting success of 6006.61 '%x00 shows NUL': 
-	echo  >expect commit $head3 &&
-	echo >>expect fooQbar &&
-	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
-	nul_to_q <actual.nul >actual &&
-	test_cmp expect actual
+expecting success of 5702.38 'when dynamically fetching missing object, do not list refs': 
+	! grep "git> command=ls-refs" trace
 
-ok 61 - %x00 shows NUL
+ok 38 - when dynamically fetching missing object, do not list refs
 
-expecting success of 6006.62 '%ad respects --date=': 
-	echo 2005-04-07 >expect.ad-short &&
-	git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
-	test_cmp expect.ad-short output.ad-short
+expecting success of 5702.39 'partial fetch': 
+	rm -rf client "$(pwd)/trace" &&
+	git init client &&
+	SERVER="file://$(pwd)/server" &&
 
-ok 62 - %ad respects --date=
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch --filter=blob:none "$SERVER" main:refs/heads/other &&
+	grep "version 2" trace &&
 
-expecting success of 6006.63 'empty email': 
-	test_tick &&
-	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
-	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-	test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
+	# Ensure that the old version of the file is missing
+	git -C client rev-list --quiet --objects --missing=print other \
+		>observed.oids &&
+	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
 
-ok 63 - empty email
+	# Ensure that client passes fsck
+	git -C client fsck
 
-expecting success of 6006.64 'del LF before empty (1)': 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * [new branch]      main       -> other
+ * [new tag]         message2   -> message2
+ * [new tag]         message1   -> message1
+packet:  upload-pack> version 2
+packet:        fetch< version 2
+?8045c300940c3b486923ccfc4dc22e72d1a10616
+notice: HEAD points to an unborn branch (main)
+ok 39 - partial fetch
 
-ok 64 - del LF before empty (1)
+expecting success of 5702.40 'do not advertise filter if not configured to do so': 
+	SERVER="file://$(pwd)/server" &&
 
-expecting success of 6006.65 'del LF before empty (2)': 
-	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
+	rm "$(pwd)/trace" &&
+	git -C server config uploadpack.allowfilter 1 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+		ls-remote "$SERVER" &&
+	grep "fetch=.*filter" trace &&
 
+	rm "$(pwd)/trace" &&
+	git -C server config uploadpack.allowfilter 0 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
+		ls-remote "$SERVER" &&
+	grep "fetch=" trace >fetch_capabilities &&
+	! grep filter fetch_capabilities
 
-ok 65 - del LF before empty (2)
+3b911b1bf820401c718047588b81902d5b7458b9	HEAD
+3b911b1bf820401c718047588b81902d5b7458b9	refs/heads/main
+9f9a637008eb8a901bafbb20928b41749ad6d174	refs/tags/message1
+3b911b1bf820401c718047588b81902d5b7458b9	refs/tags/message2
+packet:  upload-pack> fetch=shallow wait-for-done filter
+packet:    ls-remote< fetch=shallow wait-for-done filter
+3b911b1bf820401c718047588b81902d5b7458b9	HEAD
+3b911b1bf820401c718047588b81902d5b7458b9	refs/heads/main
+9f9a637008eb8a901bafbb20928b41749ad6d174	refs/tags/message1
+3b911b1bf820401c718047588b81902d5b7458b9	refs/tags/message2
+ok 40 - do not advertise filter if not configured to do so
 
-expecting success of 6006.66 'add LF before non-empty (1)': 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
-	test_line_count = 2 actual
+expecting success of 5702.41 'partial clone warns if filter is not advertised': 
+	rm -rf client &&
+	git -C server config uploadpack.allowfilter 0 &&
+	git -c protocol.version=2 \
+		clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
+	test_grep "filtering not recognized by server, ignoring" err
 
-ok 66 - add LF before non-empty (1)
+warning: filtering not recognized by server, ignoring
+ok 41 - partial clone warns if filter is not advertised
 
-expecting success of 6006.67 'add LF before non-empty (2)': 
-	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
-	test_line_count = 6 actual &&
-	grep "^$" actual
+expecting success of 5702.42 'even with handcrafted request, filter does not work if not advertised': 
+	git -C server config uploadpack.allowfilter 0 &&
 
+	# Custom request that tries to filter even though it is not advertised.
+	test-tool pkt-line pack >in <<-EOF &&
+	command=fetch
+	object-format=$(test_oid algo)
+	0001
+	want $(git -C server rev-parse main)
+	filter blob:none
+	0000
+	EOF
 
-ok 67 - add LF before non-empty (2)
+	test_must_fail test-tool -C server serve-v2 --stateless-rpc \
+		<in >/dev/null 2>err &&
+	grep "unexpected line: .filter blob:none." err &&
 
-expecting success of 6006.68 'add SP before non-empty (1)': 
-	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 3
+	# Exercise to ensure that if advertised, filter works
+	git -C server config uploadpack.allowfilter 1 &&
+	test-tool -C server serve-v2 --stateless-rpc <in >/dev/null
 
-ok 68 - add SP before non-empty (1)
+fatal: unexpected line: 'filter blob:none'
+ok 42 - even with handcrafted request, filter does not work if not advertised
 
-expecting success of 6006.69 'add SP before non-empty (2)': 
-	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
-	test $(wc -w <actual) = 6
+expecting success of 5702.43 'default refspec is used to filter ref when fetchcing': 
+	test_when_finished "rm -f log" &&
 
-ok 69 - add SP before non-empty (2)
+	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
+		fetch origin &&
 
-expecting success of 6006.70 '--abbrev': 
-	echo SHORT SHORT SHORT >expect2 &&
-	echo LONG LONG LONG >expect3 &&
-	git log -1 --format="%h %h %h" HEAD >actual1 &&
-	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
-	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
-	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
-	test_cmp expect2 fuzzy2 &&
-	test_cmp expect3 fuzzy3 &&
-	! test_cmp actual1 actual2
+	git -C file_child log -1 --format=%s three >actual &&
+	git -C file_parent log -1 --format=%s three >expect &&
+	test_cmp expect actual &&
 
---- actual1	2026-04-19 19:22:19.507659440 +0000
-+++ actual2	2026-04-19 19:22:19.527659440 +0000
-@@ -1 +1 @@
--79c1a11 79c1a11 79c1a11
-+79c1a 79c1a 79c1a
-ok 70 - --abbrev
+	grep "ref-prefix refs/heads/" log &&
+	grep "ref-prefix refs/tags/" log
 
-expecting success of 6006.71 '%H is not affected by --abbrev-commit': 
-	expected=$(($(test_oid hexsz) + 1)) &&
-	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = $expected
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/file_parent
+ * [new branch]      unwanted-branch -> origin/unwanted-branch
+ * [new tag]         four            -> four
+ * [new tag]         three           -> three
+packet:        fetch> ref-prefix refs/heads/
+packet:        fetch> ref-prefix refs/heads/main
+packet:  upload-pack< ref-prefix refs/heads/
+packet:  upload-pack< ref-prefix refs/heads/main
+packet:        fetch> ref-prefix refs/tags/
+packet:  upload-pack< ref-prefix refs/tags/
+ok 43 - default refspec is used to filter ref when fetchcing
 
-ok 71 - %H is not affected by --abbrev-commit
+expecting success of 5702.44 'fetch supports various ways of have lines': 
+	rm -rf server client trace &&
+	git init server &&
+	test_commit -C server dwim &&
+	TREE=$(git -C server rev-parse HEAD^{tree}) &&
+	git -C server tag exact \
+		$(git -C server commit-tree -m a "$TREE") &&
+	git -C server tag dwim-unwanted \
+		$(git -C server commit-tree -m b "$TREE") &&
+	git -C server tag exact-unwanted \
+		$(git -C server commit-tree -m c "$TREE") &&
+	git -C server tag prefix1 \
+		$(git -C server commit-tree -m d "$TREE") &&
+	git -C server tag prefix2 \
+		$(git -C server commit-tree -m e "$TREE") &&
+	git -C server tag fetch-by-sha1 \
+		$(git -C server commit-tree -m f "$TREE") &&
+	git -C server tag completely-unrelated \
+		$(git -C server commit-tree -m g "$TREE") &&
 
-expecting success of 6006.72 '%h is not affected by --abbrev-commit': 
-	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
-	len=$(wc -c <actual) &&
-	test $len = 21
+	git init client &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch "file://$(pwd)/server" \
+		dwim \
+		refs/tags/exact \
+		refs/tags/prefix*:refs/tags/prefix* \
+		"$(git -C server rev-parse fetch-by-sha1)" &&
 
-ok 72 - %h is not affected by --abbrev-commit
+	# Ensure that the appropriate prefixes are sent (using a sample)
+	grep "fetch> ref-prefix dwim" trace &&
+	grep "fetch> ref-prefix refs/heads/dwim" trace &&
+	grep "fetch> ref-prefix refs/tags/prefix" trace &&
 
-expecting success of 6006.73 '"%h %gD: %gs" is same as git-reflog': 
-	git reflog >expect &&
-	git log -g --format="%h %gD: %gs" >actual &&
-	test_cmp expect actual
+	# Ensure that the correct objects are returned
+	git -C client cat-file -e $(git -C server rev-parse dwim) &&
+	git -C client cat-file -e $(git -C server rev-parse exact) &&
+	git -C client cat-file -e $(git -C server rev-parse prefix1) &&
+	git -C client cat-file -e $(git -C server rev-parse prefix2) &&
+	git -C client cat-file -e $(git -C server rev-parse fetch-by-sha1) &&
+	test_must_fail git -C client cat-file -e \
+		$(git -C server rev-parse dwim-unwanted) &&
+	test_must_fail git -C client cat-file -e \
+		$(git -C server rev-parse exact-unwanted) &&
+	test_must_fail git -C client cat-file -e \
+		$(git -C server rev-parse completely-unrelated)
 
-ok 73 - "%h %gD: %gs" is same as git-reflog
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 7f427d6] dwim
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dwim.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * tag               dwim          -> FETCH_HEAD
+ * tag               exact         -> FETCH_HEAD
+ * [new tag]         prefix1       -> prefix1
+ * [new tag]         prefix2       -> prefix2
+ * branch            6e00395e552e1231e0d9bf16c819be5a25ec09bf -> FETCH_HEAD
+ * [new tag]         dwim          -> dwim
+ * [new tag]         exact         -> exact
+ * [new tag]         fetch-by-sha1 -> fetch-by-sha1
+packet:        fetch> ref-prefix dwim
+packet:        fetch> ref-prefix refs/heads/dwim
+packet:        fetch> ref-prefix refs/tags/prefix
+ok 44 - fetch supports various ways of have lines
 
-expecting success of 6006.74 '"%h %gD: %gs" is same as git-reflog (with date)': 
-	git reflog --date=raw >expect &&
-	git log -g --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
+expecting success of 5702.45 'fetch supports include-tag and tag following': 
+	rm -rf server client trace &&
+	git init server &&
 
-ok 74 - "%h %gD: %gs" is same as git-reflog (with date)
+	test_commit -C server to_fetch &&
+	git -C server tag -a annotated_tag -m message &&
 
-expecting success of 6006.75 '"%h %gD: %gs" is same as git-reflog (with --abbrev)': 
-	git reflog --abbrev=13 --date=raw >expect &&
-	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
-	test_cmp expect actual
+	git init client &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch "$(pwd)/server" to_fetch:to_fetch &&
 
-ok 75 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
+	grep "fetch> ref-prefix to_fetch" trace &&
+	grep "fetch> ref-prefix refs/tags/" trace &&
+	grep "fetch> include-tag" trace &&
 
-expecting success of 6006.76 '%gd shortens ref name': 
-	echo "main@{0}" >expect.gd-short &&
-	git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
-	test_cmp expect.gd-short actual.gd-short
+	git -C client cat-file -e $(git -C client rev-parse annotated_tag)
 
-ok 76 - %gd shortens ref name
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 23facce] to_fetch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_fetch.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/client/.git/
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * [new tag]         to_fetch      -> to_fetch
+ * [new tag]         annotated_tag -> annotated_tag
+ * [new tag]         to_fetch      -> to_fetch
+packet:        fetch> ref-prefix to_fetch
+packet:        fetch> ref-prefix refs/tags/to_fetch
+packet:        fetch> ref-prefix refs/tags/
+packet:        fetch> include-tag
+ok 45 - fetch supports include-tag and tag following
 
-expecting success of 6006.77 'reflog identity': 
-	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
-	git log -g -1 --format="%gn:%ge" >actual &&
-	test_cmp expect actual
+expecting success of 5702.46 'upload-pack respects client shallows': 
+	rm -rf server client trace &&
 
-ok 77 - reflog identity
+	git init server &&
+	test_commit -C server base &&
+	test_commit -C server client_has &&
 
-expecting success of 6006.78 'oneline with empty message': 
-	git commit --allow-empty --cleanup=verbatim -m "$LF" &&
-	git commit --allow-empty --allow-empty-message &&
-	git rev-list --oneline HEAD >test.txt &&
-	test_line_count = 5 test.txt &&
-	git rev-list --oneline --graph HEAD >testg.txt &&
-	test_line_count = 5 testg.txt
+	git clone --depth=1 "file://$(pwd)/server" client &&
 
-[main 45d198f] 
+	# Add extra commits to the client so that the whole fetch takes more
+	# than 1 request (due to negotiation)
+	test_commit_bulk -C client --id=c 32 &&
+
+	git -C server checkout -b newbranch base &&
+	test_commit -C server client_wants &&
+
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch origin newbranch &&
+	# Ensure that protocol v2 is used
+	grep "fetch< version 2" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 7011515] base
  Author: A U Thor <author@example.com>
-[main d12d4e0] 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main 35d129e] client_has
  Author: A U Thor <author@example.com>
-ok 78 - oneline with empty message
+ 1 file changed, 1 insertion(+)
+ create mode 100644 client_has.t
+Cloning into 'client'...
+35d129e7baa6ee4831bcbeb900efe4a30c2ed8b7
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           96 (         0 duplicates                  )
+      blobs  :           32 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           32 (         0 duplicates         31 deltas of         31 attempts)
+      commits:           32 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:             34
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =         37
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7448 /       7448
+---------------------------------------------------------------------
 
-expecting success of 6006.79 'single-character name is parsed correctly': 
-	git commit --author="a <a@example.com>" --allow-empty -m foo &&
-	echo "a <a@example.com>" >expect &&
-	git log -1 --format="%an <%ae>" >actual &&
-	test_cmp expect actual
+Your branch is ahead of 'origin/main' by 32 commits.
+  (use "git push" to publish your local commits)
+Switched to a new branch 'newbranch'
+[newbranch c382fc6] client_wants
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 client_wants.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * branch            newbranch  -> FETCH_HEAD
+packet:        fetch< version 2
+ok 46 - upload-pack respects client shallows
 
-[main d066665] foo
- Author: a <a@example.com>
-ok 79 - single-character name is parsed correctly
+expecting success of 5702.47 'ensure that multiple fetches in same process from a shallow repo works': 
+	rm -rf server client trace &&
 
-expecting success of 6006.80 'unused %G placeholders are passed through': 
-	echo "%GX %G" >expect &&
-	git log -1 --format="%GX %G" >actual &&
-	test_cmp expect actual
+	test_create_repo server &&
+	test_commit -C server one &&
+	test_commit -C server two &&
+	test_commit -C server three &&
+	git clone --shallow-exclude two "file://$(pwd)/server" client &&
 
-ok 80 - unused %G placeholders are passed through
+	git -C server tag -a -m "an annotated tag" twotag two &&
 
-# passed all 80 test(s)
-1..80
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6016-rev-list-graph-simplify-history.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
-expecting success of 6016.1 'set up rev-list --graph test': 
-	# 3 commits on branch A
-	test_commit A1 foo.txt &&
-	test_commit A2 bar.txt &&
-	test_commit A3 bar.txt &&
-	git branch -m main A &&
+	# Triggers tag following (thus, 2 fetches in one process)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch --shallow-exclude one origin &&
+	# Ensure that protocol v2 is used
+	grep "fetch< version 2" trace
 
-	# 2 commits on branch B, started from A1
-	git checkout -b B A1 &&
-	test_commit B1 foo.txt &&
-	test_commit B2 abc.txt &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 1581e3e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 5680d21] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 94705d7] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Cloning into 'client'...
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * [new tag]         two        -> two
+ * [new tag]         twotag     -> twotag
+packet:        fetch< version 2
+packet:        fetch< version 2
+ok 47 - ensure that multiple fetches in same process from a shallow repo works
 
-	# 2 commits on branch C, started from A2
-	git checkout -b C A2 &&
-	test_commit C1 xyz.txt &&
-	test_commit C2 xyz.txt &&
+expecting success of 5702.48 'deepen-relative': 
+	rm -rf server client trace &&
 
-	# Octopus merge B and C into branch A
-	git checkout A &&
-	git merge B C -m A4 &&
-	git tag A4 &&
+	test_create_repo server &&
+	test_commit -C server one &&
+	test_commit -C server two &&
+	test_commit -C server three &&
+	git clone --depth 1 "file://$(pwd)/server" client &&
+	test_commit -C server four &&
 
-	test_commit A5 bar.txt &&
+	# Sanity check that only "three" is downloaded
+	git -C client log --pretty=tformat:%s main >actual &&
+	echo three >expected &&
+	test_cmp expected actual &&
 
-	# More commits on C, then merge C into A
-	git checkout C &&
-	test_commit C3 foo.txt &&
-	test_commit C4 bar.txt &&
-	git checkout A &&
-	git merge -s ours C -m A6 &&
-	git tag A6 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
+		fetch --deepen=1 origin &&
+	# Ensure that protocol v2 is used
+	grep "fetch< version 2" trace &&
 
-	test_commit A7 bar.txt
+	git -C client log --pretty=tformat:%s origin/main >actual &&
+	cat >expected <<-\EOF &&
+	four
+	three
+	two
+	EOF
+	test_cmp expected actual
 
-[main (root-commit) 9b00348] A1
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 3735e1b] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.txt
-[main 02e4832] A2
+ create mode 100644 one.t
+[main 581c9db] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.txt
-[main 993a1f0] A3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'B'
-[B 4accf7e] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[B e76ada1] B2
+ create mode 100644 two.t
+[main f6e0668] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 abc.txt
-Switched to a new branch 'C'
-[C 0c196cf] C1
+ create mode 100644 three.t
+Cloning into 'client'...
+[main e79f779] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 xyz.txt
-[C ea5d98c] C2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Trying simple merge with B
-Trying simple merge with C
-Merge made by the 'octopus' strategy.
- abc.txt | 1 +
- foo.txt | 2 +-
- xyz.txt | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 abc.txt
- create mode 100644 xyz.txt
-[A 3f4a8d1] A5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'C'
-[C f01c181] C3
+ create mode 100644 four.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+   f6e0668..e79f779  main       -> origin/main
+ * [new tag]         four       -> four
+ * [new tag]         two        -> two
+packet:        fetch< version 2
+packet:        fetch< version 2
+ok 48 - deepen-relative
+
+expecting success of 5702.49 'usage: --negotiate-only without --negotiation-tip': 
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	cat >err.expect <<-\EOF &&
+	fatal: --negotiate-only needs one or more --negotiation-tip=*
+	EOF
+
+	test_must_fail git -c protocol.version=2 -C client fetch \
+		--negotiate-only \
+		origin 2>err.actual &&
+	test_cmp err.expect err.actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 7e477a7] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[C 406947e] C4
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 862b305] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Merge made by the 'ours' strategy.
-[A 691bdad] A7
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'client'...
+[main 8803147] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up rev-list --graph test
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 49 - usage: --negotiate-only without --negotiation-tip
 
-expecting success of 6016.2 '--graph --all': 
-	check_graph --all <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	| |
-	|  \
-	*-. | A4
-	|\ \|
-	| | * C2
-	| | * C1
-	| * | B2
-	| * | B1
-	* | | A3
-	| |/
-	|/|
-	* | A2
-	|/
-	* A1
+expecting success of 5702.50 'usage: --negotiate-only with --recurse-submodules': 
+	cat >err.expect <<-\EOF &&
+	fatal: options '--negotiate-only' and '--recurse-submodules' cannot be used together
 	EOF
 
-ok 2 - --graph --all
-
-expecting success of 6016.3 '--graph --simplify-by-decoration': 
-	git tag -d A4 &&
-	check_graph --all --simplify-by-decoration <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	| |
-	|  \
-	*-. | A4
-	|\ \|
-	| | * C2
-	| | * C1
-	| * | B2
-	| * | B1
-	* | | A3
-	| |/
-	|/|
-	* | A2
-	|/
-	* A1
-	EOF
+	test_must_fail git -c protocol.version=2 -C client fetch \
+		--negotiate-only \
+		--recurse-submodules \
+		origin 2>err.actual &&
+	test_cmp err.expect err.actual
 
-Deleted tag 'A4' (was c96d503)
-ok 3 - --graph --simplify-by-decoration
+ok 50 - usage: --negotiate-only with --recurse-submodules
 
-expecting success of 6016.4 'setup: get rid of decorations on B': 
-	git tag -d B2 &&
-	git tag -d B1 &&
-	git branch -d B
+expecting success of 5702.51 'file:// --negotiate-only': 
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
 
-Deleted tag 'B2' (was e76ada1)
-Deleted tag 'B1' (was 4accf7e)
-Deleted branch B (was e76ada1).
-ok 4 - setup: get rid of decorations on B
+	setup_negotiate_only "$SERVER" "$URI" &&
 
-expecting success of 6016.5 '--graph --simplify-by-decoration prune branch B': 
-	check_graph --simplify-by-decoration --all <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	| * C3
-	* | A5
-	* | A4
-	|\|
-	| * C2
-	| * C1
-	* | A3
-	|/
-	* A2
-	* A1
-	EOF
+	git -c protocol.version=2 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin >out &&
+	COMMON=$(git -C "$SERVER" rev-parse two) &&
+	grep "$COMMON" out
 
-ok 5 - --graph --simplify-by-decoration prune branch B
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 6a4c2ac] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 2944a1a] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'client'...
+[main 55428b5] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+2944a1ad614badae9d56b41b50bb5706f4126c41
+ok 51 - file:// --negotiate-only
 
-expecting success of 6016.6 '--graph --full-history -- bar.txt': 
-	check_graph --full-history --all -- bar.txt <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	* | A4
-	|\|
-	* | A3
-	|/
-	* A2
-	EOF
+expecting success of 5702.52 'file:// --negotiate-only with protocol v0': 
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
 
-ok 6 - --graph --full-history -- bar.txt
+	setup_negotiate_only "$SERVER" "$URI" &&
 
-expecting success of 6016.7 '--graph --full-history --simplify-merges -- bar.txt': 
-	check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	* | A3
-	|/
-	* A2
-	EOF
+	test_must_fail git -c protocol.version=0 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin 2>err &&
+	test_grep "negotiate-only requires protocol v2" err
 
-ok 7 - --graph --full-history --simplify-merges -- bar.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server/.git/
+[main (root-commit) 2472fbc] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 6b8fd04] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'client'...
+[main 27885d4] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+warning: --negotiate-only requires protocol v2
+ok 52 - file:// --negotiate-only with protocol v0
 
-expecting success of 6016.8 '--graph -- bar.txt': 
-	check_graph --all -- bar.txt <<-\EOF
-	* A7
-	* A5
-	* A3
-	| * C4
-	|/
-	* A2
-	EOF
+expecting success of 5702.53 'push with custom path does not request v2': 
+	rm -f env.trace &&
+	git -C client push \
+		--receive-pack="env >../env.trace; git-receive-pack" \
+		origin HEAD:refs/heads/custom-push-test &&
+	test_path_is_file env.trace &&
+	! grep ^GIT_PROTOCOL env.trace
 
-ok 8 - --graph -- bar.txt
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * [new branch]      HEAD -> custom-push-test
+ok 53 - push with custom path does not request v2
 
-expecting success of 6016.9 '--graph --sparse -- bar.txt': 
-	check_graph --sparse --all -- bar.txt <<-\EOF
-	* A7
-	* A6
-	* A5
-	* A4
-	* A3
-	| * C4
-	| * C3
-	| * C2
-	| * C1
-	|/
-	* A2
-	* A1
-	EOF
+expecting success of 5702.54 'fetch with custom path does request v2': 
+	rm -f env.trace &&
+	git -C client fetch \
+		--upload-pack="env >../env.trace; git-upload-pack" \
+		origin HEAD &&
+	grep ^GIT_PROTOCOL=version=2 env.trace
 
-ok 9 - --graph --sparse -- bar.txt
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5702-protocol-v2/server
+ * branch            HEAD       -> FETCH_HEAD
+GIT_PROTOCOL=version=2
+ok 54 - fetch with custom path does request v2
 
-expecting success of 6016.10 '--graph ^C4': 
-	check_graph --all ^C4 <<-\EOF
-	* A7
-	* A6
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+expecting success of 5702.55 'archive with custom path does not request v2': 
+	rm -f env.trace &&
+	git -C client archive \
+		--exec="env >../env.trace; git-upload-archive" \
+		--remote=origin \
+		HEAD >/dev/null &&
+	test_path_is_file env.trace &&
+	! grep ^GIT_PROTOCOL env.trace
 
-ok 10 - --graph ^C4
+ok 55 - archive with custom path does not request v2
 
-expecting success of 6016.11 '--graph ^C3': 
-	check_graph --all ^C3 <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* A5
-	*   A4
-	|\
-	| * B2
-	| * B1
-	* A3
-	EOF
+expecting success of 5702.56 'reject client packfile-uris if not advertised': 
+	{
+		packetize command=fetch &&
+		packetize object-format=$(test_oid algo) &&
+		printf 0001 &&
+		packetize packfile-uris https &&
+		packetize done &&
+		printf 0000
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack client <input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git -c uploadpack.blobpackfileuri \
+		upload-pack client <input &&
+	GIT_PROTOCOL=version=2 \
+		git -c uploadpack.blobpackfileuri=anything \
+		upload-pack client <input
 
-ok 11 - --graph ^C3
+000eversion 2
+002cagent=git/2.49.0.395.g12beb8f557c-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+002cagent=git/2.49.0.395.g12beb8f557c-Linux
+0013ls-refs=unborn
+0020fetch=shallow wait-for-done
+0012server-option
+0017object-format=sha1
+0000fatal: unexpected line: 'packfile-uris https'
+000eversion 2
+002cagent=git/2.49.0.395.g12beb8f557c-Linux
+0013ls-refs=unborn
+002efetch=shallow wait-for-done packfile-uris
+0012server-option
+0017object-format=sha1
+0000ok 56 - reject client packfile-uris if not advertised
 
-expecting success of 6016.12 '--graph --boundary ^C3': 
-	check_graph --boundary --all ^C3 <<-\EOF
-	* A7
-	*   A6
-	|\
-	| * C4
-	* | A5
-	| |
-	|  \
-	*-. \   A4
-	|\ \ \
-	| * | | B2
-	| * | | B1
-	* | | | A3
-	o | | | A2
-	|/ / /
-	o / / A1
-	 / /
-	| o C3
-	|/
-	o C2
-	EOF
+checking prerequisite: NOT_ROOT
 
-ok 12 - --graph --boundary ^C3
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-# passed all 12 test(s)
-1..12
+)
+prerequisite NOT_ROOT ok
+# passed all 56 test(s)
+# SKIP no web server found at ''
+1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6010-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6010-merge-base/.git/
-expecting success of 6010.1 'setup': 
-	T=$(git mktree </dev/null)
+*** t6008-rev-list-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6008-rev-list-submodule/.git/
+expecting success of 6008.1 'setup': 
+	: > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo 1 > file &&
+	test_tick &&
+	git commit -m second file &&
+	echo 2 > file &&
+	test_tick &&
+	git commit -m third file &&
 
-ok 1 - setup
+	rm .git/index &&
 
-expecting success of 6010.2 'set up G and H': 
-	# E---D---C---B---A
-	# \"-_         \   \
-	#  \  `---------G   \
-	#   \                \
-	#    F----------------H
-	E=$(doit 5 E) &&
-	D=$(doit 4 D $E) &&
-	F=$(doit 6 F $E) &&
-	C=$(doit 3 C $D) &&
-	B=$(doit 2 B $C) &&
-	A=$(doit 1 A $B) &&
-	G=$(doit 7 G $B $E) &&
-	H=$(doit 8 H $A $F)
+	: > super-file &&
+	git add super-file &&
+	git -c protocol.file.allow=always submodule add "$(pwd)" sub &&
+	git symbolic-ref HEAD refs/heads/super &&
+	test_tick &&
+	git commit -m super-initial &&
+	echo 1 > super-file &&
+	test_tick &&
+	git commit -m super-first super-file &&
+	echo 2 > super-file &&
+	test_tick &&
+	git commit -m super-second super-file
 
-ok 2 - set up G and H
+[main (root-commit) 1bd44cb] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 534ad2c] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 1795412] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6008-rev-list-submodule/sub'...
+done.
+[super (root-commit) 1217e42] super-initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 100644 super-file
+[super 1b6e421] super-first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[super b8a96a3] super-second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 6010.3 'merge-base G H': 
-	git name-rev $B >expected &&
+expecting success of 6008.2 'Ilari's test': 
+	git rev-list --objects super main ^super^
 
-	MB=$(git merge-base G H) &&
-	git name-rev "$MB" >actual.single &&
+b8a96a3432630314673128fdf0dcc5b765a6db9f
+17954123b4d2a45f7e0fec2fea14972db2b90a1f
+534ad2c6e7b5b68dcaa4f008327c6c2ab1fa47ff
+1bd44cb9d13204b0fe1958db0082f5028a16eb3a
+cf9fd161052a471dbdc4582bcfa173b09c7751dc 
+0cfbf08886fca9a91cb753ec8734c84fcbe52c9f super-file
+d9cc608eedd5d2cc63c262272b7a0f6ab6aed5dd 
+f27c6ae26adb8396d3861976ba268f87ad8afa0b 
+df2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078 
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 file
+ok 2 - Ilari's test
 
-	MB=$(git merge-base --all G H) &&
-	git name-rev "$MB" >actual.all &&
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6011-rev-list-with-bad-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6011-rev-list-with-bad-commit/.git/
+expecting success of 6011.1 'setup': 
+   git init &&
+   git config core.compression 0 &&
+   git config core.logallrefupdates false &&
+   echo "foo" > foo &&
+   git add foo &&
+   git commit -m "first commit" &&
+   echo "bar" > bar &&
+   git add bar &&
+   git commit -m "second commit" &&
+   echo "baz" > baz &&
+   git add baz &&
+   git commit -m "third commit" &&
+   echo "foo again" >> foo &&
+   git add foo &&
+   git commit -m "fourth commit" &&
+   git repack -a -f -d
+   
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6011-rev-list-with-bad-commit/.git/
+[master (root-commit) 1e22a2b] first commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 869767e] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 53fc376] third commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 baz
+[master 59070cc] fourth commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-	MB=$(git show-branch --merge-base G H) &&
-	git name-rev "$MB" >actual.sb &&
+expecting success of 6011.2 'verify number of revisions': 
+   revs=$(git rev-list --all | wc -l) &&
+   test $revs -eq 4 &&
+   first_commit=$(git rev-parse HEAD~3)
+   
+ok 2 - verify number of revisions
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all &&
-	test_cmp expected actual.sb
+expecting success of 6011.3 'corrupt second commit object': 
+   perl -i.bak -pe "s/second commit/socond commit/" .git/objects/pack/*.pack &&
+   test_must_fail git fsck --full
+   
+error: .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack pack checksum mismatch
+error: index CRC mismatch for object 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
+error: inflate: data stream error (incorrect data check)
+error: cannot unpack 869767e8235beefc84738586055c7a2b7232db6d from .git/objects/pack/pack-14931f0a002da21c186a836b8d79b815fcfaa9d3.pack at offset 487
+dangling tree 89ff1a2aefcbff0f09197f0fd8beeb19a7b6e51c
+dangling commit 1e22a2b921014905366810d999b3d3a3e9514320
+ok 3 - corrupt second commit object
 
-ok 3 - merge-base G H
+expecting success of 6011.4 'rev-list should fail': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null
 
-expecting success of 6010.4 'merge-base/show-branch --independent': 
-	git name-rev "$H" >expected1 &&
-	git name-rev "$H" "$G" >expected2 &&
+error: inflate: data stream error (incorrect data check)
+error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
+fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
+ok 4 - rev-list should fail
 
-	parents=$(git merge-base --independent H) &&
-	git name-rev $parents >actual1.mb &&
-	parents=$(git merge-base --independent A H G) &&
-	git name-rev $parents >actual2.mb &&
+expecting success of 6011.5 'git repack _MUST_ fail': 
+   test_must_fail git repack -a -f -d
+   
+error: inflate: data stream error (incorrect data check)
+error: Could not read 869767e8235beefc84738586055c7a2b7232db6d
+fatal: Failed to traverse parents of commit 53fc3762862d0b07a144c875d137db8459d094f2
+ok 5 - git repack _MUST_ fail
 
-	parents=$(git show-branch --independent H) &&
-	git name-rev $parents >actual1.sb &&
-	parents=$(git show-branch --independent A H G) &&
-	git name-rev $parents >actual2.sb &&
+expecting success of 6011.6 'first commit is still available': 
+   git log $first_commit
+   
+commit 1e22a2b921014905366810d999b3d3a3e9514320
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-	test_cmp expected1 actual1.mb &&
-	test_cmp expected2 actual2.mb &&
-	test_cmp expected1 actual1.sb &&
-	test_cmp expected2 actual2.sb
+    first commit
+ok 6 - first commit is still available
 
-ok 4 - merge-base/show-branch --independent
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6013-rev-list-reverse-parents.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6013-rev-list-reverse-parents/.git/
+expecting success of 6013.1 'set up --reverse example': 
+	commit one &&
+	git tag root &&
+	commit two &&
+	git checkout -b side HEAD^ &&
+	commit three &&
+	git checkout main &&
+	git merge -s ours side &&
+	commit five
+	
+[main (root-commit) 86412ff] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main 4931c53] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side 0fcb03e] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Merge made by the 'ours' strategy.
+[main 2ed4a76] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up --reverse example
 
-expecting success of 6010.5 'unsynchronized clocks': 
-	# This test is to demonstrate that relying on timestamps in a distributed
-	# SCM to provide a _consistent_ partial ordering of commits leads to
-	# insanity.
-	#
-	#               Relative
-	# Structure     timestamps
-	#
-	#   PL  PR        +4  +4
-	#  /  \/  \      /  \/  \
-	# L2  C2  R2    +3  -1  +3
-	# |   |   |     |   |   |
-	# L1  C1  R1    +2  -2  +2
-	# |   |   |     |   |   |
-	# L0  C0  R0    +1  -3  +1
-	#   \ |  /        \ |  /
-	#     S             0
-	#
-	# The left and right chains of commits can be of any length and complexity as
-	# long as all of the timestamps are greater than that of S.
+expecting success of 6013.2 '--reverse --parents --full-history combines correctly': 
+	git rev-list --parents --full-history main -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --reverse --parents --full-history main -- foo \
+		> actual &&
+	test_cmp expected actual
+	
+ok 2 - --reverse --parents --full-history combines correctly
 
-	S=$(doit  0 S) &&
+expecting success of 6013.3 '--boundary does too': 
+	git rev-list --boundary --parents --full-history main ^root -- foo |
+		perl -e "print reverse <>" > expected &&
+	git rev-list --boundary --reverse --parents --full-history \
+		main ^root -- foo > actual &&
+	test_cmp expected actual
+	
+ok 3 - --boundary does too
 
-	C0=$(doit -3 C0 $S) &&
-	C1=$(doit -2 C1 $C0) &&
-	C2=$(doit -1 C2 $C1) &&
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6007-rev-list-cherry-pick-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6007-rev-list-cherry-pick-file/.git/
+expecting success of 6007.1 'setup': 
+	echo Hallo > foo &&
+	git add foo &&
+	test_tick &&
+	git commit -m "A" &&
+	git tag A &&
+	git checkout -b branch &&
+	echo Bello > foo &&
+	echo Cello > bar &&
+	git add foo bar &&
+	test_tick &&
+	git commit -m "C" &&
+	git tag C &&
+	echo Dello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "E" &&
+	git tag E &&
+	git checkout main &&
+	git checkout branch foo &&
+	test_tick &&
+	git commit -m "B" &&
+	git tag B &&
+	echo Cello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "D" &&
+	git tag D &&
+	echo Nello > bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m "F" &&
+	git tag F
 
-	L0=$(doit  1 L0 $S) &&
-	L1=$(doit  2 L1 $L0) &&
-	L2=$(doit  3 L2 $L1) &&
+[main (root-commit) 87a5b85] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to a new branch 'branch'
+[branch d81b112] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 bar
+[branch 50f946e] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Updated 1 path from 75417d5
+[main 9e00a87] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9c68531] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 555ccf5] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-	R0=$(doit  1 R0 $S) &&
-	R1=$(doit  2 R1 $R0) &&
-	R2=$(doit  3 R2 $R1) &&
+expecting success of 6007.2 '--left-right': 
+	git rev-list --left-right B...C > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	PL=$(doit  4 PL $L2 $C2) &&
-	PR=$(doit  4 PR $C2 $R2) &&
+ok 2 - --left-right
 
-	git name-rev $C2 >expected &&
+expecting success of 6007.3 '--count': 
+	git rev-list --count B...C > actual &&
+	test "$(cat actual)" = 2
 
-	MB=$(git merge-base PL PR) &&
-	git name-rev "$MB" >actual.single &&
+ok 3 - --count
 
-	MB=$(git merge-base --all PL PR) &&
-	git name-rev "$MB" >actual.all &&
+expecting success of 6007.4 '--cherry-pick foo comes up empty': 
+	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all
+ok 4 - --cherry-pick foo comes up empty
 
-ok 5 - unsynchronized clocks
+expecting success of 6007.5 '--cherry-pick bar does not come up empty': 
+	git rev-list --left-right --cherry-pick B...C -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-expecting success of 6010.6 '--independent with unsynchronized clocks': 
-	IB=$(doit 0 IB) &&
-	I1=$(doit -10 I1 $IB) &&
-	I2=$(doit  -9 I2 $I1) &&
-	I3=$(doit  -8 I3 $I2) &&
-	I4=$(doit  -7 I4 $I3) &&
-	I5=$(doit  -6 I5 $I4) &&
-	I6=$(doit  -5 I6 $I5) &&
-	I7=$(doit  -4 I7 $I6) &&
-	I8=$(doit  -3 I8 $I7) &&
-	IH=$(doit  -2 IH $I8) &&
+ok 5 - --cherry-pick bar does not come up empty
 
-	echo $IH >expected &&
-	git merge-base --independent IB IH >actual &&
-	test_cmp expected actual
+expecting success of 6007.6 'bar does not come up empty': 
+	git rev-list --left-right B...C -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-ok 6 - --independent with unsynchronized clocks
+ok 6 - bar does not come up empty
 
-expecting success of 6010.7 'merge-base for octopus-step (setup)': 
-	# Another set to demonstrate base between one commit and a merge
-	# in the documentation.
-	#
-	# * C (MMC) * B (MMB) * A  (MMA)
-	# * o       * o       * o
-	# * o       * o       * o
-	# * o       * o       * o
-	# * o       | _______/
-	# |         |/
-	# |         * 1 (MM1)
-	# | _______/
-	# |/
-	# * root (MMR)
+expecting success of 6007.7 '--cherry-pick bar does not come up empty (II)': 
+	git rev-list --left-right --cherry-pick F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	test_commit MMR &&
-	test_commit MM1 &&
-	test_commit MM-o &&
-	test_commit MM-p &&
-	test_commit MM-q &&
-	test_commit MMA &&
-	git checkout MM1 &&
-	test_commit MM-r &&
-	test_commit MM-s &&
-	test_commit MM-t &&
-	test_commit MMB &&
-	git checkout MMR &&
-	test_commit MM-u &&
-	test_commit MM-v &&
-	test_commit MM-w &&
-	test_commit MM-x &&
-	test_commit MMC
+ok 7 - --cherry-pick bar does not come up empty (II)
 
-[master (root-commit) 0075405] MMR
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMR.t
-[master 91243c1] MM1
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM1.t
-[master 4d5fde5] MM-o
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-o.t
-[master ca22c18] MM-p
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-p.t
-[master 2659ed6] MM-q
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-q.t
-[master fdb9a8f] MMA
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMA.t
-Note: switching to 'MM1'.
+expecting success of 6007.8 'name-rev multiple --refs combine inclusive': 
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 8 - name-rev multiple --refs combine inclusive
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6007.9 'name-rev --refs excludes non-matched patterns': 
+	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-  git switch -c <new-branch-name>
+ok 9 - name-rev --refs excludes non-matched patterns
 
-Or undo this operation with:
+expecting success of 6007.10 'name-rev --exclude excludes matched patterns': 
+	git rev-list --left-right --right-only --cherry-pick F...E -- bar >>expect &&
+	git rev-list --left-right --cherry-pick F...E -- bar >actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" --exclude="*E" \
+		<actual >actual.named &&
+	test_cmp expect actual.named
 
-  git switch -
+ok 10 - name-rev --exclude excludes matched patterns
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6007.11 'name-rev --no-refs clears the refs list': 
+	git rev-list --left-right --cherry-pick F...E -- bar >expect &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/F" --refs="*tags/E" --no-refs --refs="*tags/G" \
+		<expect >actual &&
+	test_cmp expect actual
 
-HEAD is now at 91243c1 MM1
-[detached HEAD c35e31c] MM-r
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-r.t
-[detached HEAD 44e361c] MM-s
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-s.t
-[detached HEAD a5daa7f] MM-t
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-t.t
-[detached HEAD bca1425] MMB
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMB.t
-Previous HEAD position was bca1425 MMB
-HEAD is now at 0075405 MMR
-[detached HEAD 174b4d1] MM-u
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-u.t
-[detached HEAD c171a6c] MM-v
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-v.t
-[detached HEAD c25d00b] MM-w
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-w.t
-[detached HEAD 610cc22] MM-x
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-x.t
-[detached HEAD 03ab457] MMC
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMC.t
-ok 7 - merge-base for octopus-step (setup)
+ok 11 - name-rev --no-refs clears the refs list
 
-expecting success of 6010.8 'merge-base A B C': 
-	git rev-parse --verify MM1 >expected &&
-	git rev-parse --verify MMR >expected.sb &&
+expecting success of 6007.12 '--cherry-mark': 
+	git rev-list --cherry-mark F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	git merge-base --all MMA MMB MMC >actual &&
-	git merge-base --all --octopus MMA MMB MMC >actual.common &&
-	git show-branch --merge-base MMA MMB MMC >actual.sb &&
+ok 12 - --cherry-mark
 
-	test_cmp expected actual &&
-	test_cmp expected.sb actual.common &&
-	test_cmp expected.sb actual.sb
+expecting success of 6007.13 '--cherry-mark --left-right': 
+	git rev-list --cherry-mark --left-right F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-ok 8 - merge-base A B C
+ok 13 - --cherry-mark --left-right
 
-expecting success of 6010.9 'criss-cross merge-base for octopus-step': 
-	git reset --hard MMR &&
-	test_commit CC1 &&
-	git reset --hard E &&
-	test_commit CC2 &&
-	test_tick &&
-	# E is a root commit unrelated to MMR root on which CC1 is based
-	git merge -s ours --allow-unrelated-histories CC1 &&
-	test_commit CC-o &&
-	test_commit CCB &&
-	git reset --hard CC1 &&
-	# E is a root commit unrelated to MMR root on which CC1 is based
-	git merge -s ours --allow-unrelated-histories CC2 &&
-	test_commit CCA &&
+expecting success of 6007.14 '--cherry-pick --right-only': 
+	git rev-list --cherry-pick --right-only F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	git rev-parse CC1 CC2 >expected &&
-	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
+ok 14 - --cherry-pick --right-only
 
-	sort expected >expected.sorted &&
-	sort actual >actual.sorted &&
-	test_cmp expected.sorted actual.sorted
+expecting success of 6007.15 '--cherry-pick --left-only': 
+	git rev-list --cherry-pick --left-only E...F -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-HEAD is now at 0075405 MMR
-[detached HEAD 4141141] CC1
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC1.t
-HEAD is now at e34970a E
-[detached HEAD d33e00c] CC2
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC2.t
-Merge made by the 'ours' strategy.
-[detached HEAD 48e3312] CC-o
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC-o.t
-[detached HEAD dda5641] CCB
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CCB.t
-HEAD is now at 4141141 CC1
-Merge made by the 'ours' strategy.
-[detached HEAD 6d30b69] CCA
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CCA.t
-ok 9 - criss-cross merge-base for octopus-step
+ok 15 - --cherry-pick --left-only
 
-expecting success of 6010.10 'using reflog to find the fork point': 
-	git reset --hard &&
-	git checkout -b base $E &&
+expecting success of 6007.16 '--cherry': 
+	git rev-list --cherry F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-	(
-		for count in 1 2 3
-		do
-			git commit --allow-empty -m "Base commit #$count" &&
-			git rev-parse HEAD >expect$count &&
-			git checkout -B derived &&
-			git commit --allow-empty -m "Derived #$count" &&
-			git rev-parse HEAD >derived$count &&
-			git checkout -B base $E || exit 1
-		done &&
+ok 16 - --cherry
 
-		for count in 1 2 3
-		do
-			git merge-base --fork-point base $(cat derived$count) >actual &&
-			test_cmp expect$count actual || exit 1
-		done
+expecting success of 6007.17 '--cherry --count': 
+	git rev-list --cherry --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-	) &&
-	# check that we correctly default to HEAD
-	git checkout derived &&
-	git merge-base --fork-point base >actual &&
-	test_cmp expect3 actual
+ok 17 - --cherry --count
 
-HEAD is now at 6d30b69 CCA
-Previous HEAD position was 6d30b69 CCA
-Switched to a new branch 'base'
-[base 58b1909] Base commit #1
- Author: A U Thor <git@au.thor.xz>
-Switched to a new branch 'derived'
-[derived 8ef5ddb] Derived #1
- Author: A U Thor <git@au.thor.xz>
-Switched to and reset branch 'base'
-[base 9ef36f6] Base commit #2
- Author: A U Thor <git@au.thor.xz>
-Switched to and reset branch 'derived'
-[derived 6c4d828] Derived #2
- Author: A U Thor <git@au.thor.xz>
-Switched to and reset branch 'base'
-[base d6c9a6e] Base commit #3
- Author: A U Thor <git@au.thor.xz>
-Switched to and reset branch 'derived'
-[derived 3768cdc] Derived #3
- Author: A U Thor <git@au.thor.xz>
-Switched to and reset branch 'base'
-Switched to branch 'derived'
-ok 10 - using reflog to find the fork point
+expecting success of 6007.18 '--cherry-mark --count': 
+	git rev-list --cherry-mark --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-expecting success of 6010.11 '--fork-point works with empty reflog': 
-	git -c core.logallrefupdates=false branch no-reflog base &&
-	git merge-base --fork-point no-reflog derived &&
-	test_cmp expect3 actual
+ok 18 - --cherry-mark --count
 
-e34970abbab4461223052769885c56a229ee9299
-ok 11 - --fork-point works with empty reflog
+expecting success of 6007.19 '--cherry-mark --left-right --count': 
+	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-expecting success of 6010.12 'merge-base --octopus --all for complex tree': 
-	# Best common ancestor for JE, JAA and JDD is JC
-	#             JE
-	#            / |
-	#           /  |
-	#          /   |
-	#  JAA    /    |
-	#   |\   /     |
-	#   | \  | JDD |
-	#   |  \ |/ |  |
-	#   |   JC JD  |
-	#   |    | /|  |
-	#   |    |/ |  |
-	#  JA    |  |  |
-	#   |\  /|  |  |
-	#   X JB |  X  X
-	#   \  \ | /   /
-	#    \__\|/___/
-	#        J
-	test_commit J &&
-	test_commit JB &&
-	git reset --hard J &&
-	test_commit JC &&
-	git reset --hard J &&
-	test_commit JTEMP1 &&
-	test_merge JA JB &&
-	test_merge JAA JC &&
-	git reset --hard J &&
-	test_commit JTEMP2 &&
-	test_merge JD JB &&
-	test_merge JDD JC &&
-	git reset --hard J &&
-	test_commit JTEMP3 &&
-	test_merge JE JC &&
-	git rev-parse JC >expected &&
-	git merge-base --all --octopus JAA JDD JE >actual &&
-	test_cmp expected actual
+ok 19 - --cherry-mark --left-right --count
 
-[derived 3782338] J
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[derived 83a274f] JB
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 JB.t
-HEAD is now at 3782338 J
-[derived cb75edb] JC
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-HEAD is now at 3782338 J
-[derived e9767d0] JTEMP1
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 JTEMP1.t
-Merge made by the 'ort' strategy.
- JB.t | 1 +
+expecting success of 6007.20 '--cherry-pick with independent, but identical branches': 
+	git symbolic-ref HEAD refs/heads/independent &&
+	rm .git/index &&
+	echo Hallo > foo &&
+	git add foo &&
+	test_tick &&
+	git commit -m "independent" &&
+	echo Bello > foo &&
+	test_tick &&
+	git commit -m "independent, too" foo &&
+	test -z "$(git rev-list --left-right --cherry-pick \
+		HEAD...main -- foo)"
+
+[independent (root-commit) 5da548c] independent
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JB.t
-Merge made by the 'ort' strategy.
- JC.t | 1 +
+ create mode 100644 foo
+[independent de095d9] independent, too
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - --cherry-pick with independent, but identical branches
+
+expecting success of 6007.21 '--count --left-right': 
+	git rev-list --count --left-right C...D > actual &&
+	test_cmp expect actual
+
+ok 21 - --count --left-right
+
+expecting success of 6007.22 '--cherry-pick with duplicates on each side': 
+	git checkout -b dup-orig &&
+	test_commit dup-base &&
+	git revert dup-base &&
+	git cherry-pick dup-base &&
+	git checkout -b dup-side HEAD~3 &&
+	test_tick &&
+	git cherry-pick -3 dup-orig &&
+	git rev-list --cherry-pick dup-orig...dup-side >actual &&
+	test_must_be_empty actual
+
+Switched to a new branch 'dup-orig'
+[dup-orig eb9d72c] dup-base
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-HEAD is now at 3782338 J
-[derived d2ca2eb] JTEMP2
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 dup-base.t
+[dup-orig 92ef1a2] Revert "dup-base"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 dup-base.t
+[dup-orig 3f88b9e] dup-base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 JTEMP2.t
-Merge made by the 'ort' strategy.
- JB.t | 1 +
+ create mode 100644 dup-base.t
+Switched to a new branch 'dup-side'
+[dup-side d37dce7] dup-base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 JB.t
-Merge made by the 'ort' strategy.
- JC.t | 1 +
+ create mode 100644 dup-base.t
+[dup-side 5e0bb86] Revert "dup-base"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 dup-base.t
+[dup-side c48d64d] dup-base
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-HEAD is now at 3782338 J
-[derived dc142e3] JTEMP3
- Author: A U Thor <git@au.thor.xz>
+ create mode 100644 dup-base.t
+ok 22 - --cherry-pick with duplicates on each side
+
+expecting success of 6007.23 '--cherry-pick avoids looking at full diffs': 
+	git checkout -b shy-diff &&
+	test_commit dont-look-at-me &&
+	echo Hello >dont-look-at-me.t &&
+	test_tick &&
+	git commit -m tip dont-look-at-me.t &&
+	git checkout -b mainline HEAD^ &&
+	test_commit to-cherry-pick &&
+	remove_loose_object shy-diff^:dont-look-at-me.t &&
+	git rev-list --cherry-pick ...shy-diff
+
+Switched to a new branch 'shy-diff'
+[shy-diff 694eab7] dont-look-at-me
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JTEMP3.t
-Merge made by the 'ort' strategy.
- JC.t | 1 +
+ create mode 100644 dont-look-at-me.t
+[shy-diff 065751b] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'mainline'
+[mainline edb671e] to-cherry-pick
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 JC.t
-ok 12 - merge-base --octopus --all for complex tree
+ create mode 100644 to-cherry-pick.t
+edb671edd4843042c1e4b762a9eb9a82125402aa
+065751bb4ac05081d62425d3a9670d9d9102f001
+ok 23 - --cherry-pick avoids looking at full diffs
 
-# passed all 12 test(s)
-1..12
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6009-rev-list-parent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6009-rev-list-parent/.git/
-expecting success of 6009.1 'setup': 
-
-	touch file &&
-	git add file &&
-
-	test_commit one &&
-
-	test_tick=$(($test_tick - 2400)) &&
+*** t6014-rev-list-all.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6014-rev-list-all/.git/
+expecting success of 6014.1 'setup': 
 
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
+	commit one &&
+	commit two &&
+	git checkout HEAD^ &&
+	commit detached
 
-	git log --pretty=oneline --abbrev-commit
 
-[main (root-commit) e622cea] one
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 file
- create mode 100644 one.t
-[main bfa07e2] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main ecfa770] three
+[master (root-commit) 86412ff] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[main 0906875] four
+ create mode 100644 foo
+[master 4931c53] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-0906875 four
-ecfa770 three
-bfa07e2 two
-e622cea one
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'HEAD^'.
 
-expecting success of 6009.2 'one is ancestor of others and should not be shown': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git rev-list one --not four >result &&
-	test_must_be_empty result
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
+  git switch -c <new-branch-name>
 
-ok 2 - one is ancestor of others and should not be shown
+Or undo this operation with:
 
-expecting success of 6009.3 'setup roots, merges and octopuses': 
+  git switch -
 
-	git checkout --orphan newroot &&
-	test_commit five &&
-	git checkout -b sidebranch two &&
-	test_commit six &&
-	git checkout -b anotherbranch three &&
-	test_commit seven &&
-	git checkout -b yetanotherbranch four &&
-	test_commit eight &&
-	git checkout main &&
-	test_tick &&
-	git merge --allow-unrelated-histories -m normalmerge newroot &&
-	git tag normalmerge &&
-	test_tick &&
-	git merge -m tripus sidebranch anotherbranch &&
-	git tag tripus &&
-	git checkout -b tetrabranch normalmerge &&
-	test_tick &&
-	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
-	git tag tetrapus &&
-	git checkout main
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Switched to a new branch 'newroot'
-[newroot (root-commit) 04238a1] five
- Author: A U Thor <author@example.com>
- 6 files changed, 5 insertions(+)
- create mode 100644 file
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
- create mode 100644 three.t
- create mode 100644 two.t
-Switched to a new branch 'sidebranch'
-[sidebranch e29a44f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-Switched to a new branch 'anotherbranch'
-[anotherbranch f863663] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-Switched to a new branch 'yetanotherbranch'
-[yetanotherbranch 3e13a02] eight
+HEAD is now at 86412ff one
+[detached HEAD 13d8fe0] detached
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Merge made by the 'octopus' strategy.
- seven.t | 1 +
- six.t   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to a new branch 'tetrabranch'
-Trying simple merge with sidebranch
-Trying simple merge with anotherbranch
-Trying simple merge with yetanotherbranch
-Merge made by the 'octopus' strategy.
- eight.t | 1 +
- seven.t | 1 +
- six.t   | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 eight.t
- create mode 100644 seven.t
- create mode 100644 six.t
-Switched to branch 'main'
-ok 3 - setup roots, merges and octopuses
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 6009.4 'parse --max-parents & --min-parents': 
-	test_must_fail git rev-list --max-parents=1q HEAD 2>error &&
-	grep "not an integer" error &&
+expecting success of 6014.2 'rev-list --all lists detached HEAD': 
 
-	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
-	grep "not an integer" error &&
+	test 3 = $(git rev-list --all | wc -l)
 
-	git rev-list --max-parents=1 --min-parents=1 HEAD &&
-	git rev-list --max-parents=-1 --min-parents=-1 HEAD
 
-fatal: '1q': not an integer
-fatal: '1q': not an integer
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-7e25eedf3aa367cb6d152df2cbc457e529654b85
-8d2f284dbf2c57c34df5b16a17e4d1ed01377311
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-04238a19571066bf2ac4ee6374c2ec92ef588e0f
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-e622cead7c16d37859f0b353313a4d83b5e9a6e5
-ok 4 - parse --max-parents & --min-parents
+ok 2 - rev-list --all lists detached HEAD
 
-expecting success of 6009.5 'rev-list roots': 
+expecting success of 6014.3 'repack does not lose detached HEAD': 
 
-	check_revlist "--max-parents=0" one five
+	git gc &&
+	git prune --expire=now &&
+	git show HEAD
 
-ok 5 - rev-list roots
 
-expecting success of 6009.6 'rev-list no merges': 
+commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
 
-	check_revlist "--max-parents=1" one eight seven six five four three two &&
-	check_revlist "--no-merges" one eight seven six five four three two
+    detached
 
-ok 6 - rev-list no merges
+diff --git a/foo b/foo
+index 5626abf..9aa4e2b 100644
+--- a/foo
++++ b/foo
+@@ -1 +1 @@
+-one
++detached
+ok 3 - repack does not lose detached HEAD
 
-expecting success of 6009.7 'rev-list no octopuses': 
+expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
+	test_must_fail git rev-list --graph --no-walk HEAD
 
-	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 4 - rev-list --graph --no-walk is forbidden
 
-ok 7 - rev-list no octopuses
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5516-fetch-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.git/
+expecting success of 5516.1 'setup': 
 
-expecting success of 6009.8 'rev-list no roots': 
+	>path1 &&
+	git add path1 &&
+	test_tick &&
+	git commit -a -m repo &&
+	the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
 
-	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
+	>path2 &&
+	git add path2 &&
+	test_tick &&
+	git commit -a -m second &&
+	the_commit=$(git show-ref -s --verify refs/heads/main)
 
-ok 8 - rev-list no roots
 
-expecting success of 6009.9 'rev-list merges': 
+[main (root-commit) b9c09d6] repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path1
+[main 9ad36e1] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+ok 1 - setup
 
-	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
-	check_revlist "--merges" tetrapus tripus normalmerge
+expecting success of 5516.2 'reject 'git push --no-ipv4'': 
+			test_must_fail git $cmd --no-$opt 2>err &&
+			grep "unknown option .no-$opt" err
+		
+error: unknown option `no-ipv4'
+ok 2 - reject 'git push --no-ipv4'
 
-ok 9 - rev-list merges
+expecting success of 5516.3 'reject 'git push --no-ipv6'': 
+			test_must_fail git $cmd --no-$opt 2>err &&
+			grep "unknown option .no-$opt" err
+		
+error: unknown option `no-ipv6'
+ok 3 - reject 'git push --no-ipv6'
 
-expecting success of 6009.10 'rev-list octopus': 
+expecting success of 5516.4 'reject 'git fetch --no-ipv4'': 
+			test_must_fail git $cmd --no-$opt 2>err &&
+			grep "unknown option .no-$opt" err
+		
+error: unknown option `no-ipv4'
+ok 4 - reject 'git fetch --no-ipv4'
 
-	check_revlist "--min-parents=3" tetrapus tripus
+expecting success of 5516.5 'reject 'git fetch --no-ipv6'': 
+			test_must_fail git $cmd --no-$opt 2>err &&
+			grep "unknown option .no-$opt" err
+		
+error: unknown option `no-ipv6'
+ok 5 - reject 'git fetch --no-ipv6'
 
-ok 10 - rev-list octopus
+expecting success of 5516.6 'fetch without wildcard': 
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git fetch .. refs/heads/main:refs/remotes/origin/main &&
 
-expecting success of 6009.11 'rev-list ordinary commits': 
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      main       -> origin/main
+ok 6 - fetch without wildcard
 
-ok 11 - rev-list ordinary commits
+expecting success of 5516.7 'fetch with wildcard': 
+	mk_empty testrepo &&
+	(
+		cd testrepo &&
+		git config remote.up.url .. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
 
-expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	check_revlist "--min-parents=2 --no-merges" &&
-	check_revlist "--merges --no-merges" &&
-	check_revlist "--no-merges --merges"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+From ..
+ * [new branch]      main       -> origin/main
+ok 7 - fetch with wildcard
 
-ok 12 - rev-list --merges --no-merges yields empty set
+expecting success of 5516.8 'fetch with insteadOf': 
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.$TRASH.insteadOf" trash/ &&
+		git config remote.up.url trash/. &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
 
-expecting success of 6009.13 'rev-list override and infinities': 
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
-	check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
-	check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
-	check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.
+ * [new branch]      main       -> origin/main
+ok 8 - fetch with insteadOf
 
-ok 13 - rev-list override and infinities
+expecting success of 5516.9 'fetch with pushInsteadOf (should not rewrite)': 
+	mk_empty testrepo &&
+	(
+		TRASH=$(pwd)/ &&
+		cd testrepo &&
+		git config "url.trash/.pushInsteadOf" "$TRASH" &&
+		git config remote.up.url "$TRASH." &&
+		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
+		git fetch up &&
 
-expecting success of 6009.14 'dodecapus': 
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-	roots= &&
-	for i in 1 2 3 4 5 6 7 8 9 10 11
-	do
-		git checkout -b root$i five &&
-		test_commit $i &&
-		roots="$roots root$i" ||
-		return 1
-	done &&
-	git checkout main &&
-	test_tick &&
-	git merge -m dodecapus $roots &&
-	git tag dodecapus &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.
+ * [new branch]      main       -> origin/main
+ok 9 - fetch with pushInsteadOf (should not rewrite)
 
-	check_revlist "--min-parents=4" dodecapus tetrapus &&
-	check_revlist "--min-parents=8" dodecapus &&
-	check_revlist "--min-parents=12" dodecapus &&
-	check_revlist "--min-parents=13" &&
-	check_revlist "--min-parents=4 --max-parents=11" tetrapus
+expecting success of 5516.10 'push without negotiation': 
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
+	grep_wrote 5 event # 2 commits, 2 trees, 1 blob
 
-Switched to a new branch 'root1'
-[root1 9562ee3] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'root2'
-[root2 1779fe6] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'root3'
-[root3 cc9911e] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'root4'
-[root4 35b702f] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to a new branch 'root5'
-[root5 c532809] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-Switched to a new branch 'root6'
-[root6 f4a589f] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-Switched to a new branch 'root7'
-[root7 4f77507] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-Switched to a new branch 'root8'
-[root8 e4dbc7d] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-Switched to a new branch 'root9'
-[root9 446b36e] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-Switched to a new branch 'root10'
-[root10 120147b] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-Switched to a new branch 'root11'
-[root11 ce99f6d] 11
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
+[main (root-commit) 1aad98e] unrelated_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 11.t
-Switched to branch 'main'
-Trying simple merge with root1
-Trying simple merge with root2
-Trying simple merge with root3
-Trying simple merge with root4
-Trying simple merge with root5
-Trying simple merge with root6
-Trying simple merge with root7
-Trying simple merge with root8
-Trying simple merge with root9
-Trying simple merge with root10
-Trying simple merge with root11
-Merge made by the 'octopus' strategy.
- 1.t  | 1 +
- 10.t | 1 +
- 11.t | 1 +
- 2.t  | 1 +
- 3.t  | 1 +
- 4.t  | 1 +
- 5.t  | 1 +
- 6.t  | 1 +
- 7.t  | 1 +
- 8.t  | 1 +
- 9.t  | 1 +
- 11 files changed, 11 insertions(+)
- create mode 100644 1.t
- create mode 100644 10.t
- create mode 100644 11.t
- create mode 100644 2.t
- create mode 100644 3.t
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
- create mode 100644 9.t
-ok 14 - dodecapus
-
-expecting success of 6009.15 'ancestors with the same commit time': 
+ create mode 100644 unrelated_commit.t
+To testrepo
+ * [new reference]   main -> origin/main
+{"event":"data","sid":"20250317T132355.258475Z-H5c947e1c-P003194fa/20250317T132355.302303Z-H5c947e1c-P00319516","thread":"main","time":"2025-03-17T13:23:55.318024Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.015903,"t_rel":0.000675,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+ok 10 - push without negotiation
 
-	test_tick_keep=$test_tick &&
-	for i in 1 2 3 4 5 6 7 8; do
-		test_tick=$test_tick_keep &&
-		test_commit t$i || return 1
-	done &&
-	git rev-list t1^! --not t$i >result &&
-	test_must_be_empty result
+expecting success of 5516.11 'push with negotiation': 
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TRACE2_EVENT="$(pwd)/event" \
+		git -c protocol.version=2 -c push.negotiate=1 \
+		push testrepo refs/heads/main:refs/remotes/origin/main &&
+	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
+	grep_wrote 2 event # 1 commit, 1 tree
 
-[main 1bc0b48] t1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t1.t
-[main 145e5ab] t2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t2.t
-[main 17e63bf] t3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t3.t
-[main 47d7b66] t4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t4.t
-[main a42aaab] t5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t5.t
-[main aebfe15] t6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t6.t
-[main 7cfb595] t7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 t7.t
-[main fea5200] t8
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
+[main (root-commit) 8e794eb] unrelated_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 t8.t
-ok 15 - ancestors with the same commit time
+ create mode 100644 unrelated_commit.t
+To testrepo
+ * [new reference]   main -> origin/main
+{"event":"data","sid":"20250317T132355.855838Z-H5c947e1c-P003196ff/20250317T132355.890336Z-H5c947e1c-P00319722","thread":"main","time":"2025-03-17T13:23:55.906428Z","file":"fetch-pack.c","line":2243,"repo":1,"t_abs":0.016286,"t_rel":0.015525,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20250317T132355.855838Z-H5c947e1c-P003196ff/20250317T132355.934403Z-H5c947e1c-P00319749","thread":"main","time":"2025-03-17T13:23:55.954810Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.020611,"t_rel":0.000432,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
+ok 11 - push with negotiation
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6019-rev-list-ancestry-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6019-rev-list-ancestry-path/.git/
-expecting success of 6019.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	test_commit D &&
-	test_commit E &&
-	test_commit F &&
-	git reset --hard C &&
-	test_commit G &&
-	test_merge E H &&
-	test_commit I &&
-	test_merge F J &&
-	git reset --hard A &&
-	test_commit K &&
-	test_merge J L &&
-	test_commit M
+expecting success of 5516.12 'push with negotiation proceeds anyway even if negotiation fails': 
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	test_when_finished "rm event" &&
+	GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
+		git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+	grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
+	test_grep "push negotiation failed" err
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main ee2ad00] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-[main 5374d8c] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-HEAD is now at 35a8500 C
-[main fa55005] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Merge made by the 'ours' strategy.
-[main 4e719b9] I
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
+[main (root-commit) 294c9e5] unrelated_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Merge made by the 'ours' strategy.
-HEAD is now at 0ddfaf1 A
-[main 0f470b0] K
+ create mode 100644 unrelated_commit.t
+{"event":"data","sid":"20250317T132356.511056Z-H5c947e1c-P00319938/20250317T132356.582216Z-H5c947e1c-P0031996d","thread":"main","time":"2025-03-17T13:23:56.602000Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.019973,"t_rel":0.000670,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+warning: push negotiation failed; proceeding anyway with push
+ok 12 - push with negotiation proceeds anyway even if negotiation fails
+
+expecting success of 5516.13 'push deletion with negotiation': 
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/heads/master &&
+	git -c push.negotiate=1 push testrepo \
+		:master $the_first_commit:refs/heads/next 2>errors-2 &&
+	test_grep ! "negotiate-only needs one or " errors-2 &&
+	git -c push.negotiate=1 push testrepo :next 2>errors-1 &&
+	test_grep ! "negotiate-only needs one or " errors-1
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
+ok 13 - push deletion with negotiation
+
+expecting success of 5516.14 'push with negotiation does not attempt to fetch submodules': 
+	mk_empty submodule_upstream &&
+	test_commit -C submodule_upstream submodule_commit &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./submodule_upstream submodule &&
+	mk_empty testrepo &&
+	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
+	test_commit -C testrepo unrelated_commit &&
+	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
+	GIT_TRACE2_EVENT="$(pwd)/event"  git -c submodule.recurse=true \
+		-c protocol.version=2 -c push.negotiate=1 \
+		push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
+	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
+	! grep "Fetching submodule" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/submodule_upstream/.git/
+[main (root-commit) 7c5b5fd] submodule_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 K.t
-Merge made by the 'ours' strategy.
-[main bcafe1b] M
+ create mode 100644 submodule_commit.t
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/submodule'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
+[main (root-commit) 3be3d20] unrelated_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 M.t
-ok 1 - setup
+ create mode 100644 unrelated_commit.t
+{"event":"data","sid":"20250317T132358.423790Z-H5c947e1c-P00319f2f/20250317T132358.462306Z-H5c947e1c-P00319f4d","thread":"main","time":"2025-03-17T13:23:58.501194Z","file":"fetch-pack.c","line":2243,"repo":1,"t_abs":0.039095,"t_rel":0.038342,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+ok 14 - push with negotiation does not attempt to fetch submodules
 
-expecting success of 6019.2 'log D..M': 
-		test_write_lines E F G H I J K L M >expect &&
-		git log --format=%s D..M >raw &&
+expecting success of 5516.15 'push without wildcard': 
+	mk_empty testrepo &&
 
-		if test -n "E F G H I J K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 2 - log D..M
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-expecting success of 6019.3 'log --ancestry-path D..M': 
-		test_write_lines E F H I J L M >expect &&
-		git log --format=%s --ancestry-path D..M >raw &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+ok 15 - push without wildcard
 
-		if test -n "E F H I J L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 3 - log --ancestry-path D..M
+expecting success of 5516.16 'push with wildcard': 
+	mk_empty testrepo &&
 
-expecting success of 6019.4 'log --ancestry-path=F D..M': 
-		test_write_lines E F J L M >expect &&
-		git log --format=%s --ancestry-path=F D..M >raw &&
+	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-		if test -n "E F J L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 4 - log --ancestry-path=F D..M
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   main -> origin/main
+ok 16 - push with wildcard
 
-expecting success of 6019.5 'log --ancestry-path=G D..M': 
-		test_write_lines G H I J L M >expect &&
-		git log --format=%s --ancestry-path=G D..M >raw &&
+expecting success of 5516.17 'push with insteadOf': 
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.insteadOf" trash/ &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-		if test -n "G H I J L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 5 - log --ancestry-path=G D..M
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo
+ * [new reference]   main -> origin/main
+ok 17 - push with insteadOf
 
-expecting success of 6019.6 'log --ancestry-path=H D..M': 
-		test_write_lines E G H I J L M >expect &&
-		git log --format=%s --ancestry-path=H D..M >raw &&
+expecting success of 5516.18 'push with pushInsteadOf': 
+	mk_empty testrepo &&
+	TRASH="$(pwd)/" &&
+	test_config "url.$TRASH.pushInsteadOf" trash/ &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-		if test -n "E G H I J L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 6 - log --ancestry-path=H D..M
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo
+ * [new reference]   main -> origin/main
+ok 18 - push with pushInsteadOf
 
-expecting success of 6019.7 'log --ancestry-path=K D..M': 
-		test_write_lines K L M >expect &&
-		git log --format=%s --ancestry-path=K D..M >raw &&
+expecting success of 5516.19 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)': 
+	mk_empty testrepo &&
+	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
+	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
+	test_config remote.r.url trash/wrong &&
+	test_config remote.r.pushurl "testrepo/" &&
+	git push r refs/heads/main:refs/remotes/origin/main &&
+	(
+		cd testrepo &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
+		git for-each-ref refs/remotes/origin >actual &&
+		test_cmp expect actual
+	)
 
-		if test -n "K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 7 - log --ancestry-path=K D..M
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo/
+ * [new reference]   main -> origin/main
+ok 19 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)
 
-expecting success of 6019.8 'log --ancestry-path=F --ancestry-path=K D..M': 
-		test_write_lines E F J K L M >expect &&
-		git log --format=%s --ancestry-path=F --ancestry-path=K D..M >raw &&
+expecting success of 5516.20 'push with matching heads': 
 
-		if test -n "E F J K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 8 - log --ancestry-path=F --ancestry-path=K D..M
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
 
-expecting success of 6019.9 'log D..M -- M.t': 
-		test_write_lines M >expect &&
-		git log --format=%s D..M -- M.t >raw &&
 
-		if test -n "M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 9 - log D..M -- M.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 20 - push with matching heads
 
-expecting success of 6019.10 'log --ancestry-path D..M -- M.t': 
-		test_write_lines M >expect &&
-		git log --format=%s --ancestry-path D..M -- M.t >raw &&
+expecting success of 5516.21 'push with matching heads on the command line': 
 
-		if test -n "M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 10 - log --ancestry-path D..M -- M.t
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	check_push_result testrepo $the_commit heads/main
 
-expecting success of 6019.11 'log F...I': 
-		test_write_lines F G H I >expect &&
-		git log --format=%s F...I >raw &&
 
-		if test -n "F G H I"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 11 - log F...I
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 21 - push with matching heads on the command line
 
-expecting success of 6019.12 'log --ancestry-path F...I': 
-		test_write_lines F H I >expect &&
-		git log --format=%s --ancestry-path F...I >raw &&
+expecting success of 5516.22 'failed (non-fast-forward) push with matching heads': 
 
-		if test -n "F H I"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 12 - log --ancestry-path F...I
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	test_must_fail git push testrepo &&
+	check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
 
-expecting success of 6019.13 'log G..M -- G.t': 
-		test_write_lines  >expect &&
-		git log --format=%s G..M -- G.t >raw &&
 
-		if test -n ""
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 13 - log G..M -- G.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+[main 84b8a29] assaged
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 path2
+ create mode 160000 submodule
+fatal: The current branch main has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-expecting success of 6019.14 'log --ancestry-path G..M -- G.t': 
-		test_write_lines L >expect &&
-		git log --format=%s --ancestry-path G..M -- G.t >raw &&
+    git push --set-upstream testrepo main
 
-		if test -n "L"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 14 - log --ancestry-path G..M -- G.t
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-expecting success of 6019.15 'log --ancestry-path --simplify-merges G^..M -- G.t': 
-		test_write_lines G L >expect &&
-		git log --format=%s --ancestry-path --simplify-merges G^..M -- G.t >raw &&
+warning: unable to rmdir 'submodule': Directory not empty
+HEAD is now at 9ad36e1 second
+ok 22 - failed (non-fast-forward) push with matching heads
 
-		if test -n "G L"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 15 - log --ancestry-path --simplify-merges G^..M -- G.t
+expecting success of 5516.23 'push --force with matching heads': 
 
-expecting success of 6019.16 'setup criss-cross': 
-	mkdir criss-cross &&
-	(cd criss-cross &&
-	 git init &&
-	 test_commit A &&
-	 git checkout -b xb main &&
-	 test_commit B &&
-	 git checkout -b xc main &&
-	 test_commit C &&
-	 git checkout -b xbc xb -- &&
-	 git merge xc &&
-	 git checkout -b xcb xc -- &&
-	 git merge xb &&
-	 git checkout main)
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push --force testrepo : &&
+	! check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6019-rev-list-ancestry-path/criss-cross/.git/
-[main (root-commit) 617a709] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'xb'
-[xb 7dfaf8e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'xc'
-[xc cf5ea0b] C
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+[main 935970f] assaged
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'xbc'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'xcb'
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-ok 16 - setup criss-cross
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To testrepo
+ + 9ad36e1...935970f main -> main (forced update)
+--- expect	2025-03-17 13:24:03.509736377 +0000
++++ actual	2025-03-17 13:24:03.533736529 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++935970ff2fd2257ae1a73d15652c0ac6f837cf17
+HEAD is now at 9ad36e1 second
+ok 23 - push --force with matching heads
 
-expecting success of 6019.17 'criss-cross: rev-list --ancestry-path cb..bc': 
-	(cd criss-cross &&
-	 git rev-list --ancestry-path xcb..xbc > actual &&
-	 test_must_be_empty actual)
+expecting success of 5516.24 'push with matching heads and forced update': 
 
-ok 17 - criss-cross: rev-list --ancestry-path cb..bc
+	mk_test testrepo heads/main &&
+	git push testrepo : &&
+	git commit --amend -massaged &&
+	git push testrepo +: &&
+	! check_push_result testrepo $the_commit heads/main &&
+	git reset --hard $the_commit
 
-expecting success of 6019.18 'criss-cross: rev-list --ancestry-path --all ^cb': 
-	(cd criss-cross &&
-	 git rev-list --ancestry-path --all ^xcb > actual &&
-	 test_must_be_empty actual)
 
-ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+[main 935970f] assaged
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 path2
+remote: warning: updating the current branch        
+To testrepo
+ + 9ad36e1...935970f main -> main (forced update)
+--- expect	2025-03-17 13:24:04.469742444 +0000
++++ actual	2025-03-17 13:24:04.485742545 +0000
+@@ -1 +1 @@
+-9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
++935970ff2fd2257ae1a73d15652c0ac6f837cf17
+HEAD is now at 9ad36e1 second
+ok 24 - push with matching heads and forced update
 
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6012-rev-list-simplify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6012-rev-list-simplify/.git/
-expecting success of 6012.1 'setup': 
-	echo "Hi there" >file &&
-	echo "initial" >lost &&
-	git add file lost &&
-	test_tick && git commit -m "Initial file and lost" &&
-	note A &&
+expecting success of 5516.25 'push with no ambiguity (1)': 
 
-	git branch other-branch &&
+	mk_test testrepo heads/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main
 
-	git symbolic-ref HEAD refs/heads/unrelated &&
-	git rm -f "*" &&
-	echo "Unrelated branch" >side &&
-	git add side &&
-	test_tick && git commit -m "Side root" &&
-	note J &&
-	git checkout main &&
 
-	echo "Hello" >file &&
-	echo "second" >lost &&
-	git add file lost &&
-	test_tick && GIT_AUTHOR_DATE=$(($test_tick + 120)) git commit -m "Modified file and lost" &&
-	note B &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 25 - push with no ambiguity (1)
 
-	git checkout other-branch &&
+expecting success of 5516.26 'push with no ambiguity (2)': 
 
-	echo "Hello" >file &&
-	>lost &&
-	git add file lost &&
-	test_tick && git commit -m "Modified the file identically" &&
-	note C &&
+	mk_test testrepo remotes/origin/main &&
+	git push testrepo main:origin/main &&
+	check_push_result testrepo $the_commit remotes/origin/main
 
-	echo "This is a stupid example" >another-file &&
-	git add another-file &&
-	test_tick && git commit -m "Add another file" &&
-	note D &&
 
-	test_tick &&
-	test_must_fail git merge -m "merge" main &&
-	>lost && git commit -a -m "merge" &&
-	note E &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
+notice: HEAD points to an unborn branch (main)
+To testrepo
+   b9c09d6..9ad36e1  main -> origin/main
+notice: HEAD points to an unborn branch (main)
+ok 26 - push with no ambiguity (2)
 
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Irrelevant change" &&
-	note F &&
+expecting success of 5516.27 'push with colon-less refspec, no ambiguity': 
 
-	git checkout main &&
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Another irrelevant change" &&
-	note G &&
+	mk_test testrepo heads/main heads/t/main &&
+	git branch -f t/main main &&
+	git push testrepo main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/t/main
 
-	test_tick && git merge -m "merge" other-branch &&
-	note H &&
 
-	echo "Final change" >file &&
-	test_tick && git commit -a -m "Final change" &&
-	note I &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> t/main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 27 - push with colon-less refspec, no ambiguity
 
-	git checkout main &&
-	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
-	note K &&
+expecting success of 5516.28 'push with weak ambiguity (1)': 
 
-	echo "Immaterial" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Last" &&
-	note L
+	mk_test testrepo heads/main remotes/origin/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main
 
-[main (root-commit) 2ce5a1a] Initial file and lost
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 lost
-rm 'file'
-rm 'lost'
-[unrelated (root-commit) efdd716] Side root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 side
-Switched to branch 'main'
-[main 1a21661] Modified file and lost
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'other-branch'
-[other-branch 96e46c8] Modified the file identically
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
-[other-branch afa190a] Add another file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 another-file
-Auto-merging lost
-CONFLICT (content): Merge conflict in lost
-Automatic merge failed; fix conflicts and then commit the result.
-[other-branch 87e2285] merge
- Author: A U Thor <author@example.com>
-[other-branch f67ebfb] Irrelevant change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 elif
-Switched to branch 'main'
-[main b2dce95] Another irrelevant change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 elif
-Merge made by the 'ort' strategy.
- another-file | 1 +
- lost         | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 another-file
-[main 62ab427] Final change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Already on 'main'
-Merge made by the 'ort' strategy.
- side | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 side
-[main 1be1b21] Last
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
 
-expecting success of 6012.2 'log --full-history --topo-order': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 2 - log --full-history --topo-order
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 28 - push with weak ambiguity (1)
 
-expecting success of 6012.3 'log --full-history': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 3 - log --full-history
+expecting success of 5516.29 'push with weak ambiguity (2)': 
 
-expecting success of 6012.4 'log --full-history --date-order': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 4 - log --full-history --date-order
+	mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
 
-expecting success of 6012.5 'log --full-history --author-date-order': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 5 - log --full-history --author-date-order
 
-expecting success of 6012.6 'log --full-history -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 6 - log --full-history -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
+To testrepo
+ * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> another/main
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ok 29 - push with weak ambiguity (2)
 
-expecting success of 6012.7 'log --full-history --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 7 - log --full-history --topo-order -- file
+expecting success of 5516.30 'push with ambiguity': 
 
-expecting success of 6012.8 'log --full-history --date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 8 - log --full-history --date-order -- file
+	mk_test testrepo heads/frotz tags/frotz &&
+	test_must_fail git push testrepo main:frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
 
-expecting success of 6012.9 'log --full-history --author-date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 9 - log --full-history --author-date-order -- file
 
-expecting success of 6012.10 'log --simplify-merges -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 10 - log --simplify-merges -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (main)
+error: dst refspec frotz matches more than one
+error: failed to push some refs to 'testrepo'
+notice: HEAD points to an unborn branch (main)
+ok 30 - push with ambiguity
 
-expecting success of 6012.11 'log --simplify-merges --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 11 - log --simplify-merges --topo-order -- file
+expecting success of 5516.31 'push with onelevel ref': 
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo HEAD:refs/onelevel
 
-expecting success of 6012.12 'log --simplify-merges --date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 12 - log --simplify-merges --date-order -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+remote: error: refusing to update funny ref 'refs/onelevel' remotely        
+To testrepo
+ ! [remote rejected] HEAD -> refs/onelevel (funny refname)
+error: failed to push some refs to 'testrepo'
+ok 31 - push with onelevel ref
 
-expecting success of 6012.13 'log --simplify-merges --author-date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 13 - log --simplify-merges --author-date-order -- file
+expecting success of 5516.32 'push with colon-less refspec (1)': 
 
-expecting success of 6012.14 'log -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 14 - log -- file
+	mk_test testrepo heads/frotz tags/frotz &&
+	git branch -f frotz main &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	check_push_result testrepo $the_first_commit tags/frotz
 
-expecting success of 6012.15 'log --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 15 - log --topo-order -- file
 
-expecting success of 6012.16 'log --date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 16 - log --date-order -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (main)
+To testrepo
+   b9c09d6..9ad36e1  frotz -> frotz
+notice: HEAD points to an unborn branch (main)
+notice: HEAD points to an unborn branch (main)
+ok 32 - push with colon-less refspec (1)
 
-expecting success of 6012.17 'log --author-date-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 17 - log --author-date-order -- file
+expecting success of 5516.33 'push with colon-less refspec (2)': 
 
-expecting success of 6012.18 'log --first-parent -- another-file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 18 - log --first-parent -- another-file
+	mk_test testrepo heads/frotz tags/frotz &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push -f testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	check_push_result testrepo $the_first_commit heads/frotz
 
-expecting success of 6012.19 'log --first-parent --topo-order -- another-file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 19 - log --first-parent --topo-order -- another-file
 
-expecting success of 6012.20 'log --first-parent L': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 20 - log --first-parent L
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+To testrepo
+ * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
+notice: HEAD points to an unborn branch (main)
+Deleted branch frotz (was 9ad36e1).
+To testrepo
+ + b9c09d6...9ad36e1 frotz -> frotz (forced update)
+notice: HEAD points to an unborn branch (main)
+notice: HEAD points to an unborn branch (main)
+ok 33 - push with colon-less refspec (2)
 
-expecting success of 6012.21 'log --exclude-first-parent-only F ^L': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 21 - log --exclude-first-parent-only F ^L
+expecting success of 5516.34 'push with colon-less refspec (3)': 
 
-expecting success of 6012.22 'log F ^L': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 22 - log F ^L
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/tags/frotz
+	then
+		git tag -d frotz
+	fi &&
+	git branch -f frotz main &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit heads/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
 
-expecting success of 6012.23 'log L ^F': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 23 - log L ^F
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+Deleted tag 'frotz' (was 9ad36e1)
+To testrepo
+ * [new branch]      frotz -> frotz
+notice: HEAD points to an unborn branch (main)
+ok 34 - push with colon-less refspec (3)
 
-expecting success of 6012.24 'log --exclude-first-parent-only L ^F': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 24 - log --exclude-first-parent-only L ^F
+expecting success of 5516.35 'push with colon-less refspec (4)': 
 
-expecting success of 6012.25 'log --exclude-first-parent-only --first-parent L ^F': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 25 - log --exclude-first-parent-only --first-parent L ^F
+	mk_test testrepo &&
+	if git show-ref --verify -q refs/heads/frotz
+	then
+		git branch -D frotz
+	fi &&
+	git tag -f frotz &&
+	git push testrepo frotz &&
+	check_push_result testrepo $the_commit tags/frotz &&
+	test 1 = $( cd testrepo && git show-ref | wc -l )
 
-expecting success of 6012.26 'log --full-history E -- lost': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 26 - log --full-history E -- lost
 
-expecting success of 6012.27 'full history simplification without parent': 
-	printf "%s\n" E C B A >expect &&
-	git log --pretty="$FMT" --full-history E -- lost >out &&
-	unnote >actual <out &&
-	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-	test_cmp expect check
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+Deleted branch frotz (was 9ad36e1).
+To testrepo
+ * [new tag]         frotz -> frotz
+notice: HEAD points to an unborn branch (main)
+ok 35 - push with colon-less refspec (4)
 
-ok 27 - full history simplification without parent
+expecting success of 5516.36 'push head with non-existent, incomplete dest': 
 
-expecting success of 6012.28 '--full-diff is not affected by --parents': 
-	git log -p --pretty="%H" --full-diff -- file >expected &&
-	git log -p --pretty="%H" --full-diff --parents -- file >actual &&
-	test_cmp expected actual
+	mk_test testrepo &&
+	git push testrepo main:branch &&
+	check_push_result testrepo $the_commit heads/branch
 
-ok 28 - --full-diff is not affected by --parents
 
-expecting success of 6012.29 'setup rebuild repo': 
-	rm -rf .git * &&
-	git init &&
-	git switch -c topic &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+To testrepo
+ * [new branch]      main -> branch
+notice: HEAD points to an unborn branch (main)
+ok 36 - push head with non-existent, incomplete dest
 
-	echo base >file &&
-	git add file &&
-	test_commit I &&
+expecting success of 5516.37 'push tag with non-existent, incomplete dest': 
 
-	echo A >file &&
-	git add file &&
-	test_commit A &&
+	mk_test testrepo &&
+	git tag -f v1.0 &&
+	git push testrepo v1.0:tag &&
+	check_push_result testrepo $the_commit tags/tag
 
-	git switch -c branchB I &&
-	echo B >file &&
-	git add file &&
-	test_commit B &&
 
-	git switch topic &&
-	test_must_fail git merge -m "M" B &&
-	echo A >file &&
-	echo B >>file &&
-	git add file &&
-	git merge --continue &&
-	note M &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+To testrepo
+ * [new tag]         v1.0 -> tag
+notice: HEAD points to an unborn branch (main)
+ok 37 - push tag with non-existent, incomplete dest
 
-	echo C >other &&
-	git add other &&
-	test_commit C &&
+expecting success of 5516.38 'push sha1 with non-existent, incomplete dest': 
 
-	git switch -c branchX I &&
-	echo X >file &&
-	git add file &&
-	test_commit X &&
+	mk_test testrepo &&
+	test_must_fail git push testrepo $(git rev-parse main):foo
 
-	git switch -c branchR M &&
-	git merge -m R -Xtheirs X &&
-	note R &&
 
-	git switch topic &&
-	git merge -m N R &&
-	note N &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+error: The destination you provided is not a full refname (i.e.,
+starting with "refs/"). We tried to guess what you meant by:
 
-	git switch -c branchY M &&
-	echo Y >y &&
-	git add y &&
-	test_commit Y &&
+- Looking for a ref that matches 'foo' on the remote side.
+- Checking if the <src> being pushed ('9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f')
+  is a ref in "refs/{heads,tags}/". If so we add a corresponding
+  refs/{heads,tags}/ prefix on the remote side.
 
-	git switch -c branchZ C &&
-	echo Z >z &&
-	git add z &&
-	test_commit Z &&
+Neither worked, so we gave up. You must fully qualify the ref.
+hint: The <src> part of the refspec is a commit object.
+hint: Did you mean to create a new branch by pushing to
+hint: '9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f:refs/heads/foo'?
+error: failed to push some refs to 'testrepo'
+ok 38 - push sha1 with non-existent, incomplete dest
 
-	git switch topic &&
-	git merge -m O Z &&
-	note O &&
+expecting success of 5516.39 'push ref expression with non-existent, incomplete dest': 
 
-	git merge -m P Y &&
-	note P
+	mk_test testrepo &&
+	test_must_fail git push testrepo main^:branch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6012-rev-list-simplify/.git/
-Switched to a new branch 'topic'
-[topic (root-commit) 8df680a] I
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 I.t
- create mode 100644 file
-[topic 93fcd66] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 A.t
-Switched to a new branch 'branchB'
-[branchB 2bc7954] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B.t
-Switched to branch 'topic'
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-[topic 58a754c] M
- Author: A U Thor <author@example.com>
-[topic f73bd6d] C
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 C.t
- create mode 100644 other
-Switched to a new branch 'branchX'
-[branchX a2f4788] X
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 X.t
-Switched to a new branch 'branchR'
-Auto-merging file
-Merge made by the 'ort' strategy.
- X.t  | 1 +
- file | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 X.t
-Switched to branch 'topic'
-Merge made by the 'ort' strategy.
- X.t  | 1 +
- file | 3 +--
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 X.t
-Switched to a new branch 'branchY'
-[branchY 85e7a8e] Y
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 Y.t
- create mode 100644 y
-Switched to a new branch 'branchZ'
-[branchZ 35501c2] Z
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 Z.t
- create mode 100644 z
-Switched to branch 'topic'
-Merge made by the 'ort' strategy.
- Z.t | 1 +
- z   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 Z.t
- create mode 100644 z
-Merge made by the 'ort' strategy.
- Y.t | 1 +
- y   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 Y.t
- create mode 100644 y
-ok 29 - setup rebuild repo
 
-expecting success of 6012.30 'log -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 30 - log -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+error: The destination you provided is not a full refname (i.e.,
+starting with "refs/"). We tried to guess what you meant by:
 
-expecting success of 6012.31 'log --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
-	
-ok 31 - log --show-pulls -- file
+- Looking for a ref that matches 'branch' on the remote side.
+- Checking if the <src> being pushed ('main^')
+  is a ref in "refs/{heads,tags}/". If so we add a corresponding
+  refs/{heads,tags}/ prefix on the remote side.
 
-expecting success of 6012.32 'log --full-history --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+Neither worked, so we gave up. You must fully qualify the ref.
+hint: The <src> part of the refspec is a commit object.
+hint: Did you mean to create a new branch by pushing to
+hint: 'main^:refs/heads/branch'?
+error: failed to push some refs to 'testrepo'
+ok 39 - push ref expression with non-existent, incomplete dest
+
+expecting success of 5516.40 'push with HEAD': 
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
 	
-ok 32 - log --full-history --topo-order -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  HEAD -> main
+ok 40 - push with HEAD
 
-expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.41 'push with HEAD nonexisting at remote': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
 	
-ok 33 - log --simplify-merges --topo-order --show-pulls -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Switched to a new branch 'local'
+To testrepo
+ * [new branch]      HEAD -> local
+Switched to branch 'main'
+Deleted branch local (was 9ad36e1).
+ok 41 - push with HEAD nonexisting at remote
 
-expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.42 'push with +HEAD': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo main local &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 34 - log --simplify-merges --topo-order -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Switched to a new branch 'local'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ * [new branch]      local -> local
+HEAD is now at b9c09d6 repo
+To testrepo
+ ! [rejected]        HEAD -> local (non-fast-forward)
+error: failed to push some refs to 'testrepo'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. If you want to integrate the remote changes,
+hint: use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+To testrepo
+ + 9ad36e1...b9c09d6 HEAD -> local (forced update)
+Switched to branch 'main'
+Deleted branch local (was b9c09d6).
+ok 42 - push with +HEAD
+
+expecting success of 5516.43 'push HEAD with non-existent, incomplete dest': 
+		mk_test testrepo &&
+		git checkout main &&
+		git push testrepo $head:branch &&
+		check_push_result testrepo $the_commit heads/branch
 
-expecting success of 6012.35 'log --first-parent -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
 	
-ok 35 - log --first-parent -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+Already on 'main'
+To testrepo
+ * [new branch]      HEAD -> branch
+notice: HEAD points to an unborn branch (main)
+ok 43 - push HEAD with non-existent, incomplete dest
 
-expecting success of 6012.36 'log --first-parent --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.44 'push with config remote.*.push = HEAD': 
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 36 - log --first-parent --show-pulls -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
+notice: HEAD points to an unborn branch (main)
+Already on 'main'
+Switched to branch 'local'
+HEAD is now at b9c09d6 repo
+To testrepo
+ * [new branch]      HEAD -> main
+Deleted branch local (was 9ad36e1).
+ok 44 - push with config remote.*.push = HEAD
 
-expecting success of 6012.37 'log --topo-order --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.45 'push with @': 
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
 	
-ok 37 - log --topo-order --ancestry-path A..HEAD -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  HEAD -> main
+ok 45 - push with @
 
-expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.46 'push with @ nonexisting at remote': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
 	
-ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Switched to a new branch 'local'
+To testrepo
+ * [new branch]      HEAD -> local
+Switched to branch 'main'
+Deleted branch local (was 9ad36e1).
+ok 46 - push with @ nonexisting at remote
 
-expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.47 'push with +@': 
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo main local &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 39 - log --topo-order --full-history --ancestry-path A..HEAD -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Switched to a new branch 'local'
+remote: warning: updating the current branch        
+To testrepo
+   b9c09d6..9ad36e1  main -> main
+ * [new branch]      local -> local
+HEAD is now at b9c09d6 repo
+To testrepo
+ ! [rejected]        HEAD -> local (non-fast-forward)
+error: failed to push some refs to 'testrepo'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. If you want to integrate the remote changes,
+hint: use 'git pull' before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
+To testrepo
+ + 9ad36e1...b9c09d6 HEAD -> local (forced update)
+Switched to branch 'main'
+Deleted branch local (was b9c09d6).
+ok 47 - push with +@
+
+expecting success of 5516.48 'push @ with non-existent, incomplete dest': 
+		mk_test testrepo &&
+		git checkout main &&
+		git push testrepo $head:branch &&
+		check_push_result testrepo $the_commit heads/branch
 
-expecting success of 6012.40 'log --topo-order --simplify-merges --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
 	
-ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+notice: HEAD points to an unborn branch (main)
+notice: No default references
+Already on 'main'
+To testrepo
+ * [new branch]      HEAD -> branch
+notice: HEAD points to an unborn branch (main)
+ok 48 - push @ with non-existent, incomplete dest
 
-expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5516.49 'push with config remote.*.push = @': 
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
 	
-ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
+notice: HEAD points to an unborn branch (main)
+Already on 'main'
+Switched to branch 'local'
+HEAD is now at b9c09d6 repo
+To testrepo
+ * [new branch]      HEAD -> main
+Deleted branch local (was 9ad36e1).
+ok 49 - push with config remote.*.push = @
 
-expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
-	cat >expect <<-\EOF &&
-	* N
-	*   R
-	|\  
-	| * X
-	* |   M
-	|\ \  
-	| * | B
-	| |/  
-	* / A
-	|/  
-	* I
-	EOF
-	git log --graph --pretty="%s" \
-		--simplify-merges --show-pulls \
-		-- file >actual &&
-	test_cmp expect actual
+expecting success of 5516.50 'push to remote with no explicit refspec and config remote.*.push = src:dest': 
+	mk_test testrepo heads/main &&
+	git checkout $the_first_commit &&
+	test_config remote.there.url testrepo &&
+	test_config remote.there.push refs/heads/main:refs/heads/main &&
+	git push there &&
+	check_push_result testrepo $the_commit heads/main
 
-ok 42 - log --graph --simplify-merges --show-pulls
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Note: switching to 'b9c09d6cc74d3857142fb7c082dca65b88254c6d'.
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6017-rev-list-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6017-rev-list-stdin/.git/
-expecting success of 6017.1 'setup': 
-	(
-		for i in 0 $them
-		do
-			for j in $them
-			do
-				echo $i.$j >file-$j &&
-				git add file-$j || exit
-			done &&
-			test_tick &&
-			git commit -m $i || exit
-		done &&
-		for i in $them
-		do
-			git checkout -b side-$i main~$i &&
-			echo updated $i >file-$i &&
-			git add file-$i &&
-			test_tick &&
-			git commit -m side-$i || exit
-		done &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		git update-ref refs/heads/-dashed-branch HEAD
-	)
-
-[main (root-commit) b2718df] 0
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
- create mode 100644 file-3
- create mode 100644 file-4
- create mode 100644 file-5
- create mode 100644 file-6
- create mode 100644 file-7
-[main 4c7c799] 1
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main a24e200] 2
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 72c7eca] 3
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 680e5c3] 4
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main 496e2a9] 5
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main c5757f4] 6
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-[main a21e804] 7
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+), 7 deletions(-)
-Switched to a new branch 'side-1'
-[side-1 c52bcff] side-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-2'
-[side-2 fe893aa] side-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-3'
-[side-3 48694b2] side-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-4'
-[side-4 e31c210] side-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-5'
-[side-5 5786a4a] side-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-6'
-[side-6 6879e94] side-6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side-7'
-[side-7 a65952b] side-7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6017.2 'check rev-list main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input main
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 2 - check rev-list main
-
-expecting success of 6017.3 'check log --stat main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input main
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 3 - check log --stat main
-
-expecting success of 6017.4 'check rev-list side-1 ^side-4': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-ok 4 - check rev-list side-1 ^side-4
-
-expecting success of 6017.5 'check log --stat side-1 ^side-4': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-4
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-ok 5 - check log --stat side-1 ^side-4
-
-expecting success of 6017.6 'check rev-list side-1 ^side-7 --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 6 - check rev-list side-1 ^side-7 --
-
-expecting success of 6017.7 'check log --stat side-1 ^side-7 --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-ok 7 - check log --stat side-1 ^side-7 --
-
-expecting success of 6017.8 'check rev-list side-1 ^side-7 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-1
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 8 - check rev-list side-1 ^side-7 -- file-1
-
-expecting success of 6017.9 'check log --stat side-1 ^side-7 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-1
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - check log --stat side-1 ^side-7 -- file-1
-
-expecting success of 6017.10 'check rev-list side-1 ^side-7 -- file-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-2
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-ok 10 - check rev-list side-1 ^side-7 -- file-2
-
-expecting success of 6017.11 'check log --stat side-1 ^side-7 -- file-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-1
-input ^side-7
-input --
-input file-2
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - check log --stat side-1 ^side-7 -- file-2
-
-expecting success of 6017.12 'check rev-list side-3 ^side-4 -- file-3': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-4
-input --
-input file-3
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-ok 12 - check rev-list side-3 ^side-4 -- file-3
-
-expecting success of 6017.13 'check log --stat side-3 ^side-4 -- file-3': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-4
-input --
-input file-3
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - check log --stat side-3 ^side-4 -- file-3
-
-expecting success of 6017.14 'check rev-list side-3 ^side-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-ok 14 - check rev-list side-3 ^side-2
-
-expecting success of 6017.15 'check log --stat side-3 ^side-2': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - check log --stat side-3 ^side-2
-
-expecting success of 6017.16 'check rev-list side-3 ^side-2 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-input --
-input file-1
-ok 16 - check rev-list side-3 ^side-2 -- file-1
-
-expecting success of 6017.17 'check log --stat side-3 ^side-2 -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input side-3
-input ^side-2
-input --
-input file-1
-ok 17 - check log --stat side-3 ^side-2 -- file-1
-
-expecting success of 6017.18 'check rev-list --all': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 18 - check rev-list --all
-
-expecting success of 6017.19 'check log --stat --all': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 19 - check log --stat --all
-
-expecting success of 6017.20 'check rev-list --all --not --branches': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input --branches
-ok 20 - check rev-list --all --not --branches
-
-expecting success of 6017.21 'check log --stat --all --not --branches': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input --branches
-ok 21 - check log --stat --all --not --branches
-
-expecting success of 6017.22 'check rev-list --glob=refs/heads': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 22 - check rev-list --glob=refs/heads
-
-expecting success of 6017.23 'check log --stat --glob=refs/heads': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 23 - check log --stat --glob=refs/heads
-
-expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 24 - check rev-list --glob=refs/heads --
-
-expecting success of 6017.25 'check log --stat --glob=refs/heads --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  file-2 | 2 +-
-output  file-3 | 2 +-
-output  file-4 | 2 +-
-output  file-5 | 2 +-
-output  file-6 | 2 +-
-output  file-7 | 2 +-
-output  7 files changed, 7 insertions(+), 7 deletions(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 25 - check log --stat --glob=refs/heads --
-
-expecting success of 6017.26 'check rev-list --glob=refs/heads -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-input file-1
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 26 - check rev-list --glob=refs/heads -- file-1
-
-expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-input file-1
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  1 file changed, 1 insertion(+)
-ok 27 - check log --stat --glob=refs/heads -- file-1
-
-expecting success of 6017.28 'check rev-list --end-of-options -dashed-branch': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --end-of-options
-input -dashed-branch
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 28 - check rev-list --end-of-options -dashed-branch
-
-expecting success of 6017.29 'check log --stat --end-of-options -dashed-branch': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --end-of-options
-input -dashed-branch
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  file-2 | 1 +
-output  file-3 | 1 +
-output  file-4 | 1 +
-output  file-5 | 1 +
-output  file-6 | 1 +
-output  file-7 | 1 +
-output  7 files changed, 7 insertions(+)
-ok 29 - check log --stat --end-of-options -dashed-branch
-
-expecting success of 6017.30 'check rev-list --all --not refs/heads/main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input refs/heads/main
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-ok 30 - check rev-list --all --not refs/heads/main
-
-expecting success of 6017.31 'check log --stat --all --not refs/heads/main': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --all
-input --not
-input refs/heads/main
-output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:27:13 2005 -0700
-output 
-output     side-7
-output 
-output  file-7 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 6879e948854e907320469e4dc722cd70bd4779ad
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:26:13 2005 -0700
-output 
-output     side-6
-output 
-output  file-6 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:25:13 2005 -0700
-output 
-output     side-5
-output 
-output  file-5 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:24:13 2005 -0700
-output 
-output     side-4
-output 
-output  file-4 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:23:13 2005 -0700
-output 
-output     side-3
-output 
-output  file-3 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:22:13 2005 -0700
-output 
-output     side-2
-output 
-output  file-2 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 31 - check log --stat --all --not refs/heads/main
-
-expecting success of 6017.32 'not only --stdin': 
-	cat >expect <<-EOF &&
-	7
-
-	file-1
-	file-2
-	EOF
-	cat >input <<-EOF &&
-	^main^
-	--
-	file-2
-	EOF
-	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
-		<input >actual &&
-	test_cmp expect actual
-
-ok 32 - not only --stdin
-
-expecting success of 6017.33 'pseudo-opt with missing value': 
-	cat >input <<-EOF &&
-	--glob
-	refs/heads
-	EOF
-
-	cat >expect <<-EOF &&
-	fatal: Option ${SQ}--glob${SQ} requires a value
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 33 - pseudo-opt with missing value
-
-expecting success of 6017.34 'pseudo-opt with invalid value': 
-	cat >input <<-EOF &&
-	--no-walk=garbage
-	EOF
-
-	cat >expect <<-EOF &&
-	error: invalid argument to --no-walk
-	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 34 - pseudo-opt with invalid value
-
-expecting success of 6017.35 'unknown option without --end-of-options': 
-	cat >input <<-EOF &&
-	-dashed-branch
-	EOF
-
-	cat >expect <<-EOF &&
-	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 35 - unknown option without --end-of-options
-
-expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
-	cat >input <<-EOF &&
-	refs/heads/main
-	EOF
-	git rev-list refs/heads/main >expect &&
-
-	git rev-list refs/heads/main --not --stdin <input >actual &&
-	test_cmp expect actual
-
-ok 36 - --not on command line does not influence revisions read via --stdin
-
-expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
-	cat >input <<-EOF &&
-	--not
-	EOF
-	git rev-list refs/heads/main >expect &&
-
-	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
-	test_cmp expect actual
-
-ok 37 - --not via stdin does not influence revisions from command line
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6002-rev-list-bisect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6002-rev-list-bisect/.git/
-expecting success of 6002.1 'bisection diff --bisect l0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 1 - bisection diff --bisect l0 ^root <= 0
-
-expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 2 - bisection diff --bisect l1 ^root <= 0
-
-expecting success of 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 3 - bisection diff --bisect l2 ^root <= 0
-
-expecting success of 6002.4 'bisection diff --bisect a0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 4 - bisection diff --bisect a0 ^root <= 0
-
-expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 5 - bisection diff --bisect a1 ^root <= 0
-
-expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 6 - bisection diff --bisect a2 ^root <= 0
-
-expecting success of 6002.7 'bisection diff --bisect a3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 7 - bisection diff --bisect a3 ^root <= 0
-
-expecting success of 6002.8 'bisection diff --bisect b1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 8 - bisection diff --bisect b1 ^root <= 0
-
-expecting success of 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 9 - bisection diff --bisect b2 ^root <= 0
-
-expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 10 - bisection diff --bisect b3 ^root <= 0
-
-expecting success of 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 11 - bisection diff --bisect c1 ^root <= 0
-
-expecting success of 6002.12 'bisection diff --bisect c2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 12 - bisection diff --bisect c2 ^root <= 0
-
-expecting success of 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 13 - bisection diff --bisect c3 ^root <= 0
-
-expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 14 - bisection diff --bisect E ^F <= 0
-
-expecting success of 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 15 - bisection diff --bisect e1 ^F <= 0
-
-expecting success of 6002.16 'bisection diff --bisect e2 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 16 - bisection diff --bisect e2 ^F <= 0
-
-expecting success of 6002.17 'bisection diff --bisect e3 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 17 - bisection diff --bisect e3 ^F <= 0
-
-expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 18 - bisection diff --bisect e4 ^F <= 0
-
-expecting success of 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 19 - bisection diff --bisect e5 ^F <= 0
-
-expecting success of 6002.20 'bisection diff --bisect e6 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 20 - bisection diff --bisect e6 ^F <= 0
-
-expecting success of 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 21 - bisection diff --bisect e7 ^F <= 0
-
-expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 22 - bisection diff --bisect f1 ^F <= 0
-
-expecting success of 6002.23 'bisection diff --bisect f2 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 23 - bisection diff --bisect f2 ^F <= 0
-
-expecting success of 6002.24 'bisection diff --bisect f3 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 24 - bisection diff --bisect f3 ^F <= 0
-
-expecting success of 6002.25 'bisection diff --bisect f4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 25 - bisection diff --bisect f4 ^F <= 0
-
-expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 26 - bisection diff --bisect E ^F <= 0
-
-expecting success of 6002.27 'bisection diff --bisect V ^U <= 1': test $_bisect_err -le $_max_diff
-ok 27 - bisection diff --bisect V ^U <= 1
-
-expecting success of 6002.28 'bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0': test $_bisect_err -le $_max_diff
-ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
-
-expecting success of 6002.29 'bisection diff --bisect u1 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 29 - bisection diff --bisect u1 ^U <= 0
-
-expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 30 - bisection diff --bisect u2 ^U <= 0
-
-expecting success of 6002.31 'bisection diff --bisect u3 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 31 - bisection diff --bisect u3 ^U <= 0
-
-expecting success of 6002.32 'bisection diff --bisect u4 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 32 - bisection diff --bisect u4 ^U <= 0
-
-expecting success of 6002.33 'bisection diff --bisect u5 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 33 - bisection diff --bisect u5 ^U <= 0
-
-expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
-ok 34 - --bisect l5 ^root
-
-expecting success of 6002.35 '--bisect l5 ^root ^c3': check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
-ok 35 - --bisect l5 ^root ^c3
-
-expecting success of 6002.36 '--bisect l5 ^root ^c3 ^b4': check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
-ok 36 - --bisect l5 ^root ^c3 ^b4
-
-expecting success of 6002.37 '--bisect l3 ^root ^c3 ^b4': check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
-ok 37 - --bisect l3 ^root ^c3 ^b4
-
-expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
-ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
-
-expecting success of 6002.39 '--bisect l4 ^a2 ^a3 ^b ^a4': check_output bisect-l4-a2-a3-b-a4 "git rev-list $_bisect_option l4 ^a2 ^a3 ^a4"
-ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
-
-expecting success of 6002.40 '--bisect l3 ^a2 ^a3 ^b ^a4': check_output bisect-l3-a2-a3-b-a4 "git rev-list $_bisect_option l3 ^a2 ^a3 ^a4"
-ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
-
-expecting success of 6002.41 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 41 - --bisect a4 ^a2 ^a3 ^b4
-
-expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
-ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
-
-expecting success of 6002.43 '--bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3': check_output bisect-a4-a2-a3-b4-c2-c3 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2 ^c3"
-ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
-
-expecting success of 6002.44 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
-ok 44 - --bisect a4 ^a2 ^a3 ^b4
-
-expecting success of 6002.45 '--bisect c3 ^a2 ^a3 ^b4 ^c2': check_output bisect-c3-a2-a3-b4-c2 "git rev-list $_bisect_option c3 ^a2 ^a3 ^b4 ^c2"
-ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
-
-expecting success of 6002.46 'set up fake --bisect refs': 
-	git update-ref refs/bisect/bad c3 &&
-	good=$(git rev-parse b1) &&
-	git update-ref refs/bisect/good-$good $good &&
-	good=$(git rev-parse c1) &&
-	git update-ref refs/bisect/good-$good $good
-
-ok 46 - set up fake --bisect refs
-
-expecting success of 6002.47 'rev-list --bisect can default to good/bad refs': 
-	# the only thing between c3 and c1 is c2
-	git rev-parse c2 >expect &&
-	git rev-list --bisect >actual &&
-	test_cmp expect actual
-
-ok 47 - rev-list --bisect can default to good/bad refs
-
-expecting success of 6002.48 'rev-parse --bisect can default to good/bad refs': 
-	git rev-parse c3 ^b1 ^c1 >expect &&
-	git rev-parse --bisect >actual &&
-
-	# output order depends on the refnames, which in turn depends on
-	# the exact sha1s. We just want to make sure we have the same set
-	# of lines in any order.
-	sort <expect >expect.sorted &&
-	sort <actual >actual.sorted &&
-	test_cmp expect.sorted actual.sorted
-
-ok 48 - rev-parse --bisect can default to good/bad refs
-
-expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
-ok 49 - --bisect --first-parent
-
-expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
-ok 50 - --first-parent
-
-expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
-ok 51 - --bisect-vars --first-parent
-
-expecting success of 6002.52 '--bisect-all --first-parent': 
-	cat >expect.unsorted <<-EOF &&
-	$(git rev-parse E) (tag: E, dist=0)
-	$(git rev-parse e1) (tag: e1, dist=1)
-	$(git rev-parse e2) (tag: e2, dist=2)
-	$(git rev-parse e3) (tag: e3, dist=3)
-	$(git rev-parse e4) (tag: e4, dist=4)
-	$(git rev-parse e5) (tag: e5, dist=4)
-	$(git rev-parse e6) (tag: e6, dist=3)
-	$(git rev-parse e7) (tag: e7, dist=2)
-	$(git rev-parse e8) (tag: e8, dist=1)
-	EOF
-
-	# expect results to be ordered by distance (descending),
-	# commit hash (ascending)
-	sort -k4,4r -k1,1 expect.unsorted >expect &&
-	git rev-list --bisect-all --first-parent E ^F >actual &&
-	test_cmp expect actual
-
-ok 52 - --bisect-all --first-parent
-
-expecting success of 6002.53 '--bisect without any revisions': 
-	git rev-list --bisect HEAD..HEAD >out &&
-	test_must_be_empty out
-
-ok 53 - --bisect without any revisions
-
-# passed all 53 test(s)
-1..53
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5516-fetch-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.git/
-expecting success of 5516.1 'setup': 
-
-	>path1 &&
-	git add path1 &&
-	test_tick &&
-	git commit -a -m repo &&
-	the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
-
-	>path2 &&
-	git add path2 &&
-	test_tick &&
-	git commit -a -m second &&
-	the_commit=$(git show-ref -s --verify refs/heads/main)
-
-
-[main (root-commit) b9c09d6] repo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path1
-[main 9ad36e1] second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-ok 1 - setup
-
-expecting success of 5516.2 'reject 'git push --no-ipv4'': 
-			test_must_fail git $cmd --no-$opt 2>err &&
-			grep "unknown option .no-$opt" err
-		
-error: unknown option `no-ipv4'
-ok 2 - reject 'git push --no-ipv4'
-
-expecting success of 5516.3 'reject 'git push --no-ipv6'': 
-			test_must_fail git $cmd --no-$opt 2>err &&
-			grep "unknown option .no-$opt" err
-		
-error: unknown option `no-ipv6'
-ok 3 - reject 'git push --no-ipv6'
-
-expecting success of 5516.4 'reject 'git fetch --no-ipv4'': 
-			test_must_fail git $cmd --no-$opt 2>err &&
-			grep "unknown option .no-$opt" err
-		
-error: unknown option `no-ipv4'
-ok 4 - reject 'git fetch --no-ipv4'
-
-expecting success of 5516.5 'reject 'git fetch --no-ipv6'': 
-			test_must_fail git $cmd --no-$opt 2>err &&
-			grep "unknown option .no-$opt" err
-		
-error: unknown option `no-ipv6'
-ok 5 - reject 'git fetch --no-ipv6'
-
-expecting success of 5516.6 'fetch without wildcard': 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git fetch .. refs/heads/main:refs/remotes/origin/main &&
-
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 6 - fetch without wildcard
-
-expecting success of 5516.7 'fetch with wildcard': 
-	mk_empty testrepo &&
-	(
-		cd testrepo &&
-		git config remote.up.url .. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-From ..
- * [new branch]      main       -> origin/main
-ok 7 - fetch with wildcard
-
-expecting success of 5516.8 'fetch with insteadOf': 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.$TRASH.insteadOf" trash/ &&
-		git config remote.up.url trash/. &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 8 - fetch with insteadOf
-
-expecting success of 5516.9 'fetch with pushInsteadOf (should not rewrite)': 
-	mk_empty testrepo &&
-	(
-		TRASH=$(pwd)/ &&
-		cd testrepo &&
-		git config "url.trash/.pushInsteadOf" "$TRASH" &&
-		git config remote.up.url "$TRASH." &&
-		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
-		git fetch up &&
-
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/.
- * [new branch]      main       -> origin/main
-ok 9 - fetch with pushInsteadOf (should not rewrite)
-
-expecting success of 5516.10 'push without negotiation': 
-	mk_empty testrepo &&
-	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
-	test_commit -C testrepo unrelated_commit &&
-	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
-	test_when_finished "rm event" &&
-	GIT_TRACE2_EVENT="$(pwd)/event" git -c protocol.version=2 push testrepo refs/heads/main:refs/remotes/origin/main &&
-	grep_wrote 5 event # 2 commits, 2 trees, 1 blob
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 1aad98e] unrelated_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated_commit.t
-To testrepo
- * [new reference]   main -> origin/main
-{"event":"data","sid":"20260419T192100.668878Z-H8d819085-P001ef5cb/20260419T192100.719736Z-H8d819085-P001ef5f8","thread":"main","time":"2026-04-19T19:21:00.735527Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.015973,"t_rel":0.000709,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
-ok 10 - push without negotiation
-
-expecting success of 5516.11 'push with negotiation': 
-	mk_empty testrepo &&
-	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
-	test_commit -C testrepo unrelated_commit &&
-	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
-	test_when_finished "rm event" &&
-	GIT_TRACE2_EVENT="$(pwd)/event" \
-		git -c protocol.version=2 -c push.negotiate=1 \
-		push testrepo refs/heads/main:refs/remotes/origin/main &&
-	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
-	grep_wrote 2 event # 1 commit, 1 tree
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 8e794eb] unrelated_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated_commit.t
-To testrepo
- * [new reference]   main -> origin/main
-{"event":"data","sid":"20260419T192101.182308Z-H8d819085-P001ef7bf/20260419T192101.211732Z-H8d819085-P001ef7df","thread":"main","time":"2026-04-19T19:21:01.264035Z","file":"fetch-pack.c","line":2243,"repo":1,"t_abs":0.052491,"t_rel":0.051712,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-{"event":"data","sid":"20260419T192101.182308Z-H8d819085-P001ef7bf/20260419T192101.280210Z-H8d819085-P001ef818","thread":"main","time":"2026-04-19T19:21:01.291184Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.011166,"t_rel":0.000431,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
-ok 11 - push with negotiation
-
-expecting success of 5516.12 'push with negotiation proceeds anyway even if negotiation fails': 
-	mk_empty testrepo &&
-	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
-	test_commit -C testrepo unrelated_commit &&
-	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
-	test_when_finished "rm event" &&
-	GIT_TEST_PROTOCOL_VERSION=0 GIT_TRACE2_EVENT="$(pwd)/event" \
-		git -c push.negotiate=1 push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
-	grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
-	test_grep "push negotiation failed" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 294c9e5] unrelated_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20260419T192101.725645Z-H8d819085-P001ef9dd/20260419T192101.835812Z-H8d819085-P001efa41","thread":"main","time":"2026-04-19T19:21:01.859398Z","file":"builtin/pack-objects.c","line":1457,"repo":1,"t_abs":0.023790,"t_rel":0.000739,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
-warning: push negotiation failed; proceeding anyway with push
-ok 12 - push with negotiation proceeds anyway even if negotiation fails
-
-expecting success of 5516.13 'push deletion with negotiation': 
-	mk_empty testrepo &&
-	git push testrepo $the_first_commit:refs/heads/master &&
-	git -c push.negotiate=1 push testrepo \
-		:master $the_first_commit:refs/heads/next 2>errors-2 &&
-	test_grep ! "negotiate-only needs one or " errors-2 &&
-	git -c push.negotiate=1 push testrepo :next 2>errors-1 &&
-	test_grep ! "negotiate-only needs one or " errors-1
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
-ok 13 - push deletion with negotiation
-
-expecting success of 5516.14 'push with negotiation does not attempt to fetch submodules': 
-	mk_empty submodule_upstream &&
-	test_commit -C submodule_upstream submodule_commit &&
-	test_config_global protocol.file.allow always &&
-	git submodule add ./submodule_upstream submodule &&
-	mk_empty testrepo &&
-	git push testrepo $the_first_commit:refs/remotes/origin/first_commit &&
-	test_commit -C testrepo unrelated_commit &&
-	git -C testrepo config receive.hideRefs refs/remotes/origin/first_commit &&
-	GIT_TRACE2_EVENT="$(pwd)/event"  git -c submodule.recurse=true \
-		-c protocol.version=2 -c push.negotiate=1 \
-		push testrepo refs/heads/main:refs/remotes/origin/main 2>err &&
-	grep \"key\":\"total_rounds\",\"value\":\"1\" event &&
-	! grep "Fetching submodule" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/submodule_upstream/.git/
-[main (root-commit) 7c5b5fd] submodule_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 submodule_commit.t
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/submodule'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/first_commit
-[main (root-commit) 3be3d20] unrelated_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20260419T192103.221539Z-H8d819085-P001effb7/20260419T192103.257370Z-H8d819085-P001effdd","thread":"main","time":"2026-04-19T19:21:03.293652Z","file":"fetch-pack.c","line":2243,"repo":1,"t_abs":0.036530,"t_rel":0.035663,"nesting":2,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-ok 14 - push with negotiation does not attempt to fetch submodules
-
-expecting success of 5516.15 'push without wildcard': 
-	mk_empty testrepo &&
-
-	git push testrepo refs/heads/main:refs/remotes/origin/main &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-ok 15 - push without wildcard
-
-expecting success of 5516.16 'push with wildcard': 
-	mk_empty testrepo &&
-
-	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   main -> origin/main
-ok 16 - push with wildcard
-
-expecting success of 5516.17 'push with insteadOf': 
-	mk_empty testrepo &&
-	TRASH="$(pwd)/" &&
-	test_config "url.$TRASH.insteadOf" trash/ &&
-	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo
- * [new reference]   main -> origin/main
-ok 17 - push with insteadOf
-
-expecting success of 5516.18 'push with pushInsteadOf': 
-	mk_empty testrepo &&
-	TRASH="$(pwd)/" &&
-	test_config "url.$TRASH.pushInsteadOf" trash/ &&
-	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo
- * [new reference]   main -> origin/main
-ok 18 - push with pushInsteadOf
-
-expecting success of 5516.19 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)': 
-	mk_empty testrepo &&
-	test_config "url.trash2/.pushInsteadOf" testrepo/ &&
-	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
-	test_config remote.r.url trash/wrong &&
-	test_config remote.r.pushurl "testrepo/" &&
-	git push r refs/heads/main:refs/remotes/origin/main &&
-	(
-		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
-		git for-each-ref refs/remotes/origin >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo/
- * [new reference]   main -> origin/main
-ok 19 - push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)
-
-expecting success of 5516.20 'push with matching heads': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 20 - push with matching heads
-
-expecting success of 5516.21 'push with matching heads on the command line': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 21 - push with matching heads on the command line
-
-expecting success of 5516.22 'failed (non-fast-forward) push with matching heads': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	test_must_fail git push testrepo &&
-	check_push_result testrepo $the_commit heads/main &&
-	git reset --hard $the_commit
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-[main 84b8a29] assaged
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 path2
- create mode 160000 submodule
-fatal: The current branch main has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream testrepo main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-warning: unable to rmdir 'submodule': Directory not empty
-HEAD is now at 9ad36e1 second
-ok 22 - failed (non-fast-forward) push with matching heads
-
-expecting success of 5516.23 'push --force with matching heads': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	git push --force testrepo : &&
-	! check_push_result testrepo $the_commit heads/main &&
-	git reset --hard $the_commit
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-[main 935970f] assaged
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To testrepo
- + 9ad36e1...935970f main -> main (forced update)
---- expect	2026-04-19 19:21:08.079659440 +0000
-+++ actual	2026-04-19 19:21:08.103659440 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 23 - push --force with matching heads
-
-expecting success of 5516.24 'push with matching heads and forced update': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo : &&
-	git commit --amend -massaged &&
-	git push testrepo +: &&
-	! check_push_result testrepo $the_commit heads/main &&
-	git reset --hard $the_commit
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-[main 935970f] assaged
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 path2
-remote: warning: updating the current branch        
-To testrepo
- + 9ad36e1...935970f main -> main (forced update)
---- expect	2026-04-19 19:21:08.855659440 +0000
-+++ actual	2026-04-19 19:21:08.867659440 +0000
-@@ -1 +1 @@
--9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
-+935970ff2fd2257ae1a73d15652c0ac6f837cf17
-HEAD is now at 9ad36e1 second
-ok 24 - push with matching heads and forced update
-
-expecting success of 5516.25 'push with no ambiguity (1)': 
-
-	mk_test testrepo heads/main &&
-	git push testrepo main:main &&
-	check_push_result testrepo $the_commit heads/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 25 - push with no ambiguity (1)
-
-expecting success of 5516.26 'push with no ambiguity (2)': 
-
-	mk_test testrepo remotes/origin/main &&
-	git push testrepo main:origin/main &&
-	check_push_result testrepo $the_commit remotes/origin/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
-notice: HEAD points to an unborn branch (main)
-To testrepo
-   b9c09d6..9ad36e1  main -> origin/main
-notice: HEAD points to an unborn branch (main)
-ok 26 - push with no ambiguity (2)
-
-expecting success of 5516.27 'push with colon-less refspec, no ambiguity': 
-
-	mk_test testrepo heads/main heads/t/main &&
-	git branch -f t/main main &&
-	git push testrepo main &&
-	check_push_result testrepo $the_commit heads/main &&
-	check_push_result testrepo $the_first_commit heads/t/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> t/main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 27 - push with colon-less refspec, no ambiguity
-
-expecting success of 5516.28 'push with weak ambiguity (1)': 
-
-	mk_test testrepo heads/main remotes/origin/main &&
-	git push testrepo main:main &&
-	check_push_result testrepo $the_commit heads/main &&
-	check_push_result testrepo $the_first_commit remotes/origin/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 28 - push with weak ambiguity (1)
-
-expecting success of 5516.29 'push with weak ambiguity (2)': 
-
-	mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
-	git push testrepo main:main &&
-	check_push_result testrepo $the_commit heads/main &&
-	check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/main
-To testrepo
- * [new reference]   b9c09d6cc74d3857142fb7c082dca65b88254c6d -> another/main
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
-ok 29 - push with weak ambiguity (2)
-
-expecting success of 5516.30 'push with ambiguity': 
-
-	mk_test testrepo heads/frotz tags/frotz &&
-	test_must_fail git push testrepo main:frotz &&
-	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (main)
-error: dst refspec frotz matches more than one
-error: failed to push some refs to 'testrepo'
-notice: HEAD points to an unborn branch (main)
-ok 30 - push with ambiguity
-
-expecting success of 5516.31 'push with onelevel ref': 
-	mk_test testrepo heads/main &&
-	test_must_fail git push testrepo HEAD:refs/onelevel
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-remote: error: refusing to update funny ref 'refs/onelevel' remotely        
-To testrepo
- ! [remote rejected] HEAD -> refs/onelevel (funny refname)
-error: failed to push some refs to 'testrepo'
-ok 31 - push with onelevel ref
-
-expecting success of 5516.32 'push with colon-less refspec (1)': 
-
-	mk_test testrepo heads/frotz tags/frotz &&
-	git branch -f frotz main &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit heads/frotz &&
-	check_push_result testrepo $the_first_commit tags/frotz
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (main)
-To testrepo
-   b9c09d6..9ad36e1  frotz -> frotz
-notice: HEAD points to an unborn branch (main)
-notice: HEAD points to an unborn branch (main)
-ok 32 - push with colon-less refspec (1)
-
-expecting success of 5516.33 'push with colon-less refspec (2)': 
-
-	mk_test testrepo heads/frotz tags/frotz &&
-	if git show-ref --verify -q refs/heads/frotz
-	then
-		git branch -D frotz
-	fi &&
-	git tag -f frotz &&
-	git push -f testrepo frotz &&
-	check_push_result testrepo $the_commit tags/frotz &&
-	check_push_result testrepo $the_first_commit heads/frotz
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-To testrepo
- * [new tag]         b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
-notice: HEAD points to an unborn branch (main)
-Deleted branch frotz (was 9ad36e1).
-To testrepo
- + b9c09d6...9ad36e1 frotz -> frotz (forced update)
-notice: HEAD points to an unborn branch (main)
-notice: HEAD points to an unborn branch (main)
-ok 33 - push with colon-less refspec (2)
-
-expecting success of 5516.34 'push with colon-less refspec (3)': 
-
-	mk_test testrepo &&
-	if git show-ref --verify -q refs/tags/frotz
-	then
-		git tag -d frotz
-	fi &&
-	git branch -f frotz main &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit heads/frotz &&
-	test 1 = $( cd testrepo && git show-ref | wc -l )
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-Deleted tag 'frotz' (was 9ad36e1)
-To testrepo
- * [new branch]      frotz -> frotz
-notice: HEAD points to an unborn branch (main)
-ok 34 - push with colon-less refspec (3)
-
-expecting success of 5516.35 'push with colon-less refspec (4)': 
-
-	mk_test testrepo &&
-	if git show-ref --verify -q refs/heads/frotz
-	then
-		git branch -D frotz
-	fi &&
-	git tag -f frotz &&
-	git push testrepo frotz &&
-	check_push_result testrepo $the_commit tags/frotz &&
-	test 1 = $( cd testrepo && git show-ref | wc -l )
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-Deleted branch frotz (was 9ad36e1).
-To testrepo
- * [new tag]         frotz -> frotz
-notice: HEAD points to an unborn branch (main)
-ok 35 - push with colon-less refspec (4)
-
-expecting success of 5516.36 'push head with non-existent, incomplete dest': 
-
-	mk_test testrepo &&
-	git push testrepo main:branch &&
-	check_push_result testrepo $the_commit heads/branch
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-To testrepo
- * [new branch]      main -> branch
-notice: HEAD points to an unborn branch (main)
-ok 36 - push head with non-existent, incomplete dest
-
-expecting success of 5516.37 'push tag with non-existent, incomplete dest': 
-
-	mk_test testrepo &&
-	git tag -f v1.0 &&
-	git push testrepo v1.0:tag &&
-	check_push_result testrepo $the_commit tags/tag
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-To testrepo
- * [new tag]         v1.0 -> tag
-notice: HEAD points to an unborn branch (main)
-ok 37 - push tag with non-existent, incomplete dest
-
-expecting success of 5516.38 'push sha1 with non-existent, incomplete dest': 
-
-	mk_test testrepo &&
-	test_must_fail git push testrepo $(git rev-parse main):foo
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-error: The destination you provided is not a full refname (i.e.,
-starting with "refs/"). We tried to guess what you meant by:
-
-- Looking for a ref that matches 'foo' on the remote side.
-- Checking if the <src> being pushed ('9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f')
-  is a ref in "refs/{heads,tags}/". If so we add a corresponding
-  refs/{heads,tags}/ prefix on the remote side.
-
-Neither worked, so we gave up. You must fully qualify the ref.
-hint: The <src> part of the refspec is a commit object.
-hint: Did you mean to create a new branch by pushing to
-hint: '9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f:refs/heads/foo'?
-error: failed to push some refs to 'testrepo'
-ok 38 - push sha1 with non-existent, incomplete dest
-
-expecting success of 5516.39 'push ref expression with non-existent, incomplete dest': 
-
-	mk_test testrepo &&
-	test_must_fail git push testrepo main^:branch
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-error: The destination you provided is not a full refname (i.e.,
-starting with "refs/"). We tried to guess what you meant by:
-
-- Looking for a ref that matches 'branch' on the remote side.
-- Checking if the <src> being pushed ('main^')
-  is a ref in "refs/{heads,tags}/". If so we add a corresponding
-  refs/{heads,tags}/ prefix on the remote side.
-
-Neither worked, so we gave up. You must fully qualify the ref.
-hint: The <src> part of the refspec is a commit object.
-hint: Did you mean to create a new branch by pushing to
-hint: 'main^:refs/heads/branch'?
-error: failed to push some refs to 'testrepo'
-ok 39 - push ref expression with non-existent, incomplete dest
-
-expecting success of 5516.40 'push with HEAD': 
-		mk_test testrepo heads/main &&
-		git checkout main &&
-		git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/main
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  HEAD -> main
-ok 40 - push with HEAD
-
-expecting success of 5516.41 'push with HEAD nonexisting at remote': 
-		mk_test testrepo heads/main &&
-		git checkout -b local main &&
-		test_when_finished "git checkout main; git branch -D local" &&
-		git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Switched to a new branch 'local'
-To testrepo
- * [new branch]      HEAD -> local
-Switched to branch 'main'
-Deleted branch local (was 9ad36e1).
-ok 41 - push with HEAD nonexisting at remote
-
-expecting success of 5516.42 'push with +HEAD': 
-		mk_test testrepo heads/main &&
-		git checkout -b local main &&
-		test_when_finished "git checkout main; git branch -D local" &&
-		git push testrepo main local &&
-		check_push_result testrepo $the_commit heads/main &&
-		check_push_result testrepo $the_commit heads/local &&
-
-		# Without force rewinding should fail
-		git reset --hard $head^ &&
-		test_must_fail git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local &&
-
-		# With force rewinding should succeed
-		git push testrepo +$head &&
-		check_push_result testrepo $the_first_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Switched to a new branch 'local'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
- * [new branch]      local -> local
-HEAD is now at b9c09d6 repo
-To testrepo
- ! [rejected]        HEAD -> local (non-fast-forward)
-error: failed to push some refs to 'testrepo'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. If you want to integrate the remote changes,
-hint: use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-To testrepo
- + 9ad36e1...b9c09d6 HEAD -> local (forced update)
-Switched to branch 'main'
-Deleted branch local (was b9c09d6).
-ok 42 - push with +HEAD
-
-expecting success of 5516.43 'push HEAD with non-existent, incomplete dest': 
-		mk_test testrepo &&
-		git checkout main &&
-		git push testrepo $head:branch &&
-		check_push_result testrepo $the_commit heads/branch
-
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-Already on 'main'
-To testrepo
- * [new branch]      HEAD -> branch
-notice: HEAD points to an unborn branch (main)
-ok 43 - push HEAD with non-existent, incomplete dest
-
-expecting success of 5516.44 'push with config remote.*.push = HEAD': 
-		mk_test testrepo heads/local &&
-		git checkout main &&
-		git branch -f local $the_commit &&
-		test_when_finished "git branch -D local" &&
-		(
-			cd testrepo &&
-			git checkout local &&
-			git reset --hard $the_first_commit
-		) &&
-		test_config remote.there.url testrepo &&
-		test_config remote.there.push $head &&
-		test_config branch.main.remote there &&
-		git push &&
-		check_push_result testrepo $the_commit heads/main &&
-		check_push_result testrepo $the_first_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
-notice: HEAD points to an unborn branch (main)
-Already on 'main'
-Switched to branch 'local'
-HEAD is now at b9c09d6 repo
-To testrepo
- * [new branch]      HEAD -> main
-Deleted branch local (was 9ad36e1).
-ok 44 - push with config remote.*.push = HEAD
-
-expecting success of 5516.45 'push with @': 
-		mk_test testrepo heads/main &&
-		git checkout main &&
-		git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/main
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  HEAD -> main
-ok 45 - push with @
-
-expecting success of 5516.46 'push with @ nonexisting at remote': 
-		mk_test testrepo heads/main &&
-		git checkout -b local main &&
-		test_when_finished "git checkout main; git branch -D local" &&
-		git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Switched to a new branch 'local'
-To testrepo
- * [new branch]      HEAD -> local
-Switched to branch 'main'
-Deleted branch local (was 9ad36e1).
-ok 46 - push with @ nonexisting at remote
-
-expecting success of 5516.47 'push with +@': 
-		mk_test testrepo heads/main &&
-		git checkout -b local main &&
-		test_when_finished "git checkout main; git branch -D local" &&
-		git push testrepo main local &&
-		check_push_result testrepo $the_commit heads/main &&
-		check_push_result testrepo $the_commit heads/local &&
-
-		# Without force rewinding should fail
-		git reset --hard $head^ &&
-		test_must_fail git push testrepo $head &&
-		check_push_result testrepo $the_commit heads/local &&
-
-		# With force rewinding should succeed
-		git push testrepo +$head &&
-		check_push_result testrepo $the_first_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Switched to a new branch 'local'
-remote: warning: updating the current branch        
-To testrepo
-   b9c09d6..9ad36e1  main -> main
- * [new branch]      local -> local
-HEAD is now at b9c09d6 repo
-To testrepo
- ! [rejected]        HEAD -> local (non-fast-forward)
-error: failed to push some refs to 'testrepo'
-hint: Updates were rejected because the tip of your current branch is behind
-hint: its remote counterpart. If you want to integrate the remote changes,
-hint: use 'git pull' before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-To testrepo
- + 9ad36e1...b9c09d6 HEAD -> local (forced update)
-Switched to branch 'main'
-Deleted branch local (was b9c09d6).
-ok 47 - push with +@
-
-expecting success of 5516.48 'push @ with non-existent, incomplete dest': 
-		mk_test testrepo &&
-		git checkout main &&
-		git push testrepo $head:branch &&
-		check_push_result testrepo $the_commit heads/branch
-
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-notice: HEAD points to an unborn branch (main)
-notice: No default references
-Already on 'main'
-To testrepo
- * [new branch]      HEAD -> branch
-notice: HEAD points to an unborn branch (main)
-ok 48 - push @ with non-existent, incomplete dest
-
-expecting success of 5516.49 'push with config remote.*.push = @': 
-		mk_test testrepo heads/local &&
-		git checkout main &&
-		git branch -f local $the_commit &&
-		test_when_finished "git branch -D local" &&
-		(
-			cd testrepo &&
-			git checkout local &&
-			git reset --hard $the_first_commit
-		) &&
-		test_config remote.there.url testrepo &&
-		test_config remote.there.push $head &&
-		test_config branch.main.remote there &&
-		git push &&
-		check_push_result testrepo $the_commit heads/main &&
-		check_push_result testrepo $the_first_commit heads/local
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> local
-notice: HEAD points to an unborn branch (main)
-Already on 'main'
-Switched to branch 'local'
-HEAD is now at b9c09d6 repo
-To testrepo
- * [new branch]      HEAD -> main
-Deleted branch local (was 9ad36e1).
-ok 49 - push with config remote.*.push = @
-
-expecting success of 5516.50 'push to remote with no explicit refspec and config remote.*.push = src:dest': 
-	mk_test testrepo heads/main &&
-	git checkout $the_first_commit &&
-	test_config remote.there.url testrepo &&
-	test_config remote.there.push refs/heads/main:refs/heads/main &&
-	git push there &&
-	check_push_result testrepo $the_commit heads/main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Note: switching to 'b9c09d6cc74d3857142fb7c082dca65b88254c6d'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
   git switch -c <new-branch-name>
 
@@ -399720,3918 +395046,8955 @@
 To testrepo
  * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
 Already on 'main'
-{"event":"child_start","sid":"20260419T192225.433195Z-H8d819085-P00201e3d","thread":"main","time":"2026-04-19T19:22:25.452911Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
-{"event":"child_start","sid":"20260419T192225.696392Z-H8d819085-P00201f15","thread":"main","time":"2026-04-19T19:22:25.733010Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
-{"event":"child_start","sid":"20260419T192225.920251Z-H8d819085-P00201fd1","thread":"main","time":"2026-04-19T19:22:25.936362Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
+{"event":"child_start","sid":"20250317T132538.567807Z-H5c947e1c-P0032ab4d","thread":"main","time":"2025-03-17T13:25:38.589438Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
+{"event":"child_start","sid":"20250317T132538.935666Z-H5c947e1c-P0032ac03","thread":"main","time":"2025-03-17T13:25:38.956400Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q"]}
+{"event":"child_start","sid":"20250317T132539.283758Z-H5c947e1c-P0032acaa","thread":"main","time":"2025-03-17T13:25:39.308398Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--all-progress-implied","--revs","--stdout","--thin","--delta-base-offset","-q","--no-use-bitmap-index"]}
 ok 120 - push with config push.useBitmaps
 
 # passed all 120 test(s)
 1..120
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6018-rev-list-glob/.git/
-expecting success of 6018.1 'setup': 
-
-	commit main &&
-	git checkout -b subspace/one main &&
-	commit one &&
-	git checkout -b subspace/two main &&
-	commit two &&
-	git checkout -b subspace-x main &&
-	commit subspace-x &&
-	git checkout -b other/three main &&
-	commit three &&
-	git checkout -b someref main &&
-	commit some &&
-	git checkout main &&
-	commit topic_2 &&
-	git tag foo/bar main &&
-	commit topic_3 &&
-	git update-ref refs/remotes/foo/baz main &&
-	commit topic_4 &&
-	git update-ref refs/remotes/upstream/one subspace/one &&
-	git update-ref refs/remotes/upstream/two subspace/two &&
-	git update-ref refs/remotes/upstream/x subspace-x &&
-	git tag qux/one subspace/one &&
-	git tag qux/two subspace/two &&
-	git tag qux/x subspace-x
+*** t6006-rev-list-format.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6006-rev-list-format/.git/
+expecting success of 6006.1 'setup': 
+	: >foo &&
+	git add foo &&
+	git config i18n.commitEncoding $test_encoding &&
+	echo "$added_iso88591" | git commit -F - &&
+	head1=$(git rev-parse --verify HEAD) &&
+	head1_short=$(git rev-parse --verify --short $head1) &&
+	head1_short4=$(git rev-parse --verify --short=4 $head1) &&
+	tree1=$(git rev-parse --verify HEAD:) &&
+	tree1_short=$(git rev-parse --verify --short $tree1) &&
+	echo "$changed" > foo &&
+	echo "$changed_iso88591" | git commit -a -F - &&
+	head2=$(git rev-parse --verify HEAD) &&
+	head2_short=$(git rev-parse --verify --short $head2) &&
+	head2_short4=$(git rev-parse --verify --short=4 $head2) &&
+	tree2=$(git rev-parse --verify HEAD:) &&
+	tree2_short=$(git rev-parse --verify --short $tree2) &&
+	git config --unset i18n.commitEncoding
 
-[main (root-commit) f9b107a] main
+[main (root-commit) 75bad09] added (hinzugefügt) foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
-Switched to a new branch 'subspace/one'
-[subspace/one ca90b7f] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'subspace/two'
-[subspace/two 65ee8ea] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'subspace-x'
-[subspace-x e241fee] subspace-x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'other/three'
-[other/three ec1efc4] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'someref'
-[someref dffcf3f] some
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main 2bdf448] topic_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0e3b4df] topic_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 88fe3d2] topic_4
+[main 7e50ed9] changed (geändert) foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
 ok 1 - setup
 
-expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 2 - rev-parse --glob=refs/heads/subspace/*
-
-expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 3 - rev-parse --glob=heads/subspace/*
-
-expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 4 - rev-parse --glob=refs/heads/subspace/
-
-expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 5 - rev-parse --glob=heads/subspace/
-
-expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 6 - rev-parse --glob=heads/subspace
-
-checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
-
-
-fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
-
-checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
-
-	compare rev-parse "main" "--glob --symbolic main"
+expecting success of 6006.2 'format percent': 
+		git rev-list  --pretty=format:'%%h' main >output.percent &&
+		test_cmp expect.percent output.percent
+	
+ok 2 - format percent
 
+expecting success of 6006.3 'format hash': 
+		git rev-list  --pretty=format:'%H%n%h' main >output.hash &&
+		test_cmp expect.hash output.hash
+	
+ok 3 - format hash
 
---- expected	2026-04-19 19:22:21.307659440 +0000
-+++ actual	2026-04-19 19:22:21.319659440 +0000
-@@ -1 +1,2 @@
--88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
-+--glob
-+main
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
+expecting success of 6006.4 'format hash-no-header': 
+		git rev-list  --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header &&
+		test_cmp expect.hash-no-header output.hash-no-header
+	
+ok 4 - format hash-no-header
 
-expecting success of 6018.9 'rev-parse --branches=subspace/*': 
+expecting success of 6006.5 'format hash-no-header-abbrev': 
+		git rev-list  --abbrev-commit --abbrev=0 --no-commit-header --pretty=format:'%H%n%h' main >output.hash-no-header-abbrev &&
+		test_cmp expect.hash-no-header-abbrev output.hash-no-header-abbrev
+	
+ok 5 - format hash-no-header-abbrev
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+expecting success of 6006.6 'format tree': 
+		git rev-list  --pretty=format:'%T%n%t' main >output.tree &&
+		test_cmp expect.tree output.tree
+	
+ok 6 - format tree
 
+expecting success of 6006.7 'format parents': 
+		git rev-list  --pretty=format:'%P%n%p' main >output.parents &&
+		test_cmp expect.parents output.parents
+	
+ok 7 - format parents
 
-ok 9 - rev-parse --branches=subspace/*
+expecting success of 6006.8 'format author': 
+		git rev-list  --pretty=format:'%an%n%ae%n%al%n%ad%n%aD%n%at' main >output.author &&
+		test_cmp expect.author output.author
+	
+ok 8 - format author
 
-expecting success of 6018.10 'rev-parse --branches=subspace/': 
+expecting success of 6006.9 'format committer': 
+		git rev-list  --pretty=format:'%cn%n%ce%n%cl%n%cd%n%cD%n%ct' main >output.committer &&
+		test_cmp expect.committer output.committer
+	
+ok 9 - format committer
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+expecting success of 6006.10 'format encoding': 
+		git rev-list  --pretty=format:'%e' main >output.encoding &&
+		test_cmp expect.encoding output.encoding
+	
+ok 10 - format encoding
 
+expecting success of 6006.11 'format subject': 
+		git rev-list  --pretty=format:'%s' main >output.subject &&
+		test_cmp expect.subject output.subject
+	
+ok 11 - format subject
 
-ok 10 - rev-parse --branches=subspace/
+expecting success of 6006.12 'format subject-truncated': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.subject-truncated &&
+		test_cmp expect.subject-truncated output.subject-truncated
+	
+ok 12 - format subject-truncated
 
-expecting success of 6018.11 'rev-parse --branches=subspace': 
+expecting success of 6006.13 'format body': 
+		git rev-list  --pretty=format:'%b' main >output.body &&
+		test_cmp expect.body output.body
+	
+ok 13 - format body
 
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+expecting success of 6006.14 'format raw-body': 
+		git rev-list  --pretty=format:'%B' main >output.raw-body &&
+		test_cmp expect.raw-body output.raw-body
+	
+ok 14 - format raw-body
 
+expecting success of 6006.15 'format raw-body-no-header': 
+		git rev-list  --no-commit-header --pretty=format:'%B' main >output.raw-body-no-header &&
+		test_cmp expect.raw-body-no-header output.raw-body-no-header
+	
+ok 15 - format raw-body-no-header
 
-ok 11 - rev-parse --branches=subspace
+expecting success of 6006.16 'pretty oneline (without --no-commit-header)': 
+		git rev-list  --pretty='oneline' main >output.oneline &&
+		test_cmp expect.oneline output.oneline
+	
+ok 16 - pretty oneline (without --no-commit-header)
 
-expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
+expecting success of 6006.17 'pretty oneline (with --no-commit-header)': 
+		git rev-list  --no-commit-header --pretty='oneline' main >output.oneline &&
+		test_cmp expect.oneline output.oneline
+	
+ok 17 - pretty oneline (with --no-commit-header)
 
-	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+expecting success of 6006.18 'pretty short (without --no-commit-header)': 
+		git rev-list  --pretty='short' main >output.short &&
+		test_cmp expect.short output.short
+	
+ok 18 - pretty short (without --no-commit-header)
 
+expecting success of 6006.19 'pretty short (with --no-commit-header)': 
+		git rev-list  --no-commit-header --pretty='short' main >output.short &&
+		test_cmp expect.short output.short
+	
+ok 19 - pretty short (with --no-commit-header)
 
-ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
+expecting success of 6006.20 'basic colors': 
+	cat >expect <<-EOF &&
+	commit $head2
+	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
+	EOF
+	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
+ok 20 - basic colors
 
-	compare rev-parse "main" "--glob=heads/someref/* main"
+expecting success of 6006.21 '%S is not a placeholder for rev-list yet': 
+	git rev-list --format="%S" -1 main | grep "%S"
 
+%S
+ok 21 - %S is not a placeholder for rev-list yet
 
-ok 13 - rev-parse --glob=heads/someref/* main
+expecting success of 6006.22 'advanced colors': 
+	cat >expect <<-EOF &&
+	commit $head2
+	<BOLD;RED;BYELLOW>foo<RESET>
+	EOF
+	format="%C(red yellow bold)foo%C(reset)" &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.14 'rev-parse --glob=heads/*': 
+ok 22 - advanced colors
 
-	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+expecting success of 6006.23 '%Cred does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 23 - %Cred does not enable color by default
 
+expecting success of 6006.24 '%Cred enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 24 - %Cred enables colors for color.diff
 
-ok 14 - rev-parse --glob=heads/*
+expecting success of 6006.25 '%Cred enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 25 - %Cred enables colors for color.ui
 
-expecting success of 6018.15 'rev-parse --tags=foo': 
+expecting success of 6006.26 '%Cred respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 26 - %Cred respects --color
 
-	compare rev-parse "foo/bar" "--tags=foo"
+expecting success of 6006.27 '%Cred respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 27 - %Cred respects --no-color
 
+checking prerequisite: TTY
 
-ok 15 - rev-parse --tags=foo
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 6018.16 'rev-parse --remotes=foo': 
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-	compare rev-parse "foo/baz" "--remotes=foo"
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
+)
+prerequisite TTY ok
+expecting success of 6006.28 '%Cred respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 28 - %Cred respects --color=auto (stdout is tty)
 
-ok 16 - rev-parse --remotes=foo
+expecting success of 6006.29 '%Cred respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 29 - %Cred respects --color=auto (stdout not tty)
 
-expecting success of 6018.17 'rev-parse --exclude with --branches': 
-	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
+expecting success of 6006.30 '%C(...) does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 30 - %C(...) does not enable color by default
 
-ok 17 - rev-parse --exclude with --branches
+expecting success of 6006.31 '%C(...) enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 31 - %C(...) enables colors for color.diff
 
-expecting success of 6018.18 'rev-parse --exclude with --all': 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+expecting success of 6006.32 '%C(...) enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 32 - %C(...) enables colors for color.ui
 
-ok 18 - rev-parse --exclude with --all
+expecting success of 6006.33 '%C(...) respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 33 - %C(...) respects --color
 
-expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+expecting success of 6006.34 '%C(...) respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 34 - %C(...) respects --no-color
 
-ok 19 - rev-parse accumulates multiple --exclude
+expecting success of 6006.35 '%C(...) respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 35 - %C(...) respects --color=auto (stdout is tty)
 
-expecting success of 6018.20 'rev-parse --branches clears --exclude': 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
+expecting success of 6006.36 '%C(...) respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 36 - %C(...) respects --color=auto (stdout not tty)
 
-ok 20 - rev-parse --branches clears --exclude
+expecting success of 6006.37 '%C(auto,...) does not enable color by default': 
+		git log --format=$color -1 >actual &&
+		has_no_color actual
+	
+ok 37 - %C(auto,...) does not enable color by default
 
-expecting success of 6018.21 'rev-parse --tags clears --exclude': 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
+expecting success of 6006.38 '%C(auto,...) enables colors for color.diff': 
+		git -c color.diff=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 38 - %C(auto,...) enables colors for color.diff
 
-ok 21 - rev-parse --tags clears --exclude
+expecting success of 6006.39 '%C(auto,...) enables colors for color.ui': 
+		git -c color.ui=always log --format=$color -1 >actual &&
+		has_color actual
+	
+ok 39 - %C(auto,...) enables colors for color.ui
 
-expecting success of 6018.22 'rev-parse --all clears --exclude': 
-	compare rev-parse "--exclude=* --all --all" "--all"
+expecting success of 6006.40 '%C(auto,...) respects --color': 
+		git log --format=$color -1 --color >actual &&
+		has_color actual
+	
+ok 40 - %C(auto,...) respects --color
 
-ok 22 - rev-parse --all clears --exclude
+expecting success of 6006.41 '%C(auto,...) respects --no-color': 
+		git -c color.ui=always log --format=$color -1 --no-color >actual &&
+		has_no_color actual
+	
+ok 41 - %C(auto,...) respects --no-color
 
-expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+expecting success of 6006.42 '%C(auto,...) respects --color=auto (stdout is tty)': 
+		test_terminal git log --format=$color -1 --color=auto >actual &&
+		has_color actual
+	
+ok 42 - %C(auto,...) respects --color=auto (stdout is tty)
 
-ok 23 - rev-parse --exclude=glob with --branches=glob
+expecting success of 6006.43 '%C(auto,...) respects --color=auto (stdout not tty)': 
+		(
+			TERM=vt100 && export TERM &&
+			git log --format=$color -1 --color=auto >actual &&
+			has_no_color actual
+		)
+	
+ok 43 - %C(auto,...) respects --color=auto (stdout not tty)
 
-expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
-	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+expecting success of 6006.44 '%C(always,...) enables color even without tty': 
+	git log --format=$ALWAYS_COLOR -1 >actual &&
+	has_color actual
 
-ok 24 - rev-parse --exclude=glob with --tags=glob
+ok 44 - %C(always,...) enables color even without tty
 
-expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 6006.45 '%C(auto) respects --color': 
+	git log --color --format="%C(auto)%H" -1 >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
+	test_cmp expect actual
 
-ok 25 - rev-parse --exclude=glob with --remotes=glob
+ok 45 - %C(auto) respects --color
 
-expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
-	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+expecting success of 6006.46 '%C(auto) respects --no-color': 
+	git log --no-color --format="%C(auto)%H" -1 >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
 
-ok 26 - rev-parse --exclude=ref with --branches=glob
+ok 46 - %C(auto) respects --no-color
 
-expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+expecting success of 6006.47 'rev-list %C(auto,...) respects --color': 
+	git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
+		-1 HEAD >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expect <<-EOF &&
+	commit $(git rev-parse HEAD)
+	<GREEN>foo<RESET>
+	EOF
+	test_cmp expect actual
 
-ok 27 - rev-parse --exclude=ref with --tags=glob
+ok 47 - rev-list %C(auto,...) respects --color
 
-expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 6006.48 'setup complex body': 
+	git config i18n.commitencoding $test_encoding &&
+	echo change2 >foo && git commit -a -F commit-msg &&
+	head3=$(git rev-parse --verify HEAD) &&
+	head3_short=$(git rev-parse --short $head3)
 
-ok 28 - rev-parse --exclude=ref with --remotes=glob
+[main 79c1a11] Test printing of complex bodies
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 48 - setup complex body
 
-expecting success of 6018.29 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+expecting success of 6006.49 'format complex-encoding': 
+		git rev-list  --pretty=format:'%e' main >output.complex-encoding &&
+		test_cmp expect.complex-encoding output.complex-encoding
 	
-ok 29 - rev-parse --exclude-hidden=fetch with --all
+ok 49 - format complex-encoding
 
-expecting success of 6018.30 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+expecting success of 6006.50 'format complex-subject': 
+		git rev-list  --pretty=format:'%s' main >output.complex-subject &&
+		test_cmp expect.complex-subject output.complex-subject
 	
-ok 30 - rev-parse --exclude-hidden=fetch with --all
+ok 50 - format complex-subject
 
-expecting success of 6018.31 'rev-parse --exclude-hidden=fetch with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+expecting success of 6006.51 'format complex-subject-trunc': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-trunc &&
+		test_cmp expect.complex-subject-trunc output.complex-subject-trunc
 	
-ok 31 - rev-parse --exclude-hidden=fetch with --glob
+ok 51 - format complex-subject-trunc
 
-expecting success of 6018.32 'rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+expecting success of 6006.52 'format complex-subject-mtrunc': 
+		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-mtrunc &&
+		test_cmp expect.complex-subject-mtrunc output.complex-subject-mtrunc
 	
-ok 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
+ok 52 - format complex-subject-mtrunc
 
-expecting success of 6018.33 'rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
+expecting success of 6006.53 'format complex-subject-ltrunc': 
+		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-ltrunc &&
+		test_cmp expect.complex-subject-ltrunc output.complex-subject-ltrunc
 	
-ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
-
-expecting success of 6018.34 'rev-parse --exclude-hidden=fetch fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 34 - rev-parse --exclude-hidden=fetch fails with --branches
-
-expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
-
-expecting success of 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
-
-expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
-
-expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
-
-expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
+ok 53 - format complex-subject-ltrunc
 
-expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 40 - rev-parse --exclude-hidden=receive with --all
+expecting success of 6006.54 'setup expected messages (for test %b)': 
+	cat <<-EOF >expected.utf-8 &&
+	commit $head3
+	This commit message is much longer than the others,
+	and it will be encoded in $test_encoding. We should therefore
+	include an ISO8859 character: ¡bueno!
 
-expecting success of 6018.41 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 41 - rev-parse --exclude-hidden=receive with --all
+	commit $head2
+	commit $head1
+	EOF
+	iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
 
-expecting success of 6018.42 'rev-parse --exclude-hidden=receive with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 42 - rev-parse --exclude-hidden=receive with --glob
+ok 54 - setup expected messages (for test %b)
 
-expecting success of 6018.43 'rev-parse --exclude-hidden=receive can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+expecting success of 6006.55 'format complex-body': 
+		git rev-list  --pretty=format:'%b' main >output.complex-body &&
+		test_cmp expect.complex-body output.complex-body
 	
-ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
+ok 55 - format complex-body
 
-expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
+expecting success of 6006.56 'format complex-subject-commitencoding-unset': 
+		git rev-list  --pretty=format:'%s' main >output.complex-subject-commitencoding-unset &&
+		test_cmp expect.complex-subject-commitencoding-unset output.complex-subject-commitencoding-unset
 	
-ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
-
-expecting success of 6018.45 'rev-parse --exclude-hidden=receive fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 45 - rev-parse --exclude-hidden=receive fails with --branches
-
-expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
-
-expecting success of 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 47 - rev-parse --exclude-hidden=receive fails with --tags
-
-expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
-
-expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
-
-expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
+ok 56 - format complex-subject-commitencoding-unset
 
-expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+expecting success of 6006.57 'format complex-subject-commitencoding-unset-trunc': 
+		git rev-list  --pretty=format:'%<(20,trunc)%s' main >output.complex-subject-commitencoding-unset-trunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-trunc output.complex-subject-commitencoding-unset-trunc
 	
-ok 51 - rev-parse --exclude-hidden=uploadpack with --all
+ok 57 - format complex-subject-commitencoding-unset-trunc
 
-expecting success of 6018.52 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+expecting success of 6006.58 'format complex-subject-commitencoding-unset-mtrunc': 
+		git rev-list  --pretty=format:'%<(20,mtrunc)%s' main >output.complex-subject-commitencoding-unset-mtrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-mtrunc output.complex-subject-commitencoding-unset-mtrunc
 	
-ok 52 - rev-parse --exclude-hidden=uploadpack with --all
+ok 58 - format complex-subject-commitencoding-unset-mtrunc
 
-expecting success of 6018.53 'rev-parse --exclude-hidden=uploadpack with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+expecting success of 6006.59 'format complex-subject-commitencoding-unset-ltrunc': 
+		git rev-list  --pretty=format:'%<(20,ltrunc)%s' main >output.complex-subject-commitencoding-unset-ltrunc &&
+		test_cmp expect.complex-subject-commitencoding-unset-ltrunc output.complex-subject-commitencoding-unset-ltrunc
 	
-ok 53 - rev-parse --exclude-hidden=uploadpack with --glob
+ok 59 - format complex-subject-commitencoding-unset-ltrunc
 
-expecting success of 6018.54 'rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+expecting success of 6006.60 'format complex-body-commitencoding-unset': 
+		git rev-list  --pretty=format:'%b' main >output.complex-body-commitencoding-unset &&
+		test_cmp expect.complex-body-commitencoding-unset output.complex-body-commitencoding-unset
 	
-ok 54 - rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref
+ok 60 - format complex-body-commitencoding-unset
 
-expecting success of 6018.55 'rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
+expecting success of 6006.61 '%x00 shows NUL': 
+	echo  >expect commit $head3 &&
+	echo >>expect fooQbar &&
+	git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
+	nul_to_q <actual.nul >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.56 'rev-parse --exclude-hidden=uploadpack fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 56 - rev-parse --exclude-hidden=uploadpack fails with --branches
+ok 61 - %x00 shows NUL
 
-expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
+expecting success of 6006.62 '%ad respects --date=': 
+	echo 2005-04-07 >expect.ad-short &&
+	git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
+	test_cmp expect.ad-short output.ad-short
 
-expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
+ok 62 - %ad respects --date=
 
-expecting success of 6018.59 'rev-parse --exclude-hidden=uploadpack fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 59 - rev-parse --exclude-hidden=uploadpack fails with --tags=pattern
+expecting success of 6006.63 'empty email': 
+	test_tick &&
+	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
+	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
+	test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
 
-expecting success of 6018.60 'rev-parse --exclude-hidden=uploadpack fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 60 - rev-parse --exclude-hidden=uploadpack fails with --remotes
+ok 63 - empty email
 
-expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
+expecting success of 6006.64 'del LF before empty (1)': 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
 
-expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+ok 64 - del LF before empty (1)
 
-ok 62 - rev-list --exclude=glob with --branches=glob
+expecting success of 6006.65 'del LF before empty (2)': 
+	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
 
-expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
 
-ok 63 - rev-list --exclude=glob with --tags=glob
+ok 65 - del LF before empty (2)
 
-expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+expecting success of 6006.66 'add LF before non-empty (1)': 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
+	test_line_count = 2 actual
 
-ok 64 - rev-list --exclude=glob with --remotes=glob
+ok 66 - add LF before non-empty (1)
 
-expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
-	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+expecting success of 6006.67 'add LF before non-empty (2)': 
+	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
+	test_line_count = 6 actual &&
+	grep "^$" actual
 
-ok 65 - rev-list --exclude=ref with --branches=glob
 
-expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+ok 67 - add LF before non-empty (2)
 
-ok 66 - rev-list --exclude=ref with --tags=glob
+expecting success of 6006.68 'add SP before non-empty (1)': 
+	git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 3
 
-expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+ok 68 - add SP before non-empty (1)
 
-ok 67 - rev-list --exclude=ref with --remotes=glob
+expecting success of 6006.69 'add SP before non-empty (2)': 
+	git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
+	test $(wc -w <actual) = 6
 
-expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
+ok 69 - add SP before non-empty (2)
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+expecting success of 6006.70 '--abbrev': 
+	echo SHORT SHORT SHORT >expect2 &&
+	echo LONG LONG LONG >expect3 &&
+	git log -1 --format="%h %h %h" HEAD >actual1 &&
+	git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
+	git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
+	sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
+	test_cmp expect2 fuzzy2 &&
+	test_cmp expect3 fuzzy3 &&
+	! test_cmp actual1 actual2
 
+--- actual1	2025-03-17 13:25:40.058346511 +0000
++++ actual2	2025-03-17 13:25:40.122346915 +0000
+@@ -1 +1 @@
+-79c1a11 79c1a11 79c1a11
++79c1a 79c1a 79c1a
+ok 70 - --abbrev
 
-ok 68 - rev-list --glob=refs/heads/subspace/*
+expecting success of 6006.71 '%H is not affected by --abbrev-commit': 
+	expected=$(($(test_oid hexsz) + 1)) &&
+	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = $expected
 
-expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
+ok 71 - %H is not affected by --abbrev-commit
 
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+expecting success of 6006.72 '%h is not affected by --abbrev-commit': 
+	git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
+	len=$(wc -c <actual) &&
+	test $len = 21
 
+ok 72 - %h is not affected by --abbrev-commit
 
-ok 69 - rev-list --glob refs/heads/subspace/*
+expecting success of 6006.73 '"%h %gD: %gs" is same as git-reflog': 
+	git reflog >expect &&
+	git log -g --format="%h %gD: %gs" >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
+ok 73 - "%h %gD: %gs" is same as git-reflog
 
-	compare rev-list "main" "--glob -0 main"
+expecting success of 6006.74 '"%h %gD: %gs" is same as git-reflog (with date)': 
+	git reflog --date=raw >expect &&
+	git log -g --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
 
+ok 74 - "%h %gD: %gs" is same as git-reflog (with date)
 
-ok 70 - rev-list not confused by option-like --glob arg
+expecting success of 6006.75 '"%h %gD: %gs" is same as git-reflog (with --abbrev)': 
+	git reflog --abbrev=13 --date=raw >expect &&
+	git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
+ok 75 - "%h %gD: %gs" is same as git-reflog (with --abbrev)
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
+expecting success of 6006.76 '%gd shortens ref name': 
+	echo "main@{0}" >expect.gd-short &&
+	git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
+	test_cmp expect.gd-short actual.gd-short
 
+ok 76 - %gd shortens ref name
 
-ok 71 - rev-list --glob=heads/subspace/*
+expecting success of 6006.77 'reflog identity': 
+	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
+	git log -g -1 --format="%gn:%ge" >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
+ok 77 - reflog identity
 
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+expecting success of 6006.78 'oneline with empty message': 
+	git commit --allow-empty --cleanup=verbatim -m "$LF" &&
+	git commit --allow-empty --allow-empty-message &&
+	git rev-list --oneline HEAD >test.txt &&
+	test_line_count = 5 test.txt &&
+	git rev-list --oneline --graph HEAD >testg.txt &&
+	test_line_count = 5 testg.txt
 
+[main 45d198f] 
+ Author: A U Thor <author@example.com>
+[main d12d4e0] 
+ Author: A U Thor <author@example.com>
+ok 78 - oneline with empty message
 
-ok 72 - rev-list --glob=refs/heads/subspace/
+expecting success of 6006.79 'single-character name is parsed correctly': 
+	git commit --author="a <a@example.com>" --allow-empty -m foo &&
+	echo "a <a@example.com>" >expect &&
+	git log -1 --format="%an <%ae>" >actual &&
+	test_cmp expect actual
 
-expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
+[main d066665] foo
+ Author: a <a@example.com>
+ok 79 - single-character name is parsed correctly
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
+expecting success of 6006.80 'unused %G placeholders are passed through': 
+	echo "%GX %G" >expect &&
+	git log -1 --format="%GX %G" >actual &&
+	test_cmp expect actual
 
+ok 80 - unused %G placeholders are passed through
 
-ok 73 - rev-list --glob=heads/subspace/
+# passed all 80 test(s)
+1..80
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6016-rev-list-graph-simplify-history.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6016-rev-list-graph-simplify-history/.git/
+expecting success of 6016.1 'set up rev-list --graph test': 
+	# 3 commits on branch A
+	test_commit A1 foo.txt &&
+	test_commit A2 bar.txt &&
+	test_commit A3 bar.txt &&
+	git branch -m main A &&
 
-expecting success of 6018.74 'rev-list --glob=heads/subspace': 
+	# 2 commits on branch B, started from A1
+	git checkout -b B A1 &&
+	test_commit B1 foo.txt &&
+	test_commit B2 abc.txt &&
 
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+	# 2 commits on branch C, started from A2
+	git checkout -b C A2 &&
+	test_commit C1 xyz.txt &&
+	test_commit C2 xyz.txt &&
 
+	# Octopus merge B and C into branch A
+	git checkout A &&
+	git merge B C -m A4 &&
+	git tag A4 &&
 
-ok 74 - rev-list --glob=heads/subspace
+	test_commit A5 bar.txt &&
 
-expecting success of 6018.75 'rev-list --branches=subspace/*': 
+	# More commits on C, then merge C into A
+	git checkout C &&
+	test_commit C3 foo.txt &&
+	test_commit C4 bar.txt &&
+	git checkout A &&
+	git merge -s ours C -m A6 &&
+	git tag A6 &&
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+	test_commit A7 bar.txt
 
+[main (root-commit) 9b00348] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.txt
+[main 02e4832] A2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.txt
+[main 993a1f0] A3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'B'
+[B 4accf7e] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[B e76ada1] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abc.txt
+Switched to a new branch 'C'
+[C 0c196cf] C1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xyz.txt
+[C ea5d98c] C2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Trying simple merge with B
+Trying simple merge with C
+Merge made by the 'octopus' strategy.
+ abc.txt | 1 +
+ foo.txt | 2 +-
+ xyz.txt | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 abc.txt
+ create mode 100644 xyz.txt
+[A 3f4a8d1] A5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'C'
+[C f01c181] C3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[C 406947e] C4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Merge made by the 'ours' strategy.
+[A 691bdad] A7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up rev-list --graph test
 
-ok 75 - rev-list --branches=subspace/*
+expecting success of 6016.2 '--graph --all': 
+	check_graph --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
 
-expecting success of 6018.76 'rev-list --branches=subspace/': 
+ok 2 - --graph --all
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+expecting success of 6016.3 '--graph --simplify-by-decoration': 
+	git tag -d A4 &&
+	check_graph --all --simplify-by-decoration <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
 
+Deleted tag 'A4' (was c96d503)
+ok 3 - --graph --simplify-by-decoration
 
-ok 76 - rev-list --branches=subspace/
+expecting success of 6016.4 'setup: get rid of decorations on B': 
+	git tag -d B2 &&
+	git tag -d B1 &&
+	git branch -d B
 
-expecting success of 6018.77 'rev-list --branches=subspace': 
+Deleted tag 'B2' (was e76ada1)
+Deleted tag 'B1' (was 4accf7e)
+Deleted branch B (was e76ada1).
+ok 4 - setup: get rid of decorations on B
 
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+expecting success of 6016.5 '--graph --simplify-by-decoration prune branch B': 
+	check_graph --simplify-by-decoration --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	* | A4
+	|\|
+	| * C2
+	| * C1
+	* | A3
+	|/
+	* A2
+	* A1
+	EOF
 
+ok 5 - --graph --simplify-by-decoration prune branch B
 
-ok 77 - rev-list --branches=subspace
+expecting success of 6016.6 '--graph --full-history -- bar.txt': 
+	check_graph --full-history --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A4
+	|\|
+	* | A3
+	|/
+	* A2
+	EOF
 
-expecting success of 6018.78 'rev-list --branches': 
+ok 6 - --graph --full-history -- bar.txt
 
-	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
+expecting success of 6016.7 '--graph --full-history --simplify-merges -- bar.txt': 
+	check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A3
+	|/
+	* A2
+	EOF
 
+ok 7 - --graph --full-history --simplify-merges -- bar.txt
 
-ok 78 - rev-list --branches
+expecting success of 6016.8 '--graph -- bar.txt': 
+	check_graph --all -- bar.txt <<-\EOF
+	* A7
+	* A5
+	* A3
+	| * C4
+	|/
+	* A2
+	EOF
 
-expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
+ok 8 - --graph -- bar.txt
 
-	compare rev-list "main" "--glob=heads/someref/* main"
+expecting success of 6016.9 '--graph --sparse -- bar.txt': 
+	check_graph --sparse --all -- bar.txt <<-\EOF
+	* A7
+	* A6
+	* A5
+	* A4
+	* A3
+	| * C4
+	| * C3
+	| * C2
+	| * C1
+	|/
+	* A2
+	* A1
+	EOF
 
+ok 9 - --graph --sparse -- bar.txt
 
-ok 79 - rev-list --glob=heads/someref/* main
+expecting success of 6016.10 '--graph ^C4': 
+	check_graph --all ^C4 <<-\EOF
+	* A7
+	* A6
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
 
-expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
+ok 10 - --graph ^C4
 
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+expecting success of 6016.11 '--graph ^C3': 
+	check_graph --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
 
+ok 11 - --graph ^C3
 
-ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
+expecting success of 6016.12 '--graph --boundary ^C3': 
+	check_graph --boundary --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	| |
+	|  \
+	*-. \   A4
+	|\ \ \
+	| * | | B2
+	| * | | B1
+	* | | | A3
+	o | | | A2
+	|/ / /
+	o / / A1
+	 / /
+	| o C3
+	|/
+	o C2
+	EOF
 
-expecting success of 6018.81 'rev-list --glob=heads/*': 
+ok 12 - --graph --boundary ^C3
 
-	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6009-rev-list-parent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6009-rev-list-parent/.git/
+expecting success of 6009.1 'setup': 
 
+	touch file &&
+	git add file &&
 
-ok 81 - rev-list --glob=heads/*
+	test_commit one &&
 
-expecting success of 6018.82 'rev-list --tags=foo': 
+	test_tick=$(($test_tick - 2400)) &&
 
-	compare rev-list "foo/bar" "--tags=foo"
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
 
+	git log --pretty=oneline --abbrev-commit
 
-ok 82 - rev-list --tags=foo
-
-expecting success of 6018.83 'rev-list --tags': 
-
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
-
-
-ok 83 - rev-list --tags
-
-expecting success of 6018.84 'rev-list --remotes=foo': 
-
-	compare rev-list "foo/baz" "--remotes=foo"
-
-
-ok 84 - rev-list --remotes=foo
-
-expecting success of 6018.85 'rev-list --exclude with --branches': 
-	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
-
-ok 85 - rev-list --exclude with --branches
-
-expecting success of 6018.86 'rev-list --exclude with --all': 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 86 - rev-list --exclude with --all
-
-expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 87 - rev-list accumulates multiple --exclude
-
-expecting success of 6018.88 'rev-list should succeed with empty output on empty stdin': 
-	git rev-list --stdin </dev/null >actual &&
-	test_must_be_empty actual
-
-ok 88 - rev-list should succeed with empty output on empty stdin
-
-expecting success of 6018.89 'rev-list should succeed with empty output with all refs excluded': 
-	git rev-list --exclude=* --all >actual &&
-	test_must_be_empty actual
-
-ok 89 - rev-list should succeed with empty output with all refs excluded
-
-expecting success of 6018.90 'rev-list should succeed with empty output with empty --all': 
-	(
-		test_create_repo empty &&
-		cd empty &&
-		git rev-list --all >actual &&
-		test_must_be_empty actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 90 - rev-list should succeed with empty output with empty --all
-
-expecting success of 6018.91 'rev-list should succeed with empty output with empty glob': 
-	git rev-list --glob=does-not-match-anything >actual &&
-	test_must_be_empty actual
-
-ok 91 - rev-list should succeed with empty output with empty glob
-
-expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
-	git rev-list --ignore-missing $ZERO_OID >actual &&
-	test_must_be_empty actual
-
-ok 92 - rev-list should succeed with empty output when ignoring missing
-
-expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
-
-	compare shortlog "subspace/one subspace/two" --branches=subspace &&
-	compare shortlog \
-	  "main subspace-x someref other/three subspace/one subspace/two" \
-	  --branches &&
-	compare shortlog main "--glob=heads/someref/* main" &&
-	compare shortlog "subspace/one subspace/two other/three" \
-	  "--glob=heads/subspace/* --glob=heads/other/*" &&
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob=heads/*" &&
-	compare shortlog foo/bar --tags=foo &&
-	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
-	compare shortlog foo/baz --remotes=foo
-
-
-ok 93 - shortlog accepts --glob/--tags/--remotes
-
-checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
-
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob heads/*"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --[no-]committer  group by committer rather than author
-    -n, --[no-]numbered   sort output according to the number of commits per author
-    -s, --[no-]summary    suppress commit descriptions, only provides commit count
-    -e, --[no-]email      show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]] linewrap output
-    --[no-]group <field>  group by field
-
-not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
-
-checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
-
-	compare shortlog main "--glob -e main"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --[no-]committer  group by committer rather than author
-    -n, --[no-]numbered   sort output according to the number of commits per author
-    -s, --[no-]summary    suppress commit descriptions, only provides commit count
-    -e, --[no-]email      show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]] linewrap output
-    --[no-]group <field>  group by field
-
-not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
-
-# still have 4 known breakage(s)
-# passed all remaining 91 test(s)
-1..95
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6003-rev-list-topo-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6003-rev-list-topo-order/.git/
-expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
-ok 1 - rev-list has correct number of entries
-
-expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
-ok 2 - simple topo order
-
-expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
-ok 3 - simple date order
-
-expecting success of 6003.4 'simple author-date order': check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
-ok 4 - simple author-date order
-
-expecting success of 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
-ok 5 - two diamonds topo order (g6)
-
-expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
-ok 6 - multiple heads
-
-expecting success of 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
-ok 7 - multiple heads, prune at a1
-
-expecting success of 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
-ok 8 - multiple heads, prune at l1
-
-expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
-ok 9 - cross-epoch, head at l5, prune at l1
-
-expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
-ok 10 - duplicated head arguments
-
-expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
-ok 11 - prune near topo
-
-expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
-ok 12 - head has no parent
-
-expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
-ok 13 - two nodes - one head, one base
-
-expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
-ok 14 - three nodes one head, one internal, one base
-
-expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
-ok 15 - linear prune l2 ^root
-
-expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
-ok 16 - linear prune l2 ^l0
-
-expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
-ok 17 - linear prune l2 ^l1
-
-expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
-ok 18 - linear prune l5 ^a4
-
-expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
-ok 19 - linear prune l5 ^l3
-
-expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
-ok 20 - linear prune l5 ^l4
-
-expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
-ok 21 - max-count 10 - topo order
-
-expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
-ok 22 - max-count 10 - non topo order
-
-expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
-ok 23 - --max-age=c3, no --topo-order
-
-expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
-ok 24 - --max-age=c3, --topo-order
-
-expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
-ok 25 - one specified head reachable from another a4, c3, --topo-order
-
-expecting success of 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
-ok 26 - one specified head reachable from another c3, a4, --topo-order
-
-expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
-ok 27 - one specified head reachable from another a4, c3, no --topo-order
-
-expecting success of 6003.28 'one specified head reachable from another c3, a4, no --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
-ok 28 - one specified head reachable from another c3, a4, no --topo-order
-
-expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
-ok 29 - graph with c3 and a4 parents of head
-
-expecting success of 6003.30 'graph with a4 and c3 parents of head': check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
-ok 30 - graph with a4 and c3 parents of head
-
-expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
-ok 31 - head ^head --topo-order
-
-expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
-ok 32 - head ^head no --topo-order
-
-expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
-ok 33 - simple topo order (l5r1)
-
-expecting success of 6003.34 'simple topo order (r1l5)': check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
-ok 34 - simple topo order (r1l5)
-
-expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
-ok 35 - don't print things unreachable from one branch
-
-expecting success of 6003.36 '--topo-order a4 l3': check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
-ok 36 - --topo-order a4 l3
-
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6021-rev-list-exclude-hidden.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6021-rev-list-exclude-hidden/.git/
-expecting success of 6021.1 'setup': 
-	test_commit_bulk --id=commit --ref=refs/heads/branch 1 &&
-	COMMIT=$(git rev-parse refs/heads/branch) &&
-	test_commit_bulk --id=tag --ref=refs/tags/lightweight 1 &&
-	TAG=$(git rev-parse refs/tags/lightweight) &&
-	test_commit_bulk --id=hidden --ref=refs/hidden/commit 1 &&
-	HIDDEN=$(git rev-parse refs/hidden/commit) &&
-	test_commit_bulk --id=namespace --ref=refs/namespaces/namespace/refs/namespaced/commit 1 &&
-	NAMESPACE=$(git rev-parse refs/namespaces/namespace/refs/namespaced/commit)
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        225 /        225
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        220 /        220
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        228 /        228
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        235 /        235
----------------------------------------------------------------------
-
+[main (root-commit) e622cea] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 file
+ create mode 100644 one.t
+[main bfa07e2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main ecfa770] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[main 0906875] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+0906875 four
+ecfa770 three
+bfa07e2 two
+e622cea one
 ok 1 - setup
 
-expecting success of 6021.2 'invalid section': 
-	echo "fatal: unsupported section for hidden refs: unsupported" >expected &&
-	test_must_fail git rev-list --exclude-hidden=unsupported 2>err &&
-	test_cmp expected err
-
-ok 2 - invalid section
-
-expecting success of 6021.3 'fetch: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 3 - fetch: passed multiple times
-
-expecting success of 6021.4 'fetch: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 4 - fetch: without hiddenRefs
-
-expecting success of 6021.5 'fetch: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 5 - fetch: hidden via transfer.hideRefs
-
-expecting success of 6021.6 'fetch: hidden via fetch.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 6 - fetch: hidden via fetch.hideRefs
-
-expecting success of 6021.7 'fetch: respects both transfer.hideRefs and fetch.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 7 - fetch: respects both transfer.hideRefs and fetch.hideRefs
-
-expecting success of 6021.8 'fetch: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
-	
-ok 8 - fetch: negation without hidden refs marks everything as uninteresting
-
-expecting success of 6021.9 'fetch: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 9 - fetch: negation with hidden refs marks them as interesting
-
-expecting success of 6021.10 'fetch: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 10 - fetch: hidden refs and excludes work together
-
-expecting success of 6021.11 'fetch: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 11 - fetch: excluded hidden refs get reset
-
-expecting success of 6021.12 'fetch: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
-	
-ok 12 - fetch: excluded hidden refs can be used with multiple pseudo-refs
-
-expecting success of 6021.13 'fetch: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 13 - fetch: works with --glob
-
-expecting success of 6021.14 'fetch: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 14 - fetch: operates on stripped refs by default
-
-expecting success of 6021.15 'fetch: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 15 - fetch: does not hide namespace by default
-
-expecting success of 6021.16 'fetch: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 16 - fetch: can operate on unstripped refs
-
-expecting success of 6021.17 'fetch: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 17 - fetch: fails with --remotes
-
-expecting success of 6021.18 'fetch: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 18 - fetch: fails with --remotes=pattern
-
-expecting success of 6021.19 'fetch: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 19 - fetch: fails with --branches
-
-expecting success of 6021.20 'fetch: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 20 - fetch: fails with --branches=pattern
-
-expecting success of 6021.21 'fetch: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 21 - fetch: fails with --tags
-
-expecting success of 6021.22 'fetch: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 22 - fetch: fails with --tags=pattern
-
-expecting success of 6021.23 'receive: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 23 - receive: passed multiple times
-
-expecting success of 6021.24 'receive: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 24 - receive: without hiddenRefs
-
-expecting success of 6021.25 'receive: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 25 - receive: hidden via transfer.hideRefs
+expecting success of 6009.2 'one is ancestor of others and should not be shown': 
 
-expecting success of 6021.26 'receive: hidden via receive.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 26 - receive: hidden via receive.hideRefs
+	git rev-list one --not four >result &&
+	test_must_be_empty result
 
-expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
 
-expecting success of 6021.28 'receive: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
-	
-ok 28 - receive: negation without hidden refs marks everything as uninteresting
+ok 2 - one is ancestor of others and should not be shown
 
-expecting success of 6021.29 'receive: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 29 - receive: negation with hidden refs marks them as interesting
+expecting success of 6009.3 'setup roots, merges and octopuses': 
 
-expecting success of 6021.30 'receive: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 30 - receive: hidden refs and excludes work together
+	git checkout --orphan newroot &&
+	test_commit five &&
+	git checkout -b sidebranch two &&
+	test_commit six &&
+	git checkout -b anotherbranch three &&
+	test_commit seven &&
+	git checkout -b yetanotherbranch four &&
+	test_commit eight &&
+	git checkout main &&
+	test_tick &&
+	git merge --allow-unrelated-histories -m normalmerge newroot &&
+	git tag normalmerge &&
+	test_tick &&
+	git merge -m tripus sidebranch anotherbranch &&
+	git tag tripus &&
+	git checkout -b tetrabranch normalmerge &&
+	test_tick &&
+	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
+	git tag tetrapus &&
+	git checkout main
 
-expecting success of 6021.31 'receive: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 31 - receive: excluded hidden refs get reset
+Switched to a new branch 'newroot'
+[newroot (root-commit) 04238a1] five
+ Author: A U Thor <author@example.com>
+ 6 files changed, 5 insertions(+)
+ create mode 100644 file
+ create mode 100644 five.t
+ create mode 100644 four.t
+ create mode 100644 one.t
+ create mode 100644 three.t
+ create mode 100644 two.t
+Switched to a new branch 'sidebranch'
+[sidebranch e29a44f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+Switched to a new branch 'anotherbranch'
+[anotherbranch f863663] seven
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 seven.t
+Switched to a new branch 'yetanotherbranch'
+[yetanotherbranch 3e13a02] eight
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 eight.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Merge made by the 'octopus' strategy.
+ seven.t | 1 +
+ six.t   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to a new branch 'tetrabranch'
+Trying simple merge with sidebranch
+Trying simple merge with anotherbranch
+Trying simple merge with yetanotherbranch
+Merge made by the 'octopus' strategy.
+ eight.t | 1 +
+ seven.t | 1 +
+ six.t   | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 eight.t
+ create mode 100644 seven.t
+ create mode 100644 six.t
+Switched to branch 'main'
+ok 3 - setup roots, merges and octopuses
 
-expecting success of 6021.32 'receive: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
-	
-ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
+expecting success of 6009.4 'parse --max-parents & --min-parents': 
+	test_must_fail git rev-list --max-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
 
-expecting success of 6021.33 'receive: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 33 - receive: works with --glob
+	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
 
-expecting success of 6021.34 'receive: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 34 - receive: operates on stripped refs by default
+	git rev-list --max-parents=1 --min-parents=1 HEAD &&
+	git rev-list --max-parents=-1 --min-parents=-1 HEAD
 
-expecting success of 6021.35 'receive: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 35 - receive: does not hide namespace by default
+fatal: '1q': not an integer
+fatal: '1q': not an integer
+f8636639f2719cb5d0e52902e25dd79e31d50ebf
+e29a44f7344623c1769e6ebf2a1dff468d38b78e
+090687546dcc443852244b61eee29f6d293f6447
+ecfa7709bd4782513d04d58aeadcd786b62f6f3d
+bfa07e29ea06c68a502fde1833ec867767da4e32
+7e25eedf3aa367cb6d152df2cbc457e529654b85
+8d2f284dbf2c57c34df5b16a17e4d1ed01377311
+f8636639f2719cb5d0e52902e25dd79e31d50ebf
+e29a44f7344623c1769e6ebf2a1dff468d38b78e
+04238a19571066bf2ac4ee6374c2ec92ef588e0f
+090687546dcc443852244b61eee29f6d293f6447
+ecfa7709bd4782513d04d58aeadcd786b62f6f3d
+bfa07e29ea06c68a502fde1833ec867767da4e32
+e622cead7c16d37859f0b353313a4d83b5e9a6e5
+ok 4 - parse --max-parents & --min-parents
 
-expecting success of 6021.36 'receive: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 36 - receive: can operate on unstripped refs
+expecting success of 6009.5 'rev-list roots': 
 
-expecting success of 6021.37 'receive: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 37 - receive: fails with --remotes
+	check_revlist "--max-parents=0" one five
 
-expecting success of 6021.38 'receive: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - receive: fails with --remotes=pattern
+ok 5 - rev-list roots
 
-expecting success of 6021.39 'receive: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 39 - receive: fails with --branches
+expecting success of 6009.6 'rev-list no merges': 
 
-expecting success of 6021.40 'receive: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 40 - receive: fails with --branches=pattern
+	check_revlist "--max-parents=1" one eight seven six five four three two &&
+	check_revlist "--no-merges" one eight seven six five four three two
 
-expecting success of 6021.41 'receive: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 41 - receive: fails with --tags
+ok 6 - rev-list no merges
 
-expecting success of 6021.42 'receive: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 42 - receive: fails with --tags=pattern
+expecting success of 6009.7 'rev-list no octopuses': 
 
-expecting success of 6021.43 'uploadpack: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 43 - uploadpack: passed multiple times
+	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
 
-expecting success of 6021.44 'uploadpack: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 44 - uploadpack: without hiddenRefs
+ok 7 - rev-list no octopuses
 
-expecting success of 6021.45 'uploadpack: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 45 - uploadpack: hidden via transfer.hideRefs
+expecting success of 6009.8 'rev-list no roots': 
 
-expecting success of 6021.46 'uploadpack: hidden via uploadpack.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 46 - uploadpack: hidden via uploadpack.hideRefs
+	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
 
-expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
+ok 8 - rev-list no roots
 
-expecting success of 6021.48 'uploadpack: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
-	
-ok 48 - uploadpack: negation without hidden refs marks everything as uninteresting
+expecting success of 6009.9 'rev-list merges': 
 
-expecting success of 6021.49 'uploadpack: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 49 - uploadpack: negation with hidden refs marks them as interesting
+	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
+	check_revlist "--merges" tetrapus tripus normalmerge
 
-expecting success of 6021.50 'uploadpack: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 50 - uploadpack: hidden refs and excludes work together
+ok 9 - rev-list merges
 
-expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 51 - uploadpack: excluded hidden refs get reset
+expecting success of 6009.10 'rev-list octopus': 
 
-expecting success of 6021.52 'uploadpack: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
-	
-ok 52 - uploadpack: excluded hidden refs can be used with multiple pseudo-refs
+	check_revlist "--min-parents=3" tetrapus tripus
 
-expecting success of 6021.53 'uploadpack: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 53 - uploadpack: works with --glob
+ok 10 - rev-list octopus
 
-expecting success of 6021.54 'uploadpack: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 54 - uploadpack: operates on stripped refs by default
+expecting success of 6009.11 'rev-list ordinary commits': 
 
-expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 55 - uploadpack: does not hide namespace by default
+	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
 
-expecting success of 6021.56 'uploadpack: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 56 - uploadpack: can operate on unstripped refs
+ok 11 - rev-list ordinary commits
 
-expecting success of 6021.57 'uploadpack: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 57 - uploadpack: fails with --remotes
+expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
 
-expecting success of 6021.58 'uploadpack: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 58 - uploadpack: fails with --remotes=pattern
+	check_revlist "--min-parents=2 --no-merges" &&
+	check_revlist "--merges --no-merges" &&
+	check_revlist "--no-merges --merges"
 
-expecting success of 6021.59 'uploadpack: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 59 - uploadpack: fails with --branches
+ok 12 - rev-list --merges --no-merges yields empty set
 
-expecting success of 6021.60 'uploadpack: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 60 - uploadpack: fails with --branches=pattern
+expecting success of 6009.13 'rev-list override and infinities': 
 
-expecting success of 6021.61 'uploadpack: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 61 - uploadpack: fails with --tags
+	check_revlist "--min-parents=2 --max-parents=1 --max-parents=3" tripus normalmerge &&
+	check_revlist "--min-parents=1 --min-parents=2 --max-parents=7" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --max-parents=8" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --max-parents=-1" tetrapus tripus normalmerge &&
+	check_revlist "--min-parents=2 --no-max-parents" tetrapus tripus normalmerge &&
+	check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
 
-expecting success of 6021.62 'uploadpack: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 62 - uploadpack: fails with --tags=pattern
+ok 13 - rev-list override and infinities
 
-# passed all 62 test(s)
-1..62
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t5616-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/.git/
-expecting success of 5616.1 'setup normal src repo': 
-	echo "{print \$1}" >print_1.awk &&
-	echo "{print \$2}" >print_2.awk &&
+expecting success of 6009.14 'dodecapus': 
 
-	git init src &&
-	for n in 1 2 3 4
+	roots= &&
+	for i in 1 2 3 4 5 6 7 8 9 10 11
 	do
-		echo "This is file: $n" > src/file.$n.txt &&
-		git -C src add file.$n.txt &&
-		git -C src commit -m "file $n" &&
-		git -C src ls-files -s file.$n.txt >>temp || return 1
+		git checkout -b root$i five &&
+		test_commit $i &&
+		roots="$roots root$i" ||
+		return 1
 	done &&
-	awk -f print_2.awk <temp | sort >expect_1.oids &&
-	test_line_count = 4 expect_1.oids
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) a042509] file 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1.txt
-[main 6a6b7aa] file 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2.txt
-[main 2b2f6e6] file 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3.txt
-[main aeb0144] file 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4.txt
-ok 1 - setup normal src repo
-
-expecting success of 5616.2 'setup bare clone for server': 
-	git clone --bare "file://$(pwd)/src" srv.bare &&
-	git -C srv.bare config --local uploadpack.allowfilter 1 &&
-	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
-
-Cloning into bare repository 'srv.bare'...
-ok 2 - setup bare clone for server
-
-expecting success of 5616.3 'do partial clone 1': 
-	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_cmp expect_1.oids observed.oids &&
-	test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
-	test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
-	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
-
-Cloning into 'pc1'...
-ok 3 - do partial clone 1
-
-expecting success of 5616.4 'rev-list --missing=allow-promisor on partial clone': 
-	git -C pc1 rev-list --objects --missing=allow-promisor HEAD >actual &&
-	git -C pc1 rev-list --objects --missing=print HEAD >expect.raw &&
-	grep -v "^?" expect.raw >expect &&
-	test_cmp expect actual
-
-ok 4 - rev-list --missing=allow-promisor on partial clone
-
-expecting success of 5616.5 'verify that .promisor file contains refs fetched': 
-	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
-	test_line_count = 1 promisorlist &&
-	git -C srv.bare rev-parse --verify HEAD >headhash &&
-	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
-	grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
-
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 HEAD
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 refs/heads/main
-ok 5 - verify that .promisor file contains refs fetched
-
-expecting success of 5616.6 'verify checkout with dynamic object fetch': 
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 4 observed &&
-	git -C pc1 checkout main &&
-	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
-	test_line_count = 0 observed
-
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-ok 6 - verify checkout with dynamic object fetch
+	git checkout main &&
+	test_tick &&
+	git merge -m dodecapus $roots &&
+	git tag dodecapus &&
 
-expecting success of 5616.7 'push new commits to server': 
-	git -C src remote add srv "file://$(pwd)/srv.bare" &&
-	for x in a b c d e
-	do
-		echo "Mod file.1.txt $x" >>src/file.1.txt &&
-		git -C src add file.1.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src blame main -- file.1.txt >expect.blame &&
-	git -C src push -u srv main
+	check_revlist "--min-parents=4" dodecapus tetrapus &&
+	check_revlist "--min-parents=8" dodecapus &&
+	check_revlist "--min-parents=12" dodecapus &&
+	check_revlist "--min-parents=13" &&
+	check_revlist "--min-parents=4 --max-parents=11" tetrapus
 
-[main b4a5c87] mod a
+Switched to a new branch 'root1'
+[root1 9562ee3] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 2260bed] mod b
+ create mode 100644 1.t
+Switched to a new branch 'root2'
+[root2 1779fe6] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 85d45de] mod c
+ create mode 100644 2.t
+Switched to a new branch 'root3'
+[root3 cc9911e] 3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main f571048] mod d
+ create mode 100644 3.t
+Switched to a new branch 'root4'
+[root4 35b702f] 4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main d0edb11] mod e
+ create mode 100644 4.t
+Switched to a new branch 'root5'
+[root5 c532809] 5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   aeb0144..d0edb11  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 7 - push new commits to server
-
-expecting success of 5616.8 'partial fetch inherits filter settings': 
-	git -C pc1 fetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 5 observed
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   aeb0144..d0edb11  main       -> origin/main
-ok 8 - partial fetch inherits filter settings
-
-expecting success of 5616.9 'verify diff causes dynamic object fetch': 
-	git -C pc1 diff main..origin/main -- file.1.txt &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 main..origin/main >observed &&
-	test_line_count = 4 observed
-
-diff --git a/file.1.txt b/file.1.txt
-index 54ff69b..5cc7250 100644
---- a/file.1.txt
-+++ b/file.1.txt
-@@ -1 +1,6 @@
- This is file: 1
-+Mod file.1.txt a
-+Mod file.1.txt b
-+Mod file.1.txt c
-+Mod file.1.txt d
-+Mod file.1.txt e
-ok 9 - verify diff causes dynamic object fetch
-
-expecting success of 5616.10 'verify blame causes dynamic object fetch': 
-	git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
-	test_cmp expect.blame observed.blame &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
-
-ok 10 - verify blame causes dynamic object fetch
-
-expecting success of 5616.11 'push new commits to server for file.2.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.2.txt $x" >>src/file.2.txt &&
-		git -C src add file.2.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src push -u srv main
-
-[main 50dbe65] mod a
+ create mode 100644 5.t
+Switched to a new branch 'root6'
+[root6 f4a589f] 6
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 71d1ab3] mod b
+ create mode 100644 6.t
+Switched to a new branch 'root7'
+[root7 4f77507] 7
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main c2c95e9] mod c
+ create mode 100644 7.t
+Switched to a new branch 'root8'
+[root8 e4dbc7d] 8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 95992c5] mod d
+ create mode 100644 8.t
+Switched to a new branch 'root9'
+[root9 446b36e] 9
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main ac0a329] mod e
+ create mode 100644 9.t
+Switched to a new branch 'root10'
+[root10 120147b] 10
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 03262f2] mod f
+ create mode 100644 10.t
+Switched to a new branch 'root11'
+[root11 ce99f6d] 11
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   d0edb11..03262f2  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 11 - push new commits to server for file.2.txt
-
-expecting success of 5616.12 'override inherited filter-spec using --no-filter': 
-	git -C pc1 fetch --no-filter origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
+ create mode 100644 11.t
+Switched to branch 'main'
+Trying simple merge with root1
+Trying simple merge with root2
+Trying simple merge with root3
+Trying simple merge with root4
+Trying simple merge with root5
+Trying simple merge with root6
+Trying simple merge with root7
+Trying simple merge with root8
+Trying simple merge with root9
+Trying simple merge with root10
+Trying simple merge with root11
+Merge made by the 'octopus' strategy.
+ 1.t  | 1 +
+ 10.t | 1 +
+ 11.t | 1 +
+ 2.t  | 1 +
+ 3.t  | 1 +
+ 4.t  | 1 +
+ 5.t  | 1 +
+ 6.t  | 1 +
+ 7.t  | 1 +
+ 8.t  | 1 +
+ 9.t  | 1 +
+ 11 files changed, 11 insertions(+)
+ create mode 100644 1.t
+ create mode 100644 10.t
+ create mode 100644 11.t
+ create mode 100644 2.t
+ create mode 100644 3.t
+ create mode 100644 4.t
+ create mode 100644 5.t
+ create mode 100644 6.t
+ create mode 100644 7.t
+ create mode 100644 8.t
+ create mode 100644 9.t
+ok 14 - dodecapus
 
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   d0edb11..03262f2  main       -> origin/main
-ok 12 - override inherited filter-spec using --no-filter
+expecting success of 6009.15 'ancestors with the same commit time': 
 
-expecting success of 5616.13 'push new commits to server for file.3.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.3.txt $x" >>src/file.3.txt &&
-		git -C src add file.3.txt &&
-		git -C src commit -m "mod $x" || return 1
+	test_tick_keep=$test_tick &&
+	for i in 1 2 3 4 5 6 7 8; do
+		test_tick=$test_tick_keep &&
+		test_commit t$i || return 1
 	done &&
-	git -C src push -u srv main
+	git rev-list t1^! --not t$i >result &&
+	test_must_be_empty result
 
-[main 2456429] mod a
+[main 1bc0b48] t1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main f359f06] mod b
+ create mode 100644 t1.t
+[main 145e5ab] t2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main ed3a9d1] mod c
+ create mode 100644 t2.t
+[main 17e63bf] t3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 42a1e60] mod d
+ create mode 100644 t3.t
+[main 47d7b66] t4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 2827aa8] mod e
+ create mode 100644 t4.t
+[main a42aaab] t5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main 3f5edd7] mod f
+ create mode 100644 t5.t
+[main aebfe15] t6
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   03262f2..3f5edd7  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 13 - push new commits to server for file.3.txt
-
-expecting success of 5616.14 'manual prefetch of missing objects': 
-	git -C pc1 fetch --filter=blob:none origin &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		 main..origin/main >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_line_count = 6 observed.oids &&
-	git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
-
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed.oids &&
-
-	test_line_count = 0 observed.oids
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   03262f2..3f5edd7  main       -> origin/main
-remote: Enumerating objects: 6, done.        
-remote: Counting objects:  16% (1/6)        
remote: Counting objects:  33% (2/6)        
remote: Counting objects:  50% (3/6)        
remote: Counting objects:  66% (4/6)        
remote: Counting objects:  83% (5/6)        
remote: Counting objects: 100% (6/6)        
remote: Counting objects: 100% (6/6), done.        
-remote: Compressing objects:  20% (1/5)        
remote: Compressing objects:  40% (2/5)        
remote: Compressing objects:  60% (3/5)        
remote: Compressing objects:  80% (4/5)        
remote: Compressing objects: 100% (5/5)        
remote: Compressing objects: 100% (5/5), done.        
-remote: Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)        
-7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
-7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
-7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
-9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
-a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
-e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
-ok 14 - manual prefetch of missing objects
-
-expecting success of 5616.15 'push new commits to server for file.4.txt': 
-	for x in a b c d e f
-	do
-		echo "Mod file.4.txt $x" >src/file.4.txt &&
-		if list_contains "a,b" "$x"; then
-			printf "%10000s" X >>src/file.4.txt
-		fi &&
-		if list_contains "c,d" "$x"; then
-			printf "%20000s" X >>src/file.4.txt
-		fi &&
-		git -C src add file.4.txt &&
-		git -C src commit -m "mod $x" || return 1
-	done &&
-	git -C src push -u srv main
-
-[main e9880ed] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-[main b08fb33] mod b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main dc63000] mod c
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-[main d79e7f2] mod d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0e6343d] mod e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-[main 129c8a2] mod f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   3f5edd7..129c8a2  main -> main
-branch 'main' set up to track 'srv/main'.
-ok 15 - push new commits to server for file.4.txt
-
-expecting success of 5616.16 'apply a different filter using --refetch': 
-	git -C pc1 fetch --filter=blob:limit=999 origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 4 observed &&
-
-	git -C pc1 fetch --filter=blob:limit=19999 --refetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 2 observed &&
-
-	git -c protocol.version=0 -C pc1 fetch --filter=blob:limit=29999 \
-		--refetch origin &&
-	git -C pc1 rev-list --quiet --objects --missing=print \
-		main..origin/main >observed &&
-	test_line_count = 0 observed
-
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   3f5edd7..129c8a2  main       -> origin/main
-ok 16 - apply a different filter using --refetch
-
-expecting success of 5616.17 'fetch --refetch works with a shallow clone': 
-	git clone --no-checkout --depth=1 --filter=blob:none "file://$(pwd)/srv.bare" pc1s &&
-	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
-	test_line_count = 6 observed &&
-
-	GIT_TRACE=1 git -C pc1s fetch --filter=blob:limit=999 --refetch origin &&
-	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
-	test_line_count = 6 observed
-
-Cloning into 'pc1s'...
-trace: built-in: git fetch --filter=blob:limit=999 --refetch origin
-trace: run_command: unset GIT_PREFIX; GIT_PROTOCOL=version=2 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\'''
-trace: start_command: /bin/sh -c 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\''' 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\'''
-trace: built-in: git upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'
-trace: run_command: git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
-remote: trace: built-in: git pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999        
-trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin --promisor --pack_header=2,6
-trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
-run_processes_parallel: preparing to run up to 1 tasks
-run_processes_parallel: done
-trace: run_command: git maintenance run --auto --no-quiet --detach
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git maintenance run --auto --no-quiet --detach
-trace: built-in: git maintenance run --auto --no-quiet --detach
-ok 17 - fetch --refetch works with a shallow clone
-
-expecting success of 5616.18 'fetch --refetch triggers repacking': 
-	GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
-	export GIT_TRACE2_CONFIG_PARAMS &&
-
-	GIT_TRACE2_EVENT="$PWD/trace1.event" \
-	git -C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace1.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
-
-	GIT_TRACE2_EVENT="$PWD/trace2.event" \
-	git -c protocol.version=0 \
-		-c gc.autoPackLimit=0 \
-		-c maintenance.incremental-repack.auto=1234 \
-		-C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace2.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
-
-	GIT_TRACE2_EVENT="$PWD/trace3.event" \
-	git -c protocol.version=0 \
-		-c gc.autoPackLimit=1234 \
-		-c maintenance.incremental-repack.auto=0 \
-		-C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet --detach <trace3.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
-
-{"event":"child_start","sid":"20260419T192159.148892Z-H8d819085-P001fbfef","thread":"main","time":"2026-04-19T19:21:59.275721Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260419T192159.148892Z-H8d819085-P001fbfef/20260419T192159.287761Z-H8d819085-P001fc067","thread":"main","time":"2026-04-19T19:21:59.288297Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260419T192159.148892Z-H8d819085-P001fbfef/20260419T192159.287761Z-H8d819085-P001fc067/20260419T192159.315710Z-H8d819085-P001fc082","thread":"main","time":"2026-04-19T19:21:59.316003Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260419T192159.148892Z-H8d819085-P001fbfef/20260419T192159.287761Z-H8d819085-P001fc067","thread":"main","time":"2026-04-19T19:21:59.288302Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20260419T192159.148892Z-H8d819085-P001fbfef/20260419T192159.287761Z-H8d819085-P001fc067/20260419T192159.315710Z-H8d819085-P001fc082","thread":"main","time":"2026-04-19T19:21:59.316008Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20260419T192159.148892Z-H8d819085-P001fbfef/20260419T192159.287761Z-H8d819085-P001fc067/20260419T192159.315710Z-H8d819085-P001fc082/20260419T192159.327746Z-H8d819085-P001fc08f","thread":"main","time":"2026-04-19T19:21:59.328070Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20260419T192159.340318Z-H8d819085-P001fc09c","thread":"main","time":"2026-04-19T19:21:59.507816Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260419T192159.340318Z-H8d819085-P001fc09c","thread":"main","time":"2026-04-19T19:21:59.340847Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260419T192159.340318Z-H8d819085-P001fc09c/20260419T192159.439775Z-H8d819085-P001fc0f1","thread":"main","time":"2026-04-19T19:21:59.440326Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260419T192159.340318Z-H8d819085-P001fc09c/20260419T192159.439775Z-H8d819085-P001fc0f1/20260419T192159.491626Z-H8d819085-P001fc11e","thread":"main","time":"2026-04-19T19:21:59.492191Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260419T192159.340318Z-H8d819085-P001fc09c/20260419T192159.531667Z-H8d819085-P001fc148","thread":"main","time":"2026-04-19T19:21:59.532185Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20260419T192159.340318Z-H8d819085-P001fc09c/20260419T192159.531667Z-H8d819085-P001fc148","thread":"main","time":"2026-04-19T19:21:59.532194Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20260419T192159.636163Z-H8d819085-P001fc197","thread":"main","time":"2026-04-19T19:21:59.811959Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197/20260419T192159.823827Z-H8d819085-P001fc251","thread":"main","time":"2026-04-19T19:21:59.824376Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197","thread":"main","time":"2026-04-19T19:21:59.636691Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197/20260419T192159.759776Z-H8d819085-P001fc217","thread":"main","time":"2026-04-19T19:21:59.760296Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197/20260419T192159.759776Z-H8d819085-P001fc217/20260419T192159.799878Z-H8d819085-P001fc240","thread":"main","time":"2026-04-19T19:21:59.800432Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197/20260419T192159.823827Z-H8d819085-P001fc251","thread":"main","time":"2026-04-19T19:21:59.824373Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20260419T192159.636163Z-H8d819085-P001fc197/20260419T192159.823827Z-H8d819085-P001fc251/20260419T192159.859196Z-H8d819085-P001fc26e","thread":"main","time":"2026-04-19T19:21:59.859505Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-ok 18 - fetch --refetch triggers repacking
-
-expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
-	test_create_repo submodule &&
-	test_commit -C submodule mycommit &&
-
-	test_create_repo src_with_sub &&
-	git -C src_with_sub config uploadpack.allowfilter 1 &&
-	git -C src_with_sub config uploadpack.allowanysha1inwant 1 &&
-
-	test_config_global protocol.file.allow always &&
-
-	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
-	git -C src_with_sub commit -m "commit with submodule" &&
-
-	git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
-	test_when_finished rm -rf dst
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/submodule/.git/
-[main (root-commit) 35ce5a7] mycommit
+ create mode 100644 t6.t
+[main 7cfb595] t7
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 mycommit.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src_with_sub/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
-[main (root-commit) 2413c86] commit with submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 mysub
-Cloning into 'dst'...
-ok 19 - partial clone with transfer.fsckobjects=1 works with submodules
-
-expecting success of 5616.20 'lazily fetched .gitmodules works': 
-	git clone --filter="blob:none" --no-checkout "file://$(pwd)/src_with_sub" dst &&
-	git -C dst fetch &&
-	test_when_finished rm -rf dst
-
-Cloning into 'dst'...
-ok 20 - lazily fetched .gitmodules works
-
-expecting success of 5616.21 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects': 
-	git init src &&
-	test_commit -C src x &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
-
-	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src" dst &&
-	grep "git index-pack.*--fsck-objects" trace
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
-[main 1fb08d4] x
+ create mode 100644 t7.t
+[main fea5200] t8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Cloning into 'dst'...
-trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 2082667 on codethink03-arm64' --promisor --fsck-objects
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin '--keep=fetch-pack 2082667 on codethink03-arm64' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 2082667 on codethink03-arm64' --promisor --fsck-objects
-trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
-ok 21 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
-
-expecting success of 5616.22 'use fsck before and after manually fetching a missing subtree': 
-	# push new commit so server has a subtree
-	mkdir src/dir &&
-	echo "in dir" >src/dir/file.txt &&
-	git -C src add dir/file.txt &&
-	git -C src commit -m "file in dir" &&
-	git -C src push -u srv main &&
-	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
-
-	rm -rf dst &&
-	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
-	git -C dst fsck &&
+ create mode 100644 t8.t
+ok 15 - ancestors with the same commit time
 
-	# Make sure we only have commits, and all trees and blobs are missing.
-	git -C dst rev-list --missing=allow-any --objects main \
-		>fetched_objects &&
-	awk -f print_1.awk fetched_objects |
-	xargs -n1 git -C dst cat-file -t >fetched_types &&
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6010-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6010-merge-base/.git/
+expecting success of 6010.1 'setup': 
+	T=$(git mktree </dev/null)
 
-	sort -u fetched_types >unique_types.observed &&
-	echo commit >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed &&
+ok 1 - setup
 
-	# Auto-fetch a tree with cat-file.
-	git -C dst cat-file -p $SUBTREE >tree_contents &&
-	grep file.txt tree_contents &&
+expecting success of 6010.2 'set up G and H': 
+	# E---D---C---B---A
+	# \"-_         \   \
+	#  \  `---------G   \
+	#   \                \
+	#    F----------------H
+	E=$(doit 5 E) &&
+	D=$(doit 4 D $E) &&
+	F=$(doit 6 F $E) &&
+	C=$(doit 3 C $D) &&
+	B=$(doit 2 B $C) &&
+	A=$(doit 1 A $B) &&
+	G=$(doit 7 G $B $E) &&
+	H=$(doit 8 H $A $F)
 
-	# fsck still works after an auto-fetch of a tree.
-	git -C dst fsck &&
+ok 2 - set up G and H
 
-	# Auto-fetch all remaining trees and blobs with --missing=error
-	git -C dst rev-list --missing=error --objects main >fetched_objects &&
-	test_line_count = 88 fetched_objects &&
+expecting success of 6010.3 'merge-base G H': 
+	git name-rev $B >expected &&
 
-	awk -f print_1.awk fetched_objects |
-	xargs -n1 git -C dst cat-file -t >fetched_types &&
+	MB=$(git merge-base G H) &&
+	git name-rev "$MB" >actual.single &&
 
-	sort -u fetched_types >unique_types.observed &&
-	test_write_lines blob commit tree >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed
+	MB=$(git merge-base --all G H) &&
+	git name-rev "$MB" >actual.all &&
 
-[main 957c60b] file in dir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/file.txt
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   129c8a2..957c60b  main -> main
-branch 'main' set up to track 'srv/main'.
-Cloning into 'dst'...
-100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
-dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
-ok 22 - use fsck before and after manually fetching a missing subtree
+	MB=$(git show-branch --merge-base G H) &&
+	git name-rev "$MB" >actual.sb &&
 
-expecting success of 5616.23 'implicitly construct combine: filter with repeated flags': 
-	GIT_TRACE=$(pwd)/trace git clone --bare \
-		--filter=blob:none --filter=tree:1 \
-		"file://$(pwd)/srv.bare" pc2 &&
-	grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
-		trace &&
-	git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all &&
+	test_cmp expected actual.sb
 
-	# We should have gotten some root trees.
-	grep " $" objects &&
-	# Should not have gotten any non-root trees or blobs.
-	! grep " ." objects &&
+ok 3 - merge-base G H
 
-	xargs -n 1 git -C pc2 cat-file -t <objects >types &&
-	sort -u types >unique_types.actual &&
-	test_write_lines commit tree >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.actual
+expecting success of 6010.4 'merge-base/show-branch --independent': 
+	git name-rev "$H" >expected1 &&
+	git name-rev "$H" "$G" >expected2 &&
 
-Cloning into bare repository 'pc2'...
-trace: run_command: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
-trace: built-in: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
-849950ea25ea502730806953150a8b29fbc04fd1 
-5e06b9e5aed2904563066a6d041bd48487b00cba 
-94a1afd9afa4ab1486352ab1c059762e3e872ce4 
-e77db3bdb5e7e6af01bd93bcd0f99a69d939d0aa 
-e6f42a769ea1225565ede9aa9e708186165aad4c 
-7eaccd314b25541fb2e12c6a9041510af10e1518 
-fdb7f75e829001ecb4ca2d6217d7fd04457e275c 
-f0075f67c4ce0cc5963de5143fb89b89762976ea 
-e891efadd67ca0c01b1c518a2fd91130d40f5904 
-b1ada3a7551c02bc311cab409bcdb3210cc0db2b 
-a00681e4a08fb4916de7e62d89de5b662ef1860a 
-6a1c4b6f6db25436faf11feadebfa98132273db5 
-a7d56826180d177dcd33e04e00c6ae488eda8dd2 
-91d0f663d7a546b2e8dfad2b8298f743aae0b020 
-ddb185bb2b7d210636855cd4f053ea8ff15c8f1c 
-974a5d9aee9b30da804ae932f36ed0eb7f5a2c50 
-2ce2a26473b0751a79d9c42a2a4480fa73fe4f15 
-f7e2c683a7004d4fb81563ae0a3087442db18354 
-26f5e35d8a7ae9658923cf3ccdfc19c86a3e1424 
-4c015c7e720cb846212f85d6513eaf497ea021fe 
-b1d4c4f82f23b1f0779bc7e8f360950eaab333da 
-aa3aad2daa2266f2379fa0b387e0c47ce7fc59bd 
-5768e37e39ded4ab416a0e61f824cad46e996fec 
-3a35e4cd4fbd2d3dbcd056d0e997a47518d10432 
-3246c304205324149983025431c5211438f41931 
-dfce1aed58f95775a6963107c4471a9f0bfff6e6 
-25c201430fa73e4f524ad53e88ef255c807b27e0 
-aa8fcdda393dec1e72abbb7f868b7d971b730a19 
-3f2b9ee6d5378134943b47172ba029ae46a49419 
-ok 23 - implicitly construct combine: filter with repeated flags
+	parents=$(git merge-base --independent H) &&
+	git name-rev $parents >actual1.mb &&
+	parents=$(git merge-base --independent A H G) &&
+	git name-rev $parents >actual2.mb &&
 
-expecting success of 5616.24 'upload-pack complains of bogus filter config': 
-	printf 0000 |
-	test_must_fail git \
-		-c uploadpackfilter.tree.maxdepth \
-		upload-pack . >/dev/null 2>err &&
-	test_grep "unable to parse.*tree.maxdepth" err
+	parents=$(git show-branch --independent H) &&
+	git name-rev $parents >actual1.sb &&
+	parents=$(git show-branch --independent A H G) &&
+	git name-rev $parents >actual2.sb &&
 
-fatal: unable to parse 'uploadpackfilter.tree.maxdepth' from command-line config
-ok 24 - upload-pack complains of bogus filter config
+	test_cmp expected1 actual1.mb &&
+	test_cmp expected2 actual2.mb &&
+	test_cmp expected1 actual1.sb &&
+	test_cmp expected2 actual2.sb
 
-expecting success of 5616.25 'upload-pack fails banned object filters': 
-	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
+ok 4 - merge-base/show-branch --independent
 
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 25 - upload-pack fails banned object filters
+expecting success of 6010.5 'unsynchronized clocks': 
+	# This test is to demonstrate that relying on timestamps in a distributed
+	# SCM to provide a _consistent_ partial ordering of commits leads to
+	# insanity.
+	#
+	#               Relative
+	# Structure     timestamps
+	#
+	#   PL  PR        +4  +4
+	#  /  \/  \      /  \/  \
+	# L2  C2  R2    +3  -1  +3
+	# |   |   |     |   |   |
+	# L1  C1  R1    +2  -2  +2
+	# |   |   |     |   |   |
+	# L0  C0  R0    +1  -3  +1
+	#   \ |  /        \ |  /
+	#     S             0
+	#
+	# The left and right chains of commits can be of any length and complexity as
+	# long as all of the timestamps are greater than that of S.
 
-expecting success of 5616.26 'upload-pack fails banned combine object filters': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_config -C srv.bare uploadpackfilter.combine.allow true &&
-	test_config -C srv.bare uploadpackfilter.tree.allow true &&
-	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
-		--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
+	S=$(doit  0 S) &&
 
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 26 - upload-pack fails banned combine object filters
+	C0=$(doit -3 C0 $S) &&
+	C1=$(doit -2 C1 $C0) &&
+	C2=$(doit -1 C2 $C1) &&
 
-expecting success of 5616.27 'upload-pack fails banned object filters with fallback': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "filter 'blob:none' not supported" err
+	L0=$(doit  1 L0 $S) &&
+	L1=$(doit  2 L1 $L0) &&
+	L2=$(doit  3 L2 $L1) &&
 
-fatal: filter 'blob:none' not supported
-fatal: remote error: filter 'blob:none' not supported
-ok 27 - upload-pack fails banned object filters with fallback
+	R0=$(doit  1 R0 $S) &&
+	R1=$(doit  2 R1 $R0) &&
+	R2=$(doit  3 R2 $R1) &&
 
-expecting success of 5616.28 'upload-pack limits tree depth filters': 
-	test_config -C srv.bare uploadpackfilter.allow false &&
-	test_config -C srv.bare uploadpackfilter.tree.allow true &&
-	test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
-		"file://$(pwd)/srv.bare" pc3 2>err &&
-	test_grep "tree filter allows max depth 0, but got 1" err &&
+	PL=$(doit  4 PL $L2 $C2) &&
+	PR=$(doit  4 PR $C2 $R2) &&
 
-	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
+	git name-rev $C2 >expected &&
 
-	test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
-	git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
-	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
-		"file://$(pwd)/srv.bare" pc6 2>err &&
-	test_grep "tree filter allows max depth 5, but got 6" err
+	MB=$(git merge-base PL PR) &&
+	git name-rev "$MB" >actual.single &&
 
-fatal: tree filter allows max depth 0, but got 1
-fatal: remote error: tree filter allows max depth 0, but got 1
-Cloning into 'pc4'...
-Cloning into 'pc5'...
-fatal: tree filter allows max depth 5, but got 6
-fatal: remote error: tree filter allows max depth 5, but got 6
-ok 28 - upload-pack limits tree depth filters
+	MB=$(git merge-base --all PL PR) &&
+	git name-rev "$MB" >actual.all &&
 
-expecting success of 5616.29 'partial clone fetches blobs pointed to by refs even if normally filtered out': 
-	rm -rf src dst &&
-	git init src &&
-	test_commit -C src x &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all
 
-	# Create a tag pointing to a blob.
-	BLOB=$(echo blob-contents | git -C src hash-object --stdin -w) &&
-	git -C src tag myblob "$BLOB" &&
+ok 5 - unsynchronized clocks
 
-	git clone --filter="blob:none" "file://$(pwd)/src" dst 2>err &&
-	! grep "does not point to a valid object" err &&
-	git -C dst fsck
+expecting success of 6010.6 '--independent with unsynchronized clocks': 
+	IB=$(doit 0 IB) &&
+	I1=$(doit -10 I1 $IB) &&
+	I2=$(doit  -9 I2 $I1) &&
+	I3=$(doit  -8 I3 $I2) &&
+	I4=$(doit  -7 I4 $I3) &&
+	I5=$(doit  -6 I5 $I4) &&
+	I6=$(doit  -5 I6 $I5) &&
+	I7=$(doit  -4 I7 $I6) &&
+	I8=$(doit  -3 I8 $I7) &&
+	IH=$(doit  -2 IH $I8) &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) d63d3b7] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-ok 29 - partial clone fetches blobs pointed to by refs even if normally filtered out
+	echo $IH >expected &&
+	git merge-base --independent IB IH >actual &&
+	test_cmp expected actual
 
-expecting success of 5616.30 'fetch what is specified on CLI even if already promised': 
-	rm -rf src dst.git &&
-	git init src &&
-	test_commit -C src foo &&
-	test_config -C src uploadpack.allowfilter 1 &&
-	test_config -C src uploadpack.allowanysha1inwant 1 &&
+ok 6 - --independent with unsynchronized clocks
 
-	git hash-object --stdin <src/foo.t >blob &&
+expecting success of 6010.7 'merge-base for octopus-step (setup)': 
+	# Another set to demonstrate base between one commit and a merge
+	# in the documentation.
+	#
+	# * C (MMC) * B (MMB) * A  (MMA)
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       | _______/
+	# |         |/
+	# |         * 1 (MM1)
+	# | _______/
+	# |/
+	# * root (MMR)
 
-	git clone --bare --filter=blob:none "file://$(pwd)/src" dst.git &&
-	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_before &&
-	grep "?$(cat blob)" missing_before &&
-	git -C dst.git fetch origin $(cat blob) &&
-	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_after &&
-	! grep "?$(cat blob)" missing_after
+	test_commit MMR &&
+	test_commit MM1 &&
+	test_commit MM-o &&
+	test_commit MM-p &&
+	test_commit MM-q &&
+	test_commit MMA &&
+	git checkout MM1 &&
+	test_commit MM-r &&
+	test_commit MM-s &&
+	test_commit MM-t &&
+	test_commit MMB &&
+	git checkout MMR &&
+	test_commit MM-u &&
+	test_commit MM-v &&
+	test_commit MM-w &&
+	test_commit MM-x &&
+	test_commit MMC
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) f80cabb] foo
- Author: A U Thor <author@example.com>
+[master (root-commit) 0075405] MMR
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into bare repository 'dst.git'...
-?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
- * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
-ok 30 - fetch what is specified on CLI even if already promised
-
-expecting success of 5616.31 'setup src repo for sparse filter': 
-	git init sparse-src &&
-	git -C sparse-src config --local uploadpack.allowfilter 1 &&
-	git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
-	test_commit -C sparse-src one &&
-	test_commit -C sparse-src two &&
-	echo /one.t >sparse-src/only-one &&
-	git -C sparse-src add . &&
-	git -C sparse-src commit -m "add sparse checkout files"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/sparse-src/.git/
-[main (root-commit) 6f4b17f] one
- Author: A U Thor <author@example.com>
+ create mode 100644 MMR.t
+[master 91243c1] MM1
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 5c4888c] two
- Author: A U Thor <author@example.com>
+ create mode 100644 MM1.t
+[master 4d5fde5] MM-o
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[main cc88d32] add sparse checkout files
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-o.t
+[master ca22c18] MM-p
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 only-one
-ok 31 - setup src repo for sparse filter
-
-expecting success of 5616.32 'partial clone with sparse filter succeeds': 
-	rm -rf dst.git &&
-	git clone --no-local --bare \
-		  --filter=sparse:oid=main:only-one \
-		  sparse-src dst.git &&
-	(
-		cd dst.git &&
-		git rev-list --objects --missing=print HEAD >out &&
-		grep "^$(git rev-parse HEAD:one.t)" out &&
-		grep "^?$(git rev-parse HEAD:two.t)" out
-	)
+ create mode 100644 MM-p.t
+[master 2659ed6] MM-q
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-q.t
+[master fdb9a8f] MMA
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMA.t
+Note: switching to 'MM1'.
 
-Cloning into bare repository 'dst.git'...
-5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
-?f719efd430d52bcfc8566a43b2eb655688d38871
-ok 32 - partial clone with sparse filter succeeds
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 5616.33 'partial clone with unresolvable sparse filter fails cleanly': 
-	rm -rf dst.git &&
-	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=main:no-such-name \
-				 sparse-src dst.git 2>err &&
-	test_grep "unable to access sparse blob in .main:no-such-name" err &&
-	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=main \
-				 sparse-src dst.git 2>err &&
-	test_grep "unable to parse sparse filter data in" err
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-remote: fatal: unable to access sparse blob in 'main:no-such-name'        
-remote: fatal: unable to parse sparse filter data in cc88d32db343d6bb15610824107d11c391b515ca        
-ok 33 - partial clone with unresolvable sparse filter fails cleanly
+  git switch -c <new-branch-name>
 
-expecting success of 5616.34 'fetch lazy-fetches only to resolve deltas': 
-	setup_triangle &&
+Or undo this operation with:
 
-	# Exercise to make sure it works. Git will not fetch anything from the
-	# promisor remote other than for the big tree (because it needs to
-	# resolve the delta).
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
-		fetch "file://$(pwd)/server" main &&
+  git switch -
 
-	# Verify the assumption that the client needed to fetch the delta base
-	# to resolve the delta.
-	git -C server rev-parse HEAD~1^{tree} >hash &&
-	grep "want $(cat hash)" trace
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) b380020] initial
- Author: A U Thor <author@example.com>
- 100 files changed, 100 insertions(+)
- create mode 100644 file1
- create mode 100644 file10
- create mode 100644 file100
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 file15
- create mode 100644 file16
- create mode 100644 file17
- create mode 100644 file18
- create mode 100644 file19
- create mode 100644 file2
- create mode 100644 file20
- create mode 100644 file21
- create mode 100644 file22
- create mode 100644 file23
- create mode 100644 file24
- create mode 100644 file25
- create mode 100644 file26
- create mode 100644 file27
- create mode 100644 file28
- create mode 100644 file29
- create mode 100644 file3
- create mode 100644 file30
- create mode 100644 file31
- create mode 100644 file32
- create mode 100644 file33
- create mode 100644 file34
- create mode 100644 file35
- create mode 100644 file36
- create mode 100644 file37
- create mode 100644 file38
- create mode 100644 file39
- create mode 100644 file4
- create mode 100644 file40
- create mode 100644 file41
- create mode 100644 file42
- create mode 100644 file43
- create mode 100644 file44
- create mode 100644 file45
- create mode 100644 file46
- create mode 100644 file47
- create mode 100644 file48
- create mode 100644 file49
- create mode 100644 file5
- create mode 100644 file50
- create mode 100644 file51
- create mode 100644 file52
- create mode 100644 file53
- create mode 100644 file54
- create mode 100644 file55
- create mode 100644 file56
- create mode 100644 file57
- create mode 100644 file58
- create mode 100644 file59
- create mode 100644 file6
- create mode 100644 file60
- create mode 100644 file61
- create mode 100644 file62
- create mode 100644 file63
- create mode 100644 file64
- create mode 100644 file65
- create mode 100644 file66
- create mode 100644 file67
- create mode 100644 file68
- create mode 100644 file69
- create mode 100644 file7
- create mode 100644 file70
- create mode 100644 file71
- create mode 100644 file72
- create mode 100644 file73
- create mode 100644 file74
- create mode 100644 file75
- create mode 100644 file76
- create mode 100644 file77
- create mode 100644 file78
- create mode 100644 file79
- create mode 100644 file8
- create mode 100644 file80
- create mode 100644 file81
- create mode 100644 file82
- create mode 100644 file83
- create mode 100644 file84
- create mode 100644 file85
- create mode 100644 file86
- create mode 100644 file87
- create mode 100644 file88
- create mode 100644 file89
- create mode 100644 file9
- create mode 100644 file90
- create mode 100644 file91
- create mode 100644 file92
- create mode 100644 file93
- create mode 100644 file94
- create mode 100644 file95
- create mode 100644 file96
- create mode 100644 file97
- create mode 100644 file98
- create mode 100644 file99
-Cloning into bare repository 'client'...
-[main 85be905] incremental change
- Author: A U Thor <author@example.com>
+HEAD is now at 91243c1 MM1
+[detached HEAD c35e31c] MM-r
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) 06e07da] one
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-r.t
+[detached HEAD 44e361c] MM-s
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            main       -> FETCH_HEAD
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-ok 34 - fetch lazy-fetches only to resolve deltas
-
-expecting success of 5616.35 'fetch lazy-fetches only to resolve deltas, protocol v2': 
-	setup_triangle &&
-
-	git -C server config --local protocol.version 2 &&
-	git -C client config --local protocol.version 2 &&
-	git -C promisor-remote config --local protocol.version 2 &&
-
-	# Exercise to make sure it works. Git will not fetch anything from the
-	# promisor remote other than for the big blob (because it needs to
-	# resolve the delta).
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
-		fetch "file://$(pwd)/server" main &&
-
-	# Verify that protocol version 2 was used.
-	grep "fetch< version 2" trace &&
-
-	# Verify the assumption that the client needed to fetch the delta base
-	# to resolve the delta.
-	git -C server rev-parse HEAD~1^{tree} >hash &&
-	grep "want $(cat hash)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) 9bc3270] initial
- Author: A U Thor <author@example.com>
- 100 files changed, 100 insertions(+)
- create mode 100644 file1
- create mode 100644 file10
- create mode 100644 file100
- create mode 100644 file11
- create mode 100644 file12
- create mode 100644 file13
- create mode 100644 file14
- create mode 100644 file15
- create mode 100644 file16
- create mode 100644 file17
- create mode 100644 file18
- create mode 100644 file19
- create mode 100644 file2
- create mode 100644 file20
- create mode 100644 file21
- create mode 100644 file22
- create mode 100644 file23
- create mode 100644 file24
- create mode 100644 file25
- create mode 100644 file26
- create mode 100644 file27
- create mode 100644 file28
- create mode 100644 file29
- create mode 100644 file3
- create mode 100644 file30
- create mode 100644 file31
- create mode 100644 file32
- create mode 100644 file33
- create mode 100644 file34
- create mode 100644 file35
- create mode 100644 file36
- create mode 100644 file37
- create mode 100644 file38
- create mode 100644 file39
- create mode 100644 file4
- create mode 100644 file40
- create mode 100644 file41
- create mode 100644 file42
- create mode 100644 file43
- create mode 100644 file44
- create mode 100644 file45
- create mode 100644 file46
- create mode 100644 file47
- create mode 100644 file48
- create mode 100644 file49
- create mode 100644 file5
- create mode 100644 file50
- create mode 100644 file51
- create mode 100644 file52
- create mode 100644 file53
- create mode 100644 file54
- create mode 100644 file55
- create mode 100644 file56
- create mode 100644 file57
- create mode 100644 file58
- create mode 100644 file59
- create mode 100644 file6
- create mode 100644 file60
- create mode 100644 file61
- create mode 100644 file62
- create mode 100644 file63
- create mode 100644 file64
- create mode 100644 file65
- create mode 100644 file66
- create mode 100644 file67
- create mode 100644 file68
- create mode 100644 file69
- create mode 100644 file7
- create mode 100644 file70
- create mode 100644 file71
- create mode 100644 file72
- create mode 100644 file73
- create mode 100644 file74
- create mode 100644 file75
- create mode 100644 file76
- create mode 100644 file77
- create mode 100644 file78
- create mode 100644 file79
- create mode 100644 file8
- create mode 100644 file80
- create mode 100644 file81
- create mode 100644 file82
- create mode 100644 file83
- create mode 100644 file84
- create mode 100644 file85
- create mode 100644 file86
- create mode 100644 file87
- create mode 100644 file88
- create mode 100644 file89
- create mode 100644 file9
- create mode 100644 file90
- create mode 100644 file91
- create mode 100644 file92
- create mode 100644 file93
- create mode 100644 file94
- create mode 100644 file95
- create mode 100644 file96
- create mode 100644 file97
- create mode 100644 file98
- create mode 100644 file99
-Cloning into bare repository 'client'...
-[main 014bae7] incremental change
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-s.t
+[detached HEAD a5daa7f] MM-t
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) d944c64] one
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-t.t
+[detached HEAD bca1425] MMB
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            main       -> FETCH_HEAD
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch< version 2
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
-packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
-ok 35 - fetch lazy-fetches only to resolve deltas, protocol v2
-
-expecting success of 5616.36 'fetch does not lazy-fetch missing targets of its refs': 
-	rm -rf server client trace &&
-
-	test_create_repo server &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	test_commit -C server foo &&
-
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	# Make all refs point to nothing by deleting all objects.
-	rm client/.git/objects/pack/* &&
-
-	test_commit -C server bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
-		--no-tags --recurse-submodules=no \
-		origin refs/tags/bar &&
-	FOO_HASH=$(git -C server rev-parse foo) &&
-	! grep "want $FOO_HASH" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) 92a62de] foo
- Author: A U Thor <author@example.com>
+ create mode 100644 MMB.t
+Previous HEAD position was bca1425 MMB
+HEAD is now at 0075405 MMR
+[detached HEAD 174b4d1] MM-u
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'client'...
-[main 92e3d69] bar
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-u.t
+[detached HEAD c171a6c] MM-v
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * tag               bar        -> FETCH_HEAD
-ok 36 - fetch does not lazy-fetch missing targets of its refs
-
-expecting success of 5616.37 'verify fetch succeeds when asking for new tags': 
-	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
-	for i in I J K
-	do
-		test_commit -C src $i &&
-		git -C src branch $i || return 1
-	done &&
-	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
-	git -C tag-test -c protocol.version=2 fetch --tags origin
-
-Cloning into 'tag-test'...
-[main f18c5f5] I
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-v.t
+[detached HEAD c25d00b] MM-w
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-[main a03a6a6] J
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-w.t
+[detached HEAD 610cc22] MM-x
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[main 367cc8f] K
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-x.t
+[detached HEAD 03ab457] MMC
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 K.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
- * [new branch]      I          -> I
- * [new branch]      J          -> J
- * [new branch]      K          -> K
- + 957c60b...367cc8f main       -> main  (forced update)
- * [new tag]         I          -> I
- * [new tag]         J          -> J
- * [new tag]         K          -> K
- * [new tag]         foo        -> foo
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
- + 957c60b...367cc8f main       -> origin/main  (forced update)
- * [new branch]      I          -> origin/I
- * [new branch]      J          -> origin/J
- * [new branch]      K          -> origin/K
- * [new tag]         I          -> I
- * [new tag]         J          -> J
- * [new tag]         K          -> K
- * [new tag]         foo        -> foo
-ok 37 - verify fetch succeeds when asking for new tags
+ create mode 100644 MMC.t
+ok 7 - merge-base for octopus-step (setup)
 
-expecting success of 5616.38 'verify fetch downloads only one pack when updating refs': 
-	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
-	ls pack-test/.git/objects/pack/*pack >pack-list &&
-	test_line_count = 2 pack-list &&
-	for i in A B C
-	do
-		test_commit -C src $i &&
-		git -C src branch $i || return 1
-	done &&
-	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
-	git -C pack-test fetch origin &&
-	ls pack-test/.git/objects/pack/*pack >pack-list &&
-	test_line_count = 3 pack-list
+expecting success of 6010.8 'merge-base A B C': 
+	git rev-parse --verify MM1 >expected &&
+	git rev-parse --verify MMR >expected.sb &&
 
-Cloning into 'pack-test'...
-[main bc03829] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 525529d] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 66f5bb0] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
- * [new branch]      A          -> A
- * [new branch]      B          -> B
- * [new branch]      C          -> C
-   367cc8f..66f5bb0  main       -> main
- * [new tag]         A          -> A
- * [new tag]         B          -> B
- * [new tag]         C          -> C
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
-   367cc8f..66f5bb0  main       -> origin/main
- * [new branch]      A          -> origin/A
- * [new branch]      B          -> origin/B
- * [new branch]      C          -> origin/C
- * [new tag]         A          -> A
- * [new tag]         B          -> B
- * [new tag]         C          -> C
-ok 38 - verify fetch downloads only one pack when updating refs
+	git merge-base --all MMA MMB MMC >actual &&
+	git merge-base --all --octopus MMA MMB MMC >actual.common &&
+	git show-branch --merge-base MMA MMB MMC >actual.sb &&
 
-expecting success of 5616.39 'single-branch tag following respects partial clone': 
-	git clone --single-branch -b B --filter=blob:none \
-		"file://$(pwd)/srv.bare" single &&
-	git -C single rev-parse --verify refs/tags/B &&
-	git -C single rev-parse --verify refs/tags/A &&
-	test_must_fail git -C single rev-parse --verify refs/tags/C
+	test_cmp expected actual &&
+	test_cmp expected.sb actual.common &&
+	test_cmp expected.sb actual.sb
 
-Cloning into 'single'...
-525529d87f8f318d404aa60b6d2b41ed0f49123b
-bc03829a3804fb49ee75372a845d1554afc2e83f
-fatal: Needed a single revision
-ok 39 - single-branch tag following respects partial clone
+ok 8 - merge-base A B C
 
-expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
-	rm -rf server client trace &&
+expecting success of 6010.9 'criss-cross merge-base for octopus-step': 
+	git reset --hard MMR &&
+	test_commit CC1 &&
+	git reset --hard E &&
+	test_commit CC2 &&
+	test_tick &&
+	# E is a root commit unrelated to MMR root on which CC1 is based
+	git merge -s ours --allow-unrelated-histories CC1 &&
+	test_commit CC-o &&
+	test_commit CCB &&
+	git reset --hard CC1 &&
+	# E is a root commit unrelated to MMR root on which CC1 is based
+	git merge -s ours --allow-unrelated-histories CC2 &&
+	test_commit CCA &&
 
-	# Pretend that the server is a partial clone
-	git init server &&
-	git -C server remote add a_remote "file://$(pwd)/" &&
-	test_config -C server core.repositoryformatversion 1 &&
-	test_config -C server extensions.partialclone a_remote &&
-	test_config -C server protocol.version 0 &&
-	test_commit -C server foo &&
+	git rev-parse CC1 CC2 >expected &&
+	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
 
-	# Fetch from the server
-	git init client &&
-	test_config -C client protocol.version 0 &&
-	test_commit -C client bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
-	! grep "version 2" trace
+	sort expected >expected.sorted &&
+	sort actual >actual.sorted &&
+	test_cmp expected.sorted actual.sorted
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) b259608] foo
- Author: A U Thor <author@example.com>
+HEAD is now at 0075405 MMR
+[detached HEAD 4141141] CC1
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 76913b4] bar
- Author: A U Thor <author@example.com>
+ create mode 100644 CC1.t
+HEAD is now at e34970a E
+[detached HEAD d33e00c] CC2
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-warning: no common commits
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            HEAD       -> FETCH_HEAD
-ok 40 - fetch from a partial clone, protocol v0
-
-expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
-	rm -rf server client trace &&
-
-	# Pretend that the server is a partial clone
-	git init server &&
-	git -C server remote add a_remote "file://$(pwd)/" &&
-	test_config -C server core.repositoryformatversion 1 &&
-	test_config -C server extensions.partialclone a_remote &&
-	test_config -C server protocol.version 2 &&
-	test_commit -C server foo &&
-
-	# Fetch from the server
-	git init client &&
-	test_config -C client protocol.version 2 &&
-	test_commit -C client bar &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
-	grep "version 2" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) bbef54c] foo
- Author: A U Thor <author@example.com>
+ create mode 100644 CC2.t
+Merge made by the 'ours' strategy.
+[detached HEAD 48e3312] CC-o
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 10dc217] bar
- Author: A U Thor <author@example.com>
+ create mode 100644 CC-o.t
+[detached HEAD dda5641] CCB
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
- * branch            HEAD       -> FETCH_HEAD
-packet:  upload-pack> version 2
-packet:        fetch< version 2
-ok 41 - fetch from a partial clone, protocol v2
-
-expecting success of 5616.42 'repack does not loosen promisor objects': 
-	rm -rf client trace &&
-	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
-	test_when_finished "rm -rf client trace" &&
-	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
-	grep "loosen_unused_packed_objects/loosened:0" trace
-
-Cloning into bare repository 'client'...
-19:22:23.564851 builtin/pack-objects.c:4084  | d1 | main                     | data         | r0  |  0.001319 |  0.000425 | pack-objects | ..loosen_unused_packed_objects/loosened:0
-ok 42 - repack does not loosen promisor objects
-
-expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
-	# setup
-	test_config_global protocol.file.allow always &&
-
-	test_when_finished "rm -rf src-sub" &&
-	git init src-sub &&
-	git -C src-sub config uploadpack.allowfilter 1 &&
-	git -C src-sub config uploadpack.allowanysha1inwant 1 &&
-
-	# This blob must be missing in the subsequent commit.
-	echo foo >src-sub/file &&
-	git -C src-sub add file &&
-	git -C src-sub commit -m "submodule one" &&
-	SUB_ONE=$(git -C src-sub rev-parse HEAD) &&
-
-	echo bar >src-sub/file &&
-	git -C src-sub add file &&
-	git -C src-sub commit -m "submodule two" &&
-	SUB_TWO=$(git -C src-sub rev-parse HEAD) &&
-
-	test_when_finished "rm -rf src-super" &&
-	git init src-super &&
-	git -C src-super config uploadpack.allowfilter 1 &&
-	git -C src-super config uploadpack.allowanysha1inwant 1 &&
-	git -C src-super submodule add ../src-sub src-sub &&
-
-	git -C src-super/src-sub checkout $SUB_ONE &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject one" &&
-
-	git -C src-super/src-sub checkout $SUB_TWO &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject two" &&
-
-	# the fetch
-	test_when_finished "rm -rf client" &&
-	git clone --filter=blob:none --also-filter-submodules \
-		--recurse-submodules "file://$(pwd)/src-super" client &&
-
-	# Trigger lazy-fetch from the superproject
-	git -C client restore --recurse-submodules --source=HEAD^ :/
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-sub/.git/
-[main (root-commit) 801106d] submodule one
- Author: A U Thor <author@example.com>
+ create mode 100644 CCB.t
+HEAD is now at 4141141 CC1
+Merge made by the 'ours' strategy.
+[detached HEAD 6d30b69] CCA
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[main acdf0b1] submodule two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-super/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-super/src-sub'...
-done.
-Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
+ create mode 100644 CCA.t
+ok 9 - criss-cross merge-base for octopus-step
 
-  git switch -
+expecting success of 6010.10 'using reflog to find the fork point': 
+	git reset --hard &&
+	git checkout -b base $E &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	(
+		for count in 1 2 3
+		do
+			git commit --allow-empty -m "Base commit #$count" &&
+			git rev-parse HEAD >expect$count &&
+			git checkout -B derived &&
+			git commit --allow-empty -m "Derived #$count" &&
+			git rev-parse HEAD >derived$count &&
+			git checkout -B base $E || exit 1
+		done &&
 
-HEAD is now at 801106d submodule one
-[main (root-commit) 5f7f3e0] superproject one
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 src-sub
-Previous HEAD position was 801106d submodule one
-HEAD is now at acdf0b1 submodule two
-[main 9a05ac3] superproject two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'client'...
-Submodule 'src-sub' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/src-sub'...
-Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
-ok 43 - lazy-fetch in submodule succeeds
+		for count in 1 2 3
+		do
+			git merge-base --fork-point base $(cat derived$count) >actual &&
+			test_cmp expect$count actual || exit 1
+		done
 
-expecting success of 5616.44 'after fetching descendants of non-promisor commits, gc works': 
-	# Setup
-	git init full &&
-	git -C full config uploadpack.allowfilter 1 &&
-	git -C full config uploadpack.allowanysha1inwant 1 &&
-	touch full/foo &&
-	git -C full add foo &&
-	git -C full commit -m "commit 1" &&
-	git -C full checkout --detach &&
+	) &&
+	# check that we correctly default to HEAD
+	git checkout derived &&
+	git merge-base --fork-point base >actual &&
+	test_cmp expect3 actual
 
-	# Partial clone and push commit to remote
-	git clone "file://$(pwd)/full" --filter=blob:none partial &&
-	echo "hello" > partial/foo &&
-	git -C partial commit -a -m "commit 2" &&
-	git -C partial push &&
+HEAD is now at 6d30b69 CCA
+Previous HEAD position was 6d30b69 CCA
+Switched to a new branch 'base'
+[base 58b1909] Base commit #1
+ Author: A U Thor <git@au.thor.xz>
+Switched to a new branch 'derived'
+[derived 8ef5ddb] Derived #1
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+[base 9ef36f6] Base commit #2
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'derived'
+[derived 6c4d828] Derived #2
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+[base d6c9a6e] Base commit #3
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'derived'
+[derived 3768cdc] Derived #3
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+Switched to branch 'derived'
+ok 10 - using reflog to find the fork point
 
-	# gc in partial repo
-	git -C partial gc --prune=now &&
+expecting success of 6010.11 '--fork-point works with empty reflog': 
+	git -c core.logallrefupdates=false branch no-reflog base &&
+	git merge-base --fork-point no-reflog derived &&
+	test_cmp expect3 actual
 
-	# Create another commit in normal repo
-	git -C full checkout main &&
-	echo " world" >> full/foo &&
-	git -C full commit -a -m "commit 3" &&
+e34970abbab4461223052769885c56a229ee9299
+ok 11 - --fork-point works with empty reflog
 
-	# Pull from remote in partial repo, and run gc again
-	git -C partial pull &&
-	git -C partial gc --prune=now
+expecting success of 6010.12 'merge-base --octopus --all for complex tree': 
+	# Best common ancestor for JE, JAA and JDD is JC
+	#             JE
+	#            / |
+	#           /  |
+	#          /   |
+	#  JAA    /    |
+	#   |\   /     |
+	#   | \  | JDD |
+	#   |  \ |/ |  |
+	#   |   JC JD  |
+	#   |    | /|  |
+	#   |    |/ |  |
+	#  JA    |  |  |
+	#   |\  /|  |  |
+	#   X JB |  X  X
+	#   \  \ | /   /
+	#    \__\|/___/
+	#        J
+	test_commit J &&
+	test_commit JB &&
+	git reset --hard J &&
+	test_commit JC &&
+	git reset --hard J &&
+	test_commit JTEMP1 &&
+	test_merge JA JB &&
+	test_merge JAA JC &&
+	git reset --hard J &&
+	test_commit JTEMP2 &&
+	test_merge JD JB &&
+	test_merge JDD JC &&
+	git reset --hard J &&
+	test_commit JTEMP3 &&
+	test_merge JE JC &&
+	git rev-parse JC >expected &&
+	git merge-base --all --octopus JAA JDD JE >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full/.git/
-[main (root-commit) 08368f5] commit 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-HEAD is now at 08368f5 commit 1
-Cloning into 'partial'...
-[main d697f4a] commit 2
- Author: A U Thor <author@example.com>
+[derived 3782338] J
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full
-   08368f5..d697f4a  main -> main
-Previous HEAD position was 08368f5 commit 1
-Switched to branch 'main'
-[main 5b8be83] commit 3
- Author: A U Thor <author@example.com>
+ create mode 100644 J.t
+[derived 83a274f] JB
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full
-   d697f4a..5b8be83  main       -> origin/main
-Updating d697f4a..5b8be83
-Fast-forward
- foo | 1 +
+ create mode 100644 JB.t
+HEAD is now at 3782338 J
+[derived cb75edb] JC
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
-ok 44 - after fetching descendants of non-promisor commits, gc works
-
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-# passed all 44 test(s)
-# SKIP no web server found at ''
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6100-rev-list-in-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6100-rev-list-in-order/.git/
-expecting success of 6100.1 'setup a commit history with trees, blobs': 
-	for x in one two three four
-	do
-		echo $x >$x &&
-		git add $x &&
-		git commit -m "add file $x" ||
-		return 1
-	done &&
-	for x in four three
-	do
-		git rm $x &&
-		git commit -m "remove $x" ||
-		return 1
-	done
-
-[master (root-commit) 852067c] add file one
- Author: A U Thor <author@example.com>
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived e9767d0] JTEMP1
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 one
-[master 090ebfd] add file two
- Author: A U Thor <author@example.com>
+ create mode 100644 JTEMP1.t
+Merge made by the 'ort' strategy.
+ JB.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 two
-[master 2101c65] add file three
- Author: A U Thor <author@example.com>
+ create mode 100644 JB.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 three
-[master 0846a08] add file four
- Author: A U Thor <author@example.com>
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived d2ca2eb] JTEMP2
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 four
-rm 'four'
-[master 37698d1] remove four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 four
-rm 'three'
-[master 0ade3bd] remove three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 three
-ok 1 - setup a commit history with trees, blobs
-
-expecting success of 6100.2 'rev-list --in-commit-order': 
-	git rev-list --in-commit-order --objects HEAD >actual.raw &&
-	cut -d" " -f1 >actual <actual.raw &&
-
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{commit}
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{commit}
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		HEAD~3^{commit}
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		HEAD~4^{commit}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{commit}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
-
-	test_cmp expect actual
-
-ok 2 - rev-list --in-commit-order
-
-expecting success of 6100.3 'rev-list lists blobs and trees after commits': 
-	git rev-list --objects HEAD >actual.raw &&
-	cut -d" " -f1 >actual <actual.raw &&
-
-	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
-		HEAD^{commit}
-		HEAD~1^{commit}
-		HEAD~2^{commit}
-		HEAD~3^{commit}
-		HEAD~4^{commit}
-		HEAD~5^{commit}
-		HEAD^{tree}
-		HEAD^{tree}:one
-		HEAD^{tree}:two
-		HEAD~1^{tree}
-		HEAD~1^{tree}:three
-		HEAD~2^{tree}
-		HEAD~2^{tree}:four
-		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
-		# HEAD~4^{tree} skipped, same as HEAD^{tree}
-		HEAD~5^{tree}
-	EOF
-	grep -v "#" >expect <expect.raw &&
-
-	test_cmp expect actual
-
-ok 3 - rev-list lists blobs and trees after commits
+ create mode 100644 JTEMP2.t
+Merge made by the 'ort' strategy.
+ JB.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JB.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived dc142e3] JTEMP3
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JTEMP3.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+ok 12 - merge-base --octopus --all for complex tree
 
-# passed all 3 test(s)
-1..3
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6040-tracking-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6040-tracking-info/.git/
-expecting success of 6040.1 'setup': 
-	advance a &&
-	advance b &&
-	advance c &&
-	git clone . test &&
-	(
-		cd test &&
-		git checkout -b b1 origin &&
-		git reset --hard HEAD^ &&
-		advance d &&
-		git checkout -b b2 origin &&
-		git reset --hard b1 &&
-		git checkout -b b3 origin &&
-		git reset --hard HEAD^ &&
-		git checkout -b b4 origin &&
-		advance e &&
-		advance f &&
-		git checkout -b brokenbase origin &&
-		git checkout -b b5 --track brokenbase &&
-		advance g &&
-		git branch -d brokenbase &&
-		git checkout -b b6 origin
-	) &&
-	git checkout -b follower --track main &&
-	advance h
+*** t6019-rev-list-ancestry-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6019-rev-list-ancestry-path/.git/
+expecting success of 6019.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	test_commit D &&
+	test_commit E &&
+	test_commit F &&
+	git reset --hard C &&
+	test_commit G &&
+	test_merge E H &&
+	test_commit I &&
+	test_merge F J &&
+	git reset --hard A &&
+	test_commit K &&
+	test_merge J L &&
+	test_commit M
 
-[main (root-commit) cc33353] a
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 7e1cf2d] b
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b
-[main ac11e55] c
+ create mode 100644 B.t
+[main 35a8500] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c
-Cloning into 'test'...
-done.
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-[b1 afc0d66] d
+ create mode 100644 C.t
+[main be8f64f] D
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 d
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/main'.
-HEAD is now at afc0d66 d
-Switched to a new branch 'b3'
-branch 'b3' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-Switched to a new branch 'b4'
-branch 'b4' set up to track 'origin/main'.
-[b4 ec9b031] e
+ create mode 100644 D.t
+[main ee2ad00] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 e
-[b4 59ecd1d] f
+ create mode 100644 E.t
+[main 5374d8c] F
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 f
-Switched to a new branch 'brokenbase'
-branch 'brokenbase' set up to track 'origin/main'.
-Switched to a new branch 'b5'
-branch 'b5' set up to track 'brokenbase'.
-[b5 d8d0202] g
+ create mode 100644 F.t
+HEAD is now at 35a8500 C
+[main fa55005] G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 g
-Deleted branch brokenbase (was ac11e55).
-Switched to a new branch 'b6'
-branch 'b6' set up to track 'origin/main'.
-Switched to a new branch 'follower'
-branch 'follower' set up to track 'main'.
-[follower 21abfbd] h
+ create mode 100644 G.t
+Merge made by the 'ours' strategy.
+[main 4e719b9] I
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 h
+ create mode 100644 I.t
+Merge made by the 'ours' strategy.
+HEAD is now at 0ddfaf1 A
+[main 0f470b0] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+Merge made by the 'ours' strategy.
+[main bcafe1b] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 M.t
 ok 1 - setup
 
-expecting success of 6040.2 'branch -v': 
-	(
-		cd test &&
-		git branch -v
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 2 - branch -v
-
-expecting success of 6040.3 'branch -vv': 
-	(
-		cd test &&
-		git branch -vv
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 3 - branch -vv
-
-expecting success of 6040.4 'checkout (diverged from upstream)': 
-	(
-		cd test && git checkout b1
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 4 - checkout (diverged from upstream)
-
-expecting success of 6040.5 'checkout with local tracked branch': 
-	git checkout main &&
-	git checkout follower >actual &&
-	test_grep "is ahead of" actual
-
-Switched to branch 'main'
-Switched to branch 'follower'
-Your branch is ahead of 'main' by 1 commit.
-ok 5 - checkout with local tracked branch
-
-expecting success of 6040.6 'checkout (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 6 - checkout (upstream is gone)
-
-expecting success of 6040.7 'checkout (up-to-date with upstream)': 
-	(
-		cd test && git checkout b6
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 7 - checkout (up-to-date with upstream)
-
-expecting success of 6040.8 'status (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 8 - status (diverged from upstream)
-
-expecting success of 6040.9 'status (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 9 - status (upstream is gone)
-
-expecting success of 6040.10 'status (up-to-date with upstream)': 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
+expecting success of 6019.2 'log D..M': 
+		test_write_lines E F G H I J K L M >expect &&
+		git log --format=%s D..M >raw &&
 
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 10 - status (up-to-date with upstream)
+		if test -n "E F G H I J K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 2 - log D..M
 
-expecting success of 6040.11 'status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.3 'log --ancestry-path D..M': 
+		test_write_lines E F H I J L M >expect &&
+		git log --format=%s --ancestry-path D..M >raw &&
 
-Switched to branch 'b1'
-ok 11 - status -s -b (diverged from upstream)
+		if test -n "E F H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 3 - log --ancestry-path D..M
 
-expecting success of 6040.12 'status -s -b --no-ahead-behind (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b --no-ahead-behind | head -1
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.4 'log --ancestry-path=F D..M': 
+		test_write_lines E F J L M >expect &&
+		git log --format=%s --ancestry-path=F D..M >raw &&
 
-Already on 'b1'
-ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
+		if test -n "E F J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 4 - log --ancestry-path=F D..M
 
-expecting success of 6040.13 'status.aheadbehind=false status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.5 'log --ancestry-path=G D..M': 
+		test_write_lines G H I J L M >expect &&
+		git log --format=%s --ancestry-path=G D..M >raw &&
 
-Already on 'b1'
-ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
+		if test -n "G H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 5 - log --ancestry-path=G D..M
 
-expecting success of 6040.14 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.6 'log --ancestry-path=H D..M': 
+		test_write_lines E G H I J L M >expect &&
+		git log --format=%s --ancestry-path=H D..M >raw &&
 
-Already on 'b1'
-ok 14 - status --long --branch
+		if test -n "E G H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 6 - log --ancestry-path=H D..M
 
-expecting success of 6040.15 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=true status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.7 'log --ancestry-path=K D..M': 
+		test_write_lines K L M >expect &&
+		git log --format=%s --ancestry-path=K D..M >raw &&
 
-Already on 'b1'
-ok 15 - status --long --branch
+		if test -n "K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 7 - log --ancestry-path=K D..M
 
-expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b --no-ahead-behind | head -2
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.8 'log --ancestry-path=F --ancestry-path=K D..M': 
+		test_write_lines E F J K L M >expect &&
+		git log --format=%s --ancestry-path=F --ancestry-path=K D..M >raw &&
 
-Already on 'b1'
-ok 16 - status --long --branch --no-ahead-behind
+		if test -n "E F J K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 8 - log --ancestry-path=F --ancestry-path=K D..M
 
-expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status --long -b | head -2
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.9 'log D..M -- M.t': 
+		test_write_lines M >expect &&
+		git log --format=%s D..M -- M.t >raw &&
 
-Already on 'b1'
-ok 17 - status.aheadbehind=false status --long --branch
+		if test -n "M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 9 - log D..M -- M.t
 
-expecting success of 6040.18 'status -s -b (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.10 'log --ancestry-path D..M -- M.t': 
+		test_write_lines M >expect &&
+		git log --format=%s --ancestry-path D..M -- M.t >raw &&
 
-Switched to branch 'b5'
-ok 18 - status -s -b (upstream is gone)
+		if test -n "M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 10 - log --ancestry-path D..M -- M.t
 
-expecting success of 6040.19 'status -s -b (up-to-date with upstream)': 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
+expecting success of 6019.11 'log F...I': 
+		test_write_lines F G H I >expect &&
+		git log --format=%s F...I >raw &&
 
-Switched to branch 'b6'
-ok 19 - status -s -b (up-to-date with upstream)
+		if test -n "F G H I"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 11 - log F...I
 
-expecting success of 6040.20 'fail to track lightweight tags': 
-	git checkout main &&
-	git tag light &&
-	test_must_fail git branch --track lighttrack light >actual &&
-	test_grep ! "set up to track" actual &&
-	test_must_fail git checkout lighttrack
+expecting success of 6019.12 'log --ancestry-path F...I': 
+		test_write_lines F H I >expect &&
+		git log --format=%s --ancestry-path F...I >raw &&
 
-Switched to branch 'main'
-fatal: cannot set up tracking information; starting point 'light' is not a branch
-error: pathspec 'lighttrack' did not match any file(s) known to git
-ok 20 - fail to track lightweight tags
+		if test -n "F H I"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 12 - log --ancestry-path F...I
 
-expecting success of 6040.21 'fail to track annotated tags': 
-	git checkout main &&
-	git tag -m heavy heavy &&
-	test_must_fail git branch --track heavytrack heavy >actual &&
-	test_grep ! "set up to track" actual &&
-	test_must_fail git checkout heavytrack
+expecting success of 6019.13 'log G..M -- G.t': 
+		test_write_lines  >expect &&
+		git log --format=%s G..M -- G.t >raw &&
 
-Already on 'main'
-fatal: cannot set up tracking information; starting point 'heavy' is not a branch
-error: pathspec 'heavytrack' did not match any file(s) known to git
-ok 21 - fail to track annotated tags
+		if test -n ""
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 13 - log G..M -- G.t
 
-expecting success of 6040.22 '--set-upstream-to does not change branch': 
-	git branch from-main main &&
-	git branch --set-upstream-to main from-main &&
-	git branch from-topic_2 main &&
-	test_must_fail git config branch.from-topic_2.merge > actual &&
-	git rev-list from-topic_2 &&
-	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
-	git rev-parse from-topic_2 >expect2 &&
-	git branch --set-upstream-to main from-topic_2 &&
-	git config branch.from-main.merge > actual &&
-	git rev-parse from-topic_2 >actual2 &&
-	grep -q "^refs/heads/main$" actual &&
-	cmp expect2 actual2
+expecting success of 6019.14 'log --ancestry-path G..M -- G.t': 
+		test_write_lines L >expect &&
+		git log --format=%s --ancestry-path G..M -- G.t >raw &&
 
-branch 'from-main' set up to track 'main'.
-ac11e552c8e799a6af00e91a64888439b699d9fd
-7e1cf2dc889e845623128125195d11533d8aef5e
-cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
-branch 'from-topic_2' set up to track 'main'.
-ok 22 - --set-upstream-to does not change branch
+		if test -n "L"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 14 - log --ancestry-path G..M -- G.t
 
-expecting success of 6040.23 '--set-upstream-to @{-1}': 
-	git checkout follower &&
-	git checkout from-topic_2 &&
-	git config branch.from-topic_2.merge > expect2 &&
-	git branch --set-upstream-to @{-1} from-main &&
-	git config branch.from-main.merge > actual &&
-	git config branch.from-topic_2.merge > actual2 &&
-	git branch --set-upstream-to follower from-main &&
-	git config branch.from-main.merge > expect &&
-	test_cmp expect2 actual2 &&
-	test_cmp expect actual
+expecting success of 6019.15 'log --ancestry-path --simplify-merges G^..M -- G.t': 
+		test_write_lines G L >expect &&
+		git log --format=%s --ancestry-path --simplify-merges G^..M -- G.t >raw &&
 
-Switched to branch 'follower'
-Your branch is ahead of 'main' by 1 commit.
-  (use "git push" to publish your local commits)
-Switched to branch 'from-topic_2'
-Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-branch 'from-main' set up to track 'follower'.
-branch 'from-main' set up to track 'follower'.
-ok 23 - --set-upstream-to @{-1}
+		if test -n "G L"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 15 - log --ancestry-path --simplify-merges G^..M -- G.t
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6110-rev-list-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6110-rev-list-sparse/.git/
-expecting success of 6110.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	git checkout -b side HEAD^ &&
-	test_commit D &&
-	test_commit E &&
-	git merge main
+expecting success of 6019.16 'setup criss-cross': 
+	mkdir criss-cross &&
+	(cd criss-cross &&
+	 git init &&
+	 test_commit A &&
+	 git checkout -b xb main &&
+	 test_commit B &&
+	 git checkout -b xc main &&
+	 test_commit C &&
+	 git checkout -b xbc xb -- &&
+	 git merge xc &&
+	 git checkout -b xcb xc -- &&
+	 git merge xb &&
+	 git checkout main)
 
-[main (root-commit) 0ddfaf1] A
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6019-rev-list-ancestry-path/criss-cross/.git/
+[main (root-commit) 617a709] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 A.t
-[main d9df450] B
+Switched to a new branch 'xb'
+[xb 7dfaf8e] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 B.t
-[main 35a8500] C
+Switched to a new branch 'xc'
+[xc cf5ea0b] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
-Switched to a new branch 'side'
-[side 3e6e33e] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[side dc25130] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
+Switched to a new branch 'xbc'
 Merge made by the 'ort' strategy.
  C.t | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 C.t
-ok 1 - setup
+Switched to a new branch 'xcb'
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+ok 16 - setup criss-cross
 
-expecting success of 6110.2 'rev-list --first-parent --boundary': 
-	git rev-list --first-parent --boundary HEAD^..
+expecting success of 6019.17 'criss-cross: rev-list --ancestry-path cb..bc': 
+	(cd criss-cross &&
+	 git rev-list --ancestry-path xcb..xbc > actual &&
+	 test_must_be_empty actual)
 
-e8ee201b06a2eb86519e2b246f4c082e43aa5e90
--35a8500a6c116c9ddf35e140fa3277a7fe0b4196
--dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
-ok 2 - rev-list --first-parent --boundary
+ok 17 - criss-cross: rev-list --ancestry-path cb..bc
 
-# passed all 2 test(s)
-1..2
+expecting success of 6019.18 'criss-cross: rev-list --ancestry-path --all ^cb': 
+	(cd criss-cross &&
+	 git rev-list --ancestry-path --all ^xcb > actual &&
+	 test_must_be_empty actual)
+
+ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
+
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6102-rev-list-unexpected-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6102-rev-list-unexpected-objects/.git/
-expecting success of 6102.1 'setup well-formed objects': 
-	blob="$(printf "foo" | git hash-object -w --stdin)" &&
-	tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
-	commit="$(git commit-tree $tree -m "first commit")" &&
-	git cat-file commit $commit >good-commit
+*** t6002-rev-list-bisect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6002-rev-list-bisect/.git/
+expecting success of 6002.1 'bisection diff --bisect l0 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 1 - bisection diff --bisect l0 ^root <= 0
 
-ok 1 - setup well-formed objects
+expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 2 - bisection diff --bisect l1 ^root <= 0
 
-expecting success of 6102.2 'setup unexpected non-blob entry': 
-	printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
-	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+expecting success of 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 3 - bisection diff --bisect l2 ^root <= 0
 
-ok 2 - setup unexpected non-blob entry
+expecting success of 6002.4 'bisection diff --bisect a0 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 4 - bisection diff --bisect a0 ^root <= 0
 
-expecting success of 6102.3 'TODO (should fail!): traverse unexpected non-blob entry (lone)': 
-	sed "s/Z$//" >expect <<-EOF &&
-	$broken_tree Z
-	$tree foo
-	EOF
-	git rev-list --objects $broken_tree >actual &&
-	test_cmp expect actual
+expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 5 - bisection diff --bisect a1 ^root <= 0
 
-ok 3 - TODO (should fail!): traverse unexpected non-blob entry (lone)
+expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 6 - bisection diff --bisect a2 ^root <= 0
 
-expecting success of 6102.4 'traverse unexpected non-blob entry (seen)': 
-	test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
-	test_grep "is not a blob" output
+expecting success of 6002.7 'bisection diff --bisect a3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 7 - bisection diff --bisect a3 ^root <= 0
 
-fatal: entry 'foo' in tree f9a0e545d60bd011757113bec85ba95242fa6c4e has blob mode, but is not a blob
-ok 4 - traverse unexpected non-blob entry (seen)
+expecting success of 6002.8 'bisection diff --bisect b1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 8 - bisection diff --bisect b1 ^root <= 0
 
-expecting success of 6102.5 'setup unexpected non-tree entry': 
-	printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
-	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+expecting success of 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 9 - bisection diff --bisect b2 ^root <= 0
 
-ok 5 - setup unexpected non-tree entry
+expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 10 - bisection diff --bisect b3 ^root <= 0
 
-expecting success of 6102.6 'traverse unexpected non-tree entry (lone)': 
-	test_must_fail git rev-list --objects $broken_tree
+expecting success of 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 11 - bisection diff --bisect c1 ^root <= 0
 
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
-fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
-10cd09cb3996f045aaf5417c833c0fa1ee7227e9 
-ok 6 - traverse unexpected non-tree entry (lone)
+expecting success of 6002.12 'bisection diff --bisect c2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 12 - bisection diff --bisect c2 ^root <= 0
 
-expecting success of 6102.7 'traverse unexpected non-tree entry (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
-	test_grep "is not a tree" output
+expecting success of 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 13 - bisection diff --bisect c3 ^root <= 0
 
-fatal: entry 'foo' in tree 10cd09cb3996f045aaf5417c833c0fa1ee7227e9 has tree mode, but is not a tree
-ok 7 - traverse unexpected non-tree entry (seen)
+expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 14 - bisection diff --bisect E ^F <= 0
 
-expecting success of 6102.8 'setup unexpected non-commit parent': 
-	sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
-		>broken-commit &&
-	broken_commit="$(git hash-object -w --literally -t commit \
-		broken-commit)"
+expecting success of 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 15 - bisection diff --bisect e1 ^F <= 0
 
-ok 8 - setup unexpected non-commit parent
+expecting success of 6002.16 'bisection diff --bisect e2 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 16 - bisection diff --bisect e2 ^F <= 0
 
-expecting success of 6102.9 'traverse unexpected non-commit parent (lone)': 
-	test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
-	test_grep "not a commit" output
+expecting success of 6002.17 'bisection diff --bisect e3 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 17 - bisection diff --bisect e3 ^F <= 0
 
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a commit
-ok 9 - traverse unexpected non-commit parent (lone)
+expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 18 - bisection diff --bisect e4 ^F <= 0
 
-expecting success of 6102.10 'traverse unexpected non-commit parent (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_commit \
-		>output 2>&1 &&
-	test_grep "not a commit" output
+expecting success of 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 19 - bisection diff --bisect e5 ^F <= 0
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
-ok 10 - traverse unexpected non-commit parent (seen)
+expecting success of 6002.20 'bisection diff --bisect e6 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 20 - bisection diff --bisect e6 ^F <= 0
 
-expecting success of 6102.11 'setup unexpected non-tree root': 
-	sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
-	broken_commit="$(git hash-object -w --literally -t commit \
-		broken-commit)"
+expecting success of 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 21 - bisection diff --bisect e7 ^F <= 0
 
-ok 11 - setup unexpected non-tree root
+expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 22 - bisection diff --bisect f1 ^F <= 0
 
-expecting success of 6102.12 'traverse unexpected non-tree root (lone)': 
-	test_must_fail git rev-list --objects $broken_commit
+expecting success of 6002.23 'bisection diff --bisect f2 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 23 - bisection diff --bisect f2 ^F <= 0
 
-error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
-fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
-0751a6c0afe31568a8dfe6a1b216fc464faa46ae
-ok 12 - traverse unexpected non-tree root (lone)
+expecting success of 6002.24 'bisection diff --bisect f3 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 24 - bisection diff --bisect f3 ^F <= 0
 
-expecting success of 6102.13 'traverse unexpected non-tree root (seen)': 
-	test_must_fail git rev-list --objects $blob $broken_commit \
-		>output 2>&1 &&
-	test_grep "not a tree" output
+expecting success of 6002.25 'bisection diff --bisect f4 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 25 - bisection diff --bisect f4 ^F <= 0
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
-ok 13 - traverse unexpected non-tree root (seen)
+expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 26 - bisection diff --bisect E ^F <= 0
 
-expecting success of 6102.14 'setup unexpected non-commit tag': 
-	git tag -a -m "tagged commit" tag $commit &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
+expecting success of 6002.27 'bisection diff --bisect V ^U <= 1': test $_bisect_err -le $_max_diff
+ok 27 - bisection diff --bisect V ^U <= 1
 
-Deleted tag 'tag' (was a857fb4)
-ok 14 - setup unexpected non-commit tag
+expecting success of 6002.28 'bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0': test $_bisect_err -le $_max_diff
+ok 28 - bisection diff --bisect V ^U ^u1 ^u2 ^u3 <= 0
 
-expecting success of 6102.15 'traverse unexpected non-commit tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+expecting success of 6002.29 'bisection diff --bisect u1 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 29 - bisection diff --bisect u1 ^U <= 0
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a commit, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 15 - traverse unexpected non-commit tag (lone)
+expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 30 - bisection diff --bisect u2 ^U <= 0
 
-expecting success of 6102.16 'traverse unexpected non-commit tag (seen)': 
-	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
-	test_grep "not a commit" output
+expecting success of 6002.31 'bisection diff --bisect u3 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 31 - bisection diff --bisect u3 ^U <= 0
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
-ok 16 - traverse unexpected non-commit tag (seen)
+expecting success of 6002.32 'bisection diff --bisect u4 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 32 - bisection diff --bisect u4 ^U <= 0
 
-expecting success of 6102.17 'setup unexpected non-tree tag': 
-	git tag -a -m "tagged tree" tag $tree &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
+expecting success of 6002.33 'bisection diff --bisect u5 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 33 - bisection diff --bisect u5 ^U <= 0
 
-Deleted tag 'tag' (was 7f85285)
-ok 17 - setup unexpected non-tree tag
+expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
+ok 34 - --bisect l5 ^root
 
-expecting success of 6102.18 'traverse unexpected non-tree tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+expecting success of 6002.35 '--bisect l5 ^root ^c3': check_output bisect-l5-root-c3 "git rev-list $_bisect_option l5 ^root ^c3"
+ok 35 - --bisect l5 ^root ^c3
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a tree, not a blob
-fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
-ok 18 - traverse unexpected non-tree tag (lone)
+expecting success of 6002.36 '--bisect l5 ^root ^c3 ^b4': check_output bisect-l5-root-c3-b4 "git rev-list $_bisect_option l5 ^c3 ^b4"
+ok 36 - --bisect l5 ^root ^c3 ^b4
 
-expecting success of 6102.19 'traverse unexpected non-tree tag (seen)': 
-	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
-	test_grep "not a tree" output
+expecting success of 6002.37 '--bisect l3 ^root ^c3 ^b4': check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
+ok 37 - --bisect l3 ^root ^c3 ^b4
 
-error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
-ok 19 - traverse unexpected non-tree tag (seen)
+expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
+ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
 
-expecting success of 6102.20 'setup unexpected non-blob tag': 
-	git tag -a -m "tagged blob" tag $blob &&
-	git cat-file tag tag >good-tag &&
-	test_when_finished "git tag -d tag" &&
-	sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
-	tag=$(git hash-object -w --literally -t tag broken-tag)
+expecting success of 6002.39 '--bisect l4 ^a2 ^a3 ^b ^a4': check_output bisect-l4-a2-a3-b-a4 "git rev-list $_bisect_option l4 ^a2 ^a3 ^a4"
+ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
 
-Deleted tag 'tag' (was 5ff9998)
-ok 20 - setup unexpected non-blob tag
+expecting success of 6002.40 '--bisect l3 ^a2 ^a3 ^b ^a4': check_output bisect-l3-a2-a3-b-a4 "git rev-list $_bisect_option l3 ^a2 ^a3 ^a4"
+ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
 
-expecting success of 6102.21 'traverse unexpected non-blob tag (lone)': 
-	test_must_fail git rev-list --objects $tag
+expecting success of 6002.41 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 41 - --bisect a4 ^a2 ^a3 ^b4
 
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a blob, not a commit
-fatal: bad object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd
-ok 21 - traverse unexpected non-blob tag (lone)
+expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
+ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
 
-expecting success of 6102.22 'traverse unexpected non-blob tag (seen)': 
-	test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
-	test_grep "not a blob" output
+expecting success of 6002.43 '--bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3': check_output bisect-a4-a2-a3-b4-c2-c3 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2 ^c3"
+ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
 
-error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a commit, not a blob
-ok 22 - traverse unexpected non-blob tag (seen)
+expecting success of 6002.44 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 44 - --bisect a4 ^a2 ^a3 ^b4
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6060-merge-index/.git/
-expecting success of 6060.1 'setup diverging branches': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
-	git add file &&
-	git commit -m base &&
-	git tag base &&
-	sed s/2/two/ <file >tmp &&
-	mv tmp file &&
-	git commit -a -m two &&
-	git tag two &&
-	git checkout -b other HEAD^ &&
-	sed s/10/ten/ <file >tmp &&
-	mv tmp file &&
-	git commit -a -m ten &&
-	git tag ten
+expecting success of 6002.45 '--bisect c3 ^a2 ^a3 ^b4 ^c2': check_output bisect-c3-a2-a3-b4-c2 "git rev-list $_bisect_option c3 ^a2 ^a3 ^b4 ^c2"
+ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
 
-[master (root-commit) 69c42a0] base
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file
-[master 6a4bad4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'other'
-[other e88ef53] ten
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup diverging branches
+expecting success of 6002.46 'set up fake --bisect refs': 
+	git update-ref refs/bisect/bad c3 &&
+	good=$(git rev-parse b1) &&
+	git update-ref refs/bisect/good-$good $good &&
+	good=$(git rev-parse c1) &&
+	git update-ref refs/bisect/good-$good $good
 
-expecting success of 6060.2 'read-tree does not resolve content merge': 
-	git read-tree -i -m base ten two &&
-	echo file >expect &&
-	git diff-files --name-only --diff-filter=U >unmerged &&
-	test_cmp expect unmerged
+ok 46 - set up fake --bisect refs
 
-ok 2 - read-tree does not resolve content merge
+expecting success of 6002.47 'rev-list --bisect can default to good/bad refs': 
+	# the only thing between c3 and c1 is c2
+	git rev-parse c2 >expect &&
+	git rev-list --bisect >actual &&
+	test_cmp expect actual
 
-expecting success of 6060.3 'git merge-index git-merge-one-file resolves': 
-	git merge-index git-merge-one-file -a &&
-	git diff-files --name-only --diff-filter=U >unmerged &&
-	test_must_be_empty unmerged &&
-	test_cmp expect-merged file &&
-	git cat-file blob :file >file-index &&
-	test_cmp expect-merged file-index
+ok 47 - rev-list --bisect can default to good/bad refs
 
-Auto-merging file
-ok 3 - git merge-index git-merge-one-file resolves
+expecting success of 6002.48 'rev-parse --bisect can default to good/bad refs': 
+	git rev-parse c3 ^b1 ^c1 >expect &&
+	git rev-parse --bisect >actual &&
 
-expecting success of 6060.4 'setup bare merge': 
-	git clone --bare . bare.git &&
-	(cd bare.git &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 git read-tree -i -m base ten two
-	)
+	# output order depends on the refnames, which in turn depends on
+	# the exact sha1s. We just want to make sure we have the same set
+	# of lines in any order.
+	sort <expect >expect.sorted &&
+	sort <actual >actual.sorted &&
+	test_cmp expect.sorted actual.sorted
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 4 - setup bare merge
+ok 48 - rev-parse --bisect can default to good/bad refs
 
-expecting success of 6060.5 'merge-one-file fails without a work tree': 
-	(cd bare.git &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 test_must_fail git merge-index git-merge-one-file -a
-	)
+expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
+ok 49 - --bisect --first-parent
 
-fatal: this operation must be run in a work tree
-Cannot chdir to $cdup, the toplevel of the working tree
-fatal: merge program failed
-ok 5 - merge-one-file fails without a work tree
+expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
+ok 50 - --first-parent
 
-expecting success of 6060.6 'merge-one-file respects GIT_WORK_TREE': 
-	(cd bare.git &&
-	 mkdir work &&
-	 GIT_WORK_TREE=$PWD/work &&
-	 export GIT_WORK_TREE &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 git merge-index git-merge-one-file -a &&
-	 git cat-file blob :file >work/file-index
-	) &&
-	test_cmp expect-merged bare.git/work/file &&
-	test_cmp expect-merged bare.git/work/file-index
+expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
+ok 51 - --bisect-vars --first-parent
 
-Auto-merging file
-ok 6 - merge-one-file respects GIT_WORK_TREE
+expecting success of 6002.52 '--bisect-all --first-parent': 
+	cat >expect.unsorted <<-EOF &&
+	$(git rev-parse E) (tag: E, dist=0)
+	$(git rev-parse e1) (tag: e1, dist=1)
+	$(git rev-parse e2) (tag: e2, dist=2)
+	$(git rev-parse e3) (tag: e3, dist=3)
+	$(git rev-parse e4) (tag: e4, dist=4)
+	$(git rev-parse e5) (tag: e5, dist=4)
+	$(git rev-parse e6) (tag: e6, dist=3)
+	$(git rev-parse e7) (tag: e7, dist=2)
+	$(git rev-parse e8) (tag: e8, dist=1)
+	EOF
 
-expecting success of 6060.7 'merge-one-file respects core.worktree': 
-	mkdir subdir &&
-	git clone . subdir/child &&
-	(cd subdir &&
-	 GIT_DIR=$PWD/child/.git &&
-	 export GIT_DIR &&
-	 git config core.worktree "$PWD/child" &&
-	 git read-tree -i -m base ten two &&
-	 git merge-index git-merge-one-file -a &&
-	 git cat-file blob :file >file-index
-	) &&
-	test_cmp expect-merged subdir/child/file &&
-	test_cmp expect-merged subdir/file-index
+	# expect results to be ordered by distance (descending),
+	# commit hash (ascending)
+	sort -k4,4r -k1,1 expect.unsorted >expect &&
+	git rev-list --bisect-all --first-parent E ^F >actual &&
+	test_cmp expect actual
 
-Cloning into 'subdir/child'...
-done.
-Auto-merging file
-ok 7 - merge-one-file respects core.worktree
+ok 52 - --bisect-all --first-parent
 
-# passed all 7 test(s)
-1..7
+expecting success of 6002.53 '--bisect without any revisions': 
+	git rev-list --bisect HEAD..HEAD >out &&
+	test_must_be_empty out
+
+ok 53 - --bisect without any revisions
+
+# passed all 53 test(s)
+1..53
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6022-rev-list-missing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6022-rev-list-missing/.git/
-expecting success of 6022.1 'create repository and alternate directory': 
-	test_commit 1 &&
-	test_commit 2 &&
-	test_commit 3 &&
-	git tag -m "tag message" annot_tag HEAD~1 &&
-	git tag regul_tag HEAD~1 &&
-	git branch a_branch HEAD~1
-
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ddc8575] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 1 - create repository and alternate directory
+*** t6003-rev-list-topo-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6003-rev-list-topo-order/.git/
+expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
+ok 1 - rev-list has correct number of entries
 
-expecting success of 6022.2 'rev-list --missing=error fails with missing object HEAD~1': 
-		oid="$(git rev-parse $obj)" &&
-		path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
+ok 2 - simple topo order
 
-		mv "$path" "$path.hidden" &&
-		test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
+ok 3 - simple date order
 
-		test_must_fail git rev-list --missing=error --objects \
-			--no-object-names HEAD
-	
-error: Could not read 82335b23aa7234320d6f8055243c852e4b6a5ca3
-fatal: Failed to traverse parents of commit ddc8575ed6fc205127629848895ac35ba7529ace
-ok 2 - rev-list --missing=error fails with missing object HEAD~1
+expecting success of 6003.4 'simple author-date order': check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
+ok 4 - simple author-date order
 
-expecting success of 6022.3 'rev-list --missing=error fails with missing object HEAD~1^{tree}': 
-		oid="$(git rev-parse $obj)" &&
-		path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
+ok 5 - two diamonds topo order (g6)
 
-		mv "$path" "$path.hidden" &&
-		test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
+ok 6 - multiple heads
 
-		test_must_fail git rev-list --missing=error --objects \
-			--no-object-names HEAD
-	
-fatal: bad tree object c21b0cdc70e26c3ddd8478ac3d82c4e7a3ab3f32
-ddc8575ed6fc205127629848895ac35ba7529ace
-82335b23aa7234320d6f8055243c852e4b6a5ca3
-d0dcf978085b712ac89a73020e40fb8b7e540ec4
-80055bbfa58b994e48e236912516273bcbf0dd1c
-d00491fd7e5bb6fa28c517a0bb32b8b506539d4d
-0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
-00750edc07d6415dcc07ae0351e9397b0222b7ba
-ok 3 - rev-list --missing=error fails with missing object HEAD~1^{tree}
+expecting success of 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
+ok 7 - multiple heads, prune at a1
 
-expecting success of 6022.4 'rev-list --missing=error fails with missing object HEAD:1.t': 
-		oid="$(git rev-parse $obj)" &&
-		path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
+ok 8 - multiple heads, prune at l1
 
-		mv "$path" "$path.hidden" &&
-		test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
+ok 9 - cross-epoch, head at l5, prune at l1
 
-		test_must_fail git rev-list --missing=error --objects \
-			--no-object-names HEAD
-	
-fatal: missing blob object 'd00491fd7e5bb6fa28c517a0bb32b8b506539d4d'
-ddc8575ed6fc205127629848895ac35ba7529ace
-82335b23aa7234320d6f8055243c852e4b6a5ca3
-d0dcf978085b712ac89a73020e40fb8b7e540ec4
-80055bbfa58b994e48e236912516273bcbf0dd1c
-ok 4 - rev-list --missing=error fails with missing object HEAD:1.t
+expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
+ok 10 - duplicated head arguments
 
-expecting success of 6022.5 'rev-list --missing=allow-any with missing HEAD~1': 
-			oid="$(git rev-parse $obj)" &&
-			path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
+ok 11 - prune near topo
 
-			# Before the object is made missing, we use rev-list to
-			# get the expected oids.
-			git rev-list --objects --no-object-names \
-				HEAD ^$obj >expect.raw &&
+expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
+ok 12 - head has no parent
 
-			# Blobs are shared by all commits, so even though a commit/tree
-			# might be skipped, its blob must be accounted for.
-			if test $obj != "HEAD:1.t"
-			then
-				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
-				echo $(git rev-parse HEAD:2.t) >>expect.raw
-			fi &&
+expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
+ok 13 - two nodes - one head, one base
 
-			mv "$path" "$path.hidden" &&
-			test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
+ok 14 - three nodes one head, one internal, one base
 
-			git rev-list --missing=$action --objects --no-object-names \
-				HEAD >actual.raw &&
+expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
+ok 15 - linear prune l2 ^root
 
-			# When the action is to print, we should also add the missing
-			# oid to the expect list.
-			case $action in
-			allow-any)
-				;;
-			print)
-				grep ?$oid actual.raw &&
-				echo ?$oid >>expect.raw
-				;;
-			esac &&
+expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
+ok 16 - linear prune l2 ^l0
 
-			sort actual.raw >actual &&
-			sort expect.raw >expect &&
-			test_cmp expect actual
-		
-ok 5 - rev-list --missing=allow-any with missing HEAD~1
+expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
+ok 17 - linear prune l2 ^l1
 
-expecting success of 6022.6 'rev-list --missing=print with missing HEAD~1': 
-			oid="$(git rev-parse $obj)" &&
-			path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
+ok 18 - linear prune l5 ^a4
 
-			# Before the object is made missing, we use rev-list to
-			# get the expected oids.
-			git rev-list --objects --no-object-names \
-				HEAD ^$obj >expect.raw &&
+expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
+ok 19 - linear prune l5 ^l3
 
-			# Blobs are shared by all commits, so even though a commit/tree
-			# might be skipped, its blob must be accounted for.
-			if test $obj != "HEAD:1.t"
-			then
-				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
-				echo $(git rev-parse HEAD:2.t) >>expect.raw
-			fi &&
+expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
+ok 20 - linear prune l5 ^l4
 
-			mv "$path" "$path.hidden" &&
-			test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
+ok 21 - max-count 10 - topo order
 
-			git rev-list --missing=$action --objects --no-object-names \
-				HEAD >actual.raw &&
+expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
+ok 22 - max-count 10 - non topo order
 
-			# When the action is to print, we should also add the missing
-			# oid to the expect list.
-			case $action in
-			allow-any)
-				;;
-			print)
-				grep ?$oid actual.raw &&
-				echo ?$oid >>expect.raw
-				;;
-			esac &&
+expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
+ok 23 - --max-age=c3, no --topo-order
 
-			sort actual.raw >actual &&
-			sort expect.raw >expect &&
-			test_cmp expect actual
-		
-?82335b23aa7234320d6f8055243c852e4b6a5ca3
-ok 6 - rev-list --missing=print with missing HEAD~1
+expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
+ok 24 - --max-age=c3, --topo-order
 
-expecting success of 6022.7 'rev-list --missing=allow-any with missing HEAD~1^{tree}': 
-			oid="$(git rev-parse $obj)" &&
-			path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
+ok 25 - one specified head reachable from another a4, c3, --topo-order
 
-			# Before the object is made missing, we use rev-list to
-			# get the expected oids.
-			git rev-list --objects --no-object-names \
-				HEAD ^$obj >expect.raw &&
+expecting success of 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
+ok 26 - one specified head reachable from another c3, a4, --topo-order
 
-			# Blobs are shared by all commits, so even though a commit/tree
-			# might be skipped, its blob must be accounted for.
-			if test $obj != "HEAD:1.t"
-			then
-				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
-				echo $(git rev-parse HEAD:2.t) >>expect.raw
-			fi &&
+expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
+ok 27 - one specified head reachable from another a4, c3, no --topo-order
 
-			mv "$path" "$path.hidden" &&
-			test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.28 'one specified head reachable from another c3, a4, no --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
+ok 28 - one specified head reachable from another c3, a4, no --topo-order
 
-			git rev-list --missing=$action --objects --no-object-names \
-				HEAD >actual.raw &&
+expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
+ok 29 - graph with c3 and a4 parents of head
 
-			# When the action is to print, we should also add the missing
-			# oid to the expect list.
-			case $action in
-			allow-any)
-				;;
-			print)
-				grep ?$oid actual.raw &&
-				echo ?$oid >>expect.raw
-				;;
-			esac &&
+expecting success of 6003.30 'graph with a4 and c3 parents of head': check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
+ok 30 - graph with a4 and c3 parents of head
 
-			sort actual.raw >actual &&
-			sort expect.raw >expect &&
-			test_cmp expect actual
-		
-ok 7 - rev-list --missing=allow-any with missing HEAD~1^{tree}
+expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
+ok 31 - head ^head --topo-order
 
-expecting success of 6022.8 'rev-list --missing=print with missing HEAD~1^{tree}': 
-			oid="$(git rev-parse $obj)" &&
-			path=".git/objects/$(test_oid_to_path $oid)" &&
+expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
+ok 32 - head ^head no --topo-order
 
-			# Before the object is made missing, we use rev-list to
-			# get the expected oids.
-			git rev-list --objects --no-object-names \
-				HEAD ^$obj >expect.raw &&
+expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
+ok 33 - simple topo order (l5r1)
 
-			# Blobs are shared by all commits, so even though a commit/tree
-			# might be skipped, its blob must be accounted for.
-			if test $obj != "HEAD:1.t"
-			then
-				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
-				echo $(git rev-parse HEAD:2.t) >>expect.raw
-			fi &&
+expecting success of 6003.34 'simple topo order (r1l5)': check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
+ok 34 - simple topo order (r1l5)
 
-			mv "$path" "$path.hidden" &&
-			test_when_finished "mv $path.hidden $path" &&
+expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
+ok 35 - don't print things unreachable from one branch
 
-			git rev-list --missing=$action --objects --no-object-names \
-				HEAD >actual.raw &&
+expecting success of 6003.36 '--topo-order a4 l3': check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
+ok 36 - --topo-order a4 l3
 
-			# When the action is to print, we should also add the missing
-			# oid to the expect list.
-			case $action in
-			allow-any)
-				;;
-			print)
-				grep ?$oid actual.raw &&
-				echo ?$oid >>expect.raw
-				;;
+# passed all 36 test(s)
+1..36
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6017-rev-list-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6017-rev-list-stdin/.git/
+expecting success of 6017.1 'setup': 
+	(
+		for i in 0 $them
+		do
+			for j in $them
+			do
+				echo $i.$j >file-$j &&
+				git add file-$j || exit
+			done &&
+			test_tick &&
+			git commit -m $i || exit
+		done &&
+		for i in $them
+		do
+			git checkout -b side-$i main~$i &&
+			echo updated $i >file-$i &&
+			git add file-$i &&
+			test_tick &&
+			git commit -m side-$i || exit
+		done &&
+
+		git update-ref refs/heads/-dashed-branch HEAD
+	)
+
+[main (root-commit) b2718df] 0
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+ create mode 100644 file-3
+ create mode 100644 file-4
+ create mode 100644 file-5
+ create mode 100644 file-6
+ create mode 100644 file-7
+[main 4c7c799] 1
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a24e200] 2
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 72c7eca] 3
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 680e5c3] 4
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 496e2a9] 5
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main c5757f4] 6
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a21e804] 7
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+Switched to a new branch 'side-1'
+[side-1 c52bcff] side-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-2'
+[side-2 fe893aa] side-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-3'
+[side-3 48694b2] side-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-4'
+[side-4 e31c210] side-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-5'
+[side-5 5786a4a] side-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-6'
+[side-6 6879e94] side-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-7'
+[side-7 a65952b] side-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6017.2 'check rev-list main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 2 - check rev-list main
+
+expecting success of 6017.3 'check log --stat main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 3 - check log --stat main
+
+expecting success of 6017.4 'check rev-list side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 4 - check rev-list side-1 ^side-4
+
+expecting success of 6017.5 'check log --stat side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 5 - check log --stat side-1 ^side-4
+
+expecting success of 6017.6 'check rev-list side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 6 - check rev-list side-1 ^side-7 --
+
+expecting success of 6017.7 'check log --stat side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 7 - check log --stat side-1 ^side-7 --
+
+expecting success of 6017.8 'check rev-list side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 8 - check rev-list side-1 ^side-7 -- file-1
+
+expecting success of 6017.9 'check log --stat side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - check log --stat side-1 ^side-7 -- file-1
+
+expecting success of 6017.10 'check rev-list side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 10 - check rev-list side-1 ^side-7 -- file-2
+
+expecting success of 6017.11 'check log --stat side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - check log --stat side-1 ^side-7 -- file-2
+
+expecting success of 6017.12 'check rev-list side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 12 - check rev-list side-3 ^side-4 -- file-3
+
+expecting success of 6017.13 'check log --stat side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - check log --stat side-3 ^side-4 -- file-3
+
+expecting success of 6017.14 'check rev-list side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+ok 14 - check rev-list side-3 ^side-2
+
+expecting success of 6017.15 'check log --stat side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - check log --stat side-3 ^side-2
+
+expecting success of 6017.16 'check rev-list side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 16 - check rev-list side-3 ^side-2 -- file-1
+
+expecting success of 6017.17 'check log --stat side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 17 - check log --stat side-3 ^side-2 -- file-1
+
+expecting success of 6017.18 'check rev-list --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 18 - check rev-list --all
+
+expecting success of 6017.19 'check log --stat --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 19 - check log --stat --all
+
+expecting success of 6017.20 'check rev-list --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 20 - check rev-list --all --not --branches
+
+expecting success of 6017.21 'check log --stat --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 21 - check log --stat --all --not --branches
+
+expecting success of 6017.22 'check rev-list --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 22 - check rev-list --glob=refs/heads
+
+expecting success of 6017.23 'check log --stat --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 23 - check log --stat --glob=refs/heads
+
+expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 24 - check rev-list --glob=refs/heads --
+
+expecting success of 6017.25 'check log --stat --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 25 - check log --stat --glob=refs/heads --
+
+expecting success of 6017.26 'check rev-list --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 26 - check rev-list --glob=refs/heads -- file-1
+
+expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  1 file changed, 1 insertion(+)
+ok 27 - check log --stat --glob=refs/heads -- file-1
+
+expecting success of 6017.28 'check rev-list --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 28 - check rev-list --end-of-options -dashed-branch
+
+expecting success of 6017.29 'check log --stat --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 29 - check log --stat --end-of-options -dashed-branch
+
+expecting success of 6017.30 'check rev-list --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+ok 30 - check rev-list --all --not refs/heads/main
+
+expecting success of 6017.31 'check log --stat --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 31 - check log --stat --all --not refs/heads/main
+
+expecting success of 6017.32 'not only --stdin': 
+	cat >expect <<-EOF &&
+	7
+
+	file-1
+	file-2
+	EOF
+	cat >input <<-EOF &&
+	^main^
+	--
+	file-2
+	EOF
+	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
+		<input >actual &&
+	test_cmp expect actual
+
+ok 32 - not only --stdin
+
+expecting success of 6017.33 'pseudo-opt with missing value': 
+	cat >input <<-EOF &&
+	--glob
+	refs/heads
+	EOF
+
+	cat >expect <<-EOF &&
+	fatal: Option ${SQ}--glob${SQ} requires a value
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 33 - pseudo-opt with missing value
+
+expecting success of 6017.34 'pseudo-opt with invalid value': 
+	cat >input <<-EOF &&
+	--no-walk=garbage
+	EOF
+
+	cat >expect <<-EOF &&
+	error: invalid argument to --no-walk
+	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 34 - pseudo-opt with invalid value
+
+expecting success of 6017.35 'unknown option without --end-of-options': 
+	cat >input <<-EOF &&
+	-dashed-branch
+	EOF
+
+	cat >expect <<-EOF &&
+	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 35 - unknown option without --end-of-options
+
+expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
+	cat >input <<-EOF &&
+	refs/heads/main
+	EOF
+	git rev-list refs/heads/main >expect &&
+
+	git rev-list refs/heads/main --not --stdin <input >actual &&
+	test_cmp expect actual
+
+ok 36 - --not on command line does not influence revisions read via --stdin
+
+expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
+	cat >input <<-EOF &&
+	--not
+	EOF
+	git rev-list refs/heads/main >expect &&
+
+	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
+	test_cmp expect actual
+
+ok 37 - --not via stdin does not influence revisions from command line
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6012-rev-list-simplify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6012-rev-list-simplify/.git/
+expecting success of 6012.1 'setup': 
+	echo "Hi there" >file &&
+	echo "initial" >lost &&
+	git add file lost &&
+	test_tick && git commit -m "Initial file and lost" &&
+	note A &&
+
+	git branch other-branch &&
+
+	git symbolic-ref HEAD refs/heads/unrelated &&
+	git rm -f "*" &&
+	echo "Unrelated branch" >side &&
+	git add side &&
+	test_tick && git commit -m "Side root" &&
+	note J &&
+	git checkout main &&
+
+	echo "Hello" >file &&
+	echo "second" >lost &&
+	git add file lost &&
+	test_tick && GIT_AUTHOR_DATE=$(($test_tick + 120)) git commit -m "Modified file and lost" &&
+	note B &&
+
+	git checkout other-branch &&
+
+	echo "Hello" >file &&
+	>lost &&
+	git add file lost &&
+	test_tick && git commit -m "Modified the file identically" &&
+	note C &&
+
+	echo "This is a stupid example" >another-file &&
+	git add another-file &&
+	test_tick && git commit -m "Add another file" &&
+	note D &&
+
+	test_tick &&
+	test_must_fail git merge -m "merge" main &&
+	>lost && git commit -a -m "merge" &&
+	note E &&
+
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Irrelevant change" &&
+	note F &&
+
+	git checkout main &&
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Another irrelevant change" &&
+	note G &&
+
+	test_tick && git merge -m "merge" other-branch &&
+	note H &&
+
+	echo "Final change" >file &&
+	test_tick && git commit -a -m "Final change" &&
+	note I &&
+
+	git checkout main &&
+	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
+	note K &&
+
+	echo "Immaterial" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Last" &&
+	note L
+
+[main (root-commit) 2ce5a1a] Initial file and lost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 lost
+rm 'file'
+rm 'lost'
+[unrelated (root-commit) efdd716] Side root
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side
+Switched to branch 'main'
+[main 1a21661] Modified file and lost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'other-branch'
+[other-branch 96e46c8] Modified the file identically
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+[other-branch afa190a] Add another file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 another-file
+Auto-merging lost
+CONFLICT (content): Merge conflict in lost
+Automatic merge failed; fix conflicts and then commit the result.
+[other-branch 87e2285] merge
+ Author: A U Thor <author@example.com>
+[other-branch f67ebfb] Irrelevant change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 elif
+Switched to branch 'main'
+[main b2dce95] Another irrelevant change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 elif
+Merge made by the 'ort' strategy.
+ another-file | 1 +
+ lost         | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 another-file
+[main 62ab427] Final change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Already on 'main'
+Merge made by the 'ort' strategy.
+ side | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side
+[main 1be1b21] Last
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6012.2 'log --full-history --topo-order': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 2 - log --full-history --topo-order
+
+expecting success of 6012.3 'log --full-history': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 3 - log --full-history
+
+expecting success of 6012.4 'log --full-history --date-order': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 4 - log --full-history --date-order
+
+expecting success of 6012.5 'log --full-history --author-date-order': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 5 - log --full-history --author-date-order
+
+expecting success of 6012.6 'log --full-history -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 6 - log --full-history -- file
+
+expecting success of 6012.7 'log --full-history --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 7 - log --full-history --topo-order -- file
+
+expecting success of 6012.8 'log --full-history --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 8 - log --full-history --date-order -- file
+
+expecting success of 6012.9 'log --full-history --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 9 - log --full-history --author-date-order -- file
+
+expecting success of 6012.10 'log --simplify-merges -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 10 - log --simplify-merges -- file
+
+expecting success of 6012.11 'log --simplify-merges --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 11 - log --simplify-merges --topo-order -- file
+
+expecting success of 6012.12 'log --simplify-merges --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 12 - log --simplify-merges --date-order -- file
+
+expecting success of 6012.13 'log --simplify-merges --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 13 - log --simplify-merges --author-date-order -- file
+
+expecting success of 6012.14 'log -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 14 - log -- file
+
+expecting success of 6012.15 'log --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 15 - log --topo-order -- file
+
+expecting success of 6012.16 'log --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 16 - log --date-order -- file
+
+expecting success of 6012.17 'log --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 17 - log --author-date-order -- file
+
+expecting success of 6012.18 'log --first-parent -- another-file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 18 - log --first-parent -- another-file
+
+expecting success of 6012.19 'log --first-parent --topo-order -- another-file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 19 - log --first-parent --topo-order -- another-file
+
+expecting success of 6012.20 'log --first-parent L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 20 - log --first-parent L
+
+expecting success of 6012.21 'log --exclude-first-parent-only F ^L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 21 - log --exclude-first-parent-only F ^L
+
+expecting success of 6012.22 'log F ^L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 22 - log F ^L
+
+expecting success of 6012.23 'log L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 23 - log L ^F
+
+expecting success of 6012.24 'log --exclude-first-parent-only L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 24 - log --exclude-first-parent-only L ^F
+
+expecting success of 6012.25 'log --exclude-first-parent-only --first-parent L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 25 - log --exclude-first-parent-only --first-parent L ^F
+
+expecting success of 6012.26 'log --full-history E -- lost': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 26 - log --full-history E -- lost
+
+expecting success of 6012.27 'full history simplification without parent': 
+	printf "%s\n" E C B A >expect &&
+	git log --pretty="$FMT" --full-history E -- lost >out &&
+	unnote >actual <out &&
+	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+	test_cmp expect check
+
+ok 27 - full history simplification without parent
+
+expecting success of 6012.28 '--full-diff is not affected by --parents': 
+	git log -p --pretty="%H" --full-diff -- file >expected &&
+	git log -p --pretty="%H" --full-diff --parents -- file >actual &&
+	test_cmp expected actual
+
+ok 28 - --full-diff is not affected by --parents
+
+expecting success of 6012.29 'setup rebuild repo': 
+	rm -rf .git * &&
+	git init &&
+	git switch -c topic &&
+
+	echo base >file &&
+	git add file &&
+	test_commit I &&
+
+	echo A >file &&
+	git add file &&
+	test_commit A &&
+
+	git switch -c branchB I &&
+	echo B >file &&
+	git add file &&
+	test_commit B &&
+
+	git switch topic &&
+	test_must_fail git merge -m "M" B &&
+	echo A >file &&
+	echo B >>file &&
+	git add file &&
+	git merge --continue &&
+	note M &&
+
+	echo C >other &&
+	git add other &&
+	test_commit C &&
+
+	git switch -c branchX I &&
+	echo X >file &&
+	git add file &&
+	test_commit X &&
+
+	git switch -c branchR M &&
+	git merge -m R -Xtheirs X &&
+	note R &&
+
+	git switch topic &&
+	git merge -m N R &&
+	note N &&
+
+	git switch -c branchY M &&
+	echo Y >y &&
+	git add y &&
+	test_commit Y &&
+
+	git switch -c branchZ C &&
+	echo Z >z &&
+	git add z &&
+	test_commit Z &&
+
+	git switch topic &&
+	git merge -m O Z &&
+	note O &&
+
+	git merge -m P Y &&
+	note P
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6012-rev-list-simplify/.git/
+Switched to a new branch 'topic'
+[topic (root-commit) 8df680a] I
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 I.t
+ create mode 100644 file
+[topic 93fcd66] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 A.t
+Switched to a new branch 'branchB'
+[branchB 2bc7954] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B.t
+Switched to branch 'topic'
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[topic 58a754c] M
+ Author: A U Thor <author@example.com>
+[topic f73bd6d] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 other
+Switched to a new branch 'branchX'
+[branchX a2f4788] X
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchR'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchY'
+[branchY 85e7a8e] Y
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+Switched to a new branch 'branchZ'
+[branchZ 35501c2] Z
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ Z.t | 1 +
+ z   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Merge made by the 'ort' strategy.
+ Y.t | 1 +
+ y   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+ok 29 - setup rebuild repo
+
+expecting success of 6012.30 'log -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 30 - log -- file
+
+expecting success of 6012.31 'log --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 31 - log --show-pulls -- file
+
+expecting success of 6012.32 'log --full-history --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 32 - log --full-history --topo-order -- file
+
+expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 33 - log --simplify-merges --topo-order --show-pulls -- file
+
+expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 34 - log --simplify-merges --topo-order -- file
+
+expecting success of 6012.35 'log --first-parent -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 35 - log --first-parent -- file
+
+expecting success of 6012.36 'log --first-parent --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 36 - log --first-parent --show-pulls -- file
+
+expecting success of 6012.37 'log --topo-order --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 37 - log --topo-order --ancestry-path A..HEAD -- file
+
+expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- file
+
+expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 39 - log --topo-order --full-history --ancestry-path A..HEAD -- file
+
+expecting success of 6012.40 'log --topo-order --simplify-merges --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
+
+expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+
+expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
+	cat >expect <<-\EOF &&
+	* N
+	*   R
+	|\  
+	| * X
+	* |   M
+	|\ \  
+	| * | B
+	| |/  
+	* / A
+	|/  
+	* I
+	EOF
+	git log --graph --pretty="%s" \
+		--simplify-merges --show-pulls \
+		-- file >actual &&
+	test_cmp expect actual
+
+ok 42 - log --graph --simplify-merges --show-pulls
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t5616-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/.git/
+expecting success of 5616.1 'setup normal src repo': 
+	echo "{print \$1}" >print_1.awk &&
+	echo "{print \$2}" >print_2.awk &&
+
+	git init src &&
+	for n in 1 2 3 4
+	do
+		echo "This is file: $n" > src/file.$n.txt &&
+		git -C src add file.$n.txt &&
+		git -C src commit -m "file $n" &&
+		git -C src ls-files -s file.$n.txt >>temp || return 1
+	done &&
+	awk -f print_2.awk <temp | sort >expect_1.oids &&
+	test_line_count = 4 expect_1.oids
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) a042509] file 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1.txt
+[main 6a6b7aa] file 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2.txt
+[main 2b2f6e6] file 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3.txt
+[main aeb0144] file 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4.txt
+ok 1 - setup normal src repo
+
+expecting success of 5616.2 'setup bare clone for server': 
+	git clone --bare "file://$(pwd)/src" srv.bare &&
+	git -C srv.bare config --local uploadpack.allowfilter 1 &&
+	git -C srv.bare config --local uploadpack.allowanysha1inwant 1
+
+Cloning into bare repository 'srv.bare'...
+ok 2 - setup bare clone for server
+
+expecting success of 5616.3 'do partial clone 1': 
+	git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
+
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
+
+	test_cmp expect_1.oids observed.oids &&
+	test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
+	test "$(git -C pc1 config --local remote.origin.promisor)" = "true" &&
+	test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none"
+
+Cloning into 'pc1'...
+ok 3 - do partial clone 1
+
+expecting success of 5616.4 'rev-list --missing=allow-promisor on partial clone': 
+	git -C pc1 rev-list --objects --missing=allow-promisor HEAD >actual &&
+	git -C pc1 rev-list --objects --missing=print HEAD >expect.raw &&
+	grep -v "^?" expect.raw >expect &&
+	test_cmp expect actual
+
+ok 4 - rev-list --missing=allow-promisor on partial clone
+
+expecting success of 5616.5 'verify that .promisor file contains refs fetched': 
+	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
+	test_line_count = 1 promisorlist &&
+	git -C srv.bare rev-parse --verify HEAD >headhash &&
+	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
+	grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
+
+aeb0144502699ac86da4c2c98d4cd3b741c6c645 HEAD
+aeb0144502699ac86da4c2c98d4cd3b741c6c645 refs/heads/main
+ok 5 - verify that .promisor file contains refs fetched
+
+expecting success of 5616.6 'verify checkout with dynamic object fetch': 
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 4 observed &&
+	git -C pc1 checkout main &&
+	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
+	test_line_count = 0 observed
+
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+ok 6 - verify checkout with dynamic object fetch
+
+expecting success of 5616.7 'push new commits to server': 
+	git -C src remote add srv "file://$(pwd)/srv.bare" &&
+	for x in a b c d e
+	do
+		echo "Mod file.1.txt $x" >>src/file.1.txt &&
+		git -C src add file.1.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src blame main -- file.1.txt >expect.blame &&
+	git -C src push -u srv main
+
+[main b4a5c87] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 2260bed] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 85d45de] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main f571048] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main d0edb11] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   aeb0144..d0edb11  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 7 - push new commits to server
+
+expecting success of 5616.8 'partial fetch inherits filter settings': 
+	git -C pc1 fetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 5 observed
+
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   aeb0144..d0edb11  main       -> origin/main
+ok 8 - partial fetch inherits filter settings
+
+expecting success of 5616.9 'verify diff causes dynamic object fetch': 
+	git -C pc1 diff main..origin/main -- file.1.txt &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 main..origin/main >observed &&
+	test_line_count = 4 observed
+
+diff --git a/file.1.txt b/file.1.txt
+index 54ff69b..5cc7250 100644
+--- a/file.1.txt
++++ b/file.1.txt
+@@ -1 +1,6 @@
+ This is file: 1
++Mod file.1.txt a
++Mod file.1.txt b
++Mod file.1.txt c
++Mod file.1.txt d
++Mod file.1.txt e
+ok 9 - verify diff causes dynamic object fetch
+
+expecting success of 5616.10 'verify blame causes dynamic object fetch': 
+	git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
+	test_cmp expect.blame observed.blame &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
+
+ok 10 - verify blame causes dynamic object fetch
+
+expecting success of 5616.11 'push new commits to server for file.2.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.2.txt $x" >>src/file.2.txt &&
+		git -C src add file.2.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
+
+[main 50dbe65] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 71d1ab3] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main c2c95e9] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 95992c5] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ac0a329] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 03262f2] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   d0edb11..03262f2  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 11 - push new commits to server for file.2.txt
+
+expecting success of 5616.12 'override inherited filter-spec using --no-filter': 
+	git -C pc1 fetch --no-filter origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
+
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   d0edb11..03262f2  main       -> origin/main
+ok 12 - override inherited filter-spec using --no-filter
+
+expecting success of 5616.13 'push new commits to server for file.3.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.3.txt $x" >>src/file.3.txt &&
+		git -C src add file.3.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
+
+[main 2456429] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main f359f06] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ed3a9d1] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 42a1e60] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 2827aa8] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3f5edd7] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   03262f2..3f5edd7  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 13 - push new commits to server for file.3.txt
+
+expecting success of 5616.14 'manual prefetch of missing objects': 
+	git -C pc1 fetch --filter=blob:none origin &&
+
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		 main..origin/main >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
+
+	test_line_count = 6 observed.oids &&
+	git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
+
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed.oids &&
+
+	test_line_count = 0 observed.oids
+
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   03262f2..3f5edd7  main       -> origin/main
+remote: Enumerating objects: 6, done.        
+remote: Counting objects:  16% (1/6)        
remote: Counting objects:  33% (2/6)        
remote: Counting objects:  50% (3/6)        
remote: Counting objects:  66% (4/6)        
remote: Counting objects:  83% (5/6)        
remote: Counting objects: 100% (6/6)        
remote: Counting objects: 100% (6/6), done.        
+remote: Compressing objects:  20% (1/5)        
remote: Compressing objects:  40% (2/5)        
remote: Compressing objects:  60% (3/5)        
remote: Compressing objects:  80% (4/5)        
remote: Compressing objects: 100% (5/5)        
remote: Compressing objects: 100% (5/5), done.        
+remote: Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)        
+7724cffe11579f391f6c098265878597ecd1ca74 7724cffe11579f391f6c098265878597ecd1ca74
+7c22d416ccef0f2e04b1909d448fa12714ed0c5a 7c22d416ccef0f2e04b1909d448fa12714ed0c5a
+7d87eff241fc01757db1d4f2f4710fbaeacd9950 7d87eff241fc01757db1d4f2f4710fbaeacd9950
+9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d 9f8a0fb67784f4d9b9f81d22baf14c5bead82c7d
+a5e78dc6f3d20c8de85b54d4596946979a89d383 a5e78dc6f3d20c8de85b54d4596946979a89d383
+e5f3bec205041acafa4538978741f185e437e1ee e5f3bec205041acafa4538978741f185e437e1ee
+ok 14 - manual prefetch of missing objects
+
+expecting success of 5616.15 'push new commits to server for file.4.txt': 
+	for x in a b c d e f
+	do
+		echo "Mod file.4.txt $x" >src/file.4.txt &&
+		if list_contains "a,b" "$x"; then
+			printf "%10000s" X >>src/file.4.txt
+		fi &&
+		if list_contains "c,d" "$x"; then
+			printf "%20000s" X >>src/file.4.txt
+		fi &&
+		git -C src add file.4.txt &&
+		git -C src commit -m "mod $x" || return 1
+	done &&
+	git -C src push -u srv main
+
+[main e9880ed] mod a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+[main b08fb33] mod b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main dc63000] mod c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+[main d79e7f2] mod d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0e6343d] mod e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+[main 129c8a2] mod f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   3f5edd7..129c8a2  main -> main
+branch 'main' set up to track 'srv/main'.
+ok 15 - push new commits to server for file.4.txt
+
+expecting success of 5616.16 'apply a different filter using --refetch': 
+	git -C pc1 fetch --filter=blob:limit=999 origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 4 observed &&
+
+	git -C pc1 fetch --filter=blob:limit=19999 --refetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 2 observed &&
+
+	git -c protocol.version=0 -C pc1 fetch --filter=blob:limit=29999 \
+		--refetch origin &&
+	git -C pc1 rev-list --quiet --objects --missing=print \
+		main..origin/main >observed &&
+	test_line_count = 0 observed
+
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   3f5edd7..129c8a2  main       -> origin/main
+ok 16 - apply a different filter using --refetch
+
+expecting success of 5616.17 'fetch --refetch works with a shallow clone': 
+	git clone --no-checkout --depth=1 --filter=blob:none "file://$(pwd)/srv.bare" pc1s &&
+	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+	test_line_count = 6 observed &&
+
+	GIT_TRACE=1 git -C pc1s fetch --filter=blob:limit=999 --refetch origin &&
+	git -C pc1s rev-list --objects --missing=print HEAD >observed &&
+	test_line_count = 6 observed
+
+Cloning into 'pc1s'...
+trace: built-in: git fetch --filter=blob:limit=999 --refetch origin
+trace: run_command: unset GIT_PREFIX; GIT_PROTOCOL=version=2 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\'''
+trace: start_command: /bin/sh -c 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\''' 'git-upload-pack '\''/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'\'''
+trace: built-in: git upload-pack '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare'
+trace: run_command: git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git --shallow-file '' pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999
+remote: trace: built-in: git pack-objects --revs --thin --stdout --shallow --delta-base-offset --include-tag --filter=blob:limit=999        
+trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin --promisor --pack_header=2,6
+trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,6
+run_processes_parallel: preparing to run up to 1 tasks
+run_processes_parallel: done
+trace: run_command: git maintenance run --auto --no-quiet --detach
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git maintenance run --auto --no-quiet --detach
+trace: built-in: git maintenance run --auto --no-quiet --detach
+ok 17 - fetch --refetch works with a shallow clone
+
+expecting success of 5616.18 'fetch --refetch triggers repacking': 
+	GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
+	export GIT_TRACE2_CONFIG_PARAMS &&
+
+	GIT_TRACE2_EVENT="$PWD/trace1.event" \
+	git -C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace1.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
+
+	GIT_TRACE2_EVENT="$PWD/trace2.event" \
+	git -c protocol.version=0 \
+		-c gc.autoPackLimit=0 \
+		-c maintenance.incremental-repack.auto=1234 \
+		-C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace2.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
+
+	GIT_TRACE2_EVENT="$PWD/trace3.event" \
+	git -c protocol.version=0 \
+		-c gc.autoPackLimit=1234 \
+		-c maintenance.incremental-repack.auto=0 \
+		-C pc1 fetch --refetch origin &&
+	test_subcommand git maintenance run --auto --no-quiet --detach <trace3.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
+
+{"event":"child_start","sid":"20250317T132507.767923Z-H5c947e1c-P00326273","thread":"main","time":"2025-03-17T13:25:07.955183Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250317T132507.767923Z-H5c947e1c-P00326273/20250317T132507.974356Z-H5c947e1c-P003262f5","thread":"main","time":"2025-03-17T13:25:07.974832Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250317T132507.767923Z-H5c947e1c-P00326273/20250317T132507.974356Z-H5c947e1c-P003262f5/20250317T132508.007939Z-H5c947e1c-P0032630d","thread":"main","time":"2025-03-17T13:25:08.008233Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250317T132507.767923Z-H5c947e1c-P00326273/20250317T132507.974356Z-H5c947e1c-P003262f5","thread":"main","time":"2025-03-17T13:25:07.974837Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20250317T132507.767923Z-H5c947e1c-P00326273/20250317T132507.974356Z-H5c947e1c-P003262f5/20250317T132508.007939Z-H5c947e1c-P0032630d","thread":"main","time":"2025-03-17T13:25:08.008238Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20250317T132507.767923Z-H5c947e1c-P00326273/20250317T132507.974356Z-H5c947e1c-P003262f5/20250317T132508.007939Z-H5c947e1c-P0032630d/20250317T132508.026590Z-H5c947e1c-P00326319","thread":"main","time":"2025-03-17T13:25:08.026930Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20250317T132508.081672Z-H5c947e1c-P00326330","thread":"main","time":"2025-03-17T13:25:08.279041Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250317T132508.081672Z-H5c947e1c-P00326330","thread":"main","time":"2025-03-17T13:25:08.082172Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250317T132508.081672Z-H5c947e1c-P00326330/20250317T132508.218340Z-H5c947e1c-P00326398","thread":"main","time":"2025-03-17T13:25:08.218825Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250317T132508.081672Z-H5c947e1c-P00326330/20250317T132508.218340Z-H5c947e1c-P00326398/20250317T132508.266578Z-H5c947e1c-P003263be","thread":"main","time":"2025-03-17T13:25:08.267091Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250317T132508.081672Z-H5c947e1c-P00326330/20250317T132508.298315Z-H5c947e1c-P003263d6","thread":"main","time":"2025-03-17T13:25:08.298799Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20250317T132508.081672Z-H5c947e1c-P00326330/20250317T132508.298315Z-H5c947e1c-P003263d6","thread":"main","time":"2025-03-17T13:25:08.298807Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20250317T132508.403818Z-H5c947e1c-P00326415","thread":"main","time":"2025-03-17T13:25:08.602998Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet","--detach"]}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.622312Z-H5c947e1c-P003264aa","thread":"main","time":"2025-03-17T13:25:08.622809Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.622312Z-H5c947e1c-P003264aa/20250317T132508.662292Z-H5c947e1c-P003264c3","thread":"main","time":"2025-03-17T13:25:08.662599Z","file":"trace2.c","line":439,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415","thread":"main","time":"2025-03-17T13:25:08.404347Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.542496Z-H5c947e1c-P00326473","thread":"main","time":"2025-03-17T13:25:08.543003Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.542496Z-H5c947e1c-P00326473/20250317T132508.586359Z-H5c947e1c-P00326498","thread":"main","time":"2025-03-17T13:25:08.586865Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.622312Z-H5c947e1c-P003264aa","thread":"main","time":"2025-03-17T13:25:08.622805Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20250317T132508.403818Z-H5c947e1c-P00326415/20250317T132508.622312Z-H5c947e1c-P003264aa/20250317T132508.662292Z-H5c947e1c-P003264c3","thread":"main","time":"2025-03-17T13:25:08.662595Z","file":"trace2.c","line":439,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+ok 18 - fetch --refetch triggers repacking
+
+expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
+	test_create_repo submodule &&
+	test_commit -C submodule mycommit &&
+
+	test_create_repo src_with_sub &&
+	git -C src_with_sub config uploadpack.allowfilter 1 &&
+	git -C src_with_sub config uploadpack.allowanysha1inwant 1 &&
+
+	test_config_global protocol.file.allow always &&
+
+	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
+	git -C src_with_sub commit -m "commit with submodule" &&
+
+	git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
+	test_when_finished rm -rf dst
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/submodule/.git/
+[main (root-commit) 35ce5a7] mycommit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 mycommit.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src_with_sub/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
+[main (root-commit) 2413c86] commit with submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 mysub
+Cloning into 'dst'...
+ok 19 - partial clone with transfer.fsckobjects=1 works with submodules
+
+expecting success of 5616.20 'lazily fetched .gitmodules works': 
+	git clone --filter="blob:none" --no-checkout "file://$(pwd)/src_with_sub" dst &&
+	git -C dst fetch &&
+	test_when_finished rm -rf dst
+
+Cloning into 'dst'...
+ok 20 - lazily fetched .gitmodules works
+
+expecting success of 5616.21 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects': 
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src" dst &&
+	grep "git index-pack.*--fsck-objects" trace
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
+[main 1fb08d4] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Cloning into 'dst'...
+trace: run_command: git index-pack --stdin --fix-thin '--keep=fetch-pack 3303770 on i-capture-the-hostname' --promisor --fsck-objects
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin '--keep=fetch-pack 3303770 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 3303770 on i-capture-the-hostname' --promisor --fsck-objects
+trace: run_command: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin --promisor --pack_header=2,5 --fsck-objects
+ok 21 - partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects
+
+expecting success of 5616.22 'use fsck before and after manually fetching a missing subtree': 
+	# push new commit so server has a subtree
+	mkdir src/dir &&
+	echo "in dir" >src/dir/file.txt &&
+	git -C src add dir/file.txt &&
+	git -C src commit -m "file in dir" &&
+	git -C src push -u srv main &&
+	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
+
+	rm -rf dst &&
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
+	git -C dst fsck &&
+
+	# Make sure we only have commits, and all trees and blobs are missing.
+	git -C dst rev-list --missing=allow-any --objects main \
+		>fetched_objects &&
+	awk -f print_1.awk fetched_objects |
+	xargs -n1 git -C dst cat-file -t >fetched_types &&
+
+	sort -u fetched_types >unique_types.observed &&
+	echo commit >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.observed &&
+
+	# Auto-fetch a tree with cat-file.
+	git -C dst cat-file -p $SUBTREE >tree_contents &&
+	grep file.txt tree_contents &&
+
+	# fsck still works after an auto-fetch of a tree.
+	git -C dst fsck &&
+
+	# Auto-fetch all remaining trees and blobs with --missing=error
+	git -C dst rev-list --missing=error --objects main >fetched_objects &&
+	test_line_count = 88 fetched_objects &&
+
+	awk -f print_1.awk fetched_objects |
+	xargs -n1 git -C dst cat-file -t >fetched_types &&
+
+	sort -u fetched_types >unique_types.observed &&
+	test_write_lines blob commit tree >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.observed
+
+[main 957c60b] file in dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/file.txt
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   129c8a2..957c60b  main -> main
+branch 'main' set up to track 'srv/main'.
+Cloning into 'dst'...
+100644 blob d2cebd4f0a9e97a48a6139d09cafdb513ad8fee3	file.txt
+dangling tree bc1967ebf96a4e914801c7ef8328140456a10f41
+ok 22 - use fsck before and after manually fetching a missing subtree
+
+expecting success of 5616.23 'implicitly construct combine: filter with repeated flags': 
+	GIT_TRACE=$(pwd)/trace git clone --bare \
+		--filter=blob:none --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc2 &&
+	grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \
+		trace &&
+	git -C pc2 rev-list --objects --missing=allow-any HEAD >objects &&
+
+	# We should have gotten some root trees.
+	grep " $" objects &&
+	# Should not have gotten any non-root trees or blobs.
+	! grep " ." objects &&
+
+	xargs -n 1 git -C pc2 cat-file -t <objects >types &&
+	sort -u types >unique_types.actual &&
+	test_write_lines commit tree >unique_types.expected &&
+	test_cmp unique_types.expected unique_types.actual
+
+Cloning into bare repository 'pc2'...
+trace: run_command: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
+trace: built-in: git pack-objects --revs --thin --stdout --delta-base-offset --filter=combine:blob:none+tree:1
+849950ea25ea502730806953150a8b29fbc04fd1 
+5e06b9e5aed2904563066a6d041bd48487b00cba 
+94a1afd9afa4ab1486352ab1c059762e3e872ce4 
+e77db3bdb5e7e6af01bd93bcd0f99a69d939d0aa 
+e6f42a769ea1225565ede9aa9e708186165aad4c 
+7eaccd314b25541fb2e12c6a9041510af10e1518 
+fdb7f75e829001ecb4ca2d6217d7fd04457e275c 
+f0075f67c4ce0cc5963de5143fb89b89762976ea 
+e891efadd67ca0c01b1c518a2fd91130d40f5904 
+b1ada3a7551c02bc311cab409bcdb3210cc0db2b 
+a00681e4a08fb4916de7e62d89de5b662ef1860a 
+6a1c4b6f6db25436faf11feadebfa98132273db5 
+a7d56826180d177dcd33e04e00c6ae488eda8dd2 
+91d0f663d7a546b2e8dfad2b8298f743aae0b020 
+ddb185bb2b7d210636855cd4f053ea8ff15c8f1c 
+974a5d9aee9b30da804ae932f36ed0eb7f5a2c50 
+2ce2a26473b0751a79d9c42a2a4480fa73fe4f15 
+f7e2c683a7004d4fb81563ae0a3087442db18354 
+26f5e35d8a7ae9658923cf3ccdfc19c86a3e1424 
+4c015c7e720cb846212f85d6513eaf497ea021fe 
+b1d4c4f82f23b1f0779bc7e8f360950eaab333da 
+aa3aad2daa2266f2379fa0b387e0c47ce7fc59bd 
+5768e37e39ded4ab416a0e61f824cad46e996fec 
+3a35e4cd4fbd2d3dbcd056d0e997a47518d10432 
+3246c304205324149983025431c5211438f41931 
+dfce1aed58f95775a6963107c4471a9f0bfff6e6 
+25c201430fa73e4f524ad53e88ef255c807b27e0 
+aa8fcdda393dec1e72abbb7f868b7d971b730a19 
+3f2b9ee6d5378134943b47172ba029ae46a49419 
+ok 23 - implicitly construct combine: filter with repeated flags
+
+expecting success of 5616.24 'upload-pack complains of bogus filter config': 
+	printf 0000 |
+	test_must_fail git \
+		-c uploadpackfilter.tree.maxdepth \
+		upload-pack . >/dev/null 2>err &&
+	test_grep "unable to parse.*tree.maxdepth" err
+
+fatal: unable to parse 'uploadpackfilter.tree.maxdepth' from command-line config
+ok 24 - upload-pack complains of bogus filter config
+
+expecting success of 5616.25 'upload-pack fails banned object filters': 
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
+
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 25 - upload-pack fails banned object filters
+
+expecting success of 5616.26 'upload-pack fails banned combine object filters': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.combine.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
+
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 26 - upload-pack fails banned combine object filters
+
+expecting success of 5616.27 'upload-pack fails banned object filters with fallback': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "filter 'blob:none' not supported" err
+
+fatal: filter 'blob:none' not supported
+fatal: remote error: filter 'blob:none' not supported
+ok 27 - upload-pack fails banned object filters with fallback
+
+expecting success of 5616.28 'upload-pack limits tree depth filters': 
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_grep "tree filter allows max depth 0, but got 1" err &&
+
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
+
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
+	git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
+		"file://$(pwd)/srv.bare" pc6 2>err &&
+	test_grep "tree filter allows max depth 5, but got 6" err
+
+fatal: tree filter allows max depth 0, but got 1
+fatal: remote error: tree filter allows max depth 0, but got 1
+Cloning into 'pc4'...
+Cloning into 'pc5'...
+fatal: tree filter allows max depth 5, but got 6
+fatal: remote error: tree filter allows max depth 5, but got 6
+ok 28 - upload-pack limits tree depth filters
+
+expecting success of 5616.29 'partial clone fetches blobs pointed to by refs even if normally filtered out': 
+	rm -rf src dst &&
+	git init src &&
+	test_commit -C src x &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+	# Create a tag pointing to a blob.
+	BLOB=$(echo blob-contents | git -C src hash-object --stdin -w) &&
+	git -C src tag myblob "$BLOB" &&
+
+	git clone --filter="blob:none" "file://$(pwd)/src" dst 2>err &&
+	! grep "does not point to a valid object" err &&
+	git -C dst fsck
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) d63d3b7] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+ok 29 - partial clone fetches blobs pointed to by refs even if normally filtered out
+
+expecting success of 5616.30 'fetch what is specified on CLI even if already promised': 
+	rm -rf src dst.git &&
+	git init src &&
+	test_commit -C src foo &&
+	test_config -C src uploadpack.allowfilter 1 &&
+	test_config -C src uploadpack.allowanysha1inwant 1 &&
+
+	git hash-object --stdin <src/foo.t >blob &&
+
+	git clone --bare --filter=blob:none "file://$(pwd)/src" dst.git &&
+	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_before &&
+	grep "?$(cat blob)" missing_before &&
+	git -C dst.git fetch origin $(cat blob) &&
+	git -C dst.git rev-list --objects --quiet --missing=print HEAD >missing_after &&
+	! grep "?$(cat blob)" missing_after
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src/.git/
+[main (root-commit) f80cabb] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into bare repository 'dst.git'...
+?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
+ * branch            257cc5642cb1a054f08cc83f2d943e56fd3ebe99 -> FETCH_HEAD
+ok 30 - fetch what is specified on CLI even if already promised
+
+expecting success of 5616.31 'setup src repo for sparse filter': 
+	git init sparse-src &&
+	git -C sparse-src config --local uploadpack.allowfilter 1 &&
+	git -C sparse-src config --local uploadpack.allowanysha1inwant 1 &&
+	test_commit -C sparse-src one &&
+	test_commit -C sparse-src two &&
+	echo /one.t >sparse-src/only-one &&
+	git -C sparse-src add . &&
+	git -C sparse-src commit -m "add sparse checkout files"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/sparse-src/.git/
+[main (root-commit) 6f4b17f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 5c4888c] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main cc88d32] add sparse checkout files
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 only-one
+ok 31 - setup src repo for sparse filter
+
+expecting success of 5616.32 'partial clone with sparse filter succeeds': 
+	rm -rf dst.git &&
+	git clone --no-local --bare \
+		  --filter=sparse:oid=main:only-one \
+		  sparse-src dst.git &&
+	(
+		cd dst.git &&
+		git rev-list --objects --missing=print HEAD >out &&
+		grep "^$(git rev-parse HEAD:one.t)" out &&
+		grep "^?$(git rev-parse HEAD:two.t)" out
+	)
+
+Cloning into bare repository 'dst.git'...
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+?f719efd430d52bcfc8566a43b2eb655688d38871
+ok 32 - partial clone with sparse filter succeeds
+
+expecting success of 5616.33 'partial clone with unresolvable sparse filter fails cleanly': 
+	rm -rf dst.git &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=main:no-such-name \
+				 sparse-src dst.git 2>err &&
+	test_grep "unable to access sparse blob in .main:no-such-name" err &&
+	test_must_fail git clone --no-local --bare \
+				 --filter=sparse:oid=main \
+				 sparse-src dst.git 2>err &&
+	test_grep "unable to parse sparse filter data in" err
+
+remote: fatal: unable to access sparse blob in 'main:no-such-name'        
+remote: fatal: unable to parse sparse filter data in cc88d32db343d6bb15610824107d11c391b515ca        
+ok 33 - partial clone with unresolvable sparse filter fails cleanly
+
+expecting success of 5616.34 'fetch lazy-fetches only to resolve deltas': 
+	setup_triangle &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big tree (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b380020] initial
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file10
+ create mode 100644 file100
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 file15
+ create mode 100644 file16
+ create mode 100644 file17
+ create mode 100644 file18
+ create mode 100644 file19
+ create mode 100644 file2
+ create mode 100644 file20
+ create mode 100644 file21
+ create mode 100644 file22
+ create mode 100644 file23
+ create mode 100644 file24
+ create mode 100644 file25
+ create mode 100644 file26
+ create mode 100644 file27
+ create mode 100644 file28
+ create mode 100644 file29
+ create mode 100644 file3
+ create mode 100644 file30
+ create mode 100644 file31
+ create mode 100644 file32
+ create mode 100644 file33
+ create mode 100644 file34
+ create mode 100644 file35
+ create mode 100644 file36
+ create mode 100644 file37
+ create mode 100644 file38
+ create mode 100644 file39
+ create mode 100644 file4
+ create mode 100644 file40
+ create mode 100644 file41
+ create mode 100644 file42
+ create mode 100644 file43
+ create mode 100644 file44
+ create mode 100644 file45
+ create mode 100644 file46
+ create mode 100644 file47
+ create mode 100644 file48
+ create mode 100644 file49
+ create mode 100644 file5
+ create mode 100644 file50
+ create mode 100644 file51
+ create mode 100644 file52
+ create mode 100644 file53
+ create mode 100644 file54
+ create mode 100644 file55
+ create mode 100644 file56
+ create mode 100644 file57
+ create mode 100644 file58
+ create mode 100644 file59
+ create mode 100644 file6
+ create mode 100644 file60
+ create mode 100644 file61
+ create mode 100644 file62
+ create mode 100644 file63
+ create mode 100644 file64
+ create mode 100644 file65
+ create mode 100644 file66
+ create mode 100644 file67
+ create mode 100644 file68
+ create mode 100644 file69
+ create mode 100644 file7
+ create mode 100644 file70
+ create mode 100644 file71
+ create mode 100644 file72
+ create mode 100644 file73
+ create mode 100644 file74
+ create mode 100644 file75
+ create mode 100644 file76
+ create mode 100644 file77
+ create mode 100644 file78
+ create mode 100644 file79
+ create mode 100644 file8
+ create mode 100644 file80
+ create mode 100644 file81
+ create mode 100644 file82
+ create mode 100644 file83
+ create mode 100644 file84
+ create mode 100644 file85
+ create mode 100644 file86
+ create mode 100644 file87
+ create mode 100644 file88
+ create mode 100644 file89
+ create mode 100644 file9
+ create mode 100644 file90
+ create mode 100644 file91
+ create mode 100644 file92
+ create mode 100644 file93
+ create mode 100644 file94
+ create mode 100644 file95
+ create mode 100644 file96
+ create mode 100644 file97
+ create mode 100644 file98
+ create mode 100644 file99
+Cloning into bare repository 'client'...
+[main 85be905] incremental change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
+count: 0
+in-pack: 2
+[main (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: filtering not recognized by server, ignoring
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            main       -> FETCH_HEAD
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+ok 34 - fetch lazy-fetches only to resolve deltas
+
+expecting success of 5616.35 'fetch lazy-fetches only to resolve deltas, protocol v2': 
+	setup_triangle &&
+
+	git -C server config --local protocol.version 2 &&
+	git -C client config --local protocol.version 2 &&
+	git -C promisor-remote config --local protocol.version 2 &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big blob (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
+
+	# Verify that protocol version 2 was used.
+	grep "fetch< version 2" trace &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 9bc3270] initial
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file10
+ create mode 100644 file100
+ create mode 100644 file11
+ create mode 100644 file12
+ create mode 100644 file13
+ create mode 100644 file14
+ create mode 100644 file15
+ create mode 100644 file16
+ create mode 100644 file17
+ create mode 100644 file18
+ create mode 100644 file19
+ create mode 100644 file2
+ create mode 100644 file20
+ create mode 100644 file21
+ create mode 100644 file22
+ create mode 100644 file23
+ create mode 100644 file24
+ create mode 100644 file25
+ create mode 100644 file26
+ create mode 100644 file27
+ create mode 100644 file28
+ create mode 100644 file29
+ create mode 100644 file3
+ create mode 100644 file30
+ create mode 100644 file31
+ create mode 100644 file32
+ create mode 100644 file33
+ create mode 100644 file34
+ create mode 100644 file35
+ create mode 100644 file36
+ create mode 100644 file37
+ create mode 100644 file38
+ create mode 100644 file39
+ create mode 100644 file4
+ create mode 100644 file40
+ create mode 100644 file41
+ create mode 100644 file42
+ create mode 100644 file43
+ create mode 100644 file44
+ create mode 100644 file45
+ create mode 100644 file46
+ create mode 100644 file47
+ create mode 100644 file48
+ create mode 100644 file49
+ create mode 100644 file5
+ create mode 100644 file50
+ create mode 100644 file51
+ create mode 100644 file52
+ create mode 100644 file53
+ create mode 100644 file54
+ create mode 100644 file55
+ create mode 100644 file56
+ create mode 100644 file57
+ create mode 100644 file58
+ create mode 100644 file59
+ create mode 100644 file6
+ create mode 100644 file60
+ create mode 100644 file61
+ create mode 100644 file62
+ create mode 100644 file63
+ create mode 100644 file64
+ create mode 100644 file65
+ create mode 100644 file66
+ create mode 100644 file67
+ create mode 100644 file68
+ create mode 100644 file69
+ create mode 100644 file7
+ create mode 100644 file70
+ create mode 100644 file71
+ create mode 100644 file72
+ create mode 100644 file73
+ create mode 100644 file74
+ create mode 100644 file75
+ create mode 100644 file76
+ create mode 100644 file77
+ create mode 100644 file78
+ create mode 100644 file79
+ create mode 100644 file8
+ create mode 100644 file80
+ create mode 100644 file81
+ create mode 100644 file82
+ create mode 100644 file83
+ create mode 100644 file84
+ create mode 100644 file85
+ create mode 100644 file86
+ create mode 100644 file87
+ create mode 100644 file88
+ create mode 100644 file89
+ create mode 100644 file9
+ create mode 100644 file90
+ create mode 100644 file91
+ create mode 100644 file92
+ create mode 100644 file93
+ create mode 100644 file94
+ create mode 100644 file95
+ create mode 100644 file96
+ create mode 100644 file97
+ create mode 100644 file98
+ create mode 100644 file99
+Cloning into bare repository 'client'...
+[main 014bae7] incremental change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
+count: 0
+in-pack: 2
+[main (root-commit) d944c64] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+warning: filtering not recognized by server, ignoring
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            main       -> FETCH_HEAD
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch< version 2
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+packet:        fetch> want 57347849e08bc08f191614c886e54d309cb293da
+packet:  upload-pack< want 57347849e08bc08f191614c886e54d309cb293da
+ok 35 - fetch lazy-fetches only to resolve deltas, protocol v2
+
+expecting success of 5616.36 'fetch does not lazy-fetch missing targets of its refs': 
+	rm -rf server client trace &&
+
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_commit -C server foo &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	# Make all refs point to nothing by deleting all objects.
+	rm client/.git/objects/pack/* &&
+
+	test_commit -C server bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--no-tags --recurse-submodules=no \
+		origin refs/tags/bar &&
+	FOO_HASH=$(git -C server rev-parse foo) &&
+	! grep "want $FOO_HASH" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 92a62de] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'client'...
+[main 92e3d69] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * tag               bar        -> FETCH_HEAD
+ok 36 - fetch does not lazy-fetch missing targets of its refs
+
+expecting success of 5616.37 'verify fetch succeeds when asking for new tags': 
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
+	for i in I J K
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
+	git -C tag-test -c protocol.version=2 fetch --tags origin
+
+Cloning into 'tag-test'...
+[main f18c5f5] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+[main a03a6a6] J
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+[main 367cc8f] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
+ * [new branch]      I          -> I
+ * [new branch]      J          -> J
+ * [new branch]      K          -> K
+ + 957c60b...367cc8f main       -> main  (forced update)
+ * [new tag]         I          -> I
+ * [new tag]         J          -> J
+ * [new tag]         K          -> K
+ * [new tag]         foo        -> foo
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+ + 957c60b...367cc8f main       -> origin/main  (forced update)
+ * [new branch]      I          -> origin/I
+ * [new branch]      J          -> origin/J
+ * [new branch]      K          -> origin/K
+ * [new tag]         I          -> I
+ * [new tag]         J          -> J
+ * [new tag]         K          -> K
+ * [new tag]         foo        -> foo
+ok 37 - verify fetch succeeds when asking for new tags
+
+expecting success of 5616.38 'verify fetch downloads only one pack when updating refs': 
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 2 pack-list &&
+	for i in A B C
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
+	git -C pack-test fetch origin &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 3 pack-list
+
+Cloning into 'pack-test'...
+[main bc03829] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 525529d] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 66f5bb0] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src
+ * [new branch]      A          -> A
+ * [new branch]      B          -> B
+ * [new branch]      C          -> C
+   367cc8f..66f5bb0  main       -> main
+ * [new tag]         A          -> A
+ * [new tag]         B          -> B
+ * [new tag]         C          -> C
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/srv.bare
+   367cc8f..66f5bb0  main       -> origin/main
+ * [new branch]      A          -> origin/A
+ * [new branch]      B          -> origin/B
+ * [new branch]      C          -> origin/C
+ * [new tag]         A          -> A
+ * [new tag]         B          -> B
+ * [new tag]         C          -> C
+ok 38 - verify fetch downloads only one pack when updating refs
+
+expecting success of 5616.39 'single-branch tag following respects partial clone': 
+	git clone --single-branch -b B --filter=blob:none \
+		"file://$(pwd)/srv.bare" single &&
+	git -C single rev-parse --verify refs/tags/B &&
+	git -C single rev-parse --verify refs/tags/A &&
+	test_must_fail git -C single rev-parse --verify refs/tags/C
+
+Cloning into 'single'...
+525529d87f8f318d404aa60b6d2b41ed0f49123b
+bc03829a3804fb49ee75372a845d1554afc2e83f
+fatal: Needed a single revision
+ok 39 - single-branch tag following respects partial clone
+
+expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
+	rm -rf server client trace &&
+
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 0 &&
+	test_commit -C server foo &&
+
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 0 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	! grep "version 2" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b259608] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/.git/
+[main (root-commit) 76913b4] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+warning: no common commits
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 40 - fetch from a partial clone, protocol v0
+
+expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
+	rm -rf server client trace &&
+
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 2 &&
+	test_commit -C server foo &&
+
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 2 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	grep "version 2" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) bbef54c] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/.git/
+[main (root-commit) 10dc217] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:  upload-pack> version 2
+packet:        fetch< version 2
+ok 41 - fetch from a partial clone, protocol v2
+
+expecting success of 5616.42 'repack does not loosen promisor objects': 
+	rm -rf client trace &&
+	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
+	test_when_finished "rm -rf client trace" &&
+	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
+	grep "loosen_unused_packed_objects/loosened:0" trace
+
+Cloning into bare repository 'client'...
+13:25:43.215348 builtin/pack-objects.c:4084  | d1 | main                     | data         | r0  |  0.001217 |  0.000390 | pack-objects | ..loosen_unused_packed_objects/loosened:0
+ok 42 - repack does not loosen promisor objects
+
+expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
+	# setup
+	test_config_global protocol.file.allow always &&
+
+	test_when_finished "rm -rf src-sub" &&
+	git init src-sub &&
+	git -C src-sub config uploadpack.allowfilter 1 &&
+	git -C src-sub config uploadpack.allowanysha1inwant 1 &&
+
+	# This blob must be missing in the subsequent commit.
+	echo foo >src-sub/file &&
+	git -C src-sub add file &&
+	git -C src-sub commit -m "submodule one" &&
+	SUB_ONE=$(git -C src-sub rev-parse HEAD) &&
+
+	echo bar >src-sub/file &&
+	git -C src-sub add file &&
+	git -C src-sub commit -m "submodule two" &&
+	SUB_TWO=$(git -C src-sub rev-parse HEAD) &&
+
+	test_when_finished "rm -rf src-super" &&
+	git init src-super &&
+	git -C src-super config uploadpack.allowfilter 1 &&
+	git -C src-super config uploadpack.allowanysha1inwant 1 &&
+	git -C src-super submodule add ../src-sub src-sub &&
+
+	git -C src-super/src-sub checkout $SUB_ONE &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject one" &&
+
+	git -C src-super/src-sub checkout $SUB_TWO &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject two" &&
+
+	# the fetch
+	test_when_finished "rm -rf client" &&
+	git clone --filter=blob:none --also-filter-submodules \
+		--recurse-submodules "file://$(pwd)/src-super" client &&
+
+	# Trigger lazy-fetch from the superproject
+	git -C client restore --recurse-submodules --source=HEAD^ :/
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-sub/.git/
+[main (root-commit) 801106d] submodule one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main acdf0b1] submodule two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-super/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-super/src-sub'...
+done.
+Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 801106d submodule one
+[main (root-commit) 5f7f3e0] superproject one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 src-sub
+Previous HEAD position was 801106d submodule one
+HEAD is now at acdf0b1 submodule two
+[main 9a05ac3] superproject two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'client'...
+Submodule 'src-sub' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/client/src-sub'...
+Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
+ok 43 - lazy-fetch in submodule succeeds
+
+expecting success of 5616.44 'after fetching descendants of non-promisor commits, gc works': 
+	# Setup
+	git init full &&
+	git -C full config uploadpack.allowfilter 1 &&
+	git -C full config uploadpack.allowanysha1inwant 1 &&
+	touch full/foo &&
+	git -C full add foo &&
+	git -C full commit -m "commit 1" &&
+	git -C full checkout --detach &&
+
+	# Partial clone and push commit to remote
+	git clone "file://$(pwd)/full" --filter=blob:none partial &&
+	echo "hello" > partial/foo &&
+	git -C partial commit -a -m "commit 2" &&
+	git -C partial push &&
+
+	# gc in partial repo
+	git -C partial gc --prune=now &&
+
+	# Create another commit in normal repo
+	git -C full checkout main &&
+	echo " world" >> full/foo &&
+	git -C full commit -a -m "commit 3" &&
+
+	# Pull from remote in partial repo, and run gc again
+	git -C partial pull &&
+	git -C partial gc --prune=now
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full/.git/
+[main (root-commit) 08368f5] commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+HEAD is now at 08368f5 commit 1
+Cloning into 'partial'...
+[main d697f4a] commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full
+   08368f5..d697f4a  main -> main
+Previous HEAD position was 08368f5 commit 1
+Switched to branch 'main'
+[main 5b8be83] commit 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t5616-partial-clone/full
+   d697f4a..5b8be83  main       -> origin/main
+Updating d697f4a..5b8be83
+Fast-forward
+ foo | 1 +
+ 1 file changed, 1 insertion(+)
+ok 44 - after fetching descendants of non-promisor commits, gc works
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 44 test(s)
+# SKIP no web server found at ''
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6018-rev-list-glob/.git/
+expecting success of 6018.1 'setup': 
+
+	commit main &&
+	git checkout -b subspace/one main &&
+	commit one &&
+	git checkout -b subspace/two main &&
+	commit two &&
+	git checkout -b subspace-x main &&
+	commit subspace-x &&
+	git checkout -b other/three main &&
+	commit three &&
+	git checkout -b someref main &&
+	commit some &&
+	git checkout main &&
+	commit topic_2 &&
+	git tag foo/bar main &&
+	commit topic_3 &&
+	git update-ref refs/remotes/foo/baz main &&
+	commit topic_4 &&
+	git update-ref refs/remotes/upstream/one subspace/one &&
+	git update-ref refs/remotes/upstream/two subspace/two &&
+	git update-ref refs/remotes/upstream/x subspace-x &&
+	git tag qux/one subspace/one &&
+	git tag qux/two subspace/two &&
+	git tag qux/x subspace-x
+
+[main (root-commit) f9b107a] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to a new branch 'subspace/one'
+[subspace/one ca90b7f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace/two'
+[subspace/two 65ee8ea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace-x'
+[subspace-x e241fee] subspace-x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'other/three'
+[other/three ec1efc4] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'someref'
+[someref dffcf3f] some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main 2bdf448] topic_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0e3b4df] topic_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 88fe3d2] topic_4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+
+
+ok 2 - rev-parse --glob=refs/heads/subspace/*
+
+expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
+
+
+ok 3 - rev-parse --glob=heads/subspace/*
+
+expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+
+
+ok 4 - rev-parse --glob=refs/heads/subspace/
+
+expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
+
+
+ok 5 - rev-parse --glob=heads/subspace/
+
+expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 6 - rev-parse --glob=heads/subspace
+
+checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
+
+
+fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
+
+checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
+
+	compare rev-parse "main" "--glob --symbolic main"
+
+
+--- expected	2025-03-17 13:25:41.526355787 +0000
++++ actual	2025-03-17 13:25:41.550355939 +0000
+@@ -1 +1,2 @@
+-88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
++--glob
++main
+not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
+
+expecting success of 6018.9 'rev-parse --branches=subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 9 - rev-parse --branches=subspace/*
+
+expecting success of 6018.10 'rev-parse --branches=subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 10 - rev-parse --branches=subspace/
+
+expecting success of 6018.11 'rev-parse --branches=subspace': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 11 - rev-parse --branches=subspace
+
+expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
+
+	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+
+
+ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
+
+expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
+
+	compare rev-parse "main" "--glob=heads/someref/* main"
+
+
+ok 13 - rev-parse --glob=heads/someref/* main
+
+expecting success of 6018.14 'rev-parse --glob=heads/*': 
+
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+
+
+ok 14 - rev-parse --glob=heads/*
+
+expecting success of 6018.15 'rev-parse --tags=foo': 
+
+	compare rev-parse "foo/bar" "--tags=foo"
+
+
+ok 15 - rev-parse --tags=foo
+
+expecting success of 6018.16 'rev-parse --remotes=foo': 
+
+	compare rev-parse "foo/baz" "--remotes=foo"
+
+
+ok 16 - rev-parse --remotes=foo
+
+expecting success of 6018.17 'rev-parse --exclude with --branches': 
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
+
+ok 17 - rev-parse --exclude with --branches
+
+expecting success of 6018.18 'rev-parse --exclude with --all': 
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+
+ok 18 - rev-parse --exclude with --all
+
+expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+
+ok 19 - rev-parse accumulates multiple --exclude
+
+expecting success of 6018.20 'rev-parse --branches clears --exclude': 
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
+
+ok 20 - rev-parse --branches clears --exclude
+
+expecting success of 6018.21 'rev-parse --tags clears --exclude': 
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
+
+ok 21 - rev-parse --tags clears --exclude
+
+expecting success of 6018.22 'rev-parse --all clears --exclude': 
+	compare rev-parse "--exclude=* --all --all" "--all"
+
+ok 22 - rev-parse --all clears --exclude
+
+expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
+	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+
+ok 23 - rev-parse --exclude=glob with --branches=glob
+
+expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 24 - rev-parse --exclude=glob with --tags=glob
+
+expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 25 - rev-parse --exclude=glob with --remotes=glob
+
+expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+
+ok 26 - rev-parse --exclude=ref with --branches=glob
+
+expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+
+ok 27 - rev-parse --exclude=ref with --tags=glob
+
+expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 28 - rev-parse --exclude=ref with --remotes=glob
+
+expecting success of 6018.29 'rev-parse --exclude-hidden=fetch with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 29 - rev-parse --exclude-hidden=fetch with --all
+
+expecting success of 6018.30 'rev-parse --exclude-hidden=fetch with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 30 - rev-parse --exclude-hidden=fetch with --all
+
+expecting success of 6018.31 'rev-parse --exclude-hidden=fetch with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 31 - rev-parse --exclude-hidden=fetch with --glob
+
+expecting success of 6018.32 'rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
+
+expecting success of 6018.33 'rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
+
+expecting success of 6018.34 'rev-parse --exclude-hidden=fetch fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 34 - rev-parse --exclude-hidden=fetch fails with --branches
+
+expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
+
+expecting success of 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
+
+expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
+
+expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
+
+expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
+
+expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 40 - rev-parse --exclude-hidden=receive with --all
+
+expecting success of 6018.41 'rev-parse --exclude-hidden=receive with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 41 - rev-parse --exclude-hidden=receive with --all
+
+expecting success of 6018.42 'rev-parse --exclude-hidden=receive with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 42 - rev-parse --exclude-hidden=receive with --glob
+
+expecting success of 6018.43 'rev-parse --exclude-hidden=receive can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
+
+expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
+
+expecting success of 6018.45 'rev-parse --exclude-hidden=receive fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 45 - rev-parse --exclude-hidden=receive fails with --branches
+
+expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
+
+expecting success of 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 47 - rev-parse --exclude-hidden=receive fails with --tags
+
+expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
+
+expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
+
+expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
+
+expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 51 - rev-parse --exclude-hidden=uploadpack with --all
+
+expecting success of 6018.52 'rev-parse --exclude-hidden=uploadpack with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 52 - rev-parse --exclude-hidden=uploadpack with --all
+
+expecting success of 6018.53 'rev-parse --exclude-hidden=uploadpack with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 53 - rev-parse --exclude-hidden=uploadpack with --glob
+
+expecting success of 6018.54 'rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 54 - rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref
+
+expecting success of 6018.55 'rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
+
+expecting success of 6018.56 'rev-parse --exclude-hidden=uploadpack fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 56 - rev-parse --exclude-hidden=uploadpack fails with --branches
+
+expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
+
+expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
+
+expecting success of 6018.59 'rev-parse --exclude-hidden=uploadpack fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 59 - rev-parse --exclude-hidden=uploadpack fails with --tags=pattern
+
+expecting success of 6018.60 'rev-parse --exclude-hidden=uploadpack fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 60 - rev-parse --exclude-hidden=uploadpack fails with --remotes
+
+expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
+
+expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+
+ok 62 - rev-list --exclude=glob with --branches=glob
+
+expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 63 - rev-list --exclude=glob with --tags=glob
+
+expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
+	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 64 - rev-list --exclude=glob with --remotes=glob
+
+expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+
+ok 65 - rev-list --exclude=ref with --branches=glob
+
+expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+
+ok 66 - rev-list --exclude=ref with --tags=glob
+
+expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 67 - rev-list --exclude=ref with --remotes=glob
+
+expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+
+
+ok 68 - rev-list --glob=refs/heads/subspace/*
+
+expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+
+
+ok 69 - rev-list --glob refs/heads/subspace/*
+
+expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
+
+	compare rev-list "main" "--glob -0 main"
+
+
+ok 70 - rev-list not confused by option-like --glob arg
+
+expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
+
+
+ok 71 - rev-list --glob=heads/subspace/*
+
+expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+
+
+ok 72 - rev-list --glob=refs/heads/subspace/
+
+expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
+
+
+ok 73 - rev-list --glob=heads/subspace/
+
+expecting success of 6018.74 'rev-list --glob=heads/subspace': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 74 - rev-list --glob=heads/subspace
+
+expecting success of 6018.75 'rev-list --branches=subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 75 - rev-list --branches=subspace/*
+
+expecting success of 6018.76 'rev-list --branches=subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 76 - rev-list --branches=subspace/
+
+expecting success of 6018.77 'rev-list --branches=subspace': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 77 - rev-list --branches=subspace
+
+expecting success of 6018.78 'rev-list --branches': 
+
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
+
+
+ok 78 - rev-list --branches
+
+expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
+
+	compare rev-list "main" "--glob=heads/someref/* main"
+
+
+ok 79 - rev-list --glob=heads/someref/* main
+
+expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
+
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+
+
+ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
+
+expecting success of 6018.81 'rev-list --glob=heads/*': 
+
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+
+
+ok 81 - rev-list --glob=heads/*
+
+expecting success of 6018.82 'rev-list --tags=foo': 
+
+	compare rev-list "foo/bar" "--tags=foo"
+
+
+ok 82 - rev-list --tags=foo
+
+expecting success of 6018.83 'rev-list --tags': 
+
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
+
+
+ok 83 - rev-list --tags
+
+expecting success of 6018.84 'rev-list --remotes=foo': 
+
+	compare rev-list "foo/baz" "--remotes=foo"
+
+
+ok 84 - rev-list --remotes=foo
+
+expecting success of 6018.85 'rev-list --exclude with --branches': 
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
+
+ok 85 - rev-list --exclude with --branches
+
+expecting success of 6018.86 'rev-list --exclude with --all': 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
+
+ok 86 - rev-list --exclude with --all
+
+expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+
+ok 87 - rev-list accumulates multiple --exclude
+
+expecting success of 6018.88 'rev-list should succeed with empty output on empty stdin': 
+	git rev-list --stdin </dev/null >actual &&
+	test_must_be_empty actual
+
+ok 88 - rev-list should succeed with empty output on empty stdin
+
+expecting success of 6018.89 'rev-list should succeed with empty output with all refs excluded': 
+	git rev-list --exclude=* --all >actual &&
+	test_must_be_empty actual
+
+ok 89 - rev-list should succeed with empty output with all refs excluded
+
+expecting success of 6018.90 'rev-list should succeed with empty output with empty --all': 
+	(
+		test_create_repo empty &&
+		cd empty &&
+		git rev-list --all >actual &&
+		test_must_be_empty actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6018-rev-list-glob/empty/.git/
+ok 90 - rev-list should succeed with empty output with empty --all
+
+expecting success of 6018.91 'rev-list should succeed with empty output with empty glob': 
+	git rev-list --glob=does-not-match-anything >actual &&
+	test_must_be_empty actual
+
+ok 91 - rev-list should succeed with empty output with empty glob
+
+expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
+	git rev-list --ignore-missing $ZERO_OID >actual &&
+	test_must_be_empty actual
+
+ok 92 - rev-list should succeed with empty output when ignoring missing
+
+expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
+
+	compare shortlog "subspace/one subspace/two" --branches=subspace &&
+	compare shortlog \
+	  "main subspace-x someref other/three subspace/one subspace/two" \
+	  --branches &&
+	compare shortlog main "--glob=heads/someref/* main" &&
+	compare shortlog "subspace/one subspace/two other/three" \
+	  "--glob=heads/subspace/* --glob=heads/other/*" &&
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob=heads/*" &&
+	compare shortlog foo/bar --tags=foo &&
+	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
+	compare shortlog foo/baz --remotes=foo
+
+
+ok 93 - shortlog accepts --glob/--tags/--remotes
+
+checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
+
+	compare shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
+
+
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
+
+    -c, --[no-]committer  group by committer rather than author
+    -n, --[no-]numbered   sort output according to the number of commits per author
+    -s, --[no-]summary    suppress commit descriptions, only provides commit count
+    -e, --[no-]email      show the email address of each author
+    -w[<w>[,<i1>[,<i2>]]] linewrap output
+    --[no-]group <field>  group by field
+
+not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
+
+checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
+
+	compare shortlog main "--glob -e main"
+
+
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
+
+    -c, --[no-]committer  group by committer rather than author
+    -n, --[no-]numbered   sort output according to the number of commits per author
+    -s, --[no-]summary    suppress commit descriptions, only provides commit count
+    -e, --[no-]email      show the email address of each author
+    -w[<w>[,<i1>[,<i2>]]] linewrap output
+    --[no-]group <field>  group by field
+
+not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
+
+# still have 4 known breakage(s)
+# passed all remaining 91 test(s)
+1..95
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6021-rev-list-exclude-hidden.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6021-rev-list-exclude-hidden/.git/
+expecting success of 6021.1 'setup': 
+	test_commit_bulk --id=commit --ref=refs/heads/branch 1 &&
+	COMMIT=$(git rev-parse refs/heads/branch) &&
+	test_commit_bulk --id=tag --ref=refs/tags/lightweight 1 &&
+	TAG=$(git rev-parse refs/tags/lightweight) &&
+	test_commit_bulk --id=hidden --ref=refs/hidden/commit 1 &&
+	HIDDEN=$(git rev-parse refs/hidden/commit) &&
+	test_commit_bulk --id=namespace --ref=refs/namespaces/namespace/refs/namespaced/commit 1 &&
+	NAMESPACE=$(git rev-parse refs/namespaces/namespace/refs/namespaced/commit)
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        225 /        225
+---------------------------------------------------------------------
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        220 /        220
+---------------------------------------------------------------------
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        228 /        228
+---------------------------------------------------------------------
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        235 /        235
+---------------------------------------------------------------------
+
+ok 1 - setup
+
+expecting success of 6021.2 'invalid section': 
+	echo "fatal: unsupported section for hidden refs: unsupported" >expected &&
+	test_must_fail git rev-list --exclude-hidden=unsupported 2>err &&
+	test_cmp expected err
+
+ok 2 - invalid section
+
+expecting success of 6021.3 'fetch: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 3 - fetch: passed multiple times
+
+expecting success of 6021.4 'fetch: without hiddenRefs': 
+		git rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 4 - fetch: without hiddenRefs
+
+expecting success of 6021.5 'fetch: hidden via transfer.hideRefs': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 5 - fetch: hidden via transfer.hideRefs
+
+expecting success of 6021.6 'fetch: hidden via fetch.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 6 - fetch: hidden via fetch.hideRefs
+
+expecting success of 6021.7 'fetch: respects both transfer.hideRefs and fetch.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 7 - fetch: respects both transfer.hideRefs and fetch.hideRefs
+
+expecting success of 6021.8 'fetch: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 8 - fetch: negation without hidden refs marks everything as uninteresting
+
+expecting success of 6021.9 'fetch: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 9 - fetch: negation with hidden refs marks them as interesting
+
+expecting success of 6021.10 'fetch: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 10 - fetch: hidden refs and excludes work together
+
+expecting success of 6021.11 'fetch: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 11 - fetch: excluded hidden refs get reset
+
+expecting success of 6021.12 'fetch: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 12 - fetch: excluded hidden refs can be used with multiple pseudo-refs
+
+expecting success of 6021.13 'fetch: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 13 - fetch: works with --glob
+
+expecting success of 6021.14 'fetch: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 14 - fetch: operates on stripped refs by default
+
+expecting success of 6021.15 'fetch: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 15 - fetch: does not hide namespace by default
+
+expecting success of 6021.16 'fetch: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 16 - fetch: can operate on unstripped refs
+
+expecting success of 6021.17 'fetch: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 17 - fetch: fails with --remotes
+
+expecting success of 6021.18 'fetch: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 18 - fetch: fails with --remotes=pattern
+
+expecting success of 6021.19 'fetch: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 19 - fetch: fails with --branches
+
+expecting success of 6021.20 'fetch: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 20 - fetch: fails with --branches=pattern
+
+expecting success of 6021.21 'fetch: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 21 - fetch: fails with --tags
+
+expecting success of 6021.22 'fetch: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 22 - fetch: fails with --tags=pattern
+
+expecting success of 6021.23 'receive: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 23 - receive: passed multiple times
+
+expecting success of 6021.24 'receive: without hiddenRefs': 
+		git rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 24 - receive: without hiddenRefs
+
+expecting success of 6021.25 'receive: hidden via transfer.hideRefs': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 25 - receive: hidden via transfer.hideRefs
+
+expecting success of 6021.26 'receive: hidden via receive.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 26 - receive: hidden via receive.hideRefs
+
+expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
+
+expecting success of 6021.28 'receive: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 28 - receive: negation without hidden refs marks everything as uninteresting
+
+expecting success of 6021.29 'receive: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 29 - receive: negation with hidden refs marks them as interesting
+
+expecting success of 6021.30 'receive: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 30 - receive: hidden refs and excludes work together
+
+expecting success of 6021.31 'receive: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 31 - receive: excluded hidden refs get reset
+
+expecting success of 6021.32 'receive: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
+
+expecting success of 6021.33 'receive: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 33 - receive: works with --glob
+
+expecting success of 6021.34 'receive: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 34 - receive: operates on stripped refs by default
+
+expecting success of 6021.35 'receive: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 35 - receive: does not hide namespace by default
+
+expecting success of 6021.36 'receive: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 36 - receive: can operate on unstripped refs
+
+expecting success of 6021.37 'receive: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 37 - receive: fails with --remotes
+
+expecting success of 6021.38 'receive: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 38 - receive: fails with --remotes=pattern
+
+expecting success of 6021.39 'receive: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 39 - receive: fails with --branches
+
+expecting success of 6021.40 'receive: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 40 - receive: fails with --branches=pattern
+
+expecting success of 6021.41 'receive: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 41 - receive: fails with --tags
+
+expecting success of 6021.42 'receive: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 42 - receive: fails with --tags=pattern
+
+expecting success of 6021.43 'uploadpack: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 43 - uploadpack: passed multiple times
+
+expecting success of 6021.44 'uploadpack: without hiddenRefs': 
+		git rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 44 - uploadpack: without hiddenRefs
+
+expecting success of 6021.45 'uploadpack: hidden via transfer.hideRefs': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 45 - uploadpack: hidden via transfer.hideRefs
+
+expecting success of 6021.46 'uploadpack: hidden via uploadpack.hideRefs': 
+		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 46 - uploadpack: hidden via uploadpack.hideRefs
+
+expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
+
+expecting success of 6021.48 'uploadpack: negation without hidden refs marks everything as uninteresting': 
+		git rev-list --all --exclude-hidden=$section --not --all >out &&
+		test_must_be_empty out
+	
+ok 48 - uploadpack: negation without hidden refs marks everything as uninteresting
+
+expecting success of 6021.49 'uploadpack: negation with hidden refs marks them as interesting': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		EOF
+		test_cmp expected out
+	
+ok 49 - uploadpack: negation with hidden refs marks them as interesting
+
+expecting success of 6021.50 'uploadpack: hidden refs and excludes work together': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 50 - uploadpack: hidden refs and excludes work together
+
+expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 51 - uploadpack: excluded hidden refs get reset
+
+expecting success of 6021.52 'uploadpack: excluded hidden refs can be used with multiple pseudo-refs': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
+		test_must_be_empty out
+	
+ok 52 - uploadpack: excluded hidden refs can be used with multiple pseudo-refs
+
+expecting success of 6021.53 'uploadpack: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 53 - uploadpack: works with --glob
+
+expecting success of 6021.54 'uploadpack: operates on stripped refs by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 54 - uploadpack: operates on stripped refs by default
+
+expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 55 - uploadpack: does not hide namespace by default
+
+expecting success of 6021.56 'uploadpack: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 56 - uploadpack: can operate on unstripped refs
+
+expecting success of 6021.57 'uploadpack: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 57 - uploadpack: fails with --remotes
+
+expecting success of 6021.58 'uploadpack: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 58 - uploadpack: fails with --remotes=pattern
+
+expecting success of 6021.59 'uploadpack: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 59 - uploadpack: fails with --branches
+
+expecting success of 6021.60 'uploadpack: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 60 - uploadpack: fails with --branches=pattern
+
+expecting success of 6021.61 'uploadpack: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 61 - uploadpack: fails with --tags
+
+expecting success of 6021.62 'uploadpack: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 62 - uploadpack: fails with --tags=pattern
+
+# passed all 62 test(s)
+1..62
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6100-rev-list-in-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6100-rev-list-in-order/.git/
+expecting success of 6100.1 'setup a commit history with trees, blobs': 
+	for x in one two three four
+	do
+		echo $x >$x &&
+		git add $x &&
+		git commit -m "add file $x" ||
+		return 1
+	done &&
+	for x in four three
+	do
+		git rm $x &&
+		git commit -m "remove $x" ||
+		return 1
+	done
+
+[master (root-commit) 852067c] add file one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master 090ebfd] add file two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two
+[master 2101c65] add file three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three
+[master 0846a08] add file four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four
+rm 'four'
+[master 37698d1] remove four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 four
+rm 'three'
+[master 0ade3bd] remove three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 three
+ok 1 - setup a commit history with trees, blobs
+
+expecting success of 6100.2 'rev-list --in-commit-order': 
+	git rev-list --in-commit-order --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
+
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{commit}
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{commit}
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		HEAD~3^{commit}
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		HEAD~4^{commit}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{commit}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
+
+	test_cmp expect actual
+
+ok 2 - rev-list --in-commit-order
+
+expecting success of 6100.3 'rev-list lists blobs and trees after commits': 
+	git rev-list --objects HEAD >actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
+
+	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+		HEAD^{commit}
+		HEAD~1^{commit}
+		HEAD~2^{commit}
+		HEAD~3^{commit}
+		HEAD~4^{commit}
+		HEAD~5^{commit}
+		HEAD^{tree}
+		HEAD^{tree}:one
+		HEAD^{tree}:two
+		HEAD~1^{tree}
+		HEAD~1^{tree}:three
+		HEAD~2^{tree}
+		HEAD~2^{tree}:four
+		# HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+		# HEAD~4^{tree} skipped, same as HEAD^{tree}
+		HEAD~5^{tree}
+	EOF
+	grep -v "#" >expect <expect.raw &&
+
+	test_cmp expect actual
+
+ok 3 - rev-list lists blobs and trees after commits
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6040-tracking-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6040-tracking-info/.git/
+expecting success of 6040.1 'setup': 
+	advance a &&
+	advance b &&
+	advance c &&
+	git clone . test &&
+	(
+		cd test &&
+		git checkout -b b1 origin &&
+		git reset --hard HEAD^ &&
+		advance d &&
+		git checkout -b b2 origin &&
+		git reset --hard b1 &&
+		git checkout -b b3 origin &&
+		git reset --hard HEAD^ &&
+		git checkout -b b4 origin &&
+		advance e &&
+		advance f &&
+		git checkout -b brokenbase origin &&
+		git checkout -b b5 --track brokenbase &&
+		advance g &&
+		git branch -d brokenbase &&
+		git checkout -b b6 origin
+	) &&
+	git checkout -b follower --track main &&
+	advance h
+
+[main (root-commit) cc33353] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main 7e1cf2d] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+[main ac11e55] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Cloning into 'test'...
+done.
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/main'.
+HEAD is now at 7e1cf2d b
+[b1 afc0d66] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/main'.
+HEAD is now at afc0d66 d
+Switched to a new branch 'b3'
+branch 'b3' set up to track 'origin/main'.
+HEAD is now at 7e1cf2d b
+Switched to a new branch 'b4'
+branch 'b4' set up to track 'origin/main'.
+[b4 ec9b031] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e
+[b4 59ecd1d] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f
+Switched to a new branch 'brokenbase'
+branch 'brokenbase' set up to track 'origin/main'.
+Switched to a new branch 'b5'
+branch 'b5' set up to track 'brokenbase'.
+[b5 d8d0202] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g
+Deleted branch brokenbase (was ac11e55).
+Switched to a new branch 'b6'
+branch 'b6' set up to track 'origin/main'.
+Switched to a new branch 'follower'
+branch 'follower' set up to track 'main'.
+[follower 21abfbd] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 h
+ok 1 - setup
+
+expecting success of 6040.2 'branch -v': 
+	(
+		cd test &&
+		git branch -v
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
+
+ok 2 - branch -v
+
+expecting success of 6040.3 'branch -vv': 
+	(
+		cd test &&
+		git branch -vv
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
+
+ok 3 - branch -vv
+
+expecting success of 6040.4 'checkout (diverged from upstream)': 
+	(
+		cd test && git checkout b1
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
+
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 4 - checkout (diverged from upstream)
+
+expecting success of 6040.5 'checkout with local tracked branch': 
+	git checkout main &&
+	git checkout follower >actual &&
+	test_grep "is ahead of" actual
+
+Switched to branch 'main'
+Switched to branch 'follower'
+Your branch is ahead of 'main' by 1 commit.
+ok 5 - checkout with local tracked branch
+
+expecting success of 6040.6 'checkout (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
+
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 6 - checkout (upstream is gone)
+
+expecting success of 6040.7 'checkout (up-to-date with upstream)': 
+	(
+		cd test && git checkout b6
+	) >actual &&
+	test_grep "Your branch is up to date with .origin/main" actual
+
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 7 - checkout (up-to-date with upstream)
+
+expecting success of 6040.8 'status (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
+
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 8 - status (diverged from upstream)
+
+expecting success of 6040.9 'status (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
+
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 9 - status (upstream is gone)
+
+expecting success of 6040.10 'status (up-to-date with upstream)': 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "Your branch is up to date with .origin/main" actual
+
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 10 - status (up-to-date with upstream)
+
+expecting success of 6040.11 'status -s -b (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
+
+Switched to branch 'b1'
+ok 11 - status -s -b (diverged from upstream)
+
+expecting success of 6040.12 'status -s -b --no-ahead-behind (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status -s -b --no-ahead-behind | head -1
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
+
+expecting success of 6040.13 'status.aheadbehind=false status -s -b (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=false status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
+
+expecting success of 6040.14 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 14 - status --long --branch
+
+expecting success of 6040.15 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=true status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 15 - status --long --branch
+
+expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b --no-ahead-behind | head -2
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 16 - status --long --branch --no-ahead-behind
+
+expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=false status --long -b | head -2
+	) >actual &&
+	test_cmp expect actual
+
+Already on 'b1'
+ok 17 - status.aheadbehind=false status --long --branch
+
+expecting success of 6040.18 'status -s -b (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
+
+Switched to branch 'b5'
+ok 18 - status -s -b (upstream is gone)
+
+expecting success of 6040.19 'status -s -b (up-to-date with upstream)': 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
+
+Switched to branch 'b6'
+ok 19 - status -s -b (up-to-date with upstream)
+
+expecting success of 6040.20 'fail to track lightweight tags': 
+	git checkout main &&
+	git tag light &&
+	test_must_fail git branch --track lighttrack light >actual &&
+	test_grep ! "set up to track" actual &&
+	test_must_fail git checkout lighttrack
+
+Switched to branch 'main'
+fatal: cannot set up tracking information; starting point 'light' is not a branch
+error: pathspec 'lighttrack' did not match any file(s) known to git
+ok 20 - fail to track lightweight tags
+
+expecting success of 6040.21 'fail to track annotated tags': 
+	git checkout main &&
+	git tag -m heavy heavy &&
+	test_must_fail git branch --track heavytrack heavy >actual &&
+	test_grep ! "set up to track" actual &&
+	test_must_fail git checkout heavytrack
+
+Already on 'main'
+fatal: cannot set up tracking information; starting point 'heavy' is not a branch
+error: pathspec 'heavytrack' did not match any file(s) known to git
+ok 21 - fail to track annotated tags
+
+expecting success of 6040.22 '--set-upstream-to does not change branch': 
+	git branch from-main main &&
+	git branch --set-upstream-to main from-main &&
+	git branch from-topic_2 main &&
+	test_must_fail git config branch.from-topic_2.merge > actual &&
+	git rev-list from-topic_2 &&
+	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
+	git rev-parse from-topic_2 >expect2 &&
+	git branch --set-upstream-to main from-topic_2 &&
+	git config branch.from-main.merge > actual &&
+	git rev-parse from-topic_2 >actual2 &&
+	grep -q "^refs/heads/main$" actual &&
+	cmp expect2 actual2
+
+branch 'from-main' set up to track 'main'.
+ac11e552c8e799a6af00e91a64888439b699d9fd
+7e1cf2dc889e845623128125195d11533d8aef5e
+cc33353f1c71fb0fa9b4671a6a0a8539ad9ecd0a
+branch 'from-topic_2' set up to track 'main'.
+ok 22 - --set-upstream-to does not change branch
+
+expecting success of 6040.23 '--set-upstream-to @{-1}': 
+	git checkout follower &&
+	git checkout from-topic_2 &&
+	git config branch.from-topic_2.merge > expect2 &&
+	git branch --set-upstream-to @{-1} from-main &&
+	git config branch.from-main.merge > actual &&
+	git config branch.from-topic_2.merge > actual2 &&
+	git branch --set-upstream-to follower from-main &&
+	git config branch.from-main.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
+
+Switched to branch 'follower'
+Your branch is ahead of 'main' by 1 commit.
+  (use "git push" to publish your local commits)
+Switched to branch 'from-topic_2'
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+branch 'from-main' set up to track 'follower'.
+branch 'from-main' set up to track 'follower'.
+ok 23 - --set-upstream-to @{-1}
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6110-rev-list-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6110-rev-list-sparse/.git/
+expecting success of 6110.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	git checkout -b side HEAD^ &&
+	test_commit D &&
+	test_commit E &&
+	git merge main
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to a new branch 'side'
+[side 3e6e33e] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[side dc25130] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
+
+expecting success of 6110.2 'rev-list --first-parent --boundary': 
+	git rev-list --first-parent --boundary HEAD^..
+
+e8ee201b06a2eb86519e2b246f4c082e43aa5e90
+-35a8500a6c116c9ddf35e140fa3277a7fe0b4196
+-dc25130fe5e9f5d4a18aa4e0dff022e489b22c75
+ok 2 - rev-list --first-parent --boundary
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6060-merge-index/.git/
+expecting success of 6060.1 'setup diverging branches': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
+	git add file &&
+	git commit -m base &&
+	git tag base &&
+	sed s/2/two/ <file >tmp &&
+	mv tmp file &&
+	git commit -a -m two &&
+	git tag two &&
+	git checkout -b other HEAD^ &&
+	sed s/10/ten/ <file >tmp &&
+	mv tmp file &&
+	git commit -a -m ten &&
+	git tag ten
+
+[master (root-commit) 69c42a0] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 file
+[master 6a4bad4] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'other'
+[other e88ef53] ten
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup diverging branches
+
+expecting success of 6060.2 'read-tree does not resolve content merge': 
+	git read-tree -i -m base ten two &&
+	echo file >expect &&
+	git diff-files --name-only --diff-filter=U >unmerged &&
+	test_cmp expect unmerged
+
+ok 2 - read-tree does not resolve content merge
+
+expecting success of 6060.3 'git merge-index git-merge-one-file resolves': 
+	git merge-index git-merge-one-file -a &&
+	git diff-files --name-only --diff-filter=U >unmerged &&
+	test_must_be_empty unmerged &&
+	test_cmp expect-merged file &&
+	git cat-file blob :file >file-index &&
+	test_cmp expect-merged file-index
+
+Auto-merging file
+ok 3 - git merge-index git-merge-one-file resolves
+
+expecting success of 6060.4 'setup bare merge': 
+	git clone --bare . bare.git &&
+	(cd bare.git &&
+	 GIT_INDEX_FILE=$PWD/merge.index &&
+	 export GIT_INDEX_FILE &&
+	 git read-tree -i -m base ten two
+	)
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 4 - setup bare merge
+
+expecting success of 6060.5 'merge-one-file fails without a work tree': 
+	(cd bare.git &&
+	 GIT_INDEX_FILE=$PWD/merge.index &&
+	 export GIT_INDEX_FILE &&
+	 test_must_fail git merge-index git-merge-one-file -a
+	)
+
+fatal: this operation must be run in a work tree
+Cannot chdir to $cdup, the toplevel of the working tree
+fatal: merge program failed
+ok 5 - merge-one-file fails without a work tree
+
+expecting success of 6060.6 'merge-one-file respects GIT_WORK_TREE': 
+	(cd bare.git &&
+	 mkdir work &&
+	 GIT_WORK_TREE=$PWD/work &&
+	 export GIT_WORK_TREE &&
+	 GIT_INDEX_FILE=$PWD/merge.index &&
+	 export GIT_INDEX_FILE &&
+	 git merge-index git-merge-one-file -a &&
+	 git cat-file blob :file >work/file-index
+	) &&
+	test_cmp expect-merged bare.git/work/file &&
+	test_cmp expect-merged bare.git/work/file-index
+
+Auto-merging file
+ok 6 - merge-one-file respects GIT_WORK_TREE
+
+expecting success of 6060.7 'merge-one-file respects core.worktree': 
+	mkdir subdir &&
+	git clone . subdir/child &&
+	(cd subdir &&
+	 GIT_DIR=$PWD/child/.git &&
+	 export GIT_DIR &&
+	 git config core.worktree "$PWD/child" &&
+	 git read-tree -i -m base ten two &&
+	 git merge-index git-merge-one-file -a &&
+	 git cat-file blob :file >file-index
+	) &&
+	test_cmp expect-merged subdir/child/file &&
+	test_cmp expect-merged subdir/file-index
+
+Cloning into 'subdir/child'...
+done.
+Auto-merging file
+ok 7 - merge-one-file respects core.worktree
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6102-rev-list-unexpected-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6102-rev-list-unexpected-objects/.git/
+expecting success of 6102.1 'setup well-formed objects': 
+	blob="$(printf "foo" | git hash-object -w --stdin)" &&
+	tree="$(printf "100644 blob $blob\tfoo" | git mktree)" &&
+	commit="$(git commit-tree $tree -m "first commit")" &&
+	git cat-file commit $commit >good-commit
+
+ok 1 - setup well-formed objects
+
+expecting success of 6102.2 'setup unexpected non-blob entry': 
+	printf "100644 foo\0$(echo $tree | hex2oct)" >broken-tree &&
+	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+
+ok 2 - setup unexpected non-blob entry
+
+expecting success of 6102.3 'TODO (should fail!): traverse unexpected non-blob entry (lone)': 
+	sed "s/Z$//" >expect <<-EOF &&
+	$broken_tree Z
+	$tree foo
+	EOF
+	git rev-list --objects $broken_tree >actual &&
+	test_cmp expect actual
+
+ok 3 - TODO (should fail!): traverse unexpected non-blob entry (lone)
+
+expecting success of 6102.4 'traverse unexpected non-blob entry (seen)': 
+	test_must_fail git rev-list --objects $tree $broken_tree >output 2>&1 &&
+	test_grep "is not a blob" output
+
+fatal: entry 'foo' in tree f9a0e545d60bd011757113bec85ba95242fa6c4e has blob mode, but is not a blob
+ok 4 - traverse unexpected non-blob entry (seen)
+
+expecting success of 6102.5 'setup unexpected non-tree entry': 
+	printf "40000 foo\0$(echo $blob | hex2oct)" >broken-tree &&
+	broken_tree="$(git hash-object -w --literally -t tree broken-tree)"
+
+ok 5 - setup unexpected non-tree entry
+
+expecting success of 6102.6 'traverse unexpected non-tree entry (lone)': 
+	test_must_fail git rev-list --objects $broken_tree
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
+fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
+10cd09cb3996f045aaf5417c833c0fa1ee7227e9 
+ok 6 - traverse unexpected non-tree entry (lone)
+
+expecting success of 6102.7 'traverse unexpected non-tree entry (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 &&
+	test_grep "is not a tree" output
+
+fatal: entry 'foo' in tree 10cd09cb3996f045aaf5417c833c0fa1ee7227e9 has tree mode, but is not a tree
+ok 7 - traverse unexpected non-tree entry (seen)
+
+expecting success of 6102.8 'setup unexpected non-commit parent': 
+	sed "/^author/ { h; s/.*/parent $blob/; G; }" <good-commit \
+		>broken-commit &&
+	broken_commit="$(git hash-object -w --literally -t commit \
+		broken-commit)"
+
+ok 8 - setup unexpected non-commit parent
+
+expecting success of 6102.9 'traverse unexpected non-commit parent (lone)': 
+	test_must_fail git rev-list --objects $broken_commit >output 2>&1 &&
+	test_grep "not a commit" output
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a commit
+ok 9 - traverse unexpected non-commit parent (lone)
+
+expecting success of 6102.10 'traverse unexpected non-commit parent (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_commit \
+		>output 2>&1 &&
+	test_grep "not a commit" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
+ok 10 - traverse unexpected non-commit parent (seen)
+
+expecting success of 6102.11 'setup unexpected non-tree root': 
+	sed -e "s/$tree/$blob/" <good-commit >broken-commit &&
+	broken_commit="$(git hash-object -w --literally -t commit \
+		broken-commit)"
+
+ok 11 - setup unexpected non-tree root
+
+expecting success of 6102.12 'traverse unexpected non-tree root (lone)': 
+	test_must_fail git rev-list --objects $broken_commit
+
+error: Object 19102815663d23f8b75a47e7a01965dcdc96468c not a tree
+fatal: bad tree object 19102815663d23f8b75a47e7a01965dcdc96468c
+0751a6c0afe31568a8dfe6a1b216fc464faa46ae
+ok 12 - traverse unexpected non-tree root (lone)
+
+expecting success of 6102.13 'traverse unexpected non-tree root (seen)': 
+	test_must_fail git rev-list --objects $blob $broken_commit \
+		>output 2>&1 &&
+	test_grep "not a tree" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
+ok 13 - traverse unexpected non-tree root (seen)
+
+expecting success of 6102.14 'setup unexpected non-commit tag': 
+	git tag -a -m "tagged commit" tag $commit &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$commit/$blob/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was a857fb4)
+ok 14 - setup unexpected non-commit tag
+
+expecting success of 6102.15 'traverse unexpected non-commit tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a commit, not a blob
+fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
+ok 15 - traverse unexpected non-commit tag (lone)
+
+expecting success of 6102.16 'traverse unexpected non-commit tag (seen)': 
+	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+	test_grep "not a commit" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a commit
+ok 16 - traverse unexpected non-commit tag (seen)
+
+expecting success of 6102.17 'setup unexpected non-tree tag': 
+	git tag -a -m "tagged tree" tag $tree &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$tree/$blob/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was 7f85285)
+ok 17 - setup unexpected non-tree tag
+
+expecting success of 6102.18 'traverse unexpected non-tree tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a tree, not a blob
+fatal: bad object 19102815663d23f8b75a47e7a01965dcdc96468c
+ok 18 - traverse unexpected non-tree tag (lone)
+
+expecting success of 6102.19 'traverse unexpected non-tree tag (seen)': 
+	test_must_fail git rev-list --objects $blob $tag >output 2>&1 &&
+	test_grep "not a tree" output
+
+error: object 19102815663d23f8b75a47e7a01965dcdc96468c is a blob, not a tree
+ok 19 - traverse unexpected non-tree tag (seen)
+
+expecting success of 6102.20 'setup unexpected non-blob tag': 
+	git tag -a -m "tagged blob" tag $blob &&
+	git cat-file tag tag >good-tag &&
+	test_when_finished "git tag -d tag" &&
+	sed -e "s/$blob/$commit/" <good-tag >broken-tag &&
+	tag=$(git hash-object -w --literally -t tag broken-tag)
+
+Deleted tag 'tag' (was 5ff9998)
+ok 20 - setup unexpected non-blob tag
+
+expecting success of 6102.21 'traverse unexpected non-blob tag (lone)': 
+	test_must_fail git rev-list --objects $tag
+
+error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a blob, not a commit
+fatal: bad object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd
+ok 21 - traverse unexpected non-blob tag (lone)
+
+expecting success of 6102.22 'traverse unexpected non-blob tag (seen)': 
+	test_must_fail git rev-list --objects $commit $tag >output 2>&1 &&
+	test_grep "not a blob" output
+
+error: object 23c6239dd2793ccb5d4754a117a3c891c1bb96fd is a commit, not a blob
+ok 22 - traverse unexpected non-blob tag (seen)
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6114-keep-packs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6114-keep-packs/.git/
+expecting success of 6114.1 'setup': 
+	test_commit loose &&
+	test_commit packed &&
+	test_commit kept &&
+
+	KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/kept
+	^refs/tags/packed
+	EOF
+	) &&
+	MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/packed
+	^refs/tags/loose
+	EOF
+	) &&
+
+	touch .git/objects/pack/pack-$KEPT_PACK.keep
+
+[master (root-commit) c1488ad] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+[master 84721bd] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[master fb0b3cd] kept
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 kept.t
+ok 1 - setup
+
+expecting success of 6114.2 '--no-kept-objects excludes trees and blobs in .keep packs': 
+	rev_list_objects --objects --all --no-object-names >kept &&
+	rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
+
+	idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
+	comm -3 kept no-kept >actual &&
+
+	test_cmp expect actual
+
+ok 2 - --no-kept-objects excludes trees and blobs in .keep packs
+
+expecting success of 6114.3 '--no-kept-objects excludes kept non-MIDX object': 
+	test_config core.multiPackIndex true &&
+
+	# Create a pack with just the commit object in pack, and do not mark it
+	# as kept (even though it appears in $KEPT_PACK, which does have a .keep
+	# file).
+	MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
+	$(git rev-parse kept)
+	EOF
+	) &&
+
+	# Write a MIDX containing all packs, but use the version of the commit
+	# at "kept" in a non-kept pack by touching $MIDX_PACK.
+	touch .git/objects/pack/pack-$MIDX_PACK.pack &&
+	git multi-pack-index write &&
+
+	rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
+	(
+		idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
+		git rev-list --objects --no-object-names refs/tags/loose
+	) | sort >expect &&
+	test_cmp expect actual
+
+ok 3 - --no-kept-objects excludes kept non-MIDX object
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6115-rev-list-du.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6115-rev-list-du/.git/
+expecting success of 6115.1 'set up repository': 
+	test_commit --no-tag one &&
+	test_commit --no-tag two &&
+	git repack -adb &&
+	git reset --hard HEAD^ &&
+	test_commit --no-tag three &&
+	test_commit --no-tag four &&
+	git reset --hard HEAD^
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+HEAD is now at d79ce16 one
+[master 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 6f2ec4d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+HEAD is now at 897c206 three
+ok 1 - set up repository
+
+expecting success of 6115.2 'generate expected size (HEAD)': 
+		disk_usage_slow HEAD >expect
+	
+ok 2 - generate expected size (HEAD)
+
+expecting success of 6115.3 'rev-list --disk-usage without bitmaps (HEAD)': 
+		git rev-list --disk-usage HEAD >actual &&
+		test_cmp expect actual
+	
+ok 3 - rev-list --disk-usage without bitmaps (HEAD)
+
+expecting success of 6115.4 'rev-list --disk-usage with bitmaps (HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index HEAD >actual &&
+		test_cmp expect actual
+	
+ok 4 - rev-list --disk-usage with bitmaps (HEAD)
+
+expecting success of 6115.5 'generate expected size (--objects HEAD)': 
+		disk_usage_slow --objects HEAD >expect
+	
+ok 5 - generate expected size (--objects HEAD)
+
+expecting success of 6115.6 'rev-list --disk-usage without bitmaps (--objects HEAD)': 
+		git rev-list --disk-usage --objects HEAD >actual &&
+		test_cmp expect actual
+	
+ok 6 - rev-list --disk-usage without bitmaps (--objects HEAD)
+
+expecting success of 6115.7 'rev-list --disk-usage with bitmaps (--objects HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index --objects HEAD >actual &&
+		test_cmp expect actual
+	
+ok 7 - rev-list --disk-usage with bitmaps (--objects HEAD)
+
+expecting success of 6115.8 'generate expected size (--objects HEAD^..HEAD)': 
+		disk_usage_slow --objects HEAD^..HEAD >expect
+	
+ok 8 - generate expected size (--objects HEAD^..HEAD)
+
+expecting success of 6115.9 'rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)': 
+		git rev-list --disk-usage --objects HEAD^..HEAD >actual &&
+		test_cmp expect actual
+	
+ok 9 - rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)
+
+expecting success of 6115.10 'rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index --objects HEAD^..HEAD >actual &&
+		test_cmp expect actual
+	
+ok 10 - rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)
+
+expecting success of 6115.11 'setup for --unpacked tests': 
+	git repack -adb &&
+	test_commit unpacked
+
+[master 76e469a] unpacked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unpacked.t
+ok 11 - setup for --unpacked tests
+
+expecting success of 6115.12 'generate expected size (--all --objects --unpacked)': 
+		disk_usage_slow --all --objects --unpacked >expect
+	
+ok 12 - generate expected size (--all --objects --unpacked)
+
+expecting success of 6115.13 'rev-list --disk-usage without bitmaps (--all --objects --unpacked)': 
+		git rev-list --disk-usage --all --objects --unpacked >actual &&
+		test_cmp expect actual
+	
+ok 13 - rev-list --disk-usage without bitmaps (--all --objects --unpacked)
+
+expecting success of 6115.14 'rev-list --disk-usage with bitmaps (--all --objects --unpacked)': 
+		git rev-list --disk-usage --use-bitmap-index --all --objects --unpacked >actual &&
+		test_cmp expect actual
+	
+ok 14 - rev-list --disk-usage with bitmaps (--all --objects --unpacked)
+
+expecting success of 6115.15 'rev-list --disk-usage=human': 
+	git rev-list --objects HEAD --disk-usage=human >actual &&
+	disk_usage_slow --objects HEAD >actual_size &&
+	grep "$(cat actual_size) bytes" actual
+
+733 bytes
+ok 15 - rev-list --disk-usage=human
+
+expecting success of 6115.16 'rev-list --disk-usage=human with bitmaps': 
+	git rev-list --objects HEAD --use-bitmap-index --disk-usage=human >actual &&
+	disk_usage_slow --objects HEAD >actual_size &&
+	grep "$(cat actual_size) bytes" actual
+
+733 bytes
+ok 16 - rev-list --disk-usage=human with bitmaps
+
+expecting success of 6115.17 'rev-list use --disk-usage unproperly': 
+	test_must_fail git rev-list --objects HEAD --disk-usage=typo 2>err &&
+	cat >expect <<-\EOF &&
+	fatal: invalid value for '--disk-usage=<format>': 'typo', the only allowed format is 'human'
+	EOF
+	test_cmp err expect
+
+ok 17 - rev-list use --disk-usage unproperly
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6113-rev-list-bitmap-filters.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6113-rev-list-bitmap-filters/.git/
+expecting success of 6113.1 'set up bitmapped repo': 
+	# one commit will have bitmaps, the other will not
+	test_commit one &&
+	test_commit much-larger-blob-one &&
+	git repack -adb &&
+	test_commit two &&
+	test_commit much-larger-blob-two &&
+	git tag tag
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master e6e7e90] much-larger-blob-one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 much-larger-blob-one.t
+[master 5ff67e3] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master bb132a8] much-larger-blob-two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 much-larger-blob-two.t
+ok 1 - set up bitmapped repo
+
+expecting success of 6113.2 'filters fallback to non-bitmap traversal': 
+	# use a path-based filter, since they are inherently incompatible with
+	# bitmaps (i.e., this test will never get confused by later code to
+	# combine the features)
+	filter=$(echo "!one" | git hash-object -w --stdin) &&
+	git rev-list --objects --filter=sparse:oid=$filter HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=sparse:oid=$filter HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - filters fallback to non-bitmap traversal
+
+expecting success of 6113.3 'blob:none filter': 
+	git rev-list --objects --filter=blob:none HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 3 - blob:none filter
+
+expecting success of 6113.4 'blob:none filter with specified blob': 
+	git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD HEAD:two.t >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 4 - blob:none filter with specified blob
+
+expecting success of 6113.5 'blob:limit filter': 
+	git rev-list --objects --filter=blob:limit=5 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 HEAD >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 5 - blob:limit filter
+
+expecting success of 6113.6 'blob:limit filter with specified blob': 
+	git rev-list --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 6 - blob:limit filter with specified blob
+
+expecting success of 6113.7 'tree:0 filter': 
+	git rev-list --objects --filter=tree:0 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:0 HEAD >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 7 - tree:0 filter
+
+expecting success of 6113.8 'tree:0 filter with specified blob, tree': 
+	git rev-list --objects --filter=tree:0 HEAD HEAD:two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:0 HEAD HEAD:two.t >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 8 - tree:0 filter with specified blob, tree
+
+expecting success of 6113.9 'tree:1 filter': 
+	git rev-list --objects --filter=tree:1 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 9 - tree:1 filter
+
+expecting success of 6113.10 'object:type filter': 
+	git rev-list --objects --filter=object:type=tag tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=tag tag >actual &&
+	test_cmp expect actual &&
+
+	git rev-list --objects --filter=object:type=commit tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=commit tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter=object:type=tree tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=tree tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+expect actual differ: char 1, line 1
+expect actual differ: char 1, line 1
+ok 10 - object:type filter
+
+expecting success of 6113.11 'object:type filter with --filter-provided-objects': 
+	git rev-list --objects --filter-provided-objects --filter=object:type=tag tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=tag tag >actual &&
+	test_cmp expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=commit tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=commit tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=tree tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=tree tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+expect actual differ: char 1, line 1
+expect actual differ: char 41, line 1
+ok 11 - object:type filter with --filter-provided-objects
+
+expecting success of 6113.12 'combine filter': 
+	git rev-list --objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+
+expect actual differ: char 1, line 1
+ok 12 - combine filter
+
+expecting success of 6113.13 'combine filter with --filter-provided-objects': 
+	git rev-list --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git cat-file --batch-check="%(objecttype) %(objectsize)" <actual >objects &&
+	while read objecttype objectsize
+	do
+		test "$objecttype" = blob || return 1
+		test "$objectsize" -le 1000 || return 1
+	done <objects
+
+expect actual differ: char 41, line 1
+ok 13 - combine filter with --filter-provided-objects
+
+expecting success of 6113.14 'bitmap traversal with --unpacked': 
+	git repack -adb &&
+	test_commit unpacked &&
+
+	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
+	sort expect.raw >expect &&
+
+	git rev-list --use-bitmap-index --objects --all --unpacked >actual.raw &&
+	sort actual.raw >actual &&
+
+	test_cmp expect actual
+
+[master 3679470] unpacked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unpacked.t
+ok 14 - bitmap traversal with --unpacked
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6022-rev-list-missing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6022-rev-list-missing/.git/
+expecting success of 6022.1 'create repository and alternate directory': 
+	test_commit 1 &&
+	test_commit 2 &&
+	test_commit 3 &&
+	git tag -m "tag message" annot_tag HEAD~1 &&
+	git tag regul_tag HEAD~1 &&
+	git branch a_branch HEAD~1
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ddc8575] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+ok 1 - create repository and alternate directory
+
+expecting success of 6022.2 'rev-list --missing=error fails with missing object HEAD~1': 
+		oid="$(git rev-parse $obj)" &&
+		path=".git/objects/$(test_oid_to_path $oid)" &&
+
+		mv "$path" "$path.hidden" &&
+		test_when_finished "mv $path.hidden $path" &&
+
+		test_must_fail git rev-list --missing=error --objects \
+			--no-object-names HEAD
+	
+error: Could not read 82335b23aa7234320d6f8055243c852e4b6a5ca3
+fatal: Failed to traverse parents of commit ddc8575ed6fc205127629848895ac35ba7529ace
+ok 2 - rev-list --missing=error fails with missing object HEAD~1
+
+expecting success of 6022.3 'rev-list --missing=error fails with missing object HEAD~1^{tree}': 
+		oid="$(git rev-parse $obj)" &&
+		path=".git/objects/$(test_oid_to_path $oid)" &&
+
+		mv "$path" "$path.hidden" &&
+		test_when_finished "mv $path.hidden $path" &&
+
+		test_must_fail git rev-list --missing=error --objects \
+			--no-object-names HEAD
+	
+fatal: bad tree object c21b0cdc70e26c3ddd8478ac3d82c4e7a3ab3f32
+ddc8575ed6fc205127629848895ac35ba7529ace
+82335b23aa7234320d6f8055243c852e4b6a5ca3
+d0dcf978085b712ac89a73020e40fb8b7e540ec4
+80055bbfa58b994e48e236912516273bcbf0dd1c
+d00491fd7e5bb6fa28c517a0bb32b8b506539d4d
+0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
+00750edc07d6415dcc07ae0351e9397b0222b7ba
+ok 3 - rev-list --missing=error fails with missing object HEAD~1^{tree}
+
+expecting success of 6022.4 'rev-list --missing=error fails with missing object HEAD:1.t': 
+		oid="$(git rev-parse $obj)" &&
+		path=".git/objects/$(test_oid_to_path $oid)" &&
+
+		mv "$path" "$path.hidden" &&
+		test_when_finished "mv $path.hidden $path" &&
+
+		test_must_fail git rev-list --missing=error --objects \
+			--no-object-names HEAD
+	
+fatal: missing blob object 'd00491fd7e5bb6fa28c517a0bb32b8b506539d4d'
+ddc8575ed6fc205127629848895ac35ba7529ace
+82335b23aa7234320d6f8055243c852e4b6a5ca3
+d0dcf978085b712ac89a73020e40fb8b7e540ec4
+80055bbfa58b994e48e236912516273bcbf0dd1c
+ok 4 - rev-list --missing=error fails with missing object HEAD:1.t
+
+expecting success of 6022.5 'rev-list --missing=allow-any with missing HEAD~1': 
+			oid="$(git rev-parse $obj)" &&
+			path=".git/objects/$(test_oid_to_path $oid)" &&
+
+			# Before the object is made missing, we use rev-list to
+			# get the expected oids.
+			git rev-list --objects --no-object-names \
+				HEAD ^$obj >expect.raw &&
+
+			# Blobs are shared by all commits, so even though a commit/tree
+			# might be skipped, its blob must be accounted for.
+			if test $obj != "HEAD:1.t"
+			then
+				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
+				echo $(git rev-parse HEAD:2.t) >>expect.raw
+			fi &&
+
+			mv "$path" "$path.hidden" &&
+			test_when_finished "mv $path.hidden $path" &&
+
+			git rev-list --missing=$action --objects --no-object-names \
+				HEAD >actual.raw &&
+
+			# When the action is to print, we should also add the missing
+			# oid to the expect list.
+			case $action in
+			allow-any)
+				;;
+			print)
+				grep ?$oid actual.raw &&
+				echo ?$oid >>expect.raw
+				;;
+			esac &&
+
+			sort actual.raw >actual &&
+			sort expect.raw >expect &&
+			test_cmp expect actual
+		
+ok 5 - rev-list --missing=allow-any with missing HEAD~1
+
+expecting success of 6022.6 'rev-list --missing=print with missing HEAD~1': 
+			oid="$(git rev-parse $obj)" &&
+			path=".git/objects/$(test_oid_to_path $oid)" &&
+
+			# Before the object is made missing, we use rev-list to
+			# get the expected oids.
+			git rev-list --objects --no-object-names \
+				HEAD ^$obj >expect.raw &&
+
+			# Blobs are shared by all commits, so even though a commit/tree
+			# might be skipped, its blob must be accounted for.
+			if test $obj != "HEAD:1.t"
+			then
+				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
+				echo $(git rev-parse HEAD:2.t) >>expect.raw
+			fi &&
+
+			mv "$path" "$path.hidden" &&
+			test_when_finished "mv $path.hidden $path" &&
+
+			git rev-list --missing=$action --objects --no-object-names \
+				HEAD >actual.raw &&
+
+			# When the action is to print, we should also add the missing
+			# oid to the expect list.
+			case $action in
+			allow-any)
+				;;
+			print)
+				grep ?$oid actual.raw &&
+				echo ?$oid >>expect.raw
+				;;
+			esac &&
+
+			sort actual.raw >actual &&
+			sort expect.raw >expect &&
+			test_cmp expect actual
+		
+?82335b23aa7234320d6f8055243c852e4b6a5ca3
+ok 6 - rev-list --missing=print with missing HEAD~1
+
+expecting success of 6022.7 'rev-list --missing=allow-any with missing HEAD~1^{tree}': 
+			oid="$(git rev-parse $obj)" &&
+			path=".git/objects/$(test_oid_to_path $oid)" &&
+
+			# Before the object is made missing, we use rev-list to
+			# get the expected oids.
+			git rev-list --objects --no-object-names \
+				HEAD ^$obj >expect.raw &&
+
+			# Blobs are shared by all commits, so even though a commit/tree
+			# might be skipped, its blob must be accounted for.
+			if test $obj != "HEAD:1.t"
+			then
+				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
+				echo $(git rev-parse HEAD:2.t) >>expect.raw
+			fi &&
+
+			mv "$path" "$path.hidden" &&
+			test_when_finished "mv $path.hidden $path" &&
+
+			git rev-list --missing=$action --objects --no-object-names \
+				HEAD >actual.raw &&
+
+			# When the action is to print, we should also add the missing
+			# oid to the expect list.
+			case $action in
+			allow-any)
+				;;
+			print)
+				grep ?$oid actual.raw &&
+				echo ?$oid >>expect.raw
+				;;
+			esac &&
+
+			sort actual.raw >actual &&
+			sort expect.raw >expect &&
+			test_cmp expect actual
+		
+ok 7 - rev-list --missing=allow-any with missing HEAD~1^{tree}
+
+expecting success of 6022.8 'rev-list --missing=print with missing HEAD~1^{tree}': 
+			oid="$(git rev-parse $obj)" &&
+			path=".git/objects/$(test_oid_to_path $oid)" &&
+
+			# Before the object is made missing, we use rev-list to
+			# get the expected oids.
+			git rev-list --objects --no-object-names \
+				HEAD ^$obj >expect.raw &&
+
+			# Blobs are shared by all commits, so even though a commit/tree
+			# might be skipped, its blob must be accounted for.
+			if test $obj != "HEAD:1.t"
+			then
+				echo $(git rev-parse HEAD:1.t) >>expect.raw &&
+				echo $(git rev-parse HEAD:2.t) >>expect.raw
+			fi &&
+
+			mv "$path" "$path.hidden" &&
+			test_when_finished "mv $path.hidden $path" &&
+
+			git rev-list --missing=$action --objects --no-object-names \
+				HEAD >actual.raw &&
+
+			# When the action is to print, we should also add the missing
+			# oid to the expect list.
+			case $action in
+			allow-any)
+				;;
+			print)
+				grep ?$oid actual.raw &&
+				echo ?$oid >>expect.raw
+				;;
 			esac &&
 
 			sort actual.raw >actual &&
@@ -405334,422 +405697,6 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6114-keep-packs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6114-keep-packs/.git/
-expecting success of 6114.1 'setup': 
-	test_commit loose &&
-	test_commit packed &&
-	test_commit kept &&
-
-	KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
-	refs/tags/kept
-	^refs/tags/packed
-	EOF
-	) &&
-	MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
-	refs/tags/packed
-	^refs/tags/loose
-	EOF
-	) &&
-
-	touch .git/objects/pack/pack-$KEPT_PACK.keep
-
-[master (root-commit) c1488ad] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-[master 84721bd] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master fb0b3cd] kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 kept.t
-ok 1 - setup
-
-expecting success of 6114.2 '--no-kept-objects excludes trees and blobs in .keep packs': 
-	rev_list_objects --objects --all --no-object-names >kept &&
-	rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
-
-	idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
-	comm -3 kept no-kept >actual &&
-
-	test_cmp expect actual
-
-ok 2 - --no-kept-objects excludes trees and blobs in .keep packs
-
-expecting success of 6114.3 '--no-kept-objects excludes kept non-MIDX object': 
-	test_config core.multiPackIndex true &&
-
-	# Create a pack with just the commit object in pack, and do not mark it
-	# as kept (even though it appears in $KEPT_PACK, which does have a .keep
-	# file).
-	MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
-	$(git rev-parse kept)
-	EOF
-	) &&
-
-	# Write a MIDX containing all packs, but use the version of the commit
-	# at "kept" in a non-kept pack by touching $MIDX_PACK.
-	touch .git/objects/pack/pack-$MIDX_PACK.pack &&
-	git multi-pack-index write &&
-
-	rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
-	(
-		idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
-		git rev-list --objects --no-object-names refs/tags/loose
-	) | sort >expect &&
-	test_cmp expect actual
-
-ok 3 - --no-kept-objects excludes kept non-MIDX object
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6115-rev-list-du.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6115-rev-list-du/.git/
-expecting success of 6115.1 'set up repository': 
-	test_commit --no-tag one &&
-	test_commit --no-tag two &&
-	git repack -adb &&
-	git reset --hard HEAD^ &&
-	test_commit --no-tag three &&
-	test_commit --no-tag four &&
-	git reset --hard HEAD^
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-HEAD is now at d79ce16 one
-[master 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master 6f2ec4d] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-HEAD is now at 897c206 three
-ok 1 - set up repository
-
-expecting success of 6115.2 'generate expected size (HEAD)': 
-		disk_usage_slow HEAD >expect
-	
-ok 2 - generate expected size (HEAD)
-
-expecting success of 6115.3 'rev-list --disk-usage without bitmaps (HEAD)': 
-		git rev-list --disk-usage HEAD >actual &&
-		test_cmp expect actual
-	
-ok 3 - rev-list --disk-usage without bitmaps (HEAD)
-
-expecting success of 6115.4 'rev-list --disk-usage with bitmaps (HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index HEAD >actual &&
-		test_cmp expect actual
-	
-ok 4 - rev-list --disk-usage with bitmaps (HEAD)
-
-expecting success of 6115.5 'generate expected size (--objects HEAD)': 
-		disk_usage_slow --objects HEAD >expect
-	
-ok 5 - generate expected size (--objects HEAD)
-
-expecting success of 6115.6 'rev-list --disk-usage without bitmaps (--objects HEAD)': 
-		git rev-list --disk-usage --objects HEAD >actual &&
-		test_cmp expect actual
-	
-ok 6 - rev-list --disk-usage without bitmaps (--objects HEAD)
-
-expecting success of 6115.7 'rev-list --disk-usage with bitmaps (--objects HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index --objects HEAD >actual &&
-		test_cmp expect actual
-	
-ok 7 - rev-list --disk-usage with bitmaps (--objects HEAD)
-
-expecting success of 6115.8 'generate expected size (--objects HEAD^..HEAD)': 
-		disk_usage_slow --objects HEAD^..HEAD >expect
-	
-ok 8 - generate expected size (--objects HEAD^..HEAD)
-
-expecting success of 6115.9 'rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)': 
-		git rev-list --disk-usage --objects HEAD^..HEAD >actual &&
-		test_cmp expect actual
-	
-ok 9 - rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)
-
-expecting success of 6115.10 'rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index --objects HEAD^..HEAD >actual &&
-		test_cmp expect actual
-	
-ok 10 - rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)
-
-expecting success of 6115.11 'setup for --unpacked tests': 
-	git repack -adb &&
-	test_commit unpacked
-
-[master 76e469a] unpacked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unpacked.t
-ok 11 - setup for --unpacked tests
-
-expecting success of 6115.12 'generate expected size (--all --objects --unpacked)': 
-		disk_usage_slow --all --objects --unpacked >expect
-	
-ok 12 - generate expected size (--all --objects --unpacked)
-
-expecting success of 6115.13 'rev-list --disk-usage without bitmaps (--all --objects --unpacked)': 
-		git rev-list --disk-usage --all --objects --unpacked >actual &&
-		test_cmp expect actual
-	
-ok 13 - rev-list --disk-usage without bitmaps (--all --objects --unpacked)
-
-expecting success of 6115.14 'rev-list --disk-usage with bitmaps (--all --objects --unpacked)': 
-		git rev-list --disk-usage --use-bitmap-index --all --objects --unpacked >actual &&
-		test_cmp expect actual
-	
-ok 14 - rev-list --disk-usage with bitmaps (--all --objects --unpacked)
-
-expecting success of 6115.15 'rev-list --disk-usage=human': 
-	git rev-list --objects HEAD --disk-usage=human >actual &&
-	disk_usage_slow --objects HEAD >actual_size &&
-	grep "$(cat actual_size) bytes" actual
-
-733 bytes
-ok 15 - rev-list --disk-usage=human
-
-expecting success of 6115.16 'rev-list --disk-usage=human with bitmaps': 
-	git rev-list --objects HEAD --use-bitmap-index --disk-usage=human >actual &&
-	disk_usage_slow --objects HEAD >actual_size &&
-	grep "$(cat actual_size) bytes" actual
-
-733 bytes
-ok 16 - rev-list --disk-usage=human with bitmaps
-
-expecting success of 6115.17 'rev-list use --disk-usage unproperly': 
-	test_must_fail git rev-list --objects HEAD --disk-usage=typo 2>err &&
-	cat >expect <<-\EOF &&
-	fatal: invalid value for '--disk-usage=<format>': 'typo', the only allowed format is 'human'
-	EOF
-	test_cmp err expect
-
-ok 17 - rev-list use --disk-usage unproperly
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6113-rev-list-bitmap-filters.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6113-rev-list-bitmap-filters/.git/
-expecting success of 6113.1 'set up bitmapped repo': 
-	# one commit will have bitmaps, the other will not
-	test_commit one &&
-	test_commit much-larger-blob-one &&
-	git repack -adb &&
-	test_commit two &&
-	test_commit much-larger-blob-two &&
-	git tag tag
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master e6e7e90] much-larger-blob-one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 much-larger-blob-one.t
-[master 5ff67e3] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master bb132a8] much-larger-blob-two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 much-larger-blob-two.t
-ok 1 - set up bitmapped repo
-
-expecting success of 6113.2 'filters fallback to non-bitmap traversal': 
-	# use a path-based filter, since they are inherently incompatible with
-	# bitmaps (i.e., this test will never get confused by later code to
-	# combine the features)
-	filter=$(echo "!one" | git hash-object -w --stdin) &&
-	git rev-list --objects --filter=sparse:oid=$filter HEAD >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=sparse:oid=$filter HEAD >actual &&
-	test_cmp expect actual
-
-ok 2 - filters fallback to non-bitmap traversal
-
-expecting success of 6113.3 'blob:none filter': 
-	git rev-list --objects --filter=blob:none HEAD >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=blob:none HEAD >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 3 - blob:none filter
-
-expecting success of 6113.4 'blob:none filter with specified blob': 
-	git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=blob:none HEAD HEAD:two.t >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 4 - blob:none filter with specified blob
-
-expecting success of 6113.5 'blob:limit filter': 
-	git rev-list --objects --filter=blob:limit=5 HEAD >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=blob:limit=5 HEAD >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 5 - blob:limit filter
-
-expecting success of 6113.6 'blob:limit filter with specified blob': 
-	git rev-list --objects --filter=blob:limit=5 \
-		     HEAD HEAD:much-larger-blob-two.t >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=blob:limit=5 \
-		     HEAD HEAD:much-larger-blob-two.t >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 6 - blob:limit filter with specified blob
-
-expecting success of 6113.7 'tree:0 filter': 
-	git rev-list --objects --filter=tree:0 HEAD >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=tree:0 HEAD >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 7 - tree:0 filter
-
-expecting success of 6113.8 'tree:0 filter with specified blob, tree': 
-	git rev-list --objects --filter=tree:0 HEAD HEAD:two.t >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=tree:0 HEAD HEAD:two.t >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 8 - tree:0 filter with specified blob, tree
-
-expecting success of 6113.9 'tree:1 filter': 
-	git rev-list --objects --filter=tree:1 HEAD >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=tree:1 HEAD >actual &&
-	test_cmp expect actual
-
-ok 9 - tree:1 filter
-
-expecting success of 6113.10 'object:type filter': 
-	git rev-list --objects --filter=object:type=tag tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=object:type=tag tag >actual &&
-	test_cmp expect actual &&
-
-	git rev-list --objects --filter=object:type=commit tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=object:type=commit tag >actual &&
-	test_bitmap_traversal expect actual &&
-
-	git rev-list --objects --filter=object:type=tree tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=object:type=tree tag >actual &&
-	test_bitmap_traversal expect actual &&
-
-	git rev-list --objects --filter=object:type=blob tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=object:type=blob tag >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-expect actual differ: char 1, line 1
-expect actual differ: char 1, line 1
-ok 10 - object:type filter
-
-expecting success of 6113.11 'object:type filter with --filter-provided-objects': 
-	git rev-list --objects --filter-provided-objects --filter=object:type=tag tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter-provided-objects --filter=object:type=tag tag >actual &&
-	test_cmp expect actual &&
-
-	git rev-list --objects --filter-provided-objects --filter=object:type=commit tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter-provided-objects --filter=object:type=commit tag >actual &&
-	test_bitmap_traversal expect actual &&
-
-	git rev-list --objects --filter-provided-objects --filter=object:type=tree tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter-provided-objects --filter=object:type=tree tag >actual &&
-	test_bitmap_traversal expect actual &&
-
-	git rev-list --objects --filter-provided-objects --filter=object:type=blob tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter-provided-objects --filter=object:type=blob tag >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-expect actual differ: char 1, line 1
-expect actual differ: char 41, line 1
-ok 11 - object:type filter with --filter-provided-objects
-
-expecting success of 6113.12 'combine filter': 
-	git rev-list --objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
-	test_bitmap_traversal expect actual
-
-expect actual differ: char 1, line 1
-ok 12 - combine filter
-
-expecting success of 6113.13 'combine filter with --filter-provided-objects': 
-	git rev-list --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
-	git rev-list --use-bitmap-index \
-		     --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
-	test_bitmap_traversal expect actual &&
-
-	git cat-file --batch-check="%(objecttype) %(objectsize)" <actual >objects &&
-	while read objecttype objectsize
-	do
-		test "$objecttype" = blob || return 1
-		test "$objectsize" -le 1000 || return 1
-	done <objects
-
-expect actual differ: char 41, line 1
-ok 13 - combine filter with --filter-provided-objects
-
-expecting success of 6113.14 'bitmap traversal with --unpacked': 
-	git repack -adb &&
-	test_commit unpacked &&
-
-	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
-	sort expect.raw >expect &&
-
-	git rev-list --use-bitmap-index --objects --all --unpacked >actual.raw &&
-	sort actual.raw >actual &&
-
-	test_cmp expect actual
-
-[master 3679470] unpacked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unpacked.t
-ok 14 - bitmap traversal with --unpacked
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6101-rev-parse-parents.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6101-rev-parse-parents/.git/
 expecting success of 6101.1 'setup': 
@@ -407463,211 +407410,6 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6130-pathspec-noglob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6130-pathspec-noglob/.git/
-expecting success of 6130.1 'create commits with glob characters': 
-	test_commit unrelated bar &&
-	test_commit vanilla foo &&
-	# insert file "f*" in the commit, but in a way that avoids
-	# the name "f*" in the worktree, because it is not allowed
-	# on Windows (the tests below do not depend on the presence
-	# of the file in the worktree)
-	git config core.protectNTFS false &&
-	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
-	test_tick &&
-	git commit -m star &&
-	test_commit bracket "f[o][o]"
-
-[master (root-commit) f600089] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 065b8fa] vanilla
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 306e39a] star
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f*
-[master 48b9afb] bracket
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f[o][o]
-ok 1 - create commits with glob characters
-
-expecting success of 6130.2 'vanilla pathspec matches literally': 
-	echo vanilla >expect &&
-	git log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 2 - vanilla pathspec matches literally
-
-expecting success of 6130.3 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 3 - star pathspec globs
-
-expecting success of 6130.4 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f*" >actual &&
-	test_cmp expect actual
-
-ok 4 - star pathspec globs
-
-expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 5 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 6 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git --literal-pathspecs log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 7 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git log --format=%s -- ":(literal)foo" >actual &&
-	test_cmp expect actual
-
-ok 8 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.9 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git --literal-pathspecs log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 9 - no-glob option matches literally (star)
-
-expecting success of 6130.10 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git log --format=%s -- ":(literal)f*" >actual &&
-	test_cmp expect actual
-
-ok 10 - no-glob option matches literally (star)
-
-expecting success of 6130.11 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 11 - no-glob option matches literally (bracket)
-
-expecting success of 6130.12 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git log --format=%s -- ":(literal)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 12 - no-glob option matches literally (bracket)
-
-expecting success of 6130.13 'no-glob option disables :(literal)': 
-	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
-	test_must_be_empty actual
-
-ok 13 - no-glob option disables :(literal)
-
-expecting success of 6130.14 'no-glob environment variable works': 
-	echo star >expect &&
-	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 14 - no-glob environment variable works
-
-expecting success of 6130.15 'blame takes global pathspec flags': 
-	git --literal-pathspecs blame -- foo &&
-	git --icase-pathspecs   blame -- foo &&
-	git --glob-pathspecs    blame -- foo &&
-	git --noglob-pathspecs  blame -- foo
-
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-ok 15 - blame takes global pathspec flags
-
-expecting success of 6130.16 'setup xxx/bar': 
-	mkdir xxx &&
-	test_commit xxx xxx/bar
-
-[master 7cd4d15] xxx
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 xxx/bar
-ok 16 - setup xxx/bar
-
-expecting success of 6130.17 '**/ works with :(glob)': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 17 - **/ works with :(glob)
-
-expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
-	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 18 - **/ does not work with --noglob-pathspecs
-
-expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 19 - **/ works with :(glob) and --noglob-pathspecs
-
-expecting success of 6130.20 '**/ works with --glob-pathspecs': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_cmp expect actual
-
-ok 20 - **/ works with --glob-pathspecs
-
-expecting success of 6130.21 '**/ does not work with :(literal) and --glob-pathspecs': 
-	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 21 - **/ does not work with :(literal) and --glob-pathspecs
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6050-replace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6050-replace/.git/
 expecting success of 6050.1 'set up buggy branch': 
@@ -408476,6 +408218,273 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6130-pathspec-noglob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6130-pathspec-noglob/.git/
+expecting success of 6130.1 'create commits with glob characters': 
+	test_commit unrelated bar &&
+	test_commit vanilla foo &&
+	# insert file "f*" in the commit, but in a way that avoids
+	# the name "f*" in the worktree, because it is not allowed
+	# on Windows (the tests below do not depend on the presence
+	# of the file in the worktree)
+	git config core.protectNTFS false &&
+	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
+	test_tick &&
+	git commit -m star &&
+	test_commit bracket "f[o][o]"
+
+[master (root-commit) f600089] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 065b8fa] vanilla
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 306e39a] star
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f*
+[master 48b9afb] bracket
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f[o][o]
+ok 1 - create commits with glob characters
+
+expecting success of 6130.2 'vanilla pathspec matches literally': 
+	echo vanilla >expect &&
+	git log --format=%s -- foo >actual &&
+	test_cmp expect actual
+
+ok 2 - vanilla pathspec matches literally
+
+expecting success of 6130.3 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 3 - star pathspec globs
+
+expecting success of 6130.4 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f*" >actual &&
+	test_cmp expect actual
+
+ok 4 - star pathspec globs
+
+expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 5 - bracket pathspec globs and matches literal brackets
+
+expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 6 - bracket pathspec globs and matches literal brackets
+
+expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git --literal-pathspecs log --format=%s -- foo >actual &&
+	test_cmp expect actual
+
+ok 7 - no-glob option matches literally (vanilla)
+
+expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git log --format=%s -- ":(literal)foo" >actual &&
+	test_cmp expect actual
+
+ok 8 - no-glob option matches literally (vanilla)
+
+expecting success of 6130.9 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git --literal-pathspecs log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 9 - no-glob option matches literally (star)
+
+expecting success of 6130.10 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git log --format=%s -- ":(literal)f*" >actual &&
+	test_cmp expect actual
+
+ok 10 - no-glob option matches literally (star)
+
+expecting success of 6130.11 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 11 - no-glob option matches literally (bracket)
+
+expecting success of 6130.12 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git log --format=%s -- ":(literal)f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 12 - no-glob option matches literally (bracket)
+
+expecting success of 6130.13 'no-glob option disables :(literal)': 
+	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
+	test_must_be_empty actual
+
+ok 13 - no-glob option disables :(literal)
+
+expecting success of 6130.14 'no-glob environment variable works': 
+	echo star >expect &&
+	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 14 - no-glob environment variable works
+
+expecting success of 6130.15 'blame takes global pathspec flags': 
+	git --literal-pathspecs blame -- foo &&
+	git --icase-pathspecs   blame -- foo &&
+	git --glob-pathspecs    blame -- foo &&
+	git --noglob-pathspecs  blame -- foo
+
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+ok 15 - blame takes global pathspec flags
+
+expecting success of 6130.16 'setup xxx/bar': 
+	mkdir xxx &&
+	test_commit xxx xxx/bar
+
+[master 7cd4d15] xxx
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xxx/bar
+ok 16 - setup xxx/bar
+
+expecting success of 6130.17 '**/ works with :(glob)': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
+
+ok 17 - **/ works with :(glob)
+
+expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
+	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_must_be_empty actual
+
+ok 18 - **/ does not work with --noglob-pathspecs
+
+expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
+
+ok 19 - **/ works with :(glob) and --noglob-pathspecs
+
+expecting success of 6130.20 '**/ works with --glob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_cmp expect actual
+
+ok 20 - **/ works with --glob-pathspecs
+
+expecting success of 6130.21 '**/ does not work with :(literal) and --glob-pathspecs': 
+	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
+	test_must_be_empty actual
+
+ok 21 - **/ does not work with :(literal) and --glob-pathspecs
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6133-pathspec-rev-dwim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6133-pathspec-rev-dwim/.git/
+expecting success of 6133.1 'setup': 
+	test_commit base &&
+	echo content >"br[ack]ets" &&
+	git add . &&
+	test_tick &&
+	git commit -m brackets
+
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 261aa52] brackets
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 br[ack]ets
+ok 1 - setup
+
+expecting success of 6133.2 'non-rev wildcard dwims to pathspec': 
+	git log -- "*.t" >expect &&
+	git log    "*.t" >actual &&
+	test_cmp expect actual
+
+ok 2 - non-rev wildcard dwims to pathspec
+
+expecting success of 6133.3 'tree:path with metacharacters dwims to rev': 
+	git show "HEAD:br[ack]ets" -- >expect &&
+	git show "HEAD:br[ack]ets"    >actual &&
+	test_cmp expect actual
+
+ok 3 - tree:path with metacharacters dwims to rev
+
+expecting success of 6133.4 '^{foo} with metacharacters dwims to rev': 
+	git log "HEAD^{/b.*}" -- >expect &&
+	git log "HEAD^{/b.*}"    >actual &&
+	test_cmp expect actual
+
+ok 4 - ^{foo} with metacharacters dwims to rev
+
+expecting success of 6133.5 '@{foo} with metacharacters dwims to rev': 
+	git log "HEAD@{now [or thereabouts]}" -- >expect &&
+	git log "HEAD@{now [or thereabouts]}"    >actual &&
+	test_cmp expect actual
+
+ok 5 - @{foo} with metacharacters dwims to rev
+
+expecting success of 6133.6 ':/*.t from a subdir dwims to a pathspec': 
+	mkdir subdir &&
+	(
+		cd subdir &&
+		git log -- ":/*.t" >expect &&
+		git log    ":/*.t" >actual &&
+		test_cmp expect actual
+	)
+
+ok 6 - :/*.t from a subdir dwims to a pathspec
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6131-pathspec-icase.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6131-pathspec-icase/.git/
 checking prerequisite: CASE_INSENSITIVE_FS
@@ -408647,68 +408656,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6133-pathspec-rev-dwim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6133-pathspec-rev-dwim/.git/
-expecting success of 6133.1 'setup': 
-	test_commit base &&
-	echo content >"br[ack]ets" &&
-	git add . &&
-	test_tick &&
-	git commit -m brackets
-
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 261aa52] brackets
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 br[ack]ets
-ok 1 - setup
-
-expecting success of 6133.2 'non-rev wildcard dwims to pathspec': 
-	git log -- "*.t" >expect &&
-	git log    "*.t" >actual &&
-	test_cmp expect actual
-
-ok 2 - non-rev wildcard dwims to pathspec
-
-expecting success of 6133.3 'tree:path with metacharacters dwims to rev': 
-	git show "HEAD:br[ack]ets" -- >expect &&
-	git show "HEAD:br[ack]ets"    >actual &&
-	test_cmp expect actual
-
-ok 3 - tree:path with metacharacters dwims to rev
-
-expecting success of 6133.4 '^{foo} with metacharacters dwims to rev': 
-	git log "HEAD^{/b.*}" -- >expect &&
-	git log "HEAD^{/b.*}"    >actual &&
-	test_cmp expect actual
-
-ok 4 - ^{foo} with metacharacters dwims to rev
-
-expecting success of 6133.5 '@{foo} with metacharacters dwims to rev': 
-	git log "HEAD@{now [or thereabouts]}" -- >expect &&
-	git log "HEAD@{now [or thereabouts]}"    >actual &&
-	test_cmp expect actual
-
-ok 5 - @{foo} with metacharacters dwims to rev
-
-expecting success of 6133.6 ':/*.t from a subdir dwims to a pathspec': 
-	mkdir subdir &&
-	(
-		cd subdir &&
-		git log -- ":/*.t" >expect &&
-		git log    ":/*.t" >actual &&
-		test_cmp expect actual
-	)
-
-ok 6 - :/*.t from a subdir dwims to a pathspec
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6111-rev-list-treesame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6111-rev-list-treesame/.git/
 expecting success of 6111.1 'setup': 
@@ -410254,81 +410201,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6301-for-each-ref-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6301-for-each-ref-errors/.git/
-expecting success of 6301.1 'setup': 
-	MISSING=$(test_oid deadbeef) &&
-	git commit --allow-empty -m "Initial" &&
-	git tag testtag &&
-	git for-each-ref >full-list &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-list
-
-[master (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 6301.2 'Broken refs are reported correctly': 
-	r=refs/heads/bogus &&
-	: >.git/$r &&
-	test_when_finished "rm -f .git/$r" &&
-	echo "warning: ignoring broken ref $r" >broken-err &&
-	git for-each-ref >out 2>err &&
-	test_cmp full-list out &&
-	test_cmp broken-err err
-
-ok 2 - Broken refs are reported correctly
-
-expecting success of 6301.3 'NULL_SHA1 refs are reported correctly': 
-	r=refs/heads/zeros &&
-	echo $ZEROS >.git/$r &&
-	test_when_finished "rm -f .git/$r" &&
-	echo "warning: ignoring broken ref $r" >zeros-err &&
-	git for-each-ref >out 2>err &&
-	test_cmp full-list out &&
-	test_cmp zeros-err err &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
-	test_cmp brief-list brief-out &&
-	test_cmp zeros-err brief-err
-
-ok 3 - NULL_SHA1 refs are reported correctly
-
-expecting success of 6301.4 'Missing objects are reported correctly': 
-	test_when_finished "git update-ref -d refs/heads/missing" &&
-	test-tool ref-store main update-ref msg refs/heads/missing "$MISSING" "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
-	echo "fatal: missing object $MISSING for refs/heads/missing" >missing-err &&
-	test_must_fail git for-each-ref 2>err &&
-	test_cmp missing-err err &&
-	(
-		cat brief-list &&
-		echo "$MISSING refs/heads/missing"
-	) | sort -k 2 >missing-brief-expected &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
-	test_cmp missing-brief-expected brief-out &&
-	test_must_be_empty brief-err
-
-d31adcd248e1f85d12741183d231fa5260dcfd5e commit	refs/heads/master
-ok 4 - Missing objects are reported correctly
-
-expecting success of 6301.5 'ahead-behind requires an argument': 
-	test_must_fail git for-each-ref \
-		--format="%(ahead-behind)" 2>err &&
-	echo "fatal: expected format: %(ahead-behind:<committish>)" >expect &&
-	test_cmp expect err
-
-ok 5 - ahead-behind requires an argument
-
-expecting success of 6301.6 'missing ahead-behind base': 
-	test_must_fail git for-each-ref \
-		--format="%(ahead-behind:refs/heads/missing)" 2>err &&
-	echo "fatal: failed to find 'refs/heads/missing'" >expect &&
-	test_cmp expect err
-
-ok 6 - missing ahead-behind base
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6132-pathspec-exclude.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6132-pathspec-exclude/.git/
 expecting success of 6132.1 'setup': 
@@ -410868,6 +410740,81 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6301-for-each-ref-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6301-for-each-ref-errors/.git/
+expecting success of 6301.1 'setup': 
+	MISSING=$(test_oid deadbeef) &&
+	git commit --allow-empty -m "Initial" &&
+	git tag testtag &&
+	git for-each-ref >full-list &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-list
+
+[master (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 6301.2 'Broken refs are reported correctly': 
+	r=refs/heads/bogus &&
+	: >.git/$r &&
+	test_when_finished "rm -f .git/$r" &&
+	echo "warning: ignoring broken ref $r" >broken-err &&
+	git for-each-ref >out 2>err &&
+	test_cmp full-list out &&
+	test_cmp broken-err err
+
+ok 2 - Broken refs are reported correctly
+
+expecting success of 6301.3 'NULL_SHA1 refs are reported correctly': 
+	r=refs/heads/zeros &&
+	echo $ZEROS >.git/$r &&
+	test_when_finished "rm -f .git/$r" &&
+	echo "warning: ignoring broken ref $r" >zeros-err &&
+	git for-each-ref >out 2>err &&
+	test_cmp full-list out &&
+	test_cmp zeros-err err &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
+	test_cmp brief-list brief-out &&
+	test_cmp zeros-err brief-err
+
+ok 3 - NULL_SHA1 refs are reported correctly
+
+expecting success of 6301.4 'Missing objects are reported correctly': 
+	test_when_finished "git update-ref -d refs/heads/missing" &&
+	test-tool ref-store main update-ref msg refs/heads/missing "$MISSING" "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
+	echo "fatal: missing object $MISSING for refs/heads/missing" >missing-err &&
+	test_must_fail git for-each-ref 2>err &&
+	test_cmp missing-err err &&
+	(
+		cat brief-list &&
+		echo "$MISSING refs/heads/missing"
+	) | sort -k 2 >missing-brief-expected &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
+	test_cmp missing-brief-expected brief-out &&
+	test_must_be_empty brief-err
+
+d31adcd248e1f85d12741183d231fa5260dcfd5e commit	refs/heads/master
+ok 4 - Missing objects are reported correctly
+
+expecting success of 6301.5 'ahead-behind requires an argument': 
+	test_must_fail git for-each-ref \
+		--format="%(ahead-behind)" 2>err &&
+	echo "fatal: expected format: %(ahead-behind:<committish>)" >expect &&
+	test_cmp expect err
+
+ok 5 - ahead-behind requires an argument
+
+expecting success of 6301.6 'missing ahead-behind base': 
+	test_must_fail git for-each-ref \
+		--format="%(ahead-behind:refs/heads/missing)" 2>err &&
+	echo "fatal: failed to find 'refs/heads/missing'" >expect &&
+	test_cmp expect err
+
+ok 6 - missing ahead-behind base
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6135-pathspec-with-attrs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6135-pathspec-with-attrs/.git/
 expecting success of 6135.1 'setup a tree': 
@@ -412308,7 +412255,7 @@
 		git bundle create --progress out.bundle --all 2>err &&
 	grep Writing err
 
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 293.00 KiB/s, done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 476.00 KiB/s, done.
 ok 25 - bundle progress includes write phase
 
 checking prerequisite: TTY
@@ -412353,7 +412300,7 @@
 
 Counting objects:   2% (1/47)
Counting objects:   4% (2/47)
Counting objects:   6% (3/47)
Counting objects:   8% (4/47)
Counting objects:  10% (5/47)
Counting objects:  12% (6/47)
Counting objects:  14% (7/47)
Counting objects:  17% (8/47)
Counting objects:  19% (9/47)
Counting objects:  21% (10/47)
Counting objects:  23% (11/47)
Counting objects:  25% (12/47)
Counting objects:  27% (13/47)
Counting objects:  29% (14/47)
Counting objects:  31% (15/47)
Counting objects:  34% (16/47)
Counting objects:  36% (17/47)
Counting objects:  38% (18/47)
Counting objects:  40% (19/47)
Counting objects:  42% (20/47)
Counting objects:  44% (21/47)
Counting objects:  46% (22/47)
Counting objects:  48% (23/47)
Counting objects:  51% (24/47)
Counting objects:  53% (25/47)
Counting objects:  55% (26/47)
Counting objects:  57% (27/47)
Counting objects:  59% (28/47)
Counting objects:  61% (29/47)
Counting objects:  63% (30/47)
Counting objects:  65% (31/47)
Counting objects:  68% (32/47)
Counting objects:  70% (33/47)
Counting objects:  72% (34/47)
Counting objects:  74% (35/47)
Counting objects:  76% (36/47)
Counting objects:  78% (37/47)
Counting objects:  80% (38/47)
Counting objects:  82% (39/47)
Counting objects:  85% (40/47)
Counting objects:  87% (41/47)
Counting objects:  89% (42/47)
Counting objects:  91% (43/47)
Counting objects:  93% (44/47)
Counting objects:  95% (45/47)
Counting objects:  97% (46/47)
Counting objects: 100% (47/47)
Counting objects: 100% (47/47), done.
 Compressing objects:   3% (1/31)
Compressing objects:   6% (2/31)
Compressing objects:   9% (3/31)
Compressing objects:  12% (4/31)
Compressing objects:  16% (5/31)
Compressing objects:  19% (6/31)
Compressing objects:  22% (7/31)
Compressing objects:  25% (8/31)
Compressing objects:  29% (9/31)
Compressing objects:  32% (10/31)
Compressing objects:  35% (11/31)
Compressing objects:  38% (12/31)
Compressing objects:  41% (13/31)
Compressing objects:  45% (14/31)
Compressing objects:  48% (15/31)
Compressing objects:  51% (16/31)
Compressing objects:  54% (17/31)
Compressing objects:  58% (18/31)
Compressing objects:  61% (19/31)
Compressing objects:  64% (20/31)
Compressing objects:  67% (21/31)
Compressing objects:  70% (22/31)
Compressing objects:  74% (23/31)
Compressing objects:  77% (24/31)
Compressing objects:  80% (25/31)
Compressing objects:  83% (26/31)
Compressing objects:  87% (27/31)
Compressing objects:  90% (28/31)
Compressing objects:  93% (29/31)
Compressing objects:  96% (30/31)
Compressing objects: 100% (31/31)
Compressing objects: 100% (31/31), done.
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 476.00 KiB/s, done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 952.00 KiB/s, done.
 ok 27 - bundle progress with --no-quiet
 
 expecting success of 6020.28 'read bundle over stdin': 
@@ -412851,6 +412798,312 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6405-merge-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6405-merge-symlinks/.git/
+expecting success of 6405.1 'setup': 
+	git config core.symlinks false &&
+	>file &&
+	git add file &&
+	git commit -m initial &&
+	git branch b-symlink &&
+	git branch b-file &&
+	l=$(printf file | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m main &&
+	git checkout b-symlink &&
+	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m b-symlink &&
+	git checkout b-file &&
+	echo plain-file >symlink &&
+	git add symlink &&
+	git commit -m b-file
+
+[main (root-commit) 6ce5622] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 5fce5e3] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-symlink'
+[b-symlink efc53db] b-symlink
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-file'
+[b-file 32029ee] b-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 symlink
+ok 1 - setup
+
+expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
+	git checkout b-symlink &&
+	test_must_fail git merge main
+
+Switched to branch 'b-symlink'
+CONFLICT (add/add): Merge conflict in symlink
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge main into b-symlink, which has a different symbolic link
+
+expecting success of 6405.3 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 3 - the merge result must be a file
+
+expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
+	git reset --hard &&
+	git checkout b-file &&
+	test_must_fail git merge main
+
+HEAD is now at efc53db b-symlink
+Switched to branch 'b-file'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge main into b-file, which has a file instead of a symbolic link
+
+expecting success of 6405.5 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 5 - the merge result must be a file
+
+expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
+	git reset --hard &&
+	git checkout main &&
+	test_must_fail git merge b-file
+
+HEAD is now at 32029ee b-file
+Switched to branch 'main'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - merge b-file, which has a file instead of a symbolic link, into main
+
+expecting success of 6405.7 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 7 - the merge result must be a file
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6404-recursive-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6404-recursive-merge/.git/
+expecting success of 6404.1 'setup tests': 
+	GIT_TEST_COMMIT_GRAPH=0 &&
+	export GIT_TEST_COMMIT_GRAPH &&
+	echo 1 >a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A main &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B main &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo D >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo E >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A >.git/MERGE_HEAD &&
+	echo G >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C >.git/MERGE_HEAD &&
+	echo F >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	EOF
+
+[main (root-commit) 2cb59ab] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+Switched to a new branch 'A'
+[A 9d821b5] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'B'
+[B 7082aa6] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'D'
+[D e1146db] D
+ Author: A U Thor <author@example.com>
+[other (root-commit) 216d386] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+Switched to a new branch 'C'
+[C d264643] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'E'
+[E 939285a] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'G'
+[G 26f86b6] G
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'F'
+[F 71b2f3d] F
+ Author: A U Thor <author@example.com>
+ok 1 - setup tests
+
+expecting success of 6404.2 'combined merge conflicts': 
+	test_must_fail git merge -m final G
+
+  From inner merge:  Auto-merging a1
+  From inner merge:  CONFLICT (add/add): Merge conflict in a1
+  From inner merge:  Auto-merging a1
+  From inner merge:  CONFLICT (content): Merge conflict in a1
+Auto-merging a1
+CONFLICT (content): Merge conflict in a1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - combined merge conflicts
+
+expecting success of 6404.3 'result contains a conflict': 
+	cat >expect <<-\EOF &&
+	<<<<<<< HEAD
+	F
+	=======
+	G
+	>>>>>>> G
+	EOF
+
+	test_cmp expect a1
+
+ok 3 - result contains a conflict
+
+expecting success of 6404.4 'virtual trees were processed': 
+	# TODO: fragile test, relies on ambiguous merge-base resolution
+	git ls-files --stage >out &&
+
+	cat >expect <<-EOF &&
+	100644 $(test_oid idxstage1) 1	a1
+	100644 $(git rev-parse F:a1) 2	a1
+	100644 $(git rev-parse G:a1) 3	a1
+	EOF
+
+	test_cmp expect out
+
+ok 4 - virtual trees were processed
+
+expecting success of 6404.5 'refuse to merge binary files': 
+	git reset --hard &&
+	printf "\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary &&
+	git checkout G &&
+	printf "\0\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary2 &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge F >merge_output
+	else
+		test_must_fail git merge F 2>merge_output
+	fi &&
+	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
+
+HEAD is now at 71b2f3d F
+[F 585846d] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary-file
+Switched to branch 'G'
+[G 4e36843] binary2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary-file
+warning: Cannot merge binary files: binary-file (HEAD vs. F)
+ok 5 - refuse to merge binary files
+
+expecting success of 6404.6 'mark rename/delete as unmerged': 
+
+	git reset --hard &&
+	git checkout -b delete &&
+	git rm a1 &&
+	test_tick &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	git mv a1 a2 &&
+	test_tick &&
+	git commit -m rename &&
+	test_must_fail git merge delete &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	git rev-parse --verify :2:a2 &&
+	test_must_fail git rev-parse --verify :3:a2 &&
+	git checkout -f delete &&
+	test_must_fail git merge rename &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	test_must_fail git rev-parse --verify :2:a2 &&
+	git rev-parse --verify :3:a2
+
+HEAD is now at 4e36843 binary2
+Switched to a new branch 'delete'
+rm 'a1'
+[delete d263b4e] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a1
+Switched to a new branch 'rename'
+[rename be2bcbd] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a1 => a2 (100%)
+CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
+Automatic merge failed; fix conflicts and then commit the result.
+fd7923529855d0b274795ae3349c5e0438333979
+fatal: Needed a single revision
+Switched to branch 'delete'
+CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Needed a single revision
+fd7923529855d0b274795ae3349c5e0438333979
+ok 6 - mark rename/delete as unmerged
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6302-for-each-ref-filter.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6302-for-each-ref-filter/.git/
 expecting success of 6302.1 'setup some history and refs': 
@@ -413573,312 +413826,6 @@
 1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6405-merge-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6405-merge-symlinks/.git/
-expecting success of 6405.1 'setup': 
-	git config core.symlinks false &&
-	>file &&
-	git add file &&
-	git commit -m initial &&
-	git branch b-symlink &&
-	git branch b-file &&
-	l=$(printf file | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m main &&
-	git checkout b-symlink &&
-	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m b-symlink &&
-	git checkout b-file &&
-	echo plain-file >symlink &&
-	git add symlink &&
-	git commit -m b-file
-
-[main (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 5fce5e3] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-symlink'
-[b-symlink efc53db] b-symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-file'
-[b-file 32029ee] b-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 symlink
-ok 1 - setup
-
-expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
-	git checkout b-symlink &&
-	test_must_fail git merge main
-
-Switched to branch 'b-symlink'
-CONFLICT (add/add): Merge conflict in symlink
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge main into b-symlink, which has a different symbolic link
-
-expecting success of 6405.3 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 3 - the merge result must be a file
-
-expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
-	git reset --hard &&
-	git checkout b-file &&
-	test_must_fail git merge main
-
-HEAD is now at efc53db b-symlink
-Switched to branch 'b-file'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge main into b-file, which has a file instead of a symbolic link
-
-expecting success of 6405.5 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 5 - the merge result must be a file
-
-expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
-	git reset --hard &&
-	git checkout main &&
-	test_must_fail git merge b-file
-
-HEAD is now at 32029ee b-file
-Switched to branch 'main'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - merge b-file, which has a file instead of a symbolic link, into main
-
-expecting success of 6405.7 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 7 - the merge result must be a file
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6404-recursive-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6404-recursive-merge/.git/
-expecting success of 6404.1 'setup tests': 
-	GIT_TEST_COMMIT_GRAPH=0 &&
-	export GIT_TEST_COMMIT_GRAPH &&
-	echo 1 >a1 &&
-	git add a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-	git checkout -b A main &&
-	echo A >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-	git checkout -b B main &&
-	echo B >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-	git checkout -b D A &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo D >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-	git symbolic-ref HEAD refs/heads/other &&
-	echo 2 >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-	git checkout -b C &&
-	echo C >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-	git checkout -b E C &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo E >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-	git checkout -b G E &&
-	git rev-parse A >.git/MERGE_HEAD &&
-	echo G >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-	git checkout -b F D &&
-	git rev-parse C >.git/MERGE_HEAD &&
-	echo F >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
-
-	test_oid_cache <<-EOF
-	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
-	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
-	EOF
-
-[main (root-commit) 2cb59ab] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'A'
-[A 9d821b5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'B'
-[B 7082aa6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'D'
-[D e1146db] D
- Author: A U Thor <author@example.com>
-[other (root-commit) 216d386] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'C'
-[C d264643] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'E'
-[E 939285a] E
- Author: A U Thor <author@example.com>
-Switched to a new branch 'G'
-[G 26f86b6] G
- Author: A U Thor <author@example.com>
-Switched to a new branch 'F'
-[F 71b2f3d] F
- Author: A U Thor <author@example.com>
-ok 1 - setup tests
-
-expecting success of 6404.2 'combined merge conflicts': 
-	test_must_fail git merge -m final G
-
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (add/add): Merge conflict in a1
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (content): Merge conflict in a1
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - combined merge conflicts
-
-expecting success of 6404.3 'result contains a conflict': 
-	cat >expect <<-\EOF &&
-	<<<<<<< HEAD
-	F
-	=======
-	G
-	>>>>>>> G
-	EOF
-
-	test_cmp expect a1
-
-ok 3 - result contains a conflict
-
-expecting success of 6404.4 'virtual trees were processed': 
-	# TODO: fragile test, relies on ambiguous merge-base resolution
-	git ls-files --stage >out &&
-
-	cat >expect <<-EOF &&
-	100644 $(test_oid idxstage1) 1	a1
-	100644 $(git rev-parse F:a1) 2	a1
-	100644 $(git rev-parse G:a1) 3	a1
-	EOF
-
-	test_cmp expect out
-
-ok 4 - virtual trees were processed
-
-expecting success of 6404.5 'refuse to merge binary files': 
-	git reset --hard &&
-	printf "\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary &&
-	git checkout G &&
-	printf "\0\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary2 &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_must_fail git merge F >merge_output
-	else
-		test_must_fail git merge F 2>merge_output
-	fi &&
-	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
-
-HEAD is now at 71b2f3d F
-[F 585846d] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-Switched to branch 'G'
-[G 4e36843] binary2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-warning: Cannot merge binary files: binary-file (HEAD vs. F)
-ok 5 - refuse to merge binary files
-
-expecting success of 6404.6 'mark rename/delete as unmerged': 
-
-	git reset --hard &&
-	git checkout -b delete &&
-	git rm a1 &&
-	test_tick &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	git mv a1 a2 &&
-	test_tick &&
-	git commit -m rename &&
-	test_must_fail git merge delete &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	git rev-parse --verify :2:a2 &&
-	test_must_fail git rev-parse --verify :3:a2 &&
-	git checkout -f delete &&
-	test_must_fail git merge rename &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	test_must_fail git rev-parse --verify :2:a2 &&
-	git rev-parse --verify :3:a2
-
-HEAD is now at 4e36843 binary2
-Switched to a new branch 'delete'
-rm 'a1'
-[delete d263b4e] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 a1
-Switched to a new branch 'rename'
-[rename be2bcbd] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a1 => a2 (100%)
-CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
-Automatic merge failed; fix conflicts and then commit the result.
-fd7923529855d0b274795ae3349c5e0438333979
-fatal: Needed a single revision
-Switched to branch 'delete'
-CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Needed a single revision
-fd7923529855d0b274795ae3349c5e0438333979
-ok 6 - mark rename/delete as unmerged
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6403-merge-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6403-merge-file/.git/
 expecting success of 6403.1 'setup': 
@@ -414056,8 +414003,8 @@
 checking known breakage of 6403.10 'merge result added missing LF': 
 	test_cmp test.txt test2.txt
 
---- test.txt	2026-04-19 19:22:40.467659440 +0000
-+++ test2.txt	2026-04-19 19:22:40.523659440 +0000
+--- test.txt	2025-03-17 13:26:07.762521577 +0000
++++ test2.txt	2025-03-17 13:26:07.826521982 +0000
 @@ -3,7 +3,11 @@
  super aquam refectionis educavit me;
  animam meam convertit,
@@ -415542,7 +415489,7 @@
 Trying simple merge.
 Simple merge failed, trying Automatic merge.
 Auto-merging m
-error: Cannot merge binary files: .merge_file_A05zIh
+error: Cannot merge binary files: .merge_file_cWcQJL
 ERROR: content conflict in m
 fatal: merge program failed
 Automatic merge failed; fix conflicts and then commit the result.
@@ -416117,197 +416064,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6414-merge-rename-nocruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6414-merge-rename-nocruft/.git/
-expecting success of 6414.1 'setup': 
-	cat >A <<-\EOF &&
-	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-	c cccccccccccccccccccccccccccccccccccccccccccccccc
-	d dddddddddddddddddddddddddddddddddddddddddddddddd
-	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-	f ffffffffffffffffffffffffffffffffffffffffffffffff
-	g gggggggggggggggggggggggggggggggggggggggggggggggg
-	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-	l llllllllllllllllllllllllllllllllllllllllllllllll
-	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-	o oooooooooooooooooooooooooooooooooooooooooooooooo
-	EOF
-
-	cat >M <<-\EOF &&
-	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-	EOF
-
-	git add A M &&
-	git commit -m "initial has A and M" &&
-	git branch white &&
-	git branch red &&
-	git branch blue &&
-
-	git checkout white &&
-	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-	rm -f A M &&
-	git update-index --add --remove A B M N &&
-	git commit -m "white renames A->B, M->N" &&
-
-	git checkout red &&
-	echo created by red >R &&
-	git update-index --add R &&
-	git commit -m "red creates R" &&
-
-	git checkout blue &&
-	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
-	rm -f A &&
-	mv B A &&
-	git update-index A &&
-	git commit -m "blue modify A" &&
-
-	git checkout main
-
-[main (root-commit) 7bbb60a] initial has A and M
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 A
- create mode 100644 M
-Switched to branch 'white'
-[white 72f28f0] white renames A->B, M->N
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'red'
-[red f4afd94] red creates R
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 R
-Switched to branch 'blue'
-[blue ea35213] blue modify A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6414.2 'merge white into red (A->B,M->N)': 
-	git checkout -b red-white red &&
-	git merge white &&
-	git write-tree &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_file R &&
-	test_path_is_missing A &&
-	test_path_is_missing M
-
-Switched to a new branch 'red-white'
-Merge made by the 'ort' strategy.
- A => B | 2 +-
- M => N | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-2f1341e5f32ecb7f45a35d122e62999a76d463cf
-ok 2 - merge white into red (A->B,M->N)
-
-expecting success of 6414.3 'merge blue into white (A->B, mod A, A untracked)': 
-	git checkout -b white-blue white &&
-	echo dirty >A &&
-	git merge blue &&
-	git write-tree &&
-	test_path_is_file A &&
-	echo dirty >expect &&
-	test_cmp expect A &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_missing M
-
-Switched to a new branch 'white-blue'
-Auto-merging B
-Merge made by the 'ort' strategy.
- B | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-1db6abaa095ec16043333967f8d0dbaa01cdf029
-ok 3 - merge blue into white (A->B, mod A, A untracked)
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6413-merge-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6413-merge-crlf/.git/
-expecting success of 6413.1 'setup': 
-	git config core.autocrlf true &&
-	echo foo | append_cr >file &&
-	git add file &&
-	git commit -m "Initial" &&
-	git tag initial &&
-	git branch side &&
-	echo line from a | append_cr >file &&
-	git commit -m "add line from a" file &&
-	git tag a &&
-	git checkout side &&
-	echo line from b | append_cr >file &&
-	git commit -m "add line from b" file &&
-	git tag b &&
-	git checkout main
-
-[main (root-commit) e0f7379] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 8798c05] add line from a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side 5296996] add line from b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6413.2 'Check "ours" is CRLF': 
-	git reset --hard initial &&
-	git merge side -s ours &&
-	remove_cr <file | append_cr >file.temp &&
-	test_cmp file file.temp
-
-HEAD is now at e0f7379 Initial
-Merge made by the 'ours' strategy.
-ok 2 - Check "ours" is CRLF
-
-expecting success of 6413.3 'Check that conflict file is CRLF': 
-	git reset --hard a &&
-	test_must_fail git merge side &&
-	remove_cr <file | append_cr >file.temp &&
-	test_cmp file file.temp
-
-HEAD is now at 8798c05 add line from a
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 3 - Check that conflict file is CRLF
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6409-merge-subtree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6409-merge-subtree/.git/
 expecting success of 6409.1 'setup': 
@@ -416569,6 +416325,197 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6413-merge-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6413-merge-crlf/.git/
+expecting success of 6413.1 'setup': 
+	git config core.autocrlf true &&
+	echo foo | append_cr >file &&
+	git add file &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+	echo line from a | append_cr >file &&
+	git commit -m "add line from a" file &&
+	git tag a &&
+	git checkout side &&
+	echo line from b | append_cr >file &&
+	git commit -m "add line from b" file &&
+	git tag b &&
+	git checkout main
+
+[main (root-commit) e0f7379] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 8798c05] add line from a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side 5296996] add line from b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6413.2 'Check "ours" is CRLF': 
+	git reset --hard initial &&
+	git merge side -s ours &&
+	remove_cr <file | append_cr >file.temp &&
+	test_cmp file file.temp
+
+HEAD is now at e0f7379 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
+
+expecting success of 6413.3 'Check that conflict file is CRLF': 
+	git reset --hard a &&
+	test_must_fail git merge side &&
+	remove_cr <file | append_cr >file.temp &&
+	test_cmp file file.temp
+
+HEAD is now at 8798c05 add line from a
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 3 - Check that conflict file is CRLF
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6414-merge-rename-nocruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6414-merge-rename-nocruft/.git/
+expecting success of 6414.1 'setup': 
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	echo created by red >R &&
+	git update-index --add R &&
+	git commit -m "red creates R" &&
+
+	git checkout blue &&
+	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
+	rm -f A &&
+	mv B A &&
+	git update-index A &&
+	git commit -m "blue modify A" &&
+
+	git checkout main
+
+[main (root-commit) 7bbb60a] initial has A and M
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 A
+ create mode 100644 M
+Switched to branch 'white'
+[white 72f28f0] white renames A->B, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'red'
+[red f4afd94] red creates R
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 R
+Switched to branch 'blue'
+[blue ea35213] blue modify A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6414.2 'merge white into red (A->B,M->N)': 
+	git checkout -b red-white red &&
+	git merge white &&
+	git write-tree &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_file R &&
+	test_path_is_missing A &&
+	test_path_is_missing M
+
+Switched to a new branch 'red-white'
+Merge made by the 'ort' strategy.
+ A => B | 2 +-
+ M => N | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+2f1341e5f32ecb7f45a35d122e62999a76d463cf
+ok 2 - merge white into red (A->B,M->N)
+
+expecting success of 6414.3 'merge blue into white (A->B, mod A, A untracked)': 
+	git checkout -b white-blue white &&
+	echo dirty >A &&
+	git merge blue &&
+	git write-tree &&
+	test_path_is_file A &&
+	echo dirty >expect &&
+	test_cmp expect A &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_missing M
+
+Switched to a new branch 'white-blue'
+Auto-merging B
+Merge made by the 'ort' strategy.
+ B | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+1db6abaa095ec16043333967f8d0dbaa01cdf029
+ok 3 - merge blue into white (A->B, mod A, A untracked)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6030-bisect-porcelain.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6030-bisect-porcelain/.git/
 expecting success of 6030.1 'bisect usage': 
@@ -417240,8 +417187,8 @@
 status: waiting for bad commit, 1 good commit known
 Bisecting: 0 revisions left to test after this (roughly 1 step)
 [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-'./not-executable.sh': 1: ./not-executable.sh: Permission denied
-'./not-executable.sh': 1: ./not-executable.sh: Permission denied
+'./not-executable.sh': line 1: ./not-executable.sh: Permission denied
+'./not-executable.sh': line 1: ./not-executable.sh: Permission denied
 error: bogus exit code 126 for good revision
 Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
 Switched to branch 'other'
@@ -417280,8 +417227,8 @@
 status: waiting for bad commit, 1 good commit known
 Bisecting: 0 revisions left to test after this (roughly 1 step)
 [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-'./does-not-exist.sh': 1: ./does-not-exist.sh: not found
-'./does-not-exist.sh': 1: ./does-not-exist.sh: not found
+'./does-not-exist.sh': line 1: ./does-not-exist.sh: No such file or directory
+'./does-not-exist.sh': line 1: ./does-not-exist.sh: No such file or directory
 error: bogus exit code 127 for good revision
 Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
 Switched to branch 'other'
@@ -418804,6 +418751,22 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6419-merge-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6419-merge-ignorecase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+1..0 # SKIP skipping case insensitive tests - case sensitive file system
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6120-describe.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6120-describe/.git/
 expecting success of 6120.1 'setup': 
@@ -420004,8 +419967,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2026-04-19 19:22:45.619659440 +0000
-+++ actual	2026-04-19 19:22:45.619659440 +0000
+--- expect	2025-03-17 13:26:14.618564901 +0000
++++ actual	2025-03-17 13:26:14.618564901 +0000
 @@ -1 +1 @@
 -A-3-gHASH
 +B-4-gHASH
@@ -420066,8 +420029,8 @@
 		echo "$expect" >expect &&
 		test_cmp expect actual
 	
---- expect	2026-04-19 19:22:46.115659440 +0000
-+++ actual	2026-04-19 19:22:46.115659440 +0000
+--- expect	2025-03-17 13:26:15.326569375 +0000
++++ actual	2025-03-17 13:26:15.326569375 +0000
 @@ -1 +1 @@
 -B-3-gHASH
 +A-5-gHASH
@@ -420181,22 +420144,6 @@
 1..102
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6419-merge-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6419-merge-ignorecase/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-1..0 # SKIP skipping case insensitive tests - case sensitive file system
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6417-merge-ours-theirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6417-merge-ours-theirs/.git/
 expecting success of 6417.1 'setup': 
@@ -421633,48 +421580,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6425-merge-rename-delete.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6425-merge-rename-delete/.git/
-expecting success of 6425.1 'rename/delete': 
-	echo foo >A &&
-	git add A &&
-	git commit -m "initial" &&
-
-	git checkout -b rename &&
-	git mv A B &&
-	git commit -m "rename" &&
-
-	git checkout main &&
-	git rm A &&
-	git commit -m "delete" &&
-
-	test_must_fail git merge --strategy=recursive rename >output &&
-	test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
-	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
-
-[main (root-commit) 6604e52] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-Switched to a new branch 'rename'
-[rename f088787] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename A => B (100%)
-Switched to branch 'main'
-rm 'A'
-[main b4eee36] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A
-CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
-CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
-ok 1 - rename/delete
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6415-merge-dir-to-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6415-merge-dir-to-symlink/.git/
 expecting success of 6415.1 'create a commit where dir a/b changed to symlink': 
@@ -422129,6 +422034,48 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6425-merge-rename-delete.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6425-merge-rename-delete/.git/
+expecting success of 6425.1 'rename/delete': 
+	echo foo >A &&
+	git add A &&
+	git commit -m "initial" &&
+
+	git checkout -b rename &&
+	git mv A B &&
+	git commit -m "rename" &&
+
+	git checkout main &&
+	git rm A &&
+	git commit -m "delete" &&
+
+	test_must_fail git merge --strategy=recursive rename >output &&
+	test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
+	test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
+
+[main (root-commit) 6604e52] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+Switched to a new branch 'rename'
+[rename f088787] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename A => B (100%)
+Switched to branch 'main'
+rm 'A'
+[main b4eee36] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A
+CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
+CONFLICT (rename/delete): A renamed to B in rename, but deleted in HEAD.
+ok 1 - rename/delete
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6421-merge-partial-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6421-merge-partial-clone/.git/
 expecting success of 6421.1 'Objects downloaded for single relevant rename': 
@@ -423118,6 +423065,154 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6428-merge-conflicts-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/.git/
+expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
+	test_setup_numerals plain &&
+	(
+		cd numerals_plain &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		test_cmp expected-merge numerals &&
+
+		# 4 other files:
+		#   * expected-merge
+		#   * expected-index
+		#   * index_files
+		#   * others
+		git ls-files -o >others &&
+		test_line_count = 4 others
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+Auto-merging numerals
+CONFLICT (content): Merge conflict in numerals
+Automatic merge failed; fix conflicts and then commit the result.
+ok 1 - conflicting entries written to worktree even if sparse
+
+expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
+	test_setup_numerals in_the_way &&
+	(
+		cd numerals_in_the_way &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		echo foobar >numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		test_path_is_missing .git/MERGE_HEAD &&
+
+		test_path_is_file numerals &&
+
+		# numerals should still have "foobar" in it
+		echo foobar >expect &&
+		test_cmp expect numerals
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+error: Your local changes to the following files would be overwritten by merge:
+	numerals
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 2 - present-despite-SKIP_WORKTREE handled reasonably
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6402-merge-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6402-merge-rename/.git/
 expecting success of 6402.1 'setup': 
@@ -424752,154 +424847,6 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6428-merge-conflicts-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/.git/
-expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
-	test_setup_numerals plain &&
-	(
-		cd numerals_plain &&
-
-		git checkout A^0 &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
-
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
-
-		test_must_fail git merge -s recursive B^0 &&
-
-		git ls-files -t >index_files &&
-		test_cmp expected-index index_files &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		test_cmp expected-merge numerals &&
-
-		# 4 other files:
-		#   * expected-merge
-		#   * expected-index
-		#   * index_files
-		#   * others
-		git ls-files -o >others &&
-		test_line_count = 4 others
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 016e05e A
-warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-Auto-merging numerals
-CONFLICT (content): Merge conflict in numerals
-Automatic merge failed; fix conflicts and then commit the result.
-ok 1 - conflicting entries written to worktree even if sparse
-
-expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
-	test_setup_numerals in_the_way &&
-	(
-		cd numerals_in_the_way &&
-
-		git checkout A^0 &&
-
-		test_path_is_file README &&
-		test_path_is_file numerals &&
-
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
-
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
-
-		echo foobar >numerals &&
-
-		test_must_fail git merge -s recursive B^0 &&
-
-		test_path_is_missing .git/MERGE_HEAD &&
-
-		test_path_is_file numerals &&
-
-		# numerals should still have "foobar" in it
-		echo foobar >expect &&
-		test_cmp expect numerals
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 016e05e A
-warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-error: Your local changes to the following files would be overwritten by merge:
-	numerals
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 2 - present-despite-SKIP_WORKTREE handled reasonably
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6427-diff3-conflict-markers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6427-diff3-conflict-markers/.git/
 expecting success of 6427.1 'setup no merge base': 
@@ -425785,78 +425732,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6435-merge-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6435-merge-sparse/.git/
-expecting success of 6435.1 'setup': 
-	test_file checked-out init &&
-	test_file modify_delete modify_delete_init &&
-	test_commit_this init &&
-	test_file modify_delete modify_delete_theirs &&
-	test_commit_this theirs &&
-	git reset --hard init &&
-	git rm modify_delete &&
-	test_commit_this ours &&
-	git config core.sparseCheckout true &&
-	mkdir .git/info &&
-	echo "/checked-out" >.git/info/sparse-checkout &&
-	git reset --hard &&
-	test_must_fail git merge theirs
-
-[master (root-commit) badb3ac] init
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 checked-out
- create mode 100644 modify_delete
-[master 1c06c2f] theirs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at badb3ac init
-rm 'modify_delete'
-[master 3dfe889] ours
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 modify_delete
-HEAD is now at 3dfe889 ours
-CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 1 - setup
-
-expecting success of 6435.2 'reset --hard works after the conflict': 
-	git reset --hard
-
-HEAD is now at 3dfe889 ours
-ok 2 - reset --hard works after the conflict
-
-expecting success of 6435.3 'is reset properly': 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 3 - is reset properly
-
-expecting success of 6435.4 'setup: conflict back': 
-	test_must_fail git merge theirs
-
-CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - setup: conflict back
-
-expecting success of 6435.5 'Merge abort works after the conflict': 
-	git merge --abort
-
-ok 5 - Merge abort works after the conflict
-
-expecting success of 6435.6 'is aborted properly': 
-	git status --porcelain -- modify_delete >out &&
-	test_must_be_empty out &&
-	test_path_is_missing modify_delete
-
-ok 6 - is aborted properly
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6424-merge-unrelated-index-changes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6424-merge-unrelated-index-changes/.git/
 expecting success of 6424.1 'setup trivial merges': 
@@ -426339,6 +426214,78 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6435-merge-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6435-merge-sparse/.git/
+expecting success of 6435.1 'setup': 
+	test_file checked-out init &&
+	test_file modify_delete modify_delete_init &&
+	test_commit_this init &&
+	test_file modify_delete modify_delete_theirs &&
+	test_commit_this theirs &&
+	git reset --hard init &&
+	git rm modify_delete &&
+	test_commit_this ours &&
+	git config core.sparseCheckout true &&
+	mkdir .git/info &&
+	echo "/checked-out" >.git/info/sparse-checkout &&
+	git reset --hard &&
+	test_must_fail git merge theirs
+
+[master (root-commit) badb3ac] init
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 checked-out
+ create mode 100644 modify_delete
+[master 1c06c2f] theirs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at badb3ac init
+rm 'modify_delete'
+[master 3dfe889] ours
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 modify_delete
+HEAD is now at 3dfe889 ours
+CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 1 - setup
+
+expecting success of 6435.2 'reset --hard works after the conflict': 
+	git reset --hard
+
+HEAD is now at 3dfe889 ours
+ok 2 - reset --hard works after the conflict
+
+expecting success of 6435.3 'is reset properly': 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
+
+ok 3 - is reset properly
+
+expecting success of 6435.4 'setup: conflict back': 
+	test_must_fail git merge theirs
+
+CONFLICT (modify/delete): modify_delete deleted in HEAD and modified in theirs.  Version theirs of modify_delete left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - setup: conflict back
+
+expecting success of 6435.5 'Merge abort works after the conflict': 
+	git merge --abort
+
+ok 5 - Merge abort works after the conflict
+
+expecting success of 6435.6 'is aborted properly': 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
+
+ok 6 - is aborted properly
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6429-merge-sequence-rename-caching.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6429-merge-sequence-rename-caching/.git/
 expecting success of 6429.1 'caching renames does not preclude finding new ones': 
@@ -428868,267 +428815,617 @@
 	) >expected &&
 	test_cmp expected actual
 
-ok 32 - merge-recursive simple w/submodule result
+ok 32 - merge-recursive simple w/submodule result
+
+expecting success of 6430.33 'merge-recursive copy vs. rename': 
+	git checkout -f copy &&
+	git merge rename &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 blob $o0	e" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e" &&
+		echo "100644 $o0 0	e"
+	) >expected &&
+	test_cmp expected actual
+
+Switched to branch 'copy'
+Merge made by the 'ort' strategy.
+ a | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a
+ok 33 - merge-recursive copy vs. rename
+
+expecting success of 6430.34 'merge-recursive rename vs. rename/symlink': 
+
+	git checkout -f rename &&
+	git merge rename-ln &&
+	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
+	(
+		echo "120000 blob $oln	a" &&
+		echo "100644 blob $o0	b" &&
+		echo "100644 blob $o0	c" &&
+		echo "100644 blob $o0	d/e" &&
+		echo "100644 blob $o0	e" &&
+		echo "120000 $oln 0	a" &&
+		echo "100644 $o0 0	b" &&
+		echo "100644 $o0 0	c" &&
+		echo "100644 $o0 0	d/e" &&
+		echo "100644 $o0 0	e"
+	) >expected &&
+	test_cmp expected actual
+
+Switched to branch 'rename'
+Merge made by the 'ort' strategy.
+ a | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 a
+ok 34 - merge-recursive rename vs. rename/symlink
+
+expecting success of 6430.35 'merging with triple rename across D/F conflict': 
+	git reset --hard HEAD &&
+	git checkout -b topic &&
+	git rm -rf . &&
+
+	echo "just a file" >sub1 &&
+	mkdir -p sub2 &&
+	echo content1 >sub2/file1 &&
+	echo content2 >sub2/file2 &&
+	echo content3 >sub2/file3 &&
+	mkdir simple &&
+	echo base >simple/bar &&
+	git add -A &&
+	test_tick &&
+	git commit -m base &&
+
+	git checkout -b other &&
+	echo more >>simple/bar &&
+	test_tick &&
+	git commit -a -m changesimplefile &&
+
+	git checkout topic &&
+	git rm sub1 &&
+	git mv sub2 sub1 &&
+	test_tick &&
+	git commit -m changefiletodir &&
+
+	test_tick &&
+	git merge other
+
+HEAD is now at b57c6be Merge branch 'rename-ln' into rename
+Switched to a new branch 'topic'
+rm 'a'
+rm 'b'
+rm 'c'
+rm 'd/e'
+rm 'e'
+warning: adding embedded git repository: sym
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sym
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sym
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[topic 50cf300] base
+ Author: A U Thor <author@example.com>
+ 22 files changed, 42 insertions(+), 2 deletions(-)
+ delete mode 120000 a
+ create mode 100644 actual
+ create mode 100644 actual-err
+ create mode 100644 actual-files
+ rename b => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e (50%)
+ rename c => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0 (50%)
+ create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d
+ create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
+ delete mode 100644 e
+ create mode 100644 expected
+ create mode 100644 expected-files
+ create mode 100644 ours-has-rename-index
+ create mode 100644 ours-has-rename-work/b/c
+ create mode 100644 out
+ create mode 100644 simple/bar
+ create mode 100644 sub1
+ create mode 100644 sub2/file1
+ create mode 100644 sub2/file2
+ create mode 100644 sub2/file3
+ create mode 160000 sym
+ create mode 100644 theirs-has-rename-index
+ rename {d => theirs-has-rename-work}/e (100%)
+Switched to a new branch 'other'
+[other 39a1696] changesimplefile
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'topic'
+rm 'sub1'
+[topic 8aab078] changefiletodir
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 deletion(-)
+ delete mode 100644 sub1
+ rename {sub2 => sub1}/file1 (100%)
+ rename {sub2 => sub1}/file2 (100%)
+ rename {sub2 => sub1}/file3 (100%)
+Merge made by the 'ort' strategy.
+ simple/bar | 1 +
+ 1 file changed, 1 insertion(+)
+ok 35 - merging with triple rename across D/F conflict
+
+expecting success of 6430.36 'merge-recursive remembers the names of all base trees': 
+	git reset --hard HEAD &&
+
+	# make the index match $c1 so that merge-recursive below does not
+	# fail early
+	git diff --binary HEAD $c1 -- | git apply --cached &&
+
+	# more trees than static slots used by oid_to_hex()
+	for commit in $c0 $c2 $c4 $c5 $c6 $c7
+	do
+		git rev-parse "$commit^{tree}" || return 1
+	done >trees &&
+
+	# ignore the return code; it only fails because the input is weird...
+	test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
+
+	# ...but make sure it fails in the expected way
+	test_grep CONFLICT.*rename/rename out &&
+
+	# merge-recursive prints in reverse order, but we do not care
+	sort <trees >expect &&
+	sed -n "s/^virtual //p" out | sort >actual &&
+	test_cmp expect actual &&
+
+	git clean -fd
+
+HEAD is now at 58fc686 Merge branch 'other' into topic
+CONFLICT (rename/rename): Rename e->a in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Rename a~Temporary merge branch 2_0->a in 918ade1d06dd1c0da47b644356c64b1b2122e705
+Removing actual
+Removing actual-err
+Removing actual-files
+Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
+Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0
+Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d
+Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
+Removing expect
+Removing expected
+Removing expected-files
+Removing ours-has-rename-index
+Removing ours-has-rename-work/
+Removing out
+Removing simple/
+Removing sub1/
+Removing theirs-has-rename-index
+Removing theirs-has-rename-work/
+Removing trees
+ok 36 - merge-recursive remembers the names of all base trees
+
+expecting success of 6430.37 'merge-recursive internal merge resolves to the sameness': 
+	git reset --hard HEAD &&
+
+	# We are going to create a history leading to two criss-cross
+	# branches A and B.  The common ancestor at the bottom, O0,
+	# has two child commits O1 and O2, both of which will be merge
+	# base between A and B, like so:
+	#
+	#       O1---A
+	#      /  \ /
+	#    O0    .
+	#      \  / \
+	#       O2---B
+	#
+	# The recently added "check to see if the index is different from
+	# the tree into which something else is getting merged" check must
+	# NOT kick in when an inner merge between O1 and O2 is made.  Both
+	# O1 and O2 happen to have the same tree as O0 in this test to
+	# trigger the bug---whether the inner merge is made by merging O2
+	# into O1 or O1 into O2, their common ancestor O0 and the branch
+	# being merged have the same tree.  We should not trigger the "is
+	# the index dirty?" check in this case.
+
+	echo "zero" >file &&
+	git add file &&
+	test_tick &&
+	git commit -m "O0" &&
+	O0=$(git rev-parse HEAD) &&
+
+	test_tick &&
+	git commit --allow-empty -m "O1" &&
+	O1=$(git rev-parse HEAD) &&
+
+	git reset --hard $O0 &&
+	test_tick &&
+	git commit --allow-empty -m "O2" &&
+	O2=$(git rev-parse HEAD) &&
+
+	test_tick &&
+	git merge -s ours $O1 &&
+	B=$(git rev-parse HEAD) &&
+
+	git reset --hard $O1 &&
+	test_tick &&
+	git merge -s ours $O2 &&
+	A=$(git rev-parse HEAD) &&
+
+	git merge $B
+
+HEAD is now at 58fc686 Merge branch 'other' into topic
+[topic 38b370d] O0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[topic 4778554] O1
+ Author: A U Thor <author@example.com>
+HEAD is now at 38b370d O0
+[topic 77f8c71] O2
+ Author: A U Thor <author@example.com>
+Merge made by the 'ours' strategy.
+HEAD is now at 4778554 O1
+Merge made by the 'ours' strategy.
+Merge made by the 'ort' strategy.
+ok 37 - merge-recursive internal merge resolves to the sameness
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6436-merge-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6436-merge-overwrite/.git/
+expecting success of 6436.1 'setup': 
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	test_commit c1a c1.c "c1 a" &&
+	git reset --hard c0 &&
+	test_commit c2 c2.c &&
+	git reset --hard c0 &&
+	mkdir sub &&
+	echo "sub/f" > sub/f &&
+	mkdir sub2 &&
+	echo "sub2/f" > sub2/f &&
+	git add sub/f sub2/f &&
+	git commit -m sub &&
+	git tag sub &&
+	echo "VERY IMPORTANT CHANGES" > important
+
+[main (root-commit) 934056f] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[main 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[main 4e7fedb] c1a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 934056f c0
+[main 48f99e1] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at 934056f c0
+[main 55608b7] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub/f
+ create mode 100644 sub2/f
+ok 1 - setup
+
+expecting success of 6436.2 'will not overwrite untracked file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: The following untracked working tree files would be overwritten by merge:
+	c2.c
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 2 - will not overwrite untracked file
+
+expecting success of 6436.3 'will overwrite tracked file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	git commit -m important &&
+	git checkout c2
+
+HEAD is now at 7b51d7c c1
+[main b7e8e56] important
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+Note: switching to 'c2'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 48f99e1 c2
+ok 3 - will overwrite tracked file
+
+expecting success of 6436.4 'will not overwrite new file': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merge with strategy ort failed.
+ok 4 - will not overwrite new file
+
+expecting success of 6436.5 'will not overwrite staged changes': 
+	git reset --hard c1 &&
+	cp important c2.c &&
+	git add c2.c &&
+	rm c2.c &&
+	test_must_fail git merge c2 &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c2.c &&
+	test_cmp important c2.c
+
+HEAD is now at 7b51d7c c1
+error: Your local changes to the following files would be overwritten by merge:
+  c2.c
+Merge with strategy ort failed.
+Updated 0 paths from the index
+ok 5 - will not overwrite staged changes
+
+expecting success of 6436.6 'will not overwrite removed file': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	test_must_fail git merge c1a &&
+	test_cmp important c1.c &&
+	rm c1.c  # Do not leave untracked file in way of future tests
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: The following untracked working tree files would be overwritten by merge:
+	c1.c
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 6 - will not overwrite removed file
+
+expecting success of 6436.7 'will not overwrite re-added file': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c1.c
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merge with strategy ort failed.
+ok 7 - will not overwrite re-added file
+
+expecting success of 6436.8 'will not overwrite removed file with staged changes': 
+	git reset --hard c1 &&
+	git rm c1.c &&
+	git commit -m "rm c1.c" &&
+	cp important c1.c &&
+	git add c1.c &&
+	rm c1.c &&
+	test_must_fail git merge c1a &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	git checkout c1.c &&
+	test_cmp important c1.c
+
+HEAD is now at 7b51d7c c1
+rm 'c1.c'
+[detached HEAD 86e44d1] rm c1.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 c1.c
+error: Your local changes to the following files would be overwritten by merge:
+  c1.c
+Merge with strategy ort failed.
+Updated 0 paths from the index
+ok 8 - will not overwrite removed file with staged changes
+
+expecting success of 6436.9 'will not overwrite unstaged changes in renamed file': 
+	git reset --hard c1 &&
+	git mv c1.c other.c &&
+	git commit -m rename &&
+	cp important other.c &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge c1a >out 2>err &&
+		test_grep "would be overwritten by merge" err &&
+		test_cmp important other.c &&
+		test_path_is_missing .git/MERGE_HEAD
+	else
+		test_must_fail git merge c1a >out &&
+		test_grep "Refusing to lose dirty file at other.c" out &&
+		test_path_is_file other.c~HEAD &&
+		test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
+		test_cmp important other.c
+	fi
+
+HEAD is now at 7b51d7c c1
+[detached HEAD 891a741] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename c1.c => other.c (100%)
+error: Your local changes to the following files would be overwritten by merge:
+ok 9 - will not overwrite unstaged changes in renamed file
 
-expecting success of 6430.33 'merge-recursive copy vs. rename': 
-	git checkout -f copy &&
-	git merge rename &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 blob $o0	e" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e" &&
-		echo "100644 $o0 0	e"
-	) >expected &&
-	test_cmp expected actual
+expecting success of 6436.10 'will not overwrite untracked subtree': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir -p sub/f &&
+	cp important sub/f/important &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub/f/important
 
-Switched to branch 'copy'
-Merge made by the 'ort' strategy.
- a | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 a
-ok 33 - merge-recursive copy vs. rename
+HEAD is now at 934056f c0
+error: Updating the following directories would lose untracked files in them:
+	sub/f
 
-expecting success of 6430.34 'merge-recursive rename vs. rename/symlink': 
+Aborting
+Updating 934056f..55608b7
+ok 10 - will not overwrite untracked subtree
 
-	git checkout -f rename &&
-	git merge rename-ln &&
-	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
-	(
-		echo "120000 blob $oln	a" &&
-		echo "100644 blob $o0	b" &&
-		echo "100644 blob $o0	c" &&
-		echo "100644 blob $o0	d/e" &&
-		echo "100644 blob $o0	e" &&
-		echo "120000 $oln 0	a" &&
-		echo "100644 $o0 0	b" &&
-		echo "100644 $o0 0	c" &&
-		echo "100644 $o0 0	d/e" &&
-		echo "100644 $o0 0	e"
-	) >expected &&
-	test_cmp expected actual
+expecting success of 6436.11 'will not overwrite untracked file in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	cp important sub &&
+	cp important sub2 &&
+	test_must_fail git merge sub 2>out &&
+	test_cmp out expect &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important sub &&
+	test_cmp important sub2 &&
+	rm -f sub sub2
 
-Switched to branch 'rename'
-Merge made by the 'ort' strategy.
- a | 1 +
- 1 file changed, 1 insertion(+)
- create mode 120000 a
-ok 34 - merge-recursive rename vs. rename/symlink
+HEAD is now at 934056f c0
+Updating 934056f..55608b7
+ok 11 - will not overwrite untracked file in leading path
 
-expecting success of 6430.35 'merging with triple rename across D/F conflict': 
-	git reset --hard HEAD &&
-	git checkout -b topic &&
-	git rm -rf . &&
+checking prerequisite: SYMLINKS
 
-	echo "just a file" >sub1 &&
-	mkdir -p sub2 &&
-	echo content1 >sub2/file1 &&
-	echo content2 >sub2/file2 &&
-	echo content3 >sub2/file3 &&
-	mkdir simple &&
-	echo base >simple/bar &&
-	git add -A &&
-	test_tick &&
-	git commit -m base &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-	git checkout -b other &&
-	echo more >>simple/bar &&
-	test_tick &&
-	git commit -a -m changesimplefile &&
+)
+prerequisite SYMLINKS ok
+expecting success of 6436.12 'will not overwrite untracked symlink in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	mkdir sub2 &&
+	ln -s sub2 sub &&
+	test_must_fail git merge sub &&
+	test_path_is_missing .git/MERGE_HEAD
 
-	git checkout topic &&
-	git rm sub1 &&
-	git mv sub2 sub1 &&
-	test_tick &&
-	git commit -m changefiletodir &&
+HEAD is now at 934056f c0
+error: The following untracked working tree files would be overwritten by merge:
+	sub
+Please move or remove them before you merge.
+Aborting
+Updating 934056f..55608b7
+ok 12 - will not overwrite untracked symlink in leading path
 
-	test_tick &&
-	git merge other
+expecting success of 6436.13 'will not be confused by symlink in leading path': 
+	git reset --hard c0 &&
+	rm -rf sub &&
+	test_ln_s_add sub2 sub &&
+	git commit -m ln &&
+	git checkout sub
 
-HEAD is now at b57c6be Merge branch 'rename-ln' into rename
-Switched to a new branch 'topic'
-rm 'a'
-rm 'b'
-rm 'c'
-rm 'd/e'
-rm 'e'
-warning: adding embedded git repository: sym
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sym
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sym
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[topic 10aa973] base
- Author: A U Thor <author@example.com>
- 22 files changed, 42 insertions(+), 2 deletions(-)
- delete mode 120000 a
- create mode 100644 actual
- create mode 100644 actual-err
- create mode 100644 actual-files
- rename b => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e (50%)
- rename c => a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0 (50%)
- create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d
- create mode 100644 d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
- delete mode 100644 e
- create mode 100644 expected
- create mode 100644 expected-files
- create mode 100644 ours-has-rename-index
- create mode 100644 ours-has-rename-work/b/c
- create mode 100644 out
- create mode 100644 simple/bar
- create mode 100644 sub1
- create mode 100644 sub2/file1
- create mode 100644 sub2/file2
- create mode 100644 sub2/file3
- create mode 160000 sym
- create mode 100644 theirs-has-rename-index
- rename {d => theirs-has-rename-work}/e (100%)
-Switched to a new branch 'other'
-[other 3cddc58] changesimplefile
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'topic'
-rm 'sub1'
-[topic f09a2f7] changefiletodir
+HEAD is now at 934056f c0
+[detached HEAD 6d387d8] ln
  Author: A U Thor <author@example.com>
- 4 files changed, 1 deletion(-)
- delete mode 100644 sub1
- rename {sub2 => sub1}/file1 (100%)
- rename {sub2 => sub1}/file2 (100%)
- rename {sub2 => sub1}/file3 (100%)
-Merge made by the 'ort' strategy.
- simple/bar | 1 +
  1 file changed, 1 insertion(+)
-ok 35 - merging with triple rename across D/F conflict
-
-expecting success of 6430.36 'merge-recursive remembers the names of all base trees': 
-	git reset --hard HEAD &&
-
-	# make the index match $c1 so that merge-recursive below does not
-	# fail early
-	git diff --binary HEAD $c1 -- | git apply --cached &&
-
-	# more trees than static slots used by oid_to_hex()
-	for commit in $c0 $c2 $c4 $c5 $c6 $c7
-	do
-		git rev-parse "$commit^{tree}" || return 1
-	done >trees &&
+ create mode 120000 sub
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	# ignore the return code; it only fails because the input is weird...
-	test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
+  6d387d8 ln
 
-	# ...but make sure it fails in the expected way
-	test_grep CONFLICT.*rename/rename out &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	# merge-recursive prints in reverse order, but we do not care
-	sort <trees >expect &&
-	sed -n "s/^virtual //p" out | sort >actual &&
-	test_cmp expect actual &&
+ git branch <new-branch-name> 6d387d8
 
-	git clean -fd
+HEAD is now at 55608b7 sub
+ok 13 - will not be confused by symlink in leading path
 
-HEAD is now at 807246a Merge branch 'other' into topic
-CONFLICT (rename/rename): Rename e->a in fdc905408c9d6dd868ab5d3b6939a2a4f33e068e. Rename a~Temporary merge branch 2_0->a in 918ade1d06dd1c0da47b644356c64b1b2122e705
-Removing actual
-Removing actual-err
-Removing actual-files
-Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e
-Removing a~fdc905408c9d6dd868ab5d3b6939a2a4f33e068e_0
-Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d
-Removing d~9d284b3a95aea72df4581977e913e55da89d5e3d_0
-Removing expect
-Removing expected
-Removing expected-files
-Removing ours-has-rename-index
-Removing ours-has-rename-work/
-Removing out
-Removing simple/
-Removing sub1/
-Removing theirs-has-rename-index
-Removing theirs-has-rename-work/
-Removing trees
-ok 36 - merge-recursive remembers the names of all base trees
+expecting success of 6436.14 'will not overwrite untracked file on unborn branch': 
+	git reset --hard c0 &&
+	git rm -fr . &&
+	git checkout --orphan new &&
+	cp important c0.c &&
+	test_must_fail git merge c0 2>out &&
+	test_cmp out expect
 
-expecting success of 6430.37 'merge-recursive internal merge resolves to the sameness': 
-	git reset --hard HEAD &&
+HEAD is now at 934056f c0
+rm 'c0.c'
+Switched to a new branch 'new'
+D	c0.c
+ok 14 - will not overwrite untracked file on unborn branch
 
-	# We are going to create a history leading to two criss-cross
-	# branches A and B.  The common ancestor at the bottom, O0,
-	# has two child commits O1 and O2, both of which will be merge
-	# base between A and B, like so:
-	#
-	#       O1---A
-	#      /  \ /
-	#    O0    .
-	#      \  / \
-	#       O2---B
-	#
-	# The recently added "check to see if the index is different from
-	# the tree into which something else is getting merged" check must
-	# NOT kick in when an inner merge between O1 and O2 is made.  Both
-	# O1 and O2 happen to have the same tree as O0 in this test to
-	# trigger the bug---whether the inner merge is made by merging O2
-	# into O1 or O1 into O2, their common ancestor O0 and the branch
-	# being merged have the same tree.  We should not trigger the "is
-	# the index dirty?" check in this case.
+expecting success of 6436.15 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.': 
+	test_when_finished "rm c0.c" &&
+	test_path_is_missing .git/MERGE_HEAD &&
+	test_cmp important c0.c
 
-	echo "zero" >file &&
-	git add file &&
-	test_tick &&
-	git commit -m "O0" &&
-	O0=$(git rev-parse HEAD) &&
+ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
 
-	test_tick &&
-	git commit --allow-empty -m "O1" &&
-	O1=$(git rev-parse HEAD) &&
+expecting success of 6436.16 'failed merge leaves unborn branch in the womb': 
+	test_must_fail git rev-parse --verify HEAD
 
-	git reset --hard $O0 &&
-	test_tick &&
-	git commit --allow-empty -m "O2" &&
-	O2=$(git rev-parse HEAD) &&
+fatal: Needed a single revision
+ok 16 - failed merge leaves unborn branch in the womb
 
-	test_tick &&
-	git merge -s ours $O1 &&
-	B=$(git rev-parse HEAD) &&
+expecting success of 6436.17 'set up unborn branch and content': 
+	git symbolic-ref HEAD refs/heads/unborn &&
+	rm -f .git/index &&
+	echo foo > tracked-file &&
+	git add tracked-file &&
+	echo bar > untracked-file
 
-	git reset --hard $O1 &&
-	test_tick &&
-	git merge -s ours $O2 &&
-	A=$(git rev-parse HEAD) &&
+ok 17 - set up unborn branch and content
 
-	git merge $B
+expecting success of 6436.18 'will not clobber WT/index when merging into unborn': 
+	git merge main &&
+	grep foo tracked-file &&
+	git show :tracked-file >expect &&
+	grep foo expect &&
+	grep bar untracked-file
 
-HEAD is now at 807246a Merge branch 'other' into topic
-[topic 1c06d3c] O0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[topic 3d0ecb0] O1
- Author: A U Thor <author@example.com>
-HEAD is now at 1c06d3c O0
-[topic 678aff6] O2
- Author: A U Thor <author@example.com>
-Merge made by the 'ours' strategy.
-HEAD is now at 3d0ecb0 O1
-Merge made by the 'ours' strategy.
-Merge made by the 'ort' strategy.
-ok 37 - merge-recursive internal merge resolves to the sameness
+foo
+foo
+bar
+ok 18 - will not clobber WT/index when merging into unborn
 
-# passed all 37 test(s)
-1..37
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6439-merge-co-error-msgs.sh ***
@@ -429763,354 +430060,346 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6436-merge-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6436-merge-overwrite/.git/
-expecting success of 6436.1 'setup': 
-	test_commit c0 c0.c &&
-	test_commit c1 c1.c &&
-	test_commit c1a c1.c "c1 a" &&
-	git reset --hard c0 &&
-	test_commit c2 c2.c &&
-	git reset --hard c0 &&
-	mkdir sub &&
-	echo "sub/f" > sub/f &&
-	mkdir sub2 &&
-	echo "sub2/f" > sub2/f &&
-	git add sub/f sub2/f &&
-	git commit -m sub &&
-	git tag sub &&
-	echo "VERY IMPORTANT CHANGES" > important
+*** t6433-merge-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6433-merge-toplevel/.git/
+expecting success of 6433.1 'setup': 
+	test_commit one &&
+	git branch left &&
+	git branch right &&
+	test_commit two &&
+	git checkout left &&
+	test_commit three &&
+	git checkout right &&
+	test_commit four &&
+	git checkout --orphan newroot &&
+	test_commit five &&
+	git checkout main
 
-[main (root-commit) 934056f] c0
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[main 7b51d7c] c1
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[main 4e7fedb] c1a
+ create mode 100644 two.t
+Switched to branch 'left'
+[left 897c206] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 934056f c0
-[main 48f99e1] c2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'right'
+[right bd0edcc] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at 934056f c0
-[main 55608b7] sub
+ create mode 100644 four.t
+Switched to a new branch 'newroot'
+[newroot (root-commit) 5280273] five
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub/f
- create mode 100644 sub2/f
+ 3 files changed, 3 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 four.t
+ create mode 100644 one.t
+Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 6436.2 'will not overwrite untracked file': 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c2.c
-
-HEAD is now at 7b51d7c c1
-error: The following untracked working tree files would be overwritten by merge:
-	c2.c
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 2 - will not overwrite untracked file
-
-expecting success of 6436.3 'will overwrite tracked file': 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	git commit -m important &&
-	git checkout c2
-
-HEAD is now at 7b51d7c c1
-[main b7e8e56] important
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-Note: switching to 'c2'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
+expecting success of 6433.2 'merge an octopus into void': 
+	t3033_reset &&
+	git checkout --orphan test &&
+	git rm -fr . &&
+	test_must_fail git merge left right &&
+	test_must_fail git rev-parse --verify HEAD &&
+	git diff --quiet &&
+	test_must_fail git rev-parse HEAD
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Reset branch 'main'
+Switched to a new branch 'test'
+rm 'one.t'
+rm 'two.t'
+fatal: Can merge only exactly one commit into empty head
+fatal: Needed a single revision
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD
+ok 2 - merge an octopus into void
 
-HEAD is now at 48f99e1 c2
-ok 3 - will overwrite tracked file
+expecting success of 6433.3 'merge an octopus, fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.4 'will not overwrite new file': 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c2.c
+Switched to and reset branch 'main'
+HEAD is now at d79ce16 one
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 3 - merge an octopus, fast-forward (ff)
 
-HEAD is now at 7b51d7c c1
-error: Your local changes to the following files would be overwritten by merge:
-  c2.c
-Merge with strategy ort failed.
-ok 4 - will not overwrite new file
+expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge --no-ff left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.5 'will not overwrite staged changes': 
-	git reset --hard c1 &&
-	cp important c2.c &&
-	git add c2.c &&
-	rm c2.c &&
-	test_must_fail git merge c2 &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	git checkout c2.c &&
-	test_cmp important c2.c
+Reset branch 'main'
+HEAD is now at d79ce16 one
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 4 - merge octopus, non-fast-forward (ff)
 
-HEAD is now at 7b51d7c c1
-error: Your local changes to the following files would be overwritten by merge:
-  c2.c
-Merge with strategy ort failed.
-Updated 0 paths from the index
-ok 5 - will not overwrite staged changes
+expecting success of 6433.5 'merge octopus, fast-forward (does not ff)': 
+	t3033_reset &&
+	git merge left right &&
+	# two (main) is not an ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.6 'will not overwrite removed file': 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	test_must_fail git merge c1a &&
-	test_cmp important c1.c &&
-	rm c1.c  # Do not leave untracked file in way of future tests
+Reset branch 'main'
+Trying simple merge with left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 5 - merge octopus, fast-forward (does not ff)
 
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-error: The following untracked working tree files would be overwritten by merge:
-	c1.c
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 6 - will not overwrite removed file
+expecting success of 6433.6 'merge octopus, non-fast-forward': 
+	t3033_reset &&
+	git merge --no-ff left right &&
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.7 'will not overwrite re-added file': 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	git add c1.c &&
-	test_must_fail git merge c1a &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c1.c
+Reset branch 'main'
+Trying simple merge with left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 6 - merge octopus, non-fast-forward
 
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-error: Your local changes to the following files would be overwritten by merge:
-  c1.c
-Merge with strategy ort failed.
-ok 7 - will not overwrite re-added file
+expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
+	t3033_reset &&
+	git checkout --orphan test &&
+	git rm -fr . &&
+	git fetch . left right &&
+	test_must_fail git merge FETCH_HEAD &&
+	test_must_fail git rev-parse --verify HEAD &&
+	git diff --quiet &&
+	test_must_fail git rev-parse HEAD
 
-expecting success of 6436.8 'will not overwrite removed file with staged changes': 
-	git reset --hard c1 &&
-	git rm c1.c &&
-	git commit -m "rm c1.c" &&
-	cp important c1.c &&
-	git add c1.c &&
-	rm c1.c &&
-	test_must_fail git merge c1a &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	git checkout c1.c &&
-	test_cmp important c1.c
+Reset branch 'main'
+Switched to a new branch 'test'
+rm 'one.t'
+rm 'two.t'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+fatal: Can merge only exactly one commit into empty head
+fatal: Needed a single revision
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD
+ok 7 - merge FETCH_HEAD octopus into void
 
-HEAD is now at 7b51d7c c1
-rm 'c1.c'
-[detached HEAD 86e44d1] rm c1.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 c1.c
-error: Your local changes to the following files would be overwritten by merge:
-  c1.c
-Merge with strategy ort failed.
-Updated 0 paths from the index
-ok 8 - will not overwrite removed file with staged changes
+expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.9 'will not overwrite unstaged changes in renamed file': 
-	git reset --hard c1 &&
-	git mv c1.c other.c &&
-	git commit -m rename &&
-	cp important other.c &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_must_fail git merge c1a >out 2>err &&
-		test_grep "would be overwritten by merge" err &&
-		test_cmp important other.c &&
-		test_path_is_missing .git/MERGE_HEAD
-	else
-		test_must_fail git merge c1a >out &&
-		test_grep "Refusing to lose dirty file at other.c" out &&
-		test_path_is_file other.c~HEAD &&
-		test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
-		test_cmp important other.c
-	fi
+Switched to and reset branch 'main'
+HEAD is now at d79ce16 one
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 8 - merge FETCH_HEAD octopus fast-forward (ff)
 
-HEAD is now at 7b51d7c c1
-[detached HEAD 891a741] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename c1.c => other.c (100%)
-error: Your local changes to the following files would be overwritten by merge:
-ok 9 - will not overwrite unstaged changes in renamed file
+expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge --no-ff FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
 
-expecting success of 6436.10 'will not overwrite untracked subtree': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	mkdir -p sub/f &&
-	cp important sub/f/important &&
-	test_must_fail git merge sub &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important sub/f/important
+Reset branch 'main'
+HEAD is now at d79ce16 one
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 9 - merge FETCH_HEAD octopus non-fast-forward (ff)
 
-HEAD is now at 934056f c0
-error: Updating the following directories would lose untracked files in them:
-	sub/f
+expecting success of 6433.10 'merge FETCH_HEAD octopus fast-forward (does not ff)': 
+	t3033_reset &&
+	git fetch . left right &&
+	git merge FETCH_HEAD &&
+	# two (main) is not an ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-Aborting
-Updating 934056f..55608b7
-ok 10 - will not overwrite untracked subtree
+Reset branch 'main'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 10 - merge FETCH_HEAD octopus fast-forward (does not ff)
 
-expecting success of 6436.11 'will not overwrite untracked file in leading path': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	cp important sub &&
-	cp important sub2 &&
-	test_must_fail git merge sub 2>out &&
-	test_cmp out expect &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important sub &&
-	test_cmp important sub2 &&
-	rm -f sub sub2
+expecting success of 6433.11 'merge FETCH_HEAD octopus non-fast-forward': 
+	t3033_reset &&
+	git fetch . left right &&
+	git merge --no-ff FETCH_HEAD &&
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
 
-HEAD is now at 934056f c0
-Updating 934056f..55608b7
-ok 11 - will not overwrite untracked file in leading path
+Reset branch 'main'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 11 - merge FETCH_HEAD octopus non-fast-forward
 
-checking prerequisite: SYMLINKS
+expecting success of 6433.12 'refuse two-project merge by default': 
+	t3033_reset &&
+	git reset --hard four &&
+	test_must_fail git merge five
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Reset branch 'main'
+HEAD is now at bd0edcc four
+fatal: refusing to merge unrelated histories
+ok 12 - refuse two-project merge by default
 
-)
-prerequisite SYMLINKS ok
-expecting success of 6436.12 'will not overwrite untracked symlink in leading path': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	mkdir sub2 &&
-	ln -s sub2 sub &&
-	test_must_fail git merge sub &&
-	test_path_is_missing .git/MERGE_HEAD
+expecting success of 6433.13 'refuse two-project merge by default, quit before --autostash happens': 
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff >expect &&
+	test_must_fail git merge --autostash five 2>err &&
+	test_grep ! "stash" err &&
+	git diff >actual &&
+	test_cmp expect actual
 
-HEAD is now at 934056f c0
-error: The following untracked working tree files would be overwritten by merge:
-	sub
-Please move or remove them before you merge.
-Aborting
-Updating 934056f..55608b7
-ok 12 - will not overwrite untracked symlink in leading path
+Reset branch 'main'
+HEAD is now at bd0edcc four
+ok 13 - refuse two-project merge by default, quit before --autostash happens
 
-expecting success of 6436.13 'will not be confused by symlink in leading path': 
-	git reset --hard c0 &&
-	rm -rf sub &&
-	test_ln_s_add sub2 sub &&
-	git commit -m ln &&
-	git checkout sub
+expecting success of 6433.14 'two-project merge with --allow-unrelated-histories': 
+	t3033_reset &&
+	git reset --hard four &&
+	git merge --allow-unrelated-histories five &&
+	git diff --exit-code five
 
-HEAD is now at 934056f c0
-[detached HEAD 6d387d8] ln
- Author: A U Thor <author@example.com>
+Reset branch 'main'
+M	one.t
+HEAD is now at bd0edcc four
+Merge made by the 'ort' strategy.
+ five.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 120000 sub
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6d387d8 ln
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 6d387d8
-
-HEAD is now at 55608b7 sub
-ok 13 - will not be confused by symlink in leading path
-
-expecting success of 6436.14 'will not overwrite untracked file on unborn branch': 
-	git reset --hard c0 &&
-	git rm -fr . &&
-	git checkout --orphan new &&
-	cp important c0.c &&
-	test_must_fail git merge c0 2>out &&
-	test_cmp out expect
-
-HEAD is now at 934056f c0
-rm 'c0.c'
-Switched to a new branch 'new'
-D	c0.c
-ok 14 - will not overwrite untracked file on unborn branch
-
-expecting success of 6436.15 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.': 
-	test_when_finished "rm c0.c" &&
-	test_path_is_missing .git/MERGE_HEAD &&
-	test_cmp important c0.c
-
-ok 15 - will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.
-
-expecting success of 6436.16 'failed merge leaves unborn branch in the womb': 
-	test_must_fail git rev-parse --verify HEAD
-
-fatal: Needed a single revision
-ok 16 - failed merge leaves unborn branch in the womb
-
-expecting success of 6436.17 'set up unborn branch and content': 
-	git symbolic-ref HEAD refs/heads/unborn &&
-	rm -f .git/index &&
-	echo foo > tracked-file &&
-	git add tracked-file &&
-	echo bar > untracked-file
-
-ok 17 - set up unborn branch and content
+ create mode 100644 five.t
+ok 14 - two-project merge with --allow-unrelated-histories
 
-expecting success of 6436.18 'will not clobber WT/index when merging into unborn': 
-	git merge main &&
-	grep foo tracked-file &&
-	git show :tracked-file >expect &&
-	grep foo expect &&
-	grep bar untracked-file
+expecting success of 6433.15 'two-project merge with --allow-unrelated-histories with --autostash': 
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff one.t >expect &&
+	git merge --allow-unrelated-histories --autostash five 2>err &&
+	test_grep "Applied autostash." err &&
+	git diff one.t >actual &&
+	test_cmp expect actual
 
-foo
-foo
-bar
-ok 18 - will not clobber WT/index when merging into unborn
+Reset branch 'main'
+HEAD is now at bd0edcc four
+Created autostash: 2969e55
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Applied autostash.
+ok 15 - two-project merge with --allow-unrelated-histories with --autostash
 
-# passed all 18 test(s)
-1..18
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6422-merge-rename-corner-cases.sh ***
@@ -431915,348 +432204,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6433-merge-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6433-merge-toplevel/.git/
-expecting success of 6433.1 'setup': 
-	test_commit one &&
-	git branch left &&
-	git branch right &&
-	test_commit two &&
-	git checkout left &&
-	test_commit three &&
-	git checkout right &&
-	test_commit four &&
-	git checkout --orphan newroot &&
-	test_commit five &&
-	git checkout main
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'left'
-[left 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'right'
-[right bd0edcc] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Switched to a new branch 'newroot'
-[newroot (root-commit) 5280273] five
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
-Switched to branch 'main'
-ok 1 - setup
-
-expecting success of 6433.2 'merge an octopus into void': 
-	t3033_reset &&
-	git checkout --orphan test &&
-	git rm -fr . &&
-	test_must_fail git merge left right &&
-	test_must_fail git rev-parse --verify HEAD &&
-	git diff --quiet &&
-	test_must_fail git rev-parse HEAD
-
-Reset branch 'main'
-Switched to a new branch 'test'
-rm 'one.t'
-rm 'two.t'
-fatal: Can merge only exactly one commit into empty head
-fatal: Needed a single revision
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD
-ok 2 - merge an octopus into void
-
-expecting success of 6433.3 'merge an octopus, fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git merge left right &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^3 &&
-	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
-	git rev-parse three four | sort >expect &&
-	test_cmp expect actual
-
-Switched to and reset branch 'main'
-HEAD is now at d79ce16 one
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 3 - merge an octopus, fast-forward (ff)
-
-expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git merge --no-ff left right &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at d79ce16 one
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 4 - merge octopus, non-fast-forward (ff)
-
-expecting success of 6433.5 'merge octopus, fast-forward (does not ff)': 
-	t3033_reset &&
-	git merge left right &&
-	# two (main) is not an ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-Trying simple merge with left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 5 - merge octopus, fast-forward (does not ff)
-
-expecting success of 6433.6 'merge octopus, non-fast-forward': 
-	t3033_reset &&
-	git merge --no-ff left right &&
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-Trying simple merge with left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 6 - merge octopus, non-fast-forward
-
-expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
-	t3033_reset &&
-	git checkout --orphan test &&
-	git rm -fr . &&
-	git fetch . left right &&
-	test_must_fail git merge FETCH_HEAD &&
-	test_must_fail git rev-parse --verify HEAD &&
-	git diff --quiet &&
-	test_must_fail git rev-parse HEAD
-
-Reset branch 'main'
-Switched to a new branch 'test'
-rm 'one.t'
-rm 'two.t'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-fatal: Can merge only exactly one commit into empty head
-fatal: Needed a single revision
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD
-ok 7 - merge FETCH_HEAD octopus into void
-
-expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^3 &&
-	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
-	git rev-parse three four | sort >expect &&
-	test_cmp expect actual
-
-Switched to and reset branch 'main'
-HEAD is now at d79ce16 one
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 8 - merge FETCH_HEAD octopus fast-forward (ff)
-
-expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge --no-ff FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at d79ce16 one
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 9 - merge FETCH_HEAD octopus non-fast-forward (ff)
-
-expecting success of 6433.10 'merge FETCH_HEAD octopus fast-forward (does not ff)': 
-	t3033_reset &&
-	git fetch . left right &&
-	git merge FETCH_HEAD &&
-	# two (main) is not an ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 10 - merge FETCH_HEAD octopus fast-forward (does not ff)
-
-expecting success of 6433.11 'merge FETCH_HEAD octopus non-fast-forward': 
-	t3033_reset &&
-	git fetch . left right &&
-	git merge --no-ff FETCH_HEAD &&
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 11 - merge FETCH_HEAD octopus non-fast-forward
-
-expecting success of 6433.12 'refuse two-project merge by default': 
-	t3033_reset &&
-	git reset --hard four &&
-	test_must_fail git merge five
-
-Reset branch 'main'
-HEAD is now at bd0edcc four
-fatal: refusing to merge unrelated histories
-ok 12 - refuse two-project merge by default
-
-expecting success of 6433.13 'refuse two-project merge by default, quit before --autostash happens': 
-	t3033_reset &&
-	git reset --hard four &&
-	echo change >>one.t &&
-	git diff >expect &&
-	test_must_fail git merge --autostash five 2>err &&
-	test_grep ! "stash" err &&
-	git diff >actual &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at bd0edcc four
-ok 13 - refuse two-project merge by default, quit before --autostash happens
-
-expecting success of 6433.14 'two-project merge with --allow-unrelated-histories': 
-	t3033_reset &&
-	git reset --hard four &&
-	git merge --allow-unrelated-histories five &&
-	git diff --exit-code five
-
-Reset branch 'main'
-M	one.t
-HEAD is now at bd0edcc four
-Merge made by the 'ort' strategy.
- five.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-ok 14 - two-project merge with --allow-unrelated-histories
-
-expecting success of 6433.15 'two-project merge with --allow-unrelated-histories with --autostash': 
-	t3033_reset &&
-	git reset --hard four &&
-	echo change >>one.t &&
-	git diff one.t >expect &&
-	git merge --allow-unrelated-histories --autostash five 2>err &&
-	test_grep "Applied autostash." err &&
-	git diff one.t >actual &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at bd0edcc four
-Created autostash: 2969e55
-Merge made by the 'ort' strategy.
- five.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Applied autostash.
-ok 15 - two-project merge with --allow-unrelated-histories with --autostash
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6416-recursive-corner-cases.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6416-recursive-corner-cases/.git/
 expecting success of 6416.1 'setup basic criss-cross + rename with no modifications': 
@@ -434654,126 +434601,6 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6700-tree-depth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6700-tree-depth/.git/
-expecting success of 6700.1 'create small tree': 
-	mkdeep small $small_depth
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           53 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           51 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 1 - create small tree
-
-expecting success of 6700.2 'create big tree': 
-	mkdeep big $big_depth
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:         4103 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :         4101 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              2
-Memory total:          2868 KiB
-       pools:          2516 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =     152731 /     152731
----------------------------------------------------------------------
-
-ok 2 - create big tree
-
-expecting success of 6700.3 'limit recursion of git-archive': 
-	git $small_ok archive small >/dev/null &&
-	test_must_fail git $small_no archive small >/dev/null
-
-error: exceeded maximum allowed tree depth
-fatal: failed to unpack tree object 89dec2e140b538c88e6d3990453ffc27adfa7fc1
-ok 3 - limit recursion of git-archive
-
-expecting success of 6700.4 'default limit for git-archive fails gracefully': 
-	test_must_fail git archive big >/dev/null
-
-error: exceeded maximum allowed tree depth
-fatal: failed to unpack tree object e0fe3d6d3d70bfe6a08264a50dd1a104cd787427
-ok 4 - default limit for git-archive fails gracefully
-
-expecting success of 6700.5 'limit recursion of ls-tree -r': 
-	git $small_ok ls-tree -r small &&
-	test_must_fail git $small_no ls-tree -r small
-
-100644 blob d7178a291fc27940d51a7ac20784bb91c5ae524c	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-error: exceeded maximum allowed tree depth
-ok 5 - limit recursion of ls-tree -r
-
-expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
-	test_must_fail git ls-tree -r big >/dev/null
-
-error: exceeded maximum allowed tree depth
-ok 6 - default limit for ls-tree fails gracefully
-
-expecting success of 6700.7 'limit recursion of rev-list --objects': 
-	git $small_ok rev-list --objects small >/dev/null &&
-	test_must_fail git $small_no rev-list --objects small >/dev/null
-
-fatal: exceeded maximum allowed tree depth
-ok 7 - limit recursion of rev-list --objects
-
-expecting success of 6700.8 'default limit for rev-list fails gracefully': 
-	test_must_fail git rev-list --objects big >/dev/null
-
-fatal: exceeded maximum allowed tree depth
-ok 8 - default limit for rev-list fails gracefully
-
-expecting success of 6700.9 'limit recursion of diff-tree -r': 
-	git $small_ok diff-tree -r $EMPTY_TREE small &&
-	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
-
-:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-fatal: exceeded maximum allowed tree depth
-ok 9 - limit recursion of diff-tree -r
-
-expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
-	test_must_fail git diff-tree -r $EMPTY_TREE big
-
-fatal: exceeded maximum allowed tree depth
-ok 10 - default limit for diff-tree fails gracefully
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6501-freshen-objects.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6501-freshen-objects/.git/
 expecting success of 6501.1 'make repo completely empty (loose)': 
@@ -434817,12 +434644,12 @@
 expecting success of 6501.5 'simulate time passing (loose)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1776540180
-1776540180
-1776540180
-1776540180
-1776540180
-1776540180
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
+1742131593
 ok 5 - simulate time passing (loose)
 
 expecting success of 6501.6 'start writing new commit with old blob (loose)': 
@@ -434858,15 +434685,15 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 8539479 base
-1776540181
-1776540181
-1776540181
-1776540181
-1776540181
-1776540181
-1776540181
-1776540181
-1776540181
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
+1742131594
 ok 10 - abandon objects again (loose)
 
 expecting success of 6501.11 'start writing new commit with same tree (loose)': 
@@ -434933,10 +434760,10 @@
 expecting success of 6501.18 'simulate time passing (repack)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1776540181
-1776540181
-1776540181
-1776540181
+1742131595
+1742131595
+1742131595
+1742131595
 ok 18 - simulate time passing (repack)
 
 expecting success of 6501.19 'start writing new commit with old blob (repack)': 
@@ -434973,17 +434800,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at aa8ecd7 base
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
-1776540182
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
+1742131595
 ok 23 - abandon objects again (repack)
 
 expecting success of 6501.24 'start writing new commit with same tree (repack)': 
@@ -435050,11 +434877,11 @@
 expecting success of 6501.31 'simulate time passing (bitmap)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
+1742131596
+1742131596
+1742131596
+1742131596
+1742131596
 ok 31 - simulate time passing (bitmap)
 
 expecting success of 6501.32 'start writing new commit with old blob (bitmap)': 
@@ -435091,17 +434918,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 41163df base
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
-1776540183
+1742131597
+1742131597
+1742131597
+1742131597
+1742131597
+1742131596
+1742131597
+1742131597
+1742131597
+1742131597
+1742131597
 ok 36 - abandon objects again (bitmap)
 
 expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
@@ -435174,950 +435001,124 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6437-submodule-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/.git/
-expecting success of 6437.1 'setup': 
-
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo original > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-root) &&
-	git add sub &&
-	test_tick &&
-	git commit -m root &&
-
-	git checkout -b a main &&
-	(cd sub &&
-	 echo A > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-a) &&
-	git add sub &&
-	test_tick &&
-	git commit -m a &&
-
-	git checkout -b b main &&
-	(cd sub &&
-	 echo B > file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m sub-b) &&
-	git add sub &&
-	test_tick &&
-	git commit -m b &&
-
-	git checkout -b c a &&
-	git merge -s ours b &&
-
-	git checkout -b d b &&
-	git merge -s ours a
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/sub/.git/
-[main (root-commit) 0998b33] sub-root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) 5c9ada4] root
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'a'
-[main d98dfef] sub-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[a 6102a2a] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'b'
-M	sub
-[main ce35c37] sub-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[b 0405d8c] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'c'
-M	sub
-Merge made by the 'ours' strategy.
-Switched to a new branch 'd'
-Merge made by the 'ours' strategy.
-ok 1 - setup
-
-expecting success of 6437.2 'setup for merge search': 
-	mkdir merge-search &&
-	(cd merge-search &&
-	git init &&
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo "file-a" > file-a &&
-	 git add file-a &&
-	 git commit -m "sub-a" &&
-	 git branch sub-a) &&
-	git commit --allow-empty -m init &&
-	git branch init &&
-	git add sub &&
-	git commit -m "a" &&
-	git branch a &&
-
-	git checkout -b b &&
-	(cd sub &&
-	 git checkout -b sub-b &&
-	 echo "file-b" > file-b &&
-	 git add file-b &&
-	 git commit -m "sub-b") &&
-	git commit -a -m "b" &&
-
-	git checkout -b c a &&
-	(cd sub &&
-	 git checkout -b sub-c sub-a &&
-	 echo "file-c" > file-c &&
-	 git add file-c &&
-	 git commit -m "sub-c") &&
-	git commit -a -m "c")
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-search/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-search/sub/.git/
-[main (root-commit) 9c64145] sub-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-a
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main ea59e10] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'b'
-Switched to a new branch 'sub-b'
-[sub-b 1e4c5d4] sub-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-b
-[b 65d3c25] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'c'
-M	sub
-Switched to a new branch 'sub-c'
-[sub-c 18cac7c] sub-c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-[c 00fd913] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - setup for merge search
-
-expecting success of 6437.3 'merging should conflict for non fast-forward': 
-	test_when_finished "git -C merge-search reset --hard" &&
-	(cd merge-search &&
-	 git checkout -b test-nonforward-a b &&
-	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	  then
-		test_must_fail git merge c 2>actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" actual
-	  else
-		test_must_fail git merge c 2> actual
-	  fi)
-
-Switched to a new branch 'test-nonforward-a'
-M	sub
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 3 - merging should conflict for non fast-forward
-
-expecting success of 6437.4 'finish setup for merge-search': 
-	(cd merge-search &&
-	git checkout -b d a &&
-	(cd sub &&
-	 git checkout -b sub-d sub-b &&
-	 git merge sub-c) &&
-	git commit -a -m "d" &&
-	git branch test b &&
-
-	git checkout -b g init &&
-	(cd sub &&
-	 git checkout -b sub-g sub-c) &&
-	git add sub &&
-	git commit -a -m "g")
-
-Switched to a new branch 'd'
-M	sub
-Switched to a new branch 'sub-d'
-Merge made by the 'ort' strategy.
- file-c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-[d 40eded3] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: unable to rmdir 'sub': Directory not empty
-Switched to a new branch 'g'
-Switched to a new branch 'sub-g'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[g 61ce3a9] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 4 - finish setup for merge-search
-
-expecting success of 6437.5 'merge with one side as a fast-forward of the other': 
-	(cd merge-search &&
-	 git checkout -b test-forward b &&
-	 git merge d &&
-	 git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
-	 (cd sub &&
-	  git rev-parse sub-d > ../expect) &&
-	 test_cmp expect actual)
-
-Switched to a new branch 'test-forward'
-M	sub
-Note: Fast-forwarding submodule sub to aafcfa2a62764282ab848d5d6bea86ba217c1b24
-Merge made by the 'ort' strategy.
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - merge with one side as a fast-forward of the other
-
-expecting success of 6437.6 'merging should conflict for non fast-forward (resolution exists)': 
-	(cd merge-search &&
-	 git checkout -b test-nonforward-b b &&
-	 (cd sub &&
-	  git rev-parse --short sub-d > ../expect) &&
-	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	  then
-		test_must_fail git merge c >actual 2>sub-actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" sub-actual
-	  else
-		test_must_fail git merge c 2> actual
-	  fi &&
-	 grep $(cat expect) actual > /dev/null &&
-	 git reset --hard)
-
-Switched to a new branch 'test-nonforward-b'
-M	sub
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 6 - merging should conflict for non fast-forward (resolution exists)
-
-expecting success of 6437.7 'merging should fail for ambiguous common parent': 
-	(cd merge-search &&
-	git checkout -b test-ambiguous b &&
-	(cd sub &&
-	 git checkout -b ambiguous sub-b &&
-	 git merge sub-c &&
-	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	 then
-		git rev-parse --short sub-d >../expect1 &&
-		git rev-parse --short ambiguous >../expect2
-	 else
-		git rev-parse sub-d > ../expect1 &&
-		git rev-parse ambiguous > ../expect2
-	 fi
-	 ) &&
-	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	 then
-		test_must_fail git merge c >actual 2>sub-actual &&
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
-		grep "$sub_expect" sub-actual
-	 else
-		test_must_fail git merge c 2> actual
-	 fi &&
-	grep $(cat expect1) actual > /dev/null &&
-	grep $(cat expect2) actual > /dev/null &&
-	git reset --hard)
-
-Switched to a new branch 'test-ambiguous'
-M	sub
-Switched to a new branch 'ambiguous'
-Merge made by the 'ort' strategy.
- file-c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file-c
-hint:  - go to submodule (sub), and either merge commit 18cac7c
-HEAD is now at 65d3c25 b
-ok 7 - merging should fail for ambiguous common parent
-
-expecting success of 6437.8 'merging should fail for changes that are backwards': 
-	(cd merge-search &&
-	git checkout -b bb a &&
-	(cd sub &&
-	 git checkout sub-b) &&
-	git commit -a -m "bb" &&
-
-	git checkout -b e bb &&
-	(cd sub &&
-	 git checkout sub-a) &&
-	git commit -a -m "e" &&
-
-	git checkout -b f bb &&
-	(cd sub &&
-	 git checkout sub-d) &&
-	git commit -a -m "f" &&
-
-	git checkout -b test-backward e &&
-	test_must_fail git merge f 2>actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-d)" &&
-		grep "$sub_expect" actual
-	fi)
-
-Switched to a new branch 'bb'
-M	sub
-Switched to branch 'sub-b'
-[bb 41fd2a8] bb
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'e'
-Switched to branch 'sub-a'
-[e 49e8960] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'f'
-M	sub
-Switched to branch 'sub-d'
-[f ceec2f6] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'test-backward'
-M	sub
-Failed to merge submodule sub (commits don't follow merge-base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit aafcfa2
-ok 8 - merging should fail for changes that are backwards
-
-expecting success of 6437.9 'git submodule status should display the merge conflict properly with merge base': 
-       (cd merge-search &&
-       cat >.gitmodules <<EOF &&
-[submodule "sub"]
-       path = sub
-       url = $TRASH_DIRECTORY/sub
-EOF
-       cat >expect <<EOF &&
-U$ZERO_OID sub
-EOF
-       git submodule status > actual &&
-       test_cmp expect actual &&
-	git reset --hard)
-
-HEAD is now at 49e8960 e
-ok 9 - git submodule status should display the merge conflict properly with merge base
-
-expecting success of 6437.10 'git submodule status should display the merge conflict properly without merge-base': 
-       (cd merge-search &&
-	git checkout -b test-no-merge-base g &&
-	test_must_fail git merge b &&
-       cat >.gitmodules <<EOF &&
-[submodule "sub"]
-       path = sub
-       url = $TRASH_DIRECTORY/sub
-EOF
-       cat >expect <<EOF &&
-U$ZERO_OID sub
-EOF
-       git submodule status > actual &&
-       test_cmp expect actual &&
-       git reset --hard)
-
-Switched to a new branch 'test-no-merge-base'
-M	sub
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit 1e4c5d4
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule sub (no merge base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 61ce3a9 g
-ok 10 - git submodule status should display the merge conflict properly without merge-base
-
-expecting success of 6437.11 'merging with a modify/modify conflict between merge bases': 
-	git reset --hard HEAD &&
-	git checkout -b test2 c &&
-	git merge d
-
-HEAD is now at f35b3af Merge branch 'a' into d
-Switched to a new branch 'test2'
-M	sub
-  From inner merge:  Note: Fast-forwarding submodule sub to ce35c37b7ac232e25ec1e4224f220de1cc360c38
-Merge made by the 'ort' strategy.
-ok 11 - merging with a modify/modify conflict between merge bases
-
-expecting success of 6437.12 'setup for recursive merge with submodule': 
-	mkdir merge-recursive &&
-	(cd merge-recursive &&
-	 git init &&
-	 mkdir sub &&
-	 (cd sub &&
-	  git init &&
-	  test_commit a &&
-	  git checkout -b sub-b main &&
-	  test_commit b &&
-	  git checkout -b sub-c main &&
-	  test_commit c &&
-	  git checkout -b sub-bc sub-b &&
-	  git merge sub-c &&
-	  git checkout -b sub-cb sub-c &&
-	  git merge sub-b &&
-	  git checkout main) &&
-	 git add sub &&
-	 git commit -m a &&
-	 git checkout -b top-b main &&
-	 (cd sub && git checkout sub-b) &&
-	 git add sub &&
-	 git commit -m b &&
-	 git checkout -b top-c main &&
-	 (cd sub && git checkout sub-c) &&
-	 git add sub &&
-	 git commit -m c &&
-	 git checkout -b top-bc top-b &&
-	 git merge -s ours --no-commit top-c &&
-	 (cd sub && git checkout sub-bc) &&
-	 git add sub &&
-	 git commit -m bc &&
-	 git checkout -b top-cb top-c &&
-	 git merge -s ours --no-commit top-b &&
-	 (cd sub && git checkout sub-cb) &&
-	 git add sub &&
-	 git commit -m cb)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-recursive/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-recursive/sub/.git/
-[main (root-commit) 9d932ab] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Switched to a new branch 'sub-b'
-[sub-b 8b32189] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Switched to a new branch 'sub-c'
-[sub-c 7d3d4d8] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'sub-bc'
-Merge made by the 'ort' strategy.
- c.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Switched to a new branch 'sub-cb'
-Merge made by the 'ort' strategy.
- b.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-Switched to branch 'main'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[main (root-commit) a2ff72f] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Switched to a new branch 'top-b'
-Switched to branch 'sub-b'
-[top-b f6b4d5a] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'top-c'
-M	sub
-Switched to branch 'sub-c'
-[top-c 4d9cfab] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'top-bc'
-M	sub
-Automatic merge went well; stopped before committing as requested
-Switched to branch 'sub-bc'
-[top-bc ff9bd9b] bc
- Author: A U Thor <author@example.com>
-Switched to a new branch 'top-cb'
-M	sub
-Automatic merge went well; stopped before committing as requested
-Switched to branch 'sub-cb'
-[top-cb a0ac63b] cb
- Author: A U Thor <author@example.com>
-ok 12 - setup for recursive merge with submodule
-
-expecting success of 6437.13 'recursive merge with submodule': 
-	(cd merge-recursive &&
-	 test_must_fail git merge top-bc &&
-	 echo "160000 $(git rev-parse top-cb:sub) 2	sub" > expect2 &&
-	 echo "160000 $(git rev-parse top-bc:sub) 3	sub" > expect3 &&
-	 git ls-files -u > actual &&
-	 grep "$(cat expect2)" actual > /dev/null &&
-	 grep "$(cat expect3)" actual > /dev/null)
-
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (sub), and either merge commit 8060496
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add sub
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-  From inner merge:  CONFLICT (submodule): Merge conflict in sub
-Failed to merge submodule sub
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - recursive merge with submodule
-
-expecting success of 6437.14 'setup file/submodule conflict': 
-	git init file-submodule &&
-	(
-		cd file-submodule &&
-
-		git commit --allow-empty -m O &&
-
-		git branch A &&
-		git branch B &&
-
-		git checkout B &&
-		echo content >path &&
-		git add path &&
-		git commit -m B &&
-
-		git checkout A &&
-		git init path &&
-		test_commit -C path world &&
-		git submodule add ./path &&
-		git commit -m A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/file-submodule/.git/
-[main (root-commit) f09f54e] O
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B 208816f] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path
-Switched to branch 'A'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/file-submodule/path/.git/
-[main (root-commit) 26692a7] world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world.t
-Adding existing repo at 'path' to the index
-[A 85fc078] A
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 path
-ok 14 - setup file/submodule conflict
-
-expecting success of 6437.15 'file/submodule conflict': 
-	test_when_finished "git -C file-submodule reset --hard" &&
-	(
-		cd file-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-
-		# path/ is still a submodule
-		test_path_is_dir path/.git &&
-
-		# There is a submodule at "path", so B:path cannot be written
-		# there.  We expect it to be written somewhere in the same
-		# directory, though, so just grep for its content in all
-		# files, and ignore "grep: path: Is a directory" message
-		echo Checking if contents from B:path showed up anywhere &&
-		grep -q content * 2>/dev/null
-	)
-
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 85fc078 A
-CONFLICT (distinct types): path had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-Checking if contents from B:path showed up anywhere
-HEAD is now at 85fc078 A
-ok 15 - file/submodule conflict
-
-expecting success of 6437.16 'file/submodule conflict; merge --abort works afterward': 
-	test_when_finished "git -C file-submodule reset --hard" &&
-	(
-		cd file-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B^0 >out 2>err &&
-
-		test_path_is_file .git/MERGE_HEAD &&
-		git merge --abort
-	)
-
-HEAD is now at 85fc078 A
-HEAD is now at 85fc078 A
-ok 16 - file/submodule conflict; merge --abort works afterward
-
-expecting success of 6437.17 'setup directory/submodule conflict': 
-	git init directory-submodule &&
-	(
-		cd directory-submodule &&
-
-		git commit --allow-empty -m O &&
-
-		git branch A &&
-		git branch B1 &&
-		git branch B2 &&
-
-		git checkout B1 &&
-		mkdir path &&
-		echo contents >path/file &&
-		git add path/file &&
-		git commit -m B1 &&
-
-		git checkout B2 &&
-		mkdir path &&
-		echo contents >path/world &&
-		git add path/world &&
-		git commit -m B2 &&
-
-		git checkout A &&
-		git init path &&
-		test_commit -C path hello world &&
-		git submodule add ./path &&
-		git commit -m A
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/directory-submodule/.git/
-[main (root-commit) f09f54e] O
- Author: A U Thor <author@example.com>
-Switched to branch 'B1'
-[B1 8ab0f0c] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path/file
-Switched to branch 'B2'
-[B2 db2a533] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 path/world
-Switched to branch 'A'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/directory-submodule/path/.git/
-[main (root-commit) 2605480] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world
-Adding existing repo at 'path' to the index
-[A 90b0bac] A
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 path
-ok 17 - setup directory/submodule conflict
-
-checking known breakage of 6437.18 'directory/submodule conflict; keep submodule clean': 
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
-
-		git checkout A^0 &&
-		test_must_fail git merge B1^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-
-		# path/ is still a submodule
-		test_path_is_dir path/.git &&
-
-		echo Checking if contents from B1:path/file showed up &&
-		# Would rather use grep -r, but that is GNU extension...
-		git ls-files -co | xargs grep -q contents 2>/dev/null &&
-
-		# However, B1:path/file should NOT have shown up at path/file,
-		# because we should not write into the submodule
-		test_path_is_missing path/file
-	)
+*** t6700-tree-depth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6700-tree-depth/.git/
+expecting success of 6700.1 'create small tree': 
+	mkdeep small $small_depth
 
-Note: switching to 'A^0'.
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           53 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           51 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 1 - create small tree
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6700.2 'create big tree': 
+	mkdeep big $big_depth
 
-  git switch -c <new-branch-name>
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:         4103 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :         4101 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              2
+Memory total:          2868 KiB
+       pools:          2516 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     152731 /     152731
+---------------------------------------------------------------------
 
-Or undo this operation with:
+ok 2 - create big tree
 
-  git switch -
+expecting success of 6700.3 'limit recursion of git-archive': 
+	git $small_ok archive small >/dev/null &&
+	test_must_fail git $small_no archive small >/dev/null
 
-Turn off this advice by setting config variable advice.detachedHead to false
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object 89dec2e140b538c88e6d3990453ffc27adfa7fc1
+ok 3 - limit recursion of git-archive
 
-HEAD is now at 90b0bac A
-warning: unable to rmdir 'path': Directory not empty
-CONFLICT (file/directory): directory in the way of path from HEAD; moving it to path~HEAD instead.
-Automatic merge failed; fix conflicts and then commit the result.
-Checking if contents from B1:path/file showed up
-Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 9 Apr 19 19:23 path/file
-HEAD is now at 90b0bac A
-not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
+expecting success of 6700.4 'default limit for git-archive fails gracefully': 
+	test_must_fail git archive big >/dev/null
 
-checking prerequisite: FAIL_PREREQS
+error: exceeded maximum allowed tree depth
+fatal: failed to unpack tree object e0fe3d6d3d70bfe6a08264a50dd1a104cd787427
+ok 4 - default limit for git-archive fails gracefully
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-		test_bool_env GIT_TEST_FAIL_PREREQS false
-	
-)
-prerequisite FAIL_PREREQS not satisfied
-expecting success of 6437.19 'directory/submodule conflict; should not treat submodule files as untracked or in the way': 
-	test_when_finished "git -C directory-submodule/path reset --hard" &&
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
+expecting success of 6700.5 'limit recursion of ls-tree -r': 
+	git $small_ok ls-tree -r small &&
+	test_must_fail git $small_no ls-tree -r small
 
-		git checkout A^0 &&
-		test_must_fail git merge B2^0 >out 2>err &&
+100644 blob d7178a291fc27940d51a7ac20784bb91c5ae524c	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
+error: exceeded maximum allowed tree depth
+ok 5 - limit recursion of ls-tree -r
 
-		# We do not want files within the submodule to prevent the
-		# merge from starting; we should not be writing to such paths
-		# anyway.
-		test_grep ! "refusing to lose untracked file at" err
-	)
+expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
+	test_must_fail git ls-tree -r big >/dev/null
 
-HEAD is now at 90b0bac A
-HEAD is now at 90b0bac A
-HEAD is now at 2605480 hello
-ok 19 - directory/submodule conflict; should not treat submodule files as untracked or in the way
+error: exceeded maximum allowed tree depth
+ok 6 - default limit for ls-tree fails gracefully
 
-checking known breakage of 6437.20 'directory/submodule conflict; merge --abort works afterward': 
-	test_when_finished "git -C directory-submodule/path reset --hard" &&
-	test_when_finished "git -C directory-submodule reset --hard" &&
-	(
-		cd directory-submodule &&
+expecting success of 6700.7 'limit recursion of rev-list --objects': 
+	git $small_ok rev-list --objects small >/dev/null &&
+	test_must_fail git $small_no rev-list --objects small >/dev/null
 
-		git checkout A^0 &&
-		test_must_fail git merge B2^0 &&
-		test_path_is_file .git/MERGE_HEAD &&
+fatal: exceeded maximum allowed tree depth
+ok 7 - limit recursion of rev-list --objects
 
-		# merge --abort should succeed, should clear .git/MERGE_HEAD,
-		# and should not leave behind any conflicted files
-		git merge --abort &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 6700.8 'default limit for rev-list fails gracefully': 
+	test_must_fail git rev-list --objects big >/dev/null
 
-HEAD is now at 90b0bac A
-error: The following untracked working tree files would be overwritten by merge:
-	path/world
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-File .git/MERGE_HEAD doesn't exist
-HEAD is now at 90b0bac A
-HEAD is now at 2605480 hello
-not ok 20 - directory/submodule conflict; merge --abort works afterward # TODO known breakage
+fatal: exceeded maximum allowed tree depth
+ok 8 - default limit for rev-list fails gracefully
 
-expecting success of 6437.21 'setup for null merge base': 
-	mkdir no-merge-base &&
-	(cd no-merge-base &&
-	git init &&
-	mkdir sub &&
-	(cd sub &&
-	 git init &&
-	 echo "file-a" > file-a &&
-	 git add file-a &&
-	 git commit -m "commit a") &&
-	git commit --allow-empty -m init &&
-	git branch init &&
-	git checkout -b a init &&
-	git add sub &&
-	git commit -m "a" &&
-	git switch main &&
-	(cd sub &&
-	 echo "file-b" > file-b &&
-	 git add file-b &&
-	 git commit -m "commit b"))
+expecting success of 6700.9 'limit recursion of diff-tree -r': 
+	git $small_ok diff-tree -r $EMPTY_TREE small &&
+	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/no-merge-base/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/no-merge-base/sub/.git/
-[main (root-commit) d61d855] commit a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-a
-[main (root-commit) edb5fba] init
- Author: A U Thor <author@example.com>
-Switched to a new branch 'a'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[a 8b6337e] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-warning: unable to rmdir 'sub': Directory not empty
-Switched to branch 'main'
-[main dc37965] commit b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-b
-ok 21 - setup for null merge base
+:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
+fatal: exceeded maximum allowed tree depth
+ok 9 - limit recursion of diff-tree -r
 
-expecting success of 6437.22 'merging should fail with no merge base': 
-	(cd no-merge-base &&
-	git checkout -b b init &&
-	git add sub &&
-	git commit -m "b" &&
-	test_must_fail git merge a 2>actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
-		grep "$sub_expect" actual
-	fi)
+expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
+	test_must_fail git diff-tree -r $EMPTY_TREE big
 
-Switched to a new branch 'b'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[b 5e75592] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Failed to merge submodule sub (no merge base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit d61d855
-ok 22 - merging should fail with no merge base
+fatal: exceeded maximum allowed tree depth
+ok 10 - default limit for diff-tree fails gracefully
 
-# still have 2 known breakage(s)
-# passed all remaining 20 test(s)
-1..22
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6300-for-each-ref.sh ***
@@ -437487,7 +436488,7 @@
 	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
 
 Tue Jul 4 01:18:44 2006 +0200
-20 years ago
+19 years ago
 2006-07-04
 Mon Jul 3 23:18:44 2006
 2006-07-04 01:18:44 +0200
@@ -439676,1497 +438677,949 @@
 1..428
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6601-path-walk.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6601-path-walk/.git/
-expecting success of 6601.1 'setup test repository': 
-	git checkout -b base &&
-
-	# Make some objects that will only be reachable
-	# via non-commit tags.
-	mkdir child &&
-	echo file >child/file &&
-	git add child &&
-	git commit -m "will abandon" &&
-	git tag -a -m "tree" tree-tag HEAD^{tree} &&
-	echo file2 >file2 &&
-	git add file2 &&
-	git commit --amend -m "will abandon" &&
-	git tag tree-tag2 HEAD^{tree} &&
-
-	echo blob >file &&
-	blob_oid=$(git hash-object -t blob -w --stdin <file) &&
-	git tag -a -m "blob" blob-tag "$blob_oid" &&
-	echo blob2 >file2 &&
-	blob2_oid=$(git hash-object -t blob -w --stdin <file2) &&
-	git tag blob-tag2 "$blob2_oid" &&
+*** t6437-submodule-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/.git/
+expecting success of 6437.1 'setup': 
 
-	rm -fr child file file2 &&
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo original > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-root) &&
+	git add sub &&
+	test_tick &&
+	git commit -m root &&
 
-	mkdir left &&
-	mkdir right &&
-	echo a >a &&
-	echo b >left/b &&
-	echo c >right/c &&
-	git add . &&
-	git commit --amend -m "first" &&
-	git tag -m "first" first HEAD &&
+	git checkout -b a main &&
+	(cd sub &&
+	 echo A > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-a) &&
+	git add sub &&
+	test_tick &&
+	git commit -m a &&
 
-	echo d >right/d &&
-	git add right &&
-	git commit -m "second" &&
-	git tag -a -m "second (under)" second.1 HEAD &&
-	git tag -a -m "second (top)" second.2 second.1 &&
+	git checkout -b b main &&
+	(cd sub &&
+	 echo B > file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m sub-b) &&
+	git add sub &&
+	test_tick &&
+	git commit -m b &&
 
-	# Set up file/dir collision in history.
-	rm a &&
-	mkdir a &&
-	echo a >a/a &&
-	echo bb >left/b &&
-	git add a left &&
-	git commit -m "third" &&
-	git tag -a -m "third" third &&
+	git checkout -b c a &&
+	git merge -s ours b &&
 
-	git checkout -b topic HEAD~1 &&
-	echo cc >right/c &&
-	git commit -a -m "topic" &&
-	git tag -a -m "fourth" fourth
+	git checkout -b d b &&
+	git merge -s ours a
 
-Switched to a new branch 'base'
-[base (root-commit) 8a1cb1c] will abandon
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/sub/.git/
+[main (root-commit) 0998b33] sub-root
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 child/file
-[base 59ee105] will abandon
+ create mode 100644 file
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) 5c9ada4] root
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 2 insertions(+)
- create mode 100644 child/file
- create mode 100644 file2
-[base af55d63] first
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Switched to a new branch 'a'
+[main d98dfef] sub-a
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 100644 left/b
- create mode 100644 right/c
-[base 39cfa34] second
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[a 6102a2a] a
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 right/d
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f second.2 second.1^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-[base e8558c1] third
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'b'
+M	sub
+[main ce35c37] sub-b
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename a => a/a (100%)
-Switched to a new branch 'topic'
-[topic f3f293d] topic
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[b 0405d8c] b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup test repository
-
-expecting success of 6601.2 'all': 
-	test-tool path-walk -- --all >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base)
-	0:commit::$(git rev-parse base~1)
-	0:commit::$(git rev-parse base~2)
-	1:tag:/tags:$(git rev-parse refs/tags/first)
-	1:tag:/tags:$(git rev-parse refs/tags/second.1)
-	1:tag:/tags:$(git rev-parse refs/tags/second.2)
-	1:tag:/tags:$(git rev-parse refs/tags/third)
-	1:tag:/tags:$(git rev-parse refs/tags/fourth)
-	1:tag:/tags:$(git rev-parse refs/tags/tree-tag)
-	1:tag:/tags:$(git rev-parse refs/tags/blob-tag)
-	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{})
-	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
-	3:tree::$(git rev-parse topic^{tree})
-	3:tree::$(git rev-parse base^{tree})
-	3:tree::$(git rev-parse base~1^{tree})
-	3:tree::$(git rev-parse base~2^{tree})
-	3:tree::$(git rev-parse refs/tags/tree-tag^{})
-	3:tree::$(git rev-parse refs/tags/tree-tag2^{})
-	4:blob:a:$(git rev-parse base~2:a)
-	5:blob:file2:$(git rev-parse refs/tags/tree-tag2^{}:file2)
-	6:tree:a/:$(git rev-parse base:a)
-	7:tree:child/:$(git rev-parse refs/tags/tree-tag:child)
-	8:blob:child/file:$(git rev-parse refs/tags/tree-tag:child/file)
-	9:tree:left/:$(git rev-parse base:left)
-	9:tree:left/:$(git rev-parse base~2:left)
-	10:blob:left/b:$(git rev-parse base~2:left/b)
-	10:blob:left/b:$(git rev-parse base:left/b)
-	11:tree:right/:$(git rev-parse topic:right)
-	11:tree:right/:$(git rev-parse base~1:right)
-	11:tree:right/:$(git rev-parse base~2:right)
-	12:blob:right/c:$(git rev-parse base~2:right/c)
-	12:blob:right/c:$(git rev-parse topic:right/c)
-	13:blob:right/d:$(git rev-parse base~1:right/d)
-	blobs:10
-	commits:4
-	tags:7
-	trees:13
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 2 - all
-
-expecting success of 6601.3 'indexed objects': 
-	test_when_finished git reset --hard &&
-
-	# stage change into index, adding a blob but
-	# also invalidating the cache-tree for the root
-	# and the "left" directory.
-	echo bogus >left/c &&
-	git add left &&
-
-	test-tool path-walk -- --indexed-objects >out &&
-
-	cat >expect <<-EOF &&
-	0:blob:a:$(git rev-parse HEAD:a)
-	1:blob:left/b:$(git rev-parse HEAD:left/b)
-	2:blob:left/c:$(git rev-parse :left/c)
-	3:blob:right/c:$(git rev-parse HEAD:right/c)
-	4:blob:right/d:$(git rev-parse HEAD:right/d)
-	5:tree:right/:$(git rev-parse topic:right)
-	blobs:5
-	commits:0
-	tags:0
-	trees:1
-	EOF
-
-	test_cmp_sorted expect out
-
-HEAD is now at f3f293d topic
-ok 3 - indexed objects
-
-expecting success of 6601.4 'branches and indexed objects mix well': 
-	test_when_finished git reset --hard &&
-
-	# stage change into index, adding a blob but
-	# also invalidating the cache-tree for the root
-	# and the "right" directory.
-	echo fake >right/d &&
-	git add right &&
-
-	test-tool path-walk -- --indexed-objects --branches >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base)
-	0:commit::$(git rev-parse base~1)
-	0:commit::$(git rev-parse base~2)
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base^{tree})
-	1:tree::$(git rev-parse base~1^{tree})
-	1:tree::$(git rev-parse base~2^{tree})
-	2:tree:a/:$(git rev-parse refs/tags/third:a)
-	3:tree:left/:$(git rev-parse base:left)
-	3:tree:left/:$(git rev-parse base~2:left)
-	4:blob:left/b:$(git rev-parse base:left/b)
-	4:blob:left/b:$(git rev-parse base~2:left/b)
-	5:tree:right/:$(git rev-parse topic:right)
-	5:tree:right/:$(git rev-parse base~1:right)
-	5:tree:right/:$(git rev-parse base~2:right)
-	6:blob:right/c:$(git rev-parse base~2:right/c)
-	6:blob:right/c:$(git rev-parse topic:right/c)
-	7:blob:right/d:$(git rev-parse base~1:right/d)
-	7:blob:right/d:$(git rev-parse :right/d)
-	8:blob:a:$(git rev-parse base~2:a)
-	blobs:7
-	commits:4
-	tags:0
-	trees:10
-	EOF
-
-	test_cmp_sorted expect out
-
-HEAD is now at f3f293d topic
-ok 4 - branches and indexed objects mix well
-
-expecting success of 6601.5 'base & topic, sparse': 
-	cat >patterns <<-EOF &&
-	/*
-	!/*/
-	/left/
-	EOF
-
-	test-tool path-walk --stdin-pl -- base topic <patterns >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base)
-	0:commit::$(git rev-parse base~1)
-	0:commit::$(git rev-parse base~2)
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base^{tree})
-	1:tree::$(git rev-parse base~1^{tree})
-	1:tree::$(git rev-parse base~2^{tree})
-	2:blob:a:$(git rev-parse base~2:a)
-	3:tree:left/:$(git rev-parse base:left)
-	3:tree:left/:$(git rev-parse base~2:left)
-	4:blob:left/b:$(git rev-parse base~2:left/b)
-	4:blob:left/b:$(git rev-parse base:left/b)
-	blobs:3
-	commits:4
-	tags:0
-	trees:6
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 5 - base & topic, sparse
-
-expecting success of 6601.6 'topic only': 
-	test-tool path-walk -- topic >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base~1)
-	0:commit::$(git rev-parse base~2)
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base~1^{tree})
-	1:tree::$(git rev-parse base~2^{tree})
-	2:blob:a:$(git rev-parse base~2:a)
-	3:tree:left/:$(git rev-parse base~2:left)
-	4:blob:left/b:$(git rev-parse base~2:left/b)
-	5:tree:right/:$(git rev-parse topic:right)
-	5:tree:right/:$(git rev-parse base~1:right)
-	5:tree:right/:$(git rev-parse base~2:right)
-	6:blob:right/c:$(git rev-parse base~2:right/c)
-	6:blob:right/c:$(git rev-parse topic:right/c)
-	7:blob:right/d:$(git rev-parse base~1:right/d)
-	blobs:5
-	commits:3
-	tags:0
-	trees:7
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 6 - topic only
-
-expecting success of 6601.7 'topic, not base': 
-	test-tool path-walk -- topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	1:tree::$(git rev-parse topic^{tree})
-	2:blob:a:$(git rev-parse topic:a):UNINTERESTING
-	3:tree:left/:$(git rev-parse topic:left):UNINTERESTING
-	4:blob:left/b:$(git rev-parse topic:left/b):UNINTERESTING
-	5:tree:right/:$(git rev-parse topic:right)
-	6:blob:right/c:$(git rev-parse topic:right/c)
-	7:blob:right/d:$(git rev-parse topic:right/d):UNINTERESTING
-	blobs:4
-	commits:1
-	tags:0
-	trees:3
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 7 - topic, not base
-
-expecting success of 6601.8 'fourth, blob-tag2, not base': 
-	test-tool path-walk -- fourth blob-tag2 --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	1:tag:/tags:$(git rev-parse fourth)
-	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
-	3:tree::$(git rev-parse topic^{tree})
-	4:blob:a:$(git rev-parse base~1:a):UNINTERESTING
-	5:tree:left/:$(git rev-parse base~1:left):UNINTERESTING
-	6:blob:left/b:$(git rev-parse base~1:left/b):UNINTERESTING
-	7:tree:right/:$(git rev-parse topic:right)
-	8:blob:right/c:$(git rev-parse topic:right/c)
-	9:blob:right/d:$(git rev-parse base~1:right/d):UNINTERESTING
-	blobs:5
-	commits:1
-	tags:1
-	trees:3
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 8 - fourth, blob-tag2, not base
-
-expecting success of 6601.9 'topic, not base, only blobs': 
-	test-tool path-walk --no-trees --no-commits \
-		-- topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:blob:a:$(git rev-parse topic:a):UNINTERESTING
-	1:blob:left/b:$(git rev-parse topic:left/b):UNINTERESTING
-	2:blob:right/c:$(git rev-parse topic:right/c)
-	3:blob:right/d:$(git rev-parse topic:right/d):UNINTERESTING
-	blobs:4
-	commits:0
-	tags:0
-	trees:0
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 9 - topic, not base, only blobs
-
-expecting success of 6601.10 'topic, not base, only commits': 
-	test-tool path-walk --no-blobs --no-trees \
-		-- topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	commits:1
-	blobs:0
-	tags:0
-	trees:0
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 10 - topic, not base, only commits
-
-expecting success of 6601.11 'topic, not base, only trees': 
-	test-tool path-walk --no-blobs --no-commits \
-		-- topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:tree::$(git rev-parse topic^{tree})
-	1:tree:left/:$(git rev-parse topic:left):UNINTERESTING
-	2:tree:right/:$(git rev-parse topic:right)
-	commits:0
-	blobs:0
-	tags:0
-	trees:3
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 11 - topic, not base, only trees
-
-expecting success of 6601.12 'topic, not base, boundary': 
-	test-tool path-walk -- --boundary topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base~1):UNINTERESTING
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base~1^{tree}):UNINTERESTING
-	2:blob:a:$(git rev-parse base~1:a):UNINTERESTING
-	3:tree:left/:$(git rev-parse base~1:left):UNINTERESTING
-	4:blob:left/b:$(git rev-parse base~1:left/b):UNINTERESTING
-	5:tree:right/:$(git rev-parse topic:right)
-	5:tree:right/:$(git rev-parse base~1:right):UNINTERESTING
-	6:blob:right/c:$(git rev-parse base~1:right/c):UNINTERESTING
-	6:blob:right/c:$(git rev-parse topic:right/c)
-	7:blob:right/d:$(git rev-parse base~1:right/d):UNINTERESTING
-	blobs:5
-	commits:2
-	tags:0
-	trees:5
-	EOF
-
-	test_cmp_sorted expect out
-
-ok 12 - topic, not base, boundary
-
-expecting success of 6601.13 'topic, not base, boundary with pruning': 
-	test-tool path-walk --prune -- --boundary topic --not base >out &&
-
-	cat >expect <<-EOF &&
-	0:commit::$(git rev-parse topic)
-	0:commit::$(git rev-parse base~1):UNINTERESTING
-	1:tree::$(git rev-parse topic^{tree})
-	1:tree::$(git rev-parse base~1^{tree}):UNINTERESTING
-	2:tree:right/:$(git rev-parse topic:right)
-	2:tree:right/:$(git rev-parse base~1:right):UNINTERESTING
-	3:blob:right/c:$(git rev-parse base~1:right/c):UNINTERESTING
-	3:blob:right/c:$(git rev-parse topic:right/c)
-	blobs:2
-	commits:2
-	tags:0
-	trees:4
-	EOF
+Switched to a new branch 'c'
+M	sub
+Merge made by the 'ours' strategy.
+Switched to a new branch 'd'
+Merge made by the 'ours' strategy.
+ok 1 - setup
 
-	test_cmp_sorted expect out
+expecting success of 6437.2 'setup for merge search': 
+	mkdir merge-search &&
+	(cd merge-search &&
+	git init &&
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo "file-a" > file-a &&
+	 git add file-a &&
+	 git commit -m "sub-a" &&
+	 git branch sub-a) &&
+	git commit --allow-empty -m init &&
+	git branch init &&
+	git add sub &&
+	git commit -m "a" &&
+	git branch a &&
 
-ok 13 - topic, not base, boundary with pruning
+	git checkout -b b &&
+	(cd sub &&
+	 git checkout -b sub-b &&
+	 echo "file-b" > file-b &&
+	 git add file-b &&
+	 git commit -m "sub-b") &&
+	git commit -a -m "b" &&
 
-expecting success of 6601.14 'trees are reported exactly once': 
-	test_when_finished "rm -rf unique-trees" &&
-	test_create_repo unique-trees &&
-	(
-		cd unique-trees &&
-		mkdir initial &&
-		test_commit initial/file &&
-		git switch -c move-to-top &&
-		git mv initial/file.t ./ &&
-		test_tick &&
-		git commit -m moved &&
-		git update-ref refs/heads/other HEAD
-	) &&
-	test-tool -C unique-trees path-walk -- --all >out &&
-	tree=$(git -C unique-trees rev-parse HEAD:) &&
-	grep "$tree" out >out-filtered &&
-	test_line_count = 1 out-filtered
+	git checkout -b c a &&
+	(cd sub &&
+	 git checkout -b sub-c sub-a &&
+	 echo "file-c" > file-c &&
+	 git add file-c &&
+	 git commit -m "sub-c") &&
+	git commit -a -m "c")
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6601-path-walk/unique-trees/.git/
-[master (root-commit) 52fcaa7] initial/file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-search/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-search/sub/.git/
+[main (root-commit) 9c64145] sub-a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial/file.t
-Switched to a new branch 'move-to-top'
-[move-to-top efba859] moved
+ create mode 100644 file-a
+[main (root-commit) edb5fba] init
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename initial/file.t => file.t (100%)
-ok 14 - trees are reported exactly once
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7005-editor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7005-editor/.git/
-expecting success of 7005.1 'determine default editor': 
-
-	vi=$(TERM=vt100 git var GIT_EDITOR) &&
-	test -n "$vi"
-
-
-ok 1 - determine default editor
-
-expecting success of 7005.2 'setup': 
-
-	msg="Hand-edited" &&
-	test_commit "$msg" &&
-	echo "$msg" >expect &&
-	git show -s --format=%s > actual &&
-	test_cmp expect actual
-
-
-[master (root-commit) 2ddcc77] Hand-edited
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main ea59e10] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 2 - setup
-
-expecting success of 7005.3 'dumb should error out when falling back on vi': 
-
-	if git commit --amend
-	then
-		echo "Oops?"
-		false
-	else
-		: happy
-	fi
-
-error: Terminal is dumb, but EDITOR unset
-Please supply the message using either -m or -F option.
-ok 3 - dumb should error out when falling back on vi
-
-expecting success of 7005.4 'dumb should prefer EDITOR to VISUAL': 
-
-	EDITOR=./e-EDITOR.sh &&
-	VISUAL=./e-VISUAL.sh &&
-	export EDITOR VISUAL &&
-	git commit --amend &&
-	test "$(git show -s --format=%s)" = "Edited by EDITOR"
-
-
-[master 7eecd8c] Edited by EDITOR
+ create mode 160000 sub
+Switched to a new branch 'b'
+Switched to a new branch 'sub-b'
+[sub-b 1e4c5d4] sub-b
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 4 - dumb should prefer EDITOR to VISUAL
-
-expecting success of 7005.5 'Using editor': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 5b7078a] Edited by editor
+ create mode 100644 file-b
+[b 65d3c25] b
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 5 - Using editor
-
-expecting success of 7005.6 'Using EDITOR': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 7eecd8c] Edited by EDITOR
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'c'
+M	sub
+Switched to a new branch 'sub-c'
+[sub-c 18cac7c] sub-c
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 6 - Using EDITOR
-
-expecting success of 7005.7 'Using VISUAL': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 2ee1d44] Edited by VISUAL
+ create mode 100644 file-c
+[c 00fd913] c
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 7 - Using VISUAL
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - setup for merge search
 
-expecting success of 7005.8 'Using core_editor': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1c851bb] Edited by core_editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 8 - Using core_editor
+expecting success of 6437.3 'merging should conflict for non fast-forward': 
+	test_when_finished "git -C merge-search reset --hard" &&
+	(cd merge-search &&
+	 git checkout -b test-nonforward-a b &&
+	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	  then
+		test_must_fail git merge c 2>actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" actual
+	  else
+		test_must_fail git merge c 2> actual
+	  fi)
 
-expecting success of 7005.9 'Using GIT_EDITOR': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1bdd03b] Edited by GIT_EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 9 - Using GIT_EDITOR
+Switched to a new branch 'test-nonforward-a'
+M	sub
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 3 - merging should conflict for non fast-forward
 
-expecting success of 7005.10 'Using editor (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 5b7078a] Edited by editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 10 - Using editor (override)
+expecting success of 6437.4 'finish setup for merge-search': 
+	(cd merge-search &&
+	git checkout -b d a &&
+	(cd sub &&
+	 git checkout -b sub-d sub-b &&
+	 git merge sub-c) &&
+	git commit -a -m "d" &&
+	git branch test b &&
 
-expecting success of 7005.11 'Using EDITOR (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 7eecd8c] Edited by EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 11 - Using EDITOR (override)
+	git checkout -b g init &&
+	(cd sub &&
+	 git checkout -b sub-g sub-c) &&
+	git add sub &&
+	git commit -a -m "g")
 
-expecting success of 7005.12 'Using VISUAL (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 2ee1d44] Edited by VISUAL
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
+Switched to a new branch 'd'
+M	sub
+Switched to a new branch 'sub-d'
+Merge made by the 'ort' strategy.
+ file-c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 12 - Using VISUAL (override)
-
-expecting success of 7005.13 'Using core_editor (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1c851bb] Edited by core_editor
+ create mode 100644 file-c
+[d 40eded3] d
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 13 - Using core_editor (override)
-
-expecting success of 7005.14 'Using GIT_EDITOR (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1bdd03b] Edited by GIT_EDITOR
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: unable to rmdir 'sub': Directory not empty
+Switched to a new branch 'g'
+Switched to a new branch 'sub-g'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[g 61ce3a9] g
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 14 - Using GIT_EDITOR (override)
+ create mode 160000 sub
+ok 4 - finish setup for merge-search
 
-expecting success of 7005.15 'editor with a space': 
-	echo "echo space >\"\$1\"" >"e space.sh" &&
-	chmod a+x "e space.sh" &&
-	GIT_EDITOR="./e\ space.sh" git commit --amend &&
-	test space = "$(git show -s --pretty=format:%s)"
+expecting success of 6437.5 'merge with one side as a fast-forward of the other': 
+	(cd merge-search &&
+	 git checkout -b test-forward b &&
+	 git merge d &&
+	 git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
+	 (cd sub &&
+	  git rev-parse sub-d > ../expect) &&
+	 test_cmp expect actual)
 
+Switched to a new branch 'test-forward'
+M	sub
+Note: Fast-forwarding submodule sub to aafcfa2a62764282ab848d5d6bea86ba217c1b24
+Merge made by the 'ort' strategy.
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - merge with one side as a fast-forward of the other
 
-[master 5d9c28a] space
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
+expecting success of 6437.6 'merging should conflict for non fast-forward (resolution exists)': 
+	(cd merge-search &&
+	 git checkout -b test-nonforward-b b &&
+	 (cd sub &&
+	  git rev-parse --short sub-d > ../expect) &&
+	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	  then
+		test_must_fail git merge c >actual 2>sub-actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" sub-actual
+	  else
+		test_must_fail git merge c 2> actual
+	  fi &&
+	 grep $(cat expect) actual > /dev/null &&
+	 git reset --hard)
+
+Switched to a new branch 'test-nonforward-b'
+M	sub
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 6 - merging should conflict for non fast-forward (resolution exists)
+
+expecting success of 6437.7 'merging should fail for ambiguous common parent': 
+	(cd merge-search &&
+	git checkout -b test-ambiguous b &&
+	(cd sub &&
+	 git checkout -b ambiguous sub-b &&
+	 git merge sub-c &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		git rev-parse --short sub-d >../expect1 &&
+		git rev-parse --short ambiguous >../expect2
+	 else
+		git rev-parse sub-d > ../expect1 &&
+		git rev-parse ambiguous > ../expect2
+	 fi
+	 ) &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		test_must_fail git merge c >actual 2>sub-actual &&
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-c)" &&
+		grep "$sub_expect" sub-actual
+	 else
+		test_must_fail git merge c 2> actual
+	 fi &&
+	grep $(cat expect1) actual > /dev/null &&
+	grep $(cat expect2) actual > /dev/null &&
+	git reset --hard)
+
+Switched to a new branch 'test-ambiguous'
+M	sub
+Switched to a new branch 'ambiguous'
+Merge made by the 'ort' strategy.
+ file-c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 15 - editor with a space
+ create mode 100644 file-c
+hint:  - go to submodule (sub), and either merge commit 18cac7c
+HEAD is now at 65d3c25 b
+ok 7 - merging should fail for ambiguous common parent
 
-expecting success of 7005.16 'core.editor with a space': 
+expecting success of 6437.8 'merging should fail for changes that are backwards': 
+	(cd merge-search &&
+	git checkout -b bb a &&
+	(cd sub &&
+	 git checkout sub-b) &&
+	git commit -a -m "bb" &&
 
-	git config core.editor \"./e\ space.sh\" &&
-	git commit --amend &&
-	test space = "$(git show -s --pretty=format:%s)"
+	git checkout -b e bb &&
+	(cd sub &&
+	 git checkout sub-a) &&
+	git commit -a -m "e" &&
 
+	git checkout -b f bb &&
+	(cd sub &&
+	 git checkout sub-d) &&
+	git commit -a -m "f" &&
 
-[master 5d9c28a] space
+	git checkout -b test-backward e &&
+	test_must_fail git merge f 2>actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short sub-d)" &&
+		grep "$sub_expect" actual
+	fi)
+
+Switched to a new branch 'bb'
+M	sub
+Switched to branch 'sub-b'
+[bb 41fd2a8] bb
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 16 - core.editor with a space
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'e'
+Switched to branch 'sub-a'
+[e 49e8960] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'f'
+M	sub
+Switched to branch 'sub-d'
+[f ceec2f6] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'test-backward'
+M	sub
+Failed to merge submodule sub (commits don't follow merge-base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit aafcfa2
+ok 8 - merging should fail for changes that are backwards
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7007-show.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7007-show/.git/
-expecting success of 7007.1 'setup': 
-	echo hello world >foo &&
-	H=$(git hash-object -w foo) &&
-	git tag -a foo-tag -m "Tags $H" $H &&
-	HH=$(expr "$H" : "\(..\)") &&
-	H38=$(expr "$H" : "..\(.*\)") &&
-	rm -f .git/objects/$HH/$H38
+expecting success of 6437.9 'git submodule status should display the merge conflict properly with merge base': 
+       (cd merge-search &&
+       cat >.gitmodules <<EOF &&
+[submodule "sub"]
+       path = sub
+       url = $TRASH_DIRECTORY/sub
+EOF
+       cat >expect <<EOF &&
+U$ZERO_OID sub
+EOF
+       git submodule status > actual &&
+       test_cmp expect actual &&
+	git reset --hard)
 
-ok 1 - setup
+HEAD is now at 49e8960 e
+ok 9 - git submodule status should display the merge conflict properly with merge base
 
-expecting success of 7007.2 'showing a tag that point at a missing object': 
-	test_must_fail git --no-pager show foo-tag
+expecting success of 6437.10 'git submodule status should display the merge conflict properly without merge-base': 
+       (cd merge-search &&
+	git checkout -b test-no-merge-base g &&
+	test_must_fail git merge b &&
+       cat >.gitmodules <<EOF &&
+[submodule "sub"]
+       path = sub
+       url = $TRASH_DIRECTORY/sub
+EOF
+       cat >expect <<EOF &&
+U$ZERO_OID sub
+EOF
+       git submodule status > actual &&
+       test_cmp expect actual &&
+       git reset --hard)
 
-error: could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
-tag foo-tag
-Tagger: C O Mitter <committer@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+Switched to a new branch 'test-no-merge-base'
+M	sub
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit 1e4c5d4
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule sub (no merge base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 61ce3a9 g
+ok 10 - git submodule status should display the merge conflict properly without merge-base
 
-Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
-ok 2 - showing a tag that point at a missing object
+expecting success of 6437.11 'merging with a modify/modify conflict between merge bases': 
+	git reset --hard HEAD &&
+	git checkout -b test2 c &&
+	git merge d
 
-expecting success of 7007.3 'set up a bit of history': 
-	test_commit main1 &&
-	test_commit main2 &&
-	test_commit main3 &&
-	git tag -m "annotated tag" annotated &&
-	git checkout -b side HEAD^^ &&
-	test_commit side2 &&
-	test_commit side3 &&
-	test_merge merge main3
+HEAD is now at f35b3af Merge branch 'a' into d
+Switched to a new branch 'test2'
+M	sub
+  From inner merge:  Note: Fast-forwarding submodule sub to ce35c37b7ac232e25ec1e4224f220de1cc360c38
+Merge made by the 'ort' strategy.
+ok 11 - merging with a modify/modify conflict between merge bases
 
-[master (root-commit) 9ca29bf] main1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main1.t
-[master 6983cd6] main2
+expecting success of 6437.12 'setup for recursive merge with submodule': 
+	mkdir merge-recursive &&
+	(cd merge-recursive &&
+	 git init &&
+	 mkdir sub &&
+	 (cd sub &&
+	  git init &&
+	  test_commit a &&
+	  git checkout -b sub-b main &&
+	  test_commit b &&
+	  git checkout -b sub-c main &&
+	  test_commit c &&
+	  git checkout -b sub-bc sub-b &&
+	  git merge sub-c &&
+	  git checkout -b sub-cb sub-c &&
+	  git merge sub-b &&
+	  git checkout main) &&
+	 git add sub &&
+	 git commit -m a &&
+	 git checkout -b top-b main &&
+	 (cd sub && git checkout sub-b) &&
+	 git add sub &&
+	 git commit -m b &&
+	 git checkout -b top-c main &&
+	 (cd sub && git checkout sub-c) &&
+	 git add sub &&
+	 git commit -m c &&
+	 git checkout -b top-bc top-b &&
+	 git merge -s ours --no-commit top-c &&
+	 (cd sub && git checkout sub-bc) &&
+	 git add sub &&
+	 git commit -m bc &&
+	 git checkout -b top-cb top-c &&
+	 git merge -s ours --no-commit top-b &&
+	 (cd sub && git checkout sub-cb) &&
+	 git add sub &&
+	 git commit -m cb)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-recursive/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/merge-recursive/sub/.git/
+[main (root-commit) 9d932ab] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main2.t
-[master 75daec8] main3
+ create mode 100644 a.t
+Switched to a new branch 'sub-b'
+[sub-b 8b32189] b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 main3.t
-Switched to a new branch 'side'
-[side 2e812aa] side2
+ create mode 100644 b.t
+Switched to a new branch 'sub-c'
+[sub-c 7d3d4d8] c
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 side2.t
-[side 42b83a8] side3
- Author: A U Thor <author@example.com>
+ create mode 100644 c.t
+Switched to a new branch 'sub-bc'
+Merge made by the 'ort' strategy.
+ c.t | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 side3.t
+ create mode 100644 c.t
+Switched to a new branch 'sub-cb'
 Merge made by the 'ort' strategy.
- main2.t | 1 +
- main3.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 main2.t
- create mode 100644 main3.t
-ok 3 - set up a bit of history
-
-expecting success of 7007.4 'showing two commits': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main2)
-	commit $(git rev-parse main3)
-	EOF
-	git show main2 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 4 - showing two commits
-
-expecting success of 7007.5 'showing a tree': 
-	cat >expected <<-EOF &&
-	tree main1:
-
-	main1.t
-	EOF
-	git show main1: >actual &&
-	test_cmp expected actual
-
-ok 5 - showing a tree
-
-expecting success of 7007.6 'showing two trees': 
-	cat >expected <<-EOF &&
-	tree main1^{tree}
-
-	main1.t
-
-	tree main2^{tree}
-
-	main1.t
-	main2.t
-	EOF
-	git show main1^{tree} main2^{tree} >actual &&
-	test_cmp expected actual
-
-ok 6 - showing two trees
-
-expecting success of 7007.7 'showing a trees is not recursive': 
-	git worktree add not-recursive main1 &&
-	mkdir not-recursive/a &&
-	test_commit -C not-recursive a/file &&
-	cat >expected <<-EOF &&
-	tree HEAD^{tree}
-
-	a/
-	main1.t
-	EOF
-	git -C not-recursive show HEAD^{tree} >actual &&
-	test_cmp expected actual
-
-Preparing worktree (detached HEAD 9ca29bf)
-HEAD is now at 9ca29bf main1
-[detached HEAD 2da4daa] a/file
+ b.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+Switched to branch 'main'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[main (root-commit) a2ff72f] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a/file.t
-ok 7 - showing a trees is not recursive
-
-expecting success of 7007.8 'showing a range walks (linear)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show main1..main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 8 - showing a range walks (linear)
-
-expecting success of 7007.9 'showing a range walks (Y shape, ^ first)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show ^side3 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 9 - showing a range walks (Y shape, ^ first)
-
-expecting success of 7007.10 'showing a range walks (Y shape, ^ last)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show main3 ^side3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 10 - showing a range walks (Y shape, ^ last)
-
-expecting success of 7007.11 'showing with -N walks': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show -2 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 11 - showing with -N walks
-
-expecting success of 7007.12 'showing annotated tag': 
-	cat >expect <<-EOF &&
-	tag annotated
-	commit $(git rev-parse annotated^{commit})
-	EOF
-	git show annotated >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 12 - showing annotated tag
-
-expecting success of 7007.13 'showing annotated tag plus commit': 
-	cat >expect <<-EOF &&
-	tag annotated
-	commit $(git rev-parse annotated^{commit})
-	commit $(git rev-parse side3)
-	EOF
-	git show annotated side3 >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 13 - showing annotated tag plus commit
-
-expecting success of 7007.14 'showing range': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show ^side3 annotated >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 14 - showing range
-
-expecting success of 7007.15 '-s suppresses diff': 
-	cat >expect <<-\EOF &&
-	merge
-	main3
-	EOF
-	git show -s --format=%s merge main3 >actual &&
-	test_cmp expect actual
-
-ok 15 - -s suppresses diff
-
-expecting success of 7007.16 '--quiet suppresses diff': 
-	echo main3 >expect &&
-	git show --quiet --format=%s main3 >actual &&
-	test_cmp expect actual
-
-ok 16 - --quiet suppresses diff
-
-expecting success of 7007.17 'show --graph is forbidden': 
-  test_must_fail git show --graph HEAD
-
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 17 - show --graph is forbidden
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7002-mv-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7002-mv-sparse-checkout/.git/
-expecting success of 7002.1 'setup': 
-	mkdir -p sub/dir sub/dir2 &&
-	touch a b c sub/d sub/dir/e sub/dir2/e &&
-	git add -A &&
-	git commit -m files &&
-
-	cat >sparse_error_header <<-EOF &&
-	The following paths and/or pathspecs matched paths that exist
-	outside of your sparse-checkout definition, so will not be
-	updated in the index:
-	EOF
-
-	cat >sparse_hint <<-EOF &&
-	hint: If you intend to update such entries, try one of the following:
-	hint: * Use the --sparse option.
-	hint: * Disable or modify the sparsity rules.
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
-
-	cat >dirty_error_header <<-EOF &&
-	The following paths have been moved outside the
-	sparse-checkout definition but are not sparse due to local
-	modifications.
-	EOF
-
-	cat >dirty_hint <<-EOF
-	hint: To correct the sparsity of these paths, do the following:
-	hint: * Use "git add --sparse <paths>" to update the index
-	hint: * Use "git sparse-checkout reapply" to apply the sparsity rules
-	hint: Disable this message with "git config set advice.updateSparsePath false"
-	EOF
-
-[master (root-commit) 127a813] files
+ create mode 160000 sub
+Switched to a new branch 'top-b'
+Switched to branch 'sub-b'
+[top-b f6b4d5a] b
  Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
- create mode 100644 b
- create mode 100644 c
- create mode 100644 sub/d
- create mode 100644 sub/dir/e
- create mode 100644 sub/dir2/e
-ok 1 - setup
-
-expecting success of 7002.2 'mv refuses to move sparse-to-sparse': 
-	test_when_finished rm -f e &&
-	git reset --hard &&
-	git sparse-checkout set --no-cone a &&
-	touch b &&
-	test_must_fail git mv b e 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 2 - mv refuses to move sparse-to-sparse
-
-expecting success of 7002.3 'mv refuses to move sparse-to-sparse, ignores failure': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a &&
-
-	# tracked-to-untracked
-	touch b &&
-	git mv -k b e 2>stderr &&
-	test_path_exists b &&
-	test_path_is_missing e &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b &&
-	test_path_exists e &&
-
-	# tracked-to-tracked
-	git reset --hard &&
-	touch b &&
-	git mv -k b c 2>stderr &&
-	test_path_exists b &&
-	test_path_is_missing c &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	echo c >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-
-	git mv --sparse b c 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing b &&
-	test_path_exists c
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-error: Path 'e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 3 - mv refuses to move sparse-to-sparse, ignores failure
-
-expecting success of 7002.4 'mv refuses to move non-sparse-to-sparse': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a &&
-
-	# tracked-to-untracked
-	test_must_fail git mv a e 2>stderr &&
-	test_path_exists a &&
-	test_path_is_missing e &&
-	cat sparse_error_header >expect &&
-	echo e >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse a e 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing a &&
-	test_path_exists e &&
-
-	# tracked-to-tracked
-	rm e &&
-	git reset --hard &&
-	test_must_fail git mv a c 2>stderr &&
-	test_path_exists a &&
-	test_path_is_missing c &&
-	cat sparse_error_header >expect &&
-	echo c >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse a c 2>stderr &&
-	test_must_be_empty stderr &&
-	test_path_is_missing a &&
-	test_path_exists c
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-HEAD is now at 127a813 files
-ok 4 - mv refuses to move non-sparse-to-sparse
-
-expecting success of 7002.5 'mv refuses to move sparse-to-non-sparse': 
-	test_when_finished rm -f b c e &&
-	git reset --hard &&
-	git sparse-checkout set a e &&
-
-	# tracked-to-untracked
-	touch b &&
-	test_must_fail git mv b e 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo b >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse b e 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 5 - mv refuses to move sparse-to-non-sparse
-
-expecting success of 7002.6 'recursive mv refuses to move (possible) sparse': 
-	test_when_finished rm -rf b c e sub2 &&
-	git reset --hard &&
-	# Without cone mode, "sub" and "sub2" do not match
-	git sparse-checkout set sub/dir sub2/dir &&
-
-	# Add contained contents to ensure we avoid non-existence errors
-	mkdir sub/dir2 &&
-	touch sub/d sub/dir2/e &&
-
-	test_must_fail git mv sub sub2 2>stderr &&
-	cat sparse_error_header >expect &&
-	cat >>expect <<-\EOF &&
-	sub/d
-	sub2/d
-	sub/dir2/e
-	sub2/dir2/e
-	EOF
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse sub sub2 2>stderr &&
-	test_must_be_empty stderr &&
-	git commit -m "moved sub to sub2" &&
-	git rev-parse HEAD~1:sub >expect &&
-	git rev-parse HEAD:sub2 >actual &&
-	test_cmp expect actual &&
-	git reset --hard HEAD~1
-
-HEAD is now at 127a813 files
-[master 361f042] moved sub to sub2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'top-c'
+M	sub
+Switched to branch 'sub-c'
+[top-c 4d9cfab] c
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {sub => sub2}/d (100%)
- rename {sub => sub2}/dir/e (100%)
- rename {sub => sub2}/dir2/e (100%)
-error: Path 'sub2/d' not uptodate; will not remove from working tree.
-error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 6 - recursive mv refuses to move (possible) sparse
-
-expecting success of 7002.7 'recursive mv refuses to move sparse': 
-	git reset --hard &&
-	# Use cone mode so "sub/" matches the sparse-checkout patterns
-	git sparse-checkout init --cone &&
-	git sparse-checkout set sub/dir sub2/dir &&
-
-	# Add contained contents to ensure we avoid non-existence errors
-	mkdir sub/dir2 &&
-	touch sub/dir2/e &&
-
-	test_must_fail git mv sub sub2 2>stderr &&
-	cat sparse_error_header >expect &&
-	cat >>expect <<-\EOF &&
-	sub/dir2/e
-	sub2/dir2/e
-	EOF
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
-	git mv --sparse sub sub2 2>stderr &&
-	test_must_be_empty stderr &&
-	git commit -m "moved sub to sub2" &&
-	git rev-parse HEAD~1:sub >expect &&
-	git rev-parse HEAD:sub2 >actual &&
-	test_cmp expect actual &&
-	git reset --hard HEAD~1
-
-HEAD is now at 127a813 files
-warning: unrecognized pattern: 'sub/dir'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'sub/dir'
-warning: disabling cone pattern matching
-[master 361f042] moved sub to sub2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'top-bc'
+M	sub
+Automatic merge went well; stopped before committing as requested
+Switched to branch 'sub-bc'
+[top-bc ff9bd9b] bc
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {sub => sub2}/d (100%)
- rename {sub => sub2}/dir/e (100%)
- rename {sub => sub2}/dir2/e (100%)
-error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
-HEAD is now at 127a813 files
-ok 7 - recursive mv refuses to move sparse
-
-expecting success of 7002.8 'can move files to non-sparse dir': 
-	git reset --hard &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a b c w !/x y/ &&
-	mkdir -p w x/y &&
-
-	git mv a w/new-a 2>stderr &&
-	git mv b x/y/new-b 2>stderr &&
-	test_must_be_empty stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: pass a leading slash before paths such as 'b' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: pass a leading slash before paths such as 'c' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-ok 8 - can move files to non-sparse dir
-
-expecting success of 7002.9 'refuse to move file to non-skip-worktree sparse path': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	git reset --hard &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set a !/x y/ !x/y/z &&
-	mkdir -p x/y/z &&
-
-	test_must_fail git mv a x/y/z/new-a 2>stderr &&
-	echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-HEAD is now at 127a813 files
-ok 9 - refuse to move file to non-skip-worktree sparse path
-
-expecting success of 7002.10 'refuse to move out-of-cone directory without --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-
-	test_must_fail git mv folder1 sub 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo folder1/file1 >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr
-
-HEAD is now at 127a813 files
-ok 10 - refuse to move out-of-cone directory without --sparse
-
-expecting success of 7002.11 'can move out-of-cone directory with --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
+Switched to a new branch 'top-cb'
+M	sub
+Automatic merge went well; stopped before committing as requested
+Switched to branch 'sub-cb'
+[top-cb a0ac63b] cb
+ Author: A U Thor <author@example.com>
+ok 12 - setup for recursive merge with submodule
 
-	git mv --sparse folder1 sub 2>stderr &&
-	test_must_be_empty stderr &&
+expecting success of 6437.13 'recursive merge with submodule': 
+	(cd merge-recursive &&
+	 test_must_fail git merge top-bc &&
+	 echo "160000 $(git rev-parse top-cb:sub) 2	sub" > expect2 &&
+	 echo "160000 $(git rev-parse top-bc:sub) 3	sub" > expect3 &&
+	 git ls-files -u > actual &&
+	 grep "$(cat expect2)" actual > /dev/null &&
+	 grep "$(cat expect3)" actual > /dev/null)
 
-	test_path_is_dir sub/folder1 &&
-	test_path_is_file sub/folder1/file1
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (sub), and either merge commit 8060496
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add sub
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+  From inner merge:  CONFLICT (submodule): Merge conflict in sub
+Failed to merge submodule sub
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - recursive merge with submodule
 
-HEAD is now at 127a813 files
-ok 11 - can move out-of-cone directory with --sparse
+expecting success of 6437.14 'setup file/submodule conflict': 
+	git init file-submodule &&
+	(
+		cd file-submodule &&
 
-expecting success of 7002.12 'refuse to move out-of-cone file without --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
+		git commit --allow-empty -m O &&
 
-	test_must_fail git mv folder1/file1 sub 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo folder1/file1 >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr
+		git branch A &&
+		git branch B &&
 
-HEAD is now at 127a813 files
-ok 12 - refuse to move out-of-cone file without --sparse
+		git checkout B &&
+		echo content >path &&
+		git add path &&
+		git commit -m B &&
 
-expecting success of 7002.13 'can move out-of-cone file with --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
+		git checkout A &&
+		git init path &&
+		test_commit -C path world &&
+		git submodule add ./path &&
+		git commit -m A
+	)
 
-	git mv --sparse folder1/file1 sub 2>stderr &&
-	test_must_be_empty stderr &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/file-submodule/.git/
+[main (root-commit) f09f54e] O
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B 208816f] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path
+Switched to branch 'A'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/file-submodule/path/.git/
+[main (root-commit) 26692a7] world
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world.t
+Adding existing repo at 'path' to the index
+[A 85fc078] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 path
+ok 14 - setup file/submodule conflict
 
-	test_path_is_file sub/file1
+expecting success of 6437.15 'file/submodule conflict': 
+	test_when_finished "git -C file-submodule reset --hard" &&
+	(
+		cd file-submodule &&
 
-HEAD is now at 127a813 files
-ok 13 - can move out-of-cone file with --sparse
+		git checkout A^0 &&
+		test_must_fail git merge B^0 &&
 
-expecting success of 7002.14 'refuse to move sparse file to existing destination': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir folder1 &&
-	touch folder1/file1 &&
-	touch sub/file1 &&
-	git add folder1 sub/file1 &&
-	git sparse-checkout set --cone sub &&
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
 
-	test_must_fail git mv --sparse folder1/file1 sub 2>stderr &&
-	echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect &&
-	test_cmp expect stderr
+		# path/ is still a submodule
+		test_path_is_dir path/.git &&
 
-HEAD is now at 127a813 files
-ok 14 - refuse to move sparse file to existing destination
+		# There is a submodule at "path", so B:path cannot be written
+		# there.  We expect it to be written somewhere in the same
+		# directory, though, so just grep for its content in all
+		# files, and ignore "grep: path: Is a directory" message
+		echo Checking if contents from B:path showed up anywhere &&
+		grep -q content * 2>/dev/null
+	)
 
-expecting success of 7002.15 'move sparse file to existing destination with --force and --sparse': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir folder1 &&
-	touch folder1/file1 &&
-	touch sub/file1 &&
-	echo "overwrite" >folder1/file1 &&
-	git add folder1 sub/file1 &&
-	git sparse-checkout set --cone sub &&
+Note: switching to 'A^0'.
 
-	git mv --sparse --force folder1/file1 sub 2>stderr &&
-	test_must_be_empty stderr &&
-	echo "overwrite" >expect &&
-	test_cmp expect sub/file1
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-HEAD is now at 127a813 files
-ok 15 - move sparse file to existing destination with --force and --sparse
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7002.16 'move clean path from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
+  git switch -c <new-branch-name>
 
-	test_must_fail git mv sub/d folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+Or undo this operation with:
 
-	git mv --sparse sub/d folder1 2>stderr &&
-	test_must_be_empty stderr &&
+  git switch -
 
-	test_path_is_missing sub/d &&
-	test_path_is_missing folder1/d &&
-	git ls-files -t >actual &&
-	! grep "^H sub/d\$" actual &&
-	grep "S folder1/d" actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-S folder1/d
-HEAD is now at 127a813 files
-ok 16 - move clean path from in-cone to out-of-cone
+HEAD is now at 85fc078 A
+CONFLICT (distinct types): path had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+Checking if contents from B:path showed up anywhere
+HEAD is now at 85fc078 A
+ok 15 - file/submodule conflict
 
-expecting success of 7002.17 'move clean path from in-cone to out-of-cone overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "sub/file1 overwrite" >sub/file1 &&
-	git add sub/file1 &&
+expecting success of 6437.16 'file/submodule conflict; merge --abort works afterward': 
+	test_when_finished "git -C file-submodule reset --hard" &&
+	(
+		cd file-submodule &&
 
-	test_must_fail git mv sub/file1 folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+		git checkout A^0 &&
+		test_must_fail git merge B^0 >out 2>err &&
 
-	test_must_fail git mv --sparse sub/file1 folder1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
-	>expect &&
-	test_cmp expect stderr &&
+		test_path_is_file .git/MERGE_HEAD &&
+		git merge --abort
+	)
 
-	git mv --sparse -f sub/file1 folder1 2>stderr &&
-	test_must_be_empty stderr &&
+HEAD is now at 85fc078 A
+HEAD is now at 85fc078 A
+ok 16 - file/submodule conflict; merge --abort works afterward
 
-	test_path_is_missing sub/file1 &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/file1" actual &&
-	grep "S folder1/file1" actual &&
+expecting success of 6437.17 'setup directory/submodule conflict': 
+	git init directory-submodule &&
+	(
+		cd directory-submodule &&
 
-	# compare file content before move and after move
-	echo "sub/file1 overwrite" >expect &&
-	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
+		git commit --allow-empty -m O &&
 
-S folder1/file1
-HEAD is now at 127a813 files
-ok 17 - move clean path from in-cone to out-of-cone overwrite
+		git branch A &&
+		git branch B1 &&
+		git branch B2 &&
 
-expecting success of 7002.18 'move clean path from in-cone to out-of-cone file overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "sub/file1 overwrite" >sub/file1 &&
-	git add sub/file1 &&
+		git checkout B1 &&
+		mkdir path &&
+		echo contents >path/file &&
+		git add path/file &&
+		git commit -m B1 &&
 
-	test_must_fail git mv sub/file1 folder1/file1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+		git checkout B2 &&
+		mkdir path &&
+		echo contents >path/world &&
+		git add path/world &&
+		git commit -m B2 &&
 
-	test_must_fail git mv --sparse sub/file1 folder1/file1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
-	>expect &&
-	test_cmp expect stderr &&
+		git checkout A &&
+		git init path &&
+		test_commit -C path hello world &&
+		git submodule add ./path &&
+		git commit -m A
+	)
 
-	git mv --sparse -f sub/file1 folder1/file1 2>stderr &&
-	test_must_be_empty stderr &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/directory-submodule/.git/
+[main (root-commit) f09f54e] O
+ Author: A U Thor <author@example.com>
+Switched to branch 'B1'
+[B1 8ab0f0c] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path/file
+Switched to branch 'B2'
+[B2 db2a533] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 path/world
+Switched to branch 'A'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/directory-submodule/path/.git/
+[main (root-commit) 2605480] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 world
+Adding existing repo at 'path' to the index
+[A 90b0bac] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 path
+ok 17 - setup directory/submodule conflict
 
-	test_path_is_missing sub/file1 &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/file1" actual &&
-	grep "S folder1/file1" actual &&
+checking known breakage of 6437.18 'directory/submodule conflict; keep submodule clean': 
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
 
-	# compare file content before move and after move
-	echo "sub/file1 overwrite" >expect &&
-	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
+		git checkout A^0 &&
+		test_must_fail git merge B1^0 &&
 
-S folder1/file1
-HEAD is now at 127a813 files
-ok 18 - move clean path from in-cone to out-of-cone file overwrite
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
 
-expecting success of 7002.19 'move directory with one of the files overwrite': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	mkdir -p folder1/dir &&
-	touch folder1/dir/file1 &&
-	git add folder1 &&
-	git sparse-checkout set --cone sub &&
+		# path/ is still a submodule
+		test_path_is_dir path/.git &&
 
-	echo test >sub/dir/file1 &&
-	git add sub/dir/file1 &&
+		echo Checking if contents from B1:path/file showed up &&
+		# Would rather use grep -r, but that is GNU extension...
+		git ls-files -co | xargs grep -q contents 2>/dev/null &&
 
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	echo "folder1/dir/file1" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+		# However, B1:path/file should NOT have shown up at path/file,
+		# because we should not write into the submodule
+		test_path_is_missing path/file
+	)
 
-	test_must_fail git mv --sparse sub/dir folder1 2>stderr &&
-	echo "fatal: destination exists in the index, source=sub/dir/file1, destination=folder1/dir/file1" \
-	>expect &&
-	test_cmp expect stderr &&
+Note: switching to 'A^0'.
 
-	git mv --sparse -f sub/dir folder1 2>stderr &&
-	test_must_be_empty stderr &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	test_path_is_missing sub/dir/file1 &&
-	test_path_is_missing sub/dir/e &&
-	test_path_is_missing folder1/file1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/file1" actual &&
-	! grep "H sub/dir/e" actual &&
-	grep "S folder1/dir/file1" actual &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# compare file content before move and after move
-	echo test >expect &&
-	git ls-files -s -- folder1/dir/file1 | awk "{print \$2}" >oid &&
-	git cat-file blob $(cat oid) >actual &&
-	test_cmp expect actual
+  git switch -c <new-branch-name>
 
-S folder1/dir/file1
-HEAD is now at 127a813 files
-ok 19 - move directory with one of the files overwrite
+Or undo this operation with:
 
-expecting success of 7002.20 'move dirty path from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	echo "modified" >>sub/d &&
+  git switch -
 
-	test_must_fail git mv sub/d folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	git mv --sparse sub/d folder1 2>stderr &&
-	cat dirty_error_header >expect &&
-	echo "folder1/d" >>expect &&
-	cat dirty_hint >>expect &&
-	test_cmp expect stderr &&
+HEAD is now at 90b0bac A
+warning: unable to rmdir 'path': Directory not empty
+CONFLICT (file/directory): directory in the way of path from HEAD; moving it to path~HEAD instead.
+Automatic merge failed; fix conflicts and then commit the result.
+Checking if contents from B1:path/file showed up
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 9 Mar 17 13:26 path/file
+HEAD is now at 90b0bac A
+not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
 
-	test_path_is_missing sub/d &&
-	test_path_is_file folder1/d &&
-	git ls-files -t >actual &&
-	! grep "^H sub/d\$" actual &&
-	grep "H folder1/d" actual
+checking prerequisite: FAIL_PREREQS
 
-H folder1/d
-HEAD is now at 127a813 files
-ok 20 - move dirty path from in-cone to out-of-cone
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+		test_bool_env GIT_TEST_FAIL_PREREQS false
+	
+)
+prerequisite FAIL_PREREQS not satisfied
+expecting success of 6437.19 'directory/submodule conflict; should not treat submodule files as untracked or in the way': 
+	test_when_finished "git -C directory-submodule/path reset --hard" &&
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
 
-expecting success of 7002.21 'move dir from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	mkdir sub/dir/deep &&
+		git checkout A^0 &&
+		test_must_fail git merge B2^0 >out 2>err &&
 
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+		# We do not want files within the submodule to prevent the
+		# merge from starting; we should not be writing to such paths
+		# anyway.
+		test_grep ! "refusing to lose untracked file at" err
+	)
 
-	git mv --sparse sub/dir folder1 2>stderr &&
-	test_must_be_empty stderr &&
+HEAD is now at 90b0bac A
+HEAD is now at 90b0bac A
+HEAD is now at 2605480 hello
+ok 19 - directory/submodule conflict; should not treat submodule files as untracked or in the way
 
-	test_path_is_missing sub/dir &&
-	test_path_is_missing folder1 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/e" actual &&
-	grep "S folder1/dir/e" actual
+checking known breakage of 6437.20 'directory/submodule conflict; merge --abort works afterward': 
+	test_when_finished "git -C directory-submodule/path reset --hard" &&
+	test_when_finished "git -C directory-submodule reset --hard" &&
+	(
+		cd directory-submodule &&
 
-S folder1/dir/e
-HEAD is now at 127a813 files
-ok 21 - move dir from in-cone to out-of-cone
+		git checkout A^0 &&
+		test_must_fail git merge B2^0 &&
+		test_path_is_file .git/MERGE_HEAD &&
 
-expecting success of 7002.22 'move partially-dirty dir from in-cone to out-of-cone': 
-	test_when_finished "cleanup_sparse_checkout" &&
-	setup_sparse_checkout &&
-	mkdir sub/dir/deep &&
-	touch sub/dir/e2 sub/dir/e3 &&
-	git add sub/dir/e2 sub/dir/e3 &&
-	echo "modified" >>sub/dir/e2 &&
-	echo "modified" >>sub/dir/e3 &&
+		# merge --abort should succeed, should clear .git/MERGE_HEAD,
+		# and should not leave behind any conflicted files
+		git merge --abort &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-	test_must_fail git mv sub/dir folder1 2>stderr &&
-	cat sparse_error_header >expect &&
-	echo "folder1/dir/e" >>expect &&
-	echo "folder1/dir/e2" >>expect &&
-	echo "folder1/dir/e3" >>expect &&
-	cat sparse_hint >>expect &&
-	test_cmp expect stderr &&
+HEAD is now at 90b0bac A
+error: The following untracked working tree files would be overwritten by merge:
+	path/world
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+File .git/MERGE_HEAD doesn't exist
+HEAD is now at 90b0bac A
+HEAD is now at 2605480 hello
+not ok 20 - directory/submodule conflict; merge --abort works afterward # TODO known breakage
 
-	git mv --sparse sub/dir folder1 2>stderr &&
-	cat dirty_error_header >expect &&
-	echo "folder1/dir/e2" >>expect &&
-	echo "folder1/dir/e3" >>expect &&
-	cat dirty_hint >>expect &&
-	test_cmp expect stderr &&
+expecting success of 6437.21 'setup for null merge base': 
+	mkdir no-merge-base &&
+	(cd no-merge-base &&
+	git init &&
+	mkdir sub &&
+	(cd sub &&
+	 git init &&
+	 echo "file-a" > file-a &&
+	 git add file-a &&
+	 git commit -m "commit a") &&
+	git commit --allow-empty -m init &&
+	git branch init &&
+	git checkout -b a init &&
+	git add sub &&
+	git commit -m "a" &&
+	git switch main &&
+	(cd sub &&
+	 echo "file-b" > file-b &&
+	 git add file-b &&
+	 git commit -m "commit b"))
 
-	test_path_is_missing sub/dir &&
-	test_path_is_missing folder1/dir/e &&
-	test_path_is_file folder1/dir/e2 &&
-	test_path_is_file folder1/dir/e3 &&
-	git ls-files -t >actual &&
-	! grep "H sub/dir/e" actual &&
-	! grep "H sub/dir/e2" actual &&
-	! grep "H sub/dir/e3" actual &&
-	grep "S folder1/dir/e" actual &&
-	grep "H folder1/dir/e2" actual &&
-	grep "H folder1/dir/e3" actual
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/no-merge-base/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6437-submodule-merge/no-merge-base/sub/.git/
+[main (root-commit) d61d855] commit a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-a
+[main (root-commit) edb5fba] init
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'a'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[a 8b6337e] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+warning: unable to rmdir 'sub': Directory not empty
+Switched to branch 'main'
+[main dc37965] commit b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-b
+ok 21 - setup for null merge base
 
-S folder1/dir/e
-H folder1/dir/e2
-H folder1/dir/e3
-HEAD is now at 127a813 files
-ok 22 - move partially-dirty dir from in-cone to out-of-cone
+expecting success of 6437.22 'merging should fail with no merge base': 
+	(cd no-merge-base &&
+	git checkout -b b init &&
+	git add sub &&
+	git commit -m "b" &&
+	test_must_fail git merge a 2>actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
+		grep "$sub_expect" actual
+	fi)
 
-# passed all 22 test(s)
+Switched to a new branch 'b'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[b 5e75592] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Failed to merge submodule sub (no merge base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit d61d855
+ok 22 - merging should fail with no merge base
+
+# still have 2 known breakage(s)
+# passed all remaining 20 test(s)
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -443670,367 +442123,758 @@
 1..68
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7010-setup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/.git/
-expecting success of 7010.1 'setup': 
+*** t6423-merge-rename-directories.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/.git/
+expecting success of 6423.1 '1a: Simple directory rename detection': 
+	test_setup_1a &&
+	(
+		cd 1a &&
 
-	mkdir -p a/b/c a/e &&
-	D=$(pwd) &&
-	>a/b/c/d &&
-	>a/e/f
+		git checkout A^0 &&
 
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 
-ok 1 - setup
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-expecting success of 7010.2 'git add (absolute)': 
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d    B:z/e/f &&
+		test_cmp expect actual &&
 
-	git add "$D/a/b/c/d" &&
-	git ls-files >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+		git hash-object y/d >actual &&
+		git rev-parse B:z/d >expect &&
+		test_cmp expect actual &&
 
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_must_fail git rev-parse HEAD:z/e/f &&
+		test_path_is_missing z/d &&
+		test_path_is_missing z/e/f
+	)
 
-ok 2 - git add (absolute)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+Note: switching to 'A^0'.
 
-expecting success of 7010.3 'git add (funny relative)': 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	rm -f .git/index &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 4e9f86d A
+fatal: path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+fatal: path 'z/e/f' does not exist in 'HEAD'
+HEAD:z/e/f
+ok 1 - 1a: Simple directory rename detection
+
+expecting success of 6423.2 '1b: Merge a directory with another': 
+	test_setup_1b &&
 	(
-		cd a/b &&
-		git add "../e/./f"
-	) &&
-	git ls-files >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+		cd 1b &&
 
+		git checkout A^0 &&
 
-ok 3 - git add (funny relative)
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7010.4 'git rm (absolute)': 
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-	rm -f .git/index &&
-	git add a &&
-	git rm -f --cached "$D/a/b/c/d" &&
-	git ls-files >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:y/d    A:z/e &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/e
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1b/.git/
+[master (root-commit) 828128d] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 62cf902] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/e
+Switched to branch 'B'
+[B 2a8bd7d] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
 
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-rm 'a/b/c/d'
-ok 4 - git rm (absolute)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7010.5 'git rm (funny relative)': 
+  git switch -c <new-branch-name>
 
-	rm -f .git/index &&
-	git add a &&
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 62cf902 A
+Path updated: z/e added in HEAD inside a directory that was renamed in B^0; moving it to y/e.
+Merge made by the 'ort' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ {z => y}/e | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/e (100%)
+fatal: path 'z/e' does not exist in 'HEAD'
+HEAD:z/e
+ok 2 - 1b: Merge a directory with another
+
+expecting success of 6423.3 '1c: Transitive renaming': 
+	test_setup_1c &&
 	(
-		cd a/b &&
-		git rm -f --cached "../e/./f"
-	) &&
-	git ls-files >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+		cd 1c &&
 
+		git checkout A^0 &&
 
-rm 'a/e/f'
-ok 5 - git rm (funny relative)
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 
-expecting success of 7010.6 'git ls-files (absolute)': 
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
-	rm -f .git/index &&
-	git add a &&
-	git ls-files "$D/a/e/../b" >current &&
-	echo a/b/c/d >expect &&
-	test_cmp expect current
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d
+	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1c/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 623f815] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-ok 6 - git ls-files (absolute)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7010.7 'git ls-files (relative #1)': 
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	rm -f .git/index &&
-	git add a &&
-	(
-		cd a/b &&
-		git ls-files "../b/c"
-	)  >current &&
-	echo c/d >expect &&
-	test_cmp expect current
+  git switch -c <new-branch-name>
 
+Or undo this operation with:
 
-ok 7 - git ls-files (relative #1)
+  git switch -
 
-expecting success of 7010.8 'git ls-files (relative #2)': 
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	rm -f .git/index &&
-	git add a &&
+HEAD is now at 623f815 A
+fatal: path 'x/d' does not exist in 'HEAD'
+HEAD:x/d
+fatal: path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 3 - 1c: Transitive renaming
+
+expecting success of 6423.4 '1d: Directory renames cause a rename/rename(2to1) conflict': 
+	test_setup_1d &&
 	(
-		cd a/b &&
-		git ls-files --full-name "../e/f"
-	)  >current &&
-	echo a/e/f >expect &&
-	test_cmp expect current
+		cd 1d &&
 
+		git checkout A^0 &&
 
-ok 8 - git ls-files (relative #2)
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (\(.*\)/\1)" out &&
 
-expecting success of 7010.9 'git ls-files (relative #3)': 
+		git ls-files -s >out &&
+		test_line_count = 8 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-	rm -f .git/index &&
-	git add a &&
+		git rev-parse >actual \
+			:0:x/b :0:x/c :0:x/d :0:x/e :0:x/m :0:x/n &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  O:y/e  A:y/m  B:z/n &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :0:x/wham &&
+		git rev-parse >actual \
+			:2:x/wham :3:x/wham &&
+		git rev-parse >expect \
+			 A:y/wham  B:z/wham &&
+		test_cmp expect actual &&
+
+		# Test that the two-way merge in x/wham is as expected
+		git cat-file -p :2:x/wham >expect &&
+		git cat-file -p :3:x/wham >other &&
+		>empty &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git merge-file \
+				-L "HEAD:y/wham" \
+				-L "" \
+				-L "B^0:z/wham" \
+				expect empty other
+		else
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other
+		fi &&
+		test_cmp expect x/wham
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1d/.git/
+[master (root-commit) a5c945e] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 y/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A e0494ce] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {z => x}/b (100%)
+ rename {z => x}/c (100%)
+ create mode 100644 y/m
+ create mode 100644 y/wham
+Switched to branch 'B'
+[B 7f8e93c] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {y => x}/d (100%)
+ rename {y => x}/e (100%)
+ create mode 100644 z/n
+ create mode 100644 z/wham
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e0494ce A
+CONFLICT (add/add): Merge conflict in x/wham
+fatal: path 'x/wham' is in the index, but not at stage 0
+hint: Did you mean ':2:x/wham'?
+:0:x/wham
+ok 4 - 1d: Directory renames cause a rename/rename(2to1) conflict
+
+expecting success of 6423.5 '1e: Renamed directory, with all files being renamed too': 
+	test_setup_1e &&
 	(
-		cd a/b &&
-		git ls-files "../e/f"
-	)  >current &&
-	echo ../e/f >expect &&
-	test_cmp expect current
+		cd 1e &&
 
+		git checkout A^0 &&
 
-ok 9 - git ls-files (relative #3)
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7010.10 'commit using absolute path names': 
-	git commit -m "foo" &&
-	echo aa >>a/b/c/d &&
-	git commit -m "aa" "$(pwd)/a/b/c/d"
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
-[master (root-commit) 2d7d991] foo
+		git rev-parse >actual \
+			HEAD:y/newb HEAD:y/newc HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/oldb    O:z/oldc    B:z/d &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:z/d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1e/.git/
+[master (root-commit) a0c453d] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/oldb
+ create mode 100644 z/oldc
+Switched to branch 'A'
+[A e7f73d0] A
  Author: A U Thor <author@example.com>
  2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b/c/d
- create mode 100644 a/e/f
-[master 2049ba0] aa
+ rename z/oldb => y/newb (100%)
+ rename z/oldc => y/newc (100%)
+Switched to branch 'B'
+[B b36bf99] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 10 - commit using absolute path names
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-expecting success of 7010.11 'log using absolute path names': 
-	echo bb >>a/b/c/d &&
-	git commit -m "bb" "$(pwd)/a/b/c/d" &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git log a/b/c/d >f1.txt &&
-	git log "$(pwd)/a/b/c/d" >f2.txt &&
-	test_cmp f1.txt f2.txt
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[master 8d92247] bb
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e7f73d0 A
+Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
+Merge made by the 'ort' strategy.
+ y/d | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/d
+fatal: path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 5 - 1e: Renamed directory, with all files being renamed too
+
+expecting success of 6423.6 '1f: Split a directory into two other directories': 
+	test_setup_1f &&
+	(
+		cd 1f &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d HEAD:x/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    O:z/f    A:z/g &&
+		test_cmp expect actual &&
+		test_path_is_missing z/g &&
+		test_must_fail git rev-parse HEAD:z/g
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1f/.git/
+[master (root-commit) bc89ae6] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+ create mode 100644 z/e
+ create mode 100644 z/f
+Switched to branch 'A'
+[A d83c371] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 11 - log using absolute path names
+ create mode 100644 z/g
+Switched to branch 'B'
+[B 2106ef0] B
+ Author: A U Thor <author@example.com>
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => x}/e (100%)
+ rename {z => x}/f (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7010.12 'blame using absolute path names': 
-	git blame a/b/c/d >f1.txt &&
-	git blame "$(pwd)/a/b/c/d" >f2.txt &&
-	test_cmp f1.txt f2.txt
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 12 - blame using absolute path names
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7010.13 'setup deeper work tree': 
-	test_create_repo tester
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester/.git/
-ok 13 - setup deeper work tree
+Or undo this operation with:
 
-expecting success of 7010.14 'add a directory outside the work tree': (
-	cd tester &&
-	d1="$(cd .. && pwd)" &&
-	test_must_fail git add "$d1"
-)
-fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
-ok 14 - add a directory outside the work tree
+  git switch -
 
-expecting success of 7010.15 'add a file outside the work tree, nasty case 1': (
-	cd tester &&
-	f="$(pwd)x" &&
-	echo "$f" &&
-	touch "$f" &&
-	test_must_fail git add "$f"
-)
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx
-fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
-ok 15 - add a file outside the work tree, nasty case 1
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7010.16 'add a file outside the work tree, nasty case 2': (
-	cd tester &&
-	f="$(pwd | sed "s/.$//")x" &&
-	echo "$f" &&
-	touch "$f" &&
-	test_must_fail git add "$f"
-)
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex
-fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
-ok 16 - add a file outside the work tree, nasty case 2
+HEAD is now at d83c371 A
+Path updated: z/g added in HEAD inside a directory that was renamed in B^0; moving it to x/g.
+Merge made by the 'ort' strategy.
+ {z => x}/d | 0
+ {z => x}/e | 0
+ {z => x}/f | 0
+ {z => x}/g | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => x}/e (100%)
+ rename {z => x}/f (100%)
+ rename {z => x}/g (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+fatal: path 'z/g' does not exist in 'HEAD'
+HEAD:z/g
+ok 6 - 1f: Split a directory into two other directories
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7011-skip-worktree-reading/.git/
-expecting success of 7011.1 'setup': 
-	test_commit init &&
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t >result &&
-	test_cmp expect.skip result
+expecting success of 6423.7 '2a: Directory split into two on one side, with equal numbers of paths': 
+	test_setup_2a &&
+	(
+		cd 2a &&
 
-[master (root-commit) 2519212] init
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT.*directory rename split" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/2a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 6af9a4d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/c (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B db43152] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-expecting success of 7011.2 'update-index': 
-	setup_absent &&
-	git update-index 1 &&
-	test_absent
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 2 - update-index
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7011.3 'update-index': 
-	setup_dirty &&
-	git update-index 1 &&
-	test_dirty
+  git switch -c <new-branch-name>
 
-ok 3 - update-index
+Or undo this operation with:
 
-expecting success of 7011.4 'update-index --remove': 
-	setup_absent &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	test ! -f 1
+  git switch -
 
-ok 4 - update-index --remove
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7011.5 'update-index --remove': 
-	setup_dirty &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	echo dirty >expected &&
-	test_cmp expected 1
+HEAD is now at 6af9a4d A
+CONFLICT (directory rename split): Unclear where to rename z to; it was renamed to multiple other directories, with no destination getting a majority of the files.
+ok 7 - 2a: Directory split into two on one side, with equal numbers of paths
 
-ok 5 - update-index --remove
+expecting success of 6423.8 '2b: Directory split into two on one side, with equal numbers of paths': 
+	test_setup_2b &&
+	(
+		cd 2b &&
 
-expecting success of 7011.6 'ls-files --deleted': 
-	setup_absent &&
-	test -z "$(git ls-files -d)"
+		git checkout A^0 &&
 
-ok 6 - ls-files --deleted
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 
-expecting success of 7011.7 'ls-files --deleted': 
-	setup_dirty &&
-	test -z "$(git ls-files -d)"
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-ok 7 - ls-files --deleted
+		git rev-parse >actual \
+			:0:y/b :0:w/c :0:x/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:x/d &&
+		test_cmp expect actual &&
+		test_grep ! "CONFLICT.*directory rename split" out
+	)
 
-expecting success of 7011.8 'ls-files --modified': 
-	setup_absent &&
-	test -z "$(git ls-files -m)"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/2b/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 6af9a4d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/c (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B c2fe7fb] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x/d
+Note: switching to 'A^0'.
 
-ok 8 - ls-files --modified
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7011.9 'ls-files --modified': 
-	setup_dirty &&
-	test -z "$(git ls-files -m)"
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 9 - ls-files --modified
+  git switch -c <new-branch-name>
 
-expecting success of 7011.10 'diff-index does not examine skip-worktree absent entries': 
-	setup_absent &&
-	git diff-index HEAD -- 1 >result &&
-	test_cmp expected result
+Or undo this operation with:
 
-ok 10 - diff-index does not examine skip-worktree absent entries
+  git switch -
 
-expecting success of 7011.11 'diff-index does not examine skip-worktree dirty entries': 
-	setup_dirty &&
-	git diff-index HEAD -- 1 >result &&
-	test_cmp expected result
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 11 - diff-index does not examine skip-worktree dirty entries
+HEAD is now at 6af9a4d A
+ok 8 - 2b: Directory split into two on one side, with equal numbers of paths
 
-expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
-	setup_absent &&
-	test -z "$(git diff-files -- one)"
+expecting success of 6423.9 '3a: Avoid implicit rename if involved as source on other side': 
+	test_setup_3a &&
+	(
+		cd 3a &&
 
-ok 12 - diff-files does not examine skip-worktree absent entries
+		git checkout A^0 &&
 
-expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
-	setup_dirty &&
-	test -z "$(git diff-files -- one)"
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 13 - diff-files does not examine skip-worktree dirty entries
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
 
-expecting success of 7011.14 'commit on skip-worktree absent entries': 
-	git reset &&
-	setup_absent &&
-	test_must_fail git commit -m null 1
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d &&
+		test_cmp expect actual
+	)
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/3a/.git/
+[master (root-commit) 6c15033] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A 73b131e] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B d135340] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - commit on skip-worktree absent entries
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7011.15 'commit on skip-worktree dirty entries': 
-	git reset &&
-	setup_dirty &&
-	test_must_fail git commit -m null 1
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	1
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+  git switch -c <new-branch-name>
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 15 - commit on skip-worktree dirty entries
+Or undo this operation with:
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7012-skip-worktree-writing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7012-skip-worktree-writing/.git/
-expecting success of 7012.1 'setup': 
-	test_commit init &&
-	echo modified >> init.t &&
-	touch added &&
-	git add init.t added &&
-	git commit -m "modified and added" &&
-	git tag top
+  git switch -
 
-[master (root-commit) 2519212] init
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 73b131e A
+Merge made by the 'ort' strategy.
+ {z => x}/d | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 9 - 3a: Avoid implicit rename if involved as source on other side
+
+expecting success of 6423.10 '3b: Avoid implicit rename if involved as source on current side': 
+	test_setup_3b &&
+	(
+		cd 3b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
+		test_grep ! CONFLICT.*rename/rename.*y/d out &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:z/d :2:x/d :3:w/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:z/d  O:z/d  O:z/d &&
+		test_cmp expect actual &&
+
+		test_path_is_missing z/d &&
+		git hash-object >actual \
+			x/d   w/d &&
+		git rev-parse >expect \
+			O:z/d O:z/d &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/3b/.git/
+[master (root-commit) 6c15033] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master fa1ce8e] modified and added
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A 5eead67] A
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 added
-ok 1 - setup
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 464e387] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {z => w}/d (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7012.2 'read-tree updates worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	rm init.t &&
-	git read-tree -m -u HEAD^ &&
-	echo init > expected &&
-	test_cmp expected init.t
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Note: switching to 'top'.
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 5eead67 A
+CONFLICT (rename/rename): z/d renamed to x/d in HEAD and to w/d in B^0.
+ok 10 - 3b: Avoid implicit rename if involved as source on current side
+
+expecting success of 6423.11 '4a: Directory split, with original directory still present': 
+	test_setup_4a &&
+	(
+		cd 4a &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/e HEAD:z/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/4a/.git/
+[master (root-commit) 9e2ca6f] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+ create mode 100644 z/e
+Switched to branch 'A'
+[A 9c11b44] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/d (100%)
+Switched to branch 'B'
+[B aa71186] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/f
+Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -444047,2499 +442891,3975 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at fa1ce8e modified and added
-ok 2 - read-tree updates worktree, absent case
+HEAD is now at 9c11b44 A
+Merge made by the 'ort' strategy.
+ z/f | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z/f
+ok 11 - 4a: Directory split, with original directory still present
 
-expecting success of 7012.3 'read-tree updates worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	echo dirty >> init.t &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty init.t &&
-	test "$(git ls-files -t init.t)" = "S init.t" &&
-	git update-index --no-skip-worktree init.t
+expecting success of 6423.12 '5a: Merge directories, other side adds files to original and target': 
+	test_setup_5a &&
+	(
+		cd 5a &&
 
-HEAD is now at fa1ce8e modified and added
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 3 - read-tree updates worktree, dirty case
+		git checkout A^0 &&
 
-expecting success of 7012.4 'read-tree removes worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	rm added &&
-	git read-tree -m -u HEAD^ &&
-	test ! -f added
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT.*implicit dir rename" out &&
 
-HEAD is now at fa1ce8e modified and added
-ok 4 - read-tree removes worktree, absent case
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-expecting success of 7012.5 'read-tree removes worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	echo dirty >> added &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty added &&
-	test "$(git ls-files -t added)" = "S added" &&
-	git update-index --no-skip-worktree added
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/d :0:y/e :0:z/e :0:y/f &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:y/d  A:y/e  A:z/e  A:z/f &&
+		test_cmp expect actual
+	)
 
-HEAD is now at fa1ce8e modified and added
-error: Entry 'added' not uptodate. Cannot merge.
-ok 5 - read-tree removes worktree, dirty case
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5a/.git/
+[master (root-commit) 828128d] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A b42bf3c] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/e
+ create mode 100644 z/e
+ create mode 100644 z/f
+Switched to branch 'B'
+[B 2a8bd7d] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7012.6 'index setup': 
-	git checkout -f init &&
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t > result &&
-	test_cmp expected result
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Previous HEAD position was fa1ce8e modified and added
-HEAD is now at 2519212 init
-ok 6 - index setup
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7012.7 'git-rm fails if worktree is dirty': 
-	setup_dirty &&
-	test_must_fail git rm 1 &&
-	test_dirty
+  git switch -c <new-branch-name>
 
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-1
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config set advice.updateSparsePath false"
-ok 7 - git-rm fails if worktree is dirty
+Or undo this operation with:
 
-expecting success of 7012.8 'git-clean, absent case': 
-	setup_absent &&
-	git clean -n > result &&
-	test_cmp expected result
+  git switch -
 
-ok 8 - git-clean, absent case
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7012.9 'git-clean, dirty case': 
-	setup_dirty &&
-	git clean -n > result &&
-	test_cmp expected result
+HEAD is now at b42bf3c A
+CONFLICT (implicit dir rename): Existing file/dir at y/e in the way of implicit directory rename(s) putting the following path(s) there: z/e.
+ok 12 - 5a: Merge directories, other side adds files to original and target
 
-ok 9 - git-clean, dirty case
+expecting success of 6423.13 '5b: Rename/delete in order to get add/add/add conflict': 
+	test_setup_5b &&
+	(
+		cd 5b &&
 
-expecting success of 7012.10 '--ignore-skip-worktree-entries leaves worktree alone': 
-	test_commit keep-me &&
-	git update-index --skip-worktree keep-me.t &&
-	rm keep-me.t &&
+		git checkout A^0 &&
 
-	: ignoring the worktree &&
-	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
-	git diff-index --cached --exit-code HEAD &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (add/add).* y/d" out &&
 
-	: not ignoring the worktree, a deletion is staged &&
-	git update-index --remove keep-me.t &&
-	test_must_fail git diff-index --cached --exit-code HEAD \
-		--diff-filter=D -- keep-me.t
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-[detached HEAD 2b2ea08] keep-me
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  A:y/d  B:y/d &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse :1:y/d &&
+		test_path_is_file y/d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5b/.git/
+[master (root-commit) 66a9911] O
  Author: A U Thor <author@example.com>
- 5 files changed, 1 insertion(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 keep-me.t
- create mode 100644 sub/1
- create mode 100644 sub/2
-:100644 000000 f00f5e00581fe7be1be150ec748178e224a827d4 0000000000000000000000000000000000000000 D	keep-me.t
-ok 10 - --ignore-skip-worktree-entries leaves worktree alone
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A f5563b5] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+), 1 deletion(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 5ac66d1] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 y/d
+ create mode 100644 z/e
+Note: switching to 'A^0'.
 
-expecting success of 7012.11 'stash restore in sparse checkout': 
-	test_create_repo stash-restore &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f5563b5 A
+CONFLICT (add/add): Merge conflict in y/d
+fatal: path 'y/d' is in the index, but not at stage 1
+hint: Did you mean ':2:y/d'?
+:1:y/d
+ok 13 - 5b: Rename/delete in order to get add/add/add conflict
+
+expecting success of 6423.14 '5c: Transitive rename would cause rename/rename/rename/add/add/add': 
+	test_setup_5c &&
 	(
-		cd stash-restore &&
+		cd 5c &&
 
-		mkdir subdir &&
-		echo A >subdir/A &&
-		echo untouched >untouched &&
-		echo removeme >removeme &&
-		echo modified >modified &&
-		git add . &&
-		git commit -m Initial &&
+		git checkout A^0 &&
 
-		echo AA >>subdir/A &&
-		echo addme >addme &&
-		echo tweaked >>modified &&
-		rm removeme &&
-		git add addme &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
+		test_grep "CONFLICT (add/add).* y/d" out &&
 
-		git stash push &&
+		git ls-files -s >out &&
+		test_line_count = 9 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-		git sparse-checkout set --no-cone subdir &&
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e &&
+		test_cmp expect actual &&
 
-		# Ensure after sparse-checkout we only have expected files
-		cat >expect <<-EOF &&
-		S modified
-		S removeme
-		H subdir/A
-		S untouched
-		EOF
-		git ls-files -t >actual &&
+		test_must_fail git rev-parse :1:y/d &&
+		git rev-parse >actual \
+			:2:w/d :3:w/d :1:x/d :2:y/d :3:y/d :3:z/d &&
+		git rev-parse >expect \
+			 O:x/d  B:w/d  O:x/d  A:y/d  B:y/d  O:x/d &&
 		test_cmp expect actual &&
 
-		test_path_is_missing addme &&
-		test_path_is_missing modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched &&
+		git hash-object >actual \
+			z/d &&
+		git rev-parse >expect \
+			O:x/d &&
+		test_cmp expect actual &&
+		test_path_is_missing x/d &&
+		test_path_is_file y/d &&
+		grep -q "<<<<" y/d  # conflict markers should be present
+	)
 
-		# Put a file in the working directory in the way
-		echo in the way >modified &&
-		test_must_fail git stash apply 2>error&&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5c/.git/
+[master (root-commit) cb15013] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A b27f493] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {x => w}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+Switched to branch 'B'
+[B 535e6b3] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 3 insertions(+)
+ create mode 100644 w/d
+ create mode 100644 y/d
+ rename {x => z}/d (100%)
+ create mode 100644 z/e
+Note: switching to 'A^0'.
 
-		grep "changes.*would be overwritten by merge" error &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		echo in the way >expect &&
-		test_cmp expect modified &&
-		git diff --quiet HEAD ":!modified" &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		# ...and that working directory reflects the files correctly
-		test_path_is_missing addme &&
-		test_path_is_file    modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at b27f493 A
+CONFLICT (rename/rename): x/d renamed to w/d in HEAD and to z/d in B^0.
+CONFLICT (add/add): Merge conflict in y/d
+fatal: path 'y/d' is in the index, but not at stage 1
+hint: Did you mean ':2:y/d'?
+:1:y/d
+ok 14 - 5c: Transitive rename would cause rename/rename/rename/add/add/add
+
+expecting success of 6423.15 '5d: Directory/file/file conflict due to directory rename': 
+	test_setup_5d &&
+	(
+		cd 5d &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (file/directory).*y/d" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d~HEAD :0:y/d/e
+		else
+			test_line_count = 2 out &&
+
+			git rev-parse >actual \
+			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d      :0:y/d/e
+		fi &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~HEAD >actual &&
+		git rev-parse A:y/d >expect &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
-[master (root-commit) 5e4d62b] Initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5d/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A ecc7afe] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+Switched to branch 'B'
+[B 67e12ad] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 y/d/e
+ create mode 100644 z/d
+ create mode 100644 z/f
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at ecc7afe A
+CONFLICT (file/directory): directory in the way of y/d from HEAD; moving it to y/d~HEAD instead.
+ok 15 - 5d: Directory/file/file conflict due to directory rename
+
+expecting success of 6423.16 '6a: Tricky rename/delete': 
+	test_setup_6a &&
+	(
+		cd 6a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/delete).*z/c.*y/c" out &&
+
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :1:y/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:z/c
+		else
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :3:y/c &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c
+		fi &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6a/.git/
+[master (root-commit) 6c15033] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/c'
+rm 'z/d'
+[A 1476532] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 z/c
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 53c1aba] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1476532 A
+CONFLICT (rename/delete): z/c renamed to y/c in B^0, but deleted in HEAD.
+ok 16 - 6a: Tricky rename/delete
+
+expecting success of 6423.17 '6b1: Same renames done on both sides, plus another rename': 
+	test_setup_6b1 &&
+	(
+		cd 6b1 &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:x/e HEAD:y/f &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6b1/.git/
+[master (root-commit) 9e2ca6f] O
  Author: A U Thor <author@example.com>
  4 files changed, 4 insertions(+)
- create mode 100644 modified
- create mode 100644 removeme
- create mode 100644 subdir/A
- create mode 100644 untouched
-Saved working directory and index state WIP on master: 5e4d62b Initial
-Merging Version stash was based on with Stashed changes
-On branch master
-You are in a sparse checkout with 50% of tracked files present.
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+ create mode 100644 z/e
+Switched to branch 'A'
+[A e7863b2] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/e (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/d (100%)
+Switched to branch 'B'
+[B de7c755] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {z => y}/d (100%)
+ create mode 100644 z/f
+Note: switching to 'A^0'.
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   modified
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	error
-	expect
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-no changes added to commit (use "git add" and/or "git commit -a")
-error: Your local changes to the following files would be overwritten by merge:
-ok 11 - stash restore in sparse checkout
+  git switch -c <new-branch-name>
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7030-verify-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7030-verify-tag/.git/
-checking prerequisite: GPG
+Or undo this operation with:
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
+  git switch -
 
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
+Turn off this advice by setting config variable advice.detachedHead to false
 
-)
-prerequisite GPG not satisfied
-ok 1 # skip verify-tag does not crash with -h (missing GPG)
+HEAD is now at e7863b2 A
+Path updated: z/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/f.
+Merge made by the 'ort' strategy.
+ y/f | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/f
+ok 17 - 6b1: Same renames done on both sides, plus another rename
 
-ok 2 # skip create signed tags (missing GPG)
+expecting success of 6423.18 '6b2: Same rename done on both sides': 
+	test_setup_6b2 &&
+	(
+		cd 6b2 &&
 
-checking prerequisite: GPGSM
+		git checkout A^0 &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
-	test_have_prereq GPG &&
-	# Available key info:
-	# * see t/lib-gpg/gpgsm-gen-key.in
-	# To generate new certificate:
-	#  * no passphrase
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o /tmp/gpgsm.crt.user \
-	#		--generate-key \
-	#		--batch t/lib-gpg/gpgsm-gen-key.in
-	# To import certificate:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		--import /tmp/gpgsm.crt.user
-	# To export into a .p12 we can later import:
-	#	gpgsm --homedir /tmp/gpghome/ \
-	#		-o t/lib-gpg/gpgsm_cert.p12 \
-	#		--export-secret-key-p12 "committer@example.com"
-	echo | gpgsm --homedir "${GNUPGHOME}" \
-		--passphrase-fd 0 --pinentry-mode loopback \
-		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
-	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
-		>"${GNUPGHOME}/trustlist.txt" &&
-	(gpgconf --reload all || : ) &&
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-	       -u committer@example.com -o /dev/null --sign -
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
 
-)
-prerequisite GPGSM not satisfied
-ok 3 # skip create signed tags x509  (missing GPGSM)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6b2/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 6ea17b2] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-ok 4 # skip verify and show signatures (missing GPG)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 5 # skip verify and show signatures x509 (missing GPGSM)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 6 # skip verify and show signatures x509 with low minTrustLevel (missing GPGSM)
+  git switch -c <new-branch-name>
 
-ok 7 # skip verify and show signatures x509 with matching minTrustLevel (missing GPGSM)
+Or undo this operation with:
 
-ok 8 # skip verify and show signatures x509 with high minTrustLevel (missing GPGSM)
+  git switch -
 
-ok 9 # skip detect fudged signature (missing GPG)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 10 # skip verify signatures with --raw (missing GPG)
+HEAD is now at 4e9f86d A
+Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
+Merge made by the 'ort' strategy.
+ y/d | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/d
+ok 18 - 6b2: Same rename done on both sides
 
-ok 11 # skip verify signatures with --raw x509 (missing GPGSM)
+expecting success of 6423.19 '6c: Rename only done on same side': 
+	test_setup_6c &&
+	(
+		cd 6c &&
 
-ok 12 # skip verify multiple tags (missing GPG)
+		git checkout A^0 &&
 
-ok 13 # skip verify multiple tags x509 (missing GPGSM)
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 14 # skip verifying tag with --format (missing GPG)
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-ok 15 # skip verifying tag with --format="%(rest)" must fail (missing GPG)
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/d &&
+		test_cmp expect actual
+	)
 
-ok 16 # skip verifying a forged tag with --format should fail silently (missing GPG)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6c/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 405f2b4] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B 6ea17b2] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7031-verify-tag-signed-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7031-verify-tag-signed-ssh/.git/
-checking prerequisite: GPGSSH
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
-	ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
-	test $? != 127 || exit 1
-	echo $ssh_version | grep -q "find-principals:missing signature file"
-	test $? = 0 || exit 1;
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# Setup some keys and an allowed signers file
-	mkdir -p "${GNUPGHOME}" &&
-	chmod 0700 "${GNUPGHOME}" &&
-	(setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
-	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
-	ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
-	ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
-	ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
-	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
+  git switch -c <new-branch-name>
 
-	cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
-	"principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
-	"principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
-	"principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
-	"principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
-	EOF
+Or undo this operation with:
 
-	# Verify if at least one key and ssh-keygen works as expected
-	echo "testpayload" |
-	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
-	ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
-	echo "testpayload" |
-	ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
+  git switch -
 
-)
-prerequisite GPGSSH not satisfied
-ok 1 # skip create signed tags ssh (missing GPGSSH)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-checking prerequisite: GPGSSH_VERIFYTIME
+HEAD is now at 405f2b4 A
+Merge made by the 'ort' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ z/d        | 1 +
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 z/d
+ok 19 - 6c: Rename only done on same side
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
-	test_have_prereq GPGSSH &&
-	# Check if ssh-keygen has a verify-time option by passing an invalid date to it
-	ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
+expecting success of 6423.20 '6d: We do not always want transitive renaming': 
+	test_setup_6d &&
+	(
+		cd 6d &&
 
-	# Set up keys with key lifetimes
-	ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
-	key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
-	key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
-	key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
-	key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
+		git checkout A^0 &&
 
-	# Timestamps outside of test_tick span
-	ts2005a=20050401000000 ts2005b=200504020000 &&
-	# Timestamps within test_tick span
-	ts2005c=20050407000000 ts2005d=200504100000 &&
-	# Definitely not yet valid / expired timestamps
-	ts2000=20000101000000 ts2999=29990101000000 &&
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-	cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
-	"timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
-	"timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
-	"principal with expired key" valid-before="$ts2000" $key_expired"
-	"principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
-	EOF
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-	# and verify ssh-keygen verifies the key lifetime
-	echo "testpayload" |
-	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
-	! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d &&
+		test_cmp expect actual
+	)
 
-)
-prerequisite GPGSSH_VERIFYTIME not satisfied
-ok 2 # skip create signed tags with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6d/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 1491553] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B add22d4] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-ok 3 # skip verify and show ssh signatures (missing GPGSSH)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 4 # skip verify-tag exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 5 # skip verify-tag exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+  git switch -c <new-branch-name>
 
-ok 6 # skip verify-tag succeeds with tag date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+Or undo this operation with:
 
-ok 7 # skip verify-tag fails with tag date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
+  git switch -
 
-ok 8 # skip detect fudged ssh signature (missing GPGSSH)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 9 # skip verify ssh signatures with --raw (missing GPGSSH)
+HEAD is now at 1491553 A
+Merge made by the 'ort' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ {x => z}/d | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => z}/d (100%)
+ok 20 - 6d: We do not always want transitive renaming
 
-ok 10 # skip verify signatures with --raw ssh (missing GPGSSH)
+expecting success of 6423.21 '6e: Add/add from one side': 
+	test_setup_6e &&
+	(
+		cd 6e &&
 
-ok 11 # skip verify multiple tags ssh (missing GPGSSH)
+		git checkout A^0 &&
 
-ok 12 # skip verifying tag with --format - ssh (missing GPGSSH)
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 13 # skip verifying a forged tag with --format should fail silently - ssh (missing GPGSSH)
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-ok 14 # skip rev-list --format=%G (missing GPGSSH)
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:y/d    B:z/d &&
+		test_cmp expect actual
+	)
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7008-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7008-filter-branch-null-sha1/.git/
-expecting success of 7008.1 'setup: base commits': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6e/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 405f2b4] A
+ Author: A U Thor <author@example.com>
+Switched to branch 'B'
+[B c2a120e] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-[master (root-commit) d79ce16] one
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 405f2b4 A
+Merge made by the 'ort' strategy.
+ {z => y}/b | 0
+ {z => y}/c | 0
+ y/d        | 1 +
+ z/d        | 1 +
+ 4 files changed, 2 insertions(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d
+ create mode 100644 z/d
+ok 21 - 6e: Add/add from one side
+
+expecting success of 6423.22 '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file': 
+	test_setup_7a &&
+	(
+		cd 7a &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
+		test_grep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:x/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/b   w/b   y/c   x/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7a/.git/
+[master (root-commit) 4e96174] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 7c7cd71] three
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B e02cee0] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup: base commits
+ 3 files changed, 1 insertion(+)
+ rename {z => w}/b (100%)
+ rename {z => x}/c (100%)
+ create mode 100644 z/d
+Note: switching to 'A^0'.
 
-expecting success of 7008.2 'setup: a commit with a bogus null sha1 in the tree': 
-	{
-		git ls-tree HEAD &&
-		printf "160000 commit $ZERO_OID\\tbroken\\n"
-	} >broken-tree &&
-	echo "add broken entry" >msg &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	tree=$(git mktree <broken-tree) &&
-	test_tick &&
-	commit=$(git commit-tree $tree -p HEAD <msg) &&
-	git update-ref HEAD "$commit"
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 2 - setup: a commit with a bogus null sha1 in the tree
+  git switch -c <new-branch-name>
 
-expecting success of 7008.3 'setup: bring HEAD and index in sync': 
-	test_tick &&
-	git commit -a -m "back to normal"
+Or undo this operation with:
 
-[master 6fc1982] back to normal
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 4e9f86d A
+CONFLICT (rename/rename): z/b renamed to y/b in HEAD and to w/b in B^0.
+CONFLICT (rename/rename): z/c renamed to y/c in HEAD and to x/c in B^0.
+ok 22 - 7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+
+expecting success of 6423.23 '7b: rename/rename(2to1), but only due to transitive rename': 
+	test_setup_7b &&
+	(
+		cd 7b &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (\(.*\)/\1)" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			:0:y/b :0:y/c :2:y/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:w/d  O:x/d &&
+		test_cmp expect actual &&
+
+		# Test that the two-way merge in y/d is as expected
+		git cat-file -p :2:y/d >expect &&
+		git cat-file -p :3:y/d >other &&
+		>empty &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git merge-file \
+				-L "HEAD:y/d" \
+				-L "" \
+				-L "B^0:z/d" \
+				expect empty other
+		else
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other
+		fi &&
+		test_cmp expect y/d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7b/.git/
+[master (root-commit) 3a7ba74] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 160000 broken
-ok 3 - setup: bring HEAD and index in sync
+ 4 files changed, 4 insertions(+)
+ create mode 100644 w/d
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 0808992] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {w => y}/d (100%)
+Switched to branch 'B'
+[B 946a998] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7008.4 'noop filter-branch complains': 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "true"
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (1 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-fatal: git-write-tree: error building trees
-fatal: not a valid object name 
-could not write rewritten commit
-ok 4 - noop filter-branch complains
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7008.5 'filter commands are still checked': 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "git rm --cached --ignore-unmatch three.t"
+  git switch -c <new-branch-name>
 
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    rm 'three.t'
-
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-error: cache entry has null sha1: broken
-fatal: Unable to write new index file
-rm 'three.t'
-index filter failed: git rm --cached --ignore-unmatch three.t
-ok 5 - filter commands are still checked
+Or undo this operation with:
 
-expecting success of 7008.6 'removing the broken entry works': 
-	echo three >expect &&
-	git filter-branch \
-		--force --prune-empty \
-		--index-filter "git rm --cached --ignore-unmatch broken" &&
-	git log -1 --format=%s >actual &&
-	test_cmp expect actual
+  git switch -
 
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (1 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-rm 'broken'
-
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (3/5) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/master' was rewritten
-ok 6 - removing the broken entry works
+Turn off this advice by setting config variable advice.detachedHead to false
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6500-gc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/.git/
-expecting success of 6500.1 'setup': 
-	# do not let the amount of physical memory affects gc
-	# behavior, make sure we always pack everything to one pack by
-	# default
-	git config gc.bigPackThreshold 2g &&
-	test_oid_init
+HEAD is now at 0808992 A
+CONFLICT (add/add): Merge conflict in y/d
+ok 23 - 7b: rename/rename(2to1), but only due to transitive rename
 
-ok 1 - setup
+expecting success of 6423.24 '7c: rename/rename(1to...2or3); transitive rename may add complexity': 
+	test_setup_7c &&
+	(
+		cd 7c &&
 
-expecting success of 6500.2 'gc empty repository': 
-	git gc
+		git checkout A^0 &&
 
-Nothing new to pack.
-ok 2 - gc empty repository
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
 
-expecting success of 6500.3 'gc does not leave behind pid file': 
-	git gc &&
-	test_path_is_missing .git/gc.pid
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 3 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-Nothing new to pack.
-ok 3 - gc does not leave behind pid file
+		git rev-parse >actual \
+			:0:y/b :0:y/c :1:x/d :2:w/d :3:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  O:x/d  O:x/d  O:x/d &&
+		test_cmp expect actual
+	)
 
-expecting success of 6500.4 'gc --gobbledegook': 
-	test_expect_code 129 git gc --nonsense 2>err &&
-	test_grep "[Uu]sage: git gc" err
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7c/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 1e0f8cf] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => w}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-usage: git gc [<options>]
-ok 4 - gc --gobbledegook
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 6500.5 'gc -h with invalid configuration': 
-	mkdir broken &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1e0f8cf A
+CONFLICT (rename/rename): x/d renamed to w/d in HEAD and to y/d in B^0.
+ok 24 - 7c: rename/rename(1to...2or3); transitive rename may add complexity
+
+expecting success of 6423.25 '7d: transitive rename involved in rename/delete; how is it reported?': 
+	test_setup_7d &&
 	(
-		cd broken &&
-		git init &&
-		echo "[gc] pruneexpire = CORRUPT" >>.git/config &&
-		test_expect_code 129 git gc -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
+		cd 7d &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/broken/.git/
-usage: git gc [<options>]
-ok 5 - gc -h with invalid configuration
+		git checkout A^0 &&
 
-expecting success of 6500.6 'gc is not aborted due to a stale symref': 
-	git init remote &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :0:y/c :1:y/d :3:y/d &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:x/d  O:x/d
+		else
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :0:y/c :3:y/d &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:x/d
+		fi &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7d/.git/
+[master (root-commit) 1e3967e] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'x/d'
+[A 202563c] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 deletion(-)
+ delete mode 100644 x/d
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B c9f07f0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 202563c A
+CONFLICT (rename/delete): x/d renamed to y/d in B^0, but deleted in HEAD.
+ok 25 - 7d: transitive rename involved in rename/delete; how is it reported?
+
+expecting success of 6423.26 '7e: transitive rename in rename/delete AND dirs in the way': 
+	test_setup_7e &&
 	(
-		cd remote &&
-		test_commit initial &&
-		git clone . ../client &&
-		git branch -m develop &&
-		cd ../client &&
-		git fetch --prune &&
-		git gc
+		cd 7e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :1:y/d~B^0 :3:y/d~B^0 &&
+			git rev-parse >expect \
+				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d      O:x/d
+		else
+			git ls-files -s >out &&
+			test_line_count = 5 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 2 out &&
+
+			git rev-parse >actual \
+				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+			git rev-parse >expect \
+				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d
+		fi &&
+		test_cmp expect actual &&
+
+		git hash-object y/d~B^0 >actual &&
+		git rev-parse O:x/d >expect &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/remote/.git/
-[master (root-commit) 24b24cf] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7e/.git/
+[master (root-commit) cb15013] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '../client'...
-done.
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/remote/.
- - [deleted]         (none)     -> origin/master
-   (refs/remotes/origin/HEAD has become dangling)
- * [new branch]      develop    -> origin/develop
-ok 6 - gc is not aborted due to a stale symref
+ 3 files changed, 3 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'x/d'
+[A 3ba9059] A
+ Author: A U Thor <author@example.com>
+ 5 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 x/d
+ create mode 100644 x/d/f
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ create mode 100644 y/d/g
+Switched to branch 'B'
+[B 0710b4b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6500.7 'gc --keep-largest-pack': 
-	test_create_repo keep-pack &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 3ba9059 A
+CONFLICT (rename/delete): x/d renamed to y/d in B^0, but deleted in HEAD.
+ok 26 - 7e: transitive rename in rename/delete AND dirs in the way
+
+expecting success of 6423.27 '8a: Dual-directory rename, one into the others way': 
+	test_setup_8a &&
 	(
-		cd keep-pack &&
-		test_commit one &&
-		test_commit two &&
-		test_commit three &&
-		git gc &&
-		( cd .git/objects/pack && ls *.pack ) >pack-list &&
-		test_line_count = 1 pack-list &&
-		cp pack-list base-pack-list &&
-		test_commit four &&
-		git repack -d &&
-		test_commit five &&
-		git repack -d &&
-		( cd .git/objects/pack && ls *.pack ) >pack-list &&
-		test_line_count = 3 pack-list &&
-		git gc --keep-largest-pack &&
-		( cd .git/objects/pack && ls *.pack ) >pack-list &&
-		test_line_count = 2 pack-list &&
-		awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
-		test_line_count = 2 pack-info &&
-		test_path_is_file .git/objects/pack/$(cat base-pack-list) &&
-		git fsck
+		cd 8a &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:y/e HEAD:y/f HEAD:z/c HEAD:z/d &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    A:x/e    A:y/f    O:y/c    O:y/d &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/keep-pack/.git/
-[master (root-commit) d79ce16] one
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8a/.git/
+[master (root-commit) 644420a] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 y/c
+ create mode 100644 y/d
+Switched to branch 'A'
+[A 6afefa0] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 7c7cd71] three
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/e
+ create mode 100644 y/f
+Switched to branch 'B'
+[B ccdb287] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master fd8d77e] four
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {y => z}/c (100%)
+ rename {y => z}/d (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6afefa0 A
+Path updated: x/e added in HEAD inside a directory that was renamed in B^0; moving it to y/e.
+Merge made by the 'ort' strategy.
+ {x => y}/a | 0
+ {x => y}/b | 0
+ {x => y}/e | 0
+ {y => z}/c | 0
+ {y => z}/d | 0
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/a (100%)
+ rename {x => y}/b (100%)
+ rename {x => y}/e (100%)
+ rename {y => z}/c (100%)
+ rename {y => z}/d (100%)
+ok 27 - 8a: Dual-directory rename, one into the others way
+
+expecting success of 6423.28 '8b: Dual-directory rename, one into the others way, with conflicting filenames': 
+	test_setup_8b &&
+	(
+		cd 8b &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/a HEAD:y/b HEAD:z/a HEAD:z/b HEAD:x/e HEAD:y/e &&
+		git rev-parse >expect \
+			O:x/a    O:x/b    O:y/a    O:y/b    A:x/e    A:y/e &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8b/.git/
+[master (root-commit) d95116f] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master a383792] five
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/a
+ create mode 100644 x/b
+ create mode 100644 y/a
+ create mode 100644 y/b
+Switched to branch 'A'
+[A 8d5e46a] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-ok 7 - gc --keep-largest-pack
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/e
+ create mode 100644 y/e
+Switched to branch 'B'
+[B a7bdbf9] B
+ Author: A U Thor <author@example.com>
+ 6 files changed, 4 insertions(+), 4 deletions(-)
+ delete mode 100644 x/a
+ delete mode 100644 x/b
+ create mode 100644 z/a
+ create mode 100644 z/b
+Note: switching to 'A^0'.
 
-expecting success of 6500.8 'pre-auto-gc hook can stop auto gc': 
-	cat >err.expect <<-\EOF &&
-	no gc for you
-	EOF
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git init pre-auto-gc-hook &&
-	test_hook -C pre-auto-gc-hook pre-auto-gc <<-\EOF &&
-	echo >&2 no gc for you &&
-	exit 1
-	EOF
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 8d5e46a A
+Merge made by the 'ort' strategy.
+ x/a | 1 -
+ x/b | 1 -
+ y/a | 2 +-
+ y/b | 2 +-
+ z/a | 1 +
+ z/b | 1 +
+ 6 files changed, 4 insertions(+), 4 deletions(-)
+ delete mode 100644 x/a
+ delete mode 100644 x/b
+ create mode 100644 z/a
+ create mode 100644 z/b
+ok 28 - 8b: Dual-directory rename, one into the others way, with conflicting filenames
+
+expecting success of 6423.29 '8c: modify/delete or rename+modify/delete': 
+	test_setup_8c &&
 	(
-		cd pre-auto-gc-hook &&
+		cd 8c &&
 
-		git config gc.auto 3 &&
-		git config gc.autoDetach false &&
+		git checkout A^0 &&
 
-		# We need to create two object whose sha1s start with 17
-		# since this is what git gc counts.  As it happens, these
-		# two blobs will do so.
-		test_commit "$(test_oid blob17_1)" &&
-		test_commit "$(test_oid blob17_2)" &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "CONFLICT (modify/delete).* z/d" out &&
 
-		git gc --auto >../out.actual 2>../err.actual
-	) &&
-	test_must_be_empty out.actual &&
-	test_cmp err.expect err.actual &&
+		git ls-files -s >out &&
+		test_line_count = 5 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
 
-	cat >err.expect <<-\EOF &&
-	will gc for you
-	Auto packing the repository for optimum performance.
-	See "git help gc" for manual housekeeping.
-	EOF
+		git rev-parse >actual \
+			:0:y/b :0:y/c :0:y/e :1:z/d :3:z/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/c  B:z/e  O:z/d  B:z/d &&
+		test_cmp expect actual &&
 
-	test_hook -C pre-auto-gc-hook --clobber pre-auto-gc <<-\EOF &&
-	echo >&2 will gc for you &&
-	exit 0
-	EOF
+		test_must_fail git rev-parse :2:z/d &&
+		git ls-files -s z/d | grep ^100755 &&
+		test_path_is_file z/d &&
+		test_path_is_missing y/d
+	)
 
-	git -C pre-auto-gc-hook gc --auto >out.actual 2>err.actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8c/.git/
+[master (root-commit) a8ba9b3] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A d5ba1c0] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 10 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 1757e3f] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+ mode change 100644 => 100755 z/d
+ create mode 100644 z/e
+Note: switching to 'A^0'.
 
-	test_must_be_empty out.actual &&
-	test_cmp err.expect err.actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/pre-auto-gc-hook/.git/
-[master (root-commit) 1808a60] 263
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d5ba1c0 A
+CONFLICT (modify/delete): z/d deleted in HEAD and modified in B^0.  Version B^0 of z/d left in tree.
+fatal: path 'z/d' is in the index, but not at stage 2
+hint: Did you mean ':1:z/d'?
+:2:z/d
+100755 b4de3947675361a7770d29b8982c407b0ec6b2a0 3	z/d
+ok 29 - 8c: modify/delete or rename+modify/delete
+
+expecting success of 6423.30 '8d: rename/delete...or not?': 
+	test_setup_8d &&
+	(
+		cd 8d &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/e &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/e &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8d/.git/
+[master (root-commit) a8ba9b3] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 263.t
-no gc for you
-[master 9a14344] 410
+ 3 files changed, 12 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+rm 'z/d'
+[A d5ba1c0] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 10 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ delete mode 100644 z/d
+Switched to branch 'B'
+[B 12eaccc] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 410.t
-ok 8 - pre-auto-gc hook can stop auto gc
+ create mode 100644 z/e
+Note: switching to 'A^0'.
 
-expecting success of 6500.9 'auto gc with too many loose objects does not attempt to create bitmaps': 
-	test_config gc.auto 3 &&
-	test_config gc.autodetach false &&
-	test_config pack.writebitmaps true &&
-	# We need to create two object whose sha1s start with 17
-	# since this is what git gc counts.  As it happens, these
-	# two blobs will do so.
-	test_commit "$(test_oid blob17_1)" &&
-	test_commit "$(test_oid blob17_2)" &&
-	# Our first gc will create a pack; our second will create a second pack
-	git gc --auto &&
-	ls .git/objects/pack/pack-*.pack | sort >existing_packs &&
-	test_commit "$(test_oid blob17_3)" &&
-	test_commit "$(test_oid blob17_4)" &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git gc --auto 2>err &&
-	test_grep ! "^warning:" err &&
-	ls .git/objects/pack/pack-*.pack | sort >post_packs &&
-	comm -1 -3 existing_packs post_packs >new &&
-	comm -2 -3 existing_packs post_packs >del &&
-	test_line_count = 0 del && # No packs are deleted
-	test_line_count = 1 new # There is one new pack
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[master (root-commit) 1808a60] 263
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d5ba1c0 A
+Path updated: z/e added in B^0 inside a directory that was renamed in HEAD; moving it to y/e.
+Merge made by the 'ort' strategy.
+ y/e | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 y/e
+ok 30 - 8d: rename/delete...or not?
+
+expecting success of 6423.31 '8e: Both sides rename, one side adds to original directory': 
+	test_setup_8e &&
+	(
+		cd 8e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		test_grep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
+		test_grep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:w/c :0:y/d &&
+		git rev-parse >expect \
+			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
+		test_cmp expect actual &&
+
+		git hash-object >actual \
+			y/b   w/b   y/c   w/c &&
+		git rev-parse >expect \
+			O:z/b O:z/b O:z/c O:z/c &&
+		test_cmp expect actual &&
+
+		test_path_is_missing z/b &&
+		test_path_is_missing z/c
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8e/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 7a02f25] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => w}/b (100%)
+ rename {z => w}/c (100%)
+ create mode 100644 z/d
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 4e9f86d A
+CONFLICT (rename/rename): z/c renamed to y/c in HEAD and to w/c in B^0.
+CONFLICT (rename/rename): z/b renamed to y/b in HEAD and to w/b in B^0.
+ok 31 - 8e: Both sides rename, one side adds to original directory
+
+expecting success of 6423.32 '9a: Inner renamed directory within outer renamed directory': 
+	test_setup_9a &&
+	(
+		cd 9a &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/i &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    B:z/i &&
+		test_cmp expect actual &&
+
+		git rev-parse >actual \
+			HEAD:x/w/e HEAD:x/w/f HEAD:x/w/g HEAD:x/w/h &&
+		git rev-parse >expect \
+			O:z/d/e    O:z/d/f    O:z/d/g    B:z/d/h &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9a/.git/
+[master (root-commit) ad6f8a2] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d/e
+ create mode 100644 z/d/f
+ create mode 100644 z/d/g
+Switched to branch 'A'
+[A 9bfe686] A
+ Author: A U Thor <author@example.com>
+ 5 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z/d => x/w}/e (100%)
+ rename {z/d => x/w}/f (100%)
+ rename {z/d => x/w}/g (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 004af77] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d/h
+ create mode 100644 z/i
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 9bfe686 A
+Path updated: z/d/h added in B^0 inside a directory that was renamed in HEAD; moving it to x/w/h.
+Path updated: z/i added in B^0 inside a directory that was renamed in HEAD; moving it to y/i.
+Merge made by the 'ort' strategy.
+ x/w/h | 1 +
+ y/i   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 x/w/h
+ create mode 100644 y/i
+ok 32 - 9a: Inner renamed directory within outer renamed directory
+
+expecting success of 6423.33 '9b: Transitive rename with content merge': 
+	test_setup_9b &&
+	(
+		cd 9b &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		test_seq 0 11 >expected &&
+		test_cmp expected y/d &&
+		git add expected &&
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    :0:expected &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:x/d &&
+		test_must_fail git rev-parse HEAD:z/d &&
+		test_path_is_missing z/d &&
+
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse O:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse A:x/d) &&
+		test $(git rev-parse HEAD:y/d) != $(git rev-parse B:z/d)
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9b/.git/
+[master (root-commit) f84ec32] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B ded5d1d] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 263.t
-Auto packing the repository for optimum performance.
-See "git help gc" for manual housekeeping.
-[master 9a14344] 410
+ rename {x => z}/d (91%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at a2010ab A
+Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
+Auto-merging y/d
+Merge made by the 'ort' strategy.
+ {x => y}/d | 1 +
+ 1 file changed, 1 insertion(+)
+ rename {x => y}/d (92%)
+fatal: path 'x/d' does not exist in 'HEAD'
+HEAD:x/d
+fatal: path 'z/d' does not exist in 'HEAD'
+HEAD:z/d
+ok 33 - 9b: Transitive rename with content merge
+
+expecting success of 6423.34 '9c: Doubly transitive rename?': 
+	test_setup_9c &&
+	(
+		cd 9c &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "WARNING: Avoiding applying x -> z rename to x/f" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e HEAD:x/f HEAD:x/g &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    O:x/d    O:x/e    O:w/f    A:x/g &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9c/.git/
+[master (root-commit) f3e903b] O
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 w/f
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 8a6c5f2] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {w => x}/f (100%)
+ create mode 100644 x/g
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B 3f509fc] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+ rename {x => z}/e (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 8a6c5f2 A
+WARNING: Avoiding applying x -> z rename to x/f, because z itself was renamed.
+ok 34 - 9c: Doubly transitive rename?
+
+expecting success of 6423.35 '9d: N-way transitive rename?': 
+	test_setup_9d &&
+	(
+		cd 9d &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		test_grep "WARNING: Avoiding applying z -> y rename to z/t" out &&
+		test_grep "WARNING: Avoiding applying y -> x rename to y/a" out &&
+		test_grep "WARNING: Avoiding applying x -> w rename to x/b" out &&
+		test_grep "WARNING: Avoiding applying w -> v rename to w/c" out &&
+
+		git ls-files -s >out &&
+		test_line_count = 7 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out &&
+
+		git rev-parse >actual \
+			HEAD:z/t \
+			HEAD:y/a HEAD:x/b HEAD:w/c \
+			HEAD:u/d HEAD:u/e HEAD:u/f &&
+		git rev-parse >expect \
+			B:z/t    \
+			O:z/a    O:y/b    O:x/c    \
+			O:w/d    O:v/e    A:u/f &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9d/.git/
+[master (root-commit) a77ae1c] O
+ Author: A U Thor <author@example.com>
+ 6 files changed, 6 insertions(+)
+ create mode 100644 u/f
+ create mode 100644 v/e
+ create mode 100644 w/d
+ create mode 100644 x/c
+ create mode 100644 y/b
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 67d374b] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {v => u}/e (100%)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+Switched to branch 'B'
+[B 9c7db88] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {w => v}/d (100%)
+ rename {y => x}/b (100%)
+ create mode 100644 z/t
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 67d374b A
+WARNING: Avoiding applying z -> y rename to z/t, because y itself was renamed.
+WARNING: Avoiding applying y -> x rename to y/a, because x itself was renamed.
+WARNING: Avoiding applying x -> w rename to x/b, because w itself was renamed.
+WARNING: Avoiding applying w -> v rename to w/c, because v itself was renamed.
+ok 35 - 9d: N-way transitive rename?
+
+expecting success of 6423.36 '9e: N-to-1 whammo': 
+	test_setup_9e &&
+	(
+		cd 9e &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+		grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
+		grep -q dir1/yo error_line &&
+		grep -q dir2/yo error_line &&
+		grep -q dir3/yo error_line &&
+		grep -q dirN/yo error_line &&
+
+		git ls-files -s >out &&
+		test_line_count = 16 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			:0:combined/a :0:combined/b :0:combined/c \
+			:0:combined/d :0:combined/e :0:combined/f \
+			:0:combined/g :0:combined/h :0:combined/i \
+			:0:combined/j :0:combined/k :0:combined/l &&
+		git rev-parse >expect \
+			 O:dir1/a      O:dir1/b      A:dir1/c \
+			 O:dir2/d      O:dir2/e      A:dir2/f \
+			 O:dir3/g      O:dir3/h      A:dir3/i \
+			 O:dirN/j      O:dirN/k      A:dirN/l &&
+		test_cmp expect actual &&
+
+		git rev-parse >actual \
+			:0:dir1/yo :0:dir2/yo :0:dir3/yo :0:dirN/yo &&
+		git rev-parse >expect \
+			 A:dir1/yo  A:dir2/yo  A:dir3/yo  A:dirN/yo &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9e/.git/
+[master (root-commit) 6b1b942] O
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+ create mode 100644 dir1/a
+ create mode 100644 dir1/b
+ create mode 100644 dir2/d
+ create mode 100644 dir2/e
+ create mode 100644 dir3/g
+ create mode 100644 dir3/h
+ create mode 100644 dirN/j
+ create mode 100644 dirN/k
+Switched to branch 'A'
+[A 1129f61] A
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+ create mode 100644 dir1/c
+ create mode 100644 dir1/yo
+ create mode 100644 dir2/f
+ create mode 100644 dir2/yo
+ create mode 100644 dir3/i
+ create mode 100644 dir3/yo
+ create mode 100644 dirN/l
+ create mode 100644 dirN/yo
+Switched to branch 'B'
+[B e5547de] B
+ Author: A U Thor <author@example.com>
+ 8 files changed, 0 insertions(+), 0 deletions(-)
+ rename {dir1 => combined}/a (100%)
+ rename {dir1 => combined}/b (100%)
+ rename {dir2 => combined}/d (100%)
+ rename {dir2 => combined}/e (100%)
+ rename {dir3 => combined}/g (100%)
+ rename {dir3 => combined}/h (100%)
+ rename {dirN => combined}/j (100%)
+ rename {dirN => combined}/k (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1129f61 A
+ok 36 - 9e: N-to-1 whammo
+
+expecting success of 6423.37 '9f: Renamed directory that only contained immediate subdirs': 
+	test_setup_9f &&
+	(
+		cd 9f &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:priority/a/foo \
+			HEAD:priority/b/bar \
+			HEAD:priority/b/baz \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9f/.git/
+[master (root-commit) 6480e53] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 goal/a/foo
+ create mode 100644 goal/b/bar
+ create mode 100644 goal/b/baz
+Switched to branch 'A'
+[A 96c4122] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {goal => priority}/a/foo (100%)
+ rename {goal => priority}/b/bar (100%)
+ rename {goal => priority}/b/baz (100%)
+Switched to branch 'B'
+[B 08998f4] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 410.t
-[master 54e21e7] 523
+ create mode 100644 goal/c
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 96c4122 A
+Path updated: goal/c added in B^0 inside a directory that was renamed in HEAD; moving it to priority/c.
+Merge made by the 'ort' strategy.
+ priority/c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 priority/c
+fatal: path 'goal/c' does not exist in 'HEAD'
+HEAD:goal/c
+ok 37 - 9f: Renamed directory that only contained immediate subdirs
+
+checking known breakage of 6423.38 '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed': 
+	test_setup_9g &&
+	(
+		cd 9g &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:priority/alpha/foo \
+			HEAD:priority/beta/bar  \
+			HEAD:priority/beta/baz  \
+			HEAD:priority/c &&
+		git rev-parse >expect \
+			O:goal/a/foo \
+			O:goal/b/bar \
+			O:goal/b/baz \
+			B:goal/c &&
+		test_cmp expect actual &&
+		test_must_fail git rev-parse HEAD:goal/c
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9g/.git/
+[master (root-commit) 6480e53] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 goal/a/foo
+ create mode 100644 goal/b/bar
+ create mode 100644 goal/b/baz
+Switched to branch 'A'
+[A f7fdc05] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {goal/a => priority/alpha}/foo (100%)
+ rename {goal/b => priority/beta}/bar (100%)
+ rename {goal/b => priority/beta}/baz (100%)
+Switched to branch 'B'
+[B 08998f4] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 523.t
-Auto packing the repository for optimum performance.
-See "git help gc" for manual housekeeping.
-[master 60dd8ad] 790
+ create mode 100644 goal/c
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f7fdc05 A
+Merge made by the 'ort' strategy.
+ goal/c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 goal/c
+fatal: path 'priority/c' does not exist in 'HEAD'
+not ok 38 - 9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed # TODO known breakage
+
+expecting success of 6423.39 '9h: Avoid dir rename on merely modified path': 
+	test_setup_9h &&
+	(
+		cd 9h &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+
+		git rev-parse >actual \
+			HEAD:y/b HEAD:y/c HEAD:x/d &&
+		git rev-parse >expect \
+			O:z/b    O:z/c    A:z/d &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9h/.git/
+[master (root-commit) 714b322] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 11 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+ create mode 100644 z/d
+Switched to branch 'A'
+[A d51a99d] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 790.t
-ok 9 - auto gc with too many loose objects does not attempt to create bitmaps
+Switched to branch 'B'
+[B 0435868] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6500.10 'gc --no-quiet': 
-	GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
-	test_must_be_empty stdout &&
-	test_grep "Computing commit graph generation numbers" stderr
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Computing commit graph generation numbers:  25% (1/4)
Computing commit graph generation numbers:  50% (2/4)
Computing commit graph generation numbers:  75% (3/4)
Computing commit graph generation numbers: 100% (4/4)
Computing commit graph generation numbers: 100% (4/4), done.
-ok 10 - gc --no-quiet
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking prerequisite: TTY
+  git switch -c <new-branch-name>
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+Or undo this operation with:
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+  git switch -
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+Turn off this advice by setting config variable advice.detachedHead to false
 
-)
-prerequisite TTY ok
-expecting success of 6500.11 'with TTY: gc --no-quiet': 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
-	test_must_be_empty stdout &&
-	test_grep "Enumerating objects" stderr &&
-	test_grep "Computing commit graph generation numbers: 100% (4/4), done." stderr
+HEAD is now at d51a99d A
+Merge made by the 'ort' strategy.
+ {z => x}/d | 0
+ {z => y}/b | 0
+ {z => y}/c | 0
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => x}/d (100%)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ok 39 - 9h: Avoid dir rename on merely modified path
 
-Enumerating objects: 12, done.
-Computing commit graph generation numbers:  25% (1/4)
Computing commit graph generation numbers:  50% (2/4)
Computing commit graph generation numbers:  75% (3/4)
Computing commit graph generation numbers: 100% (4/4)
Computing commit graph generation numbers: 100% (4/4), done.
-ok 11 - with TTY: gc --no-quiet
+expecting success of 6423.40 '10a: Overwrite untracked with normal rename/delete': 
+	test_setup_10a &&
+	(
+		cd 10a &&
 
-expecting success of 6500.12 'gc --quiet': 
-	git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
-	test_must_be_empty stdout &&
-	test_must_be_empty stderr
+		git checkout A^0 &&
+		echo very >z/c &&
+		echo important >z/d &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		test_grep "The following untracked working tree files would be overwritten by merge" err &&
+
+		git ls-files -s >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 4 out &&
+
+		echo very >expect &&
+		test_cmp expect z/c &&
+
+		echo important >expect &&
+		test_cmp expect z/d &&
+
+		git rev-parse HEAD:z/b >actual &&
+		git rev-parse O:z/b >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10a/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'z/c'
+[A bc21cd8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 z/c
+Switched to branch 'B'
+[B 7bb44f1] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename z/{c => d} (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at bc21cd8 A
+error: The following untracked working tree files would be overwritten by merge:
+ok 40 - 10a: Overwrite untracked with normal rename/delete
+
+expecting success of 6423.41 '10b: Overwrite untracked with dir rename + delete': 
+	test_setup_10b &&
+	(
+		cd 10b &&
+
+		git checkout A^0 &&
+		echo very >y/c &&
+		echo important >y/d &&
+		echo contents >y/e &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
+
+			git ls-files -s >out &&
+			test_line_count = 1 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 5 out
+		else
+			test_grep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+			test_grep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 5 out &&
+
+			git rev-parse >actual \
+				:0:y/b :3:y/d :3:y/e &&
+			git rev-parse >expect \
+				O:z/b  O:z/c  B:z/e &&
+			test_cmp expect actual
+		fi &&
+
+		echo very >expect &&
+		test_cmp expect y/c &&
 
-ok 12 - gc --quiet
+		echo important >expect &&
+		test_cmp expect y/d &&
 
-expecting success of 6500.13 'gc.reflogExpire{Unreachable,}=never skips "expire" via "gc"': 
-	test_config gc.reflogExpire never &&
-	test_config gc.reflogExpireUnreachable never &&
+		echo contents >expect &&
+		test_cmp expect y/e
+	)
 
-	GIT_TRACE=$(pwd)/trace.out git gc &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10b/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+rm 'z/c'
+[A 3a1dd27] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ rename {z => y}/b (100%)
+ delete mode 100644 z/c
+Switched to branch 'B'
+[B 13c0b2e] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename z/{c => d} (100%)
+ create mode 100644 z/e
+Note: switching to 'A^0'.
 
-	# Check that git-pack-refs is run as a sanity check (done via
-	# gc_before_repack()) but that git-expire is not.
-	grep -E "^trace: (built-in|exec|run_command): git pack-refs --" trace.out &&
-	! grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-trace: run_command: git pack-refs --all --prune
-trace: built-in: git pack-refs --all --prune
-ok 13 - gc.reflogExpire{Unreachable,}=never skips "expire" via "gc"
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6500.14 'one of gc.reflogExpire{Unreachable,}=never does not skip "expire" via "gc"': 
-	>trace.out &&
-	test_config gc.reflogExpire never &&
-	GIT_TRACE=$(pwd)/trace.out git gc &&
-	grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
+  git switch -c <new-branch-name>
 
-trace: run_command: git reflog expire --all
-trace: built-in: git reflog expire --all
-ok 14 - one of gc.reflogExpire{Unreachable,}=never does not skip "expire" via "gc"
+Or undo this operation with:
 
-expecting success of 6500.15 'gc.repackFilter launches repack with a filter': 
-	git clone --no-local --bare . bare.git &&
+  git switch -
 
-	git -C bare.git -c gc.cruftPacks=false gc &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	GIT_TRACE=$(pwd)/trace.out git -C bare.git -c gc.repackFilter=blob:none \
-		-c repack.writeBitmaps=false -c gc.cruftPacks=false gc &&
-	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
-	grep -E "^trace: (built-in|exec|run_command): git repack .* --filter=blob:none ?.*" trace.out
+HEAD is now at 3a1dd27 A
+error: The following untracked working tree files would be overwritten by merge:
+ok 41 - 10b: Overwrite untracked with dir rename + delete
 
-Cloning into bare repository 'bare.git'...
-trace: run_command: git repack -d -l -A --unpack-unreachable=2.weeks.ago --filter=blob:none
-trace: built-in: git repack -d -l -A --unpack-unreachable=2.weeks.ago --filter=blob:none
-ok 15 - gc.repackFilter launches repack with a filter
+expecting success of 6423.42 '10c1: Overwrite untracked with dir rename/rename(1to2)': 
+	test_setup_10c 1 &&
+	(
+		cd 10c_1 &&
 
-expecting success of 6500.16 'gc.repackFilterTo store filtered out objects': 
-	test_when_finished "rm -rf bare.git filtered.git" &&
+		git checkout A^0 &&
+		echo important >y/c &&
 
-	git init --bare filtered.git &&
-	git -C bare.git -c gc.repackFilter=blob:none \
-		-c gc.repackFilterTo=../filtered.git/objects/pack/pack \
-		-c repack.writeBitmaps=false -c gc.cruftPacks=false gc &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
 
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
-	test_stdout_line_count = 1 ls filtered.git/objects/pack/*.pack
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_grep "CONFLICT (rename/rename)" out &&
+			test_grep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/filtered.git/
-ok 16 - gc.repackFilterTo store filtered out objects
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-expecting success of 6500.17 'git gc generates a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+			test_cmp expect actual &&
 
-			prepare_cruft_history &&
-			git $argv &&
+			git hash-object y/c~B^0 >actual &&
+			git rev-parse O:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
-			find .git/objects/pack -name "*.mtimes" >mtimes &&
-			sed -e s/.mtimes$/.pack/g mtimes >packs &&
+		echo important >expect &&
+		test_cmp expect y/c
+	)
 
-			test_file_not_empty packs &&
-			while read pack
-			do
-				test_path_is_file "$pack" || return 1
-			done <packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10c_1/.git/
+[master (root-commit) 1ee9006] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A e6a4b22] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B b8dbf85] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 17 - git gc generates a cruft pack
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6500.18 'git -c gc.cruftPacks=true gc generates a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-			prepare_cruft_history &&
-			git $argv &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-			find .git/objects/pack -name "*.mtimes" >mtimes &&
-			sed -e s/.mtimes$/.pack/g mtimes >packs &&
+  git switch -c <new-branch-name>
 
-			test_file_not_empty packs &&
-			while read pack
-			do
-				test_path_is_file "$pack" || return 1
-			done <packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 18 - git -c gc.cruftPacks=true gc generates a cruft pack
+Or undo this operation with:
 
-expecting success of 6500.19 'git -c gc.cruftPacks=false gc --cruft generates a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+  git switch -
 
-			prepare_cruft_history &&
-			git $argv &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-			find .git/objects/pack -name "*.mtimes" >mtimes &&
-			sed -e s/.mtimes$/.pack/g mtimes >packs &&
+HEAD is now at e6a4b22 A
+error: The following untracked working tree files would be overwritten by merge:
+ok 42 - 10c1: Overwrite untracked with dir rename/rename(1to2)
 
-			test_file_not_empty packs &&
-			while read pack
-			do
-				test_path_is_file "$pack" || return 1
-			done <packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 19 - git -c gc.cruftPacks=false gc --cruft generates a cruft pack
+expecting success of 6423.43 '10c2: Overwrite untracked with dir rename/rename(1to2), other direction': 
+	test_setup_10c 2 &&
+	(
+		cd 10c_2 &&
 
-expecting success of 6500.20 'git gc --no-cruft does not generate a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+		git reset --hard &&
+		git clean -fdqx &&
 
-			prepare_cruft_history &&
-			git $argv &&
+		git checkout B^0 &&
+		mkdir y &&
+		echo important >y/c &&
 
-			assert_no_cruft_packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 20 - git gc --no-cruft does not generate a cruft pack
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
 
-expecting success of 6500.21 'git -c gc.cruftPacks=false gc does not generate a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_grep "CONFLICT (rename/rename)" out &&
+			test_grep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
 
-			prepare_cruft_history &&
-			git $argv &&
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-			assert_no_cruft_packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 21 - git -c gc.cruftPacks=false gc does not generate a cruft pack
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+			test_cmp expect actual &&
 
-expecting success of 6500.22 'git -c gc.cruftPacks=true gc --no-cruft does not generate a cruft pack': 
-		test_when_finished "rm -fr repo" &&
-		git init repo &&
-		(
-			cd repo &&
+			git hash-object y/c~HEAD >actual &&
+			git rev-parse O:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
-			prepare_cruft_history &&
-			git $argv &&
+		echo important >expect &&
+		test_cmp expect y/c
+	)
 
-			assert_no_cruft_packs
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10c_2/.git/
+[master (root-commit) 1ee9006] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A e6a4b22] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B b8dbf85] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 22 - git -c gc.cruftPacks=true gc --no-cruft does not generate a cruft pack
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+HEAD is now at b8dbf85 B
+Note: switching to 'B^0'.
 
-expecting success of 6500.23 '--keep-largest-pack ignores cruft packs': 
-	test_when_finished "rm -fr repo" &&
-	git init repo &&
-	(
-		cd repo &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		# Generate a pack for reachable objects (of which there
-		# are 3), and one for unreachable objects (of which
-		# there are 6).
-		prepare_cruft_history &&
-		git gc --cruft &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		mtimes="$(find .git/objects/pack -type f -name "pack-*.mtimes")" &&
-		sz="$(test_file_size "${mtimes%.mtimes}.pack")" &&
+  git switch -c <new-branch-name>
 
-		# Ensure that the cruft pack gets removed (due to
-		# `--prune=now`) despite it being the largest pack.
-		git -c gc.bigPackThreshold=$sz gc --cruft --prune=now &&
+Or undo this operation with:
 
-		assert_no_cruft_packs
-	)
+  git switch -
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 23 - --keep-largest-pack ignores cruft packs
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6500.24 'gc.bigPackThreshold ignores cruft packs': 
-	test_when_finished "rm -fr repo" &&
-	git init repo &&
+HEAD is now at b8dbf85 B
+error: The following untracked working tree files would be overwritten by merge:
+ok 43 - 10c2: Overwrite untracked with dir rename/rename(1to2), other direction
+
+expecting success of 6423.44 '10d: Delete untracked with dir rename/rename(2to1)': 
+	test_setup_10d &&
 	(
-		cd repo &&
+		cd 10d &&
 
-		# Generate a pack for reachable objects (of which there
-		# are 3), and one for unreachable objects (of which
-		# there are 6).
-		prepare_cruft_history &&
-		git gc --cruft &&
+		git checkout A^0 &&
+		echo important >y/wham &&
 
-		# Ensure that the cruft pack gets removed (due to
-		# `--prune=now`) despite it being the largest pack.
-		git gc --cruft --prune=now --keep-largest-pack &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
 
-		assert_no_cruft_packs
-	)
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_grep "CONFLICT (rename/rename)" out &&
+			test_grep "Refusing to lose untracked file at y/wham" out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) b37f540] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Nothing new to pack.
-ok 24 - gc.bigPackThreshold ignores cruft packs
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-expecting success of 6500.25 'setup for --max-cruft-size tests': 
-	git init cruft--max-size &&
-	(
-		cd cruft--max-size &&
-		prepare_cruft_history
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
+			test_cmp expect actual &&
+
+			test_must_fail git rev-parse :1:y/wham &&
+
+			# Test that two-way merge in y/wham~merged is as expected
+			git cat-file -p :2:y/wham >expect &&
+			git cat-file -p :3:y/wham >other &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other &&
+			test_cmp expect y/wham~merged
+		fi &&
+
+		echo important >expect &&
+		test_cmp expect y/wham
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/cruft--max-size/.git/
-[master (root-commit) b37f540] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10d/.git/
+[master (root-commit) 1a4b546] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 5f01bd4] foo
+ 6 files changed, 6 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 x/f
+ create mode 100644 z/a
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 9f961af] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master a32252d] bar
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename z/c => x/wham (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B 6a20b58] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-ok 25 - setup for --max-cruft-size tests
-
-expecting success of 6500.26 '--max-cruft-size sets appropriate repack options': 
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size \
-		gc --cruft --max-cruft-size=1M &&
-	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/d (100%)
+ rename {x => y}/e (100%)
+ rename x/f => z/wham (100%)
+Note: switching to 'A^0'.
 
-{"event":"child_start","sid":"20260419T192310.596219Z-H8d819085-P0020b86d","thread":"main","time":"2026-04-19T19:23:10.629150Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=1048576"]}
-ok 26 - --max-cruft-size sets appropriate repack options
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 6500.27 'gc.maxCruftSize sets appropriate repack options': 
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt \
-		git -C cruft--max-size -c gc.maxCruftSize=2M gc --cruft &&
-	test_subcommand $cruft_max_size_opts --max-cruft-size=2097152 <trace2.txt &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt \
-		git -C cruft--max-size -c gc.maxCruftSize=2M gc --cruft \
-		--max-cruft-size=3M &&
-	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
+  git switch -c <new-branch-name>
 
-{"event":"child_start","sid":"20260419T192310.820198Z-H8d819085-P0020b936","thread":"main","time":"2026-04-19T19:23:10.850691Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=2097152"]}
-{"event":"child_start","sid":"20260419T192311.025295Z-H8d819085-P0020ba00","thread":"main","time":"2026-04-19T19:23:11.042267Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=3145728"]}
-ok 27 - gc.maxCruftSize sets appropriate repack options
+Or undo this operation with:
 
-expecting success of 6500.28 '--expire-to sets repack --expire-to': 
-	rm -rf expired &&
-	mkdir expired &&
-	expire_to="$(pwd)/expired/pack" &&
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --cruft --expire-to="$expire_to" &&
-	test_subcommand $cruft_max_size_opts --expire-to="$expire_to" <trace2.txt
+  git switch -
 
-{"event":"child_start","sid":"20260419T192311.228831Z-H8d819085-P0020bab4","thread":"main","time":"2026-04-19T19:23:11.249764Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--expire-to=/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/expired/pack"]}
-ok 28 - --expire-to sets repack --expire-to
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 6500.29 '--expire-to with --prune=now sets repack --expire-to': 
-	rm -rf expired &&
-	mkdir expired &&
-	expire_to="$(pwd)/expired/pack" &&
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --cruft --prune=now --expire-to="$expire_to" &&
-	test_subcommand git repack -d -l --cruft --cruft-expiration=now --expire-to="$expire_to" <trace2.txt
+HEAD is now at 9f961af A
+error: The following untracked working tree files would be overwritten by merge:
+ok 44 - 10d: Delete untracked with dir rename/rename(2to1)
 
-{"event":"child_start","sid":"20260419T192311.476216Z-H8d819085-P0020bb98","thread":"main","time":"2026-04-19T19:23:11.501342Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=now","--expire-to=/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/expired/pack"]}
-ok 29 - --expire-to with --prune=now sets repack --expire-to
+expecting success of 6423.45 '10e: Does git complain about untracked file that is not really in the way?': 
+	test_setup_10e &&
+	(
+		cd 10e &&
 
-expecting success of 6500.30 '--expire-to with --no-cruft sets repack -A': 
-	rm -rf expired &&
-	mkdir expired &&
-	expire_to="$(pwd)/expired/pack" &&
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --no-cruft --expire-to="$expire_to" &&
-	test_subcommand git repack -d -l -A --unpack-unreachable=2.weeks.ago <trace2.txt
+		git checkout A^0 &&
+		mkdir z &&
+		echo random >z/c &&
 
-{"event":"child_start","sid":"20260419T192311.783001Z-H8d819085-P0020bc81","thread":"main","time":"2026-04-19T19:23:11.814715Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-A","--unpack-unreachable=2.weeks.ago"]}
-ok 30 - --expire-to with --no-cruft sets repack -A
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		test_grep ! "following untracked working tree files would be overwritten by merge" err &&
 
-expecting success of 6500.31 '--expire-to with --no-cruft sets repack -a': 
-	rm -rf expired &&
-	mkdir expired &&
-	expire_to="$(pwd)/expired/pack" &&
-	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --no-cruft --prune=now --expire-to="$expire_to" &&
-	test_subcommand git repack -d -l -a <trace2.txt
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out &&
 
-{"event":"child_start","sid":"20260419T192312.036253Z-H8d819085-P0020bd63","thread":"main","time":"2026-04-19T19:23:12.065619Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-a"]}
-ok 31 - --expire-to with --no-cruft sets repack -a
+		git rev-parse >actual \
+			:0:y/a :0:y/b :0:y/c &&
+		git rev-parse >expect \
+			 O:z/a  O:z/b  B:z/c &&
+		test_cmp expect actual &&
 
-expecting success of 6500.32 'background auto gc does not run if gc.log is present and recent but does if it is old': 
-	test_commit foo &&
-	test_commit bar &&
-	git repack &&
-	test_config gc.autopacklimit 1 &&
-	test_config gc.autodetach true &&
-	echo fleem >.git/gc.log &&
-	git gc --auto 2>err &&
-	test_grep "^warning:" err &&
-	test_config gc.logexpiry 5.days &&
-	test-tool chmtime =-345600 .git/gc.log &&
-	git gc --auto &&
-	test_config gc.logexpiry 2.days &&
-	run_and_wait_for_gc --auto &&
-	ls .git/objects/pack/pack-*.pack >packs &&
-	test_line_count = 1 packs
+		echo random >expect &&
+		test_cmp expect z/c
+	)
 
-[master b16b551] foo
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10e/.git/
+[master (root-commit) 75ee182] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master fc616a4] bar
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A ac1ed31] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+Switched to branch 'B'
+[B 095ac3d] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-warning: The last gc run reported the following. Please correct the root cause
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-warning: The last gc run reported the following. Please correct the root cause
-and remove .git/gc.log
-Automatic cleanup will not be performed until the file is removed.
+ create mode 100644 z/c
+Note: switching to 'A^0'.
 
-fleem
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-ok 32 - background auto gc does not run if gc.log is present and recent but does if it is old
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6500.33 'background auto gc respects lock for all operations': 
-	# make sure we run a background auto-gc
-	test_commit make-pack &&
-	git repack &&
-	test_config gc.autopacklimit 1 &&
-	test_config gc.autodetach true &&
+  git switch -c <new-branch-name>
 
-	# create a ref whose loose presence we can use to detect a pack-refs run
-	git update-ref refs/heads/should-be-loose HEAD &&
-	(ls -1 .git/refs/heads .git/reftable >expect || true) &&
+Or undo this operation with:
 
-	# now fake a concurrent gc that holds the lock; we can use our
-	# shell pid so that it looks valid.
-	hostname=$(hostname || echo unknown) &&
-	shell_pid=$$ &&
-	if test_have_prereq MINGW && test -f /proc/$shell_pid/winpid
-	then
-		# In Git for Windows, Bash (actually, the MSYS2 runtime) has a
-		# different idea of PIDs than git.exe (actually Windows). Use
-		# the Windows PID in this case.
-		shell_pid=$(cat /proc/$shell_pid/winpid)
-	fi &&
-	printf "%d %s" "$shell_pid" "$hostname" >.git/gc.pid &&
+  git switch -
 
-	# our gc should exit zero without doing anything
-	run_and_wait_for_gc --auto &&
-	(ls -1 .git/refs/heads .git/reftable >actual || true) &&
-	test_cmp expect actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-[master 28ecdda] make-pack
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 make-pack.t
-ls: cannot access '.git/reftable': No such file or directory
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-ls: cannot access '.git/reftable': No such file or directory
-ok 33 - background auto gc respects lock for all operations
+HEAD is now at ac1ed31 A
+ok 45 - 10e: Does git complain about untracked file that is not really in the way?
 
-expecting success of 6500.34 '--detach overrides gc.autoDetach=false': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
+expecting success of 6423.46 '11a: Avoid losing dirty contents with simple rename': 
+	test_setup_11a &&
 	(
-		cd repo &&
+		cd 11a &&
 
-		# Prepare the repository such that git-gc(1) ends up repacking.
-		test_commit "$(test_oid blob17_1)" &&
-		test_commit "$(test_oid blob17_2)" &&
-		git config gc.autodetach false &&
-		git config gc.auto 2 &&
+		git checkout A^0 &&
+		echo stuff >>z/c &&
 
-		# Note that we cannot use `test_cmp` here to compare stderr
-		# because it may contain output from `set -x`.
-		run_and_wait_for_gc --auto --detach 2>actual &&
-		test_grep "Auto packing the repository in background for optimum performance." actual
-	)
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_grep "Refusing to lose dirty file at z/c" out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) 94a3838] 263
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 263.t
-[master 2f55aec] 410
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 410.t
-Auto packing the repository in background for optimum performance.
-ok 34 - --detach overrides gc.autoDetach=false
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-expecting success of 6500.35 '--no-detach overrides gc.autoDetach=true': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
+			git rev-parse >actual \
+				:0:z/a :2:z/c &&
+			git rev-parse >expect \
+				 O:z/a  B:z/b &&
+			test_cmp expect actual &&
 
-		# Prepare the repository such that git-gc(1) ends up repacking.
-		test_commit "$(test_oid blob17_1)" &&
-		test_commit "$(test_oid blob17_2)" &&
-		git config gc.autodetach true &&
-		git config gc.auto 2 &&
+			git hash-object z/c~HEAD >actual &&
+			git rev-parse B:z/b >expect &&
+			test_cmp expect actual
+		fi &&
+
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c
 
-		GIT_PROGRESS_DELAY=0 git gc --auto --no-detach 2>output &&
-		test_grep "Auto packing the repository for optimum performance." output &&
-		test_grep "Collecting referenced commits: 2, done." output
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
-[master (root-commit) 94a3838] 263
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11a/.git/
+[master (root-commit) d2da13d] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 263.t
-[master 2f55aec] 410
+ 2 files changed, 11 insertions(+)
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 7a0ff52] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename z/{b => c} (100%)
+Switched to branch 'B'
+[B b7a4243] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 410.t
-Auto packing the repository for optimum performance.
-Collecting referenced commits: 2, done.
-ok 35 - --no-detach overrides gc.autoDetach=true
-
-# passed all 35 test(s)
-1..35
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7062-wtstatus-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7062-wtstatus-ignorecase/.git/
-expecting success of 7062.1 'status with hash collisions': 
-	# note: "V/", "V/XQANY/" and "WURZAUP/" produce the same hash code
-	# in name-hash.c::hash_name
-	mkdir V &&
-	mkdir V/XQANY &&
-	mkdir WURZAUP &&
-	touch V/XQANY/test &&
-	git config core.ignorecase true &&
-	git add . &&
-	# test is successful if git status completes (no endless loop)
-	git status
+Note: switching to 'A^0'.
 
-On branch master
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-No commits yet
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Changes to be committed:
-  (use "git rm --cached <file>..." to unstage)
-	new file:   V/XQANY/test
+  git switch -c <new-branch-name>
 
-ok 1 - status with hash collisions
+Or undo this operation with:
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7001-mv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-expecting success of 7001.1 'mv -f refreshes updated index entry': 
-	echo test >bar &&
-	git add bar &&
-	git commit -m test &&
+  git switch -
 
-	echo foo >foo &&
-	git add foo &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	# Wait one second to ensure ctime of rename will differ from original
-	# file creation ctime.
-	sleep 1 &&
-	git mv -f foo bar &&
-	git reset --merge HEAD &&
+HEAD is now at 7a0ff52 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 46 - 11a: Avoid losing dirty contents with simple rename
 
-	# Verify the index has been reset
-	git diff-files >out &&
-	test_must_be_empty out
+expecting success of 6423.47 '11b: Avoid losing dirty file involved in directory rename': 
+	test_setup_11b &&
+	(
+		cd 11b &&
 
-[master (root-commit) dd702a3] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-ok 1 - mv -f refreshes updated index entry
+		git checkout A^0 &&
+		echo stuff >>z/c &&
 
-expecting success of 7001.2 'prepare reference tree': 
-	mkdir path0 path1 &&
-	COPYING_test_data >path0/COPYING &&
-	git add path0/COPYING &&
-	git commit -m add -a
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+			test_grep "Refusing to lose dirty file at z/c" out &&
 
-[master a081f64] add
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/COPYING
-ok 2 - prepare reference tree
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -m >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-expecting success of 7001.3 'moving the file out of subdirectory': 
-	git -C path0 mv COPYING ../path1/COPYING
+			git rev-parse >actual \
+				:0:x/b :0:y/a :0:y/c &&
+			git rev-parse >expect \
+				 O:x/b  O:z/a  B:x/c &&
+			test_cmp expect actual &&
 
-ok 3 - moving the file out of subdirectory
+			git hash-object y/c >actual &&
+			git rev-parse B:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
-expecting success of 7001.4 'commiting the change': 
-	git commit -m move-out -a
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c
+	)
 
-[master e61e243] move-out
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11b/.git/
+[master (root-commit) 8ba0ed2] O
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path1}/COPYING (100%)
-ok 4 - commiting the change
-
-expecting success of 7001.5 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path0/COPYING..*path1/COPYING" actual
-
-R100	path0/COPYING	path1/COPYING
-ok 5 - checking the commit
-
-expecting success of 7001.6 'moving the file back into subdirectory': 
-	git -C path0 mv ../path1/COPYING COPYING
-
-ok 6 - moving the file back into subdirectory
-
-expecting success of 7001.7 'commiting the change': 
-	git commit -m move-in -a
-
-[master 965f93d] move-in
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 331ae41] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename {path1 => path0}/COPYING (100%)
-ok 7 - commiting the change
+ rename {x => z}/c (100%)
+Switched to branch 'B'
+[B 0b664da] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {z => y}/a (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7001.8 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path1/COPYING..*path0/COPYING" actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-R100	path1/COPYING	path0/COPYING
-ok 8 - checking the commit
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7001.9 'mv --dry-run does not move file': 
-	git mv -n path0/COPYING MOVED &&
-	test_path_is_file path0/COPYING &&
-	test_path_is_missing MOVED
+  git switch -c <new-branch-name>
 
-Checking rename of 'path0/COPYING' to 'MOVED'
-Renaming path0/COPYING to MOVED
-ok 9 - mv --dry-run does not move file
+Or undo this operation with:
 
-expecting success of 7001.10 'checking -k on non-existing file': 
-	git mv -k idontexist path0
+  git switch -
 
-ok 10 - checking -k on non-existing file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7001.11 'checking -k on untracked file': 
-	>untracked1 &&
-	git mv -k untracked1 path0 &&
-	test_path_is_file untracked1 &&
-	test_path_is_missing path0/untracked1
+HEAD is now at 331ae41 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 47 - 11b: Avoid losing dirty file involved in directory rename
 
-ok 11 - checking -k on untracked file
+expecting success of 6423.48 '11c: Avoid losing not-uptodate with rename + D/F conflict': 
+	test_setup_11c &&
+	(
+		cd 11c &&
 
-expecting success of 7001.12 'checking -k on multiple untracked files': 
-	>untracked2 &&
-	git mv -k untracked1 untracked2 path0 &&
-	test_path_is_file untracked1 &&
-	test_path_is_file untracked2 &&
-	test_path_is_missing path0/untracked1 &&
-	test_path_is_missing path0/untracked2
+		git checkout A^0 &&
+		echo stuff >>y/c &&
 
-ok 12 - checking -k on multiple untracked files
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_grep "following files would be overwritten by merge" err
+		fi &&
 
-expecting success of 7001.13 'checking -f on untracked file with existing target': 
-	>path0/untracked1 &&
-	test_must_fail git mv -f untracked1 path0 &&
-	test_path_is_missing .git/index.lock &&
-	test_path_is_file untracked1 &&
-	test_path_is_file path0/untracked1
+		grep -q stuff y/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected y/c &&
 
-fatal: not under version control, source=untracked1, destination=path0/untracked1
-ok 13 - checking -f on untracked file with existing target
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 0 out &&
+		git ls-files -m >out &&
+		test_line_count = 1 out &&
+		git ls-files -o >out &&
+		test_line_count = 3 out
+	)
 
-expecting success of 7001.14 'moving to absent target with trailing slash': 
-	test_must_fail git mv path0/COPYING no-such-dir/ &&
-	test_must_fail git mv path0/COPYING no-such-dir// &&
-	git mv path0/ no-such-dir/ &&
-	test_path_is_dir no-such-dir
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11c/.git/
+[master (root-commit) c615350] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 y/a
+Switched to branch 'A'
+[A b42d3e1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => y}/c (100%)
+Switched to branch 'B'
+[B 78faa62] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 y/c/d
+Note: switching to 'A^0'.
 
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
-ok 14 - moving to absent target with trailing slash
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7001.15 'clean up': 
-	git reset --hard
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-HEAD is now at 965f93d move-in
-ok 15 - clean up
+  git switch -c <new-branch-name>
 
-expecting success of 7001.16 'moving to existing untracked target with trailing slash': 
-	mkdir path1 &&
-	git mv path0/ path1/ &&
-	test_path_is_dir path1/path0/
+Or undo this operation with:
 
-ok 16 - moving to existing untracked target with trailing slash
+  git switch -
 
-expecting success of 7001.17 'moving to existing tracked target with trailing slash': 
-	mkdir path2 &&
-	>path2/file && git add path2/file &&
-	git mv path1/path0/ path2/ &&
-	test_path_is_dir path2/path0/
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 17 - moving to existing tracked target with trailing slash
+HEAD is now at b42d3e1 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 48 - 11c: Avoid losing not-uptodate with rename + D/F conflict
 
-expecting success of 7001.18 'clean up': 
-	git reset --hard
+expecting success of 6423.49 '11d: Avoid losing not-uptodate with rename + D/F conflict': 
+	test_setup_11d &&
+	(
+		cd 11d &&
 
-HEAD is now at 965f93d move-in
-ok 18 - clean up
+		git checkout A^0 &&
+		echo stuff >>z/c &&
 
-expecting success of 7001.19 'adding another file': 
-	COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
-	git add path0/README &&
-	git commit -m add2 -a
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_grep "Refusing to lose dirty file at z/c" out &&
 
-[master 0c7076e] add2
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/README
-ok 19 - adding another file
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 4 out &&
 
-expecting success of 7001.20 'moving whole subdirectory': 
-	git mv path0 path2
+			git rev-parse >actual \
+				:0:x/b :0:y/a :0:y/c/d :3:y/c &&
+			git rev-parse >expect \
+				 O:x/b  O:z/a  B:y/c/d  B:x/c &&
+			test_cmp expect actual &&
 
-ok 20 - moving whole subdirectory
+			git hash-object y/c~HEAD >actual &&
+			git rev-parse B:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
-expecting success of 7001.21 'commiting the change': 
-	git commit -m dir-move -a
+		grep -q stuff z/c &&
+		test_seq 1 10 >expected &&
+		echo stuff >>expected &&
+		test_cmp expected z/c
+	)
 
-[master d877af0] dir-move
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11d/.git/
+[master (root-commit) 8ba0ed2] O
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {path0 => path2}/COPYING (100%)
- rename {path0 => path2}/README (100%)
-ok 21 - commiting the change
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/b
+ create mode 100644 x/c
+ create mode 100644 z/a
+Switched to branch 'A'
+[A 331ae41] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+Switched to branch 'B'
+[B cbf14e5] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ rename {z => y}/a (100%)
+ create mode 100644 y/c/d
+Note: switching to 'A^0'.
 
-expecting success of 7001.22 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
-	grep "^R100..*path0/README..*path2/README" actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-R100	path0/COPYING	path2/COPYING
-R100	path0/README	path2/README
-ok 22 - checking the commit
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7001.23 'succeed when source is a prefix of destination': 
-	git mv path2/COPYING path2/COPYING-renamed
+  git switch -c <new-branch-name>
 
-ok 23 - succeed when source is a prefix of destination
+Or undo this operation with:
 
-expecting success of 7001.24 'moving whole subdirectory into subdirectory': 
-	git mv path2 path1
+  git switch -
 
-ok 24 - moving whole subdirectory into subdirectory
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7001.25 'commiting the change': 
-	git commit -m dir-move -a
+HEAD is now at 331ae41 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 49 - 11d: Avoid losing not-uptodate with rename + D/F conflict
 
-[master a4d744b] dir-move
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename path2/COPYING => path1/path2/COPYING-renamed (100%)
- rename {path2 => path1/path2}/README (100%)
-ok 25 - commiting the change
+expecting success of 6423.50 '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add': 
+	test_setup_11e &&
+	(
+		cd 11e &&
 
-expecting success of 7001.26 'checking the commit': 
-	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-	grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
-	grep "^R100..*path2/README..*path1/path2/README" actual
+		git checkout A^0 &&
+		echo mods >>y/c &&
 
-R100	path2/COPYING	path1/path2/COPYING-renamed
-R100	path2/README	path1/path2/README
-ok 26 - checking the commit
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_grep "CONFLICT (rename/rename)" out &&
+			test_grep "Refusing to lose dirty file at y/c" out &&
 
-expecting success of 7001.27 'do not move directory over existing directory': 
-	mkdir path0 &&
-	mkdir path0/path2 &&
-	test_must_fail git mv path2 path0
+			git ls-files -s >out &&
+			test_line_count = 7 out &&
+			git ls-files -u >out &&
+			test_line_count = 4 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-fatal: bad source, source=path2, destination=path0/path2
-ok 27 - do not move directory over existing directory
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
+			test_cmp expect actual &&
 
-expecting success of 7001.28 'rename directory to non-existing directory': 
-	mkdir dir-a &&
-	>dir-a/f &&
-	git add dir-a &&
-	git mv dir-a non-existing-dir
+			# See if y/c~merged has expected contents; requires manually
+			# doing the expected file merge
+			git cat-file -p A:y/c >c1 &&
+			git cat-file -p B:z/c >c2 &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				c1 empty c2 &&
+			test_cmp c1 y/c~merged
+		fi &&
 
-ok 28 - rename directory to non-existing directory
+		echo different >expected &&
+		echo mods >>expected &&
+		test_cmp expected y/c
+	)
 
-expecting success of 7001.29 'move into "."': 
-	git mv path1/path2/ .
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11e/.git/
+[master (root-commit) 1ee9006] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 0006594] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 1 insertion(+)
+ rename {x => w}/c (100%)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+ create mode 100644 y/c
+Switched to branch 'B'
+[B b8dbf85] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/c (100%)
+Note: switching to 'A^0'.
 
-ok 29 - move into "."
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7001.30 'Michael Cassar's test case': 
-	rm -fr .git papers partA &&
-	git init &&
-	mkdir -p papers/unsorted papers/all-papers partA &&
-	echo a >papers/unsorted/Thesis.pdf &&
-	echo b >partA/outline.txt &&
-	echo c >papers/unsorted/_another &&
-	git add papers partA &&
-	T1=$(git write-tree) &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
+  git switch -c <new-branch-name>
 
-	T=$(git write-tree) &&
-	git ls-tree -r $T >out &&
-	grep partA/outline.txt out
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
-ok 30 - Michael Cassar's test case
+  git switch -
 
-expecting success of 7001.31 'Sergey Vlasov's test case': 
-	rm -fr .git &&
-	git init &&
-	mkdir ab &&
-	date >ab.c &&
-	date >ab/d &&
-	git add ab.c ab &&
-	git commit -m "initial" &&
-	git mv ab a
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-[master (root-commit) 7330434] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 ab.c
- create mode 100644 ab/d
-ok 31 - Sergey Vlasov's test case
+HEAD is now at 0006594 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 50 - 11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
 
-expecting success of 7001.32 'absolute pathname': 
+expecting success of 6423.51 '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)': 
+	test_setup_11f &&
 	(
-		rm -fr mine &&
-		mkdir mine &&
-		cd mine &&
-		test_create_repo one &&
-		cd one &&
-		mkdir sub &&
-		>sub/file &&
-		git add sub/file &&
-
-		git mv sub "$(pwd)/in" &&
-		test_path_is_missing sub &&
-		test_path_is_dir in &&
-		git ls-files --error-unmatch in/file
-	)
+		cd 11f &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one/.git/
-in/file
-ok 32 - absolute pathname
+		git checkout A^0 &&
+		echo important >>y/wham &&
 
-expecting success of 7001.33 'absolute pathname outside should fail': 
-	(
-		rm -fr mine &&
-		mkdir mine &&
-		cd mine &&
-		out=$(pwd) &&
-		test_create_repo one &&
-		cd one &&
-		mkdir sub &&
-		>sub/file &&
-		git add sub/file &&
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_grep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_grep "CONFLICT (rename/rename)" out &&
+			test_grep "Refusing to lose dirty file at y/wham" out &&
 
-		test_must_fail git mv sub "$out/out" &&
-		test_path_is_dir sub &&
-		test_path_is_missing ../in &&
-		git ls-files --error-unmatch sub/file
-	)
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one/.git/
-fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/out' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one'
-sub/file
-ok 33 - absolute pathname outside should fail
+			test_must_fail git rev-parse :1:y/wham &&
 
-expecting success of 7001.34 'git mv to move multiple sources into a directory': 
-	rm -fr .git && git init &&
-	mkdir dir other &&
-	>dir/a.txt &&
-	>dir/b.txt &&
-	git add dir/?.txt &&
-	git mv dir/a.txt dir/b.txt other &&
-	git ls-files >actual &&
-	cat >expect <<-\EOF &&
-	other/a.txt
-	other/b.txt
-	EOF
-	test_cmp expect actual
+			git rev-parse >actual \
+				:0:y/a :0:y/b :2:y/wham :3:y/wham &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/c     O:x/d &&
+			test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-ok 34 - git mv to move multiple sources into a directory
+			# Test that two-way merge in y/wham~merged is as expected
+			git cat-file -p :2:y/wham >expect &&
+			git cat-file -p :3:y/wham >other &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other &&
+			test_cmp expect y/wham~merged
+		fi &&
 
-expecting success of 7001.35 'git mv should not change sha1 of moved cache entry': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >dirty &&
-	git add dirty &&
-	entry="$(index_at_path dirty)" &&
-	git mv dirty dirty2 &&
-	test "$entry" = "$(index_at_path dirty2)" &&
-	echo 2 >dirty2 &&
-	git mv dirty2 dirty &&
-	test "$entry" = "$(index_at_path dirty)"
+		test_seq 1 10 >expected &&
+		echo important >>expected &&
+		test_cmp expected y/wham
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-ok 35 - git mv should not change sha1 of moved cache entry
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11f/.git/
+[master (root-commit) 2274342] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/c
+ create mode 100644 x/d
+ create mode 100644 z/a
+ create mode 100644 z/b
+Switched to branch 'A'
+[A 6299452] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/a (100%)
+ rename {z => y}/b (100%)
+ rename x/c => y/wham (100%)
+Switched to branch 'B'
+[B 42fa76f] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename x/d => z/wham (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7001.36 'git mv error on conflicted file': 
-	rm -fr .git &&
-	git init &&
-	>conflict &&
-	test_when_finished "rm -f conflict" &&
-	cfhash=$(git hash-object -w conflict) &&
-	q_to_tab <<-EOF | git update-index --index-info &&
-	0 $cfhash 0Qconflict
-	100644 $cfhash 1Qconflict
-	EOF
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	test_must_fail git mv conflict newname 2>actual &&
-	test_grep "conflicted" actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-fatal: conflicted, source=conflict, destination=newname
-ok 36 - git mv error on conflicted file
+  git switch -c <new-branch-name>
 
-expecting success of 7001.37 'git mv should overwrite symlink to a file': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv moved symlink &&
-	git mv -f moved symlink &&
-	test_path_is_missing moved &&
-	test_path_is_file symlink &&
-	test "$(cat symlink)" = 1 &&
-	git update-index --refresh &&
-	git diff-files --quiet
+Or undo this operation with:
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-checking prerequisite: SYMLINKS
+  git switch -
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Turn off this advice by setting config variable advice.detachedHead to false
 
-)
-prerequisite SYMLINKS ok
-fatal: destination exists, source=moved, destination=symlink
-ok 37 - git mv should overwrite symlink to a file
+HEAD is now at 6299452 A
+error: Your local changes to the following files would be overwritten by merge:
+ok 51 - 11f: Avoid deleting not-uptodate with dir rename/rename(2to1)
 
-expecting success of 7001.38 'git mv should overwrite file with a symlink': 
-	rm -fr .git &&
-	git init &&
-	echo 1 >moved &&
-	test_ln_s_add moved symlink &&
-	git add moved &&
-	test_must_fail git mv symlink moved &&
-	git mv -f symlink moved &&
-	test_path_is_missing symlink &&
-	git update-index --refresh &&
-	git diff-files --quiet
+expecting success of 6423.52 '12a: Moving one directory hierarchy into another': 
+	test_setup_12a &&
+	(
+		cd 12a &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
-fatal: destination exists, source=symlink, destination=moved
-ok 38 - git mv should overwrite file with a symlink
+		git checkout A^0 &&
 
-expecting success of 7001.39 'check moved symlink': 
-	test_path_is_symlink moved
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 39 - check moved symlink
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-expecting success of 7001.40 'setup submodule': 
-	test_config_global protocol.file.allow always &&
-	git commit -m initial &&
-	git reset --hard &&
-	git submodule add ./. sub &&
-	echo content >file &&
-	git add file &&
-	git commit -m "added sub and file" &&
-	mkdir -p deep/directory/hierarchy &&
-	git submodule add ./. deep/directory/hierarchy/sub &&
-	git commit -m "added another submodule" &&
-	git branch submodule
+		git rev-parse >actual \
+			HEAD:node1/leaf1 HEAD:node1/leaf2 HEAD:node1/leaf5 \
+			HEAD:node1/node2/leaf3 \
+			HEAD:node1/node2/leaf4 \
+			HEAD:node1/node2/leaf6 &&
+		git rev-parse >expect \
+			O:node1/leaf1    O:node1/leaf2    B:node1/leaf5 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
 
-[master (root-commit) 335301e] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12a/.git/
+[master (root-commit) 674d36e] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 moved
-HEAD is now at 335301e initial
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub'...
-done.
-[master 7b21d91] added sub and file
+ 4 files changed, 4 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 494e77b] A
  Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 file
- create mode 160000 sub
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
-done.
-[master d0b8d3f] added another submodule
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node2 => node1/node2}/leaf3 (100%)
+ rename {node2 => node1/node2}/leaf4 (100%)
+Switched to branch 'B'
+[B 139a75f] B
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 deep/directory/hierarchy/sub
-ok 40 - setup submodule
-
-expecting success of 7001.41 'git mv cannot move a submodule in a file': 
-	test_must_fail git mv sub file
+ 2 files changed, 2 insertions(+)
+ create mode 100644 node1/leaf5
+ create mode 100644 node2/leaf6
+Note: switching to 'A^0'.
 
-fatal: destination already exists, source=sub, destination=file
-ok 41 - git mv cannot move a submodule in a file
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7001.42 'git mv moves a submodule with a .git directory and no .gitmodules': 
-	entry="$(index_at_path sub)" &&
-	git rm .gitmodules &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-rm '.gitmodules'
-On branch master
-Your branch is up to date with 'origin/master'.
+  git switch -c <new-branch-name>
 
-nothing to commit, working tree clean
-ok 42 - git mv moves a submodule with a .git directory and no .gitmodules
+Or undo this operation with:
 
-expecting success of 7001.43 'git mv moves a submodule with a .git directory and .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(index_at_path sub)" &&
-	(
-		cd sub &&
-		rm -f .git &&
-		cp -R -P -p ../.git/modules/sub .git &&
-		GIT_WORK_TREE=. git config --unset core.worktree
-	) &&
-	mkdir mod &&
-	git mv sub mod/sub &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
+  git switch -
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 43 - git mv moves a submodule with a .git directory and .gitmodules
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7001.44 'git mv moves a submodule with gitfile': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	git -C mod mv ../sub/ . &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	echo mod/sub >expected &&
-	git config -f .gitmodules submodule.sub.path >actual &&
-	test_cmp expected actual &&
-	git update-index --refresh &&
-	git diff-files --quiet
+HEAD is now at 494e77b A
+Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
+Merge made by the 'ort' strategy.
+ node1/leaf5       | 1 +
+ node1/node2/leaf6 | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 node1/leaf5
+ create mode 100644 node1/node2/leaf6
+ok 52 - 12a: Moving one directory hierarchy into another
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 44 - git mv moves a submodule with gitfile
+expecting success of 6423.53 '12b1: Moving two directory hierarchies into each other': 
+	test_setup_12b1 &&
+	(
+		cd 12b1 &&
 
-expecting success of 7001.45 'mv does not complain when no .gitmodules file is found': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git rm .gitmodules &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		git checkout A^0 &&
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-rm '.gitmodules'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 45 - mv does not complain when no .gitmodules file is found
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7001.46 'mv will error out on a modified .gitmodules file unless staged': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules foo.bar true &&
-	entry="$(index_at_path sub)" &&
-	mkdir mod &&
-	test_must_fail git mv sub mod/sub 2>actual.err &&
-	test_file_not_empty actual.err &&
-	test_path_exists sub &&
-	git diff-files --quiet -- sub &&
-	git add .gitmodules &&
-	git mv sub mod/sub 2>actual.err &&
-	test_must_be_empty actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 46 - mv will error out on a modified .gitmodules file unless staged
+		git rev-parse >actual \
+			HEAD:node2/node1/leaf1 \
+			HEAD:node2/node1/leaf2 \
+			HEAD:node1/node2/leaf3 \
+			HEAD:node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 &&
+		test_cmp expect actual
+	)
 
-expecting success of 7001.47 'mv issues a warning when section is not found in .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	git config -f .gitmodules --remove-section submodule.sub &&
-	git add .gitmodules &&
-	entry="$(index_at_path sub)" &&
-	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
-	mkdir mod &&
-	git mv sub mod/sub 2>actual.err &&
-	test_cmp expect.err actual.err &&
-	test_path_is_missing sub &&
-	test "$entry" = "$(index_at_path mod/sub)" &&
-	git -C mod/sub status &&
-	git update-index --refresh &&
-	git diff-files --quiet
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12b1/.git/
+[master (root-commit) 674d36e] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 494e77b] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node2 => node1/node2}/leaf3 (100%)
+ rename {node2 => node1/node2}/leaf4 (100%)
+Switched to branch 'B'
+[B 634f1d4] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node1 => node2/node1}/leaf1 (100%)
+ rename {node1 => node2/node1}/leaf2 (100%)
+Note: switching to 'A^0'.
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-HEAD detached at 335301e
-nothing to commit, working tree clean
-ok 47 - mv issues a warning when section is not found in .gitmodules
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7001.48 'mv --dry-run does not touch the submodule or .gitmodules': 
-	rm -rf mod &&
-	git reset --hard &&
-	git submodule update &&
-	mkdir mod &&
-	git mv -n sub mod/sub 2>actual.err &&
-	test_path_is_file sub/.git &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-HEAD is now at d0b8d3f added another submodule
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-Checking rename of 'sub' to 'mod/sub'
-Renaming sub to mod/sub
-ok 48 - mv --dry-run does not touch the submodule or .gitmodules
+  git switch -c <new-branch-name>
 
-expecting success of 7001.49 'checking out a commit before submodule moved needs manual updates': 
-	git mv sub sub2 &&
-	git commit -m "moved sub to sub2" &&
-	git checkout -q HEAD^ 2>actual &&
-	test_grep "^warning: unable to rmdir 'sub2':" actual &&
-	git status -s sub2 >actual &&
-	echo "?? sub2/" >expected &&
-	test_cmp expected actual &&
-	test_path_is_missing sub/.git &&
-	test_path_is_file sub2/.git &&
-	git submodule update &&
-	test_path_is_file sub/.git &&
-	rm -rf sub2 &&
-	git diff-index --exit-code HEAD &&
-	git update-index --refresh &&
-	git diff-files --quiet -- sub .gitmodules &&
-	git status -s sub2 >actual &&
-	test_must_be_empty actual
+Or undo this operation with:
 
-[master 6dd6220] moved sub to sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename sub => sub2 (100%)
-warning: unable to rmdir 'sub2': Directory not empty
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-ok 49 - checking out a commit before submodule moved needs manual updates
+  git switch -
 
-expecting success of 7001.50 'mv -k does not accidentally destroy submodules': 
-	git checkout submodule &&
-	mkdir dummy dest &&
-	git mv -k dummy sub dest &&
-	git status --porcelain >actual &&
-	grep "^R  sub -> dest/sub" actual &&
-	git reset --hard &&
-	git checkout .
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Switched to branch 'submodule'
-R  sub -> dest/sub
-warning: unable to rmdir 'dest/sub': Directory not empty
-HEAD is now at d0b8d3f added another submodule
-Updated 0 paths from the index
-ok 50 - mv -k does not accidentally destroy submodules
+HEAD is now at 494e77b A
+Merge made by the 'ort' strategy.
+ {node1 => node2/node1}/leaf1 | 0
+ {node1 => node2/node1}/leaf2 | 0
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {node1 => node2/node1}/leaf1 (100%)
+ rename {node1 => node2/node1}/leaf2 (100%)
+ok 53 - 12b1: Moving two directory hierarchies into each other
 
-expecting success of 7001.51 'moving a submodule in nested directories': 
+expecting success of 6423.54 '12b2: Moving two directory hierarchies into each other': 
+	test_setup_12b2 &&
 	(
-		cd deep &&
-		git mv directory ../ &&
-		# git status would fail if the update of linking git dir to
-		# work dir of the submodule failed.
-		git status &&
-		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
-		echo "directory/hierarchy/sub" >../expect
-	) &&
-	test_cmp expect actual
+		cd 12b2 &&
 
-On branch submodule
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   ../.gitmodules
-	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
+		git checkout A^0 &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	../.gitconfig
-	../a/
-	../ab.c
-	../actual
-	../actual.err
-	../bar
-	../dest/
-	../expect
-	../expect.err
-	../expected
-	../mine/
-	../non-existing-dir/
-	../other/
-	../out
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 51 - moving a submodule in nested directories
+		git ls-files -s >out &&
+		test_line_count = 6 out &&
 
-expecting success of 7001.52 'moving nested submodules': 
-	test_config_global protocol.file.allow always &&
-	git commit -am "cleanup commit" &&
-	mkdir sub_nested_nested &&
-	(
-		cd sub_nested_nested &&
-		>nested_level2 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 2"
-	) &&
-	mkdir sub_nested &&
-	(
-		cd sub_nested &&
-		>nested_level1 &&
-		git init &&
-		git add . &&
-		git commit -m "nested level 1" &&
-		git submodule add ../sub_nested_nested &&
-		git commit -m "add nested level 2"
-	) &&
-	git submodule add ./sub_nested nested_move &&
-	git commit -m "add nested_move" &&
-	git submodule update --init --recursive &&
-	git mv nested_move sub_nested_moved &&
-	git status
+		git rev-parse >actual \
+			HEAD:node1/node2/node1/leaf1 \
+			HEAD:node1/node2/node1/leaf2 \
+			HEAD:node2/node1/node2/leaf3 \
+			HEAD:node2/node1/node2/leaf4 \
+			HEAD:node2/node1/leaf5       \
+			HEAD:node1/node2/leaf6       &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf5 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
 
-[submodule 61d0f20] cleanup commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename {deep/directory => directory}/hierarchy/sub (100%)
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested_nested/.git/
-[master (root-commit) 3d81f5f] nested level 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested/.git/
-[master (root-commit) 8e39d83] nested level 1
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12b2/.git/
+[master (root-commit) 674d36e] O
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 nested_level1
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
-done.
-[master 4ba474d] add nested level 2
+ 4 files changed, 4 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 786826f] A
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub_nested_nested
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/nested_move'...
-done.
-[submodule 4d404d9] add nested_move
+ 3 files changed, 1 insertion(+)
+ create mode 100644 node1/leaf5
+ rename {node2 => node1/node2}/leaf3 (100%)
+ rename {node2 => node1/node2}/leaf4 (100%)
+Switched to branch 'B'
+[B 9ae1186] B
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 nested_move
-Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
-done.
-Submodule path 'directory/hierarchy/sub/sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-Submodule 'sub_nested_nested' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
-done.
-Submodule path 'nested_move/sub_nested_nested': checked out '3d81f5fbdb0173269895972bd0ca2f0372e7edc5'
-Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
-On branch submodule
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   .gitmodules
-	renamed:    nested_move -> sub_nested_moved
+ 3 files changed, 1 insertion(+)
+ create mode 100644 node2/leaf6
+ rename {node1 => node2/node1}/leaf1 (100%)
+ rename {node1 => node2/node1}/leaf2 (100%)
+Note: switching to 'A^0'.
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitconfig
-	a/
-	ab.c
-	actual
-	actual.err
-	bar
-	dest/
-	expect
-	expect.err
-	expected
-	mine/
-	non-existing-dir/
-	other/
-	out
-	sub_nested/
-	sub_nested_nested/
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 52 - moving nested submodules
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking known breakage of 7001.53 'nonsense mv triggers assertion failure and partially updated index': 
-	test_when_finished git reset --hard HEAD &&
-	git reset --hard HEAD &&
-	mkdir -p a &&
-	mkdir -p b &&
-	>a/a.txt &&
-	git add a/a.txt &&
-	test_must_fail git mv a/a.txt a b &&
-	git status --porcelain >actual &&
-	grep "^A[ ]*a/a.txt$" actual
+  git switch -c <new-branch-name>
 
-warning: unable to rmdir 'sub_nested_moved': Directory not empty
-HEAD is now at 4d404d9 add nested_move
-git: builtin/mv.c:508: cmd_mv: Assertion `pos >= 0' failed.
-Aborted
-test_must_fail: died by signal 6: git mv a/a.txt a b
-fatal: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/index.lock': File exists.
+Or undo this operation with:
 
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-not ok 53 - nonsense mv triggers assertion failure and partially updated index # TODO known breakage
+  git switch -
 
-# still have 1 known breakage(s)
-# passed all remaining 52 test(s)
-1..53
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7061-wtstatus-ignore.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7061-wtstatus-ignore/.git/
-expecting success of 7061.1 'status untracked directory with --ignored': 
-	echo "ignored" >.gitignore &&
-	mkdir untracked &&
-	: >untracked/ignored &&
-	: >untracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 1 - status untracked directory with --ignored
+HEAD is now at 786826f A
+Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
+Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
+Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
+Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
+Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
+Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
+Merge made by the 'ort' strategy.
+ node1/node2/leaf6                  | 1 +
+ node1/{ => node2/node1}/leaf1      | 0
+ node1/{ => node2/node1}/leaf2      | 0
+ {node1 => node2/node1}/leaf5       | 0
+ {node1 => node2/node1}/node2/leaf3 | 0
+ {node1 => node2/node1}/node2/leaf4 | 0
+ 6 files changed, 1 insertion(+)
+ create mode 100644 node1/node2/leaf6
+ rename node1/{ => node2/node1}/leaf1 (100%)
+ rename node1/{ => node2/node1}/leaf2 (100%)
+ rename {node1 => node2/node1}/leaf5 (100%)
+ rename {node1 => node2/node1}/node2/leaf3 (100%)
+ rename {node1 => node2/node1}/node2/leaf4 (100%)
+ok 54 - 12b2: Moving two directory hierarchies into each other
 
-expecting success of 7061.2 'same with gitignore starting with BOM': 
-	printf "\357\273\277ignored\n" >.gitignore &&
-	mkdir -p untracked &&
-	: >untracked/ignored &&
-	: >untracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+expecting success of 6423.55 '12c1: Moving one directory hierarchy into another w/ content merge': 
+	test_setup_12c1 &&
+	(
+		cd 12c1 &&
 
-ok 2 - same with gitignore starting with BOM
+		git checkout A^0 &&
 
-expecting success of 7061.3 'status untracked files --ignored with pathspec (no match)': 
-	git status --porcelain --ignored -- untracked/i >actual &&
-	test_must_be_empty actual &&
-	git status --porcelain --ignored -- untracked/u >actual &&
-	test_must_be_empty actual
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 3 - status untracked files --ignored with pathspec (no match)
+		git ls-files -u >out &&
+		test_line_count = 12 out &&
 
-expecting success of 7061.4 'status untracked files --ignored with pathspec (literal match)': 
-	git status --porcelain --ignored -- untracked/ignored >actual &&
-	echo "!! untracked/ignored" >expected &&
-	test_cmp expected actual &&
-	git status --porcelain --ignored -- untracked/uncommitted >actual &&
-	echo "?? untracked/uncommitted" >expected &&
-	test_cmp expected actual
+		git rev-parse >actual \
+			:1:node2/node1/leaf1 \
+			:1:node2/node1/leaf2 \
+			:1:node1/node2/leaf3 \
+			:1:node1/node2/leaf4 \
+			:2:node2/node1/leaf1 \
+			:2:node2/node1/leaf2 \
+			:2:node1/node2/leaf3 \
+			:2:node1/node2/leaf4 \
+			:3:node2/node1/leaf1 \
+			:3:node2/node1/leaf2 \
+			:3:node1/node2/leaf3 \
+			:3:node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf1 \
+			A:node1/leaf2 \
+			A:node1/node2/leaf3 \
+			A:node1/node2/leaf4 \
+			B:node2/node1/leaf1 \
+			B:node2/node1/leaf2 \
+			B:node2/leaf3 \
+			B:node2/leaf4 &&
+		test_cmp expect actual
+	)
 
-ok 4 - status untracked files --ignored with pathspec (literal match)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12c1/.git/
+[master (root-commit) 0cf2f73] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 36 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A 18ec7be] A
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ rename {node2 => node1/node2}/leaf3 (75%)
+ rename {node2 => node1/node2}/leaf4 (75%)
+Switched to branch 'B'
+[B 705044c] B
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ rename {node1 => node2/node1}/leaf1 (75%)
+ rename {node1 => node2/node1}/leaf2 (75%)
+Note: switching to 'A^0'.
 
-expecting success of 7061.5 'status untracked files --ignored with pathspec (glob match)': 
-	git status --porcelain --ignored -- untracked/i\* >actual &&
-	echo "!! untracked/ignored" >expected &&
-	test_cmp expected actual &&
-	git status --porcelain --ignored -- untracked/u\* >actual &&
-	echo "?? untracked/uncommitted" >expected &&
-	test_cmp expected actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 5 - status untracked files --ignored with pathspec (glob match)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7061.6 'status untracked directory with --ignored -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-ok 6 - status untracked directory with --ignored -u
+Or undo this operation with:
 
-expecting success of 7061.7 'status of untracked directory with --ignored works with or without prefix': 
-	git status --porcelain --ignored >tmp &&
-	grep untracked/ tmp >actual &&
-	rm tmp &&
-	test_cmp expected actual &&
+  git switch -
 
-	git status --porcelain --ignored untracked/ >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 7 - status of untracked directory with --ignored works with or without prefix
+HEAD is now at 18ec7be A
+Auto-merging node1/node2/leaf3
+CONFLICT (content): Merge conflict in node1/node2/leaf3
+Auto-merging node1/node2/leaf4
+CONFLICT (content): Merge conflict in node1/node2/leaf4
+Auto-merging node2/node1/leaf1
+CONFLICT (content): Merge conflict in node2/node1/leaf1
+Auto-merging node2/node1/leaf2
+CONFLICT (content): Merge conflict in node2/node1/leaf2
+Automatic merge failed; fix conflicts and then commit the result.
+ok 55 - 12c1: Moving one directory hierarchy into another w/ content merge
 
-expecting success of 7061.8 'status prefixed untracked sub-directory with --ignored -u': 
-	git status --porcelain --ignored -u untracked/ >actual &&
-	test_cmp expected actual
+expecting success of 6423.56 '12c2: Moving one directory hierarchy into another w/ content merge': 
+	test_setup_12c2 &&
+	(
+		cd 12c2 &&
 
-ok 8 - status prefixed untracked sub-directory with --ignored -u
+		git checkout A^0 &&
 
-expecting success of 7061.9 'status ignored directory with --ignore': 
-	rm -rf untracked &&
-	mkdir ignored &&
-	: >ignored/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 9 - status ignored directory with --ignore
+		git ls-files -s >out &&
+		test_line_count = 14 out &&
+		git ls-files -u >out &&
+		test_line_count = 12 out &&
 
-expecting success of 7061.10 'status ignored directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+		git rev-parse >actual \
+			:1:node1/node2/node1/leaf1 \
+			:1:node1/node2/node1/leaf2 \
+			:1:node2/node1/node2/leaf3 \
+			:1:node2/node1/node2/leaf4 \
+			:2:node1/node2/node1/leaf1 \
+			:2:node1/node2/node1/leaf2 \
+			:2:node2/node1/node2/leaf3 \
+			:2:node2/node1/node2/leaf4 \
+			:3:node1/node2/node1/leaf1 \
+			:3:node1/node2/node1/leaf2 \
+			:3:node2/node1/node2/leaf3 \
+			:3:node2/node1/node2/leaf4 \
+			:0:node2/node1/leaf5       \
+			:0:node1/node2/leaf6       &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf1 \
+			A:node1/leaf2 \
+			A:node1/node2/leaf3 \
+			A:node1/node2/leaf4 \
+			B:node2/node1/leaf1 \
+			B:node2/node1/leaf2 \
+			B:node2/leaf3 \
+			B:node2/leaf4 \
+			A:node1/leaf5 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
 
-ok 10 - status ignored directory with --ignore -u
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12c2/.git/
+[master (root-commit) 0cf2f73] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 36 insertions(+)
+ create mode 100644 node1/leaf1
+ create mode 100644 node1/leaf2
+ create mode 100644 node2/leaf3
+ create mode 100644 node2/leaf4
+Switched to branch 'A'
+[A c671e72] A
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 node1/leaf5
+ rename {node2 => node1/node2}/leaf3 (75%)
+ rename {node2 => node1/node2}/leaf4 (75%)
+Switched to branch 'B'
+[B 9d3c6b5] B
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 node2/leaf6
+ rename {node1 => node2/node1}/leaf1 (75%)
+ rename {node1 => node2/node1}/leaf2 (75%)
+Note: switching to 'A^0'.
 
-expecting success of 7061.11 'status empty untracked directory with --ignore': 
-	rm -rf ignored &&
-	mkdir untracked-ignored &&
-	mkdir untracked-ignored/test &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 11 - status empty untracked directory with --ignore
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7061.12 'status empty untracked directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-ok 12 - status empty untracked directory with --ignore -u
+Or undo this operation with:
 
-expecting success of 7061.13 'status untracked directory with ignored files with --ignore': 
-	: >untracked-ignored/ignored &&
-	: >untracked-ignored/test/ignored &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+  git switch -
 
-ok 13 - status untracked directory with ignored files with --ignore
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7061.14 'status untracked directory with ignored files with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+HEAD is now at c671e72 A
+Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
+Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
+Auto-merging node1/node2/node1/leaf1
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
+Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
+Auto-merging node1/node2/node1/leaf2
+CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
+Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
+Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
+Auto-merging node2/node1/node2/leaf3
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
+Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
+Auto-merging node2/node1/node2/leaf4
+CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
+Automatic merge failed; fix conflicts and then commit the result.
+ok 56 - 12c2: Moving one directory hierarchy into another w/ content merge
 
-ok 14 - status untracked directory with ignored files with --ignore -u
+expecting success of 6423.57 '12d: Rename/merge subdir into the root, variant 1': 
+	test_setup_12d &&
+	(
+		cd 12d &&
 
-expecting success of 7061.15 'status ignored tracked directory with --ignore': 
-	rm -rf untracked-ignored &&
-	mkdir tracked &&
-	: >tracked/committed &&
-	git add tracked/committed &&
-	git commit -m. &&
-	echo "tracked" >.gitignore &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+		git checkout A^0 &&
 
-[master (root-commit) e2a6909] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 tracked/committed
-ok 15 - status ignored tracked directory with --ignore
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7061.16 'status ignored tracked directory with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
 
-ok 16 - status ignored tracked directory with --ignore -u
+		git rev-parse >actual \
+			HEAD:subdir/foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/subdir/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
 
-expecting success of 7061.17 'status ignored tracked directory and ignored file with --ignore': 
-	echo "committed" >>.gitignore &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
 
-ok 17 - status ignored tracked directory and ignored file with --ignore
+		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
 
-expecting success of 7061.18 'status ignored tracked directory and ignored file with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12d/.git/
+[master (root-commit) eb8da02] a/b/subdir/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/subdir/foo.t
+Switched to branch 'A'
+[A 65a80b8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {a/b/subdir => subdir}/foo.t (100%)
+Switched to branch 'B'
+[B f100ab2] a/b/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/bar.t
+Note: switching to 'A^0'.
 
-ok 18 - status ignored tracked directory and ignored file with --ignore -u
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7061.19 'status ignored tracked directory and uncommitted file with --ignore': 
-	echo "tracked" >.gitignore &&
-	: >tracked/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 19 - status ignored tracked directory and uncommitted file with --ignore
+  git switch -c <new-branch-name>
 
-expecting success of 7061.20 'status ignored tracked directory and uncommitted file with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+Or undo this operation with:
 
-ok 20 - status ignored tracked directory and uncommitted file with --ignore -u
+  git switch -
 
-expecting success of 7061.21 'status ignored tracked directory with uncommitted file in untracked subdir with --ignore': 
-	rm -rf tracked/uncommitted &&
-	mkdir tracked/ignored &&
-	: >tracked/ignored/uncommitted &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 21 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
+HEAD is now at 65a80b8 A
+Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
+Merge made by the 'ort' strategy.
+ bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+fatal: path 'a/b/subdir/foo.t' does not exist in 'HEAD'
+HEAD:a/b/subdir/foo.t
+fatal: path 'a/b/bar.t' does not exist in 'HEAD'
+HEAD:a/b/bar.t
+ok 57 - 12d: Rename/merge subdir into the root, variant 1
 
-expecting success of 7061.22 'status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+expecting success of 6423.58 '12e: Rename/merge subdir into the root, variant 2': 
+	test_setup_12e &&
+	(
+		cd 12e &&
 
-ok 22 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
+		git checkout A^0 &&
 
-expecting success of 7061.23 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore': 
-	: >tracked/ignored/committed &&
-	git add -f tracked/ignored/committed &&
-	git commit -m. &&
-	git status --porcelain --ignored >actual &&
-	test_cmp expected actual
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-[master 8a62ec6] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 tracked/ignored/committed
-ok 23 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
 
-expecting success of 7061.24 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u': 
-	git status --porcelain --ignored -u >actual &&
-	test_cmp expected actual
+		git rev-parse >actual \
+			HEAD:foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
 
-ok 24 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
 
-expecting success of 7061.25 'status ignores submodule in excluded directory': 
-	git init tracked/submodule &&
-	test_commit -C tracked/submodule initial &&
-	git status --porcelain --ignored -u tracked/submodule >actual &&
-	test_cmp expected actual
+		test_must_fail git rev-parse HEAD:a/b/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7061-wtstatus-ignore/tracked/submodule/.git/
-[master (root-commit) 24b24cf] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12e/.git/
+[master (root-commit) b044d92] a/b/foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 25 - status ignores submodule in excluded directory
+ create mode 100644 a/b/foo.t
+Switched to branch 'A'
+[A de696c4] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/b/foo.t => foo.t (100%)
+Switched to branch 'B'
+[B e3eeb6b] a/b/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/b/bar.t
+Note: switching to 'A^0'.
 
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7101-reset-empty-subdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7101-reset-empty-subdirs/.git/
-expecting success of 7101.1 'creating initial files': 
-	mkdir path0 &&
-	COPYING_test_data >path0/COPYING &&
-	git add path0/COPYING &&
-	git commit -m add -a
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-[master (root-commit) eb5c9d9] add
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/COPYING
-ok 1 - creating initial files
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7101.2 'creating second files': 
-	mkdir path1 &&
-	mkdir path1/path2 &&
-	COPYING_test_data >path1/path2/COPYING &&
-	COPYING_test_data >path1/COPYING &&
-	COPYING_test_data >COPYING &&
-	COPYING_test_data >path0/COPYING-TOO &&
-	git add path1/path2/COPYING &&
-	git add path1/COPYING &&
-	git add COPYING &&
-	git add path0/COPYING-TOO &&
-	git commit -m change -a
+  git switch -c <new-branch-name>
 
-[master 2982bdc] change
- Author: A U Thor <author@example.com>
- 4 files changed, 72 insertions(+)
- create mode 100644 COPYING
- create mode 100644 path0/COPYING-TOO
- create mode 100644 path1/COPYING
- create mode 100644 path1/path2/COPYING
-ok 2 - creating second files
+Or undo this operation with:
 
-expecting success of 7101.3 'resetting tree HEAD^': 
-	git reset --hard HEAD^
+  git switch -
 
-HEAD is now at eb5c9d9 add
-ok 3 - resetting tree HEAD^
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7101.4 'checking initial files exist after rewind': 
-	test -d path0 &&
-	test -f path0/COPYING
+HEAD is now at de696c4 A
+Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
+Merge made by the 'ort' strategy.
+ bar.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+fatal: path 'a/b/foo.t' does not exist in 'HEAD'
+HEAD:a/b/foo.t
+fatal: path 'a/b/bar.t' does not exist in 'HEAD'
+HEAD:a/b/bar.t
+ok 58 - 12e: Rename/merge subdir into the root, variant 2
 
-ok 4 - checking initial files exist after rewind
+expecting success of 6423.59 '12f: Trivial directory resolve, caching, all kinds of fun': 
+	test_setup_12f &&
+	(
+		cd 12f &&
 
-expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
-	! test -f path1/path2/COPYING
+		git checkout A^0 &&
+		git branch Bmod B &&
 
-ok 5 - checking lack of path1/path2/COPYING
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
 
-expecting success of 7101.6 'checking lack of path1/COPYING': 
-	! test -f path1/COPYING
+		echo Checking the pick of B1... &&
 
-ok 6 - checking lack of path1/COPYING
+		test_must_fail git rev-parse Bmod~1:dir &&
 
-expecting success of 7101.7 'checking lack of COPYING': 
-	! test -f COPYING
+		git ls-tree -r Bmod~1 >out &&
+		test_line_count = 98 out &&
 
-ok 7 - checking lack of COPYING
+		git diff --name-status A Bmod~1 >actual &&
+		q_to_tab >expect <<-\EOF &&
+		MQfolder/subdir/Makefile
+		AQfolder/subdir/newfile.c
+		MQfolder/subdir/newsubdir/e
+		AQfolder/subdir/newsubdir/newfile.py
+		MQfolder/subdir/tweaked/Makefile
+		EOF
+		test_cmp expect actual &&
 
-expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
-	! test -f path0/COPYING-TOO
+		# Three-way merged files
+		test_seq  2 11 >e_Merge1 &&
+		test_seq 11 21 >Makefile_TOP &&
+		test_seq 21 31 >Makefile_SUB &&
+		git hash-object >expect      \
+			e_Merge1             \
+			Makefile_TOP         \
+			Makefile_SUB         &&
+		git rev-parse >actual              \
+			Bmod~1:folder/subdir/newsubdir/e     \
+			Bmod~1:folder/subdir/Makefile        \
+			Bmod~1:folder/subdir/tweaked/Makefile &&
+		test_cmp expect actual &&
 
-ok 8 - checking checking lack of path1/COPYING-TOO
+		# New files showed up at the right location with right contents
+		git rev-parse >expect                \
+			B~1:dir/subdir/newfile.c            \
+			B~1:dir/subdir/newsubdir/newfile.py &&
+		git rev-parse >actual                      \
+			Bmod~1:folder/subdir/newfile.c            \
+			Bmod~1:folder/subdir/newsubdir/newfile.py &&
+		test_cmp expect actual &&
 
-expecting success of 7101.9 'checking lack of path1/path2': 
-	! test -d path1/path2
+		# Removed files
+		test_path_is_missing folder/subdir/tweaked/f &&
+		test_path_is_missing folder/subdir/tweaked/g &&
 
-ok 9 - checking lack of path1/path2
+		# Unchanged files or directories
+		git rev-parse >actual        \
+			Bmod~1:folder/subdir/a          \
+			Bmod~1:folder/subdir/b          \
+			Bmod~1:folder/subdir/c          \
+			Bmod~1:folder/subdir/d          \
+			Bmod~1:folder/unchanged         \
+			Bmod~1:folder/subdir/tweaked/h &&
+		git rev-parse >expect          \
+			O:dir/subdir/a         \
+			O:dir/subdir/b         \
+			O:dir/subdir/c         \
+			O:dir/subdir/d         \
+			O:dir/unchanged        \
+			O:dir/subdir/tweaked/h &&
+		test_cmp expect actual &&
 
-expecting success of 7101.10 'checking lack of path1': 
-	! test -d path1
+		echo Checking the pick of B2... &&
 
-ok 10 - checking lack of path1
+		test_must_fail git rev-parse Bmod:dir &&
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7060-wtstatus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7060-wtstatus/.git/
-expecting success of 7060.1 'setup': 
-	git config --global advice.statusuoption false &&
-	test_commit A &&
-	test_commit B oneside added &&
-	git checkout A^0 &&
-	test_commit C oneside created
+		git ls-tree -r Bmod >out &&
+		test_line_count = 99 out &&
 
-[main (root-commit) 0ddfaf1] A
+		git diff --name-status Bmod~1 Bmod >actual &&
+		q_to_tab >expect <<-\EOF &&
+		AQfolder/subdir/newfile.rs
+		MQfolder/subdir/newsubdir/e
+		EOF
+		test_cmp expect actual &&
+
+		# Three-way merged file
+		test_seq  2 12 >e_Merge2 &&
+		git hash-object e_Merge2 >expect &&
+		git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
+		test_cmp expect actual &&
+
+		grep region_enter.*collect_merge_info trace.output >collect &&
+		test_line_count = 4 collect &&
+		grep region_enter.*process_entries$ trace.output >process &&
+		test_line_count = 2 process
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12f/.git/
+[master (root-commit) 362ed3d] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 5747a32] B
+ 98 files changed, 127 insertions(+)
+ create mode 100644 dir/subdir/Makefile
+ create mode 100644 dir/subdir/a
+ create mode 100644 dir/subdir/b
+ create mode 100644 dir/subdir/c
+ create mode 100644 dir/subdir/d
+ create mode 100644 dir/subdir/e
+ create mode 100644 dir/subdir/tweaked/Makefile
+ create mode 100644 dir/subdir/tweaked/f
+ create mode 100644 dir/subdir/tweaked/g
+ create mode 100644 dir/subdir/tweaked/h
+ create mode 100644 dir/unchanged/file_1
+ create mode 100644 dir/unchanged/file_10
+ create mode 100644 dir/unchanged/file_11
+ create mode 100644 dir/unchanged/file_12
+ create mode 100644 dir/unchanged/file_13
+ create mode 100644 dir/unchanged/file_14
+ create mode 100644 dir/unchanged/file_15
+ create mode 100644 dir/unchanged/file_16
+ create mode 100644 dir/unchanged/file_17
+ create mode 100644 dir/unchanged/file_18
+ create mode 100644 dir/unchanged/file_19
+ create mode 100644 dir/unchanged/file_2
+ create mode 100644 dir/unchanged/file_20
+ create mode 100644 dir/unchanged/file_21
+ create mode 100644 dir/unchanged/file_22
+ create mode 100644 dir/unchanged/file_23
+ create mode 100644 dir/unchanged/file_24
+ create mode 100644 dir/unchanged/file_25
+ create mode 100644 dir/unchanged/file_26
+ create mode 100644 dir/unchanged/file_27
+ create mode 100644 dir/unchanged/file_28
+ create mode 100644 dir/unchanged/file_29
+ create mode 100644 dir/unchanged/file_3
+ create mode 100644 dir/unchanged/file_30
+ create mode 100644 dir/unchanged/file_31
+ create mode 100644 dir/unchanged/file_32
+ create mode 100644 dir/unchanged/file_33
+ create mode 100644 dir/unchanged/file_34
+ create mode 100644 dir/unchanged/file_35
+ create mode 100644 dir/unchanged/file_36
+ create mode 100644 dir/unchanged/file_37
+ create mode 100644 dir/unchanged/file_38
+ create mode 100644 dir/unchanged/file_39
+ create mode 100644 dir/unchanged/file_4
+ create mode 100644 dir/unchanged/file_40
+ create mode 100644 dir/unchanged/file_41
+ create mode 100644 dir/unchanged/file_42
+ create mode 100644 dir/unchanged/file_43
+ create mode 100644 dir/unchanged/file_44
+ create mode 100644 dir/unchanged/file_45
+ create mode 100644 dir/unchanged/file_46
+ create mode 100644 dir/unchanged/file_47
+ create mode 100644 dir/unchanged/file_48
+ create mode 100644 dir/unchanged/file_49
+ create mode 100644 dir/unchanged/file_5
+ create mode 100644 dir/unchanged/file_50
+ create mode 100644 dir/unchanged/file_51
+ create mode 100644 dir/unchanged/file_52
+ create mode 100644 dir/unchanged/file_53
+ create mode 100644 dir/unchanged/file_54
+ create mode 100644 dir/unchanged/file_55
+ create mode 100644 dir/unchanged/file_56
+ create mode 100644 dir/unchanged/file_57
+ create mode 100644 dir/unchanged/file_58
+ create mode 100644 dir/unchanged/file_59
+ create mode 100644 dir/unchanged/file_6
+ create mode 100644 dir/unchanged/file_60
+ create mode 100644 dir/unchanged/file_61
+ create mode 100644 dir/unchanged/file_62
+ create mode 100644 dir/unchanged/file_63
+ create mode 100644 dir/unchanged/file_64
+ create mode 100644 dir/unchanged/file_65
+ create mode 100644 dir/unchanged/file_66
+ create mode 100644 dir/unchanged/file_67
+ create mode 100644 dir/unchanged/file_68
+ create mode 100644 dir/unchanged/file_69
+ create mode 100644 dir/unchanged/file_7
+ create mode 100644 dir/unchanged/file_70
+ create mode 100644 dir/unchanged/file_71
+ create mode 100644 dir/unchanged/file_72
+ create mode 100644 dir/unchanged/file_73
+ create mode 100644 dir/unchanged/file_74
+ create mode 100644 dir/unchanged/file_75
+ create mode 100644 dir/unchanged/file_76
+ create mode 100644 dir/unchanged/file_77
+ create mode 100644 dir/unchanged/file_78
+ create mode 100644 dir/unchanged/file_79
+ create mode 100644 dir/unchanged/file_8
+ create mode 100644 dir/unchanged/file_80
+ create mode 100644 dir/unchanged/file_81
+ create mode 100644 dir/unchanged/file_82
+ create mode 100644 dir/unchanged/file_83
+ create mode 100644 dir/unchanged/file_84
+ create mode 100644 dir/unchanged/file_85
+ create mode 100644 dir/unchanged/file_86
+ create mode 100644 dir/unchanged/file_87
+ create mode 100644 dir/unchanged/file_88
+ create mode 100644 dir/unchanged/file_9
+Switched to branch 'A'
+rm 'dir/subdir/tweaked/f'
+rm 'dir/subdir/tweaked/g'
+[A 9910422] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside
+ 98 files changed, 5 deletions(-)
+ delete mode 100644 dir/subdir/tweaked/f
+ delete mode 100644 dir/subdir/tweaked/g
+ rename {dir => folder}/subdir/Makefile (90%)
+ rename {dir => folder}/subdir/a (100%)
+ rename {dir => folder}/subdir/b (100%)
+ rename {dir => folder}/subdir/c (100%)
+ rename {dir => folder}/subdir/d (100%)
+ rename {dir/subdir => folder/subdir/newsubdir}/e (90%)
+ rename {dir => folder}/subdir/tweaked/Makefile (90%)
+ rename {dir => folder}/subdir/tweaked/h (100%)
+ rename {dir => folder}/unchanged/file_1 (100%)
+ rename {dir => folder}/unchanged/file_10 (100%)
+ rename {dir => folder}/unchanged/file_11 (100%)
+ rename {dir => folder}/unchanged/file_12 (100%)
+ rename {dir => folder}/unchanged/file_13 (100%)
+ rename {dir => folder}/unchanged/file_14 (100%)
+ rename {dir => folder}/unchanged/file_15 (100%)
+ rename {dir => folder}/unchanged/file_16 (100%)
+ rename {dir => folder}/unchanged/file_17 (100%)
+ rename {dir => folder}/unchanged/file_18 (100%)
+ rename {dir => folder}/unchanged/file_19 (100%)
+ rename {dir => folder}/unchanged/file_2 (100%)
+ rename {dir => folder}/unchanged/file_20 (100%)
+ rename {dir => folder}/unchanged/file_21 (100%)
+ rename {dir => folder}/unchanged/file_22 (100%)
+ rename {dir => folder}/unchanged/file_23 (100%)
+ rename {dir => folder}/unchanged/file_24 (100%)
+ rename {dir => folder}/unchanged/file_25 (100%)
+ rename {dir => folder}/unchanged/file_26 (100%)
+ rename {dir => folder}/unchanged/file_27 (100%)
+ rename {dir => folder}/unchanged/file_28 (100%)
+ rename {dir => folder}/unchanged/file_29 (100%)
+ rename {dir => folder}/unchanged/file_3 (100%)
+ rename {dir => folder}/unchanged/file_30 (100%)
+ rename {dir => folder}/unchanged/file_31 (100%)
+ rename {dir => folder}/unchanged/file_32 (100%)
+ rename {dir => folder}/unchanged/file_33 (100%)
+ rename {dir => folder}/unchanged/file_34 (100%)
+ rename {dir => folder}/unchanged/file_35 (100%)
+ rename {dir => folder}/unchanged/file_36 (100%)
+ rename {dir => folder}/unchanged/file_37 (100%)
+ rename {dir => folder}/unchanged/file_38 (100%)
+ rename {dir => folder}/unchanged/file_39 (100%)
+ rename {dir => folder}/unchanged/file_4 (100%)
+ rename {dir => folder}/unchanged/file_40 (100%)
+ rename {dir => folder}/unchanged/file_41 (100%)
+ rename {dir => folder}/unchanged/file_42 (100%)
+ rename {dir => folder}/unchanged/file_43 (100%)
+ rename {dir => folder}/unchanged/file_44 (100%)
+ rename {dir => folder}/unchanged/file_45 (100%)
+ rename {dir => folder}/unchanged/file_46 (100%)
+ rename {dir => folder}/unchanged/file_47 (100%)
+ rename {dir => folder}/unchanged/file_48 (100%)
+ rename {dir => folder}/unchanged/file_49 (100%)
+ rename {dir => folder}/unchanged/file_5 (100%)
+ rename {dir => folder}/unchanged/file_50 (100%)
+ rename {dir => folder}/unchanged/file_51 (100%)
+ rename {dir => folder}/unchanged/file_52 (100%)
+ rename {dir => folder}/unchanged/file_53 (100%)
+ rename {dir => folder}/unchanged/file_54 (100%)
+ rename {dir => folder}/unchanged/file_55 (100%)
+ rename {dir => folder}/unchanged/file_56 (100%)
+ rename {dir => folder}/unchanged/file_57 (100%)
+ rename {dir => folder}/unchanged/file_58 (100%)
+ rename {dir => folder}/unchanged/file_59 (100%)
+ rename {dir => folder}/unchanged/file_6 (100%)
+ rename {dir => folder}/unchanged/file_60 (100%)
+ rename {dir => folder}/unchanged/file_61 (100%)
+ rename {dir => folder}/unchanged/file_62 (100%)
+ rename {dir => folder}/unchanged/file_63 (100%)
+ rename {dir => folder}/unchanged/file_64 (100%)
+ rename {dir => folder}/unchanged/file_65 (100%)
+ rename {dir => folder}/unchanged/file_66 (100%)
+ rename {dir => folder}/unchanged/file_67 (100%)
+ rename {dir => folder}/unchanged/file_68 (100%)
+ rename {dir => folder}/unchanged/file_69 (100%)
+ rename {dir => folder}/unchanged/file_7 (100%)
+ rename {dir => folder}/unchanged/file_70 (100%)
+ rename {dir => folder}/unchanged/file_71 (100%)
+ rename {dir => folder}/unchanged/file_72 (100%)
+ rename {dir => folder}/unchanged/file_73 (100%)
+ rename {dir => folder}/unchanged/file_74 (100%)
+ rename {dir => folder}/unchanged/file_75 (100%)
+ rename {dir => folder}/unchanged/file_76 (100%)
+ rename {dir => folder}/unchanged/file_77 (100%)
+ rename {dir => folder}/unchanged/file_78 (100%)
+ rename {dir => folder}/unchanged/file_79 (100%)
+ rename {dir => folder}/unchanged/file_8 (100%)
+ rename {dir => folder}/unchanged/file_80 (100%)
+ rename {dir => folder}/unchanged/file_81 (100%)
+ rename {dir => folder}/unchanged/file_82 (100%)
+ rename {dir => folder}/unchanged/file_83 (100%)
+ rename {dir => folder}/unchanged/file_84 (100%)
+ rename {dir => folder}/unchanged/file_85 (100%)
+ rename {dir => folder}/unchanged/file_86 (100%)
+ rename {dir => folder}/unchanged/file_87 (100%)
+ rename {dir => folder}/unchanged/file_88 (100%)
+ rename {dir => folder}/unchanged/file_9 (100%)
+Switched to branch 'B'
+[B 9770da3] B1
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir/subdir/newfile.c
+ create mode 100644 dir/subdir/newsubdir/newfile.py
+[B 0eecb62] B2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir/subdir/newfile.rs
 Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
@@ -446557,327 +446877,277 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 0ddfaf1 A
-[detached HEAD f7fe030] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 oneside
-ok 1 - setup
-
-expecting success of 7060.2 'A/A conflict': 
-	git checkout B^0 &&
-	test_must_fail git merge C
-
-Previous HEAD position was f7fe030 C
-HEAD is now at 5747a32 B
-Auto-merging oneside
-CONFLICT (add/add): Merge conflict in oneside
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - A/A conflict
+HEAD is now at 9910422 A
+Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/Bmod.
+Checking the pick of B1...
+fatal: path 'dir' does not exist in 'Bmod~1'
+Bmod~1:dir
+Checking the pick of B2...
+fatal: path 'dir' does not exist in 'Bmod'
+Bmod:dir
+ok 59 - 12f: Trivial directory resolve, caching, all kinds of fun
 
-expecting success of 7060.3 'Report path with conflict': 
-	git diff --cached --name-status >actual &&
-	echo "U	oneside" >expect &&
-	test_cmp expect actual
+expecting success of 6423.60 '12g: Testcase with two kinds of "relevant" renames': 
+	test_setup_12g &&
+	(
+		cd 12g &&
 
-ok 3 - Report path with conflict
+		git checkout A^0 &&
 
-expecting success of 7060.4 'Report new path with conflict': 
-	git diff --cached --name-status HEAD^ >actual &&
-	echo "U	oneside" >expect &&
-	test_cmp expect actual
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 4 - Report new path with conflict
+		test_write_lines once upon a time there was a repo >expect &&
+		test_cmp expect newfile &&
 
-expecting success of 7060.5 'M/D conflict does not segfault': 
-	cat >expect <<EOF &&
-On branch side
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
 
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-	deleted by us:   foo
+		git rev-parse >actual \
+			HEAD:newdir/a  HEAD:newdir/b   HEAD:newdir/c &&
+		git rev-parse >expect \
+			B:newdir/a     B:newdir/b      A:subdir/c &&
+		test_cmp expect actual &&
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	mkdir mdconflict &&
-	(
-		cd mdconflict &&
-		git init &&
-		test_commit initial foo "" &&
-		test_commit modify foo foo &&
-		git checkout -b side HEAD^ &&
-		git rm foo &&
-		git commit -m delete &&
-		test_must_fail git merge main &&
-		test_must_fail git commit --dry-run >../actual &&
-		test_cmp ../expect ../actual &&
-		git status >../actual &&
-		test_cmp ../expect ../actual
+		test_must_fail git rev-parse HEAD:subdir/a &&
+		test_must_fail git rev-parse HEAD:subdir/b &&
+		test_must_fail git rev-parse HEAD:subdir/c &&
+		test_path_is_missing subdir/ &&
+		test_path_is_file newdir/c
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7060-wtstatus/mdconflict/.git/
-[main (root-commit) a3c5375] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12g/.git/
+[master (root-commit) 4f375a3] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main efd4a38] modify
+ 3 files changed, 22 insertions(+)
+ create mode 100644 somefile
+ create mode 100644 subdir/a
+ create mode 100644 subdir/b
+Switched to branch 'A'
+[A 0338b5a] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'side'
-rm 'foo'
-[side 0599bc2] delete
+ 2 files changed, 1 insertion(+)
+ create mode 100644 subdir/c
+Switched to branch 'B'
+[B a6ab9df] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo
-CONFLICT (modify/delete): foo deleted in HEAD and modified in main.  Version main of foo left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 5 - M/D conflict does not segfault
+ 3 files changed, 3 insertions(+)
+ rename {subdir => newdir}/a (87%)
+ rename {subdir => newdir}/b (82%)
+ rename somefile => newfile (82%)
+Note: switching to 'A^0'.
 
-expecting success of 7060.6 'rename & unmerged setup': 
-	git rm -f -r . &&
-	cat "$TEST_DIRECTORY/README" >ONE &&
-	git add ONE &&
-	test_tick &&
-	git commit -m "One commit with ONE" &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	echo Modified >TWO &&
-	cat ONE >>TWO &&
-	cat ONE >>THREE &&
-	git add TWO THREE &&
-	sha1=$(git rev-parse :ONE) &&
-	git rm --cached ONE &&
-	(
-		echo "100644 $sha1 1	ONE" &&
-		echo "100644 $sha1 2	ONE" &&
-		echo "100644 $sha1 3	ONE"
-	) | git update-index --index-info &&
-	echo Further >>THREE
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-rm 'A.t'
-rm 'oneside'
-rm 'oneside'
-[detached HEAD 76f0b67] One commit with ONE
- Author: A U Thor <author@example.com>
-rm 'ONE'
-ok 6 - rename & unmerged setup
+  git switch -c <new-branch-name>
 
-expecting success of 7060.7 'rename & unmerged status': 
-	git status -suno >actual &&
-	cat >expect <<-EOF &&
-	UU ONE
-	AM THREE
-	A  TWO
-	EOF
-	test_cmp expect actual
+Or undo this operation with:
 
-ok 7 - rename & unmerged status
+  git switch -
 
-expecting success of 7060.8 'git diff-index --cached shows 2 added + 1 unmerged': 
-	cat >expected <<-EOF &&
-	U	ONE
-	A	THREE
-	A	TWO
-	EOF
-	git diff-index --cached --name-status HEAD >actual &&
-	test_cmp expected actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 8 - git diff-index --cached shows 2 added + 1 unmerged
+HEAD is now at 0338b5a A
+Path updated: subdir/c added in HEAD inside a directory that was renamed in B^0; moving it to newdir/c.
+Auto-merging newfile
+Merge made by the 'ort' strategy.
+ {subdir => newdir}/a | 1 +
+ {subdir => newdir}/b | 1 +
+ {subdir => newdir}/c | 0
+ somefile => newfile  | 1 +
+ 4 files changed, 3 insertions(+)
+ rename {subdir => newdir}/a (87%)
+ rename {subdir => newdir}/b (82%)
+ rename {subdir => newdir}/c (100%)
+ rename somefile => newfile (85%)
+fatal: path 'subdir/a' does not exist in 'HEAD'
+HEAD:subdir/a
+fatal: path 'subdir/b' does not exist in 'HEAD'
+HEAD:subdir/b
+fatal: path 'subdir/c' does not exist in 'HEAD'
+HEAD:subdir/c
+ok 60 - 12g: Testcase with two kinds of "relevant" renames
 
-expecting success of 7060.9 'git diff-index --cached -M shows 2 added + 1 unmerged': 
-	cat >expected <<-EOF &&
-	U	ONE
-	A	THREE
-	A	TWO
-	EOF
-	git diff-index --cached -M --name-status HEAD >actual &&
-	test_cmp expected actual
+checking known breakage of 6423.61 '12h: renaming a file within a renamed directory': 
+	test_setup_12h &&
+	(
+		cd 12h &&
 
-ok 9 - git diff-index --cached -M shows 2 added + 1 unmerged
+		git checkout A^0 &&
 
-expecting success of 7060.10 'git diff-index --cached -C shows 2 copies + 1 unmerged': 
-	cat >expected <<-EOF &&
-	U	ONE
-	C	ONE	THREE
-	C	ONE	TWO
-	EOF
-	git diff-index --cached -C --name-status HEAD |
-	sed "s/^C[0-9]*/C/g" >actual &&
-	test_cmp expected actual
+		test_might_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-ok 10 - git diff-index --cached -C shows 2 copies + 1 unmerged
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
 
-expecting success of 7060.11 'status when conflicts with add and rm advice (deleted by them)': 
-	git reset --hard &&
-	git checkout main &&
-	test_commit init main.txt init &&
-	git checkout -b second_branch &&
-	git rm main.txt &&
-	git commit -m "main.txt deleted on second_branch" &&
-	test_commit second conflict.txt second &&
-	git checkout main &&
-	test_commit on_second main.txt on_second &&
-	test_commit main conflict.txt main &&
-	test_must_fail git merge second_branch &&
-	cat >expected <<\EOF &&
-On branch main
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
+		test_path_is_missing olddir/a &&
+		test_path_is_file newdir/alpha &&
+		test_path_is_file newdir/b &&
 
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-	both added:      conflict.txt
-	deleted by them: main.txt
+		git rev-parse >actual \
+			HEAD:newdir/alpha  HEAD:newdir/b &&
+		git rev-parse >expect \
+			A:newdir/a         O:oldir/b &&
+		test_cmp expect actual
+	)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --untracked-files=no >actual &&
-	test_cmp expected actual
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12h/.git/
+[master (root-commit) 94e6431] orig
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 olddir/a
+ create mode 100644 olddir/b
+Switched to branch 'A'
+[A 9bdc996] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ rename {olddir => newdir}/a (70%)
+ rename {olddir => newdir}/b (100%)
+Switched to branch 'B'
+[B bec6409] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename olddir/{a => alpha} (100%)
+Note: switching to 'A^0'.
 
-HEAD is now at 76f0b67 One commit with ONE
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-  76f0b67 One commit with ONE
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+  git switch -c <new-branch-name>
 
- git branch <new-branch-name> 76f0b67
+Or undo this operation with:
 
-Switched to branch 'main'
-[main e5fc44e] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main.txt
-Switched to a new branch 'second_branch'
-rm 'main.txt'
-[second_branch 1fd8046] main.txt deleted on second_branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 main.txt
-[second_branch e4d0ede] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'main'
-[main 9824e6a] on_second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 62fe2e7] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Auto-merging conflict.txt
-CONFLICT (add/add): Merge conflict in conflict.txt
-CONFLICT (modify/delete): main.txt deleted in second_branch and modified in HEAD.  Version HEAD of main.txt left in tree.
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 9bdc996 A
+Path updated: olddir/a renamed to olddir/alpha in B^0, inside a directory that was renamed in HEAD; moving it to newdir/alpha.
+CONFLICT (rename/rename): olddir/a renamed to newdir/a in HEAD and to newdir/alpha in B^0.
 Automatic merge failed; fix conflicts and then commit the result.
-ok 11 - status when conflicts with add and rm advice (deleted by them)
+test_line_count: line count for tracked != 2
+newdir/a
+newdir/alpha
+newdir/b
+olddir/a
+not ok 61 - 12h: renaming a file within a renamed directory # TODO known breakage
 
-expecting success of 7060.12 'prepare for conflicts': 
-	git reset --hard &&
-	git checkout -b conflict &&
-	test_commit one main.txt one &&
-	git branch conflict_second &&
-	git mv main.txt sub_main.txt &&
-	git commit -m "main.txt renamed in sub_main.txt" &&
-	git checkout conflict_second &&
-	git mv main.txt sub_second.txt &&
-	git commit -m "main.txt renamed in sub_second.txt"
+expecting success of 6423.62 '12i: Directory rename causes rename-to-self': 
+	test_setup_12i &&
+	(
+		cd 12i &&
 
-HEAD is now at 62fe2e7 main
-Switched to a new branch 'conflict'
-[conflict efc0b61] one
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+
+		test_path_is_missing source/subdir &&
+		test_path_is_file source/bar &&
+		test_path_is_file source/baz &&
+
+		git ls-files >actual &&
+		uniq <actual >tracked &&
+		test_line_count = 3 tracked &&
+
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU source/bar
+		 M source/baz
+		EOF
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12i/.git/
+[master (root-commit) 552586d] orig
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[conflict 05be729] main.txt renamed in sub_main.txt
+ 3 files changed, 3 insertions(+)
+ create mode 100644 source/bar
+ create mode 100644 source/baz
+ create mode 100644 source/subdir/foo
+Switched to branch 'A'
+[A 46a9eed] A
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename main.txt => sub_main.txt (100%)
-Switched to branch 'conflict_second'
-[conflict_second 8f2ff74] main.txt renamed in sub_second.txt
+ rename source/{subdir => }/foo (100%)
+Switched to branch 'B'
+[B 50b462a] B
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename main.txt => sub_second.txt (100%)
-ok 12 - prepare for conflicts
+ rename source/{ => subdir}/bar (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7060.13 'status when conflicts with add and rm advice (both deleted)': 
-	test_must_fail git merge conflict &&
-	cat >expected <<\EOF &&
-On branch conflict_second
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Unmerged paths:
-  (use "git add/rm <file>..." as appropriate to mark resolution)
-	both deleted:    main.txt
-	added by them:   sub_main.txt
-	added by us:     sub_second.txt
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --untracked-files=no >actual &&
-	test_cmp expected actual
+  git switch -c <new-branch-name>
 
-CONFLICT (rename/rename): main.txt renamed to sub_second.txt in HEAD and to sub_main.txt in conflict.
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 46a9eed A
+M	source/baz
+CONFLICT (file location): source/subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to source/bar.
 Automatic merge failed; fix conflicts and then commit the result.
-ok 13 - status when conflicts with add and rm advice (both deleted)
+ok 62 - 12i: Directory rename causes rename-to-self
 
-expecting success of 7060.14 'status when conflicts with only rm advice (both deleted)': 
-	git reset --hard conflict_second &&
-	test_must_fail git merge conflict &&
-	git add sub_main.txt &&
-	git add sub_second.txt &&
-	cat >expected <<\EOF &&
-On branch conflict_second
-You have unmerged paths.
-  (fix conflicts and run "git commit")
-  (use "git merge --abort" to abort the merge)
+expecting success of 6423.63 '12j: Directory rename to root causes rename-to-self': 
+	test_setup_12j &&
+	(
+		cd 12j &&
 
-Changes to be committed:
-	new file:   sub_main.txt
+		git checkout A^0 &&
 
-Unmerged paths:
-  (use "git rm <file>..." to mark resolution)
-	both deleted:    main.txt
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git status --untracked-files=no >actual &&
-	test_cmp expected actual &&
-	git reset --hard &&
-	git checkout main
+		test_path_is_missing subdir &&
+		test_path_is_file bar &&
+		test_path_is_file baz &&
 
-HEAD is now at 8f2ff74 main.txt renamed in sub_second.txt
-CONFLICT (rename/rename): main.txt renamed to sub_second.txt in HEAD and to sub_main.txt in conflict.
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 8f2ff74 main.txt renamed in sub_second.txt
-warning: refname 'main' is ambiguous.
-Switched to branch 'main'
-ok 14 - status when conflicts with only rm advice (both deleted)
+		git ls-files >actual &&
+		uniq <actual >tracked &&
+		test_line_count = 3 tracked &&
 
-expecting success of 7060.15 'status --branch with detached HEAD': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git status --branch --porcelain >actual &&
-	cat >expected <<-EOF &&
-	## HEAD (no branch)
-	?? .gitconfig
-	?? actual
-	?? expect
-	?? expected
-	?? mdconflict/
-	EOF
-	test_cmp expected actual
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU bar
+		 M baz
+		EOF
+		test_cmp expect actual
+	)
 
-HEAD is now at 62fe2e7 main
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-Note: switching to 'main^0'.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12j/.git/
+[master (root-commit) 59aeda9] orig
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 bar
+ create mode 100644 baz
+ create mode 100644 subdir/foo
+Switched to branch 'A'
+[A 493a8b6] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename subdir/foo => foo (100%)
+Switched to branch 'B'
+[B b7d0322] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bar => subdir/bar (100%)
+Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -446894,1499 +447164,1635 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 62fe2e7 main
-ok 15 - status --branch with detached HEAD
+HEAD is now at 493a8b6 A
+M	baz
+CONFLICT (file location): subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to bar.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 63 - 12j: Directory rename to root causes rename-to-self
 
-expecting success of 7060.16 'status --porcelain=v1 --branch with detached HEAD': 
-	git reset --hard &&
-	git checkout main^0 &&
-	git status --branch --porcelain=v1 >actual &&
-	cat >expected <<-EOF &&
-	## HEAD (no branch)
-	?? .gitconfig
-	?? actual
-	?? expect
-	?? expected
-	?? mdconflict/
-	EOF
-	test_cmp expected actual
+expecting success of 6423.64 '12k: Directory rename with sibling causes rename-to-self': 
+	test_setup_12k &&
+	(
+		cd 12k &&
 
-HEAD is now at 62fe2e7 main
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-HEAD is now at 62fe2e7 main
-ok 16 - status --porcelain=v1 --branch with detached HEAD
+		git checkout A^0 &&
 
-expecting success of 7060.17 'status --porcelain=bogus': 
-	test_must_fail git status --porcelain=bogus
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-fatal: unsupported porcelain version 'bogus'
-ok 17 - status --porcelain=bogus
+		test_path_is_missing dirB &&
+		test_path_is_file dirA/bar &&
+		test_path_is_file dirA/baz &&
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7103-reset-bare.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7103-reset-bare/.git/
-expecting success of 7103.1 'setup non-bare': 
-	echo one >file &&
-	git add file &&
-	git commit -m one &&
-	echo two >file &&
-	git commit -a -m two
+		git ls-files >actual &&
+		uniq <actual >tracked &&
+		test_line_count = 3 tracked &&
 
-[master (root-commit) 1993c08] one
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU dirA/bar
+		 M dirA/baz
+		EOF
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12k/.git/
+[master (root-commit) d90d96e] orig
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 2f98c16] two
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dirA/bar
+ create mode 100644 dirA/baz
+ create mode 100644 dirB/foo
+Switched to branch 'A'
+[A 1e2e223] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup non-bare
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dirB => dirA}/foo (100%)
+Switched to branch 'B'
+[B 8f7e5e2] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dirA => dirB}/bar (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7103.2 '"hard" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --hard)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-fatal: this operation must be run in a work tree
-ok 2 - "hard" reset requires a worktree
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7103.3 '"merge" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --merge)
+  git switch -c <new-branch-name>
 
-fatal: this operation must be run in a work tree
-ok 3 - "merge" reset requires a worktree
+Or undo this operation with:
 
-expecting success of 7103.4 '"keep" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --keep)
+  git switch -
 
-fatal: this operation must be run in a work tree
-ok 4 - "keep" reset requires a worktree
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7103.5 '"mixed" reset is ok': 
-	(cd .git && git reset)
+HEAD is now at 1e2e223 A
+M	dirA/baz
+CONFLICT (file location): dirB/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to dirA/bar.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 64 - 12k: Directory rename with sibling causes rename-to-self
 
-ok 5 - "mixed" reset is ok
+expecting success of 6423.65 '12l (B into A): Rename into each other + add/add conflict': 
+	test_setup_12l BintoA &&
+	(
+		cd 12l_BintoA &&
 
-expecting success of 7103.6 '"soft" reset is ok': 
-	(cd .git && git reset --soft)
+		git checkout -q A^0 &&
 
-ok 6 - "soft" reset is ok
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
-expecting success of 7103.7 'hard reset works with GIT_WORK_TREE': 
-	mkdir worktree &&
-	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
-	test_cmp file worktree/file
+		test_stdout_line_count = 5 git ls-files -s &&
 
-HEAD is now at 2f98c16 two
-ok 7 - hard reset works with GIT_WORK_TREE
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			A:sub2/new_add_add_file \
+			B:sub1/sub2/new_add_add_file &&
+		test_cmp expect actual &&
 
-expecting success of 7103.8 'setup bare': 
-	git clone --bare . bare.git &&
-	cd bare.git
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - setup bare
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12l_BintoA/.git/
+[master (root-commit) 3d69f53] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub1/file
+ create mode 100644 sub2/other
+Switched to branch 'A'
+[A e3180ab] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 sub2/new_add_add_file
+ rename {sub1 => sub3}/file (100%)
+Switched to branch 'B'
+[B 4fbab5b] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 sub1/newfile
+ create mode 100644 sub1/sub2/new_add_add_file
+ rename {sub2 => sub1/sub2}/other (100%)
+Path updated: sub2/new_add_add_file added in HEAD inside a directory that was renamed in B^0; moving it to sub1/sub2/new_add_add_file.
+Auto-merging sub1/sub2/new_add_add_file
+CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
+Path updated: sub1/newfile added in B^0 inside a directory that was renamed in HEAD; moving it to sub3/newfile.
+Path updated: sub2/other renamed to sub1/sub2/other in B^0, inside a directory that was renamed in HEAD; moving it to sub3/sub2/other.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 65 - 12l (B into A): Rename into each other + add/add conflict
 
-expecting success of 7103.9 '"hard" reset is not allowed in bare': 
-	test_must_fail git reset --hard HEAD^
+expecting success of 6423.66 '12l (A into B): Rename into each other + add/add conflict': 
+	test_setup_12l AintoB &&
+	(
+		cd 12l_AintoB &&
 
-fatal: this operation must be run in a work tree
-ok 9 - "hard" reset is not allowed in bare
+		git checkout -q B^0 &&
 
-expecting success of 7103.10 '"merge" reset is not allowed in bare': 
-	test_must_fail git reset --merge HEAD^
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 &&
 
-fatal: this operation must be run in a work tree
-ok 10 - "merge" reset is not allowed in bare
+		test_stdout_line_count = 5 git ls-files -s &&
 
-expecting success of 7103.11 '"keep" reset is not allowed in bare': 
-	test_must_fail git reset --keep HEAD^
+		git rev-parse >actual \
+			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
+			:2:sub1/sub2/new_add_add_file \
+			:3:sub1/sub2/new_add_add_file &&
+		git rev-parse >expect \
+			O:sub1/file  B:sub1/newfile O:sub2/other \
+			B:sub1/sub2/new_add_add_file \
+			A:sub2/new_add_add_file &&
+		test_cmp expect actual &&
 
-fatal: this operation must be run in a work tree
-ok 11 - "keep" reset is not allowed in bare
+		git ls-files -o >actual &&
+		test_write_lines actual expect >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
-	test_must_fail git reset --mixed HEAD^
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12l_AintoB/.git/
+[master (root-commit) 3d69f53] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 sub1/file
+ create mode 100644 sub2/other
+Switched to branch 'A'
+[A e3180ab] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 sub2/new_add_add_file
+ rename {sub1 => sub3}/file (100%)
+Switched to branch 'B'
+[B 4fbab5b] B
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 sub1/newfile
+ create mode 100644 sub1/sub2/new_add_add_file
+ rename {sub2 => sub1/sub2}/other (100%)
+Path updated: sub2/new_add_add_file added in A^0 inside a directory that was renamed in HEAD; moving it to sub1/sub2/new_add_add_file.
+Auto-merging sub1/sub2/new_add_add_file
+CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
+Path updated: sub1/newfile added in HEAD inside a directory that was renamed in A^0; moving it to sub3/newfile.
+Path updated: sub2/other renamed to sub1/sub2/other in HEAD, inside a directory that was renamed in A^0; moving it to sub3/sub2/other.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 66 - 12l (A into B): Rename into each other + add/add conflict
 
-fatal: mixed reset is not allowed in a bare repository
-ok 12 - "mixed" reset is not allowed in bare
+expecting success of 6423.67 '12m: Change parent of renamed-dir to symlink on other side': 
+	test_setup_12m &&
+	(
+		cd 12m &&
 
-expecting success of 7103.13 '"soft" reset is allowed in bare': 
-	git reset --soft HEAD^ &&
-	git show --pretty=format:%s >out &&
-	echo one >expect &&
-	head -n 1 out >actual &&
-	test_cmp expect actual
+		git checkout -q A^0 &&
 
-ok 13 - "soft" reset is allowed in bare
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7104-reset-hard.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7104-reset-hard/.git/
-expecting success of 7104.1 'setup': 
+		test_stdout_line_count = 3 git ls-files -s &&
+		test_stdout_line_count = 2 ls -1 renamed-dir &&
+		test_path_is_missing dir
+	)
 
-	mkdir before later &&
-	>before/1 &&
-	>before/2 &&
-	>hello &&
-	>later/3 &&
-	git add before hello later &&
-	git commit -m world &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12m/.git/
+[master (root-commit) c5527ce] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/subdir/file
+Switched to branch 'A'
+[A 4ee9449] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {dir => renamed-dir}/subdir/file (100%)
+Switched to branch 'B'
+rm 'dir/subdir/file'
+[B 7225d2a] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 120000 dir/subdir
+ delete mode 100644 dir/subdir/file
+CONFLICT (file location): dir/subdir added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to renamed-dir/subdir.
+CONFLICT (rename/delete): dir/subdir/file renamed to renamed-dir/subdir/file in HEAD, but deleted in B^0.
+CONFLICT (file/directory): directory in the way of renamed-dir/subdir from B^0; moving it to renamed-dir/subdir~B^0 instead.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 67 - 12m: Change parent of renamed-dir to symlink on other side
 
-	H=$(git rev-parse :hello) &&
-	git rm --cached hello &&
-	echo "100644 $H 2	hello" | git update-index --index-info &&
+expecting success of 6423.68 '12n: Directory rename transitively makes rename back to self': 
+	test_setup_12n &&
+	(
+		cd 12n &&
 
-	rm -f hello &&
-	mkdir -p hello &&
-	>hello/world &&
-	test "$(git ls-files -o)" = hello/world
+		git checkout -q B^0 &&
 
+		test_must_fail git cherry-pick A^0 >out &&
+		grep "CONFLICT (file location).*should perhaps be moved" out
+	)
 
-[master (root-commit) 53313cc] world
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12n/.git/
+[master (root-commit) ce200d8] O
  Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 before/1
- create mode 100644 before/2
- create mode 100644 hello
- create mode 100644 later/3
-rm 'hello'
-ok 1 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tools/hello
+Switched to branch 'A'
+[A dac8a10] Move world into tools/
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename world => tools/world (100%)
+Switched to branch 'B'
+[B 348168e] Move hello from tools/ to toplevel
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename tools/hello => hello (100%)
+error: could not apply dac8a10... Move world into tools/
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+CONFLICT (file location): world renamed to tools/world in dac8a10 (Move world into tools/), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to world.
+ok 68 - 12n: Directory rename transitively makes rename back to self
 
-expecting success of 7104.2 'reset --hard should restore unmerged ones': 
+expecting success of 6423.69 '13a(conflict): messages for newly added files': 
+	test_setup_13a conflict &&
+	(
+		cd 13a_conflict &&
 
-	git reset --hard &&
-	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
-	test -f hello
+		git checkout A^0 &&
 
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-HEAD is now at 53313cc world
-before/1
-before/2
-hello
-later/3
-ok 2 - reset --hard should restore unmerged ones
+		test_grep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
+		test_grep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
 
-expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/[de]" paths &&
 
-	T=$(git write-tree) &&
-	rm -f .git/index &&
-	git add before hello later &&
-	U=$(git write-tree) &&
-	test "$T" = "$U"
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d &&
+		test_path_is_missing z/e/f &&
+		test_path_is_file    y/e/f
+	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13a_conflict/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+Note: switching to 'A^0'.
 
-ok 3 - reset --hard did not corrupt index or cache-tree
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7106-reset-unborn-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7106-reset-unborn-branch/.git/
-expecting success of 7106.1 'setup': 
-	echo a >a &&
-	echo b >b
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 1 - setup
+  git switch -c <new-branch-name>
 
-expecting success of 7106.2 'reset': 
-	git add a b &&
-	git reset &&
+Or undo this operation with:
 
-	git ls-files >actual &&
-	test_must_be_empty actual
+  git switch -
 
-ok 2 - reset
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7106.3 'reset HEAD': 
-	rm .git/index &&
-	git add a b &&
-	test_must_fail git reset HEAD
+HEAD is now at 4e9f86d A
+CONFLICT (file location): z/e/f added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/e/f.
+CONFLICT (file location): z/d added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/e/f
+ok 69 - 13a(conflict): messages for newly added files
 
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 3 - reset HEAD
+expecting success of 6423.70 '13a(info): messages for newly added files': 
+	test_setup_13a info &&
+	(
+		cd 13a_info &&
 
-expecting success of 7106.4 'reset $file': 
-	rm .git/index &&
-	git add a b &&
-	git reset a &&
+		git reset --hard &&
+		git checkout A^0 &&
 
-	echo b >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-ok 4 - reset $file
+		test_grep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
+		test_grep Path.updated:.*z/d.added.in.B^0.*y/d out &&
 
-expecting success of 7106.5 'reset -p': 
-	rm .git/index &&
-	git add a &&
-	echo y >yes &&
-	git reset -p <yes >output &&
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/[de]" paths &&
 
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_grep "Unstage" output
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d &&
+		test_path_is_missing z/e/f &&
+		test_path_is_file    y/e/f
+	)
 
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-ok 5 - reset -p
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13a_info/.git/
+[master (root-commit) 4e96174] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 4e9f86d] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B aa97264] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 z/d
+ create mode 100644 z/e/f
+HEAD is now at aa97264 B
+Note: switching to 'A^0'.
 
-expecting success of 7106.6 'reset --soft is a no-op': 
-	rm .git/index &&
-	git add a &&
-	git reset --soft &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	echo a >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 6 - reset --soft is a no-op
+  git switch -c <new-branch-name>
 
-expecting success of 7106.7 'reset --hard': 
-	rm .git/index &&
-	git add a &&
-	test_when_finished "echo a >a" &&
-	git reset --hard &&
+Or undo this operation with:
 
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_path_is_missing a
+  git switch -
 
-ok 7 - reset --hard
+Turn off this advice by setting config variable advice.detachedHead to false
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7107-reset-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7107-reset-pathspec-file/.git/
-expecting success of 7107.1 'setup': 
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
-	git add . &&
-	git commit --include . -m "Commit" &&
-	git tag checkpoint
+HEAD is now at 4e9f86d A
+Path updated: z/e/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/e/f.
+Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+y/e/f
+ok 70 - 13a(info): messages for newly added files
 
-[master (root-commit) 4b301d4] Commit
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
- create mode 100644 fileC.t
- create mode 100644 fileD.t
-ok 1 - setup
+expecting success of 6423.71 '13b(conflict): messages for transitive rename with conflicted content': 
+	test_setup_13b conflict &&
+	(
+		cd 13b_conflict &&
 
-expecting success of 7107.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+		git checkout A^0 &&
 
-	git rm fileA.t &&
-	echo fileA.t | git reset --pathspec-from-file=- &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
+		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 2 - --pathspec-from-file from stdin
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-expecting success of 7107.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-	git rm fileA.t &&
-	echo fileA.t >list &&
-	git reset --pathspec-from-file=list &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13b_conflict/.git/
+[master (root-commit) f84ec32] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B cd61ab0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename {x => z}/d (75%)
+Note: switching to 'A^0'.
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 3 - --pathspec-from-file from file
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7107.4 'NUL delimiters': 
-	restore_checkpoint &&
+  git switch -c <new-branch-name>
 
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
+Or undo this operation with:
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
+  git switch -
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 4 - NUL delimiters
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7107.5 'LF delimiters': 
-	restore_checkpoint &&
+HEAD is now at a2010ab A
+CONFLICT (content): Merge conflict in y/d
+CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/d
+y/d
+ok 71 - 13b(conflict): messages for transitive rename with conflicted content
 
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
+expecting success of 6423.72 '13b(info): messages for transitive rename with conflicted content': 
+	test_setup_13b info &&
+	(
+		cd 13b_info &&
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
+		git reset --hard &&
+		git checkout A^0 &&
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 5 - LF delimiters
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-expecting success of 7107.6 'no trailing delimiter': 
-	restore_checkpoint &&
+		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
+		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
 
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 6 - no trailing delimiter
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13b_info/.git/
+[master (root-commit) f84ec32] O
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A a2010ab] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+Switched to branch 'B'
+[B cd61ab0] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename {x => z}/d (75%)
+HEAD is now at cd61ab0 B
+Note: switching to 'A^0'.
 
-expecting success of 7107.7 'CRLF delimiters': 
-	restore_checkpoint &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git rm fileA.t fileB.t &&
-	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	 D fileB.t
-	EOF
-	verify_expect
+  git switch -c <new-branch-name>
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-Unstaged changes after reset:
-D	fileA.t
-D	fileB.t
-ok 7 - CRLF delimiters
+Or undo this operation with:
 
-expecting success of 7107.8 'quotes': 
-	restore_checkpoint &&
+  git switch -
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	git rm fileA.t &&
-	git reset --pathspec-from-file=list &&
+HEAD is now at a2010ab A
+CONFLICT (content): Merge conflict in y/d
+Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+y/d
+y/d
+ok 72 - 13b(info): messages for transitive rename with conflicted content
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect
+expecting success of 6423.73 '13c(conflict): messages for rename/rename(1to1) via transitive rename': 
+	test_setup_13c conflict &&
+	(
+		cd 13c_conflict &&
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-Unstaged changes after reset:
-D	fileA.t
-ok 8 - quotes
+		git checkout A^0 &&
 
-expecting success of 7107.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
 
-	# Note: "git reset" has not yet learned to fail on wrong pathspecs
-	git reset --pathspec-from-file=list --pathspec-file-nul &&
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-	cat >expect <<-\EOF &&
-	 D fileA.t
-	EOF
-	verify_expect !
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
 
-HEAD is now at 4b301d4 Commit
---- expect	2026-04-19 19:23:19.923659440 +0000
-+++ actual	2026-04-19 19:23:19.923659440 +0000
-@@ -1 +0,0 @@
-- D fileA.t
-ok 9 - quotes not compatible with --pathspec-file-nul
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13c_conflict/.git/
+[master (root-commit) 868129a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 230cc6a] A
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => y}/d (100%)
+Switched to branch 'B'
+[B e9512b7] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+Note: switching to 'A^0'.
 
-expecting success of 7107.10 'only touches what was listed': 
-	restore_checkpoint &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git rm fileA.t fileB.t fileC.t fileD.t &&
-	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	cat >expect <<-\EOF &&
-	D  fileA.t
-	 D fileB.t
-	 D fileC.t
-	D  fileD.t
-	EOF
-	verify_expect
+  git switch -c <new-branch-name>
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-rm 'fileB.t'
-rm 'fileC.t'
-rm 'fileD.t'
-Unstaged changes after reset:
-D	fileB.t
-D	fileC.t
-ok 10 - only touches what was listed
+Or undo this operation with:
 
-expecting success of 7107.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	git rm fileA.t &&
+  git switch -
 
-	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+HEAD is now at 230cc6a A
+CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
+y/d
+y/d
+y/d
+ok 73 - 13c(conflict): messages for rename/rename(1to1) via transitive rename
 
-	test_must_fail git reset --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+expecting success of 6423.74 '13c(info): messages for rename/rename(1to1) via transitive rename': 
+	test_setup_13c info &&
+	(
+		cd 13c_info &&
 
-	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
-	test_grep -e "fatal: Cannot do soft reset with paths" err &&
+		git reset --hard &&
+		git checkout A^0 &&
 
-	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
-	test_grep -e "fatal: Cannot do hard reset with paths" err
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-HEAD is now at 4b301d4 Commit
-rm 'fileA.t'
-fatal: options '--pathspec-from-file' and '--patch' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-ok 11 - error conditions
+		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7105-reset-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7105-reset-patch/.git/
-expecting success of 7105.1 'setup': 
-	mkdir dir &&
-	echo parent > dir/foo &&
-	echo dummy > bar &&
-	git add dir &&
-	git commit -m initial &&
-	test_tick &&
-	test_commit second dir/foo head &&
-	set_and_save_state bar bar_work bar_index &&
-	save_head
+		git ls-files >paths &&
+		! grep z/ paths &&
+		grep "y/d" paths &&
 
-[master (root-commit) e9a8876] initial
+		test_path_is_missing z/d &&
+		test_path_is_file    y/d
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13c_info/.git/
+[master (root-commit) 868129a] O
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/foo
-[master 3877f48] second
+ 4 files changed, 13 insertions(+)
+ create mode 100644 x/d
+ create mode 100644 x/e
+ create mode 100644 z/b
+ create mode 100644 z/c
+Switched to branch 'A'
+[A 230cc6a] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {z => y}/b (100%)
+ rename {z => y}/c (100%)
+ rename {x => y}/d (100%)
+Switched to branch 'B'
+[B e9512b7] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {x => z}/d (100%)
+HEAD is now at e9512b7 B
+Note: switching to 'A^0'.
 
-expecting success of 7105.2 'saying "n" does nothing': 
-	set_and_save_state dir/foo work work &&
-	test_write_lines n n | git reset -p &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-diff --git a/bar b/bar
-new file mode 100644
-index 0000000..7780244
---- /dev/null
-+++ b/bar
-@@ -0,0 +1 @@
-+bar_index
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 2 - saying "n" does nothing
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7105.3 'git reset -p HEAD': 
-		set_and_save_state dir/foo work work &&
-		test_write_lines n y | git reset -p $opt >output &&
-		verify_state dir/foo work head &&
-		verify_saved_state bar &&
-		test_grep "Unstage" output
-	
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 3 - git reset -p HEAD
+  git switch -c <new-branch-name>
 
-expecting success of 7105.4 'git reset -p @': 
-		set_and_save_state dir/foo work work &&
-		test_write_lines n y | git reset -p $opt >output &&
-		verify_state dir/foo work head &&
-		verify_saved_state bar &&
-		test_grep "Unstage" output
-	
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 4 - git reset -p @
+Or undo this operation with:
 
-expecting success of 7105.5 'git reset -p ': 
-		set_and_save_state dir/foo work work &&
-		test_write_lines n y | git reset -p $opt >output &&
-		verify_state dir/foo work head &&
-		verify_saved_state bar &&
-		test_grep "Unstage" output
-	
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 5 - git reset -p 
+  git switch -
 
-expecting success of 7105.6 'git reset -p HEAD^': 
-	test_write_lines n y | git reset -p HEAD^ >output &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar &&
-	test_grep "Apply" output
+Turn off this advice by setting config variable advice.detachedHead to false
 
-(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
-(1/1) Apply this hunk to index [y,n,q,a,d,e,p,?]? 
-ok 6 - git reset -p HEAD^
+HEAD is now at 230cc6a A
+Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
+y/d
+ok 74 - 13c(info): messages for rename/rename(1to1) via transitive rename
 
-expecting success of 7105.7 'git reset -p HEAD^^{tree}': 
-	test_write_lines n y | git reset -p HEAD^^{tree} >output &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar &&
-	test_grep "Apply" output
+expecting success of 6423.75 '13d(conflict): messages for rename/rename(1to1) via dual transitive rename': 
+	test_setup_13d conflict &&
+	(
+		cd 13d_conflict &&
 
-(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
-ok 7 - git reset -p HEAD^^{tree}
+		git checkout A^0 &&
 
-expecting success of 7105.8 'git reset -p HEAD^:dir/foo (blob fails)': 
-	set_and_save_state dir/foo work work &&
-	test_must_fail git reset -p HEAD^:dir/foo &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-fatal: Could not parse object 'HEAD^:dir/foo'.
-ok 8 - git reset -p HEAD^:dir/foo (blob fails)
+		test_grep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
+		test_grep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
 
-expecting success of 7105.9 'git reset -p aaaaaaaa (unknown fails)': 
-	set_and_save_state dir/foo work work &&
-	test_must_fail git reset -p aaaaaaaa &&
-	verify_saved_state dir/foo &&
-	verify_saved_state bar
+		git ls-files >paths &&
+		! grep b/ paths &&
+		! grep c/ paths &&
+		grep "d/y" paths &&
 
-fatal: ambiguous argument 'aaaaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 9 - git reset -p aaaaaaaa (unknown fails)
+		test_path_is_missing b/y &&
+		test_path_is_missing c/y &&
+		test_path_is_file    d/y
+	)
 
-expecting success of 7105.10 'git reset -p dir': 
-	set_state dir/foo work work &&
-	test_write_lines y n | git reset -p dir &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13d_conflict/.git/
+[master (root-commit) c14d00a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+ create mode 100644 b/x
+ create mode 100644 c/w
+Switched to branch 'A'
+[A e246998] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {c => d}/w (100%)
+Switched to branch 'B'
+[B 0624e26] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => c}/y (100%)
+ rename {b => d}/x (100%)
+Note: switching to 'A^0'.
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 10 - git reset -p dir
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7105.11 'git reset -p -- foo (inside dir)': 
-	set_state dir/foo work work &&
-	test_write_lines y n | (cd dir && git reset -p -- foo) &&
-	verify_state dir/foo work head &&
-	verify_saved_state bar
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-diff --git a/dir/foo b/dir/foo
-index 564b12f..b8f99f5 100644
---- a/dir/foo
-+++ b/dir/foo
-@@ -1 +1 @@
--head
-+work
-(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
-ok 11 - git reset -p -- foo (inside dir)
+  git switch -c <new-branch-name>
 
-expecting success of 7105.12 'git reset -p HEAD^ -- dir': 
-	test_write_lines y n | git reset -p HEAD^ -- dir &&
-	verify_state dir/foo work parent &&
-	verify_saved_state bar
+Or undo this operation with:
 
-diff --git b/dir/foo a/dir/foo
-index 564b12f..9676f5b 100644
---- b/dir/foo
-+++ a/dir/foo
-@@ -1 +1 @@
--head
-+parent
-(1/1) Apply this hunk to index [y,n,q,a,d,e,p,?]? 
-ok 12 - git reset -p HEAD^ -- dir
+  git switch -
 
-expecting success of 7105.13 'none of this moved HEAD': 
-	verify_saved_head
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 13 - none of this moved HEAD
+HEAD is now at e246998 A
+CONFLICT (file location): a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0, suggesting it should perhaps be moved to d/y.
+CONFLICT (file location): a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to d/y.
+d/y
+d/y
+d/y
+ok 75 - 13d(conflict): messages for rename/rename(1to1) via dual transitive rename
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7064-wtstatus-pv2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7064-wtstatus-pv2/.git/
-expecting success of 7064.1 'setup': 
-	git checkout -f --orphan initial-branch &&
-	test_tick &&
-	git config core.autocrlf false &&
-	echo x >file_x &&
-	echo y >file_y &&
-	echo z >file_z &&
-	mkdir dir1 &&
-	echo a >dir1/file_a &&
-	echo b >dir1/file_b
+expecting success of 6423.76 '13d(info): messages for rename/rename(1to1) via dual transitive rename': 
+	test_setup_13d info &&
+	(
+		cd 13d_info &&
 
-Switched to a new branch 'initial-branch'
-ok 1 - setup
+		git reset --hard &&
+		git checkout A^0 &&
 
-expecting success of 7064.2 'before initial commit, nothing added, only untracked': 
-	cat >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head initial-branch
-	? actual
-	? dir1/
-	? expect
-	? file_x
-	? file_y
-	? file_z
-	EOF
+		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-	git status --porcelain=v2 --branch --untracked-files=normal >actual &&
-	test_cmp expect actual
+		test_grep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
+		test_grep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
 
-ok 2 - before initial commit, nothing added, only untracked
+		git ls-files >paths &&
+		! grep b/ paths &&
+		! grep c/ paths &&
+		grep "d/y" paths &&
 
-expecting success of 7064.3 'before initial commit, things added': 
-	git add file_x file_y file_z dir1 &&
-	OID_A=$(git hash-object -t blob -- dir1/file_a) &&
-	OID_B=$(git hash-object -t blob -- dir1/file_b) &&
-	OID_X=$(git hash-object -t blob -- file_x) &&
-	OID_Y=$(git hash-object -t blob -- file_y) &&
-	OID_Z=$(git hash-object -t blob -- file_z) &&
+		test_path_is_missing b/y &&
+		test_path_is_missing c/y &&
+		test_path_is_file    d/y
+	)
 
-	cat >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head initial-branch
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
-	? actual
-	? expect
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13d_info/.git/
+[master (root-commit) c14d00a] O
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+ create mode 100644 b/x
+ create mode 100644 c/w
+Switched to branch 'A'
+[A e246998] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {c => d}/w (100%)
+Switched to branch 'B'
+[B 0624e26] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => c}/y (100%)
+ rename {b => d}/x (100%)
+HEAD is now at 0624e26 B
+Note: switching to 'A^0'.
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 3 - before initial commit, things added
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7064.4 'before initial commit, things added (-z)': 
-	lf_to_nul >expect <<-EOF &&
-	# branch.oid (initial)
-	# branch.head initial-branch
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
-	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
-	? actual
-	? expect
-	EOF
+  git switch -c <new-branch-name>
 
-	git status -z --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+Or undo this operation with:
 
-ok 4 - before initial commit, things added (-z)
+  git switch -
 
-expecting success of 7064.5 'make first commit, confirm HEAD oid and branch': 
-	git commit -m initial &&
-	H0=$(git rev-parse HEAD) &&
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	? actual
-	? expect
-	EOF
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+HEAD is now at e246998 A
+Path updated: a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0; moving it to d/y.
+Path updated: a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD; moving it to d/y.
+d/y
+ok 76 - 13d(info): messages for rename/rename(1to1) via dual transitive rename
 
-[initial-branch (root-commit) bbc01be] initial
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/file_a
- create mode 100644 dir1/file_b
- create mode 100644 file_x
- create mode 100644 file_y
- create mode 100644 file_z
-ok 5 - make first commit, confirm HEAD oid and branch
+expecting success of 6423.77 '13e: directory rename detection in recursive case': 
+	test_setup_13e &&
+	(
+		cd 13e &&
 
-expecting success of 7064.6 'after first commit, create unstaged changes': 
-	echo x >>file_x &&
-	OID_X1=$(git hash-object -t blob -- file_x) &&
-	rm file_z &&
-	H0=$(git rev-parse HEAD) &&
+		git checkout --quiet D^0 &&
 
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
-	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
-	? actual
-	? expect
-	EOF
+		git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+		test_grep ! CONFLICT out &&
+		test_grep ! BUG: err &&
+		test_grep ! core.dumped err &&
+		test_must_be_empty err &&
 
-ok 6 - after first commit, create unstaged changes
+		git ls-files >paths &&
+		! grep a/x paths &&
+		grep b/x paths
+	)
 
-expecting success of 7064.7 'after first commit, stash existing changes': 
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	# stash 2
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13e/.git/
+[master (root-commit) 3de9c0f] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a/y
+ create mode 100644 a/z
+Switched to branch 'A'
+[A 8654583] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {a => b}/y (100%)
+ rename {a => b}/z (100%)
+Switched to branch 'B'
+[B 4f343f5] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/x
+Switched to branch 'C'
+CONFLICT (file location): a/x added in B inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to b/x.
+Automatic merge failed; fix conflicts and then commit the result.
+[C 95c9ae8] C
+ Author: A U Thor <author@example.com>
+Switched to branch 'D'
+CONFLICT (file location): a/x added in HEAD inside a directory that was renamed in A, suggesting it should perhaps be moved to b/x.
+Automatic merge failed; fix conflicts and then commit the result.
+[D e07996f] D
+ Author: A U Thor <author@example.com>
+b/x
+ok 77 - 13e: directory rename detection in recursive case
 
-	test_when_finished "git stash pop && git stash pop" &&
+# still have 2 known breakage(s)
+# passed all remaining 75 test(s)
+1..77
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6500-gc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/.git/
+expecting success of 6500.1 'setup': 
+	# do not let the amount of physical memory affects gc
+	# behavior, make sure we always pack everything to one pack by
+	# default
+	git config gc.bigPackThreshold 2g &&
+	test_oid_init
 
-	git stash -- file_x &&
-	git stash &&
-	git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual &&
-	test_cmp expect actual
+ok 1 - setup
 
-Saved working directory and index state WIP on initial-branch: bbc01be initial
-Saved working directory and index state WIP on initial-branch: bbc01be initial
-Merging Version stash was based on with Stashed changes
-On branch initial-branch
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    file_z
+expecting success of 6500.2 'gc empty repository': 
+	git gc
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+Nothing new to pack.
+ok 2 - gc empty repository
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (7d6b8e1b8ed7cd9791a23d6b5ab65250a4f45aff)
-Merging Version stash was based on with Stashed changes
-On branch initial-branch
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   file_x
-	deleted:    file_z
+expecting success of 6500.3 'gc does not leave behind pid file': 
+	git gc &&
+	test_path_is_missing .git/gc.pid
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
+Nothing new to pack.
+ok 3 - gc does not leave behind pid file
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (eee214d8ade22cdf92454c5294f0fc57fe772547)
-ok 7 - after first commit, stash existing changes
+expecting success of 6500.4 'gc --gobbledegook': 
+	test_expect_code 129 git gc --nonsense 2>err &&
+	test_grep "[Uu]sage: git gc" err
 
-expecting success of 7064.8 'after first commit but omit untracked files and branch': 
-	cat >expect <<-EOF &&
-	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
-	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
-	EOF
+usage: git gc [<options>]
+ok 4 - gc --gobbledegook
 
-	git status --porcelain=v2 --untracked-files=no >actual &&
-	test_cmp expect actual
+expecting success of 6500.5 'gc -h with invalid configuration': 
+	mkdir broken &&
+	(
+		cd broken &&
+		git init &&
+		echo "[gc] pruneexpire = CORRUPT" >>.git/config &&
+		test_expect_code 129 git gc -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
 
-ok 8 - after first commit but omit untracked files and branch
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/broken/.git/
+usage: git gc [<options>]
+ok 5 - gc -h with invalid configuration
 
-expecting success of 7064.9 'after first commit, stage existing changes': 
-	git add file_x &&
-	git rm file_z &&
-	H0=$(git rev-parse HEAD) &&
+expecting success of 6500.6 'gc is not aborted due to a stale symref': 
+	git init remote &&
+	(
+		cd remote &&
+		test_commit initial &&
+		git clone . ../client &&
+		git branch -m develop &&
+		cd ../client &&
+		git fetch --prune &&
+		git gc
+	)
 
-	cat >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	? actual
-	? expect
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/remote/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '../client'...
+done.
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/remote/.
+ - [deleted]         (none)     -> origin/master
+   (refs/remotes/origin/HEAD has become dangling)
+ * [new branch]      develop    -> origin/develop
+ok 6 - gc is not aborted due to a stale symref
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+expecting success of 6500.7 'gc --keep-largest-pack': 
+	test_create_repo keep-pack &&
+	(
+		cd keep-pack &&
+		test_commit one &&
+		test_commit two &&
+		test_commit three &&
+		git gc &&
+		( cd .git/objects/pack && ls *.pack ) >pack-list &&
+		test_line_count = 1 pack-list &&
+		cp pack-list base-pack-list &&
+		test_commit four &&
+		git repack -d &&
+		test_commit five &&
+		git repack -d &&
+		( cd .git/objects/pack && ls *.pack ) >pack-list &&
+		test_line_count = 3 pack-list &&
+		git gc --keep-largest-pack &&
+		( cd .git/objects/pack && ls *.pack ) >pack-list &&
+		test_line_count = 2 pack-list &&
+		awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
+		test_line_count = 2 pack-info &&
+		test_path_is_file .git/objects/pack/$(cat base-pack-list) &&
+		git fsck
+	)
 
-rm 'file_z'
-ok 9 - after first commit, stage existing changes
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/keep-pack/.git/
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master fd8d77e] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master a383792] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+ok 7 - gc --keep-largest-pack
 
-expecting success of 7064.10 'rename causes 2 path lines': 
-	git mv file_y renamed_y &&
-	H0=$(git rev-parse HEAD) &&
+expecting success of 6500.8 'pre-auto-gc hook can stop auto gc': 
+	cat >err.expect <<-\EOF &&
+	no gc for you
+	EOF
 
-	q_to_tab >expect <<-EOF &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
-	? actual
-	? expect
+	git init pre-auto-gc-hook &&
+	test_hook -C pre-auto-gc-hook pre-auto-gc <<-\EOF &&
+	echo >&2 no gc for you &&
+	exit 1
 	EOF
+	(
+		cd pre-auto-gc-hook &&
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+		git config gc.auto 3 &&
+		git config gc.autoDetach false &&
 
-ok 10 - rename causes 2 path lines
+		# We need to create two object whose sha1s start with 17
+		# since this is what git gc counts.  As it happens, these
+		# two blobs will do so.
+		test_commit "$(test_oid blob17_1)" &&
+		test_commit "$(test_oid blob17_2)" &&
 
-expecting success of 7064.11 'rename causes 2 path lines (-z)': 
-	H0=$(git rev-parse HEAD) &&
+		git gc --auto >../out.actual 2>../err.actual
+	) &&
+	test_must_be_empty out.actual &&
+	test_cmp err.expect err.actual &&
 
-	## Lines use NUL path separator and line terminator, so double transform here.
-	q_to_nul <<-EOF | lf_to_nul >expect &&
-	# branch.oid $H0
-	# branch.head initial-branch
-	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
-	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
-	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
-	? actual
-	? expect
+	cat >err.expect <<-\EOF &&
+	will gc for you
+	Auto packing the repository for optimum performance.
+	See "git help gc" for manual housekeeping.
 	EOF
 
-	git status --porcelain=v2 --branch --untracked-files=all -z >actual &&
-	test_cmp expect actual
+	test_hook -C pre-auto-gc-hook --clobber pre-auto-gc <<-\EOF &&
+	echo >&2 will gc for you &&
+	exit 0
+	EOF
 
-ok 11 - rename causes 2 path lines (-z)
+	git -C pre-auto-gc-hook gc --auto >out.actual 2>err.actual &&
 
-expecting success of 7064.12 'make second commit, confirm clean and new HEAD oid': 
-	git commit -m second &&
-	H1=$(git rev-parse HEAD) &&
+	test_must_be_empty out.actual &&
+	test_cmp err.expect err.actual
 
-	cat >expect <<-EOF &&
-	# branch.oid $H1
-	# branch.head initial-branch
-	? actual
-	? expect
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/pre-auto-gc-hook/.git/
+[master (root-commit) 1808a60] 263
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 263.t
+no gc for you
+[master 9a14344] 410
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 410.t
+ok 8 - pre-auto-gc hook can stop auto gc
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+expecting success of 6500.9 'auto gc with too many loose objects does not attempt to create bitmaps': 
+	test_config gc.auto 3 &&
+	test_config gc.autodetach false &&
+	test_config pack.writebitmaps true &&
+	# We need to create two object whose sha1s start with 17
+	# since this is what git gc counts.  As it happens, these
+	# two blobs will do so.
+	test_commit "$(test_oid blob17_1)" &&
+	test_commit "$(test_oid blob17_2)" &&
+	# Our first gc will create a pack; our second will create a second pack
+	git gc --auto &&
+	ls .git/objects/pack/pack-*.pack | sort >existing_packs &&
+	test_commit "$(test_oid blob17_3)" &&
+	test_commit "$(test_oid blob17_4)" &&
 
-[initial-branch 84bf28d] second
+	git gc --auto 2>err &&
+	test_grep ! "^warning:" err &&
+	ls .git/objects/pack/pack-*.pack | sort >post_packs &&
+	comm -1 -3 existing_packs post_packs >new &&
+	comm -2 -3 existing_packs post_packs >del &&
+	test_line_count = 0 del && # No packs are deleted
+	test_line_count = 1 new # There is one new pack
+
+[master (root-commit) 1808a60] 263
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 file_z
- rename file_y => renamed_y (100%)
-ok 12 - make second commit, confirm clean and new HEAD oid
+ 1 file changed, 1 insertion(+)
+ create mode 100644 263.t
+Auto packing the repository for optimum performance.
+See "git help gc" for manual housekeeping.
+[master 9a14344] 410
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 410.t
+[master 54e21e7] 523
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 523.t
+Auto packing the repository for optimum performance.
+See "git help gc" for manual housekeeping.
+[master 60dd8ad] 790
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 790.t
+ok 9 - auto gc with too many loose objects does not attempt to create bitmaps
 
-expecting success of 7064.13 'confirm ignored files are not printed': 
-	test_when_finished "rm -f x.ign .gitignore" &&
-	echo x.ign >.gitignore &&
-	echo "ignore me" >x.ign &&
+expecting success of 6500.10 'gc --no-quiet': 
+	GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	test_must_be_empty stdout &&
+	test_grep "Computing commit graph generation numbers" stderr
 
-	cat >expect <<-EOF &&
-	? .gitignore
-	? actual
-	? expect
-	EOF
+Computing commit graph generation numbers:  25% (1/4)
Computing commit graph generation numbers:  50% (2/4)
Computing commit graph generation numbers:  75% (3/4)
Computing commit graph generation numbers: 100% (4/4)
Computing commit graph generation numbers: 100% (4/4), done.
+ok 10 - gc --no-quiet
 
-	git status --porcelain=v2 --untracked-files=all >actual &&
-	test_cmp expect actual
+checking prerequisite: TTY
 
-ok 13 - confirm ignored files are not printed
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 7064.14 'ignored files are printed with --ignored': 
-	test_when_finished "rm -f x.ign .gitignore" &&
-	echo x.ign >.gitignore &&
-	echo "ignore me" >x.ign &&
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-	cat >expect <<-EOF &&
-	? .gitignore
-	? actual
-	? expect
-	! x.ign
-	EOF
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-	git status --porcelain=v2 --ignored --untracked-files=all >actual &&
-	test_cmp expect actual
+)
+prerequisite TTY ok
+expecting success of 6500.11 'with TTY: gc --no-quiet': 
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	test_must_be_empty stdout &&
+	test_grep "Enumerating objects" stderr &&
+	test_grep "Computing commit graph generation numbers: 100% (4/4), done." stderr
 
-ok 14 - ignored files are printed with --ignored
+Enumerating objects: 12, done.
+Computing commit graph generation numbers:  25% (1/4)
Computing commit graph generation numbers:  50% (2/4)
Computing commit graph generation numbers:  75% (3/4)
Computing commit graph generation numbers: 100% (4/4)
Computing commit graph generation numbers: 100% (4/4), done.
+ok 11 - with TTY: gc --no-quiet
 
-expecting success of 7064.15 'create and commit permanent ignore file': 
-	cat >.gitignore <<-EOF &&
-	actual*
-	expect*
-	EOF
+expecting success of 6500.12 'gc --quiet': 
+	git -c gc.writeCommitGraph=true gc --quiet >stdout 2>stderr &&
+	test_must_be_empty stdout &&
+	test_must_be_empty stderr
 
-	git add .gitignore &&
-	git commit -m ignore_trash &&
-	H1=$(git rev-parse HEAD) &&
+ok 12 - gc --quiet
 
-	cat >expect <<-EOF &&
-	# branch.oid $H1
-	# branch.head initial-branch
-	EOF
+expecting success of 6500.13 'gc.reflogExpire{Unreachable,}=never skips "expire" via "gc"': 
+	test_config gc.reflogExpire never &&
+	test_config gc.reflogExpireUnreachable never &&
 
-	git status --porcelain=v2 --branch >actual &&
-	test_cmp expect actual
+	GIT_TRACE=$(pwd)/trace.out git gc &&
 
-[initial-branch f09abb9] ignore_trash
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 .gitignore
-ok 15 - create and commit permanent ignore file
+	# Check that git-pack-refs is run as a sanity check (done via
+	# gc_before_repack()) but that git-expire is not.
+	grep -E "^trace: (built-in|exec|run_command): git pack-refs --" trace.out &&
+	! grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
 
-expecting success of 7064.16 'verify --intent-to-add output': 
-	test_when_finished "git rm -f intent1.add intent2.add" &&
-	touch intent1.add &&
-	echo test >intent2.add &&
+trace: run_command: git pack-refs --all --prune
+trace: built-in: git pack-refs --all --prune
+ok 13 - gc.reflogExpire{Unreachable,}=never skips "expire" via "gc"
 
-	git add --intent-to-add intent1.add intent2.add &&
+expecting success of 6500.14 'one of gc.reflogExpire{Unreachable,}=never does not skip "expire" via "gc"': 
+	>trace.out &&
+	test_config gc.reflogExpire never &&
+	GIT_TRACE=$(pwd)/trace.out git gc &&
+	grep -E "^trace: (built-in|exec|run_command): git reflog expire --" trace.out
 
-	cat >expect <<-EOF &&
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent1.add
-	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent2.add
-	EOF
+trace: run_command: git reflog expire --all
+trace: built-in: git reflog expire --all
+ok 14 - one of gc.reflogExpire{Unreachable,}=never does not skip "expire" via "gc"
 
-	git status --porcelain=v2 >actual &&
-	test_cmp expect actual
+expecting success of 6500.15 'gc.repackFilter launches repack with a filter': 
+	git clone --no-local --bare . bare.git &&
 
-rm 'intent1.add'
-rm 'intent2.add'
-ok 16 - verify --intent-to-add output
+	git -C bare.git -c gc.cruftPacks=false gc &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
 
-expecting success of 7064.17 'verify AA (add-add) conflict': 
-	test_when_finished "git reset --hard" &&
+	GIT_TRACE=$(pwd)/trace.out git -C bare.git -c gc.repackFilter=blob:none \
+		-c repack.writeBitmaps=false -c gc.cruftPacks=false gc &&
+	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
+	grep -E "^trace: (built-in|exec|run_command): git repack .* --filter=blob:none ?.*" trace.out
 
-	git branch AA_A initial-branch &&
-	git checkout AA_A &&
-	echo "Branch AA_A" >conflict.txt &&
-	OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch aa_a" &&
+Cloning into bare repository 'bare.git'...
+trace: run_command: git repack -d -l -A --unpack-unreachable=2.weeks.ago --filter=blob:none
+trace: built-in: git repack -d -l -A --unpack-unreachable=2.weeks.ago --filter=blob:none
+ok 15 - gc.repackFilter launches repack with a filter
 
-	git branch AA_B initial-branch &&
-	git checkout AA_B &&
-	echo "Branch AA_B" >conflict.txt &&
-	OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch aa_b" &&
+expecting success of 6500.16 'gc.repackFilterTo store filtered out objects': 
+	test_when_finished "rm -rf bare.git filtered.git" &&
 
-	git branch AA_M AA_B &&
-	git checkout AA_M &&
-	test_must_fail git merge AA_A &&
+	git init --bare filtered.git &&
+	git -C bare.git -c gc.repackFilter=blob:none \
+		-c gc.repackFilterTo=../filtered.git/objects/pack/pack \
+		-c repack.writeBitmaps=false -c gc.cruftPacks=false gc &&
 
-	HM=$(git rev-parse HEAD) &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
+	test_stdout_line_count = 1 ls filtered.git/objects/pack/*.pack
 
-	cat >expect <<-EOF &&
-	# branch.oid $HM
-	# branch.head AA_M
-	u AA N... 000000 100644 100644 100644 $ZERO_OID $OID_AA_B $OID_AA_A conflict.txt
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/filtered.git/
+ok 16 - gc.repackFilterTo store filtered out objects
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+expecting success of 6500.17 'git gc generates a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-Switched to branch 'AA_A'
-[AA_A 55eca05] branch aa_a
+			prepare_cruft_history &&
+			git $argv &&
+
+			find .git/objects/pack -name "*.mtimes" >mtimes &&
+			sed -e s/.mtimes$/.pack/g mtimes >packs &&
+
+			test_file_not_empty packs &&
+			while read pack
+			do
+				test_path_is_file "$pack" || return 1
+			done <packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'AA_B'
-[AA_B 307553c] branch aa_b
+ create mode 100644 base.t
+[master 5f01bd4] foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'AA_M'
-Auto-merging conflict.txt
-CONFLICT (add/add): Merge conflict in conflict.txt
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 307553c branch aa_b
-ok 17 - verify AA (add-add) conflict
-
-expecting success of 7064.18 'verify UU (edit-edit) conflict': 
-	test_when_finished "git reset --hard" &&
-
-	git branch UU_ANC initial-branch &&
-	git checkout UU_ANC &&
-	echo "Ancestor" >conflict.txt &&
-	OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "UU_ANC" &&
-
-	git branch UU_A UU_ANC &&
-	git checkout UU_A &&
-	echo "Branch UU_A" >conflict.txt &&
-	OID_UU_A=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch uu_a" &&
-
-	git branch UU_B UU_ANC &&
-	git checkout UU_B &&
-	echo "Branch UU_B" >conflict.txt &&
-	OID_UU_B=$(git hash-object -t blob -- conflict.txt) &&
-	git add conflict.txt &&
-	git commit -m "branch uu_b" &&
-
-	git branch UU_M UU_B &&
-	git checkout UU_M &&
-	test_must_fail git merge UU_A &&
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 17 - git gc generates a cruft pack
 
-	HM=$(git rev-parse HEAD) &&
+expecting success of 6500.18 'git -c gc.cruftPacks=true gc generates a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-	cat >expect <<-EOF &&
-	# branch.oid $HM
-	# branch.head UU_M
-	u UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt
-	EOF
+			prepare_cruft_history &&
+			git $argv &&
 
-	git status --porcelain=v2 --branch --untracked-files=all >actual &&
-	test_cmp expect actual
+			find .git/objects/pack -name "*.mtimes" >mtimes &&
+			sed -e s/.mtimes$/.pack/g mtimes >packs &&
 
-Switched to branch 'UU_ANC'
-[UU_ANC 70071ed] UU_ANC
+			test_file_not_empty packs &&
+			while read pack
+			do
+				test_path_is_file "$pack" || return 1
+			done <packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflict.txt
-Switched to branch 'UU_A'
-[UU_A a088b5d] branch uu_a
+ create mode 100644 base.t
+[master 5f01bd4] foo
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'UU_B'
-[UU_B c5f3cc7] branch uu_b
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'UU_M'
-Auto-merging conflict.txt
-CONFLICT (content): Merge conflict in conflict.txt
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at c5f3cc7 branch uu_b
-ok 18 - verify UU (edit-edit) conflict
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 18 - git -c gc.cruftPacks=true gc generates a cruft pack
 
-expecting success of 7064.19 'verify upstream fields in branch header': 
-	git checkout initial-branch &&
-	test_when_finished "rm -rf sub_repo" &&
-	git clone . sub_repo &&
-	(
-		## Confirm local initial-branch tracks remote initial-branch.
-		cd sub_repo &&
-		HUF=$(git rev-parse HEAD) &&
+expecting success of 6500.19 'git -c gc.cruftPacks=false gc --cruft generates a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		EOF
+			prepare_cruft_history &&
+			git $argv &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
+			find .git/objects/pack -name "*.mtimes" >mtimes &&
+			sed -e s/.mtimes$/.pack/g mtimes >packs &&
 
-		## Test ahead/behind.
-		echo xyz >file_xyz &&
-		git add file_xyz &&
-		git commit -m xyz &&
+			test_file_not_empty packs &&
+			while read pack
+			do
+				test_path_is_file "$pack" || return 1
+			done <packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 19 - git -c gc.cruftPacks=false gc --cruft generates a cruft pack
 
-		HUF=$(git rev-parse HEAD) &&
+expecting success of 6500.20 'git gc --no-cruft does not generate a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		EOF
+			prepare_cruft_history &&
+			git $argv &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
+			assert_no_cruft_packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 20 - git gc --no-cruft does not generate a cruft pack
 
-		## Repeat the above but without --branch.
-		git status --porcelain=v2 --untracked-files=all >actual &&
-		test_must_be_empty actual &&
+expecting success of 6500.21 'git -c gc.cruftPacks=false gc does not generate a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-		## Test upstream-gone case. Fake this by pointing
-		## origin/initial-branch at a non-existing commit.
-		git update-ref -d refs/remotes/origin/initial-branch &&
+			prepare_cruft_history &&
+			git $argv &&
 
-		HUF=$(git rev-parse HEAD) &&
+			assert_no_cruft_packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 21 - git -c gc.cruftPacks=false gc does not generate a cruft pack
 
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		EOF
+expecting success of 6500.22 'git -c gc.cruftPacks=true gc --no-cruft does not generate a cruft pack': 
+		test_when_finished "rm -fr repo" &&
+		git init repo &&
+		(
+			cd repo &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+			prepare_cruft_history &&
+			git $argv &&
 
-Switched to branch 'initial-branch'
-Cloning into 'sub_repo'...
-done.
-[initial-branch 638bb2b] xyz
+			assert_no_cruft_packs
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file_xyz
-ok 19 - verify upstream fields in branch header
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 22 - git -c gc.cruftPacks=true gc --no-cruft does not generate a cruft pack
 
-expecting success of 7064.20 'verify --[no-]ahead-behind with V2 format': 
-	git checkout initial-branch &&
-	test_when_finished "rm -rf sub_repo" &&
-	git clone . sub_repo &&
+expecting success of 6500.23 '--keep-largest-pack ignores cruft packs': 
+	test_when_finished "rm -fr repo" &&
+	git init repo &&
 	(
-		## Confirm local initial-branch tracks remote initial-branch.
-		cd sub_repo &&
-		HUF=$(git rev-parse HEAD) &&
-
-		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		EOF
-
-		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		EOF
-
-		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
-
-		## Test non-equal ahead/behind.
-		echo xyz >file_xyz &&
-		git add file_xyz &&
-		git commit -m xyz &&
-
-		HUF=$(git rev-parse HEAD) &&
-
-		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +? -?
-		EOF
-
-		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
+		cd repo &&
 
-		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
-		cat >expect <<-EOF &&
-		# branch.oid $HUF
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		EOF
+		# Generate a pack for reachable objects (of which there
+		# are 3), and one for unreachable objects (of which
+		# there are 6).
+		prepare_cruft_history &&
+		git gc --cruft &&
 
-		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
+		mtimes="$(find .git/objects/pack -type f -name "pack-*.mtimes")" &&
+		sz="$(test_file_size "${mtimes%.mtimes}.pack")" &&
 
-		# Confirm that "status.aheadbehind" DOES NOT work on V2 format.
-		git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual &&
+		# Ensure that the cruft pack gets removed (due to
+		# `--prune=now`) despite it being the largest pack.
+		git -c gc.bigPackThreshold=$sz gc --cruft --prune=now &&
 
-		# Confirm that "status.aheadbehind" DOES NOT work on V2 format.
-		git -c status.aheadbehind=true status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
+		assert_no_cruft_packs
 	)
 
-Already on 'initial-branch'
-Cloning into 'sub_repo'...
-done.
-[initial-branch 638bb2b] xyz
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file_xyz
-ok 20 - verify --[no-]ahead-behind with V2 format
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 23 - --keep-largest-pack ignores cruft packs
 
-expecting success of 7064.21 'create and add submodule, submodule appears clean (A. S...)': 
-	git checkout initial-branch &&
-	git clone . sub_repo &&
-	git clone . super_repo &&
-	test_config_global protocol.file.allow always &&
-	(	cd super_repo &&
-		git submodule add ../sub_repo sub1 &&
+expecting success of 6500.24 'gc.bigPackThreshold ignores cruft packs': 
+	test_when_finished "rm -fr repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-		## Confirm stage/add of clean submodule.
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+		# Generate a pack for reachable objects (of which there
+		# are 3), and one for unreachable objects (of which
+		# there are 6).
+		prepare_cruft_history &&
+		git gc --cruft &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+		# Ensure that the cruft pack gets removed (due to
+		# `--prune=now`) despite it being the largest pack.
+		git gc --cruft --prune=now --keep-largest-pack &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
+		assert_no_cruft_packs
 	)
 
-Already on 'initial-branch'
-Cloning into 'sub_repo'...
-done.
-Cloning into 'super_repo'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
-done.
-ok 21 - create and add submodule, submodule appears clean (A. S...)
-
-expecting success of 7064.22 'untracked changes in added submodule (AM S..U)': 
-	(	cd super_repo &&
-		## create untracked file in the submodule.
-		(	cd sub1 &&
-			echo "xxxx" >file_in_sub
-		) &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) b37f540] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Nothing new to pack.
+ok 24 - gc.bigPackThreshold ignores cruft packs
 
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+expecting success of 6500.25 'setup for --max-cruft-size tests': 
+	git init cruft--max-size &&
+	(
+		cd cruft--max-size &&
+		prepare_cruft_history
+	)
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/cruft--max-size/.git/
+[master (root-commit) b37f540] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 5f01bd4] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master a32252d] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+ok 25 - setup for --max-cruft-size tests
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6500.26 '--max-cruft-size sets appropriate repack options': 
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size \
+		gc --cruft --max-cruft-size=1M &&
+	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
 
-ok 22 - untracked changes in added submodule (AM S..U)
+{"event":"child_start","sid":"20250317T132644.599737Z-H5c947e1c-P00334d9b","thread":"main","time":"2025-03-17T13:26:44.637293Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=1048576"]}
+ok 26 - --max-cruft-size sets appropriate repack options
 
-expecting success of 7064.23 'staged changes in added submodule (AM S.M.)': 
-	(	cd super_repo &&
-		## stage the changes in the submodule.
-		(	cd sub1 &&
-			git add file_in_sub
-		) &&
+expecting success of 6500.27 'gc.maxCruftSize sets appropriate repack options': 
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt \
+		git -C cruft--max-size -c gc.maxCruftSize=2M gc --cruft &&
+	test_subcommand $cruft_max_size_opts --max-cruft-size=2097152 <trace2.txt &&
 
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt \
+		git -C cruft--max-size -c gc.maxCruftSize=2M gc --cruft \
+		--max-cruft-size=3M &&
+	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+{"event":"child_start","sid":"20250317T132644.855928Z-H5c947e1c-P00334e22","thread":"main","time":"2025-03-17T13:26:44.876553Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=2097152"]}
+{"event":"child_start","sid":"20250317T132645.084052Z-H5c947e1c-P00334e8a","thread":"main","time":"2025-03-17T13:26:45.137276Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--max-cruft-size=3145728"]}
+ok 27 - gc.maxCruftSize sets appropriate repack options
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+expecting success of 6500.28 '--expire-to sets repack --expire-to': 
+	rm -rf expired &&
+	mkdir expired &&
+	expire_to="$(pwd)/expired/pack" &&
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --cruft --expire-to="$expire_to" &&
+	test_subcommand $cruft_max_size_opts --expire-to="$expire_to" <trace2.txt
 
-ok 23 - staged changes in added submodule (AM S.M.)
+{"event":"child_start","sid":"20250317T132645.399663Z-H5c947e1c-P00334f2f","thread":"main","time":"2025-03-17T13:26:45.423987Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=2.weeks.ago","--expire-to=/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/expired/pack"]}
+ok 28 - --expire-to sets repack --expire-to
 
-expecting success of 7064.24 'staged and unstaged changes in added (AM S.M.)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## make additional unstaged changes (on the same file) in the submodule.
-			## This does not cause us to get S.MU (because the submodule does not report
-			## a "?" line for the unstaged changes).
-			echo "more changes" >>file_in_sub
-		) &&
+expecting success of 6500.29 '--expire-to with --prune=now sets repack --expire-to': 
+	rm -rf expired &&
+	mkdir expired &&
+	expire_to="$(pwd)/expired/pack" &&
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --cruft --prune=now --expire-to="$expire_to" &&
+	test_subcommand git repack -d -l --cruft --cruft-expiration=now --expire-to="$expire_to" <trace2.txt
 
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+{"event":"child_start","sid":"20250317T132645.663701Z-H5c947e1c-P00334fc8","thread":"main","time":"2025-03-17T13:26:45.717004Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","--cruft","--cruft-expiration=now","--expire-to=/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/expired/pack"]}
+ok 29 - --expire-to with --prune=now sets repack --expire-to
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+expecting success of 6500.30 '--expire-to with --no-cruft sets repack -A': 
+	rm -rf expired &&
+	mkdir expired &&
+	expire_to="$(pwd)/expired/pack" &&
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --no-cruft --expire-to="$expire_to" &&
+	test_subcommand git repack -d -l -A --unpack-unreachable=2.weeks.ago <trace2.txt
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+{"event":"child_start","sid":"20250317T132646.023768Z-H5c947e1c-P0033507f","thread":"main","time":"2025-03-17T13:26:46.064221Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-A","--unpack-unreachable=2.weeks.ago"]}
+ok 30 - --expire-to with --no-cruft sets repack -A
 
-ok 24 - staged and unstaged changes in added (AM S.M.)
+expecting success of 6500.31 '--expire-to with --no-cruft sets repack -a': 
+	rm -rf expired &&
+	mkdir expired &&
+	expire_to="$(pwd)/expired/pack" &&
+	GIT_TRACE2_EVENT=$(pwd)/trace2.txt git -C cruft--max-size gc --no-cruft --prune=now --expire-to="$expire_to" &&
+	test_subcommand git repack -d -l -a <trace2.txt
 
-expecting success of 7064.25 'staged and untracked changes in added submodule (AM S.MU)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## stage new changes in tracked file.
-			git add file_in_sub &&
-			## create new untracked file.
-			echo "yyyy" >>another_file_in_sub
-		) &&
+{"event":"child_start","sid":"20250317T132646.300457Z-H5c947e1c-P003350ea","thread":"main","time":"2025-03-17T13:26:46.345231Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","repack","-d","-l","-a"]}
+ok 31 - --expire-to with --no-cruft sets repack -a
 
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+expecting success of 6500.32 'background auto gc does not run if gc.log is present and recent but does if it is old': 
+	test_commit foo &&
+	test_commit bar &&
+	git repack &&
+	test_config gc.autopacklimit 1 &&
+	test_config gc.autodetach true &&
+	echo fleem >.git/gc.log &&
+	git gc --auto 2>err &&
+	test_grep "^warning:" err &&
+	test_config gc.logexpiry 5.days &&
+	test-tool chmtime =-345600 .git/gc.log &&
+	git gc --auto &&
+	test_config gc.logexpiry 2.days &&
+	run_and_wait_for_gc --auto &&
+	ls .git/objects/pack/pack-*.pack >packs &&
+	test_line_count = 1 packs
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+[master b16b551] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master fc616a4] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+warning: The last gc run reported the following. Please correct the root cause
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+warning: The last gc run reported the following. Please correct the root cause
+and remove .git/gc.log
+Automatic cleanup will not be performed until the file is removed.
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+fleem
 
-ok 25 - staged and untracked changes in added submodule (AM S.MU)
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+ok 32 - background auto gc does not run if gc.log is present and recent but does if it is old
 
-expecting success of 7064.26 'commit within the submodule appears as new commit in super (AM SC..)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			## Make a new commit in the submodule.
-			git add file_in_sub &&
-			rm -f another_file_in_sub &&
-			git commit -m "new commit"
-		) &&
+expecting success of 6500.33 'background auto gc respects lock for all operations': 
+	# make sure we run a background auto-gc
+	test_commit make-pack &&
+	git repack &&
+	test_config gc.autopacklimit 1 &&
+	test_config gc.autodetach true &&
 
-		HMOD=$(git hash-object -t blob -- .gitmodules) &&
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$HSUP &&
+	# create a ref whose loose presence we can use to detect a pack-refs run
+	git update-ref refs/heads/should-be-loose HEAD &&
+	(ls -1 .git/refs/heads .git/reftable >expect || true) &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +0 -0
-		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
-		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
-		EOF
+	# now fake a concurrent gc that holds the lock; we can use our
+	# shell pid so that it looks valid.
+	hostname=$(hostname || echo unknown) &&
+	shell_pid=$$ &&
+	if test_have_prereq MINGW && test -f /proc/$shell_pid/winpid
+	then
+		# In Git for Windows, Bash (actually, the MSYS2 runtime) has a
+		# different idea of PIDs than git.exe (actually Windows). Use
+		# the Windows PID in this case.
+		shell_pid=$(cat /proc/$shell_pid/winpid)
+	fi &&
+	printf "%d %s" "$shell_pid" "$hostname" >.git/gc.pid &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
-	)
+	# our gc should exit zero without doing anything
+	run_and_wait_for_gc --auto &&
+	(ls -1 .git/refs/heads .git/reftable >actual || true) &&
+	test_cmp expect actual
 
-[initial-branch 49ed2bd] new commit
+[master 28ecdda] make-pack
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 file_in_sub
-ok 26 - commit within the submodule appears as new commit in super (AM SC..)
-
-expecting success of 7064.27 'stage submodule in super and commit': 
-	(	cd super_repo &&
-		## Stage the new submodule commit in the super.
-		git add sub1 &&
-		## Commit the super so that the sub no longer appears as added.
-		git commit -m "super commit" &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 make-pack.t
+ls: cannot access '.git/reftable': No such file or directory
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+ls: cannot access '.git/reftable': No such file or directory
+ok 33 - background auto gc respects lock for all operations
 
-		HSUP=$(git rev-parse HEAD) &&
+expecting success of 6500.34 '--detach overrides gc.autoDetach=false': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		EOF
+		# Prepare the repository such that git-gc(1) ends up repacking.
+		test_commit "$(test_oid blob17_1)" &&
+		test_commit "$(test_oid blob17_2)" &&
+		git config gc.autodetach false &&
+		git config gc.auto 2 &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
+		# Note that we cannot use `test_cmp` here to compare stderr
+		# because it may contain output from `set -x`.
+		run_and_wait_for_gc --auto --detach 2>actual &&
+		test_grep "Auto packing the repository in background for optimum performance." actual
 	)
 
-[initial-branch 9939ebd] super commit
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) 94a3838] 263
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 27 - stage submodule in super and commit
-
-expecting success of 7064.28 'make unstaged changes in existing submodule (.M S.M.)': 
-	(	cd super_repo &&
-		(	cd sub1 &&
-			echo "zzzz" >>file_in_sub
-		) &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 263.t
+[master 2f55aec] 410
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 410.t
+Auto packing the repository in background for optimum performance.
+ok 34 - --detach overrides gc.autoDetach=false
 
-		HSUP=$(git rev-parse HEAD) &&
-		HSUB=$(cd sub1 && git rev-parse HEAD) &&
+expecting success of 6500.35 '--no-detach overrides gc.autoDetach=true': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-		cat >expect <<-EOF &&
-		# branch.oid $HSUP
-		# branch.head initial-branch
-		# branch.upstream origin/initial-branch
-		# branch.ab +1 -0
-		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
-		EOF
+		# Prepare the repository such that git-gc(1) ends up repacking.
+		test_commit "$(test_oid blob17_1)" &&
+		test_commit "$(test_oid blob17_2)" &&
+		git config gc.autodetach true &&
+		git config gc.auto 2 &&
 
-		git status --porcelain=v2 --branch --untracked-files=all >actual &&
-		test_cmp expect actual
+		GIT_PROGRESS_DELAY=0 git gc --auto --no-detach 2>output &&
+		test_grep "Auto packing the repository for optimum performance." output &&
+		test_grep "Collecting referenced commits: 2, done." output
 	)
 
-ok 28 - make unstaged changes in existing submodule (.M S.M.)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6500-gc/repo/.git/
+[master (root-commit) 94a3838] 263
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 263.t
+[master 2f55aec] 410
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 410.t
+Auto packing the repository for optimum performance.
+Collecting referenced commits: 2, done.
+ok 35 - --no-detach overrides gc.autoDetach=true
 
-# passed all 28 test(s)
-1..28
+# passed all 35 test(s)
+1..35
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t6600-test-reach.sh ***
@@ -449543,2366 +449949,1882 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7113-post-index-change-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7113-post-index-change-hook/.git/
-expecting success of 7113.1 'setup': 
-	mkdir -p dir1 &&
-	touch dir1/file1.txt &&
-	echo testing >dir1/file2.txt &&
-	git add . &&
-	git commit -m "initial"
-
-[main (root-commit) 7e53173] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dir1/file1.txt
- create mode 100644 dir1/file2.txt
-ok 1 - setup
-
-expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
-			exit 1
-		fi
-		if test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
-			exit 1
-		fi
-		if test -f ".git/index.lock"; then
-			echo ".git/index.lock exists" >testfailure
-			exit 3
-		fi
-		if ! test -f ".git/index"; then
-			echo ".git/index does not exist" >testfailure
-			exit 3
-		fi
-		echo "success" >testsuccess
-	EOF
-	mkdir -p dir2 &&
-	touch dir2/file1.txt &&
-	touch dir2/file2.txt &&
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git status &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git add . &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git commit -m "second" &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -- dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure &&
-	git reset --soft &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure
+*** t6601-path-walk.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6601-path-walk/.git/
+expecting success of 6601.1 'setup test repository': 
+	git checkout -b base &&
 
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir2/
+	# Make some objects that will only be reachable
+	# via non-commit tags.
+	mkdir child &&
+	echo file >child/file &&
+	git add child &&
+	git commit -m "will abandon" &&
+	git tag -a -m "tree" tree-tag HEAD^{tree} &&
+	echo file2 >file2 &&
+	git add file2 &&
+	git commit --amend -m "will abandon" &&
+	git tag tree-tag2 HEAD^{tree} &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-[main 5070ba9] second
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir2/file1.txt
- create mode 100644 dir2/file2.txt
-ok 2 - test status, add, commit, others trigger hook without flags set
+	echo blob >file &&
+	blob_oid=$(git hash-object -t blob -w --stdin <file) &&
+	git tag -a -m "blob" blob-tag "$blob_oid" &&
+	echo blob2 >file2 &&
+	blob2_oid=$(git hash-object -t blob -w --stdin <file2) &&
+	git tag blob-tag2 "$blob2_oid" &&
 
-expecting success of 7113.3 'test checkout and reset trigger the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$1" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_workdir set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_workdir set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "update_workdir should be set for checkout" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
-	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout main &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout HEAD &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --hard &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -B test &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
+	rm -fr child file file2 &&
 
-Already on 'main'
-HEAD is now at 5070ba9 second
-Switched to a new branch 'test'
-ok 3 - test checkout and reset trigger the hook
+	mkdir left &&
+	mkdir right &&
+	echo a >a &&
+	echo b >left/b &&
+	echo c >right/c &&
+	git add . &&
+	git commit --amend -m "first" &&
+	git tag -m "first" first HEAD &&
 
-expecting success of 7113.4 'test reset --mixed and update-index triggers the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$2" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_skipworktree set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
-	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --mixed --quiet HEAD~1 &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git hash-object -w --stdin <dir1/file2.txt >expect &&
-	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index --skip-worktree dir1/file2.txt &&
-	git update-index --remove dir1/file2.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
+	echo d >right/d &&
+	git add right &&
+	git commit -m "second" &&
+	git tag -a -m "second (under)" second.1 HEAD &&
+	git tag -a -m "second (top)" second.2 second.1 &&
 
-ok 4 - test reset --mixed and update-index triggers the hook
+	# Set up file/dir collision in history.
+	rm a &&
+	mkdir a &&
+	echo a >a/a &&
+	echo bb >left/b &&
+	git add a left &&
+	git commit -m "third" &&
+	git tag -a -m "third" third &&
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7110-reset-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7110-reset-merge/.git/
-expecting success of 7110.1 'setup': 
-	printf "line %d\n" 1 2 3 >file1 &&
-	cat file1 >file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git tag initial &&
-	echo line 4 >>file1 &&
-	cat file1 >file2 &&
-	test_tick &&
-	git commit -m "add line 4 to file1" file1 &&
-	git tag second
+	git checkout -b topic HEAD~1 &&
+	echo cc >right/c &&
+	git commit -a -m "topic" &&
+	git tag -a -m "fourth" fourth
 
-[master (root-commit) 294b13e] Initial commit
+Switched to a new branch 'base'
+[base (root-commit) 8a1cb1c] will abandon
  Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 file1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 child/file
+[base 59ee105] will abandon
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+)
+ create mode 100644 child/file
  create mode 100644 file2
-[master 91b6f65] add line 4 to file1
+[base af55d63] first
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 100644 left/b
+ create mode 100644 right/c
+[base 39cfa34] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup
+ create mode 100644 right/d
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f second.2 second.1^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+[base e8558c1] third
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename a => a/a (100%)
+Switched to a new branch 'topic'
+[topic f3f293d] topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup test repository
 
-expecting success of 7110.2 'reset --merge is ok with changes in file it does not touch': 
-	git reset --merge HEAD^ &&
-	! grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+expecting success of 6601.2 'all': 
+	test-tool path-walk -- --all >out &&
 
-line 4
-ok 2 - reset --merge is ok with changes in file it does not touch
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base)
+	0:commit::$(git rev-parse base~1)
+	0:commit::$(git rev-parse base~2)
+	1:tag:/tags:$(git rev-parse refs/tags/first)
+	1:tag:/tags:$(git rev-parse refs/tags/second.1)
+	1:tag:/tags:$(git rev-parse refs/tags/second.2)
+	1:tag:/tags:$(git rev-parse refs/tags/third)
+	1:tag:/tags:$(git rev-parse refs/tags/fourth)
+	1:tag:/tags:$(git rev-parse refs/tags/tree-tag)
+	1:tag:/tags:$(git rev-parse refs/tags/blob-tag)
+	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{})
+	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
+	3:tree::$(git rev-parse topic^{tree})
+	3:tree::$(git rev-parse base^{tree})
+	3:tree::$(git rev-parse base~1^{tree})
+	3:tree::$(git rev-parse base~2^{tree})
+	3:tree::$(git rev-parse refs/tags/tree-tag^{})
+	3:tree::$(git rev-parse refs/tags/tree-tag2^{})
+	4:blob:a:$(git rev-parse base~2:a)
+	5:blob:file2:$(git rev-parse refs/tags/tree-tag2^{}:file2)
+	6:tree:a/:$(git rev-parse base:a)
+	7:tree:child/:$(git rev-parse refs/tags/tree-tag:child)
+	8:blob:child/file:$(git rev-parse refs/tags/tree-tag:child/file)
+	9:tree:left/:$(git rev-parse base:left)
+	9:tree:left/:$(git rev-parse base~2:left)
+	10:blob:left/b:$(git rev-parse base~2:left/b)
+	10:blob:left/b:$(git rev-parse base:left/b)
+	11:tree:right/:$(git rev-parse topic:right)
+	11:tree:right/:$(git rev-parse base~1:right)
+	11:tree:right/:$(git rev-parse base~2:right)
+	12:blob:right/c:$(git rev-parse base~2:right/c)
+	12:blob:right/c:$(git rev-parse topic:right/c)
+	13:blob:right/d:$(git rev-parse base~1:right/d)
+	blobs:10
+	commits:4
+	tags:7
+	trees:13
+	EOF
 
-expecting success of 7110.3 'reset --merge is ok when switching back': 
-	git reset --merge second &&
-	grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+	test_cmp_sorted expect out
 
-line 4
-line 4
-ok 3 - reset --merge is ok when switching back
+ok 2 - all
 
-expecting success of 7110.4 'reset --keep is ok with changes in file it does not touch': 
-	git reset --hard second &&
-	cat file1 >file2 &&
-	git reset --keep HEAD^ &&
-	! grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+expecting success of 6601.3 'indexed objects': 
+	test_when_finished git reset --hard &&
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 4 - reset --keep is ok with changes in file it does not touch
+	# stage change into index, adding a blob but
+	# also invalidating the cache-tree for the root
+	# and the "left" directory.
+	echo bogus >left/c &&
+	git add left &&
 
-expecting success of 7110.5 'reset --keep is ok when switching back': 
-	git reset --keep second &&
-	grep 4 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+	test-tool path-walk -- --indexed-objects >out &&
 
-line 4
-line 4
-ok 5 - reset --keep is ok when switching back
+	cat >expect <<-EOF &&
+	0:blob:a:$(git rev-parse HEAD:a)
+	1:blob:left/b:$(git rev-parse HEAD:left/b)
+	2:blob:left/c:$(git rev-parse :left/c)
+	3:blob:right/c:$(git rev-parse HEAD:right/c)
+	4:blob:right/d:$(git rev-parse HEAD:right/d)
+	5:tree:right/:$(git rev-parse topic:right)
+	blobs:5
+	commits:0
+	tags:0
+	trees:1
+	EOF
 
-expecting success of 7110.6 'reset --merge discards changes added to index (1)': 
-	git reset --hard second &&
-	cat file1 >file2 &&
-	echo "line 5" >> file1 &&
-	git add file1 &&
-	git reset --merge HEAD^ &&
-	! grep 4 file1 &&
-	! grep 5 file1 &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+	test_cmp_sorted expect out
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 6 - reset --merge discards changes added to index (1)
+HEAD is now at f3f293d topic
+ok 3 - indexed objects
 
-expecting success of 7110.7 'reset --merge is ok again when switching back (1)': 
-	git reset --hard initial &&
-	echo "line 5" >> file2 &&
-	git add file2 &&
-	git reset --merge second &&
-	! grep 4 file2 &&
-	! grep 5 file1 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+expecting success of 6601.4 'branches and indexed objects mix well': 
+	test_when_finished git reset --hard &&
 
-HEAD is now at 294b13e Initial commit
-line 4
-ok 7 - reset --merge is ok again when switching back (1)
+	# stage change into index, adding a blob but
+	# also invalidating the cache-tree for the root
+	# and the "right" directory.
+	echo fake >right/d &&
+	git add right &&
 
-expecting success of 7110.8 'reset --keep fails with changes in index in files it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	git add file1 &&
-	test_must_fail git reset --keep HEAD^
+	test-tool path-walk -- --indexed-objects --branches >out &&
 
-HEAD is now at 91b6f65 add line 4 to file1
-error: Entry 'file1' would be overwritten by merge. Cannot merge.
-fatal: Could not reset index file to revision 'HEAD^'.
-ok 8 - reset --keep fails with changes in index in files it touches
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base)
+	0:commit::$(git rev-parse base~1)
+	0:commit::$(git rev-parse base~2)
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base^{tree})
+	1:tree::$(git rev-parse base~1^{tree})
+	1:tree::$(git rev-parse base~2^{tree})
+	2:tree:a/:$(git rev-parse refs/tags/third:a)
+	3:tree:left/:$(git rev-parse base:left)
+	3:tree:left/:$(git rev-parse base~2:left)
+	4:blob:left/b:$(git rev-parse base:left/b)
+	4:blob:left/b:$(git rev-parse base~2:left/b)
+	5:tree:right/:$(git rev-parse topic:right)
+	5:tree:right/:$(git rev-parse base~1:right)
+	5:tree:right/:$(git rev-parse base~2:right)
+	6:blob:right/c:$(git rev-parse base~2:right/c)
+	6:blob:right/c:$(git rev-parse topic:right/c)
+	7:blob:right/d:$(git rev-parse base~1:right/d)
+	7:blob:right/d:$(git rev-parse :right/d)
+	8:blob:a:$(git rev-parse base~2:a)
+	blobs:7
+	commits:4
+	tags:0
+	trees:10
+	EOF
 
-expecting success of 7110.9 'reset --merge discards changes added to index (2)': 
-	git reset --hard second &&
-	echo "line 4" >> file2 &&
-	git add file2 &&
-	git reset --merge HEAD^ &&
-	! grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff)" &&
-	test -z "$(git diff --cached)"
+	test_cmp_sorted expect out
 
-HEAD is now at 91b6f65 add line 4 to file1
-ok 9 - reset --merge discards changes added to index (2)
+HEAD is now at f3f293d topic
+ok 4 - branches and indexed objects mix well
 
-expecting success of 7110.10 'reset --merge is ok again when switching back (2)': 
-	git reset --hard initial &&
-	git reset --merge second &&
-	! grep 4 file2 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+expecting success of 6601.5 'base & topic, sparse': 
+	cat >patterns <<-EOF &&
+	/*
+	!/*/
+	/left/
+	EOF
 
-HEAD is now at 294b13e Initial commit
-line 4
-ok 10 - reset --merge is ok again when switching back (2)
+	test-tool path-walk --stdin-pl -- base topic <patterns >out &&
 
-expecting success of 7110.11 'reset --keep keeps changes it does not touch': 
-	git reset --hard second &&
-	echo "line 4" >> file2 &&
-	git add file2 &&
-	git reset --keep HEAD^ &&
-	grep 4 file2 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-	test -z "$(git diff --cached)"
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base)
+	0:commit::$(git rev-parse base~1)
+	0:commit::$(git rev-parse base~2)
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base^{tree})
+	1:tree::$(git rev-parse base~1^{tree})
+	1:tree::$(git rev-parse base~2^{tree})
+	2:blob:a:$(git rev-parse base~2:a)
+	3:tree:left/:$(git rev-parse base:left)
+	3:tree:left/:$(git rev-parse base~2:left)
+	4:blob:left/b:$(git rev-parse base~2:left/b)
+	4:blob:left/b:$(git rev-parse base:left/b)
+	blobs:3
+	commits:4
+	tags:0
+	trees:6
+	EOF
 
-HEAD is now at 91b6f65 add line 4 to file1
-line 4
-ok 11 - reset --keep keeps changes it does not touch
+	test_cmp_sorted expect out
 
-expecting success of 7110.12 'reset --keep keeps changes when switching back': 
-	git reset --keep second &&
-	grep 4 file2 &&
-	grep 4 file1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)"
+ok 5 - base & topic, sparse
 
-line 4
-line 4
-ok 12 - reset --keep keeps changes when switching back
+expecting success of 6601.6 'topic only': 
+	test-tool path-walk -- topic >out &&
 
-expecting success of 7110.13 'reset --merge fails with changes in file it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	test_tick &&
-	git commit -m "add line 5" file1 &&
-	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-	mv file3 file1 &&
-	test_must_fail git reset --merge HEAD^ 2>err.log &&
-	grep file1 err.log | grep "not uptodate"
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base~1)
+	0:commit::$(git rev-parse base~2)
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base~1^{tree})
+	1:tree::$(git rev-parse base~2^{tree})
+	2:blob:a:$(git rev-parse base~2:a)
+	3:tree:left/:$(git rev-parse base~2:left)
+	4:blob:left/b:$(git rev-parse base~2:left/b)
+	5:tree:right/:$(git rev-parse topic:right)
+	5:tree:right/:$(git rev-parse base~1:right)
+	5:tree:right/:$(git rev-parse base~2:right)
+	6:blob:right/c:$(git rev-parse base~2:right/c)
+	6:blob:right/c:$(git rev-parse topic:right/c)
+	7:blob:right/d:$(git rev-parse base~1:right/d)
+	blobs:5
+	commits:3
+	tags:0
+	trees:7
+	EOF
 
-HEAD is now at 91b6f65 add line 4 to file1
-[master 7799e7c] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 13 - reset --merge fails with changes in file it touches
+	test_cmp_sorted expect out
 
-expecting success of 7110.14 'reset --keep fails with changes in file it touches': 
-	git reset --hard second &&
-	echo "line 5" >> file1 &&
-	test_tick &&
-	git commit -m "add line 5" file1 &&
-	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-	mv file3 file1 &&
-	test_must_fail git reset --keep HEAD^ 2>err.log &&
-	grep file1 err.log | grep "not uptodate"
+ok 6 - topic only
 
-HEAD is now at 91b6f65 add line 4 to file1
-[master f1894d3] add line 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-error: Entry 'file1' not uptodate. Cannot merge.
-ok 14 - reset --keep fails with changes in file it touches
+expecting success of 6601.7 'topic, not base': 
+	test-tool path-walk -- topic --not base >out &&
 
-expecting success of 7110.15 'setup 3 different branches': 
-	git reset --hard second &&
-	git branch branch1 &&
-	git branch branch2 &&
-	git branch branch3 &&
-	git checkout branch1 &&
-	echo "line 5 in branch1" >> file1 &&
-	test_tick &&
-	git commit -a -m "change in branch1" &&
-	git checkout branch2 &&
-	echo "line 5 in branch2" >> file1 &&
-	test_tick &&
-	git commit -a -m "change in branch2" &&
-	git tag third &&
-	git checkout branch3 &&
-	echo a new file >file3 &&
-	rm -f file1 &&
-	git add file3 &&
-	test_tick &&
-	git commit -a -m "change in branch3"
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	1:tree::$(git rev-parse topic^{tree})
+	2:blob:a:$(git rev-parse topic:a):UNINTERESTING
+	3:tree:left/:$(git rev-parse topic:left):UNINTERESTING
+	4:blob:left/b:$(git rev-parse topic:left/b):UNINTERESTING
+	5:tree:right/:$(git rev-parse topic:right)
+	6:blob:right/c:$(git rev-parse topic:right/c)
+	7:blob:right/d:$(git rev-parse topic:right/d):UNINTERESTING
+	blobs:4
+	commits:1
+	tags:0
+	trees:3
+	EOF
 
-HEAD is now at 91b6f65 add line 4 to file1
-Switched to branch 'branch1'
-[branch1 4afd189] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 077fd6d] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch3'
-[branch3 05419f2] change in branch3
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 4 deletions(-)
- delete mode 100644 file1
- create mode 100644 file3
-ok 15 - setup 3 different branches
+	test_cmp_sorted expect out
 
-expecting success of 7110.16 '"reset --merge HEAD^" is ok with pending merge': 
-	git checkout third &&
-	test_must_fail git merge branch1 &&
-	git reset --merge HEAD^ &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-	test -z "$(git diff --cached)" &&
-	test -z "$(git diff)"
+ok 7 - topic, not base
 
-Note: switching to 'third'.
+expecting success of 6601.8 'fourth, blob-tag2, not base': 
+	test-tool path-walk -- fourth blob-tag2 --not base >out &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	1:tag:/tags:$(git rev-parse fourth)
+	2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
+	3:tree::$(git rev-parse topic^{tree})
+	4:blob:a:$(git rev-parse base~1:a):UNINTERESTING
+	5:tree:left/:$(git rev-parse base~1:left):UNINTERESTING
+	6:blob:left/b:$(git rev-parse base~1:left/b):UNINTERESTING
+	7:tree:right/:$(git rev-parse topic:right)
+	8:blob:right/c:$(git rev-parse topic:right/c)
+	9:blob:right/d:$(git rev-parse base~1:right/d):UNINTERESTING
+	blobs:5
+	commits:1
+	tags:1
+	trees:3
+	EOF
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	test_cmp_sorted expect out
 
-  git switch -c <new-branch-name>
+ok 8 - fourth, blob-tag2, not base
 
-Or undo this operation with:
+expecting success of 6601.9 'topic, not base, only blobs': 
+	test-tool path-walk --no-trees --no-commits \
+		-- topic --not base >out &&
 
-  git switch -
+	cat >expect <<-EOF &&
+	0:blob:a:$(git rev-parse topic:a):UNINTERESTING
+	1:blob:left/b:$(git rev-parse topic:left/b):UNINTERESTING
+	2:blob:right/c:$(git rev-parse topic:right/c)
+	3:blob:right/d:$(git rev-parse topic:right/d):UNINTERESTING
+	blobs:4
+	commits:0
+	tags:0
+	trees:0
+	EOF
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	test_cmp_sorted expect out
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 16 - "reset --merge HEAD^" is ok with pending merge
+ok 9 - topic, not base, only blobs
 
-expecting success of 7110.17 '"reset --keep HEAD^" fails with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --keep HEAD^ 2>err.log &&
-	test_grep "middle of a merge" err.log
+expecting success of 6601.10 'topic, not base, only commits': 
+	test-tool path-walk --no-blobs --no-trees \
+		-- topic --not base >out &&
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 17 - "reset --keep HEAD^" fails with pending merge
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	commits:1
+	blobs:0
+	tags:0
+	trees:0
+	EOF
 
-expecting success of 7110.18 '"reset --merge HEAD" is ok with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	git reset --merge HEAD &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
-	test -z "$(git diff --cached)" &&
-	test -z "$(git diff)"
+	test_cmp_sorted expect out
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 18 - "reset --merge HEAD" is ok with pending merge
+ok 10 - topic, not base, only commits
 
-expecting success of 7110.19 '"reset --keep HEAD" fails with pending merge': 
-	git reset --hard third &&
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --keep HEAD 2>err.log &&
-	test_grep "middle of a merge" err.log
+expecting success of 6601.11 'topic, not base, only trees': 
+	test-tool path-walk --no-blobs --no-commits \
+		-- topic --not base >out &&
 
-HEAD is now at 077fd6d change in branch2
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 19 - "reset --keep HEAD" fails with pending merge
+	cat >expect <<-EOF &&
+	0:tree::$(git rev-parse topic^{tree})
+	1:tree:left/:$(git rev-parse topic:left):UNINTERESTING
+	2:tree:right/:$(git rev-parse topic:right)
+	commits:0
+	blobs:0
+	tags:0
+	trees:3
+	EOF
 
-expecting success of 7110.20 '--merge is ok with added/deleted merge': 
-	git reset --hard third &&
-	rm -f file2 &&
-	test_must_fail git merge branch3 &&
-	test_path_is_missing file2 &&
-	test_path_is_file file3 &&
-	git diff --exit-code file3 &&
-	git diff --exit-code branch3 file3 &&
-	git reset --merge HEAD &&
-	test_path_is_missing file3 &&
-	test_path_is_missing file2 &&
-	git diff --exit-code --cached
+	test_cmp_sorted expect out
 
-HEAD is now at 077fd6d change in branch2
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 20 - --merge is ok with added/deleted merge
+ok 11 - topic, not base, only trees
 
-expecting success of 7110.21 '--keep fails with added/deleted merge': 
-	git reset --hard third &&
-	rm -f file2 &&
-	test_must_fail git merge branch3 &&
-	test_path_is_missing file2 &&
-	test_path_is_file file3 &&
-	git diff --exit-code file3 &&
-	git diff --exit-code branch3 file3 &&
-	test_must_fail git reset --keep HEAD 2>err.log &&
-	test_grep "middle of a merge" err.log
+expecting success of 6601.12 'topic, not base, boundary': 
+	test-tool path-walk -- --boundary topic --not base >out &&
 
-HEAD is now at 077fd6d change in branch2
-CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 21 - --keep fails with added/deleted merge
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base~1):UNINTERESTING
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base~1^{tree}):UNINTERESTING
+	2:blob:a:$(git rev-parse base~1:a):UNINTERESTING
+	3:tree:left/:$(git rev-parse base~1:left):UNINTERESTING
+	4:blob:left/b:$(git rev-parse base~1:left/b):UNINTERESTING
+	5:tree:right/:$(git rev-parse topic:right)
+	5:tree:right/:$(git rev-parse base~1:right):UNINTERESTING
+	6:blob:right/c:$(git rev-parse base~1:right/c):UNINTERESTING
+	6:blob:right/c:$(git rev-parse topic:right/c)
+	7:blob:right/d:$(git rev-parse base~1:right/d):UNINTERESTING
+	blobs:5
+	commits:2
+	tags:0
+	trees:5
+	EOF
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7102-reset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7102-reset/.git/
-expecting success of 7102.1 'creating initial files and commits': 
-	test_tick &&
-	echo "1st file" >first &&
-	git add first &&
-	git commit -m "create 1st file" &&
+	test_cmp_sorted expect out
 
-	echo "2nd file" >second &&
-	git add second &&
-	git commit -m "create 2nd file" &&
+ok 12 - topic, not base, boundary
 
-	echo "2nd line 1st file" >>first &&
-	git commit -a -m "modify 1st file" &&
-	head5p2=$(git rev-parse --verify HEAD) &&
-	head5p2f=$(git rev-parse --short HEAD:first) &&
+expecting success of 6601.13 'topic, not base, boundary with pruning': 
+	test-tool path-walk --prune -- --boundary topic --not base >out &&
 
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
-	head5p1=$(git rev-parse --verify HEAD) &&
-	head5p1s=$(git rev-parse --short HEAD:secondfile) &&
+	cat >expect <<-EOF &&
+	0:commit::$(git rev-parse topic)
+	0:commit::$(git rev-parse base~1):UNINTERESTING
+	1:tree::$(git rev-parse topic^{tree})
+	1:tree::$(git rev-parse base~1^{tree}):UNINTERESTING
+	2:tree:right/:$(git rev-parse topic:right)
+	2:tree:right/:$(git rev-parse base~1:right):UNINTERESTING
+	3:blob:right/c:$(git rev-parse base~1:right/c):UNINTERESTING
+	3:blob:right/c:$(git rev-parse topic:right/c)
+	blobs:2
+	commits:2
+	tags:0
+	trees:4
+	EOF
 
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	head5=$(git rev-parse --verify HEAD) &&
-	head5s=$(git rev-parse --short HEAD:secondfile) &&
-	head5sl=$(git rev-parse HEAD:secondfile)
+	test_cmp_sorted expect out
 
-[main (root-commit) 811bbdf] create 1st file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first
-[main ba22ccd] create 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second
-[main ddaefe0] modify 1st file
+ok 13 - topic, not base, boundary with pruning
+
+expecting success of 6601.14 'trees are reported exactly once': 
+	test_when_finished "rm -rf unique-trees" &&
+	test_create_repo unique-trees &&
+	(
+		cd unique-trees &&
+		mkdir initial &&
+		test_commit initial/file &&
+		git switch -c move-to-top &&
+		git mv initial/file.t ./ &&
+		test_tick &&
+		git commit -m moved &&
+		git update-ref refs/heads/other HEAD
+	) &&
+	test-tool -C unique-trees path-walk -- --all >out &&
+	tree=$(git -C unique-trees rev-parse HEAD:) &&
+	grep "$tree" out >out-filtered &&
+	test_line_count = 1 out-filtered
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6601-path-walk/unique-trees/.git/
+[master (root-commit) 52fcaa7] initial/file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-rm 'first'
-[main d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[main eed6733] modify 2nd file (geändert)
+ create mode 100644 initial/file.t
+Switched to a new branch 'move-to-top'
+[move-to-top efba859] moved
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 1 - creating initial files and commits
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename initial/file.t => file.t (100%)
+ok 14 - trees are reported exactly once
 
-expecting success of 7102.2 'no 'git reset --no-soft'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-soft'
-ok 2 - no 'git reset --no-soft'
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7001-mv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+expecting success of 7001.1 'mv -f refreshes updated index entry': 
+	echo test >bar &&
+	git add bar &&
+	git commit -m test &&
 
-expecting success of 7102.3 'no 'git reset --no-mixed'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-mixed'
-ok 3 - no 'git reset --no-mixed'
+	echo foo >foo &&
+	git add foo &&
 
-expecting success of 7102.4 'no 'git reset --no-hard'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-hard'
-ok 4 - no 'git reset --no-hard'
+	# Wait one second to ensure ctime of rename will differ from original
+	# file creation ctime.
+	sleep 1 &&
+	git mv -f foo bar &&
+	git reset --merge HEAD &&
 
-expecting success of 7102.5 'no 'git reset --no-merge'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-merge'
-ok 5 - no 'git reset --no-merge'
+	# Verify the index has been reset
+	git diff-files >out &&
+	test_must_be_empty out
 
-expecting success of 7102.6 'no 'git reset --no-keep'': 
-		test_when_finished "rm -f err" &&
-		test_must_fail git reset --no-$opt 2>err &&
-		grep "error: unknown option .no-$opt." err
-	
-error: unknown option `no-keep'
-ok 6 - no 'git reset --no-keep'
+[master (root-commit) dd702a3] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+ok 1 - mv -f refreshes updated index entry
 
-expecting success of 7102.7 'reset --hard message': 
-	hex=$(git log -1 --format="%h") &&
-	git reset --hard >.actual &&
-	echo HEAD is now at $hex $(commit_msg) >.expected &&
-	test_cmp .expected .actual
+expecting success of 7001.2 'prepare reference tree': 
+	mkdir path0 path1 &&
+	COPYING_test_data >path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
 
-ok 7 - reset --hard message
+[master a081f64] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/COPYING
+ok 2 - prepare reference tree
 
-expecting success of 7102.8 'reset --hard message (ISO8859-1 logoutputencoding)': 
-	hex=$(git log -1 --format="%h") &&
-	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
-	echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
-	test_cmp .expected .actual
+expecting success of 7001.3 'moving the file out of subdirectory': 
+	git -C path0 mv COPYING ../path1/COPYING
 
-ok 8 - reset --hard message (ISO8859-1 logoutputencoding)
+ok 3 - moving the file out of subdirectory
 
-expecting success of 7102.9 'giving a non existing revision should fail': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
+expecting success of 7001.4 'commiting the change': 
+	git commit -m move-out -a
 
-	test_must_fail git reset aaaaaa &&
-	test_must_fail git reset --mixed aaaaaa &&
-	test_must_fail git reset --soft aaaaaa &&
-	test_must_fail git reset --hard aaaaaa &&
-	check_changes $head5
+[master e61e243] move-out
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path1}/COPYING (100%)
+ok 4 - commiting the change
 
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 9 - giving a non existing revision should fail
+expecting success of 7001.5 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path1/COPYING" actual
 
-expecting success of 7102.10 'reset --soft with unmerged index should fail': 
-	touch .git/MERGE_HEAD &&
-	echo "100644 $head5sl 1	un" |
-		git update-index --index-info &&
-	test_must_fail git reset --soft HEAD &&
-	rm .git/MERGE_HEAD &&
-	git rm --cached -- un
+R100	path0/COPYING	path1/COPYING
+ok 5 - checking the commit
 
-fatal: Cannot do a soft reset in the middle of a merge.
-rm 'un'
-ok 10 - reset --soft with unmerged index should fail
+expecting success of 7001.6 'moving the file back into subdirectory': 
+	git -C path0 mv ../path1/COPYING COPYING
 
-expecting success of 7102.11 'giving paths with options different than --mixed should fail': 
-	test_must_fail git reset --soft -- first &&
-	test_must_fail git reset --hard -- first &&
-	test_must_fail git reset --soft HEAD^ -- first &&
-	test_must_fail git reset --hard HEAD^ -- first &&
-	check_changes $head5
+ok 6 - moving the file back into subdirectory
 
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-fatal: Cannot do soft reset with paths.
-fatal: Cannot do hard reset with paths.
-ok 11 - giving paths with options different than --mixed should fail
+expecting success of 7001.7 'commiting the change': 
+	git commit -m move-in -a
 
-expecting success of 7102.12 'giving unrecognized options should fail': 
-	test_must_fail git reset --other &&
-	test_must_fail git reset -o &&
-	test_must_fail git reset --mixed --other &&
-	test_must_fail git reset --mixed -o &&
-	test_must_fail git reset --soft --other &&
-	test_must_fail git reset --soft -o &&
-	test_must_fail git reset --hard --other &&
-	test_must_fail git reset --hard -o &&
-	check_changes $head5
+[master 965f93d] move-in
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {path1 => path0}/COPYING (100%)
+ok 7 - commiting the change
 
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.8 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path1/COPYING..*path0/COPYING" actual
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+R100	path1/COPYING	path0/COPYING
+ok 8 - checking the commit
 
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.9 'mv --dry-run does not move file': 
+	git mv -n path0/COPYING MOVED &&
+	test_path_is_file path0/COPYING &&
+	test_path_is_missing MOVED
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+Checking rename of 'path0/COPYING' to 'MOVED'
+Renaming path0/COPYING to MOVED
+ok 9 - mv --dry-run does not move file
 
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.10 'checking -k on non-existing file': 
+	git mv -k idontexist path0
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+ok 10 - checking -k on non-existing file
 
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.11 'checking -k on untracked file': 
+	>untracked1 &&
+	git mv -k untracked1 path0 &&
+	test_path_is_file untracked1 &&
+	test_path_is_missing path0/untracked1
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+ok 11 - checking -k on untracked file
 
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.12 'checking -k on multiple untracked files': 
+	>untracked2 &&
+	git mv -k untracked1 untracked2 path0 &&
+	test_path_is_file untracked1 &&
+	test_path_is_file untracked2 &&
+	test_path_is_missing path0/untracked1 &&
+	test_path_is_missing path0/untracked2
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+ok 12 - checking -k on multiple untracked files
 
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.13 'checking -f on untracked file with existing target': 
+	>path0/untracked1 &&
+	test_must_fail git mv -f untracked1 path0 &&
+	test_path_is_missing .git/index.lock &&
+	test_path_is_file untracked1 &&
+	test_path_is_file path0/untracked1
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+fatal: not under version control, source=untracked1, destination=path0/untracked1
+ok 13 - checking -f on untracked file with existing target
 
-error: unknown option `other'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.14 'moving to absent target with trailing slash': 
+	test_must_fail git mv path0/COPYING no-such-dir/ &&
+	test_must_fail git mv path0/COPYING no-such-dir// &&
+	git mv path0/ no-such-dir/ &&
+	test_path_is_dir no-such-dir
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+fatal: destination directory does not exist, source=path0/COPYING, destination=no-such-dir/
+ok 14 - moving to absent target with trailing slash
 
-error: unknown switch `o'
-usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
-   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
-   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
-   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
+expecting success of 7001.15 'clean up': 
+	git reset --hard
 
-    -q, --[no-]quiet      be quiet, only report errors
-    --no-refresh          skip refreshing the index after reset
-    --refresh             opposite of --no-refresh
-    --mixed               reset HEAD and index
-    --soft                reset only HEAD
-    --hard                reset HEAD, index and working tree
-    --merge               reset HEAD, index and working tree
-    --keep                reset HEAD but keep local changes
-    --[no-]recurse-submodules[=<reset>]
-                          control recursive updating of submodules
-    -p, --[no-]patch      select hunks interactively
-    -N, --[no-]intent-to-add
-                          record only the fact that removed paths will be added later
-    --[no-]pathspec-from-file <file>
-                          read pathspec from file
-    --[no-]pathspec-file-nul
-                          with --pathspec-from-file, pathspec elements are separated with NUL character
+HEAD is now at 965f93d move-in
+ok 15 - clean up
 
-ok 12 - giving unrecognized options should fail
+expecting success of 7001.16 'moving to existing untracked target with trailing slash': 
+	mkdir path1 &&
+	git mv path0/ path1/ &&
+	test_path_is_dir path1/path0/
 
-expecting success of 7102.13 'trying to do reset --soft with pending merge should fail': 
-	git branch branch1 &&
-	git branch branch2 &&
+ok 16 - moving to existing untracked target with trailing slash
 
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
+expecting success of 7001.17 'moving to existing tracked target with trailing slash': 
+	mkdir path2 &&
+	>path2/file && git add path2/file &&
+	git mv path1/path0/ path2/ &&
+	test_path_is_dir path2/path0/
 
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
+ok 17 - moving to existing tracked target with trailing slash
 
-	test_must_fail git merge branch1 &&
-	test_must_fail git reset --soft &&
+expecting success of 7001.18 'clean up': 
+	git reset --hard
 
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the change in branch2" &&
+HEAD is now at 965f93d move-in
+ok 18 - clean up
 
-	git checkout main &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
+expecting success of 7001.19 'adding another file': 
+	COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
+	git add path0/README &&
+	git commit -m add2 -a
 
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging secondfile
-CONFLICT (content): Merge conflict in secondfile
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch2 8e8e261] the change in branch2
+[master 0c7076e] add2
  Author: A U Thor <author@example.com>
-Switched to branch 'main'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was 8e8e261).
-ok 13 - trying to do reset --soft with pending merge should fail
-
-expecting success of 7102.14 'trying to do reset --soft with pending checkout merge should fail': 
-	git branch branch3 &&
-	git branch branch4 &&
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/README
+ok 19 - adding another file
 
-	git checkout branch3 &&
-	echo "3rd line in branch3" >>secondfile &&
-	git commit -a -m "line in branch3" &&
+expecting success of 7001.20 'moving whole subdirectory': 
+	git mv path0 path2
 
-	git checkout branch4 &&
-	echo "3rd line in branch4" >>secondfile &&
+ok 20 - moving whole subdirectory
 
-	git checkout -m branch3 &&
-	test_must_fail git reset --soft &&
+expecting success of 7001.21 'commiting the change': 
+	git commit -m dir-move -a
 
-	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
-	git commit -a -m "the line in branch3" &&
+[master d877af0] dir-move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename {path0 => path2}/COPYING (100%)
+ rename {path0 => path2}/README (100%)
+ok 21 - commiting the change
 
-	git checkout main &&
-	git branch -D branch3 branch4 &&
-	check_changes $head5
+expecting success of 7001.22 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+	grep "^R100..*path0/README..*path2/README" actual
 
-Switched to branch 'branch3'
-[branch3 0b5021a] line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch4'
-Switched to branch 'branch3'
-M	secondfile
-fatal: Cannot do a soft reset in the middle of a merge.
-[branch3 dbe96ed] the line in branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Deleted branch branch3 (was dbe96ed).
-Deleted branch branch4 (was eed6733).
-ok 14 - trying to do reset --soft with pending checkout merge should fail
+R100	path0/COPYING	path2/COPYING
+R100	path0/README	path2/README
+ok 22 - checking the commit
 
-expecting success of 7102.15 'resetting to HEAD with no changes should succeed and do nothing': 
-	git reset --hard &&
-		check_changes $head5 &&
-	git reset --hard HEAD &&
-		check_changes $head5 &&
-	git reset --soft &&
-		check_changes $head5 &&
-	git reset --soft HEAD &&
-		check_changes $head5 &&
-	git reset --mixed &&
-		check_changes $head5 &&
-	git reset --mixed HEAD &&
-		check_changes $head5 &&
-	git reset &&
-		check_changes $head5 &&
-	git reset HEAD &&
-		check_changes $head5
+expecting success of 7001.23 'succeed when source is a prefix of destination': 
+	git mv path2/COPYING path2/COPYING-renamed
 
-HEAD is now at eed6733 modify 2nd file (geändert)
-HEAD is now at eed6733 modify 2nd file (geändert)
-ok 15 - resetting to HEAD with no changes should succeed and do nothing
+ok 23 - succeed when source is a prefix of destination
 
-expecting success of 7102.16 '--soft reset only should show changes in diff --cached': 
-	>.diff_expect &&
-	cat >.cached_expect <<-EOF &&
-	diff --git a/secondfile b/secondfile
-	index $head5p1s..$head5s 100644
-	--- a/secondfile
-	+++ b/secondfile
-	@@ -1 +1,2 @@
-	-2nd file
-	+1st line 2nd file
-	+2nd line 2nd file
-	EOF
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset --soft HEAD^ &&
-	check_changes $head5p1 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
+expecting success of 7001.24 'moving whole subdirectory into subdirectory': 
+	git mv path2 path1
 
-ok 16 - --soft reset only should show changes in diff --cached
+ok 24 - moving whole subdirectory into subdirectory
 
-expecting success of 7102.17 'changing files and redo the last commit should succeed': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	3rd line 2nd file
-	EOF
-	echo "3rd line 2nd file" >>secondfile &&
-	git commit -a -C ORIG_HEAD &&
-	head4=$(git rev-parse --verify HEAD) &&
-	check_changes $head4 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head5
+expecting success of 7001.25 'commiting the change': 
+	git commit -m dir-move -a
 
-[main b052eb8] modify 2nd file (geändert)
+[master a4d744b] dir-move
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 3 insertions(+), 1 deletion(-)
-ok 17 - changing files and redo the last commit should succeed
-
-expecting success of 7102.18 '--hard reset should change the files and undo commits permanently': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	first:
-	1st file
-	2nd line 1st file
-	second:
-	2nd file
-	EOF
-	git reset --hard HEAD~2 &&
-	check_changes $head5p2 &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			$head4
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ rename path2/COPYING => path1/path2/COPYING-renamed (100%)
+ rename {path2 => path1/path2}/README (100%)
+ok 25 - commiting the change
 
-HEAD is now at ddaefe0 modify 1st file
-ok 18 - --hard reset should change the files and undo commits permanently
+expecting success of 7001.26 'checking the commit': 
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+	grep "^R100..*path2/README..*path1/path2/README" actual
 
-expecting success of 7102.19 'redoing changes adding them without commit them should succeed': 
-	>.diff_expect &&
-	cat >.cached_expect <<-EOF &&
-	diff --git a/first b/first
-	deleted file mode 100644
-	index $head5p2f..0000000
-	--- a/first
-	+++ /dev/null
-	@@ -1,2 +0,0 @@
-	-1st file
-	-2nd line 1st file
-	diff --git a/second b/second
-	deleted file mode 100644
-	index $head5p1s..0000000
-	--- a/second
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2nd file
-	diff --git a/secondfile b/secondfile
-	new file mode 100644
-	index 0000000..$head5s
-	--- /dev/null
-	+++ b/secondfile
-	@@ -0,0 +1,2 @@
-	+1st line 2nd file
-	+2nd line 2nd file
-	EOF
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git rm first &&
-	git mv second secondfile &&
+R100	path2/COPYING	path1/path2/COPYING-renamed
+R100	path2/README	path1/path2/README
+ok 26 - checking the commit
 
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	git add secondfile &&
-	check_changes $head5p2
+expecting success of 7001.27 'do not move directory over existing directory': 
+	mkdir path0 &&
+	mkdir path0/path2 &&
+	test_must_fail git mv path2 path0
 
-rm 'first'
-ok 19 - redoing changes adding them without commit them should succeed
+fatal: bad source, source=path2, destination=path0/path2
+ok 27 - do not move directory over existing directory
 
-expecting success of 7102.20 '--mixed reset to HEAD should unadd the files': 
-	cat >.diff_expect <<-EOF &&
-	diff --git a/first b/first
-	deleted file mode 100644
-	index $head5p2f..0000000
-	--- a/first
-	+++ /dev/null
-	@@ -1,2 +0,0 @@
-	-1st file
-	-2nd line 1st file
-	diff --git a/second b/second
-	deleted file mode 100644
-	index $head5p1s..0000000
-	--- a/second
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2nd file
-	EOF
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset &&
-	check_changes $head5p2 &&
-	test "$(git rev-parse ORIG_HEAD)" = $head5p2
+expecting success of 7001.28 'rename directory to non-existing directory': 
+	mkdir dir-a &&
+	>dir-a/f &&
+	git add dir-a &&
+	git mv dir-a non-existing-dir
 
-Unstaged changes after reset:
-D	first
-D	second
-ok 20 - --mixed reset to HEAD should unadd the files
+ok 28 - rename directory to non-existing directory
 
-expecting success of 7102.21 'redoing the last two commits should succeed': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git add secondfile &&
-	git reset --hard $head5p2 &&
-	git rm first &&
-	git mv second secondfile &&
-	git commit -a -m "remove 1st and rename 2nd" &&
+expecting success of 7001.29 'move into "."': 
+	git mv path1/path2/ .
 
-	echo "1st line 2nd file" >secondfile &&
-	echo "2nd line 2nd file" >>secondfile &&
-	# "git commit -m" would break MinGW, as Windows refuse to pass
-	# $test_encoding encoded parameter to git.
-	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	check_changes $head5
+ok 29 - move into "."
 
-HEAD is now at ddaefe0 modify 1st file
-rm 'first'
-[main d1a4bc3] remove 1st and rename 2nd
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 first
- rename second => secondfile (100%)
-[main eed6733] modify 2nd file (geändert)
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 21 - redoing the last two commits should succeed
+expecting success of 7001.30 'Michael Cassar's test case': 
+	rm -fr .git papers partA &&
+	git init &&
+	mkdir -p papers/unsorted papers/all-papers partA &&
+	echo a >papers/unsorted/Thesis.pdf &&
+	echo b >partA/outline.txt &&
+	echo c >papers/unsorted/_another &&
+	git add papers partA &&
+	T1=$(git write-tree) &&
 
-expecting success of 7102.22 '--hard reset to HEAD should clear a failed merge': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	3rd line in branch2
-	EOF
-	git branch branch1 &&
-	git branch branch2 &&
+	git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
 
-	git checkout branch1 &&
-	echo "3rd line in branch1" >>secondfile &&
-	git commit -a -m "change in branch1" &&
+	T=$(git write-tree) &&
+	git ls-tree -r $T >out &&
+	grep partA/outline.txt out
 
-	git checkout branch2 &&
-	echo "3rd line in branch2" >>secondfile &&
-	git commit -a -m "change in branch2" &&
-	head3=$(git rev-parse --verify HEAD) &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+100644 blob 61780798228d17af2d34fce4cfbdf35556832472	partA/outline.txt
+ok 30 - Michael Cassar's test case
 
-	test_must_fail git pull . branch1 &&
-	git reset --hard &&
-	check_changes $head3
+expecting success of 7001.31 'Sergey Vlasov's test case': 
+	rm -fr .git &&
+	git init &&
+	mkdir ab &&
+	date >ab.c &&
+	date >ab/d &&
+	git add ab.c ab &&
+	git commit -m "initial" &&
+	git mv ab a
 
-Switched to branch 'branch1'
-[branch1 6b78ea5] change in branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'branch2'
-[branch2 f8a209f] change in branch2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+[master (root-commit) a5c31d0] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From .
- * branch            branch1    -> FETCH_HEAD
-hint: You have divergent branches and need to specify how to reconcile them.
-hint: You can do so by running one of the following commands sometime before
-hint: your next pull:
-hint:
-hint:   git config pull.rebase false  # merge
-hint:   git config pull.rebase true   # rebase
-hint:   git config pull.ff only       # fast-forward only
-hint:
-hint: You can replace "git config" with "git config --global" to set a default
-hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-hint: or --ff-only on the command line to override the configured default per
-hint: invocation.
-fatal: Need to specify how to reconcile divergent branches.
-HEAD is now at f8a209f change in branch2
-ok 22 - --hard reset to HEAD should clear a failed merge
+ 2 files changed, 2 insertions(+)
+ create mode 100644 ab.c
+ create mode 100644 ab/d
+ok 31 - Sergey Vlasov's test case
 
-expecting success of 7102.23 '--hard reset to ORIG_HEAD should clear a fast-forward merge': 
-	>.diff_expect &&
-	>.cached_expect &&
-	cat >.cat_expect <<-\EOF &&
-	secondfile:
-	1st line 2nd file
-	2nd line 2nd file
-	EOF
-	git reset --hard HEAD^ &&
-	check_changes $head5 &&
+expecting success of 7001.32 'absolute pathname': 
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
 
-	git pull . branch1 &&
-	git reset --hard ORIG_HEAD &&
-	check_changes $head5 &&
+		git mv sub "$(pwd)/in" &&
+		test_path_is_missing sub &&
+		test_path_is_dir in &&
+		git ls-files --error-unmatch in/file
+	)
 
-	git checkout main &&
-	git branch -D branch1 branch2 &&
-	check_changes $head5
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one/.git/
+in/file
+ok 32 - absolute pathname
 
-HEAD is now at eed6733 modify 2nd file (geändert)
-From .
- * branch            branch1    -> FETCH_HEAD
-Updating eed6733..6b78ea5
-Fast-forward
- secondfile | 1 +
- 1 file changed, 1 insertion(+)
-HEAD is now at eed6733 modify 2nd file (geändert)
-Switched to branch 'main'
-Deleted branch branch1 (was 6b78ea5).
-Deleted branch branch2 (was eed6733).
-ok 23 - --hard reset to ORIG_HEAD should clear a fast-forward merge
+expecting success of 7001.33 'absolute pathname outside should fail': 
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		out=$(pwd) &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
 
-expecting success of 7102.24 'test --mixed <paths>': 
-	echo 1 >file1 &&
-	echo 2 >file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m files &&
-	before1=$(git rev-parse --short HEAD:file1) &&
-	before2=$(git rev-parse --short HEAD:file2) &&
-	git rm file2 &&
-	echo 3 >file3 &&
-	echo 4 >file4 &&
-	echo 5 >file1 &&
-	after1=$(git rev-parse --short $(git hash-object file1)) &&
-	after4=$(git rev-parse --short $(git hash-object file4)) &&
-	git add file1 file3 file4 &&
-	git reset HEAD -- file1 file2 file3 &&
-	test_must_fail git diff --quiet &&
-	git diff >output &&
+		test_must_fail git mv sub "$out/out" &&
+		test_path_is_dir sub &&
+		test_path_is_missing ../in &&
+		git ls-files --error-unmatch sub/file
+	)
 
-	cat >expect <<-EOF &&
-	diff --git a/file1 b/file1
-	index $before1..$after1 100644
-	--- a/file1
-	+++ b/file1
-	@@ -1 +1 @@
-	-1
-	+5
-	diff --git a/file2 b/file2
-	deleted file mode 100644
-	index $before2..0000000
-	--- a/file2
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one/.git/
+fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/out' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/mine/one'
+sub/file
+ok 33 - absolute pathname outside should fail
+
+expecting success of 7001.34 'git mv to move multiple sources into a directory': 
+	rm -fr .git && git init &&
+	mkdir dir other &&
+	>dir/a.txt &&
+	>dir/b.txt &&
+	git add dir/?.txt &&
+	git mv dir/a.txt dir/b.txt other &&
+	git ls-files >actual &&
+	cat >expect <<-\EOF &&
+	other/a.txt
+	other/b.txt
 	EOF
+	test_cmp expect actual
 
-	test_cmp expect output &&
-	git diff --cached >output &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+ok 34 - git mv to move multiple sources into a directory
 
-	cat >cached_expect <<-EOF &&
-	diff --git a/file4 b/file4
-	new file mode 100644
-	index 0000000..$after4
-	--- /dev/null
-	+++ b/file4
-	@@ -0,0 +1 @@
-	+4
+expecting success of 7001.35 'git mv should not change sha1 of moved cache entry': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >dirty &&
+	git add dirty &&
+	entry="$(index_at_path dirty)" &&
+	git mv dirty dirty2 &&
+	test "$entry" = "$(index_at_path dirty2)" &&
+	echo 2 >dirty2 &&
+	git mv dirty2 dirty &&
+	test "$entry" = "$(index_at_path dirty)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+ok 35 - git mv should not change sha1 of moved cache entry
+
+expecting success of 7001.36 'git mv error on conflicted file': 
+	rm -fr .git &&
+	git init &&
+	>conflict &&
+	test_when_finished "rm -f conflict" &&
+	cfhash=$(git hash-object -w conflict) &&
+	q_to_tab <<-EOF | git update-index --index-info &&
+	0 $cfhash 0Qconflict
+	100644 $cfhash 1Qconflict
 	EOF
 
-	test_cmp cached_expect output
+	test_must_fail git mv conflict newname 2>actual &&
+	test_grep "conflicted" actual
 
-[main 14b96fb] files
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-rm 'file2'
-Unstaged changes after reset:
-M	file1
-D	file2
-ok 24 - test --mixed <paths>
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+fatal: conflicted, source=conflict, destination=newname
+ok 36 - git mv error on conflicted file
 
-expecting success of 7102.25 'test resetting the index at give paths': 
-	mkdir sub &&
-	>sub/file1 &&
-	>sub/file2 &&
-	git update-index --add sub/file1 sub/file2 &&
-	T=$(git write-tree) &&
-	git reset HEAD sub/file2 &&
-	test_must_fail git diff --quiet &&
-	U=$(git write-tree) &&
-	echo "$T" &&
-	echo "$U" &&
-	test_must_fail git diff-index --cached --exit-code "$T" &&
-	test "$T" != "$U"
+expecting success of 7001.37 'git mv should overwrite symlink to a file': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv moved symlink &&
+	git mv -f moved symlink &&
+	test_path_is_missing moved &&
+	test_path_is_file symlink &&
+	test "$(cat symlink)" = 1 &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-Unstaged changes after reset:
-M	file1
-D	file2
-9571d9b5fb34d9c1274612948c5356f0615744bc
-88880074c0c9957f91fd21817fee120b773fc32c
-:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
-ok 25 - test resetting the index at give paths
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+checking prerequisite: SYMLINKS
 
-expecting success of 7102.26 'resetting an unmodified path is a no-op': 
-	git reset --hard &&
-	git reset -- file1 &&
-	git diff-files --exit-code &&
-	git diff-index --cached --exit-code HEAD
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-HEAD is now at 14b96fb files
-ok 26 - resetting an unmodified path is a no-op
+)
+prerequisite SYMLINKS ok
+fatal: destination exists, source=moved, destination=symlink
+ok 37 - git mv should overwrite symlink to a file
 
-expecting success of 7102.27 '--mixed refreshes the index': 
-	# Verify default behavior (without --[no-]refresh or reset.refresh)
-	test_reset_refreshes_index &&
+expecting success of 7001.38 'git mv should overwrite file with a symlink': 
+	rm -fr .git &&
+	git init &&
+	echo 1 >moved &&
+	test_ln_s_add moved symlink &&
+	git add moved &&
+	test_must_fail git mv symlink moved &&
+	git mv -f symlink moved &&
+	test_path_is_missing symlink &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-	# With --quiet
-	test_reset_refreshes_index "" --quiet
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/
+fatal: destination exists, source=symlink, destination=moved
+ok 38 - git mv should overwrite file with a symlink
 
-HEAD is now at 14b96fb files
-rm 'file2'
-HEAD is now at 14b96fb files
-rm 'file2'
-ok 27 - --mixed refreshes the index
+expecting success of 7001.39 'check moved symlink': 
+	test_path_is_symlink moved
 
-expecting success of 7102.28 '--mixed --[no-]refresh sets refresh behavior': 
-	# Verify that --[no-]refresh controls index refresh
-	test_reset_refreshes_index "" --refresh &&
-	! test_reset_refreshes_index "" --no-refresh
+ok 39 - check moved symlink
 
-HEAD is now at 14b96fb files
-rm 'file2'
-HEAD is now at 14b96fb files
-rm 'file2'
-'output.log' is not empty, it contains:
-:100644 100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 0000000000000000000000000000000000000000 M	file2
-ok 28 - --mixed --[no-]refresh sets refresh behavior
+expecting success of 7001.40 'setup submodule': 
+	test_config_global protocol.file.allow always &&
+	git commit -m initial &&
+	git reset --hard &&
+	git submodule add ./. sub &&
+	echo content >file &&
+	git add file &&
+	git commit -m "added sub and file" &&
+	mkdir -p deep/directory/hierarchy &&
+	git submodule add ./. deep/directory/hierarchy/sub &&
+	git commit -m "added another submodule" &&
+	git branch submodule
 
-expecting success of 7102.29 '--mixed preserves skip-worktree': 
-	echo 123 >>file2 &&
-	git add file2 &&
-	git update-index --skip-worktree file2 &&
-	git reset --mixed HEAD >output &&
-	test_must_be_empty output &&
+[master (root-commit) 335301e] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 moved
+HEAD is now at 335301e initial
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub'...
+done.
+[master 7b21d91] added sub and file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 file
+ create mode 160000 sub
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/deep/directory/hierarchy/sub'...
+done.
+[master d0b8d3f] added another submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 deep/directory/hierarchy/sub
+ok 40 - setup submodule
 
-	cat >expect <<-\EOF &&
-	Unstaged changes after reset:
-	M	file2
-	EOF
-	git update-index --no-skip-worktree file2 &&
-	git add file2 &&
-	git reset --mixed HEAD >output &&
-	test_cmp expect output
+expecting success of 7001.41 'git mv cannot move a submodule in a file': 
+	test_must_fail git mv sub file
 
-ok 29 - --mixed preserves skip-worktree
+fatal: destination already exists, source=sub, destination=file
+ok 41 - git mv cannot move a submodule in a file
 
-expecting success of 7102.30 'resetting specific path that is unmerged': 
-	git rm --cached file2 &&
-	F1=$(git rev-parse HEAD:file1) &&
-	F2=$(git rev-parse HEAD:file2) &&
-	F3=$(git rev-parse HEAD:secondfile) &&
-	{
-		echo "100644 $F1 1	file2" &&
-		echo "100644 $F2 2	file2" &&
-		echo "100644 $F3 3	file2"
-	} | git update-index --index-info &&
-	git ls-files -u &&
-	git reset HEAD file2 &&
-	test_must_fail git diff --quiet &&
-	git diff-index --exit-code --cached HEAD
+expecting success of 7001.42 'git mv moves a submodule with a .git directory and no .gitmodules': 
+	entry="$(index_at_path sub)" &&
+	git rm .gitmodules &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-rm 'file2'
-100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
-100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
-100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
-Unstaged changes after reset:
-M	file2
-ok 30 - resetting specific path that is unmerged
+rm '.gitmodules'
+On branch master
+Your branch is up to date with 'origin/master'.
 
-expecting success of 7102.31 'disambiguation (1)': 
+nothing to commit, working tree clean
+ok 42 - git mv moves a submodule with a .git directory and no .gitmodules
+
+expecting success of 7001.43 'git mv moves a submodule with a .git directory and .gitmodules': 
+	rm -rf mod &&
 	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	git reset secondfile &&
-	test_must_fail git diff --quiet -- secondfile &&
-	test -z "$(git diff --cached --name-only)" &&
-	test -f secondfile &&
-	test_must_be_empty secondfile
+	git submodule update &&
+	entry="$(index_at_path sub)" &&
+	(
+		cd sub &&
+		rm -f .git &&
+		cp -R -P -p ../.git/modules/sub .git &&
+		GIT_WORK_TREE=. git config --unset core.worktree
+	) &&
+	mkdir mod &&
+	git mv sub mod/sub &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-M	secondfile
-ok 31 - disambiguation (1)
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 43 - git mv moves a submodule with a .git directory and .gitmodules
 
-expecting success of 7102.32 'disambiguation (2)': 
+expecting success of 7001.44 'git mv moves a submodule with gitfile': 
+	rm -rf mod &&
 	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	test_must_fail git reset secondfile &&
-	test -n "$(git diff --cached --name-only -- secondfile)" &&
-	test ! -f secondfile
+	git submodule update &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	git -C mod mv ../sub/ . &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	echo mod/sub >expected &&
+	git config -f .gitmodules submodule.sub.path >actual &&
+	test_cmp expected actual &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-HEAD is now at 14b96fb files
-fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 32 - disambiguation (2)
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 44 - git mv moves a submodule with gitfile
 
-expecting success of 7102.33 'disambiguation (3)': 
+expecting success of 7001.45 'mv does not complain when no .gitmodules file is found': 
+	rm -rf mod &&
 	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset HEAD secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
+	git submodule update &&
+	git rm .gitmodules &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 33 - disambiguation (3)
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+rm '.gitmodules'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 45 - mv does not complain when no .gitmodules file is found
 
-expecting success of 7102.34 'disambiguation (4)': 
+expecting success of 7001.46 'mv will error out on a modified .gitmodules file unless staged': 
+	rm -rf mod &&
 	git reset --hard &&
-	>secondfile &&
-	git add secondfile &&
-	rm -f secondfile &&
-	git reset -- secondfile &&
-	test_must_fail git diff --quiet &&
-	test -z "$(git diff --cached --name-only)" &&
-	test ! -f secondfile
+	git submodule update &&
+	git config -f .gitmodules foo.bar true &&
+	entry="$(index_at_path sub)" &&
+	mkdir mod &&
+	test_must_fail git mv sub mod/sub 2>actual.err &&
+	test_file_not_empty actual.err &&
+	test_path_exists sub &&
+	git diff-files --quiet -- sub &&
+	git add .gitmodules &&
+	git mv sub mod/sub 2>actual.err &&
+	test_must_be_empty actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-HEAD is now at 14b96fb files
-Unstaged changes after reset:
-D	secondfile
-ok 34 - disambiguation (4)
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 46 - mv will error out on a modified .gitmodules file unless staged
 
-expecting success of 7102.35 'reset with paths accepts tree': 
-	# for simpler tests, drop last commit containing added files
-	git reset --hard HEAD^ &&
-	git reset HEAD^^{tree} -- . &&
-	git diff --cached HEAD^ --exit-code &&
-	git diff HEAD --exit-code
+expecting success of 7001.47 'mv issues a warning when section is not found in .gitmodules': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	git config -f .gitmodules --remove-section submodule.sub &&
+	git add .gitmodules &&
+	entry="$(index_at_path sub)" &&
+	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
+	mkdir mod &&
+	git mv sub mod/sub 2>actual.err &&
+	test_cmp expect.err actual.err &&
+	test_path_is_missing sub &&
+	test "$entry" = "$(index_at_path mod/sub)" &&
+	git -C mod/sub status &&
+	git update-index --refresh &&
+	git diff-files --quiet
 
-HEAD is now at eed6733 modify 2nd file (geändert)
-Unstaged changes after reset:
-M	secondfile
-ok 35 - reset with paths accepts tree
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+HEAD detached at 335301e
+nothing to commit, working tree clean
+ok 47 - mv issues a warning when section is not found in .gitmodules
 
-expecting success of 7102.36 'reset -N keeps removed files as intent-to-add': 
-	echo new-file >new-file &&
-	git add new-file &&
-	git reset -N HEAD &&
+expecting success of 7001.48 'mv --dry-run does not touch the submodule or .gitmodules': 
+	rm -rf mod &&
+	git reset --hard &&
+	git submodule update &&
+	mkdir mod &&
+	git mv -n sub mod/sub 2>actual.err &&
+	test_path_is_file sub/.git &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules
 
-	tree=$(git write-tree) &&
-	git ls-tree $tree new-file >actual &&
-	test_must_be_empty actual &&
+HEAD is now at d0b8d3f added another submodule
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+Checking rename of 'sub' to 'mod/sub'
+Renaming sub to mod/sub
+ok 48 - mv --dry-run does not touch the submodule or .gitmodules
 
-	git diff --name-only >actual &&
-	echo new-file >expect &&
+expecting success of 7001.49 'checking out a commit before submodule moved needs manual updates': 
+	git mv sub sub2 &&
+	git commit -m "moved sub to sub2" &&
+	git checkout -q HEAD^ 2>actual &&
+	test_grep "^warning: unable to rmdir 'sub2':" actual &&
+	git status -s sub2 >actual &&
+	echo "?? sub2/" >expected &&
+	test_cmp expected actual &&
+	test_path_is_missing sub/.git &&
+	test_path_is_file sub2/.git &&
+	git submodule update &&
+	test_path_is_file sub/.git &&
+	rm -rf sub2 &&
+	git diff-index --exit-code HEAD &&
+	git update-index --refresh &&
+	git diff-files --quiet -- sub .gitmodules &&
+	git status -s sub2 >actual &&
+	test_must_be_empty actual
+
+[master 6dd6220] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename sub => sub2 (100%)
+warning: unable to rmdir 'sub2': Directory not empty
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+ok 49 - checking out a commit before submodule moved needs manual updates
+
+expecting success of 7001.50 'mv -k does not accidentally destroy submodules': 
+	git checkout submodule &&
+	mkdir dummy dest &&
+	git mv -k dummy sub dest &&
+	git status --porcelain >actual &&
+	grep "^R  sub -> dest/sub" actual &&
+	git reset --hard &&
+	git checkout .
+
+Switched to branch 'submodule'
+R  sub -> dest/sub
+warning: unable to rmdir 'dest/sub': Directory not empty
+HEAD is now at d0b8d3f added another submodule
+Updated 0 paths from the index
+ok 50 - mv -k does not accidentally destroy submodules
+
+expecting success of 7001.51 'moving a submodule in nested directories': 
+	(
+		cd deep &&
+		git mv directory ../ &&
+		# git status would fail if the update of linking git dir to
+		# work dir of the submodule failed.
+		git status &&
+		git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
+		echo "directory/hierarchy/sub" >../expect
+	) &&
 	test_cmp expect actual
 
-Unstaged changes after reset:
-A	new-file
-ok 36 - reset -N keeps removed files as intent-to-add
+On branch submodule
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   ../.gitmodules
+	renamed:    directory/hierarchy/sub -> ../directory/hierarchy/sub
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	../.gitconfig
+	../a/
+	../ab.c
+	../actual
+	../actual.err
+	../bar
+	../dest/
+	../expect
+	../expect.err
+	../expected
+	../mine/
+	../non-existing-dir/
+	../other/
+	../out
+
+ok 51 - moving a submodule in nested directories
+
+expecting success of 7001.52 'moving nested submodules': 
+	test_config_global protocol.file.allow always &&
+	git commit -am "cleanup commit" &&
+	mkdir sub_nested_nested &&
+	(
+		cd sub_nested_nested &&
+		>nested_level2 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 2"
+	) &&
+	mkdir sub_nested &&
+	(
+		cd sub_nested &&
+		>nested_level1 &&
+		git init &&
+		git add . &&
+		git commit -m "nested level 1" &&
+		git submodule add ../sub_nested_nested &&
+		git commit -m "add nested level 2"
+	) &&
+	git submodule add ./sub_nested nested_move &&
+	git commit -m "add nested_move" &&
+	git submodule update --init --recursive &&
+	git mv nested_move sub_nested_moved &&
+	git status
+
+[submodule 61d0f20] cleanup commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename {deep/directory => directory}/hierarchy/sub (100%)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested_nested/.git/
+[master (root-commit) 3d81f5f] nested level 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested/.git/
+[master (root-commit) 8e39d83] nested level 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 nested_level1
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested/sub_nested_nested'...
+done.
+[master 4ba474d] add nested level 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub_nested_nested
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/nested_move'...
+done.
+[submodule 4d404d9] add nested_move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 nested_move
+Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/./.) registered for path 'directory/hierarchy/sub/sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/directory/hierarchy/sub/sub'...
+done.
+Submodule path 'directory/hierarchy/sub/sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+Submodule 'sub_nested_nested' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/sub_nested_nested) registered for path 'nested_move/sub_nested_nested'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/nested_move/sub_nested_nested'...
+done.
+Submodule path 'nested_move/sub_nested_nested': checked out '3d81f5fbdb0173269895972bd0ca2f0372e7edc5'
+Submodule path 'sub': checked out '335301e919c46841d94df945a64ff8626867ab66'
+On branch submodule
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   .gitmodules
+	renamed:    nested_move -> sub_nested_moved
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitconfig
+	a/
+	ab.c
+	actual
+	actual.err
+	bar
+	dest/
+	expect
+	expect.err
+	expected
+	mine/
+	non-existing-dir/
+	other/
+	out
+	sub_nested/
+	sub_nested_nested/
 
-expecting success of 7102.37 'reset --mixed sets up work tree': 
-	git init mixed_worktree &&
-	(
-		cd mixed_worktree &&
-		test_commit dummy
-	) &&
-	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
-	test_must_be_empty actual
+ok 52 - moving nested submodules
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7102-reset/mixed_worktree/.git/
-[main (root-commit) b737dfa] dummy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dummy.t
-ok 37 - reset --mixed sets up work tree
+checking known breakage of 7001.53 'nonsense mv triggers assertion failure and partially updated index': 
+	test_when_finished git reset --hard HEAD &&
+	git reset --hard HEAD &&
+	mkdir -p a &&
+	mkdir -p b &&
+	>a/a.txt &&
+	git add a/a.txt &&
+	test_must_fail git mv a/a.txt a b &&
+	git status --porcelain >actual &&
+	grep "^A[ ]*a/a.txt$" actual
 
-expecting success of 7102.38 'reset handles --end-of-options': 
-	git update-ref refs/heads/--foo HEAD^ &&
-	git log -1 --format=%s refs/heads/--foo >expect &&
-	git reset --hard --end-of-options --foo &&
-	git log -1 --format=%s HEAD >actual &&
-	test_cmp expect actual
+warning: unable to rmdir 'sub_nested_moved': Directory not empty
+HEAD is now at 4d404d9 add nested_move
+git: builtin/mv.c:508: cmd_mv: Assertion `pos >= 0' failed.
+/build/reproducible-path/git-2.49.0+next.20250314/t/test-lib-functions.sh: line 1175: 3365371 Aborted                 "$@" 2>&7
+test_must_fail: died by signal 6: git mv a/a.txt a b
+fatal: Unable to create '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7001-mv/.git/index.lock': File exists.
 
-HEAD is now at d1a4bc3 remove 1st and rename 2nd
-ok 38 - reset handles --end-of-options
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+not ok 53 - nonsense mv triggers assertion failure and partially updated index # TODO known breakage
 
-# passed all 38 test(s)
-1..38
+# still have 1 known breakage(s)
+# passed all remaining 52 test(s)
+1..53
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7301-clean-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7301-clean-interactive/.git/
-expecting success of 7301.1 'setup': 
+*** t7002-mv-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7002-mv-sparse-checkout/.git/
+expecting success of 7002.1 'setup': 
+	mkdir -p sub/dir sub/dir2 &&
+	touch a b c sub/d sub/dir/e sub/dir2/e &&
+	git add -A &&
+	git commit -m files &&
 
-	mkdir -p src &&
-	touch src/part1.c Makefile &&
-	echo build >.gitignore &&
-	echo \*.o >>.gitignore &&
-	git add . &&
-	git commit -m setup &&
-	touch src/part2.c README &&
-	git add .
+	cat >sparse_error_header <<-EOF &&
+	The following paths and/or pathspecs matched paths that exist
+	outside of your sparse-checkout definition, so will not be
+	updated in the index:
+	EOF
 
+	cat >sparse_hint <<-EOF &&
+	hint: If you intend to update such entries, try one of the following:
+	hint: * Use the --sparse option.
+	hint: * Disable or modify the sparsity rules.
+	hint: Disable this message with "git config set advice.updateSparsePath false"
+	EOF
 
-[master (root-commit) c1a48e2] setup
+	cat >dirty_error_header <<-EOF &&
+	The following paths have been moved outside the
+	sparse-checkout definition but are not sparse due to local
+	modifications.
+	EOF
+
+	cat >dirty_hint <<-EOF
+	hint: To correct the sparsity of these paths, do the following:
+	hint: * Use "git add --sparse <paths>" to update the index
+	hint: * Use "git sparse-checkout reapply" to apply the sparsity rules
+	hint: Disable this message with "git config set advice.updateSparsePath false"
+	EOF
+
+[master (root-commit) 127a813] files
  Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 Makefile
- create mode 100644 src/part1.c
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 c
+ create mode 100644 sub/d
+ create mode 100644 sub/dir/e
+ create mode 100644 sub/dir2/e
 ok 1 - setup
 
-expecting success of 7301.2 'git clean -i (c: clean hotkey)': 
+expecting success of 7002.2 'mv refuses to move sparse-to-sparse': 
+	test_when_finished rm -f e &&
+	git reset --hard &&
+	git sparse-checkout set --no-cone a &&
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo c | git clean -i &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_missing src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 2 - mv refuses to move sparse-to-sparse
 
+expecting success of 7002.3 'mv refuses to move sparse-to-sparse, ignores failure': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 2 - git clean -i (c: clean hotkey)
+	# tracked-to-untracked
+	touch b &&
+	git mv -k b e 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-expecting success of 7301.3 'git clean -i (cl: clean prefix)': 
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists e &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo cl | git clean -i &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_missing src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	# tracked-to-tracked
+	git reset --hard &&
+	touch b &&
+	git mv -k b c 2>stderr &&
+	test_path_exists b &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
+	git mv --sparse b c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing b &&
+	test_path_exists c
 
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 3 - git clean -i (cl: clean prefix)
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+error: Path 'e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 3 - mv refuses to move sparse-to-sparse, ignores failure
 
-expecting success of 7301.4 'git clean -i (quit)': 
+expecting success of 7002.4 'mv refuses to move non-sparse-to-sparse': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo quit | git clean -i &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	# tracked-to-untracked
+	test_must_fail git mv a e 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing e &&
+	cat sparse_error_header >expect &&
+	echo e >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a e 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists e &&
 
+	# tracked-to-tracked
+	rm e &&
+	git reset --hard &&
+	test_must_fail git mv a c 2>stderr &&
+	test_path_exists a &&
+	test_path_is_missing c &&
+	cat sparse_error_header >expect &&
+	echo c >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse a c 2>stderr &&
+	test_must_be_empty stderr &&
+	test_path_is_missing a &&
+	test_path_exists c
 
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Bye.
-ok 4 - git clean -i (quit)
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+HEAD is now at 127a813 files
+ok 4 - mv refuses to move non-sparse-to-sparse
 
-expecting success of 7301.5 'git clean -i (Ctrl+D)': 
+expecting success of 7002.5 'mv refuses to move sparse-to-non-sparse': 
+	test_when_finished rm -f b c e &&
+	git reset --hard &&
+	git sparse-checkout set a e &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	echo "\04" | git clean -i &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	# tracked-to-untracked
+	touch b &&
+	test_must_fail git mv b e 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo b >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse b e 2>stderr &&
+	test_must_be_empty stderr
 
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 5 - mv refuses to move sparse-to-non-sparse
 
-Would remove the following items:
-  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Huh ()?
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Bye.
-ok 5 - git clean -i (Ctrl+D)
+expecting success of 7002.6 'recursive mv refuses to move (possible) sparse': 
+	test_when_finished rm -rf b c e sub2 &&
+	git reset --hard &&
+	# Without cone mode, "sub" and "sub2" do not match
+	git sparse-checkout set sub/dir sub2/dir &&
 
-expecting success of 7301.6 'git clean -id (filter all)': 
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/d sub/dir2/e &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "*" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/d
+	sub2/d
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
 
+HEAD is now at 127a813 files
+[master 361f042] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {sub => sub2}/d (100%)
+ rename {sub => sub2}/dir/e (100%)
+ rename {sub => sub2}/dir2/e (100%)
+error: Path 'sub2/d' not uptodate; will not remove from working tree.
+error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 6 - recursive mv refuses to move (possible) sparse
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>> No more files to clean, exiting.
-ok 6 - git clean -id (filter all)
+expecting success of 7002.7 'recursive mv refuses to move sparse': 
+	git reset --hard &&
+	# Use cone mode so "sub/" matches the sparse-checkout patterns
+	git sparse-checkout init --cone &&
+	git sparse-checkout set sub/dir sub2/dir &&
 
-expecting success of 7301.7 'git clean -id (filter patterns)': 
+	# Add contained contents to ensure we avoid non-existence errors
+	mkdir sub/dir2 &&
+	touch sub/dir2/e &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "part3.* *.out" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_missing src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_must_fail git mv sub sub2 2>stderr &&
+	cat sparse_error_header >expect &&
+	cat >>expect <<-\EOF &&
+	sub/dir2/e
+	sub2/dir2/e
+	EOF
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
+	git mv --sparse sub sub2 2>stderr &&
+	test_must_be_empty stderr &&
+	git commit -m "moved sub to sub2" &&
+	git rev-parse HEAD~1:sub >expect &&
+	git rev-parse HEAD:sub2 >actual &&
+	test_cmp expect actual &&
+	git reset --hard HEAD~1
 
+HEAD is now at 127a813 files
+warning: unrecognized pattern: 'sub/dir'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'sub/dir'
+warning: disabling cone pattern matching
+[master 361f042] moved sub to sub2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ rename {sub => sub2}/d (100%)
+ rename {sub => sub2}/dir/e (100%)
+ rename {sub => sub2}/dir2/e (100%)
+error: Path 'sub2/dir2/e' not uptodate; will not remove from working tree.
+HEAD is now at 127a813 files
+ok 7 - recursive mv refuses to move sparse
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>>   docs/        src/part4.c  src/part4.h
-Input ignore patterns>> Would remove the following items:
-  docs/        src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing docs/
-Removing src/part4.c
-Removing src/part4.h
-ok 7 - git clean -id (filter patterns)
+expecting success of 7002.8 'can move files to non-sparse dir': 
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a b c w !/x y/ &&
+	mkdir -p w x/y &&
 
-expecting success of 7301.8 'git clean -id (filter patterns 2)': 
+	git mv a w/new-a 2>stderr &&
+	git mv b x/y/new-b 2>stderr &&
+	test_must_be_empty stderr
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines f "* !*.out" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: pass a leading slash before paths such as 'b' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: pass a leading slash before paths such as 'c' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+ok 8 - can move files to non-sparse dir
 
+expecting success of 7002.9 'refuse to move file to non-skip-worktree sparse path': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	git reset --hard &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set a !/x y/ !x/y/z &&
+	mkdir -p x/y/z &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-Input ignore patterns>>   a.out
-Input ignore patterns>> Would remove the following item:
-  a.out
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-ok 8 - git clean -id (filter patterns 2)
+	test_must_fail git mv a x/y/z/new-a 2>stderr &&
+	echo x/y/z/new-a | cat sparse_error_header - sparse_hint >expect &&
+	test_cmp expect stderr
 
-expecting success of 7301.9 'git clean -id (select - all)': 
+HEAD is now at 127a813 files
+warning: pass a leading slash before paths such as 'a' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+HEAD is now at 127a813 files
+ok 9 - refuse to move file to non-skip-worktree sparse path
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "*" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_missing src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+expecting success of 7002.10 'refuse to move out-of-cone directory without --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
 
+	test_must_fail git mv folder1 sub 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo folder1/file1 >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing docs/
-Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 9 - git clean -id (select - all)
+HEAD is now at 127a813 files
+ok 10 - refuse to move out-of-cone directory without --sparse
 
-expecting success of 7301.10 'git clean -id (select - none)': 
+expecting success of 7002.11 'can move out-of-cone directory with --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	git mv --sparse folder1 sub 2>stderr &&
+	test_must_be_empty stderr &&
 
+	test_path_is_dir sub/folder1 &&
+	test_path_is_file sub/folder1/file1
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> No more files to clean, exiting.
-ok 10 - git clean -id (select - none)
+HEAD is now at 127a813 files
+ok 11 - can move out-of-cone directory with --sparse
 
-expecting success of 7301.11 'git clean -id (select - number)': 
+expecting success of 7002.12 'refuse to move out-of-cone file without --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s 3 "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_must_fail git mv folder1/file1 sub 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo folder1/file1 >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr
 
+HEAD is now at 127a813 files
+ok 12 - refuse to move out-of-cone file without --sparse
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following item:
-  src/part3.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing src/part3.c
-ok 11 - git clean -id (select - number)
+expecting success of 7002.13 'can move out-of-cone file with --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
 
-expecting success of 7301.12 'git clean -id (select - number 2)': 
+	git mv --sparse folder1/file1 sub 2>stderr &&
+	test_must_be_empty stderr &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "2 3" 5 "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_path_is_file sub/file1
 
+HEAD is now at 127a813 files
+ok 13 - can move out-of-cone file with --sparse
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
-  * 5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  docs/        src/part3.c  src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing docs/
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean -id (select - number 2)
+expecting success of 7002.14 'refuse to move sparse file to existing destination': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir folder1 &&
+	touch folder1/file1 &&
+	touch sub/file1 &&
+	git add folder1 sub/file1 &&
+	git sparse-checkout set --cone sub &&
 
-expecting success of 7301.13 'git clean -id (select - number 3)': 
+	test_must_fail git mv --sparse folder1/file1 sub 2>stderr &&
+	echo "fatal: destination exists, source=folder1/file1, destination=sub/file1" >expect &&
+	test_cmp expect stderr
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "3,4 5" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+HEAD is now at 127a813 files
+ok 14 - refuse to move sparse file to existing destination
 
+expecting success of 7002.15 'move sparse file to existing destination with --force and --sparse': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir folder1 &&
+	touch folder1/file1 &&
+	touch sub/file1 &&
+	echo "overwrite" >folder1/file1 &&
+	git add folder1 sub/file1 &&
+	git sparse-checkout set --cone sub &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  src/part3.c  src/part3.h  src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing src/part3.c
-Removing src/part3.h
-Removing src/part4.c
-ok 13 - git clean -id (select - number 3)
+	git mv --sparse --force folder1/file1 sub 2>stderr &&
+	test_must_be_empty stderr &&
+	echo "overwrite" >expect &&
+	test_cmp expect sub/file1
 
-expecting success of 7301.14 'git clean -id (select - filenames)': 
+HEAD is now at 127a813 files
+ok 15 - move sparse file to existing destination with --force and --sparse
 
-	mkdir -p build docs &&
-	touch a.out foo.txt bar.txt baz.txt &&
-	test_write_lines s "a.out fo ba bar" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_missing a.out &&
-	test_path_is_missing foo.txt &&
-	test_path_is_missing bar.txt &&
-	test_path_is_file baz.txt &&
-	rm baz.txt
+expecting success of 7002.16 'move clean path from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
 
+	test_must_fail git mv sub/d folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-Would remove the following items:
-  a.out        baz.txt      foo.txt
-  bar.txt      docs/        src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: bar.txt        3: baz.txt        4: docs/
-    5: foo.txt        6: src/part4.h
-Select items to delete>> Huh (ba)?
-  * 1: a.out        * 2: bar.txt        3: baz.txt        4: docs/
-  * 5: foo.txt        6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out    bar.txt  foo.txt
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing bar.txt
-Removing foo.txt
-ok 14 - git clean -id (select - filenames)
+	git mv --sparse sub/d folder1 2>stderr &&
+	test_must_be_empty stderr &&
 
-expecting success of 7301.15 'git clean -id (select - range)': 
+	test_path_is_missing sub/d &&
+	test_path_is_missing folder1/d &&
+	git ls-files -t >actual &&
+	! grep "^H sub/d\$" actual &&
+	grep "S folder1/d" actual
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "1,3-4" 2 "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+S folder1/d
+HEAD is now at 127a813 files
+ok 16 - move clean path from in-cone to out-of-cone
 
+expecting success of 7002.17 'move clean path from in-cone to out-of-cone overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "sub/file1 overwrite" >sub/file1 &&
+	git add sub/file1 &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        docs/        src/part3.c  src/part3.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing docs/
-Removing src/part3.c
-Removing src/part3.h
-ok 15 - git clean -id (select - range)
+	test_must_fail git mv sub/file1 folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-expecting success of 7301.16 'git clean -id (select - range 2)': 
+	test_must_fail git mv --sparse sub/file1 folder1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
+	>expect &&
+	test_cmp expect stderr &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "4- 1" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_missing src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	git mv --sparse -f sub/file1 folder1 2>stderr &&
+	test_must_be_empty stderr &&
 
+	test_path_is_missing sub/file1 &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/file1" actual &&
+	grep "S folder1/file1" actual &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/          3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.h  src/part4.c  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.h
-Removing src/part4.c
-Removing src/part4.h
-ok 16 - git clean -id (select - range 2)
+	# compare file content before move and after move
+	echo "sub/file1 overwrite" >expect &&
+	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
 
-expecting success of 7301.17 'git clean -id (inverse select)': 
+S folder1/file1
+HEAD is now at 127a813 files
+ok 17 - move clean path from in-cone to out-of-cone overwrite
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines s "*" "-5- 1 -2" "" c |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+expecting success of 7002.18 'move clean path from in-cone to out-of-cone file overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "sub/file1 overwrite" >sub/file1 &&
+	git add sub/file1 &&
 
+	test_must_fail git mv sub/file1 folder1/file1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
-  * 5: src/part4.c  * 6: src/part4.h
-Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
-    5: src/part4.c    6: src/part4.h
-Select items to delete>> Would remove the following items:
-  a.out        src/part3.c  src/part3.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing a.out
-Removing src/part3.c
-Removing src/part3.h
-ok 17 - git clean -id (inverse select)
+	test_must_fail git mv --sparse sub/file1 folder1/file1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/file1, destination=folder1/file1" \
+	>expect &&
+	test_cmp expect stderr &&
 
-expecting success of 7301.18 'git clean -id (ask)': 
+	git mv --sparse -f sub/file1 folder1/file1 2>stderr &&
+	test_must_be_empty stderr &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines a Y y no yes bad "" |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_path_is_missing sub/file1 &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/file1" actual &&
+	grep "S folder1/file1" actual &&
 
+	# compare file content before move and after move
+	echo "sub/file1 overwrite" >expect &&
+	git ls-files -s -- folder1/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? Remove src/part4.h [y/N]? Removing a.out
-Removing docs/
-Removing src/part3.h
-ok 18 - git clean -id (ask)
+S folder1/file1
+HEAD is now at 127a813 files
+ok 18 - move clean path from in-cone to out-of-cone file overwrite
 
-expecting success of 7301.19 'git clean -id (ask - Ctrl+D)': 
+expecting success of 7002.19 'move directory with one of the files overwrite': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	mkdir -p folder1/dir &&
+	touch folder1/dir/file1 &&
+	git add folder1 &&
+	git sparse-checkout set --cone sub &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	test_write_lines a Y no yes "\04" |
-	git clean -id &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	echo test >sub/dir/file1 &&
+	git add sub/dir/file1 &&
 
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	echo "folder1/dir/file1" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-Would remove the following items:
-  a.out        src/part3.c  src/part4.c
-  docs/        src/part3.h  src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? 
-Removing a.out
-Removing src/part3.c
-ok 19 - git clean -id (ask - Ctrl+D)
+	test_must_fail git mv --sparse sub/dir folder1 2>stderr &&
+	echo "fatal: destination exists in the index, source=sub/dir/file1, destination=folder1/dir/file1" \
+	>expect &&
+	test_cmp expect stderr &&
 
-expecting success of 7301.20 'git clean -id with prefix and path (filter)': 
+	git mv --sparse -f sub/dir folder1 2>stderr &&
+	test_must_be_empty stderr &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines f docs "*.h" "" c |
-	 git clean -id ..) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_path_is_missing sub/dir/file1 &&
+	test_path_is_missing sub/dir/e &&
+	test_path_is_missing folder1/file1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/file1" actual &&
+	! grep "H sub/dir/e" actual &&
+	grep "S folder1/dir/file1" actual &&
 
+	# compare file content before move and after move
+	echo test >expect &&
+	git ls-files -s -- folder1/dir/file1 | awk "{print \$2}" >oid &&
+	git cat-file blob $(cat oid) >actual &&
+	test_cmp expect actual
 
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>   ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-Input ignore patterns>>   ../a.out        ../src/part3.h  ../src/part4.h
-  ../src/part3.c  ../src/part4.c
-Input ignore patterns>>   ../a.out        ../src/part3.c  ../src/part4.c
-Input ignore patterns>> Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing ../a.out
-Removing ../src/part3.c
-Removing ../src/part4.c
-ok 20 - git clean -id with prefix and path (filter)
+S folder1/dir/file1
+HEAD is now at 127a813 files
+ok 19 - move directory with one of the files overwrite
 
-expecting success of 7301.21 'git clean -id with prefix and path (select by name)': 
+expecting success of 7002.20 'move dirty path from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	echo "modified" >>sub/d &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines s ../docs/ ../src/part3.c ../src/part4.c "" c |
-	 git clean -id ..) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/part3.h &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+	test_must_fail git mv sub/d folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
+	git mv --sparse sub/d folder1 2>stderr &&
+	cat dirty_error_header >expect &&
+	echo "folder1/d" >>expect &&
+	cat dirty_hint >>expect &&
+	test_cmp expect stderr &&
 
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now>     1: ../a.out          2: ../docs/          3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/          3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
-    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
-    4: ../src/part3.h  * 5: ../src/part4.c    6: ../src/part4.h
-Select items to delete>> Would remove the following items:
-  ../docs/        ../src/part3.c  ../src/part4.c
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Removing ../docs/
-Removing ../src/part3.c
-Removing ../src/part4.c
-ok 21 - git clean -id with prefix and path (select by name)
+	test_path_is_missing sub/d &&
+	test_path_is_file folder1/d &&
+	git ls-files -t >actual &&
+	! grep "^H sub/d\$" actual &&
+	grep "H folder1/d" actual
 
-expecting success of 7301.22 'git clean -id with prefix and path (ask)': 
+H folder1/d
+HEAD is now at 127a813 files
+ok 20 - move dirty path from in-cone to out-of-cone
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
-	docs/manual.txt obj.o build/lib.so &&
-	(cd build/ &&
-	 test_write_lines a Y y no yes bad "" |
-	 git clean -id ..) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing docs/manual.txt &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing src/part3.h &&
-	test_path_is_file src/part4.c &&
-	test_path_is_file src/part4.h &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+expecting success of 7002.21 'move dir from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	mkdir sub/dir/deep &&
 
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-Would remove the following items:
-  ../a.out        ../src/part3.c  ../src/part4.c
-  ../docs/        ../src/part3.h  ../src/part4.h
-*** Commands ***
-    1: clean                2: filter by pattern    3: select by numbers
-    4: ask each             5: quit                 6: help
-What now> Remove ../a.out [y/N]? Remove ../docs/ [y/N]? Remove ../src/part3.c [y/N]? Remove ../src/part3.h [y/N]? Remove ../src/part4.c [y/N]? Remove ../src/part4.h [y/N]? Removing ../a.out
-Removing ../docs/
-Removing ../src/part3.h
-ok 22 - git clean -id with prefix and path (ask)
+	git mv --sparse sub/dir folder1 2>stderr &&
+	test_must_be_empty stderr &&
 
-checking prerequisite: TTY
+	test_path_is_missing sub/dir &&
+	test_path_is_missing folder1 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/e" actual &&
+	grep "S folder1/dir/e" actual
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+S folder1/dir/e
+HEAD is now at 127a813 files
+ok 21 - move dir from in-cone to out-of-cone
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+expecting success of 7002.22 'move partially-dirty dir from in-cone to out-of-cone': 
+	test_when_finished "cleanup_sparse_checkout" &&
+	setup_sparse_checkout &&
+	mkdir sub/dir/deep &&
+	touch sub/dir/e2 sub/dir/e3 &&
+	git add sub/dir/e2 sub/dir/e3 &&
+	echo "modified" >>sub/dir/e2 &&
+	echo "modified" >>sub/dir/e3 &&
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+	test_must_fail git mv sub/dir folder1 2>stderr &&
+	cat sparse_error_header >expect &&
+	echo "folder1/dir/e" >>expect &&
+	echo "folder1/dir/e2" >>expect &&
+	echo "folder1/dir/e3" >>expect &&
+	cat sparse_hint >>expect &&
+	test_cmp expect stderr &&
 
-)
-prerequisite TTY ok
-expecting success of 7301.23 'git clean -i paints the header in HEADER color': 
-	>a.out &&
-	echo q |
-	test_terminal git clean -i |
-	test_decode_color |
-	head -n 1 >header &&
-	# not i18ngrep
-	grep "^<BOLD>" header
+	git mv --sparse sub/dir folder1 2>stderr &&
+	cat dirty_error_header >expect &&
+	echo "folder1/dir/e2" >>expect &&
+	echo "folder1/dir/e3" >>expect &&
+	cat dirty_hint >>expect &&
+	test_cmp expect stderr &&
 
-<BOLD>Would remove the following items:
-ok 23 - git clean -i paints the header in HEADER color
+	test_path_is_missing sub/dir &&
+	test_path_is_missing folder1/dir/e &&
+	test_path_is_file folder1/dir/e2 &&
+	test_path_is_file folder1/dir/e3 &&
+	git ls-files -t >actual &&
+	! grep "H sub/dir/e" actual &&
+	! grep "H sub/dir/e2" actual &&
+	! grep "H sub/dir/e3" actual &&
+	grep "S folder1/dir/e" actual &&
+	grep "H folder1/dir/e2" actual &&
+	grep "H folder1/dir/e3" actual
 
-# passed all 23 test(s)
-1..23
+S folder1/dir/e
+H folder1/dir/e2
+H folder1/dir/e3
+HEAD is now at 127a813 files
+ok 22 - move partially-dirty dir from in-cone to out-of-cone
+
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7004-tag.sh ***
@@ -455285,3648 +455207,2190 @@
 1..230
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7111-reset-table.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7111-reset-table/.git/
-expecting success of 7111.1 'creating initial commits': 
-	test_commit E file1 &&
-	test_commit D file1 &&
-	test_commit C file1
-
-[master (root-commit) 8464dc0] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 2131783] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4bb0b07] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - creating initial commits
-
-expecting success of 7111.2 'check: A B C D --soft A B D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 2 - check: A B C D --soft A B D
-
-expecting success of 7111.3 'check: A B C D --mixed A D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 3 - check: A B C D --mixed A D D
-
-expecting success of 7111.4 'check: A B C D --hard D D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 2131783 D
-ok 4 - check: A B C D --hard D D D
-
-expecting success of 7111.5 'check: A B C D --merge XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' not uptodate. Cannot merge.
-fatal: Could not reset index file to revision 'D'.
-ok 5 - check: A B C D --merge XXXXX  
-
-expecting success of 7111.6 'check: A B C D --keep XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' would be overwritten by merge. Cannot merge.
-fatal: Could not reset index file to revision 'D'.
-ok 6 - check: A B C D --keep XXXXX  
-
-expecting success of 7111.7 'check: A B C C --soft A B C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 7 - check: A B C C --soft A B C
-
-expecting success of 7111.8 'check: A B C C --mixed A C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 8 - check: A B C C --mixed A C C
-
-expecting success of 7111.9 'check: A B C C --hard C C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 4bb0b07 C
-ok 9 - check: A B C C --hard C C C
-
-expecting success of 7111.10 'check: A B C C --merge XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' not uptodate. Cannot merge.
-fatal: Could not reset index file to revision 'C'.
-ok 10 - check: A B C C --merge XXXXX  
-
-expecting success of 7111.11 'check: A B C C --keep A C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 11 - check: A B C C --keep A C C
-
-expecting success of 7111.12 'check: B B C D --soft B B D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 12 - check: B B C D --soft B B D
-
-expecting success of 7111.13 'check: B B C D --mixed B D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 13 - check: B B C D --mixed B D D
-
-expecting success of 7111.14 'check: B B C D --hard D D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 2131783 D
-ok 14 - check: B B C D --hard D D D
-
-expecting success of 7111.15 'check: B B C D --merge D D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 15 - check: B B C D --merge D D D
-
-expecting success of 7111.16 'check: B B C D --keep XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' would be overwritten by merge. Cannot merge.
-fatal: Could not reset index file to revision 'D'.
-ok 16 - check: B B C D --keep XXXXX  
-
-expecting success of 7111.17 'check: B B C C --soft B B C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 17 - check: B B C C --soft B B C
-
-expecting success of 7111.18 'check: B B C C --mixed B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 18 - check: B B C C --mixed B C C
-
-expecting success of 7111.19 'check: B B C C --hard C C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 4bb0b07 C
-ok 19 - check: B B C C --hard C C C
-
-expecting success of 7111.20 'check: B B C C --merge C C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 20 - check: B B C C --merge C C C
-
-expecting success of 7111.21 'check: B B C C --keep B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 21 - check: B B C C --keep B C C
-
-expecting success of 7111.22 'check: B C C D --soft B C D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 22 - check: B C C D --soft B C D
-
-expecting success of 7111.23 'check: B C C D --mixed B D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 23 - check: B C C D --mixed B D D
-
-expecting success of 7111.24 'check: B C C D --hard D D D': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 2131783 D
-ok 24 - check: B C C D --hard D D D
-
-expecting success of 7111.25 'check: B C C D --merge XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' not uptodate. Cannot merge.
-fatal: Could not reset index file to revision 'D'.
-ok 25 - check: B C C D --merge XXXXX  
-
-expecting success of 7111.26 'check: B C C D --keep XXXXX  ': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-error: Entry 'file1' not uptodate. Cannot merge.
-fatal: Could not reset index file to revision 'D'.
-ok 26 - check: B C C D --keep XXXXX  
+*** t7005-editor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7005-editor/.git/
+expecting success of 7005.1 'determine default editor': 
 
-expecting success of 7111.27 'check: B C C C --soft B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 27 - check: B C C C --soft B C C
+	vi=$(TERM=vt100 git var GIT_EDITOR) &&
+	test -n "$vi"
 
-expecting success of 7111.28 'check: B C C C --mixed B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-Unstaged changes after reset:
-M	file1
-ok 28 - check: B C C C --mixed B C C
 
-expecting success of 7111.29 'check: B C C C --hard C C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-HEAD is now at 4bb0b07 C
-ok 29 - check: B C C C --hard C C C
+ok 1 - determine default editor
 
-expecting success of 7111.30 'check: B C C C --merge B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 30 - check: B C C C --merge B C C
+expecting success of 7005.2 'setup': 
 
-expecting success of 7111.31 'check: B C C C --keep B C C': 
-	git reset --hard C &&
-	if test "$I1" != "$H1"
-	then
-	    echo "$I1" >file1 &&
-	    git add file1
-	fi &&
-	if test "$W1" != "$I1"
-	then
-	    echo "$W1" >file1
-	fi &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    test "$(cat file1)" = "$W2" &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at 4bb0b07 C
-ok 31 - check: B C C C --keep B C C
+	msg="Hand-edited" &&
+	test_commit "$msg" &&
+	echo "$msg" >expect &&
+	git show -s --format=%s > actual &&
+	test_cmp expect actual
 
-expecting success of 7111.32 'setting up branches to test with unmerged entries': 
-	git reset --hard C &&
-	git branch branch1 &&
-	git branch branch2 &&
-	git checkout branch1 &&
-	test_commit B1 file1 &&
-	git checkout branch2 &&
-	test_commit B file1
 
-HEAD is now at 4bb0b07 C
-Switched to branch 'branch1'
-[branch1 5456cd2] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch2'
-[branch2 aa272d3] B
+[master (root-commit) 2ddcc77] Hand-edited
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 32 - setting up branches to test with unmerged entries
-
-expecting success of 7111.33 'check: X U B C --soft XXXXX  ': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-ok 33 - check: X U B C --soft XXXXX  
-
-expecting success of 7111.34 'check: X U B C --mixed X C C': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-Unstaged changes after reset:
-M	file1
-ok 34 - check: X U B C --mixed X C C
-
-expecting success of 7111.35 'check: X U B C --hard C C C': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 4bb0b07 C
-ok 35 - check: X U B C --hard C C C
-
-expecting success of 7111.36 'check: X U B C --merge C C C': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 36 - check: X U B C --merge C C C
-
-expecting success of 7111.37 'check: X U B C --keep XXXXX  ': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 37 - check: X U B C --keep XXXXX  
-
-expecting success of 7111.38 'check: X U B B --soft XXXXX  ': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a soft reset in the middle of a merge.
-ok 38 - check: X U B B --soft XXXXX  
-
-expecting success of 7111.39 'check: X U B B --mixed X B B': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-Unstaged changes after reset:
-M	file1
-ok 39 - check: X U B B --mixed X B B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 2 - setup
 
-expecting success of 7111.40 'check: X U B B --hard B B B': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at aa272d3 B
-ok 40 - check: X U B B --hard B B B
+expecting success of 7005.3 'dumb should error out when falling back on vi': 
 
-expecting success of 7111.41 'check: X U B B --merge B B B': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
+	if git commit --amend
 	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
+		echo "Oops?"
+		false
 	else
-	    test_must_fail git reset --$opt $T
+		: happy
 	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 41 - check: X U B B --merge B B B
 
-expecting success of 7111.42 'check: X U B B --keep XXXXX  ': 
-	git reset --hard B &&
-	test_must_fail git merge branch1 &&
-	cat file1 >X_file1 &&
-	if test "$W2" != "XXXXX"
-	then
-	    git reset --$opt $T &&
-	    if test "$W2" = "X"
-	    then
-		test_cmp file1 X_file1
-	    else
-		test "$(cat file1)" = "$W2"
-	    fi &&
-	    git checkout-index -f -- file1 &&
-	    test "$(cat file1)" = "$I2" &&
-	    git checkout -f HEAD -- file1 &&
-	    test "$(cat file1)" = "$H2"
-	else
-	    test_must_fail git reset --$opt $T
-	fi
-    
-HEAD is now at aa272d3 B
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Cannot do a keep reset in the middle of a merge.
-ok 42 - check: X U B B --keep XXXXX  
+error: Terminal is dumb, but EDITOR unset
+Please supply the message using either -m or -F option.
+ok 3 - dumb should error out when falling back on vi
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7402-submodule-rebase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7402-submodule-rebase/.git/
-expecting success of 7402.1 'setup': 
+expecting success of 7005.4 'dumb should prefer EDITOR to VISUAL': 
 
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	git clone . submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m submodule &&
-	echo second line >> file &&
-	(cd submodule && git pull) &&
-	test_tick &&
-	git commit -m file-and-submodule -a &&
-	git branch added-submodule
+	EDITOR=./e-EDITOR.sh &&
+	VISUAL=./e-VISUAL.sh &&
+	export EDITOR VISUAL &&
+	git commit --amend &&
+	test "$(git show -s --format=%s)" = "Edited by EDITOR"
 
 
-[master (root-commit) ffefb50] initial
+[master 7eecd8c] Edited by EDITOR
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'submodule'...
-done.
-warning: adding embedded git repository: submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master 9bd10db] submodule
+ create mode 100644 Hand-edited.t
+ok 4 - dumb should prefer EDITOR to VISUAL
+
+expecting success of 7005.5 'Using editor': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 5b7078a] Edited by editor
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 160000 submodule
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7402-submodule-rebase/.
-   ffefb50..9bd10db  master     -> origin/master
-Updating ffefb50..9bd10db
-Fast-forward
- submodule | 1 +
- 1 file changed, 1 insertion(+)
- create mode 160000 submodule
-[master 041f541] file-and-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 7402.2 'rebase with a dirty submodule': 
-
-	(cd submodule &&
-	 echo 3rd line >> file &&
-	 test_tick &&
-	 git commit -m fork -a) &&
-	echo unrelated >> file2 &&
-	git add file2 &&
-	test_tick &&
-	git commit -m unrelated file2 &&
-	echo other line >> file &&
-	test_tick &&
-	git commit -m update file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
-	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
-	STORED=$(git rev-parse HEAD:submodule) &&
-	test $EXPECTED = $STORED &&
-	test $CURRENT = $(cd submodule && git rev-parse HEAD)
-
+ create mode 100644 Hand-edited.t
+ok 5 - Using editor
 
-[master eb5e1a6] fork
+expecting success of 7005.6 'Using EDITOR': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 7eecd8c] Edited by EDITOR
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
-[master b5e9d7b] unrelated
+ create mode 100644 Hand-edited.t
+ok 6 - Using EDITOR
+
+expecting success of 7005.7 'Using VISUAL': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 2ee1d44] Edited by VISUAL
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master a65f80c] update
+ create mode 100644 Hand-edited.t
+ok 7 - Using VISUAL
+
+expecting success of 7005.8 'Using core_editor': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1c851bb] Edited by core_editor
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
-trace: built-in: git rebase --onto 'HEAD~2' HEAD^
-Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
-trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git notes copy --for-rewrite=rebase
-trace: built-in: git notes copy --for-rewrite=rebase
-Successfully rebased and updated refs/heads/master.
-ok 2 - rebase with a dirty submodule
-
-expecting success of 7402.3 'interactive rebase with a dirty submodule': 
-
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual &&
-	HEAD=$(git rev-parse HEAD) &&
-	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
-		git rebase -i HEAD^ &&
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual
-
-pick 81a011672801a6d53f73688ebde4d518274102e6
-Successfully rebased and updated refs/heads/master.
-ok 3 - interactive rebase with a dirty submodule
-
-expecting success of 7402.4 'rebase with dirty file and submodule fails': 
-
-	echo yet another line >> file &&
-	test_tick &&
-	git commit -m next file &&
-	echo rewrite > file &&
-	test_tick &&
-	git commit -m rewrite file &&
-	echo dirty > file &&
-	test_must_fail git rebase --onto HEAD~2 HEAD^
-
+ create mode 100644 Hand-edited.t
+ok 8 - Using core_editor
 
-[master 260764e] next
+expecting success of 7005.9 'Using GIT_EDITOR': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1bdd03b] Edited by GIT_EDITOR
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
-[master 63179b5] rewrite
+ create mode 100644 Hand-edited.t
+ok 9 - Using GIT_EDITOR
+
+expecting success of 7005.10 'Using editor (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 5b7078a] Edited by editor
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-ok 4 - rebase with dirty file and submodule fails
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 10 - Using editor (override)
 
-expecting success of 7402.5 'stash with a dirty submodule': 
+expecting success of 7005.11 'Using EDITOR (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 7eecd8c] Edited by EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 11 - Using EDITOR (override)
 
-	echo new > file &&
-	CURRENT=$(cd submodule && git rev-parse HEAD) &&
-	git stash &&
-	test new != $(cat file) &&
-	echo submodule >expect &&
-	git diff --name-only >actual &&
-	test_cmp expect actual &&
+expecting success of 7005.12 'Using VISUAL (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 2ee1d44] Edited by VISUAL
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 12 - Using VISUAL (override)
 
-	echo "$CURRENT" >expect &&
-	git -C submodule rev-parse HEAD >actual &&
-	test_cmp expect actual &&
+expecting success of 7005.13 'Using core_editor (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1c851bb] Edited by core_editor
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 13 - Using core_editor (override)
 
-	git stash apply &&
-	test new = $(cat file) &&
-	echo "$CURRENT" >expect &&
-	git -C submodule rev-parse HEAD >actual &&
-	test_cmp expect actual
+expecting success of 7005.14 'Using GIT_EDITOR (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1bdd03b] Edited by GIT_EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 14 - Using GIT_EDITOR (override)
 
+expecting success of 7005.15 'editor with a space': 
+	echo "echo space >\"\$1\"" >"e space.sh" &&
+	chmod a+x "e space.sh" &&
+	GIT_EDITOR="./e\ space.sh" git commit --amend &&
+	test space = "$(git show -s --pretty=format:%s)"
 
-Saved working directory and index state WIP on master: 63179b5 rewrite
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   file
-	modified:   submodule (new commits)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	fake-editor.sh
+[master 5d9c28a] space
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 15 - editor with a space
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 5 - stash with a dirty submodule
+expecting success of 7005.16 'core.editor with a space': 
 
-expecting success of 7402.6 'rebasing submodule that should conflict': 
-	git reset --hard &&
-	git checkout added-submodule &&
-	git add submodule &&
-	test_tick &&
-	git commit -m third &&
-	(
-		cd submodule &&
-		git commit --allow-empty -m extra
-	) &&
-	git add submodule &&
-	test_tick &&
-	git commit -m fourth &&
+	git config core.editor \"./e\ space.sh\" &&
+	git commit --amend &&
+	test space = "$(git show -s --pretty=format:%s)"
 
-	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 2>actual_output &&
-	git ls-files -s submodule >actual &&
-	(
-		cd submodule &&
-		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
-		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
-		echo "160000 $(git rev-parse HEAD) 3	submodule"
-	) >expect &&
-	test_cmp expect actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (submodule), and either merge commit $(git -C submodule rev-parse --short HEAD^0)" &&
-		grep "$sub_expect" actual_output
-	fi
 
-HEAD is now at 63179b5 rewrite
-Switched to branch 'added-submodule'
-M	submodule
-[added-submodule 3e80a7a] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 7d89a17] extra
- Author: A U Thor <author@example.com>
-[added-submodule b58fe73] fourth
+[master 5d9c28a] space
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Failed to merge submodule submodule (commits don't follow merge-base)
-CONFLICT (submodule): Merge conflict in submodule
-hint:  - go to submodule (submodule), and either merge commit 7d89a17
-ok 6 - rebasing submodule that should conflict
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 16 - core.editor with a space
 
-# passed all 6 test(s)
-1..6
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7300-clean.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/.git/
-expecting success of 7300.1 'setup': 
-
-	mkdir -p src &&
-	touch src/part1.c Makefile &&
-	echo build >.gitignore &&
-	echo \*.o >>.gitignore &&
-	git add . &&
-	git commit -m setup &&
-	touch src/part2.c README &&
-	git add .
-
-
-[master (root-commit) c1a48e2] setup
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 Makefile
- create mode 100644 src/part1.c
-ok 1 - setup
-
-expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
-	git update-index --skip-worktree .gitignore &&
-	rm .gitignore &&
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so &&
-	git update-index --no-skip-worktree .gitignore &&
-	git checkout .gitignore
-
-Removing a.out
-Removing src/part3.c
-Updated 1 path from the index
-ok 2 - git clean with skip-worktree .gitignore
-
-expecting success of 7300.3 'git clean': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Removing a.out
-Removing src/part3.c
-ok 3 - git clean
-
-expecting success of 7300.4 'git clean src/': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Removing src/part3.c
-ok 4 - git clean src/
-
-expecting success of 7300.5 'git clean src/ src/': 
+*** t7006-pager.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7006-pager/.git/
+expecting success of 7006.1 'determine default pager': 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		sane_unset PAGER GIT_PAGER &&
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean src/ src/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+ok 1 - determine default pager
 
+expecting success of 7006.2 'setup': 
+	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
+	test_unconfig core.pager &&
 
-Removing src/part3.c
-ok 5 - git clean src/ src/
+	PAGER="cat >paginated.out" &&
+	export PAGER &&
 
-expecting success of 7300.6 'git clean with prefix': 
+	test_commit initial
 
-	mkdir -p build docs src/test &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
-	(cd src/ && git clean) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file src/test/1.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 2 - setup
 
+checking prerequisite: TTY
 
-Removing part3.c
-ok 6 - git clean with prefix
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-expecting success of 7300.7 'git clean with relative prefix': 
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n ../src |
-		grep part3 |
-		sed -n -e "s|^Would remove ||p"
-	) &&
-	test "$would_clean" = ../src/part3.c
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-ok 7 - git clean with relative prefix
+)
+prerequisite TTY ok
+expecting success of 7006.3 'some commands use a pager': 
+	rm -f paginated.out &&
+	test_terminal git log &&
+	test_path_is_file paginated.out
 
-expecting success of 7300.8 'git clean with absolute path': 
+ok 3 - some commands use a pager
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	would_clean=$(
-		cd docs &&
-		git clean -n "$(pwd)/../src" |
-		grep part3 |
-		sed -n -e "s|^Would remove ||p"
+checking known breakage of 7006.4 'pager runs from subdir': 
+	echo subdir/paginated.out >expected &&
+	mkdir -p subdir &&
+	rm -f paginated.out subdir/paginated.out &&
+	(
+		cd subdir &&
+		test_terminal git log
 	) &&
-	test "$would_clean" = ../src/part3.c
-
-ok 8 - git clean with absolute path
+	{
+		ls paginated.out subdir/paginated.out ||
+		:
+	} >actual &&
+	test_cmp expected actual
 
-expecting success of 7300.9 'git clean with out of work tree relative path': 
+ls: cannot access 'subdir/paginated.out': No such file or directory
+--- expected	2025-03-17 13:26:41.954737638 +0000
++++ actual	2025-03-17 13:26:42.230739382 +0000
+@@ -1 +1 @@
+-subdir/paginated.out
++paginated.out
+not ok 4 - pager runs from subdir # TODO known breakage
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+expecting success of 7006.5 'LESS and LV envvars are set for pagination': 
 	(
-		cd docs &&
-		test_must_fail git clean -n ../..
-	)
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out; wc" &&
+		export PAGER &&
 
-fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean'
-ok 9 - git clean with out of work tree relative path
+		test_terminal git log
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
 
-expecting success of 7300.10 'git clean with out of work tree absolute path': 
+      5      20     248
+LESS=FRX
+LV=-c
+ok 5 - LESS and LV envvars are set for pagination
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	dd=$(cd .. && pwd) &&
+expecting success of 7006.6 'LESS and LV envvars set by git-sh-setup': 
 	(
-		cd docs &&
-		test_must_fail git clean -n $dd
-	)
-
-fatal: /build/reproducible-path/git-2.49.0+next.20250314/t: '/build/reproducible-path/git-2.49.0+next.20250314/t' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean'
-ok 10 - git clean with out of work tree absolute path
-
-expecting success of 7300.11 'git clean -d with prefix and path': 
-
-	mkdir -p build docs src/feature &&
-	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
-	(cd src/ && git clean -d feature/) &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing src/feature/file.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Removing feature/
-ok 11 - git clean -d with prefix and path
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7300.12 'git clean symbolic link': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	ln -s docs/manual.txt src/part4.c &&
-	git clean &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing src/part4.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Removing a.out
-Removing src/part3.c
-Removing src/part4.c
-ok 12 - git clean symbolic link
-
-expecting success of 7300.13 'git clean with wildcard': 
-
-	touch a.clean b.clean other.c &&
-	git clean "*.clean" &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.clean &&
-	test_path_is_missing b.clean &&
-	test_path_is_file other.c
-
-
-Removing a.clean
-Removing b.clean
-ok 13 - git clean with wildcard
-
-expecting success of 7300.14 'git clean -n': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Would remove a.out
-Would remove other.c
-Would remove src/part3.c
-ok 14 - git clean -n
-
-expecting success of 7300.15 'git clean -d': 
-
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
-
-
-Removing a.out
-Removing docs/
-Removing other.c
-Removing src/part3.c
-Removing src/test/
-ok 15 - git clean -d
-
-expecting success of 7300.16 'git clean -d src/ examples/': 
-
-	mkdir -p build docs examples &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
-	git clean -d src/ examples/ &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing examples/1.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+		sane_unset LESS LV &&
+		PAGER="env >pager-env.out; wc" &&
+		export PAGER &&
+		PATH="$(git --exec-path):$PATH" &&
+		export PATH &&
+		test_terminal sh -c ". git-sh-setup && git_pager"
+	) &&
+	grep ^LESS= pager-env.out &&
+	grep ^LV= pager-env.out
 
+      0       0       0
+LESS=FRX
+LV=-c
+ok 6 - LESS and LV envvars set by git-sh-setup
 
-Removing examples/
-Removing src/part3.c
-ok 16 - git clean -d src/ examples/
+expecting success of 7006.7 'some commands do not use a pager': 
+	rm -f paginated.out &&
+	test_terminal git rev-list HEAD &&
+	test_path_is_missing paginated.out
 
-expecting success of 7300.17 'git clean -x': 
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+ok 7 - some commands do not use a pager
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -x &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_file build/lib.so
+expecting success of 7006.8 'no pager when stdout is a pipe': 
+	rm -f paginated.out &&
+	git log | cat &&
+	test_path_is_missing paginated.out
 
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-Removing a.out
-Removing obj.o
-Removing src/part3.c
-ok 17 - git clean -x
+    initial
+ok 8 - no pager when stdout is a pipe
 
-expecting success of 7300.18 'git clean -d -x': 
+expecting success of 7006.9 'no pager when stdout is a regular file': 
+	rm -f paginated.out &&
+	git log >file &&
+	test_path_is_missing paginated.out
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+ok 9 - no pager when stdout is a regular file
 
+expecting success of 7006.10 'git --paginate rev-list uses a pager': 
+	rm -f paginated.out &&
+	test_terminal git --paginate rev-list HEAD &&
+	test_path_is_file paginated.out
 
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-Removing src/part3.c
-ok 18 - git clean -d -x
+ok 10 - git --paginate rev-list uses a pager
 
-expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
+expecting success of 7006.11 'no pager even with --paginate when stdout is a pipe': 
+	rm -f file paginated.out &&
+	git --paginate log | cat &&
+	test_path_is_missing paginated.out
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -x -e src &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_missing docs &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
+    initial
+ok 11 - no pager even with --paginate when stdout is a pipe
 
-Removing a.out
-Removing build/
-Removing docs/
-Removing obj.o
-ok 19 - git clean -d -x with ignored tracked directory
+expecting success of 7006.12 'no pager with --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git --no-pager log &&
+	test_path_is_missing paginated.out
 
-expecting success of 7300.20 'git clean -X': 
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380 (HEAD -> master, tag: initial)
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -X &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_file build/lib.so
+    initial
+ok 12 - no pager with --no-pager
 
+expecting success of 7006.13 'configuration can disable pager': 
+	rm -f paginated.out &&
+	test_unconfig pager.grep &&
+	test_terminal git grep initial &&
+	test_path_is_file paginated.out &&
 
-Removing obj.o
-ok 20 - git clean -X
+	rm -f paginated.out &&
+	test_config pager.grep false &&
+	test_terminal git grep initial &&
+	test_path_is_missing paginated.out
 
-expecting success of 7300.21 'git clean -d -X': 
+initial.t:initial
+ok 13 - configuration can disable pager
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+expecting success of 7006.14 'configuration can enable pager (from subdir)': 
+	rm -f paginated.out &&
+	mkdir -p subdir &&
+	test_config pager.bundle true &&
 
+	git bundle create test.bundle --all &&
+	rm -f paginated.out subdir/paginated.out &&
+	(
+		cd subdir &&
+		test_terminal git bundle unbundle ../test.bundle
+	) &&
+	{
+		test_path_is_file paginated.out ||
+		test_path_is_file subdir/paginated.out
+	}
 
-Removing build/
-Removing obj.o
-ok 21 - git clean -d -X
+ok 14 - configuration can enable pager (from subdir)
 
-expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
+expecting success of 7006.15 'git tag -l defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git tag -l &&
+	test_path_is_file paginated.out
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -d -X -e src &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_missing obj.o &&
-	test_path_is_missing build
+ok 15 - git tag -l defaults to paging
 
+expecting success of 7006.16 'git tag -l respects pager.tag': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag -l &&
+	test_path_is_missing paginated.out
 
-Removing build/
-Removing obj.o
-Removing src/part3.c
-ok 22 - git clean -d -X with ignored tracked directory
+initial
+ok 16 - git tag -l respects pager.tag
 
-expecting success of 7300.23 'clean.requireForce defaults to true': 
+expecting success of 7006.17 'git tag -l respects --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag --no-pager tag -l &&
+	test_path_is_missing paginated.out
 
-	git config --unset clean.requireForce &&
-	test_must_fail git clean
+initial
+ok 17 - git tag -l respects --no-pager
 
+expecting success of 7006.18 'git tag with no args defaults to paging': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git tag &&
+	test_path_is_file paginated.out
 
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 23 - clean.requireForce defaults to true
+ok 18 - git tag with no args defaults to paging
 
-expecting success of 7300.24 'clean.requireForce': 
+expecting success of 7006.19 'git tag with no args respects pager.tag': 
+	# no args implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag &&
+	test_path_is_missing paginated.out
 
-	git config clean.requireForce true &&
-	test_must_fail git clean
+initial
+ok 19 - git tag with no args respects pager.tag
 
+expecting success of 7006.20 'git tag --contains defaults to paging': 
+	# --contains implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git tag --contains &&
+	test_path_is_file paginated.out
 
-fatal: clean.requireForce is true and -f not given: refusing to clean
-ok 24 - clean.requireForce
+ok 20 - git tag --contains defaults to paging
 
-expecting success of 7300.25 'clean.requireForce and -n': 
+expecting success of 7006.21 'git tag --contains respects pager.tag': 
+	# --contains implies -l so this should page like -l
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false tag --contains &&
+	test_path_is_missing paginated.out
 
-	mkdir -p build docs &&
-	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
-	git clean -n &&
-	test_path_is_file Makefile &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_file a.out &&
-	test_path_is_file src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+initial
+ok 21 - git tag --contains respects pager.tag
 
+expecting success of 7006.22 'git tag -a defaults to not paging': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git tag -am message newtag &&
+	test_path_is_missing paginated.out
 
-Would remove a.out
-Would remove src/part3.c
-ok 25 - clean.requireForce and -n
+Deleted tag 'newtag' (was a052248)
+ok 22 - git tag -a defaults to not paging
 
-expecting success of 7300.26 'clean.requireForce and -f': 
+expecting success of 7006.23 'git tag -a ignores pager.tag': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag tag -am message newtag &&
+	test_path_is_missing paginated.out
 
-	git clean -f &&
-	test_path_is_file README &&
-	test_path_is_file src/part1.c &&
-	test_path_is_file src/part2.c &&
-	test_path_is_missing a.out &&
-	test_path_is_missing src/part3.c &&
-	test_path_is_file docs/manual.txt &&
-	test_path_is_file obj.o &&
-	test_path_is_file build/lib.so
+Deleted tag 'newtag' (was a052248)
+ok 23 - git tag -a ignores pager.tag
 
+expecting success of 7006.24 'git tag -a respects --paginate': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git --paginate tag -am message newtag &&
+	test_path_is_file paginated.out
 
-Removing a.out
-Removing src/part3.c
-ok 26 - clean.requireForce and -f
+Deleted tag 'newtag' (was a052248)
+ok 24 - git tag -a respects --paginate
 
-expecting success of 7300.27 'clean.requireForce and --interactive': 
-	git clean --interactive </dev/null >output 2>error &&
-	test_grep ! "requireForce is true and" error &&
-	test_grep "\*\*\* Commands \*\*\*" output
+expecting success of 7006.25 'git tag as alias ignores pager.tag with -a': 
+	test_when_finished "git tag -d newtag" &&
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
+	test_path_is_missing paginated.out
 
-*** Commands ***
-ok 27 - clean.requireForce and --interactive
+Deleted tag 'newtag' (was a052248)
+ok 25 - git tag as alias ignores pager.tag with -a
 
-expecting success of 7300.28 'core.excludesfile': 
+expecting success of 7006.26 'git tag as alias respects pager.tag with -l': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
+	test_path_is_missing paginated.out
 
-	echo excludes >excludes &&
-	echo included >included &&
-	git config core.excludesfile excludes &&
-	output=$(git clean -n excludes included 2>&1) &&
-	expr "$output" : ".*included" >/dev/null &&
-	! expr "$output" : ".*excludes" >/dev/null
+initial
+ok 26 - git tag as alias respects pager.tag with -l
 
+expecting success of 7006.27 'git branch defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git branch &&
+	test_path_is_file paginated.out
 
-ok 28 - core.excludesfile
+ok 27 - git branch defaults to paging
 
-checking prerequisite: SANITY
+expecting success of 7006.28 'git branch respects pager.branch': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.branch=false branch &&
+	test_path_is_missing paginated.out
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+* master
+ok 28 - git branch respects pager.branch
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+expecting success of 7006.29 'git branch respects --no-pager': 
+	rm -f paginated.out &&
+	test_terminal git --no-pager branch &&
+	test_path_is_missing paginated.out
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+* master
+ok 29 - git branch respects --no-pager
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+expecting success of 7006.30 'git branch --edit-description ignores pager.branch': 
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		echo "New description" >"$1"
+		touch editor.used
+	EOF
+	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 7300.29 'removal failure': 
+hint: Waiting for your editor to close the file... 
ok 30 - git branch --edit-description ignores pager.branch
 
-	mkdir foo &&
-	touch foo/bar &&
-	test_when_finished "chmod 755 foo" &&
-	(exec <foo/bar &&
-	 chmod 0 foo &&
-	 test_must_fail git clean -f -d)
+expecting success of 7006.31 'git branch --set-upstream-to ignores pager.branch': 
+	rm -f paginated.out &&
+	git branch other &&
+	test_when_finished "git branch -D other" &&
+	test_terminal git -c pager.branch branch --set-upstream-to=other &&
+	test_when_finished "git branch --unset-upstream" &&
+	test_path_is_missing paginated.out
 
-warning: could not open directory 'foo/': Permission denied
-warning: failed to remove foo/: Directory not empty
-Removing docs/
-Removing error
-Removing included
-Removing output
-ok 29 - removal failure
+branch 'master' set up to track 'other'.
+Deleted branch other (was 24b24cf).
+ok 31 - git branch --set-upstream-to ignores pager.branch
 
-expecting success of 7300.30 'nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
-	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
-	) &&
-	git clean -f -d &&
-	test_path_is_file foo/.git/index &&
-	test_path_is_file foo/hello.world &&
-	test_path_is_file baz/boo/.git/index &&
-	test_path_is_file baz/boo/deeper.world &&
-	test_path_is_missing bar
+expecting success of 7006.32 'git config ignores pager.config when setting': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config foo.bar bar &&
+	test_path_is_missing paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing bar/
-Skipping repository baz/boo
-ok 30 - nested git work tree
+ok 32 - git config ignores pager.config when setting
 
-expecting success of 7300.31 'should clean things that almost look like git but are not': 
-	rm -fr almost_git almost_bare_git almost_submodule &&
-	mkdir -p almost_git/.git/objects &&
-	mkdir -p almost_git/.git/refs &&
-	cat >almost_git/.git/HEAD <<-\EOF &&
-	garbage
-	EOF
-	cp -r almost_git/.git/ almost_bare_git &&
-	mkdir almost_submodule/ &&
-	cat >almost_submodule/.git <<-\EOF &&
-	garbage
+expecting success of 7006.33 'git config --edit ignores pager.config': 
+	rm -f paginated.out editor.used &&
+	write_script editor <<-\EOF &&
+		touch editor.used
 	EOF
-	test_when_finished "rm -rf almost_*" &&
-	git clean -f -d &&
-	test_path_is_missing almost_git &&
-	test_path_is_missing almost_bare_git &&
-	test_path_is_missing almost_submodule
-
-Removing almost_bare_git/
-Removing almost_git/
-Removing almost_submodule/
-Skipping repository baz/boo
-ok 31 - should clean things that almost look like git but are not
-
-expecting success of 7300.32 'should not clean submodules': 
-	rm -fr repo to_clean sub1 sub2 &&
-	mkdir repo to_clean &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	test_config_global protocol.file.allow always &&
-	git submodule add ./repo/.git sub1 &&
-	git commit -m "sub1" &&
-	git branch before_sub2 &&
-	git submodule add ./repo/.git sub2 &&
-	git commit -m "sub2" &&
-	git checkout before_sub2 &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file repo/.git/index &&
-	test_path_is_file repo/hello.world &&
-	test_path_is_file sub1/.git &&
-	test_path_is_file sub1/hello.world &&
-	test_path_is_file sub2/.git &&
-	test_path_is_file sub2/hello.world &&
-	test_path_is_missing to_clean
+	EDITOR=./editor test_terminal git -c pager.config config --edit &&
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/sub1'...
-done.
-[master a5d0902] sub1
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 README
- create mode 100644 src/part2.c
- create mode 160000 sub1
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/sub2'...
-done.
-[master 8525980] sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub2
-warning: unable to rmdir 'sub2': Directory not empty
-Switched to branch 'before_sub2'
-Removing .gitconfig
-Skipping repository baz/boo
-Removing to_clean/
-ok 32 - should not clean submodules
+hint: Waiting for your editor to close the file... 
ok 33 - git config --edit ignores pager.config
 
-expecting success of 7300.33 'should avoid cleaning possible submodules': 
-	rm -fr to_clean possible_sub1 &&
-	mkdir to_clean possible_sub1 &&
-	test_when_finished "rm -rf possible_sub*" &&
-	echo "gitdir: foo" >possible_sub1/.git &&
-	>possible_sub1/hello.world &&
-	chmod 0 possible_sub1/.git &&
-	>to_clean/should_clean.this &&
-	git clean -f -d &&
-	test_path_is_file possible_sub1/.git &&
-	test_path_is_file possible_sub1/hello.world &&
-	test_path_is_missing to_clean
+expecting success of 7006.34 'git config --get ignores pager.config': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config config --get foo.bar &&
+	test_path_is_missing paginated.out
 
-Skipping repository baz/boo
-Removing to_clean/
-ok 33 - should avoid cleaning possible submodules
+bar
+ok 34 - git config --get ignores pager.config
 
-expecting success of 7300.34 'nested (empty) git should be kept': 
-	rm -fr empty_repo to_clean &&
-	git init empty_repo &&
-	mkdir to_clean &&
-	>to_clean/should_clean.this &&
-	# Note that we put the expect file in the .git directory so that it
-	# does not get cleaned.
-	find empty_repo | sort >.git/expect &&
-	git clean -f -d &&
-	find empty_repo | sort >actual &&
-	test_cmp .git/expect actual &&
-	test_path_is_missing to_clean
+expecting success of 7006.35 'git config --get-urlmatch defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git -c http."https://foo.com/".bar=foo \
+			  config --get-urlmatch http https://foo.com &&
+	test_path_is_file paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/empty_repo/.git/
-Skipping repository baz/boo
-Removing to_clean/
-ok 34 - nested (empty) git should be kept
+ok 35 - git config --get-urlmatch defaults to paging
 
-expecting success of 7300.35 'nested bare repositories should be cleaned': 
-	rm -fr bare1 bare2 subdir &&
-	git init --bare bare1 &&
-	git clone --local --bare . bare2 &&
-	mkdir subdir &&
-	cp -r bare2 subdir/bare3 &&
-	git clean -f -d &&
-	test_path_is_missing bare1 &&
-	test_path_is_missing bare2 &&
-	test_path_is_missing subdir
+expecting success of 7006.36 'git config --get-all respects pager.config': 
+	rm -f paginated.out &&
+	test_terminal git -c pager.config=false config --get-all foo.bar &&
+	test_path_is_missing paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/bare1/
-Cloning into bare repository 'bare2'...
-done.
-Removing actual
-Removing bare1/
-Removing bare2/
-Skipping repository baz/boo
-Removing subdir/
-ok 35 - nested bare repositories should be cleaned
+bar
+ok 36 - git config --get-all respects pager.config
 
-checking known breakage of 7300.36 'nested (empty) bare repositories should be cleaned even when in .git': 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git init --bare strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
+expecting success of 7006.37 'git config --list defaults to paging': 
+	rm -f paginated.out &&
+	test_terminal git config --list &&
+	test_path_is_file paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/strange_bare/.git/
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Apr 19 19:23 strange_bare
-not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
+ok 37 - git config --list defaults to paging
 
-checking known breakage of 7300.37 'nested (non-empty) bare repositories should be cleaned even when in .git': 
-	rm -fr strange_bare &&
-	mkdir strange_bare &&
-	git clone --local --bare . strange_bare/.git &&
-	git clean -f -d &&
-	test_path_is_missing strange_bare
+expecting success of 7006.38 'tests can detect color': 
+	rm -f colorful.log colorless.log &&
+	git log --no-color >colorless.log &&
+	git log --color >colorful.log &&
+	! colorful colorless.log &&
+	colorful colorful.log
 
-Cloning into bare repository 'strange_bare/.git'...
-done.
-Skipping repository baz/boo
-Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 60 Apr 19 19:23 strange_bare
-not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
+ok 38 - tests can detect color
 
-expecting success of 7300.38 'giving path in nested git work tree will NOT remove it': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		mkdir -p bar/baz &&
-		test_commit msg bar/baz/hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/bar/baz &&
-	find repo | sort >actual &&
-	test_cmp expect actual
+expecting success of 7006.39 'no color when stdout is a regular file': 
+	rm -f colorless.log &&
+	test_config color.ui auto &&
+	git log >colorless.log &&
+	! colorful colorless.log
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 14dba50] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar/baz/hello.world
-ok 38 - giving path in nested git work tree will NOT remove it
+ok 39 - no color when stdout is a regular file
 
-expecting success of 7300.39 'giving path to nested .git will not remove it': 
-	rm -fr repo &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/.git &&
-	find repo | sort >actual &&
-	test_cmp expect actual &&
-	test_path_is_dir untracked/
+expecting success of 7006.40 'color when writing to a pager': 
+	rm -f paginated.out &&
+	test_config color.ui auto &&
+	test_terminal git log &&
+	colorful paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-ok 39 - giving path to nested .git will not remove it
+ok 40 - color when writing to a pager
 
-expecting success of 7300.40 'giving path to nested .git/ will NOT remove contents': 
-	rm -fr repo untracked &&
-	mkdir repo untracked &&
-	(
-		cd repo &&
-		git init &&
-		test_commit msg hello.world
-	) &&
-	find repo | sort >expect &&
-	git clean -f -d repo/.git/ &&
-	find repo | sort >actual &&
-	test_cmp expect actual &&
-	test_path_is_dir untracked/
+expecting success of 7006.41 'colors are suppressed by color.pager': 
+	rm -f paginated.out &&
+	test_config color.ui auto &&
+	test_config color.pager false &&
+	test_terminal git log &&
+	! colorful paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
-[master (root-commit) 1af9d3b] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-ok 40 - giving path to nested .git/ will NOT remove contents
+ok 41 - colors are suppressed by color.pager
 
-expecting success of 7300.41 'force removal of nested git work tree': 
-	rm -fr foo bar baz &&
-	mkdir -p foo bar baz/boo &&
-	(
-		cd foo &&
-		git init &&
-		test_commit nested hello.world
-	) &&
-	(
-		cd bar &&
-		>goodbye.people
-	) &&
+expecting success of 7006.42 'color when writing to a file intended for a pager': 
+	rm -f colorful.log &&
+	test_config color.ui auto &&
 	(
-		cd baz/boo &&
-		git init &&
-		test_commit deeply.nested deeper.world
+		TERM=vt100 &&
+		GIT_PAGER_IN_USE=true &&
+		export TERM GIT_PAGER_IN_USE &&
+		git log >colorful.log
 	) &&
-	git clean -f -f -d &&
-	test_path_is_missing foo &&
-	test_path_is_missing bar &&
-	test_path_is_missing baz
+	colorful colorful.log
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/foo/.git/
-[master (root-commit) abd8674] nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello.world
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/baz/boo/.git/
-[master (root-commit) 3f7f1fc] deeply.nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 deeper.world
-Removing actual
-Removing bar/
-Removing baz/
-Removing empty_repo/
-Removing expect
-Removing foo/
-Removing repo/
-Removing strange_bare/
-Removing sub2/
-Removing untracked/
-ok 41 - force removal of nested git work tree
+ok 42 - color when writing to a file intended for a pager
 
-expecting success of 7300.42 'git clean -e': 
-	rm -fr repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		touch known 1 2 3 &&
-		git add known &&
-		git clean -f -e 1 -e 2 &&
-		test_path_exists 1 &&
-		test_path_exists 2 &&
-		test_path_is_missing 3 &&
-		test_path_exists known
-	)
+expecting success of 7006.43 'colors are sent to pager for external commands': 
+	test_config alias.externallog "!git log" &&
+	test_config color.ui auto &&
+	test_terminal git -p externallog &&
+	colorful paginated.out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
-Removing 3
-ok 42 - git clean -e
+ok 43 - colors are sent to pager for external commands
 
-expecting success of 7300.43 'git clean -d with an unreadable empty directory': 
-	mkdir foo &&
-	chmod a= foo &&
-	git clean -dfx foo &&
-	test_path_is_missing foo
+expecting success of 7006.44 'setup: some aliases': 
+	git config alias.aliasedlog log &&
+	git config alias.true "!true"
 
-warning: could not open directory 'foo/': Permission denied
-Removing foo/
-ok 43 - git clean -d with an unreadable empty directory
+ok 44 - setup: some aliases
 
-expecting success of 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foobar &&
-	test_path_is_dir foo &&
-	test_path_is_missing foobar
+expecting success of 7006.45 'git log - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git log
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 45 - git log - default pager is used by default
 
-Removing foobar/
-ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
+expecting success of 7006.46 'git log - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git log &&
+		test_path_is_file PAGER_used
+	
+ok 46 - git log - PAGER overrides default pager
 
-expecting success of 7300.45 'git clean -d respects pathspecs (pathspec is prefix of dir)': 
-	mkdir -p foo &&
-	mkdir -p foobar &&
-	git clean -df foo &&
-	test_path_is_missing foo &&
-	test_path_is_dir foobar
+expecting success of 7006.47 'git log - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git log &&
+		test_path_is_file core.pager_used
+	
+ok 47 - git log - repository-local core.pager setting overrides PAGER
 
-Removing foo/
-ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
+expecting success of 7006.48 'git log - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git log
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 48 - git log - core.pager overrides PAGER from subdirectory
 
-expecting success of 7300.46 'git clean -d skips untracked dirs containing ignored files': 
-	echo /foo/bar >.gitignore &&
-	echo ignoreme >>.gitignore &&
-	rm -rf foo &&
-	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
-	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
-	git clean -df &&
-	test_path_is_dir foo &&
-	test_path_is_file foo/bar &&
-	test_path_is_missing foo/baz &&
-	test_path_is_file foo/a/aa/ignoreme &&
-	test_path_is_missing foo/a/aa/aaa &&
-	test_path_is_file foo/b/ignoreme &&
-	test_path_is_missing foo/b/bb
+expecting success of 7006.49 'git log - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git log &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 49 - git log - GIT_PAGER overrides core.pager
 
-Removing build/
-Removing foo/a/aa/aaa/
-Removing foo/b/bb/
-Removing foo/baz
-Removing foobar/
-Removing obj.o
-ok 46 - git clean -d skips untracked dirs containing ignored files
+expecting success of 7006.50 'git -p log - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p log
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 50 - git -p log - default pager is used by default
 
-expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
-	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
+expecting success of 7006.51 'git -p log - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p log &&
+		test_path_is_file PAGER_used
+	
+ok 51 - git -p log - PAGER overrides default pager
 
-	git init nested-repo-with-ignored-file &&
-	(
-		cd nested-repo-with-ignored-file &&
-		>file &&
-		git add file &&
-		git commit -m Initial &&
+expecting success of 7006.52 'git -p log - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p log &&
+		test_path_is_file core.pager_used
+	
+ok 52 - git -p log - repository-local core.pager setting overrides PAGER
 
-		# This file is ignored by a .gitignore rule in the outer repo
-		# added in the previous test.
-		>ignoreme
-	) &&
+expecting success of 7006.53 'git -p log - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p log
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 53 - git -p log - core.pager overrides PAGER from subdirectory
 
-	git clean -fd &&
+expecting success of 7006.54 'git -p log - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p log &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 54 - git -p log - GIT_PAGER overrides core.pager
 
-	test_path_is_file nested-repo-with-ignored-file/.git/index &&
-	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
-	test_path_is_file nested-repo-with-ignored-file/file
+expecting success of 7006.55 'git aliasedlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git aliasedlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 55 - git aliasedlog - default pager is used by default
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/nested-repo-with-ignored-file/.git/
-[master (root-commit) 4208a61] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-ok 47 - git clean -d skips nested repo containing ignored files
+expecting success of 7006.56 'git aliasedlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file PAGER_used
+	
+ok 56 - git aliasedlog - PAGER overrides default pager
 
-expecting success of 7300.48 'git clean handles being told what to clean': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -f */ut &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+expecting success of 7006.57 'git aliasedlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file core.pager_used
+	
+ok 57 - git aliasedlog - repository-local core.pager setting overrides PAGER
 
-Removing d1/ut
-Removing d2/ut
-ok 48 - git clean handles being told what to clean
+expecting success of 7006.58 'git aliasedlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git aliasedlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 58 - git aliasedlog - core.pager overrides PAGER from subdirectory
 
-expecting success of 7300.49 'git clean handles being told what to clean, with -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -ffd */ut &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+expecting success of 7006.59 'git aliasedlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git aliasedlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 59 - git aliasedlog - GIT_PAGER overrides core.pager
 
-Removing d1/ut
-Removing d2/ut
-ok 49 - git clean handles being told what to clean, with -d
+expecting success of 7006.60 'git -p aliasedlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p aliasedlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 60 - git -p aliasedlog - default pager is used by default
 
-expecting success of 7300.50 'git clean works if a glob is passed without -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -f "*ut" &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+expecting success of 7006.61 'git -p aliasedlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file PAGER_used
+	
+ok 61 - git -p aliasedlog - PAGER overrides default pager
 
-Removing d1/ut
-Removing d2/ut
-ok 50 - git clean works if a glob is passed without -d
+expecting success of 7006.62 'git -p aliasedlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file core.pager_used
+	
+ok 62 - git -p aliasedlog - repository-local core.pager setting overrides PAGER
 
-expecting success of 7300.51 'git clean works if a glob is passed with -d': 
-	mkdir -p d1 d2 &&
-	touch d1/ut d2/ut &&
-	git clean -ffd "*ut" &&
-	test_path_is_missing d1/ut &&
-	test_path_is_missing d2/ut
+expecting success of 7006.63 'git -p aliasedlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p aliasedlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 63 - git -p aliasedlog - core.pager overrides PAGER from subdirectory
 
-Removing d1/ut
-Removing d2/ut
-ok 51 - git clean works if a glob is passed with -d
+expecting success of 7006.64 'git -p aliasedlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p aliasedlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 64 - git -p aliasedlog - GIT_PAGER overrides core.pager
 
-ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
+expecting success of 7006.65 'git -p true - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p true
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 65 - git -p true - default pager is used by default
 
-expecting success of 7300.53 'clean untracked paths by pathspec': 
-	git init untracked &&
-	mkdir untracked/dir &&
-	echo >untracked/dir/file.txt &&
-	git -C untracked clean -f dir/file.txt &&
-	ls untracked/dir >actual &&
-	test_must_be_empty actual
+expecting success of 7006.66 'git -p true - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git -p true &&
+		test_path_is_file PAGER_used
+	
+ok 66 - git -p true - PAGER overrides default pager
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/untracked/.git/
-Removing dir/file.txt
-ok 53 - clean untracked paths by pathspec
+expecting success of 7006.67 'git -p true - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git -p true &&
+		test_path_is_file core.pager_used
+	
+ok 67 - git -p true - repository-local core.pager setting overrides PAGER
 
-expecting success of 7300.54 'avoid traversing into ignored directories': 
-	test_when_finished rm -f output error trace.* &&
-	test_create_repo avoid-traversing-deep-hierarchy &&
-	(
-		cd avoid-traversing-deep-hierarchy &&
+expecting success of 7006.68 'git -p true - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p true
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 68 - git -p true - core.pager overrides PAGER from subdirectory
 
-		mkdir -p untracked/subdir/with/a &&
-		>untracked/subdir/with/a/random-file.txt &&
+expecting success of 7006.69 'git -p true - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git -p true &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 69 - git -p true - GIT_PAGER overrides core.pager
 
-		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-		git clean -ffdxn -e untracked
-	) &&
+expecting success of 7006.70 'git -p request-pull - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_must_fail test_terminal  git -p request-pull
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 70 - git -p request-pull - default pager is used by default
 
-	# Make sure we only visited into the top-level directory, and did
-	# not traverse into the "untracked" subdirectory since it was excluded
-	grep data.*read_directo.*directories-visited trace.output |
-		cut -d "|" -f 9 >trace.relevant &&
-	cat >trace.expect <<-EOF &&
-	 ..directories-visited:1
-	EOF
-	test_cmp trace.expect trace.relevant
+expecting success of 7006.71 'git -p request-pull - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file PAGER_used
+	
+ok 71 - git -p request-pull - PAGER overrides default pager
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
-ok 54 - avoid traversing into ignored directories
+expecting success of 7006.72 'git -p request-pull - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file core.pager_used
+	
+ok 72 - git -p request-pull - repository-local core.pager setting overrides PAGER
 
-expecting success of 7300.55 'traverse into directories that may have ignored entries': 
-	test_when_finished rm -f output &&
-	test_create_repo need-to-traverse-into-hierarchy &&
-	(
-		cd need-to-traverse-into-hierarchy &&
-		mkdir -p modules/foobar/src/generated &&
-		> modules/foobar/src/generated/code.c &&
-		> modules/foobar/Makefile &&
-		echo "/modules/**/src/generated/" >.gitignore &&
+expecting success of 7006.73 'git -p request-pull - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_must_fail test_terminal  git -p request-pull
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 73 - git -p request-pull - core.pager overrides PAGER from subdirectory
 
-		git clean -fX modules/foobar >../output &&
+expecting success of 7006.74 'git -p request-pull - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p request-pull &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 74 - git -p request-pull - GIT_PAGER overrides core.pager
 
-		grep Removing ../output &&
+expecting success of 7006.75 'git -p - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_must_fail test_terminal  git -p
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 75 - git -p - default pager is used by default
 
-		test_path_is_missing modules/foobar/src/generated/code.c &&
-		test_path_is_file modules/foobar/Makefile
-	)
+expecting success of 7006.76 'git -p - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_must_fail test_terminal  git -p &&
+		test_path_is_file PAGER_used
+	
+ok 76 - git -p - PAGER overrides default pager
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/need-to-traverse-into-hierarchy/.git/
-Removing modules/foobar/src/
-ok 55 - traverse into directories that may have ignored entries
+checking known breakage of 7006.77 'git -p - repository-local core.pager setting is not used': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_must_fail test_terminal  git -p &&
+		! test_path_is_file core.pager_used
+	
+not ok 77 - git -p - repository-local core.pager setting is not used # TODO known breakage
 
-# still have 2 known breakage(s)
-# passed all remaining 53 test(s)
-1..55
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7201-co.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7201-co/.git/
-expecting success of 7201.1 'setup': 
-	fill x y z >same &&
-	fill 1 2 3 4 5 6 7 8 >one &&
-	fill a b c d e >two &&
-	git add same one two &&
-	git commit -m "Initial A one, A two" &&
+expecting success of 7006.78 'git -p - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 78 - git -p - GIT_PAGER overrides core.pager
 
-	git checkout -b renamer &&
-	rm -f one &&
-	fill 1 3 4 5 6 7 8 >uno &&
-	git add uno &&
-	fill a b c d e f >two &&
-	git commit -a -m "Renamer R one->uno, M two" &&
+expecting success of 7006.79 'core.pager in repo config works and retains cwd': 
+	sane_unset GIT_PAGER &&
+	test_config core.pager "cat >cwd-retained" &&
+	(
+		cd sub &&
+		rm -f cwd-retained &&
+		test_terminal git -p rev-parse HEAD &&
+		test_path_is_file cwd-retained
+	)
 
-	git checkout -b side main &&
-	fill 1 2 3 4 5 6 7 >one &&
-	fill A B C D E >three &&
-	rm -f two &&
-	git update-index --add --remove one two three &&
-	git commit -m "Side M one, D two, A three" &&
+ok 79 - core.pager in repo config works and retains cwd
 
-	git checkout -b simple main &&
-	rm -f one &&
-	fill a c e >two &&
-	git commit -a -m "Simple D one, M two" &&
+expecting success of 7006.80 'core.pager is found via alias in subdirectory': 
+	sane_unset GIT_PAGER &&
+	test_config core.pager "cat >via-alias" &&
+	(
+		cd sub &&
+		rm -f via-alias &&
+		test_terminal git -c alias.r="-p rev-parse" r HEAD &&
+		test_path_is_file via-alias
+	)
 
-	git checkout main
+ok 80 - core.pager is found via alias in subdirectory
 
-[main (root-commit) 7329388] Initial A one, A two
- Author: A U Thor <author@example.com>
- 3 files changed, 16 insertions(+)
- create mode 100644 one
- create mode 100644 same
- create mode 100644 two
-Switched to a new branch 'renamer'
-[renamer 0420b41] Renamer R one->uno, M two
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename one => uno (87%)
-Switched to a new branch 'side'
-[side ab76817] Side M one, D two, A three
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 6 deletions(-)
- create mode 100644 three
- delete mode 100644 two
-Switched to a new branch 'simple'
-[simple 022ff9d] Simple D one, M two
- Author: A U Thor <author@example.com>
- 2 files changed, 10 deletions(-)
- delete mode 100644 one
-Switched to branch 'main'
-ok 1 - setup
+checking known breakage of 7006.81 'no pager for 'git -p nonsense'': 
+		rm -f GIT_PAGER_used &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_must_fail test_terminal  git -p nonsense &&
+		test_path_is_missing GIT_PAGER_used
+	
+Path exists:
+-rw-r--r-- 1 pbuilder2 pbuilder2 24 Mar 17 13:27 GIT_PAGER_used
+not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
 
-expecting success of 7201.2 'checkout from non-existing branch': 
-	git checkout -b delete-me main &&
-	git update-ref -d --no-deref refs/heads/delete-me &&
-	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-	git checkout main &&
-	test refs/heads/main = "$(git symbolic-ref HEAD)"
+expecting success of 7006.82 'git shortlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git shortlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 82 - git shortlog - default pager is used by default
 
-Switched to a new branch 'delete-me'
-Switched to branch 'main'
-ok 2 - checkout from non-existing branch
+expecting success of 7006.83 'git shortlog - PAGER overrides default pager': 
+		sane_unset GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f PAGER_used &&
+		PAGER='wc >PAGER_used' &&
+		export PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_file PAGER_used
+	
+ok 83 - git shortlog - PAGER overrides default pager
 
-expecting success of 7201.3 'checkout with dirty tree without -m': 
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	if git checkout side
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi
+expecting success of 7006.84 'git shortlog - repository-local core.pager setting overrides PAGER': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		PAGER=wc &&
+		export PAGER &&
+		test_config core.pager 'wc >core.pager_used' &&
+		test_terminal  git shortlog &&
+		test_path_is_file core.pager_used
+	
+ok 84 - git shortlog - repository-local core.pager setting overrides PAGER
 
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-ok 3 - checkout with dirty tree without -m
+expecting success of 7006.85 'git shortlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git shortlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 85 - git shortlog - core.pager overrides PAGER from subdirectory
 
-expecting success of 7201.4 'checkout with unrelated dirty tree without -m': 
-	git checkout -f main &&
-	fill 0 1 2 3 4 5 6 7 8 >same &&
-	cp same kept &&
-	git checkout side >messages &&
-	test_cmp same kept &&
-	printf "M\t%s\n" same >messages.expect &&
-	test_cmp messages.expect messages
+expecting success of 7006.86 'git shortlog - GIT_PAGER overrides core.pager': 
+		rm -f GIT_PAGER_used &&
+		test_config core.pager wc &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_file GIT_PAGER_used
+	
+ok 86 - git shortlog - GIT_PAGER overrides core.pager
 
-Already on 'main'
-Switched to branch 'side'
-ok 4 - checkout with unrelated dirty tree without -m
+expecting success of 7006.87 'setup: configure shortlog not to paginate': 
+	git config pager.shortlog false
 
-expecting success of 7201.5 'checkout -m with dirty tree': 
-	git checkout -f main &&
-	git clean -f &&
+ok 87 - setup: configure shortlog not to paginate
 
-	fill 0 1 2 3 4 5 6 7 8 >one &&
-	git checkout -m side >messages &&
+expecting success of 7006.88 'no pager for 'git shortlog'': 
+		rm -f GIT_PAGER_used &&
+		GIT_PAGER='wc >GIT_PAGER_used' &&
+		export GIT_PAGER &&
+		test_terminal  git shortlog &&
+		test_path_is_missing GIT_PAGER_used
+	
+ok 88 - no pager for 'git shortlog'
 
-	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
+expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git shortlog
+		) &&
+		! test_path_is_file core.pager_used
+	
+File core.pager_used doesn't exist
+ok 89 - git shortlog - core.pager is not used from subdirectory
 
-	printf "M\t%s\n" one >expect.messages &&
-	test_cmp expect.messages messages &&
+expecting success of 7006.90 'git -p shortlog - default pager is used by default': 
+		sane_unset PAGER GIT_PAGER &&
+		test_unconfig core.pager &&
+		rm -f default_pager_used &&
+		cat >$less <<-\EOF &&
+		#!/bin/sh
+		wc >default_pager_used
+		EOF
+		chmod +x $less &&
+		(
+			PATH=.:$PATH &&
+			export PATH &&
+			test_terminal  git -p shortlog
+		) &&
+		test_path_is_file default_pager_used
+	
+ok 90 - git -p shortlog - default pager is used by default
 
-	fill "M	one" "A	three" "D	two" >expect.main &&
-	git diff --name-status main >current.main &&
-	test_cmp expect.main current.main &&
+expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_terminal  git -p shortlog
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 91 - git -p shortlog - core.pager overrides PAGER from subdirectory
 
-	fill "M	one" >expect.side &&
-	git diff --name-status side >current.side &&
-	test_cmp expect.side current.side &&
+expecting success of 7006.92 'git -p apply </dev/null - core.pager overrides PAGER from subdirectory': 
+		sane_unset GIT_PAGER &&
+		rm -f core.pager_used &&
+		rm -fr sub &&
+		PAGER=wc &&
+		stampname=$(pwd)/core.pager_used &&
+		export PAGER stampname &&
+		test_config core.pager 'wc >"$stampname"' &&
+		mkdir sub &&
+		(
+			cd sub &&
+			test_must_fail test_terminal  git -p apply </dev/null
+		) &&
+		test_path_is_file core.pager_used
+	
+ok 92 - git -p apply </dev/null - core.pager overrides PAGER from subdirectory
 
-	git diff --cached >current.index &&
-	test_must_be_empty current.index
+expecting success of 7006.93 'command-specific pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_unconfig core.pager &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
 
-Switched to branch 'main'
-Removing kept
-Removing messages
-Removing messages.expect
-Switched to branch 'side'
-ok 5 - checkout -m with dirty tree
+ok 93 - command-specific pager
 
-expecting success of 7201.6 'checkout -m with dirty tree, renamed': 
-	git checkout -f main && git clean -f &&
+expecting success of 7006.94 'command-specific pager overrides core.pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config core.pager "exit 1" &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
 
-	fill 1 2 3 4 5 7 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
+ok 94 - command-specific pager overrides core.pager
 
-	git checkout -m renamer &&
-	fill 1 3 4 5 7 8 >expect &&
-	test_cmp expect uno &&
-	! test -f one &&
-	git diff --cached >current &&
-	test_must_be_empty current
+expecting success of 7006.95 'command-specific pager overridden by environment': 
+	GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
+	>actual &&
+	echo "foo:initial" >expect &&
+	test_config pager.log "exit 1" &&
+	test_terminal git log --format=%s -1 &&
+	test_cmp expect actual
 
-Switched to branch 'main'
-Removing current.index
-Removing current.main
-Removing current.side
-Removing expect.main
-Removing expect.messages
-Removing expect.side
-Removing messages
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 6 - checkout -m with dirty tree, renamed
+ok 95 - command-specific pager overridden by environment
 
-expecting success of 7201.7 'checkout -m with merge conflict': 
-	git checkout -f main && git clean -f &&
+expecting success of 7006.96 'setup external command': 
+	cat >git-external <<-\EOF &&
+	#!/bin/sh
+	git "$@"
+	EOF
+	chmod +x git-external
 
-	fill 1 T 3 4 5 6 S 8 >one &&
-	if git checkout renamer
-	then
-		echo Not happy
-		false
-	else
-		echo "happy - failed correctly"
-	fi &&
+ok 96 - setup external command
 
-	git checkout -m renamer &&
+expecting success of 7006.97 'command-specific pager works for external commands': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config pager.external "sed s/^/foo:/ >actual" &&
+	test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
+	test_cmp expect actual
 
-	git diff main:one :3:uno |
-	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
-	fill d2 aT d7 aS >expect &&
-	test_cmp expect current &&
-	git diff --cached two >current &&
-	test_must_be_empty current
+ok 97 - command-specific pager works for external commands
 
-Switched to branch 'main'
-Removing current
-Removing expect
-error: Your local changes to the following files would be overwritten by checkout:
-	one
-Please commit your changes or stash them before you switch branches.
-Aborting
-happy - failed correctly
-Switched to branch 'renamer'
-M	uno
-ok 7 - checkout -m with merge conflict
+expecting success of 7006.98 'sub-commands of externals use their own pager': 
+	sane_unset PAGER GIT_PAGER &&
+	echo "foo:initial" >expect &&
+	>actual &&
+	test_config pager.log "sed s/^/foo:/ >actual" &&
+	test_terminal git --exec-path=. external log --format=%s -1 &&
+	test_cmp expect actual
 
-expecting success of 7201.8 'format of merge conflict from checkout -m': 
-	git checkout -f main &&
-	git clean -f &&
+ok 98 - sub-commands of externals use their own pager
 
-	fill b d >two &&
-	git checkout -m simple &&
+expecting success of 7006.99 'external command pagers override sub-commands': 
+	sane_unset PAGER GIT_PAGER &&
+	>actual &&
+	test_config pager.external false &&
+	test_config pager.log "sed s/^/log:/ >actual" &&
+	test_terminal git --exec-path=. external log --format=%s -1 &&
+	test_must_be_empty actual
 
-	git ls-files >current &&
-	fill same two two two >expect &&
-	test_cmp expect current &&
+initial
+ok 99 - external command pagers override sub-commands
 
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	=======
-	b
-	d
-	>>>>>>> local
+expecting success of 7006.100 'command with underscores does not complain': 
+	write_script git-under_score <<-\EOF &&
+	echo ok
 	EOF
-	test_cmp expect two
-
-Switched to branch 'main'
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 8 - format of merge conflict from checkout -m
-
-expecting success of 7201.9 'checkout --merge --conflict=diff3 <branch>': 
-	git checkout -f main &&
-	git reset --hard &&
-	git clean -f &&
+	git --exec-path=. under_score >actual 2>&1 &&
+	echo ok >expect &&
+	test_cmp expect actual
 
-	fill b d >two &&
-	git checkout --merge --conflict=diff3 simple &&
+ok 100 - command with underscores does not complain
 
-	cat <<-EOF >expect &&
-	<<<<<<< simple
-	a
-	c
-	e
-	||||||| main
-	a
-	b
-	c
-	d
-	e
-	=======
-	b
-	d
-	>>>>>>> local
+expecting success of 7006.101 'git tag with auto-columns ': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
+	test_commit five &&
+	cat >expect <<-\EOF &&
+	initial  one      two      three    four     five
 	EOF
-	test_cmp expect two
+	test_terminal env PAGER="cat >actual" COLUMNS=80 \
+		git -c column.ui=auto tag --sort=authordate &&
+	test_cmp expect actual
 
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Removing current
-Removing expect
-Switched to branch 'simple'
-M	two
-ok 9 - checkout --merge --conflict=diff3 <branch>
+[master bdf0f03] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master c613728] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master dbd092b] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master a0ce8ac] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master 03bd18b] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+ok 101 - git tag with auto-columns 
 
-expecting success of 7201.10 'switch to another branch while carrying a deletion': 
-	git checkout -f main &&
-	git reset --hard &&
-	git clean -f &&
-	git rm two &&
+expecting success of 7006.102 'setup trace2': 
+	GIT_TRACE2_BRIEF=1 &&
+	export GIT_TRACE2_BRIEF
 
-	test_must_fail git checkout simple 2>errs &&
-	test_grep overwritten errs &&
+ok 102 - setup trace2
 
-	test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
-	test_must_be_empty errs
+expecting success of 7006.103 'setup large log output': 
+	perl -e "
+		print \"this is a long commit message\" x 50000
+	" >commit-msg &&
+	git commit --allow-empty -F commit-msg
 
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Removing expect
-rm 'two'
-error: Your local changes to the following files would be overwritten by checkout:
-ok 10 - switch to another branch while carrying a deletion
+[master 06d9144] this is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit message
+ Author: A U Thor <author@example.com>
+ok 103 - setup large log output
 
-expecting success of 7201.11 'checkout to detach HEAD (with advice declined)': 
-	git config set advice.detachedHead false &&
-	rev=$(git rev-parse --short renamer^) &&
-	git checkout -f renamer &&
-	git clean -f &&
-	git checkout renamer^ 2>messages &&
-	test_grep "HEAD is now at $rev" messages &&
-	test_line_count = 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
+expecting success of 7006.104 'git returns SIGPIPE on early pager exit': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; head -n 1; exit 0" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	if test_have_prereq !MINGW
 	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
 	else
-		: happy
-	fi
+		test_terminal git log
+	fi &&
 
-Switched to branch 'renamer'
-Removing errs
-HEAD is now at 7329388 Initial A one, A two
-ok 11 - checkout to detach HEAD (with advice declined)
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:0 " child-exits &&
+	test_path_is_file pager-used
 
-expecting success of 7201.12 'checkout to detach HEAD': 
-	git config set advice.detachedHead true &&
-	rev=$(git rev-parse --short renamer^) &&
-	git checkout -f renamer &&
-	git clean -f &&
-	git checkout renamer^ 2>messages &&
-	grep "HEAD is now at $rev" messages &&
-	test_line_count -gt 1 messages &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
+child_exit[0] pid:3372082 code:0 elapsed:0.037559
+ok 104 - git returns SIGPIPE on early pager exit
 
-Previous HEAD position was 7329388 Initial A one, A two
-Switched to branch 'renamer'
-Removing messages
-HEAD is now at 7329388 Initial A one, A two
-ok 12 - checkout to detach HEAD
+expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; head -n 1; exit 1" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
 
-expecting success of 7201.13 'checkout to detach HEAD with branchname^': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout renamer^ &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
+	if test_have_prereq !MINGW
 	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
 	else
-		: happy
-	fi
+		test_terminal git log
+	fi &&
 
-Switched to branch 'main'
-Removing messages
-Note: switching to 'renamer^'.
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
+child_exit[0] pid:3372239 code:1 elapsed:0.046408
+ok 105 - git returns SIGPIPE on early pager non-zero exit
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager "wc >pager-used; exit 1" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
 
-  git switch -c <new-branch-name>
+	test_terminal git log &&
 
-Or undo this operation with:
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
 
-  git switch -
+child_exit[0] pid:3372412 code:1 elapsed:0.065391
+ok 106 - git discards pager non-zero exit without SIGPIPE
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
+	test_when_finished "rm -f err" &&
+	test_config core.pager "does-not-exist" &&
+	test_must_fail test_terminal git log 2>err &&
+	test_grep "unable to execute pager" err
 
-HEAD is now at 7329388 Initial A one, A two
-ok 13 - checkout to detach HEAD with branchname^
+fatal: unable to execute pager 'does-not-exist'
+ok 107 - git errors when asked to execute nonexisting pager
 
-expecting success of 7201.14 'checkout to detach HEAD with :/message': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout ":/Initial" &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
+expecting success of 7006.108 'git returns SIGPIPE on propagated signals from pager': 
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; exec test-tool sigchain" &&
+	GIT_TRACE2="$(pwd)/trace.normal" &&
+	export GIT_TRACE2 &&
+	test_when_finished "unset GIT_TRACE2" &&
+
+	if test_have_prereq !MINGW
 	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
+		{ test_terminal git log >/dev/null; OUT=$?; } &&
+		test_match_signal 13 "$OUT"
 	else
-		: happy
-	fi
-
-Switched to branch 'main'
-Note: switching to ':/Initial'.
+		test_terminal git log
+	fi &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:143 " child-exits &&
+	test_path_is_file pager-used
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
+child_exit[0] pid:3372681 code:143 elapsed:0.034858
+ok 108 - git returns SIGPIPE on propagated signals from pager
 
-  git switch -c <new-branch-name>
+expecting success of 7006.109 'non-existent pager doesnt cause crash': 
+	test_config pager.show invalid-pager &&
+	test_must_fail test_terminal git show
 
-Or undo this operation with:
+error: cannot run invalid-pager: No such file or directory
+fatal: unable to execute pager 'invalid-pager'
+ok 109 - non-existent pager doesnt cause crash
 
-  git switch -
+# still have 3 known breakage(s)
+# passed all remaining 106 test(s)
+1..109
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7062-wtstatus-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7062-wtstatus-ignorecase/.git/
+expecting success of 7062.1 'status with hash collisions': 
+	# note: "V/", "V/XQANY/" and "WURZAUP/" produce the same hash code
+	# in name-hash.c::hash_name
+	mkdir V &&
+	mkdir V/XQANY &&
+	mkdir WURZAUP &&
+	touch V/XQANY/test &&
+	git config core.ignorecase true &&
+	git add . &&
+	# test is successful if git status completes (no endless loop)
+	git status
 
-Turn off this advice by setting config variable advice.detachedHead to false
+On branch master
 
-HEAD is now at 7329388 Initial A one, A two
-ok 14 - checkout to detach HEAD with :/message
+No commits yet
 
-expecting success of 7201.15 'checkout to detach HEAD with HEAD^0': 
-	git checkout -f main &&
-	git clean -f &&
-	git checkout HEAD^0 &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	if git symbolic-ref HEAD >/dev/null 2>&1
-	then
-		echo "OOPS, HEAD is still symbolic???"
-		false
-	else
-		: happy
-	fi
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+	new file:   V/XQANY/test
 
-Switched to branch 'main'
-Note: switching to 'HEAD^0'.
+ok 1 - status with hash collisions
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7031-verify-tag-signed-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7031-verify-tag-signed-ssh/.git/
+checking prerequisite: GPGSSH
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
+	ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
+	test $? != 127 || exit 1
+	echo $ssh_version | grep -q "find-principals:missing signature file"
+	test $? = 0 || exit 1;
 
-  git switch -c <new-branch-name>
+	# Setup some keys and an allowed signers file
+	mkdir -p "${GNUPGHOME}" &&
+	chmod 0700 "${GNUPGHOME}" &&
+	(setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
+	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
+	ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
+	ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
+	ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
+	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
 
-Or undo this operation with:
+	cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+	"principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
+	"principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
+	"principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
+	"principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
+	EOF
 
-  git switch -
+	# Verify if at least one key and ssh-keygen works as expected
+	echo "testpayload" |
+	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
+	ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
+	echo "testpayload" |
+	ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
 
-Turn off this advice by setting config variable advice.detachedHead to false
+)
+prerequisite GPGSSH not satisfied
+ok 1 # skip create signed tags ssh (missing GPGSSH)
 
-HEAD is now at 7329388 Initial A one, A two
-ok 15 - checkout to detach HEAD with HEAD^0
+checking prerequisite: GPGSSH_VERIFYTIME
 
-expecting success of 7201.16 'checkout with ambiguous tag/branch names': 
-	git tag both side &&
-	git branch both main &&
-	git reset --hard &&
-	git checkout main &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
+	test_have_prereq GPGSSH &&
+	# Check if ssh-keygen has a verify-time option by passing an invalid date to it
+	ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
 
-	git checkout both &&
-	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/main) &&
-	test "z$H" = "z$M" &&
-	name=$(git symbolic-ref HEAD 2>/dev/null) &&
-	test "z$name" = zrefs/heads/both
+	# Set up keys with key lifetimes
+	ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
+	key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
+	key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
+	key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
+	ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
+	key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'main'
-warning: refname 'both' is ambiguous.
-Switched to branch 'both'
-ok 16 - checkout with ambiguous tag/branch names
+	# Timestamps outside of test_tick span
+	ts2005a=20050401000000 ts2005b=200504020000 &&
+	# Timestamps within test_tick span
+	ts2005c=20050407000000 ts2005d=200504100000 &&
+	# Definitely not yet valid / expired timestamps
+	ts2000=20000101000000 ts2999=29990101000000 &&
 
-expecting success of 7201.17 'checkout with ambiguous tag/branch names': 
-	git reset --hard &&
-	git checkout main &&
+	cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+	"timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
+	"timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
+	"principal with expired key" valid-before="$ts2000" $key_expired"
+	"principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
+	EOF
 
-	git tag frotz side &&
-	git branch frotz main &&
-	git reset --hard &&
-	git checkout main &&
+	# and verify ssh-keygen verifies the key lifetime
+	echo "testpayload" |
+	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
+	! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
 
-	git checkout tags/frotz &&
-	H=$(git rev-parse --verify HEAD) &&
-	S=$(git show-ref -s --verify refs/heads/side) &&
-	test "z$H" = "z$S" &&
-	if name=$(git symbolic-ref HEAD 2>/dev/null)
-	then
-		echo "Bad -- should have detached"
-		false
-	else
-		: happy
-	fi
+)
+prerequisite GPGSSH_VERIFYTIME not satisfied
+ok 2 # skip create signed tags with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to branch 'main'
-HEAD is now at 7329388 Initial A one, A two
-Already on 'main'
-Note: switching to 'tags/frotz'.
+ok 3 # skip verify and show ssh signatures (missing GPGSSH)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 4 # skip verify-tag exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 5 # skip verify-tag exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-  git switch -c <new-branch-name>
+ok 6 # skip verify-tag succeeds with tag date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-Or undo this operation with:
+ok 7 # skip verify-tag fails with tag date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-  git switch -
+ok 8 # skip detect fudged ssh signature (missing GPGSSH)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 9 # skip verify ssh signatures with --raw (missing GPGSSH)
 
-HEAD is now at ab76817 Side M one, D two, A three
-ok 17 - checkout with ambiguous tag/branch names
+ok 10 # skip verify signatures with --raw ssh (missing GPGSSH)
 
-expecting success of 7201.18 'switch branches while in subdirectory': 
-	git reset --hard &&
-	git checkout main &&
+ok 11 # skip verify multiple tags ssh (missing GPGSSH)
 
-	mkdir subs &&
-	git -C subs checkout side &&
-	! test -f subs/one &&
-	rm -fr subs
+ok 12 # skip verifying tag with --format - ssh (missing GPGSSH)
 
-HEAD is now at ab76817 Side M one, D two, A three
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to branch 'main'
-Switched to branch 'side'
-ok 18 - switch branches while in subdirectory
+ok 13 # skip verifying a forged tag with --format should fail silently - ssh (missing GPGSSH)
 
-expecting success of 7201.19 'checkout specific path while in subdirectory': 
-	git reset --hard &&
-	git checkout side &&
-	mkdir subs &&
-	>subs/bero &&
-	git add subs/bero &&
-	git commit -m "add subs/bero" &&
+ok 14 # skip rev-list --format=%G (missing GPGSSH)
 
-	git checkout main &&
-	mkdir -p subs &&
-	git -C subs checkout side -- bero &&
-	test -f subs/bero
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7030-verify-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7030-verify-tag/.git/
+checking prerequisite: GPG
 
-HEAD is now at ab76817 Side M one, D two, A three
-Already on 'side'
-[side bb04aa0] add subs/bero
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subs/bero
-Switched to branch 'main'
-ok 19 - checkout specific path while in subdirectory
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
-expecting success of 7201.20 'checkout w/--track sets up tracking': 
-	git config branch.autosetupmerge false &&
-	git checkout main &&
-	git checkout --track -b track1 &&
-	test "$(git config branch.track1.remote)" &&
-	test "$(git config branch.track1.merge)"
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
 
-Already on 'main'
-A	subs/bero
-Switched to a new branch 'track1'
-A	subs/bero
-branch 'track1' set up to track 'main'.
-ok 20 - checkout w/--track sets up tracking
+)
+prerequisite GPG not satisfied
+ok 1 # skip verify-tag does not crash with -h (missing GPG)
 
-expecting success of 7201.21 'checkout w/autosetupmerge=always sets up tracking': 
-	test_when_finished git config branch.autosetupmerge false &&
-	git config branch.autosetupmerge always &&
-	git checkout main &&
-	git checkout -b track2 &&
-	test "$(git config branch.track2.remote)" &&
-	test "$(git config branch.track2.merge)"
+ok 2 # skip create signed tags (missing GPG)
 
-Switched to branch 'main'
-A	subs/bero
-Switched to a new branch 'track2'
-branch 'track2' set up to track 'main'.
-ok 21 - checkout w/autosetupmerge=always sets up tracking
+checking prerequisite: GPGSM
 
-expecting success of 7201.22 'checkout w/--track from non-branch HEAD fails': 
-	git checkout main^0 &&
-	test_must_fail git symbolic-ref HEAD &&
-	test_must_fail git checkout --track -b track &&
-	test_must_fail git rev-parse --verify track &&
-	test_must_fail git symbolic-ref HEAD &&
-	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSM" &&
+	test_have_prereq GPG &&
+	# Available key info:
+	# * see t/lib-gpg/gpgsm-gen-key.in
+	# To generate new certificate:
+	#  * no passphrase
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o /tmp/gpgsm.crt.user \
+	#		--generate-key \
+	#		--batch t/lib-gpg/gpgsm-gen-key.in
+	# To import certificate:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		--import /tmp/gpgsm.crt.user
+	# To export into a .p12 we can later import:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o t/lib-gpg/gpgsm_cert.p12 \
+	#		--export-secret-key-p12 "committer@example.com"
+	echo | gpgsm --homedir "${GNUPGHOME}" \
+		--passphrase-fd 0 --pinentry-mode loopback \
+		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
 
-Note: switching to 'main^0'.
+	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+		>"${GNUPGHOME}/trustlist.txt" &&
+	(gpgconf --reload all || : ) &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+)
+prerequisite GPGSM not satisfied
+ok 3 # skip create signed tags x509  (missing GPGSM)
 
-  git switch -c <new-branch-name>
+ok 4 # skip verify and show signatures (missing GPG)
 
-Or undo this operation with:
+ok 5 # skip verify and show signatures x509 (missing GPGSM)
 
-  git switch -
+ok 6 # skip verify and show signatures x509 with low minTrustLevel (missing GPGSM)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 7 # skip verify and show signatures x509 with matching minTrustLevel (missing GPGSM)
 
-HEAD is now at 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-fatal: cannot set up tracking information; starting point 'HEAD' is not a branch
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 22 - checkout w/--track from non-branch HEAD fails
+ok 8 # skip verify and show signatures x509 with high minTrustLevel (missing GPGSM)
 
-expecting success of 7201.23 'checkout w/--track from tag fails': 
-	git checkout main^0 &&
-	test_must_fail git symbolic-ref HEAD &&
-	test_must_fail git checkout --track -b track frotz &&
-	test_must_fail git rev-parse --verify track &&
-	test_must_fail git symbolic-ref HEAD &&
-	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
+ok 9 # skip detect fudged signature (missing GPG)
 
-HEAD is now at 7329388 Initial A one, A two
-A	subs/bero
-fatal: ref HEAD is not a symbolic ref
-warning: refname 'frotz' is ambiguous.
-warning: refname 'frotz' is ambiguous.
-fatal: ambiguous object name: 'frotz'
-A	subs/bero
-fatal: Needed a single revision
-fatal: ref HEAD is not a symbolic ref
-ok 23 - checkout w/--track from tag fails
+ok 10 # skip verify signatures with --raw (missing GPG)
 
-expecting success of 7201.24 'detach a symbolic link HEAD': 
-	git checkout main &&
-	git config --bool core.prefersymlinkrefs yes &&
-	git checkout side &&
-	git checkout main &&
-	it=$(git symbolic-ref HEAD) &&
-	test "z$it" = zrefs/heads/main &&
-	here=$(git rev-parse --verify refs/heads/main) &&
-	git checkout side^ &&
-	test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
+ok 11 # skip verify signatures with --raw x509 (missing GPGSM)
 
-Switched to branch 'main'
-A	subs/bero
-Switched to branch 'side'
-Switched to branch 'main'
-Note: switching to 'side^'.
+ok 12 # skip verify multiple tags (missing GPG)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 13 # skip verify multiple tags x509 (missing GPGSM)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 14 # skip verifying tag with --format (missing GPG)
 
-  git switch -c <new-branch-name>
+ok 15 # skip verifying tag with --format="%(rest)" must fail (missing GPG)
 
-Or undo this operation with:
+ok 16 # skip verifying a forged tag with --format should fail silently (missing GPG)
 
-  git switch -
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7010-setup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/.git/
+expecting success of 7010.1 'setup': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir -p a/b/c a/e &&
+	D=$(pwd) &&
+	>a/b/c/d &&
+	>a/e/f
 
-HEAD is now at ab76817 Side M one, D two, A three
-ok 24 - detach a symbolic link HEAD
 
-expecting success of 7201.25 'checkout with --track fakes a sensible -b <name>': 
-	git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
-	git update-ref refs/remotes/origin/koala/bear renamer &&
+ok 1 - setup
 
-	git checkout --track origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
+expecting success of 7010.2 'git add (absolute)': 
 
-	git checkout main && git branch -D koala/bear &&
+	git add "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
 
-	git checkout --track refs/remotes/origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-	git checkout main && git branch -D koala/bear &&
+ok 2 - git add (absolute)
 
-	git checkout --track remotes/origin/koala/bear &&
-	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
+expecting success of 7010.3 'git add (funny relative)': 
 
-Previous HEAD position was ab76817 Side M one, D two, A three
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-Switched to branch 'main'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-Switched to branch 'main'
-Deleted branch koala/bear (was 0420b41).
-Switched to a new branch 'koala/bear'
-branch 'koala/bear' set up to track 'origin/koala/bear'.
-ok 25 - checkout with --track fakes a sensible -b <name>
+	rm -f .git/index &&
+	(
+		cd a/b &&
+		git add "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-expecting success of 7201.26 'checkout with --track, but without -b, fails with too short tracked name': 
-	test_must_fail git checkout --track renamer
 
-fatal: missing branch name; try -b
-ok 26 - checkout with --track, but without -b, fails with too short tracked name
+ok 3 - git add (funny relative)
 
-expecting success of 7201.27 'checkout an unmerged path should fail': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	test_must_fail git checkout fild file filf &&
-	test_cmp sample fild &&
-	test_cmp sample filf &&
-	test_cmp sample file
+expecting success of 7010.4 'git rm (absolute)': 
 
-error: path 'file' is unmerged
-ok 27 - checkout an unmerged path should fail
+	rm -f .git/index &&
+	git add a &&
+	git rm -f --cached "$D/a/b/c/d" &&
+	git ls-files >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-expecting success of 7201.28 'checkout with an unmerged path can be ignored': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -f fild file filf &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp sample file
 
-warning: path 'file' is unmerged
-Updated 2 paths from the index
-ok 28 - checkout with an unmerged path can be ignored
+rm 'a/b/c/d'
+ok 4 - git rm (absolute)
 
-expecting success of 7201.29 'checkout unmerged stage': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --ours . &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp expect file &&
-	git checkout --theirs file &&
-	test ztheirside = "z$(cat file)"
+expecting success of 7010.5 'git rm (funny relative)': 
 
-Updated 3 paths from the index
-Updated 1 path from the index
-ok 29 - checkout unmerged stage
+	rm -f .git/index &&
+	git add a &&
+	(
+		cd a/b &&
+		git rm -f --cached "../e/./f"
+	) &&
+	git ls-files >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
 
-expecting success of 7201.30 'checkout --ours is incompatible with switching': 
-	test_must_fail git checkout --ours 2>error &&
-	test_grep "needs the paths to check out" error &&
 
-	test_must_fail git checkout --ours HEAD 2>error &&
-	test_grep "cannot be used with switching" error &&
+rm 'a/e/f'
+ok 5 - git rm (funny relative)
 
-	test_must_fail git checkout --ours main 2>error &&
-	test_grep "cannot be used with switching" error &&
+expecting success of 7010.6 'git ls-files (absolute)': 
 
-	git checkout --ours file
+	rm -f .git/index &&
+	git add a &&
+	git ls-files "$D/a/e/../b" >current &&
+	echo a/b/c/d >expect &&
+	test_cmp expect current
 
-fatal: '--ours/--theirs' needs the paths to check out
-fatal: '--ours/--theirs' cannot be used with switching branches
-fatal: '--ours/--theirs' cannot be used with switching branches
-Updated 1 path from the index
-ok 30 - checkout --ours is incompatible with switching
 
-expecting success of 7201.31 'checkout path with --merge from tree-ish is a no-no': 
-	setup_conflicting_index &&
-	test_must_fail git checkout -m HEAD -- file
+ok 6 - git ls-files (absolute)
 
-fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
-ok 31 - checkout path with --merge from tree-ish is a no-no
+expecting success of 7010.7 'git ls-files (relative #1)': 
 
-expecting success of 7201.32 'checkout with --merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
+	rm -f .git/index &&
+	git add a &&
 	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 32 - checkout with --merge
-
-expecting success of 7201.33 'checkout -m works after (mistaken) resolution': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	# resolve to something
-	git add file &&
-	git checkout --merge -- fild file filf &&
-	{
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	} >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+		cd a/b &&
+		git ls-files "../b/c"
+	)  >current &&
+	echo c/d >expect &&
+	test_cmp expect current
 
-ok 33 - checkout -m works after (mistaken) resolution
 
-expecting success of 7201.34 'checkout -m works after (mistaken) resolution to remove': 
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	# resolve to remove
-	git rm file &&
-	git checkout --merge -- fild file filf &&
-	{
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	} >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+ok 7 - git ls-files (relative #1)
 
-rm 'file'
-ok 34 - checkout -m works after (mistaken) resolution to remove
+expecting success of 7010.8 'git ls-files (relative #2)': 
 
-expecting success of 7201.35 'checkout with --merge, in diff3 -m style': 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout -m -- fild file filf &&
+	rm -f .git/index &&
+	git add a &&
 	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+		cd a/b &&
+		git ls-files --full-name "../e/f"
+	)  >current &&
+	echo a/e/f >expect &&
+	test_cmp expect current
 
-ok 35 - checkout with --merge, in diff3 -m style
 
-expecting success of 7201.36 'checkout --conflict=merge, overriding config': 
-	git config merge.conflictstyle diff3 &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=merge -- fild file filf &&
-	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
+ok 8 - git ls-files (relative #2)
 
-ok 36 - checkout --conflict=merge, overriding config
+expecting success of 7010.9 'git ls-files (relative #3)': 
 
-expecting success of 7201.37 'checkout --conflict=diff3': 
-	test_unconfig merge.conflictstyle &&
-	setup_conflicting_index &&
-	echo "none of the above" >sample &&
-	echo ourside >expect &&
-	cat sample >fild &&
-	cat sample >file &&
-	cat sample >filf &&
-	git checkout --conflict=diff3 -- fild file filf &&
+	rm -f .git/index &&
+	git add a &&
 	(
-		echo "<<<<<<< ours" &&
-		echo ourside &&
-		echo "||||||| base" &&
-		echo original &&
-		echo "=======" &&
-		echo theirside &&
-		echo ">>>>>>> theirs"
-	) >merged &&
-	test_cmp expect fild &&
-	test_cmp expect filf &&
-	test_cmp merged file
-
-ok 37 - checkout --conflict=diff3
-
-expecting success of 7201.38 'checkout --conflict=diff3 --no-conflict does not merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >expect &&
-	cat expect >fild &&
-	cat expect >file &&
-	test_must_fail git checkout --conflict=diff3 --no-conflict -- fild file 2>err &&
-	test_cmp expect file &&
-	test_cmp expect fild &&
-	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
-	test_cmp expect err
-
-ok 38 - checkout --conflict=diff3 --no-conflict does not merge
-
-expecting success of 7201.39 'checkout --conflict=diff3 --no-merge does not merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >expect &&
-	cat expect >fild &&
-	cat expect >file &&
-	test_must_fail git checkout --conflict=diff3 --no-merge -- fild file 2>err &&
-	test_cmp expect file &&
-	test_cmp expect fild &&
-	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
-	test_cmp expect err
-
-ok 39 - checkout --conflict=diff3 --no-merge does not merge
+		cd a/b &&
+		git ls-files "../e/f"
+	)  >current &&
+	echo ../e/f >expect &&
+	test_cmp expect current
 
-expecting success of 7201.40 'checkout --no-merge --conflict=diff3 does merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >fild &&
-	echo "none of the above" >file &&
-	git checkout --no-merge --conflict=diff3 -- fild file &&
-	echo "ourside" >expect &&
-	test_cmp expect fild &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	||||||| base
-	original
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
 
-ok 40 - checkout --no-merge --conflict=diff3 does merge
+ok 9 - git ls-files (relative #3)
 
-expecting success of 7201.41 'checkout --merge --conflict=diff3 --no-conflict does merge': 
-	setup_conflicting_index &&
-	echo "none of the above" >fild &&
-	echo "none of the above" >file &&
-	git checkout --merge --conflict=diff3 --no-conflict -- fild file &&
-	echo "ourside" >expect &&
-	test_cmp expect fild &&
-	cat >expect <<-\EOF &&
-	<<<<<<< ours
-	ourside
-	=======
-	theirside
-	>>>>>>> theirs
-	EOF
-	test_cmp expect file
+expecting success of 7010.10 'commit using absolute path names': 
+	git commit -m "foo" &&
+	echo aa >>a/b/c/d &&
+	git commit -m "aa" "$(pwd)/a/b/c/d"
 
-ok 41 - checkout --merge --conflict=diff3 --no-conflict does merge
+[master (root-commit) 2d7d991] foo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ create mode 100644 a/e/f
+[master 2049ba0] aa
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - commit using absolute path names
 
-expecting success of 7201.42 'checkout with invalid conflict style': 
-	test_must_fail git checkout --conflict=bad 2>actual -- file &&
-	echo "error: unknown conflict style ${SQ}bad${SQ}" >expect &&
-	test_cmp expect actual
+expecting success of 7010.11 'log using absolute path names': 
+	echo bb >>a/b/c/d &&
+	git commit -m "bb" "$(pwd)/a/b/c/d" &&
 
-ok 42 - checkout with invalid conflict style
+	git log a/b/c/d >f1.txt &&
+	git log "$(pwd)/a/b/c/d" >f2.txt &&
+	test_cmp f1.txt f2.txt
 
-expecting success of 7201.43 'failing checkout -b should not break working tree': 
-	git clean -fd &&  # Remove untracked files in the way
-	git reset --hard main &&
-	git symbolic-ref HEAD refs/heads/main &&
-	test_must_fail git checkout -b renamer side^ &&
-	test $(git symbolic-ref HEAD) = refs/heads/main &&
-	git diff --exit-code &&
-	git diff --cached --exit-code
+[master 8d92247] bb
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 11 - log using absolute path names
 
-Removing actual
-Removing err
-Removing error
-Removing expect
-Removing merged
-Removing same
-Removing sample
-Removing two
-Removing uno
-HEAD is now at 7329388 Initial A one, A two
-fatal: a branch named 'renamer' already exists
-ok 43 - failing checkout -b should not break working tree
+expecting success of 7010.12 'blame using absolute path names': 
+	git blame a/b/c/d >f1.txt &&
+	git blame "$(pwd)/a/b/c/d" >f2.txt &&
+	test_cmp f1.txt f2.txt
 
-expecting success of 7201.44 'switch out of non-branch': 
-	git reset --hard main &&
-	git checkout main^0 &&
-	echo modified >one &&
-	test_must_fail git checkout renamer 2>error.log &&
-	! grep "^Previous HEAD" error.log
+ok 12 - blame using absolute path names
 
-HEAD is now at 7329388 Initial A one, A two
-Note: switching to 'main^0'.
+expecting success of 7010.13 'setup deeper work tree': 
+	test_create_repo tester
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester/.git/
+ok 13 - setup deeper work tree
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7010.14 'add a directory outside the work tree': (
+	cd tester &&
+	d1="$(cd .. && pwd)" &&
+	test_must_fail git add "$d1"
+)
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
+ok 14 - add a directory outside the work tree
 
-  git switch -c <new-branch-name>
+expecting success of 7010.15 'add a file outside the work tree, nasty case 1': (
+	cd tester &&
+	f="$(pwd)x" &&
+	echo "$f" &&
+	touch "$f" &&
+	test_must_fail git add "$f"
+)
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testerx' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
+ok 15 - add a file outside the work tree, nasty case 1
 
-Or undo this operation with:
+expecting success of 7010.16 'add a file outside the work tree, nasty case 2': (
+	cd tester &&
+	f="$(pwd | sed "s/.$//")x" &&
+	echo "$f" &&
+	touch "$f" &&
+	test_must_fail git add "$f"
+)
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/testex' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7010-setup/tester'
+ok 16 - add a file outside the work tree, nasty case 2
 
-  git switch -
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7011-skip-worktree-reading/.git/
+expecting success of 7011.1 'setup': 
+	test_commit init &&
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t >result &&
+	test_cmp expect.skip result
 
-Turn off this advice by setting config variable advice.detachedHead to false
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
 
-HEAD is now at 7329388 Initial A one, A two
-ok 44 - switch out of non-branch
+expecting success of 7011.2 'update-index': 
+	setup_absent &&
+	git update-index 1 &&
+	test_absent
 
-expecting success of 7201.45 'custom merge driver with checkout -m': 
-	git reset --hard &&
+ok 2 - update-index
 
-	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
-	git config merge.filfre.name "Feel-free merge driver" &&
-	git config merge.filfre.recursive binary &&
-	echo "arm merge=filfre" >.gitattributes &&
+expecting success of 7011.3 'update-index': 
+	setup_dirty &&
+	git update-index 1 &&
+	test_dirty
 
-	git checkout -b left &&
-	echo neutral >arm &&
-	git add arm .gitattributes &&
-	test_tick &&
-	git commit -m neutral &&
-	git branch right &&
+ok 3 - update-index
 
-	echo left >arm &&
-	test_tick &&
-	git commit -a -m left &&
-	git checkout right &&
+expecting success of 7011.4 'update-index --remove': 
+	setup_absent &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	test ! -f 1
 
-	echo right >arm &&
-	test_tick &&
-	git commit -a -m right &&
+ok 4 - update-index --remove
 
-	test_must_fail git merge left &&
-	(
-		for t in filfre-common left right
-		do
-			grep $t arm || exit 1
-		done
-	) &&
+expecting success of 7011.5 'update-index --remove': 
+	setup_dirty &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	echo dirty >expected &&
+	test_cmp expected 1
 
-	mv arm expect &&
-	git checkout -m arm &&
-	test_cmp expect arm
+ok 5 - update-index --remove
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to a new branch 'left'
-[left b257dc6] neutral
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 arm
-[left 2459c9d] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'right'
-[right 6b476b9] right
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging arm
-CONFLICT (content): Merge conflict in arm
-Automatic merge failed; fix conflicts and then commit the result.
-||||||| filfre-common
-left
-right
-Recreated 1 merge conflict
-ok 45 - custom merge driver with checkout -m
+expecting success of 7011.6 'ls-files --deleted': 
+	setup_absent &&
+	test -z "$(git ls-files -d)"
 
-expecting success of 7201.46 'tracking info copied with autoSetupMerge=inherit': 
-	git reset --hard main &&
-	# default config does not copy tracking info
-	git checkout -b foo-no-inherit koala/bear &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
-	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
-	# with autoSetupMerge=inherit, we copy tracking info from koala/bear
-	test_config branch.autoSetupMerge inherit &&
-	git checkout -b foo koala/bear &&
-	test_cmp_config origin branch.foo.remote &&
-	test_cmp_config refs/heads/koala/bear branch.foo.merge &&
-	# no tracking info to inherit from main
-	git checkout -b main2 main &&
-	test_cmp_config "" --default "" branch.main2.remote &&
-	test_cmp_config "" --default "" branch.main2.merge
+ok 6 - ls-files --deleted
 
-HEAD is now at 7329388 Initial A one, A two
-Switched to a new branch 'foo-no-inherit'
-Switched to a new branch 'foo'
-branch 'foo' set up to track 'origin/koala/bear'.
-warning: asked to inherit tracking from 'main', but no remote is set
-Switched to a new branch 'main2'
-ok 46 - tracking info copied with autoSetupMerge=inherit
+expecting success of 7011.7 'ls-files --deleted': 
+	setup_dirty &&
+	test -z "$(git ls-files -d)"
 
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6423-merge-rename-directories.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/.git/
-expecting success of 6423.1 '1a: Simple directory rename detection': 
-	test_setup_1a &&
-	(
-		cd 1a &&
+ok 7 - ls-files --deleted
 
-		git checkout A^0 &&
+expecting success of 7011.8 'ls-files --modified': 
+	setup_absent &&
+	test -z "$(git ls-files -m)"
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+ok 8 - ls-files --modified
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+expecting success of 7011.9 'ls-files --modified': 
+	setup_dirty &&
+	test -z "$(git ls-files -m)"
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e/f &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d    B:z/e/f &&
-		test_cmp expect actual &&
+ok 9 - ls-files --modified
 
-		git hash-object y/d >actual &&
-		git rev-parse B:z/d >expect &&
-		test_cmp expect actual &&
+expecting success of 7011.10 'diff-index does not examine skip-worktree absent entries': 
+	setup_absent &&
+	git diff-index HEAD -- 1 >result &&
+	test_cmp expected result
 
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_must_fail git rev-parse HEAD:z/e/f &&
-		test_path_is_missing z/d &&
-		test_path_is_missing z/e/f
-	)
+ok 10 - diff-index does not examine skip-worktree absent entries
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-Note: switching to 'A^0'.
+expecting success of 7011.11 'diff-index does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	git diff-index HEAD -- 1 >result &&
+	test_cmp expected result
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 11 - diff-index does not examine skip-worktree dirty entries
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
 
-  git switch -c <new-branch-name>
+ok 12 - diff-files does not examine skip-worktree absent entries
 
-Or undo this operation with:
+expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	test -z "$(git diff-files -- one)"
 
-  git switch -
+ok 13 - diff-files does not examine skip-worktree dirty entries
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7011.14 'commit on skip-worktree absent entries': 
+	git reset &&
+	setup_absent &&
+	test_must_fail git commit -m null 1
 
-HEAD is now at 4e9f86d A
-fatal: path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-fatal: path 'z/e/f' does not exist in 'HEAD'
-HEAD:z/e/f
-ok 1 - 1a: Simple directory rename detection
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
 
-expecting success of 6423.2 '1b: Merge a directory with another': 
-	test_setup_1b &&
-	(
-		cd 1b &&
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - commit on skip-worktree absent entries
 
-		git checkout A^0 &&
+expecting success of 7011.15 'commit on skip-worktree dirty entries': 
+	git reset &&
+	setup_dirty &&
+	test_must_fail git commit -m null 1
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	1
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+nothing added to commit but untracked files present (use "git add" to track)
+ok 15 - commit on skip-worktree dirty entries
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:y/d    A:z/e &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:z/e
-	)
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7012-skip-worktree-writing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7012-skip-worktree-writing/.git/
+expecting success of 7012.1 'setup': 
+	test_commit init &&
+	echo modified >> init.t &&
+	touch added &&
+	git add init.t added &&
+	git commit -m "modified and added" &&
+	git tag top
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1b/.git/
-[master (root-commit) 828128d] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 62cf902] A
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 z/e
-Switched to branch 'B'
-[B 2a8bd7d] B
+ create mode 100644 init.t
+[master fa1ce8e] modified and added
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+ 2 files changed, 1 insertion(+)
+ create mode 100644 added
+ok 1 - setup
+
+expecting success of 7012.2 'read-tree updates worktree, absent case': 
+	git checkout -f top &&
+	git update-index --skip-worktree init.t &&
+	rm init.t &&
+	git read-tree -m -u HEAD^ &&
+	echo init > expected &&
+	test_cmp expected init.t
+
+Note: switching to 'top'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -458943,856 +457407,743 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 62cf902 A
-Path updated: z/e added in HEAD inside a directory that was renamed in B^0; moving it to y/e.
-Merge made by the 'ort' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- {z => y}/e | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/e (100%)
-fatal: path 'z/e' does not exist in 'HEAD'
-HEAD:z/e
-ok 2 - 1b: Merge a directory with another
-
-expecting success of 6423.3 '1c: Transitive renaming': 
-	test_setup_1c &&
-	(
-		cd 1c &&
-
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+HEAD is now at fa1ce8e modified and added
+ok 2 - read-tree updates worktree, absent case
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+expecting success of 7012.3 'read-tree updates worktree, dirty case': 
+	git checkout -f top &&
+	git update-index --skip-worktree init.t &&
+	echo dirty >> init.t &&
+	test_must_fail git read-tree -m -u HEAD^ &&
+	grep -q dirty init.t &&
+	test "$(git ls-files -t init.t)" = "S init.t" &&
+	git update-index --no-skip-worktree init.t
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:x/d &&
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_path_is_missing z/d
-	)
+HEAD is now at fa1ce8e modified and added
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 3 - read-tree updates worktree, dirty case
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1c/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 623f815] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+expecting success of 7012.4 'read-tree removes worktree, absent case': 
+	git checkout -f top &&
+	git update-index --skip-worktree added &&
+	rm added &&
+	git read-tree -m -u HEAD^ &&
+	test ! -f added
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+HEAD is now at fa1ce8e modified and added
+ok 4 - read-tree removes worktree, absent case
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7012.5 'read-tree removes worktree, dirty case': 
+	git checkout -f top &&
+	git update-index --skip-worktree added &&
+	echo dirty >> added &&
+	test_must_fail git read-tree -m -u HEAD^ &&
+	grep -q dirty added &&
+	test "$(git ls-files -t added)" = "S added" &&
+	git update-index --no-skip-worktree added
 
-  git switch -c <new-branch-name>
+HEAD is now at fa1ce8e modified and added
+error: Entry 'added' not uptodate. Cannot merge.
+ok 5 - read-tree removes worktree, dirty case
 
-Or undo this operation with:
+expecting success of 7012.6 'index setup': 
+	git checkout -f init &&
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t > result &&
+	test_cmp expected result
 
-  git switch -
+Previous HEAD position was fa1ce8e modified and added
+HEAD is now at 2519212 init
+ok 6 - index setup
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7012.7 'git-rm fails if worktree is dirty': 
+	setup_dirty &&
+	test_must_fail git rm 1 &&
+	test_dirty
 
-HEAD is now at 623f815 A
-fatal: path 'x/d' does not exist in 'HEAD'
-HEAD:x/d
-fatal: path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 3 - 1c: Transitive renaming
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+1
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config set advice.updateSparsePath false"
+ok 7 - git-rm fails if worktree is dirty
 
-expecting success of 6423.4 '1d: Directory renames cause a rename/rename(2to1) conflict': 
-	test_setup_1d &&
-	(
-		cd 1d &&
+expecting success of 7012.8 'git-clean, absent case': 
+	setup_absent &&
+	git clean -n > result &&
+	test_cmp expected result
 
-		git checkout A^0 &&
+ok 8 - git-clean, absent case
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (\(.*\)/\1)" out &&
+expecting success of 7012.9 'git-clean, dirty case': 
+	setup_dirty &&
+	git clean -n > result &&
+	test_cmp expected result
 
-		git ls-files -s >out &&
-		test_line_count = 8 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 9 - git-clean, dirty case
 
-		git rev-parse >actual \
-			:0:x/b :0:x/c :0:x/d :0:x/e :0:x/m :0:x/n &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:y/d  O:y/e  A:y/m  B:z/n &&
-		test_cmp expect actual &&
+expecting success of 7012.10 '--ignore-skip-worktree-entries leaves worktree alone': 
+	test_commit keep-me &&
+	git update-index --skip-worktree keep-me.t &&
+	rm keep-me.t &&
 
-		test_must_fail git rev-parse :0:x/wham &&
-		git rev-parse >actual \
-			:2:x/wham :3:x/wham &&
-		git rev-parse >expect \
-			 A:y/wham  B:z/wham &&
-		test_cmp expect actual &&
+	: ignoring the worktree &&
+	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+	git diff-index --cached --exit-code HEAD &&
 
-		# Test that the two-way merge in x/wham is as expected
-		git cat-file -p :2:x/wham >expect &&
-		git cat-file -p :3:x/wham >other &&
-		>empty &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_must_fail git merge-file \
-				-L "HEAD:y/wham" \
-				-L "" \
-				-L "B^0:z/wham" \
-				expect empty other
-		else
-			test_must_fail git merge-file \
-				-L "HEAD" \
-				-L "" \
-				-L "B^0" \
-				expect empty other
-		fi &&
-		test_cmp expect x/wham
-	)
+	: not ignoring the worktree, a deletion is staged &&
+	git update-index --remove keep-me.t &&
+	test_must_fail git diff-index --cached --exit-code HEAD \
+		--diff-filter=D -- keep-me.t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1d/.git/
-[master (root-commit) a5c945e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 y/d
- create mode 100644 y/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A e0494ce] A
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {z => x}/b (100%)
- rename {z => x}/c (100%)
- create mode 100644 y/m
- create mode 100644 y/wham
-Switched to branch 'B'
-[B 7f8e93c] B
+[detached HEAD 2b2ea08] keep-me
  Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {y => x}/d (100%)
- rename {y => x}/e (100%)
- create mode 100644 z/n
- create mode 100644 z/wham
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ 5 files changed, 1 insertion(+)
+ create mode 100644 1
+ create mode 100644 2
+ create mode 100644 keep-me.t
+ create mode 100644 sub/1
+ create mode 100644 sub/2
+:100644 000000 f00f5e00581fe7be1be150ec748178e224a827d4 0000000000000000000000000000000000000000 D	keep-me.t
+ok 10 - --ignore-skip-worktree-entries leaves worktree alone
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7012.11 'stash restore in sparse checkout': 
+	test_create_repo stash-restore &&
+	(
+		cd stash-restore &&
 
-  git switch -c <new-branch-name>
+		mkdir subdir &&
+		echo A >subdir/A &&
+		echo untouched >untouched &&
+		echo removeme >removeme &&
+		echo modified >modified &&
+		git add . &&
+		git commit -m Initial &&
 
-Or undo this operation with:
+		echo AA >>subdir/A &&
+		echo addme >addme &&
+		echo tweaked >>modified &&
+		rm removeme &&
+		git add addme &&
 
-  git switch -
+		git stash push &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		git sparse-checkout set --no-cone subdir &&
 
-HEAD is now at e0494ce A
-CONFLICT (add/add): Merge conflict in x/wham
-fatal: path 'x/wham' is in the index, but not at stage 0
-hint: Did you mean ':2:x/wham'?
-:0:x/wham
-ok 4 - 1d: Directory renames cause a rename/rename(2to1) conflict
+		# Ensure after sparse-checkout we only have expected files
+		cat >expect <<-EOF &&
+		S modified
+		S removeme
+		H subdir/A
+		S untouched
+		EOF
+		git ls-files -t >actual &&
+		test_cmp expect actual &&
 
-expecting success of 6423.5 '1e: Renamed directory, with all files being renamed too': 
-	test_setup_1e &&
-	(
-		cd 1e &&
+		test_path_is_missing addme &&
+		test_path_is_missing modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched &&
 
-		git checkout A^0 &&
+		# Put a file in the working directory in the way
+		echo in the way >modified &&
+		test_must_fail git stash apply 2>error&&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+		grep "changes.*would be overwritten by merge" error &&
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+		echo in the way >expect &&
+		test_cmp expect modified &&
+		git diff --quiet HEAD ":!modified" &&
 
-		git rev-parse >actual \
-			HEAD:y/newb HEAD:y/newc HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/oldb    O:z/oldc    B:z/d &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:z/d
+		# ...and that working directory reflects the files correctly
+		test_path_is_missing addme &&
+		test_path_is_file    modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1e/.git/
-[master (root-commit) a0c453d] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/oldb
- create mode 100644 z/oldc
-Switched to branch 'A'
-[A e7f73d0] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename z/oldb => y/newb (100%)
- rename z/oldc => y/newc (100%)
-Switched to branch 'B'
-[B b36bf99] B
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
+[master (root-commit) 5e4d62b] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/d
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 modified
+ create mode 100644 removeme
+ create mode 100644 subdir/A
+ create mode 100644 untouched
+Saved working directory and index state WIP on master: 5e4d62b Initial
+Merging Version stash was based on with Stashed changes
+On branch master
+You are in a sparse checkout with 50% of tracked files present.
 
-Or undo this operation with:
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   modified
 
-  git switch -
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	error
+	expect
 
-Turn off this advice by setting config variable advice.detachedHead to false
+no changes added to commit (use "git add" and/or "git commit -a")
+error: Your local changes to the following files would be overwritten by merge:
+ok 11 - stash restore in sparse checkout
 
-HEAD is now at e7f73d0 A
-Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
-Merge made by the 'ort' strategy.
- y/d | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 y/d
-fatal: path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 5 - 1e: Renamed directory, with all files being renamed too
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7007-show.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7007-show/.git/
+expecting success of 7007.1 'setup': 
+	echo hello world >foo &&
+	H=$(git hash-object -w foo) &&
+	git tag -a foo-tag -m "Tags $H" $H &&
+	HH=$(expr "$H" : "\(..\)") &&
+	H38=$(expr "$H" : "..\(.*\)") &&
+	rm -f .git/objects/$HH/$H38
 
-expecting success of 6423.6 '1f: Split a directory into two other directories': 
-	test_setup_1f &&
-	(
-		cd 1f &&
+ok 1 - setup
 
-		git checkout A^0 &&
+expecting success of 7007.2 'showing a tag that point at a missing object': 
+	test_must_fail git --no-pager show foo-tag
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+error: could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
+tag foo-tag
+Tagger: C O Mitter <committer@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
+ok 2 - showing a tag that point at a missing object
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d HEAD:x/e HEAD:x/f HEAD:x/g &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d    O:z/e    O:z/f    A:z/g &&
-		test_cmp expect actual &&
-		test_path_is_missing z/g &&
-		test_must_fail git rev-parse HEAD:z/g
-	)
+expecting success of 7007.3 'set up a bit of history': 
+	test_commit main1 &&
+	test_commit main2 &&
+	test_commit main3 &&
+	git tag -m "annotated tag" annotated &&
+	git checkout -b side HEAD^^ &&
+	test_commit side2 &&
+	test_commit side3 &&
+	test_merge merge main3
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/1f/.git/
-[master (root-commit) bc89ae6] O
+[master (root-commit) 9ca29bf] main1
  Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
- create mode 100644 z/e
- create mode 100644 z/f
-Switched to branch 'A'
-[A d83c371] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main1.t
+[master 6983cd6] main2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 z/g
-Switched to branch 'B'
-[B 2106ef0] B
+ create mode 100644 main2.t
+[master 75daec8] main3
  Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => x}/e (100%)
- rename {z => x}/f (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main3.t
+Switched to a new branch 'side'
+[side 2e812aa] side2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side2.t
+[side 42b83a8] side3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side3.t
+Merge made by the 'ort' strategy.
+ main2.t | 1 +
+ main3.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 main2.t
+ create mode 100644 main3.t
+ok 3 - set up a bit of history
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7007.4 'showing two commits': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main2)
+	commit $(git rev-parse main3)
+	EOF
+	git show main2 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 4 - showing two commits
 
-  git switch -c <new-branch-name>
+expecting success of 7007.5 'showing a tree': 
+	cat >expected <<-EOF &&
+	tree main1:
 
-Or undo this operation with:
+	main1.t
+	EOF
+	git show main1: >actual &&
+	test_cmp expected actual
 
-  git switch -
+ok 5 - showing a tree
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7007.6 'showing two trees': 
+	cat >expected <<-EOF &&
+	tree main1^{tree}
 
-HEAD is now at d83c371 A
-Path updated: z/g added in HEAD inside a directory that was renamed in B^0; moving it to x/g.
-Merge made by the 'ort' strategy.
- {z => x}/d | 0
- {z => x}/e | 0
- {z => x}/f | 0
- {z => x}/g | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 6 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => x}/e (100%)
- rename {z => x}/f (100%)
- rename {z => x}/g (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-fatal: path 'z/g' does not exist in 'HEAD'
-HEAD:z/g
-ok 6 - 1f: Split a directory into two other directories
+	main1.t
 
-expecting success of 6423.7 '2a: Directory split into two on one side, with equal numbers of paths': 
-	test_setup_2a &&
-	(
-		cd 2a &&
+	tree main2^{tree}
 
-		git checkout A^0 &&
+	main1.t
+	main2.t
+	EOF
+	git show main1^{tree} main2^{tree} >actual &&
+	test_cmp expected actual
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT.*directory rename split" out &&
+ok 6 - showing two trees
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 7007.7 'showing a trees is not recursive': 
+	git worktree add not-recursive main1 &&
+	mkdir not-recursive/a &&
+	test_commit -C not-recursive a/file &&
+	cat >expected <<-EOF &&
+	tree HEAD^{tree}
 
-		git rev-parse >actual \
-			:0:y/b :0:w/c :0:z/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/d &&
-		test_cmp expect actual
-	)
+	a/
+	main1.t
+	EOF
+	git -C not-recursive show HEAD^{tree} >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/2a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 6af9a4d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/c (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B db43152] B
+Preparing worktree (detached HEAD 9ca29bf)
+HEAD is now at 9ca29bf main1
+[detached HEAD 2da4daa] a/file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 z/d
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ create mode 100644 a/file.t
+ok 7 - showing a trees is not recursive
 
-  git switch -c <new-branch-name>
+expecting success of 7007.8 'showing a range walks (linear)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show main1..main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-Or undo this operation with:
+ok 8 - showing a range walks (linear)
 
-  git switch -
+expecting success of 7007.9 'showing a range walks (Y shape, ^ first)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show ^side3 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 9 - showing a range walks (Y shape, ^ first)
 
-HEAD is now at 6af9a4d A
-CONFLICT (directory rename split): Unclear where to rename z to; it was renamed to multiple other directories, with no destination getting a majority of the files.
-ok 7 - 2a: Directory split into two on one side, with equal numbers of paths
+expecting success of 7007.10 'showing a range walks (Y shape, ^ last)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show main3 ^side3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-expecting success of 6423.8 '2b: Directory split into two on one side, with equal numbers of paths': 
-	test_setup_2b &&
-	(
-		cd 2b &&
+ok 10 - showing a range walks (Y shape, ^ last)
 
-		git checkout A^0 &&
+expecting success of 7007.11 'showing with -N walks': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show -2 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
+ok 11 - showing with -N walks
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 7007.12 'showing annotated tag': 
+	cat >expect <<-EOF &&
+	tag annotated
+	commit $(git rev-parse annotated^{commit})
+	EOF
+	git show annotated >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-		git rev-parse >actual \
-			:0:y/b :0:w/c :0:x/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:x/d &&
-		test_cmp expect actual &&
-		test_grep ! "CONFLICT.*directory rename split" out
-	)
+ok 12 - showing annotated tag
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/2b/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 6af9a4d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/c (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B c2fe7fb] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x/d
-Note: switching to 'A^0'.
+expecting success of 7007.13 'showing annotated tag plus commit': 
+	cat >expect <<-EOF &&
+	tag annotated
+	commit $(git rev-parse annotated^{commit})
+	commit $(git rev-parse side3)
+	EOF
+	git show annotated side3 >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 13 - showing annotated tag plus commit
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7007.14 'showing range': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show ^side3 annotated >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
 
-  git switch -c <new-branch-name>
+ok 14 - showing range
 
-Or undo this operation with:
+expecting success of 7007.15 '-s suppresses diff': 
+	cat >expect <<-\EOF &&
+	merge
+	main3
+	EOF
+	git show -s --format=%s merge main3 >actual &&
+	test_cmp expect actual
 
-  git switch -
+ok 15 - -s suppresses diff
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7007.16 '--quiet suppresses diff': 
+	echo main3 >expect &&
+	git show --quiet --format=%s main3 >actual &&
+	test_cmp expect actual
 
-HEAD is now at 6af9a4d A
-ok 8 - 2b: Directory split into two on one side, with equal numbers of paths
+ok 16 - --quiet suppresses diff
 
-expecting success of 6423.9 '3a: Avoid implicit rename if involved as source on other side': 
-	test_setup_3a &&
-	(
-		cd 3a &&
+expecting success of 7007.17 'show --graph is forbidden': 
+  test_must_fail git show --graph HEAD
 
-		git checkout A^0 &&
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 17 - show --graph is forbidden
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7061-wtstatus-ignore.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7061-wtstatus-ignore/.git/
+expecting success of 7061.1 'status untracked directory with --ignored': 
+	echo "ignored" >.gitignore &&
+	mkdir untracked &&
+	: >untracked/ignored &&
+	: >untracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+ok 1 - status untracked directory with --ignored
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d &&
-		test_cmp expect actual
-	)
+expecting success of 7061.2 'same with gitignore starting with BOM': 
+	printf "\357\273\277ignored\n" >.gitignore &&
+	mkdir -p untracked &&
+	: >untracked/ignored &&
+	: >untracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/3a/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A 73b131e] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B d135340] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+ok 2 - same with gitignore starting with BOM
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7061.3 'status untracked files --ignored with pathspec (no match)': 
+	git status --porcelain --ignored -- untracked/i >actual &&
+	test_must_be_empty actual &&
+	git status --porcelain --ignored -- untracked/u >actual &&
+	test_must_be_empty actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 3 - status untracked files --ignored with pathspec (no match)
 
-  git switch -c <new-branch-name>
+expecting success of 7061.4 'status untracked files --ignored with pathspec (literal match)': 
+	git status --porcelain --ignored -- untracked/ignored >actual &&
+	echo "!! untracked/ignored" >expected &&
+	test_cmp expected actual &&
+	git status --porcelain --ignored -- untracked/uncommitted >actual &&
+	echo "?? untracked/uncommitted" >expected &&
+	test_cmp expected actual
 
-Or undo this operation with:
+ok 4 - status untracked files --ignored with pathspec (literal match)
 
-  git switch -
+expecting success of 7061.5 'status untracked files --ignored with pathspec (glob match)': 
+	git status --porcelain --ignored -- untracked/i\* >actual &&
+	echo "!! untracked/ignored" >expected &&
+	test_cmp expected actual &&
+	git status --porcelain --ignored -- untracked/u\* >actual &&
+	echo "?? untracked/uncommitted" >expected &&
+	test_cmp expected actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 5 - status untracked files --ignored with pathspec (glob match)
 
-HEAD is now at 73b131e A
-Merge made by the 'ort' strategy.
- {z => x}/d | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 9 - 3a: Avoid implicit rename if involved as source on other side
+expecting success of 7061.6 'status untracked directory with --ignored -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-expecting success of 6423.10 '3b: Avoid implicit rename if involved as source on current side': 
-	test_setup_3b &&
-	(
-		cd 3b &&
+ok 6 - status untracked directory with --ignored -u
 
-		git checkout A^0 &&
+expecting success of 7061.7 'status of untracked directory with --ignored works with or without prefix': 
+	git status --porcelain --ignored >tmp &&
+	grep untracked/ tmp >actual &&
+	rm tmp &&
+	test_cmp expected actual &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep CONFLICT.*rename/rename.*z/d.*x/d.*w/d out &&
-		test_grep ! CONFLICT.*rename/rename.*y/d out &&
+	git status --porcelain --ignored untracked/ >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 7 - status of untracked directory with --ignored works with or without prefix
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :1:z/d :2:x/d :3:w/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:z/d  O:z/d  O:z/d &&
-		test_cmp expect actual &&
+expecting success of 7061.8 'status prefixed untracked sub-directory with --ignored -u': 
+	git status --porcelain --ignored -u untracked/ >actual &&
+	test_cmp expected actual
 
-		test_path_is_missing z/d &&
-		git hash-object >actual \
-			x/d   w/d &&
-		git rev-parse >expect \
-			O:z/d O:z/d &&
-		test_cmp expect actual
-	)
+ok 8 - status prefixed untracked sub-directory with --ignored -u
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/3b/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A 5eead67] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 464e387] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {z => w}/d (100%)
-Note: switching to 'A^0'.
+expecting success of 7061.9 'status ignored directory with --ignore': 
+	rm -rf untracked &&
+	mkdir ignored &&
+	: >ignored/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 9 - status ignored directory with --ignore
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7061.10 'status ignored directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-  git switch -c <new-branch-name>
+ok 10 - status ignored directory with --ignore -u
 
-Or undo this operation with:
+expecting success of 7061.11 'status empty untracked directory with --ignore': 
+	rm -rf ignored &&
+	mkdir untracked-ignored &&
+	mkdir untracked-ignored/test &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-  git switch -
+ok 11 - status empty untracked directory with --ignore
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7061.12 'status empty untracked directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-HEAD is now at 5eead67 A
-CONFLICT (rename/rename): z/d renamed to x/d in HEAD and to w/d in B^0.
-ok 10 - 3b: Avoid implicit rename if involved as source on current side
+ok 12 - status empty untracked directory with --ignore -u
 
-expecting success of 6423.11 '4a: Directory split, with original directory still present': 
-	test_setup_4a &&
-	(
-		cd 4a &&
+expecting success of 7061.13 'status untracked directory with ignored files with --ignore': 
+	: >untracked-ignored/ignored &&
+	: >untracked-ignored/test/ignored &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-		git checkout A^0 &&
+ok 13 - status untracked directory with ignored files with --ignore
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7061.14 'status untracked directory with ignored files with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 14 - status untracked directory with ignored files with --ignore -u
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/e HEAD:z/f &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
-		test_cmp expect actual
-	)
+expecting success of 7061.15 'status ignored tracked directory with --ignore': 
+	rm -rf untracked-ignored &&
+	mkdir tracked &&
+	: >tracked/committed &&
+	git add tracked/committed &&
+	git commit -m. &&
+	echo "tracked" >.gitignore &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/4a/.git/
-[master (root-commit) 9e2ca6f] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
- create mode 100644 z/e
-Switched to branch 'A'
-[A 9c11b44] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/d (100%)
-Switched to branch 'B'
-[B aa71186] B
+[master (root-commit) e2a6909] .
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/f
-Note: switching to 'A^0'.
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 tracked/committed
+ok 15 - status ignored tracked directory with --ignore
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7061.16 'status ignored tracked directory with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 16 - status ignored tracked directory with --ignore -u
 
-  git switch -c <new-branch-name>
+expecting success of 7061.17 'status ignored tracked directory and ignored file with --ignore': 
+	echo "committed" >>.gitignore &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-Or undo this operation with:
+ok 17 - status ignored tracked directory and ignored file with --ignore
 
-  git switch -
+expecting success of 7061.18 'status ignored tracked directory and ignored file with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 18 - status ignored tracked directory and ignored file with --ignore -u
 
-HEAD is now at 9c11b44 A
-Merge made by the 'ort' strategy.
- z/f | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 z/f
-ok 11 - 4a: Directory split, with original directory still present
+expecting success of 7061.19 'status ignored tracked directory and uncommitted file with --ignore': 
+	echo "tracked" >.gitignore &&
+	: >tracked/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-expecting success of 6423.12 '5a: Merge directories, other side adds files to original and target': 
-	test_setup_5a &&
-	(
-		cd 5a &&
+ok 19 - status ignored tracked directory and uncommitted file with --ignore
 
-		git checkout A^0 &&
+expecting success of 7061.20 'status ignored tracked directory and uncommitted file with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT.*implicit dir rename" out &&
+ok 20 - status ignored tracked directory and uncommitted file with --ignore -u
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 7061.21 'status ignored tracked directory with uncommitted file in untracked subdir with --ignore': 
+	rm -rf tracked/uncommitted &&
+	mkdir tracked/ignored &&
+	: >tracked/ignored/uncommitted &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/d :0:y/e :0:z/e :0:y/f &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:y/d  A:y/e  A:z/e  A:z/f &&
-		test_cmp expect actual
-	)
+ok 21 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5a/.git/
-[master (root-commit) 828128d] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A b42bf3c] A
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/e
- create mode 100644 z/e
- create mode 100644 z/f
-Switched to branch 'B'
-[B 2a8bd7d] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+expecting success of 7061.22 'status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 22 - status ignored tracked directory with uncommitted file in untracked subdir with --ignore -u
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7061.23 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore': 
+	: >tracked/ignored/committed &&
+	git add -f tracked/ignored/committed &&
+	git commit -m. &&
+	git status --porcelain --ignored >actual &&
+	test_cmp expected actual
 
-  git switch -c <new-branch-name>
+[master 8a62ec6] .
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 tracked/ignored/committed
+ok 23 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore
 
-Or undo this operation with:
+expecting success of 7061.24 'status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u': 
+	git status --porcelain --ignored -u >actual &&
+	test_cmp expected actual
 
-  git switch -
+ok 24 - status ignored tracked directory with uncommitted file in tracked subdir with --ignore -u
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7061.25 'status ignores submodule in excluded directory': 
+	git init tracked/submodule &&
+	test_commit -C tracked/submodule initial &&
+	git status --porcelain --ignored -u tracked/submodule >actual &&
+	test_cmp expected actual
 
-HEAD is now at b42bf3c A
-CONFLICT (implicit dir rename): Existing file/dir at y/e in the way of implicit directory rename(s) putting the following path(s) there: z/e.
-ok 12 - 5a: Merge directories, other side adds files to original and target
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7061-wtstatus-ignore/tracked/submodule/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 25 - status ignores submodule in excluded directory
 
-expecting success of 6423.13 '5b: Rename/delete in order to get add/add/add conflict': 
-	test_setup_5b &&
-	(
-		cd 5b &&
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7101-reset-empty-subdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7101-reset-empty-subdirs/.git/
+expecting success of 7101.1 'creating initial files': 
+	mkdir path0 &&
+	COPYING_test_data >path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
 
-		git checkout A^0 &&
+[master (root-commit) eb5c9d9] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/COPYING
+ok 1 - creating initial files
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (add/add).* y/d" out &&
+expecting success of 7101.2 'creating second files': 
+	mkdir path1 &&
+	mkdir path1/path2 &&
+	COPYING_test_data >path1/path2/COPYING &&
+	COPYING_test_data >path1/COPYING &&
+	COPYING_test_data >COPYING &&
+	COPYING_test_data >path0/COPYING-TOO &&
+	git add path1/path2/COPYING &&
+	git add path1/COPYING &&
+	git add COPYING &&
+	git add path0/COPYING-TOO &&
+	git commit -m change -a
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+[master 2982bdc] change
+ Author: A U Thor <author@example.com>
+ 4 files changed, 72 insertions(+)
+ create mode 100644 COPYING
+ create mode 100644 path0/COPYING-TOO
+ create mode 100644 path1/COPYING
+ create mode 100644 path1/path2/COPYING
+ok 2 - creating second files
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e :2:y/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e  A:y/d  B:y/d &&
-		test_cmp expect actual &&
+expecting success of 7101.3 'resetting tree HEAD^': 
+	git reset --hard HEAD^
 
-		test_must_fail git rev-parse :1:y/d &&
-		test_path_is_file y/d
-	)
+HEAD is now at eb5c9d9 add
+ok 3 - resetting tree HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5b/.git/
-[master (root-commit) 66a9911] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A f5563b5] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+), 1 deletion(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 5ac66d1] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 y/d
- create mode 100644 z/e
-Note: switching to 'A^0'.
+expecting success of 7101.4 'checking initial files exist after rewind': 
+	test -d path0 &&
+	test -f path0/COPYING
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 4 - checking initial files exist after rewind
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
+	! test -f path1/path2/COPYING
 
-  git switch -c <new-branch-name>
+ok 5 - checking lack of path1/path2/COPYING
 
-Or undo this operation with:
+expecting success of 7101.6 'checking lack of path1/COPYING': 
+	! test -f path1/COPYING
 
-  git switch -
+ok 6 - checking lack of path1/COPYING
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7101.7 'checking lack of COPYING': 
+	! test -f COPYING
 
-HEAD is now at f5563b5 A
-CONFLICT (add/add): Merge conflict in y/d
-fatal: path 'y/d' is in the index, but not at stage 1
-hint: Did you mean ':2:y/d'?
-:1:y/d
-ok 13 - 5b: Rename/delete in order to get add/add/add conflict
+ok 7 - checking lack of COPYING
 
-expecting success of 6423.14 '5c: Transitive rename would cause rename/rename/rename/add/add/add': 
-	test_setup_5c &&
-	(
-		cd 5c &&
+expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
+	! test -f path0/COPYING-TOO
 
-		git checkout A^0 &&
+ok 8 - checking checking lack of path1/COPYING-TOO
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/rename).*x/d.*w/d.*z/d" out &&
-		test_grep "CONFLICT (add/add).* y/d" out &&
+expecting success of 7101.9 'checking lack of path1/path2': 
+	! test -d path1/path2
 
-		git ls-files -s >out &&
-		test_line_count = 9 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ok 9 - checking lack of path1/path2
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e &&
-		test_cmp expect actual &&
+expecting success of 7101.10 'checking lack of path1': 
+	! test -d path1
 
-		test_must_fail git rev-parse :1:y/d &&
-		git rev-parse >actual \
-			:2:w/d :3:w/d :1:x/d :2:y/d :3:y/d :3:z/d &&
-		git rev-parse >expect \
-			 O:x/d  B:w/d  O:x/d  A:y/d  B:y/d  O:x/d &&
-		test_cmp expect actual &&
+ok 10 - checking lack of path1
 
-		git hash-object >actual \
-			z/d &&
-		git rev-parse >expect \
-			O:x/d &&
-		test_cmp expect actual &&
-		test_path_is_missing x/d &&
-		test_path_is_file y/d &&
-		grep -q "<<<<" y/d  # conflict markers should be present
-	)
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7060-wtstatus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7060-wtstatus/.git/
+expecting success of 7060.1 'setup': 
+	git config --global advice.statusuoption false &&
+	test_commit A &&
+	test_commit B oneside added &&
+	git checkout A^0 &&
+	test_commit C oneside created
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5c/.git/
-[master (root-commit) cb15013] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A b27f493] A
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {x => w}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
-Switched to branch 'B'
-[B 535e6b3] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 5747a32] B
  Author: A U Thor <author@example.com>
- 4 files changed, 3 insertions(+)
- create mode 100644 w/d
- create mode 100644 y/d
- rename {x => z}/d (100%)
- create mode 100644 z/e
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oneside
 Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
@@ -459810,351 +458161,327 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at b27f493 A
-CONFLICT (rename/rename): x/d renamed to w/d in HEAD and to z/d in B^0.
-CONFLICT (add/add): Merge conflict in y/d
-fatal: path 'y/d' is in the index, but not at stage 1
-hint: Did you mean ':2:y/d'?
-:1:y/d
-ok 14 - 5c: Transitive rename would cause rename/rename/rename/add/add/add
+HEAD is now at 0ddfaf1 A
+[detached HEAD f7fe030] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 oneside
+ok 1 - setup
 
-expecting success of 6423.15 '5d: Directory/file/file conflict due to directory rename': 
-	test_setup_5d &&
-	(
-		cd 5d &&
+expecting success of 7060.2 'A/A conflict': 
+	git checkout B^0 &&
+	test_must_fail git merge C
 
-		git checkout A^0 &&
+Previous HEAD position was f7fe030 C
+HEAD is now at 5747a32 B
+Auto-merging oneside
+CONFLICT (add/add): Merge conflict in oneside
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - A/A conflict
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (file/directory).*y/d" out &&
+expecting success of 7060.3 'Report path with conflict': 
+	git diff --cached --name-status >actual &&
+	echo "U	oneside" >expect &&
+	test_cmp expect actual
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_line_count = 1 out &&
+ok 3 - Report path with conflict
 
-			git rev-parse >actual \
-			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d~HEAD :0:y/d/e
-		else
-			test_line_count = 2 out &&
+expecting success of 7060.4 'Report new path with conflict': 
+	git diff --cached --name-status HEAD^ >actual &&
+	echo "U	oneside" >expect &&
+	test_cmp expect actual
 
-			git rev-parse >actual \
-			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d      :0:y/d/e
-		fi &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
-		test_cmp expect actual &&
+ok 4 - Report new path with conflict
 
-		git hash-object y/d~HEAD >actual &&
-		git rev-parse A:y/d >expect &&
-		test_cmp expect actual
+expecting success of 7060.5 'M/D conflict does not segfault': 
+	cat >expect <<EOF &&
+On branch side
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
+
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+	deleted by us:   foo
+
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	mkdir mdconflict &&
+	(
+		cd mdconflict &&
+		git init &&
+		test_commit initial foo "" &&
+		test_commit modify foo foo &&
+		git checkout -b side HEAD^ &&
+		git rm foo &&
+		git commit -m delete &&
+		test_must_fail git merge main &&
+		test_must_fail git commit --dry-run >../actual &&
+		test_cmp ../expect ../actual &&
+		git status >../actual &&
+		test_cmp ../expect ../actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/5d/.git/
-[master (root-commit) 4e96174] O
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7060-wtstatus/mdconflict/.git/
+[main (root-commit) a3c5375] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A ecc7afe] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[main efd4a38] modify
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
-Switched to branch 'B'
-[B 67e12ad] B
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+rm 'foo'
+[side 0599bc2] delete
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 y/d/e
- create mode 100644 z/d
- create mode 100644 z/f
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo
+CONFLICT (modify/delete): foo deleted in HEAD and modified in main.  Version main of foo left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 5 - M/D conflict does not segfault
 
-HEAD is now at ecc7afe A
-CONFLICT (file/directory): directory in the way of y/d from HEAD; moving it to y/d~HEAD instead.
-ok 15 - 5d: Directory/file/file conflict due to directory rename
+expecting success of 7060.6 'rename & unmerged setup': 
+	git rm -f -r . &&
+	cat "$TEST_DIRECTORY/README" >ONE &&
+	git add ONE &&
+	test_tick &&
+	git commit -m "One commit with ONE" &&
 
-expecting success of 6423.16 '6a: Tricky rename/delete': 
-	test_setup_6a &&
+	echo Modified >TWO &&
+	cat ONE >>TWO &&
+	cat ONE >>THREE &&
+	git add TWO THREE &&
+	sha1=$(git rev-parse :ONE) &&
+	git rm --cached ONE &&
 	(
-		cd 6a &&
-
-		git checkout A^0 &&
-
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/delete).*z/c.*y/c" out &&
+		echo "100644 $sha1 1	ONE" &&
+		echo "100644 $sha1 2	ONE" &&
+		echo "100644 $sha1 3	ONE"
+	) | git update-index --index-info &&
+	echo Further >>THREE
 
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			git ls-files -s >out &&
-			test_line_count = 3 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 1 out &&
+rm 'A.t'
+rm 'oneside'
+rm 'oneside'
+[detached HEAD 76f0b67] One commit with ONE
+ Author: A U Thor <author@example.com>
+rm 'ONE'
+ok 6 - rename & unmerged setup
 
-			git rev-parse >actual \
-				:0:y/b :1:y/c :3:y/c &&
-			git rev-parse >expect \
-				 O:z/b  O:z/c  O:z/c
-		else
-			git ls-files -s >out &&
-			test_line_count = 2 out &&
-			git ls-files -u >out &&
-			test_line_count = 1 out &&
-			git ls-files -o >out &&
-			test_line_count = 1 out &&
+expecting success of 7060.7 'rename & unmerged status': 
+	git status -suno >actual &&
+	cat >expect <<-EOF &&
+	UU ONE
+	AM THREE
+	A  TWO
+	EOF
+	test_cmp expect actual
 
-			git rev-parse >actual \
-				:0:y/b :3:y/c &&
-			git rev-parse >expect \
-				 O:z/b  O:z/c
-		fi &&
-		test_cmp expect actual
-	)
+ok 7 - rename & unmerged status
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6a/.git/
-[master (root-commit) 6c15033] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/c'
-rm 'z/d'
-[A 1476532] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 deletions(-)
- delete mode 100644 z/c
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 53c1aba] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+expecting success of 7060.8 'git diff-index --cached shows 2 added + 1 unmerged': 
+	cat >expected <<-EOF &&
+	U	ONE
+	A	THREE
+	A	TWO
+	EOF
+	git diff-index --cached --name-status HEAD >actual &&
+	test_cmp expected actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 8 - git diff-index --cached shows 2 added + 1 unmerged
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7060.9 'git diff-index --cached -M shows 2 added + 1 unmerged': 
+	cat >expected <<-EOF &&
+	U	ONE
+	A	THREE
+	A	TWO
+	EOF
+	git diff-index --cached -M --name-status HEAD >actual &&
+	test_cmp expected actual
 
-  git switch -c <new-branch-name>
+ok 9 - git diff-index --cached -M shows 2 added + 1 unmerged
 
-Or undo this operation with:
+expecting success of 7060.10 'git diff-index --cached -C shows 2 copies + 1 unmerged': 
+	cat >expected <<-EOF &&
+	U	ONE
+	C	ONE	THREE
+	C	ONE	TWO
+	EOF
+	git diff-index --cached -C --name-status HEAD |
+	sed "s/^C[0-9]*/C/g" >actual &&
+	test_cmp expected actual
 
-  git switch -
+ok 10 - git diff-index --cached -C shows 2 copies + 1 unmerged
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7060.11 'status when conflicts with add and rm advice (deleted by them)': 
+	git reset --hard &&
+	git checkout main &&
+	test_commit init main.txt init &&
+	git checkout -b second_branch &&
+	git rm main.txt &&
+	git commit -m "main.txt deleted on second_branch" &&
+	test_commit second conflict.txt second &&
+	git checkout main &&
+	test_commit on_second main.txt on_second &&
+	test_commit main conflict.txt main &&
+	test_must_fail git merge second_branch &&
+	cat >expected <<\EOF &&
+On branch main
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-HEAD is now at 1476532 A
-CONFLICT (rename/delete): z/c renamed to y/c in B^0, but deleted in HEAD.
-ok 16 - 6a: Tricky rename/delete
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+	both added:      conflict.txt
+	deleted by them: main.txt
 
-expecting success of 6423.17 '6b1: Same renames done on both sides, plus another rename': 
-	test_setup_6b1 &&
-	(
-		cd 6b1 &&
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --untracked-files=no >actual &&
+	test_cmp expected actual
 
-		git checkout A^0 &&
+HEAD is now at 76f0b67 One commit with ONE
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+  76f0b67 One commit with ONE
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:x/e HEAD:y/f &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
-		test_cmp expect actual
-	)
+ git branch <new-branch-name> 76f0b67
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6b1/.git/
-[master (root-commit) 9e2ca6f] O
+Switched to branch 'main'
+[main e5fc44e] init
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
- create mode 100644 z/e
-Switched to branch 'A'
-[A e7863b2] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main.txt
+Switched to a new branch 'second_branch'
+rm 'main.txt'
+[second_branch 1fd8046] main.txt deleted on second_branch
  Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/e (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/d (100%)
-Switched to branch 'B'
-[B de7c755] B
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 main.txt
+[second_branch e4d0ede] second
  Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {z => y}/d (100%)
- create mode 100644 z/f
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at e7863b2 A
-Path updated: z/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/f.
-Merge made by the 'ort' strategy.
- y/f | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 y/f
-ok 17 - 6b1: Same renames done on both sides, plus another rename
-
-expecting success of 6423.18 '6b2: Same rename done on both sides': 
-	test_setup_6b2 &&
-	(
-		cd 6b2 &&
-
-		git checkout A^0 &&
-
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+ create mode 100644 conflict.txt
+Switched to branch 'main'
+[main 9824e6a] on_second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 62fe2e7] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Auto-merging conflict.txt
+CONFLICT (add/add): Merge conflict in conflict.txt
+CONFLICT (modify/delete): main.txt deleted in second_branch and modified in HEAD.  Version HEAD of main.txt left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 11 - status when conflicts with add and rm advice (deleted by them)
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d &&
-		test_cmp expect actual
-	)
+expecting success of 7060.12 'prepare for conflicts': 
+	git reset --hard &&
+	git checkout -b conflict &&
+	test_commit one main.txt one &&
+	git branch conflict_second &&
+	git mv main.txt sub_main.txt &&
+	git commit -m "main.txt renamed in sub_main.txt" &&
+	git checkout conflict_second &&
+	git mv main.txt sub_second.txt &&
+	git commit -m "main.txt renamed in sub_second.txt"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6b2/.git/
-[master (root-commit) 4e96174] O
+HEAD is now at 62fe2e7 main
+Switched to a new branch 'conflict'
+[conflict efc0b61] one
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[conflict 05be729] main.txt renamed in sub_main.txt
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 6ea17b2] B
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename main.txt => sub_main.txt (100%)
+Switched to branch 'conflict_second'
+[conflict_second 8f2ff74] main.txt renamed in sub_second.txt
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename main.txt => sub_second.txt (100%)
+ok 12 - prepare for conflicts
 
-  git switch -
+expecting success of 7060.13 'status when conflicts with add and rm advice (both deleted)': 
+	test_must_fail git merge conflict &&
+	cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Unmerged paths:
+  (use "git add/rm <file>..." as appropriate to mark resolution)
+	both deleted:    main.txt
+	added by them:   sub_main.txt
+	added by us:     sub_second.txt
 
-HEAD is now at 4e9f86d A
-Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
-Merge made by the 'ort' strategy.
- y/d | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 y/d
-ok 18 - 6b2: Same rename done on both sides
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --untracked-files=no >actual &&
+	test_cmp expected actual
 
-expecting success of 6423.19 '6c: Rename only done on same side': 
-	test_setup_6c &&
-	(
-		cd 6c &&
+CONFLICT (rename/rename): main.txt renamed to sub_second.txt in HEAD and to sub_main.txt in conflict.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 13 - status when conflicts with add and rm advice (both deleted)
 
-		git checkout A^0 &&
+expecting success of 7060.14 'status when conflicts with only rm advice (both deleted)': 
+	git reset --hard conflict_second &&
+	test_must_fail git merge conflict &&
+	git add sub_main.txt &&
+	git add sub_second.txt &&
+	cat >expected <<\EOF &&
+On branch conflict_second
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+Changes to be committed:
+	new file:   sub_main.txt
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+Unmerged paths:
+  (use "git rm <file>..." to mark resolution)
+	both deleted:    main.txt
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/d &&
-		test_cmp expect actual
-	)
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git status --untracked-files=no >actual &&
+	test_cmp expected actual &&
+	git reset --hard &&
+	git checkout main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6c/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 405f2b4] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B 6ea17b2] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-Note: switching to 'A^0'.
+HEAD is now at 8f2ff74 main.txt renamed in sub_second.txt
+CONFLICT (rename/rename): main.txt renamed to sub_second.txt in HEAD and to sub_main.txt in conflict.
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 8f2ff74 main.txt renamed in sub_second.txt
+warning: refname 'main' is ambiguous.
+Switched to branch 'main'
+ok 14 - status when conflicts with only rm advice (both deleted)
+
+expecting success of 7060.15 'status --branch with detached HEAD': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git status --branch --porcelain >actual &&
+	cat >expected <<-EOF &&
+	## HEAD (no branch)
+	?? .gitconfig
+	?? actual
+	?? expect
+	?? expected
+	?? mdconflict/
+	EOF
+	test_cmp expected actual
+
+HEAD is now at 62fe2e7 main
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+Note: switching to 'main^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -460171,1739 +458498,1996 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 405f2b4 A
-Merge made by the 'ort' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- z/d        | 1 +
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 z/d
-ok 19 - 6c: Rename only done on same side
+HEAD is now at 62fe2e7 main
+ok 15 - status --branch with detached HEAD
 
-expecting success of 6423.20 '6d: We do not always want transitive renaming': 
-	test_setup_6d &&
-	(
-		cd 6d &&
+expecting success of 7060.16 'status --porcelain=v1 --branch with detached HEAD': 
+	git reset --hard &&
+	git checkout main^0 &&
+	git status --branch --porcelain=v1 >actual &&
+	cat >expected <<-EOF &&
+	## HEAD (no branch)
+	?? .gitconfig
+	?? actual
+	?? expect
+	?? expected
+	?? mdconflict/
+	EOF
+	test_cmp expected actual
 
-		git checkout A^0 &&
+HEAD is now at 62fe2e7 main
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+HEAD is now at 62fe2e7 main
+ok 16 - status --porcelain=v1 --branch with detached HEAD
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7060.17 'status --porcelain=bogus': 
+	test_must_fail git status --porcelain=bogus
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+fatal: unsupported porcelain version 'bogus'
+ok 17 - status --porcelain=bogus
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d &&
-		test_cmp expect actual
-	)
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7104-reset-hard.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7104-reset-hard/.git/
+expecting success of 7104.1 'setup': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6d/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 1491553] A
- Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B add22d4] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+	mkdir before later &&
+	>before/1 &&
+	>before/2 &&
+	>hello &&
+	>later/3 &&
+	git add before hello later &&
+	git commit -m world &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	H=$(git rev-parse :hello) &&
+	git rm --cached hello &&
+	echo "100644 $H 2	hello" | git update-index --index-info &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	rm -f hello &&
+	mkdir -p hello &&
+	>hello/world &&
+	test "$(git ls-files -o)" = hello/world
 
-  git switch -c <new-branch-name>
 
-Or undo this operation with:
+[master (root-commit) 53313cc] world
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 before/1
+ create mode 100644 before/2
+ create mode 100644 hello
+ create mode 100644 later/3
+rm 'hello'
+ok 1 - setup
 
-  git switch -
+expecting success of 7104.2 'reset --hard should restore unmerged ones': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git reset --hard &&
+	git ls-files --error-unmatch before/1 before/2 hello later/3 &&
+	test -f hello
 
-HEAD is now at 1491553 A
-Merge made by the 'ort' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- {x => z}/d | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => z}/d (100%)
-ok 20 - 6d: We do not always want transitive renaming
 
-expecting success of 6423.21 '6e: Add/add from one side': 
-	test_setup_6e &&
-	(
-		cd 6e &&
+HEAD is now at 53313cc world
+before/1
+before/2
+hello
+later/3
+ok 2 - reset --hard should restore unmerged ones
 
-		git checkout A^0 &&
+expecting success of 7104.3 'reset --hard did not corrupt index or cache-tree': 
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+	T=$(git write-tree) &&
+	rm -f .git/index &&
+	git add before hello later &&
+	U=$(git write-tree) &&
+	test "$T" = "$U"
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:z/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:y/d    B:z/d &&
-		test_cmp expect actual
-	)
+ok 3 - reset --hard did not corrupt index or cache-tree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/6e/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 405f2b4] A
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7103-reset-bare.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7103-reset-bare/.git/
+expecting success of 7103.1 'setup non-bare': 
+	echo one >file &&
+	git add file &&
+	git commit -m one &&
+	echo two >file &&
+	git commit -a -m two
+
+[master (root-commit) 1993c08] one
  Author: A U Thor <author@example.com>
-Switched to branch 'B'
-[B c2a120e] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 2f98c16] two
  Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- create mode 100644 z/d
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup non-bare
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7103.2 '"hard" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --hard)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+fatal: this operation must be run in a work tree
+ok 2 - "hard" reset requires a worktree
 
-  git switch -c <new-branch-name>
+expecting success of 7103.3 '"merge" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --merge)
 
-Or undo this operation with:
+fatal: this operation must be run in a work tree
+ok 3 - "merge" reset requires a worktree
 
-  git switch -
+expecting success of 7103.4 '"keep" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --keep)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: this operation must be run in a work tree
+ok 4 - "keep" reset requires a worktree
 
-HEAD is now at 405f2b4 A
-Merge made by the 'ort' strategy.
- {z => y}/b | 0
- {z => y}/c | 0
- y/d        | 1 +
- z/d        | 1 +
- 4 files changed, 2 insertions(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d
- create mode 100644 z/d
-ok 21 - 6e: Add/add from one side
+expecting success of 7103.5 '"mixed" reset is ok': 
+	(cd .git && git reset)
 
-expecting success of 6423.22 '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file': 
-	test_setup_7a &&
-	(
-		cd 7a &&
+ok 5 - "mixed" reset is ok
 
-		git checkout A^0 &&
+expecting success of 7103.6 '"soft" reset is ok': 
+	(cd .git && git reset --soft)
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/rename).*z/b.*y/b.*w/b" out &&
-		test_grep "CONFLICT (rename/rename).*z/c.*y/c.*x/c" out &&
+ok 6 - "soft" reset is ok
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 7103.7 'hard reset works with GIT_WORK_TREE': 
+	mkdir worktree &&
+	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
+	test_cmp file worktree/file
 
-		git rev-parse >actual \
-			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:x/c :0:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
-		test_cmp expect actual &&
+HEAD is now at 2f98c16 two
+ok 7 - hard reset works with GIT_WORK_TREE
 
-		git hash-object >actual \
-			y/b   w/b   y/c   x/c &&
-		git rev-parse >expect \
-			O:z/b O:z/b O:z/c O:z/c &&
-		test_cmp expect actual
-	)
+expecting success of 7103.8 'setup bare': 
+	git clone --bare . bare.git &&
+	cd bare.git
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B e02cee0] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => w}/b (100%)
- rename {z => x}/c (100%)
- create mode 100644 z/d
-Note: switching to 'A^0'.
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - setup bare
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7103.9 '"hard" reset is not allowed in bare': 
+	test_must_fail git reset --hard HEAD^
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+fatal: this operation must be run in a work tree
+ok 9 - "hard" reset is not allowed in bare
 
-  git switch -c <new-branch-name>
+expecting success of 7103.10 '"merge" reset is not allowed in bare': 
+	test_must_fail git reset --merge HEAD^
 
-Or undo this operation with:
+fatal: this operation must be run in a work tree
+ok 10 - "merge" reset is not allowed in bare
 
-  git switch -
+expecting success of 7103.11 '"keep" reset is not allowed in bare': 
+	test_must_fail git reset --keep HEAD^
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: this operation must be run in a work tree
+ok 11 - "keep" reset is not allowed in bare
 
-HEAD is now at 4e9f86d A
-CONFLICT (rename/rename): z/b renamed to y/b in HEAD and to w/b in B^0.
-CONFLICT (rename/rename): z/c renamed to y/c in HEAD and to x/c in B^0.
-ok 22 - 7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file
+expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
+	test_must_fail git reset --mixed HEAD^
 
-expecting success of 6423.23 '7b: rename/rename(2to1), but only due to transitive rename': 
-	test_setup_7b &&
-	(
-		cd 7b &&
+fatal: mixed reset is not allowed in a bare repository
+ok 12 - "mixed" reset is not allowed in bare
 
-		git checkout A^0 &&
+expecting success of 7103.13 '"soft" reset is allowed in bare': 
+	git reset --soft HEAD^ &&
+	git show --pretty=format:%s >out &&
+	echo one >expect &&
+	head -n 1 out >actual &&
+	test_cmp expect actual
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (\(.*\)/\1)" out &&
+ok 13 - "soft" reset is allowed in bare
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7106-reset-unborn-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7106-reset-unborn-branch/.git/
+expecting success of 7106.1 'setup': 
+	echo a >a &&
+	echo b >b
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :2:y/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:w/d  O:x/d &&
-		test_cmp expect actual &&
+ok 1 - setup
 
-		# Test that the two-way merge in y/d is as expected
-		git cat-file -p :2:y/d >expect &&
-		git cat-file -p :3:y/d >other &&
-		>empty &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_must_fail git merge-file \
-				-L "HEAD:y/d" \
-				-L "" \
-				-L "B^0:z/d" \
-				expect empty other
-		else
-			test_must_fail git merge-file \
-				-L "HEAD" \
-				-L "" \
-				-L "B^0" \
-				expect empty other
-		fi &&
-		test_cmp expect y/d
-	)
+expecting success of 7106.2 'reset': 
+	git add a b &&
+	git reset &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7b/.git/
-[master (root-commit) 3a7ba74] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 w/d
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 0808992] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {w => y}/d (100%)
-Switched to branch 'B'
-[B 946a998] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+	git ls-files >actual &&
+	test_must_be_empty actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 2 - reset
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7106.3 'reset HEAD': 
+	rm .git/index &&
+	git add a b &&
+	test_must_fail git reset HEAD
 
-  git switch -c <new-branch-name>
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 3 - reset HEAD
 
-Or undo this operation with:
+expecting success of 7106.4 'reset $file': 
+	rm .git/index &&
+	git add a b &&
+	git reset a &&
 
-  git switch -
+	echo b >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 4 - reset $file
 
-HEAD is now at 0808992 A
-CONFLICT (add/add): Merge conflict in y/d
-ok 23 - 7b: rename/rename(2to1), but only due to transitive rename
+expecting success of 7106.5 'reset -p': 
+	rm .git/index &&
+	git add a &&
+	echo y >yes &&
+	git reset -p <yes >output &&
 
-expecting success of 6423.24 '7c: rename/rename(1to...2or3); transitive rename may add complexity': 
-	test_setup_7c &&
-	(
-		cd 7c &&
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_grep "Unstage" output
 
-		git checkout A^0 &&
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+ok 5 - reset -p
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/rename).*x/d.*w/d.*y/d" out &&
+expecting success of 7106.6 'reset --soft is a no-op': 
+	rm .git/index &&
+	git add a &&
+	git reset --soft &&
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	echo a >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :1:x/d :2:w/d :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:x/d  O:x/d  O:x/d &&
-		test_cmp expect actual
-	)
+ok 6 - reset --soft is a no-op
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7c/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 1e0f8cf] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => w}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
+expecting success of 7106.7 'reset --hard': 
+	rm .git/index &&
+	git add a &&
+	test_when_finished "echo a >a" &&
+	git reset --hard &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_path_is_missing a
+
+ok 7 - reset --hard
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7107-reset-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7107-reset-pathspec-file/.git/
+expecting success of 7107.1 'setup': 
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add . &&
+	git commit --include . -m "Commit" &&
+	git tag checkpoint
+
+[master (root-commit) 4b301d4] Commit
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+ 4 files changed, 4 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+ok 1 - setup
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7107.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git rm fileA.t &&
+	echo fileA.t | git reset --pathspec-from-file=- &&
 
-  git switch -c <new-branch-name>
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
 
-Or undo this operation with:
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 2 - --pathspec-from-file from stdin
 
-  git switch -
+expecting success of 7107.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git rm fileA.t &&
+	echo fileA.t >list &&
+	git reset --pathspec-from-file=list &&
 
-HEAD is now at 1e0f8cf A
-CONFLICT (rename/rename): x/d renamed to w/d in HEAD and to y/d in B^0.
-ok 24 - 7c: rename/rename(1to...2or3); transitive rename may add complexity
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
 
-expecting success of 6423.25 '7d: transitive rename involved in rename/delete; how is it reported?': 
-	test_setup_7d &&
-	(
-		cd 7d &&
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 3 - --pathspec-from-file from file
 
-		git checkout A^0 &&
+expecting success of 7107.4 'NUL delimiters': 
+	restore_checkpoint &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
 
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			git ls-files -s >out &&
-			test_line_count = 4 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 1 out &&
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
 
-			git rev-parse >actual \
-				:0:y/b :0:y/c :1:y/d :3:y/d &&
-			git rev-parse >expect \
-				 O:z/b  O:z/c  O:x/d  O:x/d
-		else
-			git ls-files -s >out &&
-			test_line_count = 3 out &&
-			git ls-files -u >out &&
-			test_line_count = 1 out &&
-			git ls-files -o >out &&
-			test_line_count = 1 out &&
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 4 - NUL delimiters
 
-			git rev-parse >actual \
-				:0:y/b :0:y/c :3:y/d &&
-			git rev-parse >expect \
-				 O:z/b  O:z/c  O:x/d
-		fi &&
-		test_cmp expect actual
-	)
+expecting success of 7107.5 'LF delimiters': 
+	restore_checkpoint &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7d/.git/
-[master (root-commit) 1e3967e] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'x/d'
-[A 202563c] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 deletion(-)
- delete mode 100644 x/d
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B c9f07f0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 5 - LF delimiters
 
-  git switch -c <new-branch-name>
+expecting success of 7107.6 'no trailing delimiter': 
+	restore_checkpoint &&
 
-Or undo this operation with:
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
 
-  git switch -
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
 
-Turn off this advice by setting config variable advice.detachedHead to false
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 6 - no trailing delimiter
 
-HEAD is now at 202563c A
-CONFLICT (rename/delete): x/d renamed to y/d in B^0, but deleted in HEAD.
-ok 25 - 7d: transitive rename involved in rename/delete; how is it reported?
+expecting success of 7107.7 'CRLF delimiters': 
+	restore_checkpoint &&
 
-expecting success of 6423.26 '7e: transitive rename in rename/delete AND dirs in the way': 
-	test_setup_7e &&
-	(
-		cd 7e &&
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
 
-		git checkout A^0 &&
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (rename/delete).*x/d.*y/d" out &&
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+Unstaged changes after reset:
+D	fileA.t
+D	fileB.t
+ok 7 - CRLF delimiters
 
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			git ls-files -s >out &&
-			test_line_count = 6 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 1 out &&
+expecting success of 7107.8 'quotes': 
+	restore_checkpoint &&
 
-			git rev-parse >actual \
-				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :1:y/d~B^0 :3:y/d~B^0 &&
-			git rev-parse >expect \
-				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d      O:x/d
-		else
-			git ls-files -s >out &&
-			test_line_count = 5 out &&
-			git ls-files -u >out &&
-			test_line_count = 1 out &&
-			git ls-files -o >out &&
-			test_line_count = 2 out &&
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-			git rev-parse >actual \
-				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
-			git rev-parse >expect \
-				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d
-		fi &&
-		test_cmp expect actual &&
+	git rm fileA.t &&
+	git reset --pathspec-from-file=list &&
 
-		git hash-object y/d~B^0 >actual &&
-		git rev-parse O:x/d >expect &&
-		test_cmp expect actual
-	)
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/7e/.git/
-[master (root-commit) cb15013] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'x/d'
-[A 3ba9059] A
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 x/d
- create mode 100644 x/d/f
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- create mode 100644 y/d/g
-Switched to branch 'B'
-[B 0710b4b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+Unstaged changes after reset:
+D	fileA.t
+ok 8 - quotes
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7107.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-  git switch -c <new-branch-name>
+	# Note: "git reset" has not yet learned to fail on wrong pathspecs
+	git reset --pathspec-from-file=list --pathspec-file-nul &&
 
-Or undo this operation with:
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect !
 
-  git switch -
+HEAD is now at 4b301d4 Commit
+--- expect	2025-03-17 13:27:30.931047108 +0000
++++ actual	2025-03-17 13:27:30.943047184 +0000
+@@ -1 +0,0 @@
+- D fileA.t
+ok 9 - quotes not compatible with --pathspec-file-nul
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7107.10 'only touches what was listed': 
+	restore_checkpoint &&
 
-HEAD is now at 3ba9059 A
-CONFLICT (rename/delete): x/d renamed to y/d in B^0, but deleted in HEAD.
-ok 26 - 7e: transitive rename in rename/delete AND dirs in the way
+	git rm fileA.t fileB.t fileC.t fileD.t &&
+	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
 
-expecting success of 6423.27 '8a: Dual-directory rename, one into the others way': 
-	test_setup_8a &&
-	(
-		cd 8a &&
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	 D fileB.t
+	 D fileC.t
+	D  fileD.t
+	EOF
+	verify_expect
 
-		git checkout A^0 &&
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+rm 'fileB.t'
+rm 'fileC.t'
+rm 'fileD.t'
+Unstaged changes after reset:
+D	fileB.t
+D	fileC.t
+ok 10 - only touches what was listed
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7107.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	git rm fileA.t &&
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	test_must_fail git reset --pathspec-from-file=list --patch 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
 
-		git rev-parse >actual \
-			HEAD:y/a HEAD:y/b HEAD:y/e HEAD:y/f HEAD:z/c HEAD:z/d &&
-		git rev-parse >expect \
-			O:x/a    O:x/b    A:x/e    A:y/f    O:y/c    O:y/d &&
-		test_cmp expect actual
-	)
+	test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8a/.git/
-[master (root-commit) 644420a] O
+	test_must_fail git reset --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	test_must_fail git reset --soft --pathspec-from-file=list 2>err &&
+	test_grep -e "fatal: Cannot do soft reset with paths" err &&
+
+	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
+	test_grep -e "fatal: Cannot do hard reset with paths" err
+
+HEAD is now at 4b301d4 Commit
+rm 'fileA.t'
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+ok 11 - error conditions
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7008-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7008-filter-branch-null-sha1/.git/
+expecting success of 7008.1 'setup: base commits': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three
+
+[master (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 y/c
- create mode 100644 y/d
-Switched to branch 'A'
-[A 6afefa0] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 x/e
- create mode 100644 y/f
-Switched to branch 'B'
-[B ccdb287] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 7c7cd71] three
  Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {y => z}/c (100%)
- rename {y => z}/d (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 1 - setup: base commits
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7008.2 'setup: a commit with a bogus null sha1 in the tree': 
+	{
+		git ls-tree HEAD &&
+		printf "160000 commit $ZERO_OID\\tbroken\\n"
+	} >broken-tree &&
+	echo "add broken entry" >msg &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	tree=$(git mktree <broken-tree) &&
+	test_tick &&
+	commit=$(git commit-tree $tree -p HEAD <msg) &&
+	git update-ref HEAD "$commit"
 
-  git switch -c <new-branch-name>
+ok 2 - setup: a commit with a bogus null sha1 in the tree
 
-Or undo this operation with:
+expecting success of 7008.3 'setup: bring HEAD and index in sync': 
+	test_tick &&
+	git commit -a -m "back to normal"
 
-  git switch -
+[master 6fc1982] back to normal
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 160000 broken
+ok 3 - setup: bring HEAD and index in sync
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7008.4 'noop filter-branch complains': 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "true"
 
-HEAD is now at 6afefa0 A
-Path updated: x/e added in HEAD inside a directory that was renamed in B^0; moving it to y/e.
-Merge made by the 'ort' strategy.
- {x => y}/a | 0
- {x => y}/b | 0
- {x => y}/e | 0
- {y => z}/c | 0
- {y => z}/d | 0
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/a (100%)
- rename {x => y}/b (100%)
- rename {x => y}/e (100%)
- rename {y => z}/c (100%)
- rename {y => z}/d (100%)
-ok 27 - 8a: Dual-directory rename, one into the others way
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+fatal: git-write-tree: error building trees
+fatal: not a valid object name 
+could not write rewritten commit
+ok 4 - noop filter-branch complains
 
-expecting success of 6423.28 '8b: Dual-directory rename, one into the others way, with conflicting filenames': 
-	test_setup_8b &&
-	(
-		cd 8b &&
+expecting success of 7008.5 'filter commands are still checked': 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch three.t"
 
-		git checkout A^0 &&
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (1 seconds passed, remaining 1 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (2/5) (1 seconds passed, remaining 1 predicted)    rm 'three.t'
+
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (2/5) (1 seconds passed, remaining 1 predicted)    warning: cache entry has null sha1: broken
+error: cache entry has null sha1: broken
+fatal: Unable to write new index file
+rm 'three.t'
+index filter failed: git rm --cached --ignore-unmatch three.t
+ok 5 - filter commands are still checked
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7008.6 'removing the broken entry works': 
+	echo three >expect &&
+	git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch broken" &&
+	git log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+rm 'broken'
+
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (4/5) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 6 - removing the broken entry works
 
-		git rev-parse >actual \
-			HEAD:y/a HEAD:y/b HEAD:z/a HEAD:z/b HEAD:x/e HEAD:y/e &&
-		git rev-parse >expect \
-			O:x/a    O:x/b    O:y/a    O:y/b    A:x/e    A:y/e &&
-		test_cmp expect actual
-	)
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7113-post-index-change-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7113-post-index-change-hook/.git/
+expecting success of 7113.1 'setup': 
+	mkdir -p dir1 &&
+	touch dir1/file1.txt &&
+	echo testing >dir1/file2.txt &&
+	git add . &&
+	git commit -m "initial"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8b/.git/
-[master (root-commit) d95116f] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/a
- create mode 100644 x/b
- create mode 100644 y/a
- create mode 100644 y/b
-Switched to branch 'A'
-[A 8d5e46a] A
+[main (root-commit) 7e53173] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 x/e
- create mode 100644 y/e
-Switched to branch 'B'
-[B a7bdbf9] B
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dir1/file1.txt
+ create mode 100644 dir1/file2.txt
+ok 1 - setup
+
+expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
+			exit 1
+		fi
+		if test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
+			exit 1
+		fi
+		if test -f ".git/index.lock"; then
+			echo ".git/index.lock exists" >testfailure
+			exit 3
+		fi
+		if ! test -f ".git/index"; then
+			echo ".git/index does not exist" >testfailure
+			exit 3
+		fi
+		echo "success" >testsuccess
+	EOF
+	mkdir -p dir2 &&
+	touch dir2/file1.txt &&
+	touch dir2/file2.txt &&
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git status &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git add . &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git commit -m "second" &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -- dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure &&
+	git reset --soft &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure
+
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir2/
+
+nothing added to commit but untracked files present (use "git add" to track)
+[main 5070ba9] second
  Author: A U Thor <author@example.com>
- 6 files changed, 4 insertions(+), 4 deletions(-)
- delete mode 100644 x/a
- delete mode 100644 x/b
- create mode 100644 z/a
- create mode 100644 z/b
-Note: switching to 'A^0'.
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir2/file1.txt
+ create mode 100644 dir2/file2.txt
+ok 2 - test status, add, commit, others trigger hook without flags set
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7113.3 'test checkout and reset trigger the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$1" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_workdir set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_workdir set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "update_workdir should be set for checkout" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout main &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout HEAD &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --hard &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -B test &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Already on 'main'
+HEAD is now at 5070ba9 second
+Switched to a new branch 'test'
+ok 3 - test checkout and reset trigger the hook
 
-  git switch -c <new-branch-name>
+expecting success of 7113.4 'test reset --mixed and update-index triggers the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$2" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_skipworktree set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --mixed --quiet HEAD~1 &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git hash-object -w --stdin <dir1/file2.txt >expect &&
+	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index --skip-worktree dir1/file2.txt &&
+	git update-index --remove dir1/file2.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
 
-Or undo this operation with:
+ok 4 - test reset --mixed and update-index triggers the hook
 
-  git switch -
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7105-reset-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7105-reset-patch/.git/
+expecting success of 7105.1 'setup': 
+	mkdir dir &&
+	echo parent > dir/foo &&
+	echo dummy > bar &&
+	git add dir &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
 
-Turn off this advice by setting config variable advice.detachedHead to false
+[master (root-commit) e9a8876] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/foo
+[master 3877f48] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-HEAD is now at 8d5e46a A
-Merge made by the 'ort' strategy.
- x/a | 1 -
- x/b | 1 -
- y/a | 2 +-
- y/b | 2 +-
- z/a | 1 +
- z/b | 1 +
- 6 files changed, 4 insertions(+), 4 deletions(-)
- delete mode 100644 x/a
- delete mode 100644 x/b
- create mode 100644 z/a
- create mode 100644 z/b
-ok 28 - 8b: Dual-directory rename, one into the others way, with conflicting filenames
+expecting success of 7105.2 'saying "n" does nothing': 
+	set_and_save_state dir/foo work work &&
+	test_write_lines n n | git reset -p &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
 
-expecting success of 6423.29 '8c: modify/delete or rename+modify/delete': 
-	test_setup_8c &&
-	(
-		cd 8c &&
+diff --git a/bar b/bar
+new file mode 100644
+index 0000000..7780244
+--- /dev/null
++++ b/bar
+@@ -0,0 +1 @@
++bar_index
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 2 - saying "n" does nothing
 
-		git checkout A^0 &&
+expecting success of 7105.3 'git reset -p HEAD': 
+		set_and_save_state dir/foo work work &&
+		test_write_lines n y | git reset -p $opt >output &&
+		verify_state dir/foo work head &&
+		verify_saved_state bar &&
+		test_grep "Unstage" output
+	
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 3 - git reset -p HEAD
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "CONFLICT (modify/delete).* z/d" out &&
+expecting success of 7105.4 'git reset -p @': 
+		set_and_save_state dir/foo work work &&
+		test_write_lines n y | git reset -p $opt >output &&
+		verify_state dir/foo work head &&
+		verify_saved_state bar &&
+		test_grep "Unstage" output
+	
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 4 - git reset -p @
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+expecting success of 7105.5 'git reset -p ': 
+		set_and_save_state dir/foo work work &&
+		test_write_lines n y | git reset -p $opt >output &&
+		verify_state dir/foo work head &&
+		verify_saved_state bar &&
+		test_grep "Unstage" output
+	
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 5 - git reset -p 
 
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:y/e :1:z/d :3:z/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  B:z/e  O:z/d  B:z/d &&
-		test_cmp expect actual &&
+expecting success of 7105.6 'git reset -p HEAD^': 
+	test_write_lines n y | git reset -p HEAD^ >output &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar &&
+	test_grep "Apply" output
 
-		test_must_fail git rev-parse :2:z/d &&
-		git ls-files -s z/d | grep ^100755 &&
-		test_path_is_file z/d &&
-		test_path_is_missing y/d
-	)
+(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
+(1/1) Apply this hunk to index [y,n,q,a,d,e,p,?]? 
+ok 6 - git reset -p HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8c/.git/
-[master (root-commit) a8ba9b3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A d5ba1c0] A
- Author: A U Thor <author@example.com>
- 3 files changed, 10 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 1757e3f] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 10 deletions(-)
- mode change 100644 => 100755 z/d
- create mode 100644 z/e
-Note: switching to 'A^0'.
+expecting success of 7105.7 'git reset -p HEAD^^{tree}': 
+	test_write_lines n y | git reset -p HEAD^^{tree} >output &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar &&
+	test_grep "Apply" output
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+(1/1) Apply deletion to index [y,n,q,a,d,p,?]? 
+ok 7 - git reset -p HEAD^^{tree}
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7105.8 'git reset -p HEAD^:dir/foo (blob fails)': 
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p HEAD^:dir/foo &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
 
-  git switch -c <new-branch-name>
+fatal: Could not parse object 'HEAD^:dir/foo'.
+ok 8 - git reset -p HEAD^:dir/foo (blob fails)
 
-Or undo this operation with:
+expecting success of 7105.9 'git reset -p aaaaaaaa (unknown fails)': 
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p aaaaaaaa &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
 
-  git switch -
+fatal: ambiguous argument 'aaaaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 9 - git reset -p aaaaaaaa (unknown fails)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7105.10 'git reset -p dir': 
+	set_state dir/foo work work &&
+	test_write_lines y n | git reset -p dir &&
+	verify_state dir/foo work head &&
+	verify_saved_state bar
 
-HEAD is now at d5ba1c0 A
-CONFLICT (modify/delete): z/d deleted in HEAD and modified in B^0.  Version B^0 of z/d left in tree.
-fatal: path 'z/d' is in the index, but not at stage 2
-hint: Did you mean ':1:z/d'?
-:2:z/d
-100755 b4de3947675361a7770d29b8982c407b0ec6b2a0 3	z/d
-ok 29 - 8c: modify/delete or rename+modify/delete
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 10 - git reset -p dir
 
-expecting success of 6423.30 '8d: rename/delete...or not?': 
-	test_setup_8d &&
-	(
-		cd 8d &&
+expecting success of 7105.11 'git reset -p -- foo (inside dir)': 
+	set_state dir/foo work work &&
+	test_write_lines y n | (cd dir && git reset -p -- foo) &&
+	verify_state dir/foo work head &&
+	verify_saved_state bar
 
-		git checkout A^0 &&
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Unstage this hunk [y,n,q,a,d,e,p,?]? 
+ok 11 - git reset -p -- foo (inside dir)
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7105.12 'git reset -p HEAD^ -- dir': 
+	test_write_lines y n | git reset -p HEAD^ -- dir &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index [y,n,q,a,d,e,p,?]? 
+ok 12 - git reset -p HEAD^ -- dir
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/e &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/e &&
-		test_cmp expect actual
-	)
+expecting success of 7105.13 'none of this moved HEAD': 
+	verify_saved_head
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8d/.git/
-[master (root-commit) a8ba9b3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-rm 'z/d'
-[A d5ba1c0] A
- Author: A U Thor <author@example.com>
- 3 files changed, 10 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- delete mode 100644 z/d
-Switched to branch 'B'
-[B 12eaccc] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/e
-Note: switching to 'A^0'.
+ok 13 - none of this moved HEAD
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7064-wtstatus-pv2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7064-wtstatus-pv2/.git/
+expecting success of 7064.1 'setup': 
+	git checkout -f --orphan initial-branch &&
+	test_tick &&
+	git config core.autocrlf false &&
+	echo x >file_x &&
+	echo y >file_y &&
+	echo z >file_z &&
+	mkdir dir1 &&
+	echo a >dir1/file_a &&
+	echo b >dir1/file_b
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Switched to a new branch 'initial-branch'
+ok 1 - setup
 
-  git switch -c <new-branch-name>
+expecting success of 7064.2 'before initial commit, nothing added, only untracked': 
+	cat >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head initial-branch
+	? actual
+	? dir1/
+	? expect
+	? file_x
+	? file_y
+	? file_z
+	EOF
 
-Or undo this operation with:
+	git status --porcelain=v2 --branch --untracked-files=normal >actual &&
+	test_cmp expect actual
 
-  git switch -
+ok 2 - before initial commit, nothing added, only untracked
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.3 'before initial commit, things added': 
+	git add file_x file_y file_z dir1 &&
+	OID_A=$(git hash-object -t blob -- dir1/file_a) &&
+	OID_B=$(git hash-object -t blob -- dir1/file_b) &&
+	OID_X=$(git hash-object -t blob -- file_x) &&
+	OID_Y=$(git hash-object -t blob -- file_y) &&
+	OID_Z=$(git hash-object -t blob -- file_z) &&
 
-HEAD is now at d5ba1c0 A
-Path updated: z/e added in B^0 inside a directory that was renamed in HEAD; moving it to y/e.
-Merge made by the 'ort' strategy.
- y/e | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 y/e
-ok 30 - 8d: rename/delete...or not?
+	cat >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head initial-branch
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
+	? actual
+	? expect
+	EOF
 
-expecting success of 6423.31 '8e: Both sides rename, one side adds to original directory': 
-	test_setup_8e &&
-	(
-		cd 8e &&
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-		git checkout A^0 &&
+ok 3 - before initial commit, things added
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_grep CONFLICT.*rename/rename.*z/c.*y/c.*w/c out &&
-		test_grep CONFLICT.*rename/rename.*z/b.*y/b.*w/b out &&
+expecting success of 7064.4 'before initial commit, things added (-z)': 
+	lf_to_nul >expect <<-EOF &&
+	# branch.oid (initial)
+	# branch.head initial-branch
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Y file_y
+	1 A. N... 000000 100644 100644 $ZERO_OID $OID_Z file_z
+	? actual
+	? expect
+	EOF
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
+	git status -z --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-		git rev-parse >actual \
-			:1:z/b :2:y/b :3:w/b :1:z/c :2:y/c :3:w/c :0:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/b  O:z/b  O:z/c  O:z/c  O:z/c  B:z/d &&
-		test_cmp expect actual &&
+ok 4 - before initial commit, things added (-z)
 
-		git hash-object >actual \
-			y/b   w/b   y/c   w/c &&
-		git rev-parse >expect \
-			O:z/b O:z/b O:z/c O:z/c &&
-		test_cmp expect actual &&
+expecting success of 7064.5 'make first commit, confirm HEAD oid and branch': 
+	git commit -m initial &&
+	H0=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	? actual
+	? expect
+	EOF
 
-		test_path_is_missing z/b &&
-		test_path_is_missing z/c
-	)
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/8e/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 7a02f25] B
+[initial-branch (root-commit) bbc01be] initial
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => w}/b (100%)
- rename {z => w}/c (100%)
- create mode 100644 z/d
-Note: switching to 'A^0'.
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/file_a
+ create mode 100644 dir1/file_b
+ create mode 100644 file_x
+ create mode 100644 file_y
+ create mode 100644 file_z
+ok 5 - make first commit, confirm HEAD oid and branch
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.6 'after first commit, create unstaged changes': 
+	echo x >>file_x &&
+	OID_X1=$(git hash-object -t blob -- file_x) &&
+	rm file_z &&
+	H0=$(git rev-parse HEAD) &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
+	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
+	? actual
+	? expect
+	EOF
 
-  git switch -c <new-branch-name>
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 6 - after first commit, create unstaged changes
 
-  git switch -
+expecting success of 7064.7 'after first commit, stash existing changes': 
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	# stash 2
+	EOF
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	test_when_finished "git stash pop && git stash pop" &&
 
-HEAD is now at 4e9f86d A
-CONFLICT (rename/rename): z/c renamed to y/c in HEAD and to w/c in B^0.
-CONFLICT (rename/rename): z/b renamed to y/b in HEAD and to w/b in B^0.
-ok 31 - 8e: Both sides rename, one side adds to original directory
+	git stash -- file_x &&
+	git stash &&
+	git status --porcelain=v2 --branch --show-stash --untracked-files=no >actual &&
+	test_cmp expect actual
 
-expecting success of 6423.32 '9a: Inner renamed directory within outer renamed directory': 
-	test_setup_9a &&
-	(
-		cd 9a &&
+Saved working directory and index state WIP on initial-branch: bbc01be initial
+Saved working directory and index state WIP on initial-branch: bbc01be initial
+Merging Version stash was based on with Stashed changes
+On branch initial-branch
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    file_z
 
-		git checkout A^0 &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (7d6b8e1b8ed7cd9791a23d6b5ab65250a4f45aff)
+Merging Version stash was based on with Stashed changes
+On branch initial-branch
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file_x
+	deleted:    file_z
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/i &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    B:z/i &&
-		test_cmp expect actual &&
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (eee214d8ade22cdf92454c5294f0fc57fe772547)
+ok 7 - after first commit, stash existing changes
 
-		git rev-parse >actual \
-			HEAD:x/w/e HEAD:x/w/f HEAD:x/w/g HEAD:x/w/h &&
-		git rev-parse >expect \
-			O:z/d/e    O:z/d/f    O:z/d/g    B:z/d/h &&
-		test_cmp expect actual
-	)
+expecting success of 7064.8 'after first commit but omit untracked files and branch': 
+	cat >expect <<-EOF &&
+	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
+	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
+	EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9a/.git/
-[master (root-commit) ad6f8a2] O
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d/e
- create mode 100644 z/d/f
- create mode 100644 z/d/g
-Switched to branch 'A'
-[A 9bfe686] A
- Author: A U Thor <author@example.com>
- 5 files changed, 0 insertions(+), 0 deletions(-)
- rename {z/d => x/w}/e (100%)
- rename {z/d => x/w}/f (100%)
- rename {z/d => x/w}/g (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 004af77] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d/h
- create mode 100644 z/i
-Note: switching to 'A^0'.
+	git status --porcelain=v2 --untracked-files=no >actual &&
+	test_cmp expect actual
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 8 - after first commit but omit untracked files and branch
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7064.9 'after first commit, stage existing changes': 
+	git add file_x &&
+	git rm file_z &&
+	H0=$(git rev-parse HEAD) &&
 
-  git switch -c <new-branch-name>
+	cat >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	? actual
+	? expect
+	EOF
 
-Or undo this operation with:
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-  git switch -
+rm 'file_z'
+ok 9 - after first commit, stage existing changes
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.10 'rename causes 2 path lines': 
+	git mv file_y renamed_y &&
+	H0=$(git rev-parse HEAD) &&
 
-HEAD is now at 9bfe686 A
-Path updated: z/d/h added in B^0 inside a directory that was renamed in HEAD; moving it to x/w/h.
-Path updated: z/i added in B^0 inside a directory that was renamed in HEAD; moving it to y/i.
-Merge made by the 'ort' strategy.
- x/w/h | 1 +
- y/i   | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 x/w/h
- create mode 100644 y/i
-ok 32 - 9a: Inner renamed directory within outer renamed directory
+	q_to_tab >expect <<-EOF &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
+	? actual
+	? expect
+	EOF
 
-expecting success of 6423.33 '9b: Transitive rename with content merge': 
-	test_setup_9b &&
-	(
-		cd 9b &&
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-		git checkout A^0 &&
+ok 10 - rename causes 2 path lines
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7064.11 'rename causes 2 path lines (-z)': 
+	H0=$(git rev-parse HEAD) &&
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+	## Lines use NUL path separator and line terminator, so double transform here.
+	q_to_nul <<-EOF | lf_to_nul >expect &&
+	# branch.oid $H0
+	# branch.head initial-branch
+	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
+	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
+	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
+	? actual
+	? expect
+	EOF
 
-		test_seq 0 11 >expected &&
-		test_cmp expected y/d &&
-		git add expected &&
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    :0:expected &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:x/d &&
-		test_must_fail git rev-parse HEAD:z/d &&
-		test_path_is_missing z/d &&
+	git status --porcelain=v2 --branch --untracked-files=all -z >actual &&
+	test_cmp expect actual
 
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse O:x/d) &&
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse A:x/d) &&
-		test $(git rev-parse HEAD:y/d) != $(git rev-parse B:z/d)
-	)
+ok 11 - rename causes 2 path lines (-z)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9b/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B ded5d1d] B
+expecting success of 7064.12 'make second commit, confirm clean and new HEAD oid': 
+	git commit -m second &&
+	H1=$(git rev-parse HEAD) &&
+
+	cat >expect <<-EOF &&
+	# branch.oid $H1
+	# branch.head initial-branch
+	? actual
+	? expect
+	EOF
+
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
+
+[initial-branch 84bf28d] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (91%)
-Note: switching to 'A^0'.
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 file_z
+ rename file_y => renamed_y (100%)
+ok 12 - make second commit, confirm clean and new HEAD oid
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.13 'confirm ignored files are not printed': 
+	test_when_finished "rm -f x.ign .gitignore" &&
+	echo x.ign >.gitignore &&
+	echo "ignore me" >x.ign &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	cat >expect <<-EOF &&
+	? .gitignore
+	? actual
+	? expect
+	EOF
 
-  git switch -c <new-branch-name>
+	git status --porcelain=v2 --untracked-files=all >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 13 - confirm ignored files are not printed
 
-  git switch -
+expecting success of 7064.14 'ignored files are printed with --ignored': 
+	test_when_finished "rm -f x.ign .gitignore" &&
+	echo x.ign >.gitignore &&
+	echo "ignore me" >x.ign &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	cat >expect <<-EOF &&
+	? .gitignore
+	? actual
+	? expect
+	! x.ign
+	EOF
 
-HEAD is now at a2010ab A
-Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
-Auto-merging y/d
-Merge made by the 'ort' strategy.
- {x => y}/d | 1 +
- 1 file changed, 1 insertion(+)
- rename {x => y}/d (92%)
-fatal: path 'x/d' does not exist in 'HEAD'
-HEAD:x/d
-fatal: path 'z/d' does not exist in 'HEAD'
-HEAD:z/d
-ok 33 - 9b: Transitive rename with content merge
+	git status --porcelain=v2 --ignored --untracked-files=all >actual &&
+	test_cmp expect actual
 
-expecting success of 6423.34 '9c: Doubly transitive rename?': 
-	test_setup_9c &&
-	(
-		cd 9c &&
+ok 14 - ignored files are printed with --ignored
 
-		git checkout A^0 &&
+expecting success of 7064.15 'create and commit permanent ignore file': 
+	cat >.gitignore <<-EOF &&
+	actual*
+	expect*
+	EOF
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "WARNING: Avoiding applying x -> z rename to x/f" out &&
+	git add .gitignore &&
+	git commit -m ignore_trash &&
+	H1=$(git rev-parse HEAD) &&
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	cat >expect <<-EOF &&
+	# branch.oid $H1
+	# branch.head initial-branch
+	EOF
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:y/e HEAD:x/f HEAD:x/g &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    O:x/d    O:x/e    O:w/f    A:x/g &&
-		test_cmp expect actual
-	)
+	git status --porcelain=v2 --branch >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9c/.git/
-[master (root-commit) f3e903b] O
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 w/f
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 8a6c5f2] A
- Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {w => x}/f (100%)
- create mode 100644 x/g
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B 3f509fc] B
+[initial-branch f09abb9] ignore_trash
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
- rename {x => z}/e (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ok 15 - create and commit permanent ignore file
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.16 'verify --intent-to-add output': 
+	test_when_finished "git rm -f intent1.add intent2.add" &&
+	touch intent1.add &&
+	echo test >intent2.add &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git add --intent-to-add intent1.add intent2.add &&
 
-  git switch -c <new-branch-name>
+	cat >expect <<-EOF &&
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent1.add
+	1 .A N... 000000 000000 100644 $ZERO_OID $ZERO_OID intent2.add
+	EOF
 
-Or undo this operation with:
+	git status --porcelain=v2 >actual &&
+	test_cmp expect actual
 
-  git switch -
+rm 'intent1.add'
+rm 'intent2.add'
+ok 16 - verify --intent-to-add output
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.17 'verify AA (add-add) conflict': 
+	test_when_finished "git reset --hard" &&
 
-HEAD is now at 8a6c5f2 A
-WARNING: Avoiding applying x -> z rename to x/f, because z itself was renamed.
-ok 34 - 9c: Doubly transitive rename?
+	git branch AA_A initial-branch &&
+	git checkout AA_A &&
+	echo "Branch AA_A" >conflict.txt &&
+	OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch aa_a" &&
 
-expecting success of 6423.35 '9d: N-way transitive rename?': 
-	test_setup_9d &&
-	(
-		cd 9d &&
+	git branch AA_B initial-branch &&
+	git checkout AA_B &&
+	echo "Branch AA_B" >conflict.txt &&
+	OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch aa_b" &&
 
-		git checkout A^0 &&
+	git branch AA_M AA_B &&
+	git checkout AA_M &&
+	test_must_fail git merge AA_A &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_grep "WARNING: Avoiding applying z -> y rename to z/t" out &&
-		test_grep "WARNING: Avoiding applying y -> x rename to y/a" out &&
-		test_grep "WARNING: Avoiding applying x -> w rename to x/b" out &&
-		test_grep "WARNING: Avoiding applying w -> v rename to w/c" out &&
+	HM=$(git rev-parse HEAD) &&
 
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
+	cat >expect <<-EOF &&
+	# branch.oid $HM
+	# branch.head AA_M
+	u AA N... 000000 100644 100644 100644 $ZERO_OID $OID_AA_B $OID_AA_A conflict.txt
+	EOF
 
-		git rev-parse >actual \
-			HEAD:z/t \
-			HEAD:y/a HEAD:x/b HEAD:w/c \
-			HEAD:u/d HEAD:u/e HEAD:u/f &&
-		git rev-parse >expect \
-			B:z/t    \
-			O:z/a    O:y/b    O:x/c    \
-			O:w/d    O:v/e    A:u/f &&
-		test_cmp expect actual
-	)
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9d/.git/
-[master (root-commit) a77ae1c] O
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 u/f
- create mode 100644 v/e
- create mode 100644 w/d
- create mode 100644 x/c
- create mode 100644 y/b
- create mode 100644 z/a
-Switched to branch 'A'
-[A 67d374b] A
+Switched to branch 'AA_A'
+[AA_A 55eca05] branch aa_a
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {v => u}/e (100%)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
-Switched to branch 'B'
-[B 9c7db88] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'AA_B'
+[AA_B 307553c] branch aa_b
  Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {w => v}/d (100%)
- rename {y => x}/b (100%)
- create mode 100644 z/t
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'AA_M'
+Auto-merging conflict.txt
+CONFLICT (add/add): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 307553c branch aa_b
+ok 17 - verify AA (add-add) conflict
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.18 'verify UU (edit-edit) conflict': 
+	test_when_finished "git reset --hard" &&
 
-HEAD is now at 67d374b A
-WARNING: Avoiding applying z -> y rename to z/t, because y itself was renamed.
-WARNING: Avoiding applying y -> x rename to y/a, because x itself was renamed.
-WARNING: Avoiding applying x -> w rename to x/b, because w itself was renamed.
-WARNING: Avoiding applying w -> v rename to w/c, because v itself was renamed.
-ok 35 - 9d: N-way transitive rename?
+	git branch UU_ANC initial-branch &&
+	git checkout UU_ANC &&
+	echo "Ancestor" >conflict.txt &&
+	OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "UU_ANC" &&
 
-expecting success of 6423.36 '9e: N-to-1 whammo': 
-	test_setup_9e &&
-	(
-		cd 9e &&
+	git branch UU_A UU_ANC &&
+	git checkout UU_A &&
+	echo "Branch UU_A" >conflict.txt &&
+	OID_UU_A=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch uu_a" &&
 
-		git checkout A^0 &&
+	git branch UU_B UU_ANC &&
+	git checkout UU_B &&
+	echo "Branch UU_B" >conflict.txt &&
+	OID_UU_B=$(git hash-object -t blob -- conflict.txt) &&
+	git add conflict.txt &&
+	git commit -m "branch uu_b" &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		grep "CONFLICT (implicit dir rename): Cannot map more than one path to combined/yo" out >error_line &&
-		grep -q dir1/yo error_line &&
-		grep -q dir2/yo error_line &&
-		grep -q dir3/yo error_line &&
-		grep -q dirN/yo error_line &&
+	git branch UU_M UU_B &&
+	git checkout UU_M &&
+	test_must_fail git merge UU_A &&
 
-		git ls-files -s >out &&
-		test_line_count = 16 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
+	HM=$(git rev-parse HEAD) &&
 
-		git rev-parse >actual \
-			:0:combined/a :0:combined/b :0:combined/c \
-			:0:combined/d :0:combined/e :0:combined/f \
-			:0:combined/g :0:combined/h :0:combined/i \
-			:0:combined/j :0:combined/k :0:combined/l &&
-		git rev-parse >expect \
-			 O:dir1/a      O:dir1/b      A:dir1/c \
-			 O:dir2/d      O:dir2/e      A:dir2/f \
-			 O:dir3/g      O:dir3/h      A:dir3/i \
-			 O:dirN/j      O:dirN/k      A:dirN/l &&
-		test_cmp expect actual &&
+	cat >expect <<-EOF &&
+	# branch.oid $HM
+	# branch.head UU_M
+	u UU N... 100644 100644 100644 100644 $OID_UU_ANC $OID_UU_B $OID_UU_A conflict.txt
+	EOF
 
-		git rev-parse >actual \
-			:0:dir1/yo :0:dir2/yo :0:dir3/yo :0:dirN/yo &&
-		git rev-parse >expect \
-			 A:dir1/yo  A:dir2/yo  A:dir3/yo  A:dirN/yo &&
-		test_cmp expect actual
-	)
+	git status --porcelain=v2 --branch --untracked-files=all >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9e/.git/
-[master (root-commit) 6b1b942] O
+Switched to branch 'UU_ANC'
+[UU_ANC 70071ed] UU_ANC
  Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
- create mode 100644 dir1/a
- create mode 100644 dir1/b
- create mode 100644 dir2/d
- create mode 100644 dir2/e
- create mode 100644 dir3/g
- create mode 100644 dir3/h
- create mode 100644 dirN/j
- create mode 100644 dirN/k
-Switched to branch 'A'
-[A 1129f61] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflict.txt
+Switched to branch 'UU_A'
+[UU_A a088b5d] branch uu_a
  Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
- create mode 100644 dir1/c
- create mode 100644 dir1/yo
- create mode 100644 dir2/f
- create mode 100644 dir2/yo
- create mode 100644 dir3/i
- create mode 100644 dir3/yo
- create mode 100644 dirN/l
- create mode 100644 dirN/yo
-Switched to branch 'B'
-[B e5547de] B
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'UU_B'
+[UU_B c5f3cc7] branch uu_b
  Author: A U Thor <author@example.com>
- 8 files changed, 0 insertions(+), 0 deletions(-)
- rename {dir1 => combined}/a (100%)
- rename {dir1 => combined}/b (100%)
- rename {dir2 => combined}/d (100%)
- rename {dir2 => combined}/e (100%)
- rename {dir3 => combined}/g (100%)
- rename {dir3 => combined}/h (100%)
- rename {dirN => combined}/j (100%)
- rename {dirN => combined}/k (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'UU_M'
+Auto-merging conflict.txt
+CONFLICT (content): Merge conflict in conflict.txt
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at c5f3cc7 branch uu_b
+ok 18 - verify UU (edit-edit) conflict
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.19 'verify upstream fields in branch header': 
+	git checkout initial-branch &&
+	test_when_finished "rm -rf sub_repo" &&
+	git clone . sub_repo &&
+	(
+		## Confirm local initial-branch tracks remote initial-branch.
+		cd sub_repo &&
+		HUF=$(git rev-parse HEAD) &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		EOF
 
-  git switch -c <new-branch-name>
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-Or undo this operation with:
+		## Test ahead/behind.
+		echo xyz >file_xyz &&
+		git add file_xyz &&
+		git commit -m xyz &&
 
-  git switch -
+		HUF=$(git rev-parse HEAD) &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		EOF
 
-HEAD is now at 1129f61 A
-ok 36 - 9e: N-to-1 whammo
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-expecting success of 6423.37 '9f: Renamed directory that only contained immediate subdirs': 
-	test_setup_9f &&
-	(
-		cd 9f &&
+		## Repeat the above but without --branch.
+		git status --porcelain=v2 --untracked-files=all >actual &&
+		test_must_be_empty actual &&
 
-		git checkout A^0 &&
+		## Test upstream-gone case. Fake this by pointing
+		## origin/initial-branch at a non-existing commit.
+		git update-ref -d refs/remotes/origin/initial-branch &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+		HUF=$(git rev-parse HEAD) &&
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		EOF
 
-		git rev-parse >actual \
-			HEAD:priority/a/foo \
-			HEAD:priority/b/bar \
-			HEAD:priority/b/baz \
-			HEAD:priority/c &&
-		git rev-parse >expect \
-			O:goal/a/foo \
-			O:goal/b/bar \
-			O:goal/b/baz \
-			B:goal/c &&
-		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:goal/c
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9f/.git/
-[master (root-commit) 6480e53] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 goal/a/foo
- create mode 100644 goal/b/bar
- create mode 100644 goal/b/baz
-Switched to branch 'A'
-[A 96c4122] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {goal => priority}/a/foo (100%)
- rename {goal => priority}/b/bar (100%)
- rename {goal => priority}/b/baz (100%)
-Switched to branch 'B'
-[B 08998f4] B
+Switched to branch 'initial-branch'
+Cloning into 'sub_repo'...
+done.
+[initial-branch 638bb2b] xyz
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-Note: switching to 'A^0'.
+ create mode 100644 file_xyz
+ok 19 - verify upstream fields in branch header
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.20 'verify --[no-]ahead-behind with V2 format': 
+	git checkout initial-branch &&
+	test_when_finished "rm -rf sub_repo" &&
+	git clone . sub_repo &&
+	(
+		## Confirm local initial-branch tracks remote initial-branch.
+		cd sub_repo &&
+		HUF=$(git rev-parse HEAD) &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		EOF
 
-  git switch -c <new-branch-name>
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-Or undo this operation with:
+		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		EOF
 
-  git switch -
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		## Test non-equal ahead/behind.
+		echo xyz >file_xyz &&
+		git add file_xyz &&
+		git commit -m xyz &&
 
-HEAD is now at 96c4122 A
-Path updated: goal/c added in B^0 inside a directory that was renamed in HEAD; moving it to priority/c.
-Merge made by the 'ort' strategy.
- priority/c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 priority/c
-fatal: path 'goal/c' does not exist in 'HEAD'
-HEAD:goal/c
-ok 37 - 9f: Renamed directory that only contained immediate subdirs
+		HUF=$(git rev-parse HEAD) &&
 
-checking known breakage of 6423.38 '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed': 
-	test_setup_9g &&
-	(
-		cd 9g &&
+		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +? -?
+		EOF
 
-		git checkout A^0 &&
+		git status --no-ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
+		cat >expect <<-EOF &&
+		# branch.oid $HUF
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		EOF
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+		git status --ahead-behind --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual &&
 
-		git rev-parse >actual \
-			HEAD:priority/alpha/foo \
-			HEAD:priority/beta/bar  \
-			HEAD:priority/beta/baz  \
-			HEAD:priority/c &&
-		git rev-parse >expect \
-			O:goal/a/foo \
-			O:goal/b/bar \
-			O:goal/b/baz \
-			B:goal/c &&
+		# Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+		git -c status.aheadbehind=false status --porcelain=v2 --branch --untracked-files=all >actual &&
 		test_cmp expect actual &&
-		test_must_fail git rev-parse HEAD:goal/c
+
+		# Confirm that "status.aheadbehind" DOES NOT work on V2 format.
+		git -c status.aheadbehind=true status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9g/.git/
-[master (root-commit) 6480e53] O
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 goal/a/foo
- create mode 100644 goal/b/bar
- create mode 100644 goal/b/baz
-Switched to branch 'A'
-[A f7fdc05] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {goal/a => priority/alpha}/foo (100%)
- rename {goal/b => priority/beta}/bar (100%)
- rename {goal/b => priority/beta}/baz (100%)
-Switched to branch 'B'
-[B 08998f4] B
+Already on 'initial-branch'
+Cloning into 'sub_repo'...
+done.
+[initial-branch 638bb2b] xyz
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-Note: switching to 'A^0'.
+ create mode 100644 file_xyz
+ok 20 - verify --[no-]ahead-behind with V2 format
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.21 'create and add submodule, submodule appears clean (A. S...)': 
+	git checkout initial-branch &&
+	git clone . sub_repo &&
+	git clone . super_repo &&
+	test_config_global protocol.file.allow always &&
+	(	cd super_repo &&
+		git submodule add ../sub_repo sub1 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		## Confirm stage/add of clean submodule.
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-  git switch -c <new-branch-name>
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-Or undo this operation with:
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-  git switch -
+Already on 'initial-branch'
+Cloning into 'sub_repo'...
+done.
+Cloning into 'super_repo'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7064-wtstatus-pv2/super_repo/sub1'...
+done.
+ok 21 - create and add submodule, submodule appears clean (A. S...)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.22 'untracked changes in added submodule (AM S..U)': 
+	(	cd super_repo &&
+		## create untracked file in the submodule.
+		(	cd sub1 &&
+			echo "xxxx" >file_in_sub
+		) &&
 
-HEAD is now at f7fdc05 A
-Merge made by the 'ort' strategy.
- goal/c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 goal/c
-fatal: path 'priority/c' does not exist in 'HEAD'
-not ok 38 - 9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed # TODO known breakage
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-expecting success of 6423.39 '9h: Avoid dir rename on merely modified path': 
-	test_setup_9h &&
-	(
-		cd 9h &&
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-		git checkout A^0 &&
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+ok 22 - untracked changes in added submodule (AM S..U)
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
+expecting success of 7064.23 'staged changes in added submodule (AM S.M.)': 
+	(	cd super_repo &&
+		## stage the changes in the submodule.
+		(	cd sub1 &&
+			git add file_in_sub
+		) &&
 
-		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:x/d &&
-		git rev-parse >expect \
-			O:z/b    O:z/c    A:z/d &&
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
 		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/9h/.git/
-[master (root-commit) 714b322] O
- Author: A U Thor <author@example.com>
- 3 files changed, 11 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
- create mode 100644 z/d
-Switched to branch 'A'
-[A d51a99d] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 0435868] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Note: switching to 'A^0'.
+ok 23 - staged changes in added submodule (AM S.M.)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.24 'staged and unstaged changes in added (AM S.M.)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## make additional unstaged changes (on the same file) in the submodule.
+			## This does not cause us to get S.MU (because the submodule does not report
+			## a "?" line for the unstaged changes).
+			echo "more changes" >>file_in_sub
+		) &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-  git switch -c <new-branch-name>
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-Or undo this operation with:
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-  git switch -
+ok 24 - staged and unstaged changes in added (AM S.M.)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7064.25 'staged and untracked changes in added submodule (AM S.MU)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## stage new changes in tracked file.
+			git add file_in_sub &&
+			## create new untracked file.
+			echo "yyyy" >>another_file_in_sub
+		) &&
 
-HEAD is now at d51a99d A
-Merge made by the 'ort' strategy.
- {z => x}/d | 0
- {z => y}/b | 0
- {z => y}/c | 0
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => x}/d (100%)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-ok 39 - 9h: Avoid dir rename on merely modified path
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-expecting success of 6423.40 '10a: Overwrite untracked with normal rename/delete': 
-	test_setup_10a &&
-	(
-		cd 10a &&
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-		git checkout A^0 &&
-		echo very >z/c &&
-		echo important >z/d &&
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		test_grep "The following untracked working tree files would be overwritten by merge" err &&
+ok 25 - staged and untracked changes in added submodule (AM S.MU)
 
-		git ls-files -s >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+expecting success of 7064.26 'commit within the submodule appears as new commit in super (AM SC..)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			## Make a new commit in the submodule.
+			git add file_in_sub &&
+			rm -f another_file_in_sub &&
+			git commit -m "new commit"
+		) &&
 
-		echo very >expect &&
-		test_cmp expect z/c &&
+		HMOD=$(git hash-object -t blob -- .gitmodules) &&
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$HSUP &&
 
-		echo important >expect &&
-		test_cmp expect z/d &&
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +0 -0
+		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
+		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
+		EOF
 
-		git rev-parse HEAD:z/b >actual &&
-		git rev-parse O:z/b >expect &&
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
 		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10a/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'z/c'
-[A bc21cd8] A
+[initial-branch 49ed2bd] new commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 z/c
-Switched to branch 'B'
-[B 7bb44f1] B
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file_in_sub
+ok 26 - commit within the submodule appears as new commit in super (AM SC..)
+
+expecting success of 7064.27 'stage submodule in super and commit': 
+	(	cd super_repo &&
+		## Stage the new submodule commit in the super.
+		git add sub1 &&
+		## Commit the super so that the sub no longer appears as added.
+		git commit -m "super commit" &&
+
+		HSUP=$(git rev-parse HEAD) &&
+
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		EOF
+
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
+
+[initial-branch 9939ebd] super commit
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename z/{c => d} (100%)
-Note: switching to 'A^0'.
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 27 - stage submodule in super and commit
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7064.28 'make unstaged changes in existing submodule (.M S.M.)': 
+	(	cd super_repo &&
+		(	cd sub1 &&
+			echo "zzzz" >>file_in_sub
+		) &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+		HSUP=$(git rev-parse HEAD) &&
+		HSUB=$(cd sub1 && git rev-parse HEAD) &&
 
-  git switch -c <new-branch-name>
+		cat >expect <<-EOF &&
+		# branch.oid $HSUP
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
+		# branch.ab +1 -0
+		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
+		EOF
 
-Or undo this operation with:
+		git status --porcelain=v2 --branch --untracked-files=all >actual &&
+		test_cmp expect actual
+	)
 
-  git switch -
+ok 28 - make unstaged changes in existing submodule (.M S.M.)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7110-reset-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7110-reset-merge/.git/
+expecting success of 7110.1 'setup': 
+	printf "line %d\n" 1 2 3 >file1 &&
+	cat file1 >file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git tag initial &&
+	echo line 4 >>file1 &&
+	cat file1 >file2 &&
+	test_tick &&
+	git commit -m "add line 4 to file1" file1 &&
+	git tag second
 
-HEAD is now at bc21cd8 A
-error: The following untracked working tree files would be overwritten by merge:
-ok 40 - 10a: Overwrite untracked with normal rename/delete
+[master (root-commit) 294b13e] Initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+[master 91b6f65] add line 4 to file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-expecting success of 6423.41 '10b: Overwrite untracked with dir rename + delete': 
-	test_setup_10b &&
-	(
-		cd 10b &&
+expecting success of 7110.2 'reset --merge is ok with changes in file it does not touch': 
+	git reset --merge HEAD^ &&
+	! grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
 
-		git checkout A^0 &&
-		echo very >y/c &&
-		echo important >y/d &&
-		echo contents >y/e &&
+line 4
+ok 2 - reset --merge is ok with changes in file it does not touch
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
+expecting success of 7110.3 'reset --merge is ok when switching back': 
+	git reset --merge second &&
+	grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
 
-			git ls-files -s >out &&
-			test_line_count = 1 out &&
-			git ls-files -u >out &&
-			test_line_count = 0 out &&
-			git ls-files -o >out &&
-			test_line_count = 5 out
-		else
-			test_grep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
-			test_grep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+line 4
+line 4
+ok 3 - reset --merge is ok when switching back
 
-			git ls-files -s >out &&
-			test_line_count = 3 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 5 out &&
+expecting success of 7110.4 'reset --keep is ok with changes in file it does not touch': 
+	git reset --hard second &&
+	cat file1 >file2 &&
+	git reset --keep HEAD^ &&
+	! grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
 
-			git rev-parse >actual \
-				:0:y/b :3:y/d :3:y/e &&
-			git rev-parse >expect \
-				O:z/b  O:z/c  B:z/e &&
-			test_cmp expect actual
-		fi &&
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 4 - reset --keep is ok with changes in file it does not touch
 
-		echo very >expect &&
-		test_cmp expect y/c &&
+expecting success of 7110.5 'reset --keep is ok when switching back': 
+	git reset --keep second &&
+	grep 4 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
 
-		echo important >expect &&
-		test_cmp expect y/d &&
+line 4
+line 4
+ok 5 - reset --keep is ok when switching back
 
-		echo contents >expect &&
-		test_cmp expect y/e
-	)
+expecting success of 7110.6 'reset --merge discards changes added to index (1)': 
+	git reset --hard second &&
+	cat file1 >file2 &&
+	echo "line 5" >> file1 &&
+	git add file1 &&
+	git reset --merge HEAD^ &&
+	! grep 4 file1 &&
+	! grep 5 file1 &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10b/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-rm 'z/c'
-[A 3a1dd27] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename {z => y}/b (100%)
- delete mode 100644 z/c
-Switched to branch 'B'
-[B 13c0b2e] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename z/{c => d} (100%)
- create mode 100644 z/e
-Note: switching to 'A^0'.
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 6 - reset --merge discards changes added to index (1)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7110.7 'reset --merge is ok again when switching back (1)': 
+	git reset --hard initial &&
+	echo "line 5" >> file2 &&
+	git add file2 &&
+	git reset --merge second &&
+	! grep 4 file2 &&
+	! grep 5 file1 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+HEAD is now at 294b13e Initial commit
+line 4
+ok 7 - reset --merge is ok again when switching back (1)
 
-  git switch -c <new-branch-name>
+expecting success of 7110.8 'reset --keep fails with changes in index in files it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	git add file1 &&
+	test_must_fail git reset --keep HEAD^
 
-Or undo this operation with:
+HEAD is now at 91b6f65 add line 4 to file1
+error: Entry 'file1' would be overwritten by merge. Cannot merge.
+fatal: Could not reset index file to revision 'HEAD^'.
+ok 8 - reset --keep fails with changes in index in files it touches
 
-  git switch -
+expecting success of 7110.9 'reset --merge discards changes added to index (2)': 
+	git reset --hard second &&
+	echo "line 4" >> file2 &&
+	git add file2 &&
+	git reset --merge HEAD^ &&
+	! grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --cached)"
 
-Turn off this advice by setting config variable advice.detachedHead to false
+HEAD is now at 91b6f65 add line 4 to file1
+ok 9 - reset --merge discards changes added to index (2)
 
-HEAD is now at 3a1dd27 A
-error: The following untracked working tree files would be overwritten by merge:
-ok 41 - 10b: Overwrite untracked with dir rename + delete
+expecting success of 7110.10 'reset --merge is ok again when switching back (2)': 
+	git reset --hard initial &&
+	git reset --merge second &&
+	! grep 4 file2 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
 
-expecting success of 6423.42 '10c1: Overwrite untracked with dir rename/rename(1to2)': 
-	test_setup_10c 1 &&
-	(
-		cd 10c_1 &&
+HEAD is now at 294b13e Initial commit
+line 4
+ok 10 - reset --merge is ok again when switching back (2)
 
-		git checkout A^0 &&
-		echo important >y/c &&
+expecting success of 7110.11 'reset --keep keeps changes it does not touch': 
+	git reset --hard second &&
+	echo "line 4" >> file2 &&
+	git add file2 &&
+	git reset --keep HEAD^ &&
+	grep 4 file2 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+	test -z "$(git diff --cached)"
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
+HEAD is now at 91b6f65 add line 4 to file1
+line 4
+ok 11 - reset --keep keeps changes it does not touch
 
-			git ls-files -s >out &&
-			test_line_count = 4 out &&
-			git ls-files -u >out &&
-			test_line_count = 0 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out
-		else
-			test_grep "CONFLICT (rename/rename)" out &&
-			test_grep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+expecting success of 7110.12 'reset --keep keeps changes when switching back': 
+	git reset --keep second &&
+	grep 4 file2 &&
+	grep 4 file1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)"
 
-			git ls-files -s >out &&
-			test_line_count = 6 out &&
-			git ls-files -u >out &&
-			test_line_count = 3 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
+line 4
+line 4
+ok 12 - reset --keep keeps changes when switching back
 
-			git rev-parse >actual \
-				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
-			git rev-parse >expect \
-				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
-			test_cmp expect actual &&
+expecting success of 7110.13 'reset --merge fails with changes in file it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	test_tick &&
+	git commit -m "add line 5" file1 &&
+	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+	mv file3 file1 &&
+	test_must_fail git reset --merge HEAD^ 2>err.log &&
+	grep file1 err.log | grep "not uptodate"
 
-			git hash-object y/c~B^0 >actual &&
-			git rev-parse O:x/c >expect &&
-			test_cmp expect actual
-		fi &&
+HEAD is now at 91b6f65 add line 4 to file1
+[master 7799e7c] add line 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 13 - reset --merge fails with changes in file it touches
 
-		echo important >expect &&
-		test_cmp expect y/c
-	)
+expecting success of 7110.14 'reset --keep fails with changes in file it touches': 
+	git reset --hard second &&
+	echo "line 5" >> file1 &&
+	test_tick &&
+	git commit -m "add line 5" file1 &&
+	sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+	mv file3 file1 &&
+	test_must_fail git reset --keep HEAD^ 2>err.log &&
+	grep file1 err.log | grep "not uptodate"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10c_1/.git/
-[master (root-commit) 1ee9006] O
+HEAD is now at 91b6f65 add line 4 to file1
+[master f1894d3] add line 5
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A e6a4b22] A
+ 1 file changed, 1 insertion(+)
+error: Entry 'file1' not uptodate. Cannot merge.
+ok 14 - reset --keep fails with changes in file it touches
+
+expecting success of 7110.15 'setup 3 different branches': 
+	git reset --hard second &&
+	git branch branch1 &&
+	git branch branch2 &&
+	git branch branch3 &&
+	git checkout branch1 &&
+	echo "line 5 in branch1" >> file1 &&
+	test_tick &&
+	git commit -a -m "change in branch1" &&
+	git checkout branch2 &&
+	echo "line 5 in branch2" >> file1 &&
+	test_tick &&
+	git commit -a -m "change in branch2" &&
+	git tag third &&
+	git checkout branch3 &&
+	echo a new file >file3 &&
+	rm -f file1 &&
+	git add file3 &&
+	test_tick &&
+	git commit -a -m "change in branch3"
+
+HEAD is now at 91b6f65 add line 4 to file1
+Switched to branch 'branch1'
+[branch1 4afd189] change in branch1
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B b8dbf85] B
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 077fd6d] change in branch2
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch3'
+[branch3 05419f2] change in branch3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+ delete mode 100644 file1
+ create mode 100644 file3
+ok 15 - setup 3 different branches
+
+expecting success of 7110.16 '"reset --merge HEAD^" is ok with pending merge': 
+	git checkout third &&
+	test_must_fail git merge branch1 &&
+	git reset --merge HEAD^ &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+	test -z "$(git diff --cached)" &&
+	test -z "$(git diff)"
+
+Note: switching to 'third'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -461920,4111 +460504,5607 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at e6a4b22 A
-error: The following untracked working tree files would be overwritten by merge:
-ok 42 - 10c1: Overwrite untracked with dir rename/rename(1to2)
-
-expecting success of 6423.43 '10c2: Overwrite untracked with dir rename/rename(1to2), other direction': 
-	test_setup_10c 2 &&
-	(
-		cd 10c_2 &&
-
-		git reset --hard &&
-		git clean -fdqx &&
-
-		git checkout B^0 &&
-		mkdir y &&
-		echo important >y/c &&
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 16 - "reset --merge HEAD^" is ok with pending merge
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
+expecting success of 7110.17 '"reset --keep HEAD^" fails with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --keep HEAD^ 2>err.log &&
+	test_grep "middle of a merge" err.log
 
-			git ls-files -s >out &&
-			test_line_count = 4 out &&
-			git ls-files -u >out &&
-			test_line_count = 0 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out
-		else
-			test_grep "CONFLICT (rename/rename)" out &&
-			test_grep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 17 - "reset --keep HEAD^" fails with pending merge
 
-			git ls-files -s >out &&
-			test_line_count = 6 out &&
-			git ls-files -u >out &&
-			test_line_count = 3 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
+expecting success of 7110.18 '"reset --merge HEAD" is ok with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	git reset --merge HEAD &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
+	test -z "$(git diff --cached)" &&
+	test -z "$(git diff)"
 
-			git rev-parse >actual \
-				:0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
-			git rev-parse >expect \
-				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
-			test_cmp expect actual &&
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 18 - "reset --merge HEAD" is ok with pending merge
 
-			git hash-object y/c~HEAD >actual &&
-			git rev-parse O:x/c >expect &&
-			test_cmp expect actual
-		fi &&
+expecting success of 7110.19 '"reset --keep HEAD" fails with pending merge': 
+	git reset --hard third &&
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --keep HEAD 2>err.log &&
+	test_grep "middle of a merge" err.log
 
-		echo important >expect &&
-		test_cmp expect y/c
-	)
+HEAD is now at 077fd6d change in branch2
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 19 - "reset --keep HEAD" fails with pending merge
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10c_2/.git/
-[master (root-commit) 1ee9006] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A e6a4b22] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B b8dbf85] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-HEAD is now at b8dbf85 B
-Note: switching to 'B^0'.
+expecting success of 7110.20 '--merge is ok with added/deleted merge': 
+	git reset --hard third &&
+	rm -f file2 &&
+	test_must_fail git merge branch3 &&
+	test_path_is_missing file2 &&
+	test_path_is_file file3 &&
+	git diff --exit-code file3 &&
+	git diff --exit-code branch3 file3 &&
+	git reset --merge HEAD &&
+	test_path_is_missing file3 &&
+	test_path_is_missing file2 &&
+	git diff --exit-code --cached
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+HEAD is now at 077fd6d change in branch2
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 20 - --merge is ok with added/deleted merge
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7110.21 '--keep fails with added/deleted merge': 
+	git reset --hard third &&
+	rm -f file2 &&
+	test_must_fail git merge branch3 &&
+	test_path_is_missing file2 &&
+	test_path_is_file file3 &&
+	git diff --exit-code file3 &&
+	git diff --exit-code branch3 file3 &&
+	test_must_fail git reset --keep HEAD 2>err.log &&
+	test_grep "middle of a merge" err.log
 
-  git switch -c <new-branch-name>
+HEAD is now at 077fd6d change in branch2
+CONFLICT (modify/delete): file1 deleted in branch3 and modified in HEAD.  Version HEAD of file1 left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 21 - --keep fails with added/deleted merge
 
-Or undo this operation with:
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7301-clean-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7301-clean-interactive/.git/
+expecting success of 7301.1 'setup': 
 
-  git switch -
+	mkdir -p src &&
+	touch src/part1.c Makefile &&
+	echo build >.gitignore &&
+	echo \*.o >>.gitignore &&
+	git add . &&
+	git commit -m setup &&
+	touch src/part2.c README &&
+	git add .
 
-Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at b8dbf85 B
-error: The following untracked working tree files would be overwritten by merge:
-ok 43 - 10c2: Overwrite untracked with dir rename/rename(1to2), other direction
+[master (root-commit) c1a48e2] setup
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 Makefile
+ create mode 100644 src/part1.c
+ok 1 - setup
 
-expecting success of 6423.44 '10d: Delete untracked with dir rename/rename(2to1)': 
-	test_setup_10d &&
-	(
-		cd 10d &&
+expecting success of 7301.2 'git clean -i (c: clean hotkey)': 
 
-		git checkout A^0 &&
-		echo important >y/wham &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo c | git clean -i &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_missing src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: The following untracked working tree files would be overwritten by merge" err &&
 
-			git ls-files -s >out &&
-			test_line_count = 6 out &&
-			git ls-files -u >out &&
-			test_line_count = 0 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out
-		else
-			test_grep "CONFLICT (rename/rename)" out &&
-			test_grep "Refusing to lose untracked file at y/wham" out &&
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 2 - git clean -i (c: clean hotkey)
 
-			git ls-files -s >out &&
-			test_line_count = 6 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
+expecting success of 7301.3 'git clean -i (cl: clean prefix)': 
 
-			git rev-parse >actual \
-				:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
-			git rev-parse >expect \
-				 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
-			test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo cl | git clean -i &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_missing src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-			test_must_fail git rev-parse :1:y/wham &&
 
-			# Test that two-way merge in y/wham~merged is as expected
-			git cat-file -p :2:y/wham >expect &&
-			git cat-file -p :3:y/wham >other &&
-			>empty &&
-			test_must_fail git merge-file \
-				-L "HEAD" \
-				-L "" \
-				-L "B^0" \
-				expect empty other &&
-			test_cmp expect y/wham~merged
-		fi &&
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 3 - git clean -i (cl: clean prefix)
 
-		echo important >expect &&
-		test_cmp expect y/wham
-	)
+expecting success of 7301.4 'git clean -i (quit)': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10d/.git/
-[master (root-commit) 1a4b546] O
- Author: A U Thor <author@example.com>
- 6 files changed, 6 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 x/f
- create mode 100644 z/a
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 9f961af] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename z/c => x/wham (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B 6a20b58] B
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/d (100%)
- rename {x => y}/e (100%)
- rename x/f => z/wham (100%)
-Note: switching to 'A^0'.
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo quit | git clean -i &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Bye.
+ok 4 - git clean -i (quit)
 
-  git switch -c <new-branch-name>
+expecting success of 7301.5 'git clean -i (Ctrl+D)': 
 
-Or undo this operation with:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	echo "\04" | git clean -i &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-  git switch -
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Would remove the following items:
+  a.out        src/part3.c  src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Huh (\04)?
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Bye.
+ok 5 - git clean -i (Ctrl+D)
 
-HEAD is now at 9f961af A
-error: The following untracked working tree files would be overwritten by merge:
-ok 44 - 10d: Delete untracked with dir rename/rename(2to1)
+expecting success of 7301.6 'git clean -id (filter all)': 
 
-expecting success of 6423.45 '10e: Does git complain about untracked file that is not really in the way?': 
-	test_setup_10e &&
-	(
-		cd 10e &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "*" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		git checkout A^0 &&
-		mkdir z &&
-		echo random >z/c &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_grep ! "following untracked working tree files would be overwritten by merge" err &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>> No more files to clean, exiting.
+ok 6 - git clean -id (filter all)
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+expecting success of 7301.7 'git clean -id (filter patterns)': 
 
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  B:z/c &&
-		test_cmp expect actual &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "part3.* *.out" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_missing src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		echo random >expect &&
-		test_cmp expect z/c
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/10e/.git/
-[master (root-commit) 75ee182] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A ac1ed31] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
-Switched to branch 'B'
-[B 095ac3d] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z/c
-Note: switching to 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>>   docs/        src/part4.c  src/part4.h
+Input ignore patterns>> Would remove the following items:
+  docs/        src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing docs/
+Removing src/part4.c
+Removing src/part4.h
+ok 7 - git clean -id (filter patterns)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7301.8 'git clean -id (filter patterns 2)': 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines f "* !*.out" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-  git switch -c <new-branch-name>
 
-Or undo this operation with:
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+Input ignore patterns>>   a.out
+Input ignore patterns>> Would remove the following item:
+  a.out
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+ok 8 - git clean -id (filter patterns 2)
 
-  git switch -
+expecting success of 7301.9 'git clean -id (select - all)': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "*" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_missing src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-HEAD is now at ac1ed31 A
-ok 45 - 10e: Does git complain about untracked file that is not really in the way?
 
-expecting success of 6423.46 '11a: Avoid losing dirty contents with simple rename': 
-	test_setup_11a &&
-	(
-		cd 11a &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing docs/
+Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 9 - git clean -id (select - all)
 
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+expecting success of 7301.10 'git clean -id (select - none)': 
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			test_grep "Refusing to lose dirty file at z/c" out &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-			git ls-files -s >out &&
-			test_line_count = 2 out &&
-			git ls-files -u >out &&
-			test_line_count = 1 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
 
-			git rev-parse >actual \
-				:0:z/a :2:z/c &&
-			git rev-parse >expect \
-				 O:z/a  B:z/b &&
-			test_cmp expect actual &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> No more files to clean, exiting.
+ok 10 - git clean -id (select - none)
 
-			git hash-object z/c~HEAD >actual &&
-			git rev-parse B:z/b >expect &&
-			test_cmp expect actual
-		fi &&
+expecting success of 7301.11 'git clean -id (select - number)': 
 
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s 3 "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11a/.git/
-[master (root-commit) d2da13d] O
- Author: A U Thor <author@example.com>
- 2 files changed, 11 insertions(+)
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 7a0ff52] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename z/{b => c} (100%)
-Switched to branch 'B'
-[B b7a4243] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following item:
+  src/part3.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing src/part3.c
+ok 11 - git clean -id (select - number)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7301.12 'git clean -id (select - number 2)': 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "2 3" 5 "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-  git switch -c <new-branch-name>
 
-Or undo this operation with:
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out        * 2: docs/        * 3: src/part3.c    4: src/part3.h
+  * 5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  docs/        src/part3.c  src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing docs/
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean -id (select - number 2)
 
-  git switch -
+expecting success of 7301.13 'git clean -id (select - number 3)': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "3,4 5" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-HEAD is now at 7a0ff52 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 46 - 11a: Avoid losing dirty contents with simple rename
 
-expecting success of 6423.47 '11b: Avoid losing dirty file involved in directory rename': 
-	test_setup_11b &&
-	(
-		cd 11b &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>     1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  src/part3.c  src/part3.h  src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing src/part3.c
+Removing src/part3.h
+Removing src/part4.c
+ok 13 - git clean -id (select - number 3)
 
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+expecting success of 7301.14 'git clean -id (select - filenames)': 
 
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-			test_grep "Refusing to lose dirty file at z/c" out &&
+	mkdir -p build docs &&
+	touch a.out foo.txt bar.txt baz.txt &&
+	test_write_lines s "a.out fo ba bar" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_missing a.out &&
+	test_path_is_missing foo.txt &&
+	test_path_is_missing bar.txt &&
+	test_path_is_file baz.txt &&
+	rm baz.txt
 
-			git ls-files -s >out &&
-			test_line_count = 3 out &&
-			git ls-files -u >out &&
-			test_line_count = 0 out &&
-			git ls-files -m >out &&
-			test_line_count = 0 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
 
-			git rev-parse >actual \
-				:0:x/b :0:y/a :0:y/c &&
-			git rev-parse >expect \
-				 O:x/b  O:z/a  B:x/c &&
-			test_cmp expect actual &&
+Would remove the following items:
+  a.out        baz.txt      foo.txt
+  bar.txt      docs/        src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: bar.txt        3: baz.txt        4: docs/
+    5: foo.txt        6: src/part4.h
+Select items to delete>> Huh (ba)?
+  * 1: a.out        * 2: bar.txt        3: baz.txt        4: docs/
+  * 5: foo.txt        6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out    bar.txt  foo.txt
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing bar.txt
+Removing foo.txt
+ok 14 - git clean -id (select - filenames)
 
-			git hash-object y/c >actual &&
-			git rev-parse B:x/c >expect &&
-			test_cmp expect actual
-		fi &&
+expecting success of 7301.15 'git clean -id (select - range)': 
 
-		grep -q stuff z/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c
-	)
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "1,3-4" 2 "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11b/.git/
-[master (root-commit) 8ba0ed2] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 z/a
-Switched to branch 'A'
-[A 331ae41] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Switched to branch 'B'
-[B 0b664da] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {z => y}/a (100%)
-Note: switching to 'A^0'.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        docs/        src/part3.c  src/part3.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing docs/
+Removing src/part3.c
+Removing src/part3.h
+ok 15 - git clean -id (select - range)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7301.16 'git clean -id (select - range 2)': 
 
-  git switch -c <new-branch-name>
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "4- 1" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_missing src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Or undo this operation with:
 
-  git switch -
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/          3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.h  src/part4.c  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.h
+Removing src/part4.c
+Removing src/part4.h
+ok 16 - git clean -id (select - range 2)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7301.17 'git clean -id (inverse select)': 
 
-HEAD is now at 331ae41 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 47 - 11b: Avoid losing dirty file involved in directory rename
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines s "*" "-5- 1 -2" "" c |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-expecting success of 6423.48 '11c: Avoid losing not-uptodate with rename + D/F conflict': 
-	test_setup_11c &&
-	(
-		cd 11c &&
 
-		git checkout A^0 &&
-		echo stuff >>y/c &&
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: a.out          2: docs/          3: src/part3.c    4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>>   * 1: a.out        * 2: docs/        * 3: src/part3.c  * 4: src/part3.h
+  * 5: src/part4.c  * 6: src/part4.h
+Select items to delete>>   * 1: a.out          2: docs/        * 3: src/part3.c  * 4: src/part3.h
+    5: src/part4.c    6: src/part4.h
+Select items to delete>> Would remove the following items:
+  a.out        src/part3.c  src/part3.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing a.out
+Removing src/part3.c
+Removing src/part3.h
+ok 17 - git clean -id (inverse select)
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			test_grep "following files would be overwritten by merge" err
-		fi &&
+expecting success of 7301.18 'git clean -id (ask)': 
 
-		grep -q stuff y/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected y/c &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines a Y y no yes bad "" |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -m >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11c/.git/
-[master (root-commit) c615350] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 y/a
-Switched to branch 'A'
-[A b42d3e1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => y}/c (100%)
-Switched to branch 'B'
-[B 78faa62] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 y/c/d
-Note: switching to 'A^0'.
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? Remove src/part4.h [y/N]? Removing a.out
+Removing docs/
+Removing src/part3.h
+ok 18 - git clean -id (ask)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7301.19 'git clean -id (ask - Ctrl+D)': 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	test_write_lines a Y no yes "\04" |
+	git clean -id &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-  git switch -c <new-branch-name>
 
-Or undo this operation with:
+Would remove the following items:
+  a.out        src/part3.c  src/part4.c
+  docs/        src/part3.h  src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove a.out [y/N]? Remove docs/ [y/N]? Remove src/part3.c [y/N]? Remove src/part3.h [y/N]? Remove src/part4.c [y/N]? 
+Removing a.out
+Removing src/part3.c
+ok 19 - git clean -id (ask - Ctrl+D)
 
-  git switch -
+expecting success of 7301.20 'git clean -id with prefix and path (filter)': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines f docs "*.h" "" c |
+	 git clean -id ..) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-HEAD is now at b42d3e1 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 48 - 11c: Avoid losing not-uptodate with rename + D/F conflict
 
-expecting success of 6423.49 '11d: Avoid losing not-uptodate with rename + D/F conflict': 
-	test_setup_11d &&
-	(
-		cd 11d &&
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>   ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+Input ignore patterns>>   ../a.out        ../src/part3.h  ../src/part4.h
+  ../src/part3.c  ../src/part4.c
+Input ignore patterns>>   ../a.out        ../src/part3.c  ../src/part4.c
+Input ignore patterns>> Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing ../a.out
+Removing ../src/part3.c
+Removing ../src/part4.c
+ok 20 - git clean -id with prefix and path (filter)
 
-		git checkout A^0 &&
-		echo stuff >>z/c &&
+expecting success of 7301.21 'git clean -id with prefix and path (select by name)': 
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			test_grep "Refusing to lose dirty file at z/c" out &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines s ../docs/ ../src/part3.c ../src/part4.c "" c |
+	 git clean -id ..) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/part3.h &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-			git ls-files -s >out &&
-			test_line_count = 4 out &&
-			git ls-files -u >out &&
-			test_line_count = 1 out &&
-			git ls-files -o >out &&
-			test_line_count = 4 out &&
 
-			git rev-parse >actual \
-				:0:x/b :0:y/a :0:y/c/d :3:y/c &&
-			git rev-parse >expect \
-				 O:x/b  O:z/a  B:y/c/d  B:x/c &&
-			test_cmp expect actual &&
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now>     1: ../a.out          2: ../docs/          3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/          3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
+    4: ../src/part3.h    5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>>     1: ../a.out        * 2: ../docs/        * 3: ../src/part3.c
+    4: ../src/part3.h  * 5: ../src/part4.c    6: ../src/part4.h
+Select items to delete>> Would remove the following items:
+  ../docs/        ../src/part3.c  ../src/part4.c
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Removing ../docs/
+Removing ../src/part3.c
+Removing ../src/part4.c
+ok 21 - git clean -id with prefix and path (select by name)
 
-			git hash-object y/c~HEAD >actual &&
-			git rev-parse B:x/c >expect &&
-			test_cmp expect actual
-		fi &&
+expecting success of 7301.22 'git clean -id with prefix and path (ask)': 
 
-		grep -q stuff z/c &&
-		test_seq 1 10 >expected &&
-		echo stuff >>expected &&
-		test_cmp expected z/c
-	)
+	mkdir -p build docs &&
+	touch a.out src/part3.c src/part3.h src/part4.c src/part4.h \
+	docs/manual.txt obj.o build/lib.so &&
+	(cd build/ &&
+	 test_write_lines a Y y no yes bad "" |
+	 git clean -id ..) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing docs/manual.txt &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing src/part3.h &&
+	test_path_is_file src/part4.c &&
+	test_path_is_file src/part4.h &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11d/.git/
-[master (root-commit) 8ba0ed2] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/b
- create mode 100644 x/c
- create mode 100644 z/a
-Switched to branch 'A'
-[A 331ae41] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Switched to branch 'B'
-[B cbf14e5] B
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- rename {z => y}/a (100%)
- create mode 100644 y/c/d
-Note: switching to 'A^0'.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Would remove the following items:
+  ../a.out        ../src/part3.c  ../src/part4.c
+  ../docs/        ../src/part3.h  ../src/part4.h
+*** Commands ***
+    1: clean                2: filter by pattern    3: select by numbers
+    4: ask each             5: quit                 6: help
+What now> Remove ../a.out [y/N]? Remove ../docs/ [y/N]? Remove ../src/part3.c [y/N]? Remove ../src/part3.h [y/N]? Remove ../src/part4.c [y/N]? Remove ../src/part4.h [y/N]? Removing ../a.out
+Removing ../docs/
+Removing ../src/part3.h
+ok 22 - git clean -id with prefix and path (ask)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+checking prerequisite: TTY
 
-  git switch -c <new-branch-name>
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-Or undo this operation with:
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-  git switch -
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-Turn off this advice by setting config variable advice.detachedHead to false
+)
+prerequisite TTY ok
+expecting success of 7301.23 'git clean -i paints the header in HEADER color': 
+	>a.out &&
+	echo q |
+	test_terminal git clean -i |
+	test_decode_color |
+	head -n 1 >header &&
+	# not i18ngrep
+	grep "^<BOLD>" header
 
-HEAD is now at 331ae41 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 49 - 11d: Avoid losing not-uptodate with rename + D/F conflict
+<BOLD>Would remove the following items:
+ok 23 - git clean -i paints the header in HEADER color
 
-expecting success of 6423.50 '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add': 
-	test_setup_11e &&
-	(
-		cd 11e &&
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7402-submodule-rebase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7402-submodule-rebase/.git/
+expecting success of 7402.1 'setup': 
 
-		git checkout A^0 &&
-		echo mods >>y/c &&
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git clone . submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m submodule &&
+	echo second line >> file &&
+	(cd submodule && git pull) &&
+	test_tick &&
+	git commit -m file-and-submodule -a &&
+	git branch added-submodule
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			test_grep "CONFLICT (rename/rename)" out &&
-			test_grep "Refusing to lose dirty file at y/c" out &&
 
-			git ls-files -s >out &&
-			test_line_count = 7 out &&
-			git ls-files -u >out &&
-			test_line_count = 4 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
+[master (root-commit) ffefb50] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'submodule'...
+done.
+warning: adding embedded git repository: submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master 9bd10db] submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7402-submodule-rebase/.
+   ffefb50..9bd10db  master     -> origin/master
+Updating ffefb50..9bd10db
+Fast-forward
+ submodule | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submodule
+[master 041f541] file-and-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 1 - setup
 
-			git rev-parse >actual \
-				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
-			git rev-parse >expect \
-				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
-			test_cmp expect actual &&
+expecting success of 7402.2 'rebase with a dirty submodule': 
 
-			# See if y/c~merged has expected contents; requires manually
-			# doing the expected file merge
-			git cat-file -p A:y/c >c1 &&
-			git cat-file -p B:z/c >c2 &&
-			>empty &&
-			test_must_fail git merge-file \
-				-L "HEAD" \
-				-L "" \
-				-L "B^0" \
-				c1 empty c2 &&
-			test_cmp c1 y/c~merged
-		fi &&
+	(cd submodule &&
+	 echo 3rd line >> file &&
+	 test_tick &&
+	 git commit -m fork -a) &&
+	echo unrelated >> file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m unrelated file2 &&
+	echo other line >> file &&
+	test_tick &&
+	git commit -m update file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	EXPECTED=$(git rev-parse HEAD~2:submodule) &&
+	GIT_TRACE=1 git rebase --onto HEAD~2 HEAD^ &&
+	STORED=$(git rev-parse HEAD:submodule) &&
+	test $EXPECTED = $STORED &&
+	test $CURRENT = $(cd submodule && git rev-parse HEAD)
 
-		echo different >expected &&
-		echo mods >>expected &&
-		test_cmp expected y/c
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11e/.git/
-[master (root-commit) 1ee9006] O
+[master eb5e1a6] fork
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 0006594] A
+ 1 file changed, 1 insertion(+)
+[master b5e9d7b] unrelated
  Author: A U Thor <author@example.com>
- 4 files changed, 1 insertion(+)
- rename {x => w}/c (100%)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
- create mode 100644 y/c
-Switched to branch 'B'
-[B b8dbf85] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master a65f80c] update
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/c (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+trace: built-in: git rebase --onto 'HEAD~2' HEAD^
+Rebasing (1/1)
trace: run_command: git notes copy --for-rewrite=rebase
+trace: start_command: /build/reproducible-path/git-2.49.0+next.20250314/git notes copy --for-rewrite=rebase
+trace: built-in: git notes copy --for-rewrite=rebase
+Successfully rebased and updated refs/heads/master.
+ok 2 - rebase with a dirty submodule
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7402.3 'interactive rebase with a dirty submodule': 
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual &&
+	HEAD=$(git rev-parse HEAD) &&
+	GIT_EDITOR="\"$(pwd)/fake-editor.sh\"" EDITOR_TEXT="pick $HEAD" \
+		git rebase -i HEAD^ &&
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+pick 81a011672801a6d53f73688ebde4d518274102e6
+Successfully rebased and updated refs/heads/master.
+ok 3 - interactive rebase with a dirty submodule
 
-Or undo this operation with:
+expecting success of 7402.4 'rebase with dirty file and submodule fails': 
 
-  git switch -
+	echo yet another line >> file &&
+	test_tick &&
+	git commit -m next file &&
+	echo rewrite > file &&
+	test_tick &&
+	git commit -m rewrite file &&
+	echo dirty > file &&
+	test_must_fail git rebase --onto HEAD~2 HEAD^
 
-Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 0006594 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 50 - 11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add
+[master 260764e] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 63179b5] rewrite
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+ok 4 - rebase with dirty file and submodule fails
 
-expecting success of 6423.51 '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)': 
-	test_setup_11f &&
-	(
-		cd 11f &&
+expecting success of 7402.5 'stash with a dirty submodule': 
 
-		git checkout A^0 &&
-		echo important >>y/wham &&
+	echo new > file &&
+	CURRENT=$(cd submodule && git rev-parse HEAD) &&
+	git stash &&
+	test new != $(cat file) &&
+	echo submodule >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-		then
-			test_path_is_missing .git/MERGE_HEAD &&
-			test_grep "error: Your local changes to the following files would be overwritten by merge" err
-		else
-			test_grep "CONFLICT (rename/rename)" out &&
-			test_grep "Refusing to lose dirty file at y/wham" out &&
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
+	test_cmp expect actual &&
 
-			git ls-files -s >out &&
-			test_line_count = 4 out &&
-			git ls-files -u >out &&
-			test_line_count = 2 out &&
-			git ls-files -o >out &&
-			test_line_count = 3 out &&
+	git stash apply &&
+	test new = $(cat file) &&
+	echo "$CURRENT" >expect &&
+	git -C submodule rev-parse HEAD >actual &&
+	test_cmp expect actual
 
-			test_must_fail git rev-parse :1:y/wham &&
 
-			git rev-parse >actual \
-				:0:y/a :0:y/b :2:y/wham :3:y/wham &&
-			git rev-parse >expect \
-				 O:z/a  O:z/b  O:x/c     O:x/d &&
-			test_cmp expect actual &&
+Saved working directory and index state WIP on master: 63179b5 rewrite
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file
+	modified:   submodule (new commits)
 
-			# Test that two-way merge in y/wham~merged is as expected
-			git cat-file -p :2:y/wham >expect &&
-			git cat-file -p :3:y/wham >other &&
-			>empty &&
-			test_must_fail git merge-file \
-				-L "HEAD" \
-				-L "" \
-				-L "B^0" \
-				expect empty other &&
-			test_cmp expect y/wham~merged
-		fi &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	fake-editor.sh
 
-		test_seq 1 10 >expected &&
-		echo important >>expected &&
-		test_cmp expected y/wham
-	)
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 5 - stash with a dirty submodule
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/11f/.git/
-[master (root-commit) 2274342] O
+expecting success of 7402.6 'rebasing submodule that should conflict': 
+	git reset --hard &&
+	git checkout added-submodule &&
+	git add submodule &&
+	test_tick &&
+	git commit -m third &&
+	(
+		cd submodule &&
+		git commit --allow-empty -m extra
+	) &&
+	git add submodule &&
+	test_tick &&
+	git commit -m fourth &&
+
+	test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 2>actual_output &&
+	git ls-files -s submodule >actual &&
+	(
+		cd submodule &&
+		echo "160000 $(git rev-parse HEAD^) 1	submodule" &&
+		echo "160000 $(git rev-parse HEAD^^) 2	submodule" &&
+		echo "160000 $(git rev-parse HEAD) 3	submodule"
+	) >expect &&
+	test_cmp expect actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (submodule), and either merge commit $(git -C submodule rev-parse --short HEAD^0)" &&
+		grep "$sub_expect" actual_output
+	fi
+
+HEAD is now at 63179b5 rewrite
+Switched to branch 'added-submodule'
+M	submodule
+[added-submodule 3e80a7a] third
  Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/c
- create mode 100644 x/d
- create mode 100644 z/a
- create mode 100644 z/b
-Switched to branch 'A'
-[A 6299452] A
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 7d89a17] extra
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/a (100%)
- rename {z => y}/b (100%)
- rename x/c => y/wham (100%)
-Switched to branch 'B'
-[B 42fa76f] B
+[added-submodule b58fe73] fourth
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename x/d => z/wham (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6299452 A
-error: Your local changes to the following files would be overwritten by merge:
-ok 51 - 11f: Avoid deleting not-uptodate with dir rename/rename(2to1)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Failed to merge submodule submodule (commits don't follow merge-base)
+CONFLICT (submodule): Merge conflict in submodule
+hint:  - go to submodule (submodule), and either merge commit 7d89a17
+ok 6 - rebasing submodule that should conflict
 
-expecting success of 6423.52 '12a: Moving one directory hierarchy into another': 
-	test_setup_12a &&
-	(
-		cd 12a &&
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7102-reset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7102-reset/.git/
+expecting success of 7102.1 'creating initial files and commits': 
+	test_tick &&
+	echo "1st file" >first &&
+	git add first &&
+	git commit -m "create 1st file" &&
 
-		git checkout A^0 &&
+	echo "2nd file" >second &&
+	git add second &&
+	git commit -m "create 2nd file" &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+	echo "2nd line 1st file" >>first &&
+	git commit -a -m "modify 1st file" &&
+	head5p2=$(git rev-parse --verify HEAD) &&
+	head5p2f=$(git rev-parse --short HEAD:first) &&
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
+	head5p1=$(git rev-parse --verify HEAD) &&
+	head5p1s=$(git rev-parse --short HEAD:secondfile) &&
 
-		git rev-parse >actual \
-			HEAD:node1/leaf1 HEAD:node1/leaf2 HEAD:node1/leaf5 \
-			HEAD:node1/node2/leaf3 \
-			HEAD:node1/node2/leaf4 \
-			HEAD:node1/node2/leaf6 &&
-		git rev-parse >expect \
-			O:node1/leaf1    O:node1/leaf2    B:node1/leaf5 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			B:node2/leaf6 &&
-		test_cmp expect actual
-	)
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	head5=$(git rev-parse --verify HEAD) &&
+	head5s=$(git rev-parse --short HEAD:secondfile) &&
+	head5sl=$(git rev-parse HEAD:secondfile)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12a/.git/
-[master (root-commit) 674d36e] O
+[main (root-commit) 811bbdf] create 1st file
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 494e77b] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first
+[main ba22ccd] create 2nd file
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node2 => node1/node2}/leaf3 (100%)
- rename {node2 => node1/node2}/leaf4 (100%)
-Switched to branch 'B'
-[B 139a75f] B
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second
+[main ddaefe0] modify 1st file
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 node1/leaf5
- create mode 100644 node2/leaf6
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+rm 'first'
+[main d1a4bc3] remove 1st and rename 2nd
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[main eed6733] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 1 - creating initial files and commits
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7102.2 'no 'git reset --no-soft'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-soft'
+ok 2 - no 'git reset --no-soft'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7102.3 'no 'git reset --no-mixed'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-mixed'
+ok 3 - no 'git reset --no-mixed'
 
-  git switch -c <new-branch-name>
+expecting success of 7102.4 'no 'git reset --no-hard'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-hard'
+ok 4 - no 'git reset --no-hard'
 
-Or undo this operation with:
+expecting success of 7102.5 'no 'git reset --no-merge'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-merge'
+ok 5 - no 'git reset --no-merge'
 
-  git switch -
+expecting success of 7102.6 'no 'git reset --no-keep'': 
+		test_when_finished "rm -f err" &&
+		test_must_fail git reset --no-$opt 2>err &&
+		grep "error: unknown option .no-$opt." err
+	
+error: unknown option `no-keep'
+ok 6 - no 'git reset --no-keep'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7102.7 'reset --hard message': 
+	hex=$(git log -1 --format="%h") &&
+	git reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg) >.expected &&
+	test_cmp .expected .actual
 
-HEAD is now at 494e77b A
-Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
-Merge made by the 'ort' strategy.
- node1/leaf5       | 1 +
- node1/node2/leaf6 | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 node1/leaf5
- create mode 100644 node1/node2/leaf6
-ok 52 - 12a: Moving one directory hierarchy into another
+ok 7 - reset --hard message
 
-expecting success of 6423.53 '12b1: Moving two directory hierarchies into each other': 
-	test_setup_12b1 &&
-	(
-		cd 12b1 &&
+expecting success of 7102.8 'reset --hard message (ISO8859-1 logoutputencoding)': 
+	hex=$(git log -1 --format="%h") &&
+	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
+	test_cmp .expected .actual
 
-		git checkout A^0 &&
+ok 8 - reset --hard message (ISO8859-1 logoutputencoding)
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7102.9 'giving a non existing revision should fail': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+	test_must_fail git reset aaaaaa &&
+	test_must_fail git reset --mixed aaaaaa &&
+	test_must_fail git reset --soft aaaaaa &&
+	test_must_fail git reset --hard aaaaaa &&
+	check_changes $head5
 
-		git rev-parse >actual \
-			HEAD:node2/node1/leaf1 \
-			HEAD:node2/node1/leaf2 \
-			HEAD:node1/node2/leaf3 \
-			HEAD:node1/node2/leaf4 &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 &&
-		test_cmp expect actual
-	)
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+fatal: ambiguous argument 'aaaaaa': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 9 - giving a non existing revision should fail
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12b1/.git/
-[master (root-commit) 674d36e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 494e77b] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node2 => node1/node2}/leaf3 (100%)
- rename {node2 => node1/node2}/leaf4 (100%)
-Switched to branch 'B'
-[B 634f1d4] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node1 => node2/node1}/leaf1 (100%)
- rename {node1 => node2/node1}/leaf2 (100%)
-Note: switching to 'A^0'.
+expecting success of 7102.10 'reset --soft with unmerged index should fail': 
+	touch .git/MERGE_HEAD &&
+	echo "100644 $head5sl 1	un" |
+		git update-index --index-info &&
+	test_must_fail git reset --soft HEAD &&
+	rm .git/MERGE_HEAD &&
+	git rm --cached -- un
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+fatal: Cannot do a soft reset in the middle of a merge.
+rm 'un'
+ok 10 - reset --soft with unmerged index should fail
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7102.11 'giving paths with options different than --mixed should fail': 
+	test_must_fail git reset --soft -- first &&
+	test_must_fail git reset --hard -- first &&
+	test_must_fail git reset --soft HEAD^ -- first &&
+	test_must_fail git reset --hard HEAD^ -- first &&
+	check_changes $head5
 
-  git switch -c <new-branch-name>
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+fatal: Cannot do soft reset with paths.
+fatal: Cannot do hard reset with paths.
+ok 11 - giving paths with options different than --mixed should fail
 
-Or undo this operation with:
+expecting success of 7102.12 'giving unrecognized options should fail': 
+	test_must_fail git reset --other &&
+	test_must_fail git reset -o &&
+	test_must_fail git reset --mixed --other &&
+	test_must_fail git reset --mixed -o &&
+	test_must_fail git reset --soft --other &&
+	test_must_fail git reset --soft -o &&
+	test_must_fail git reset --hard --other &&
+	test_must_fail git reset --hard -o &&
+	check_changes $head5
 
-  git switch -
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-Turn off this advice by setting config variable advice.detachedHead to false
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-HEAD is now at 494e77b A
-Merge made by the 'ort' strategy.
- {node1 => node2/node1}/leaf1 | 0
- {node1 => node2/node1}/leaf2 | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {node1 => node2/node1}/leaf1 (100%)
- rename {node1 => node2/node1}/leaf2 (100%)
-ok 53 - 12b1: Moving two directory hierarchies into each other
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-expecting success of 6423.54 '12b2: Moving two directory hierarchies into each other': 
-	test_setup_12b2 &&
-	(
-		cd 12b2 &&
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-		git checkout A^0 &&
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-		git rev-parse >actual \
-			HEAD:node1/node2/node1/leaf1 \
-			HEAD:node1/node2/node1/leaf2 \
-			HEAD:node2/node1/node2/leaf3 \
-			HEAD:node2/node1/node2/leaf4 \
-			HEAD:node2/node1/leaf5       \
-			HEAD:node1/node2/leaf6       &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			A:node1/leaf5 \
-			B:node2/leaf6 &&
-		test_cmp expect actual
-	)
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12b2/.git/
-[master (root-commit) 674d36e] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 786826f] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- create mode 100644 node1/leaf5
- rename {node2 => node1/node2}/leaf3 (100%)
- rename {node2 => node1/node2}/leaf4 (100%)
-Switched to branch 'B'
-[B 9ae1186] B
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- create mode 100644 node2/leaf6
- rename {node1 => node2/node1}/leaf1 (100%)
- rename {node1 => node2/node1}/leaf2 (100%)
-Note: switching to 'A^0'.
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-  git switch -c <new-branch-name>
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-Or undo this operation with:
+error: unknown option `other'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-  git switch -
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-Turn off this advice by setting config variable advice.detachedHead to false
+error: unknown switch `o'
+usage: git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]
+   or: git reset [-q] [<tree-ish>] [--] <pathspec>...
+   or: git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]
+   or: git reset --patch [<tree-ish>] [--] [<pathspec>...]
 
-HEAD is now at 786826f A
-Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
-Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
-Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
-Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
-Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
-Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
-Merge made by the 'ort' strategy.
- node1/node2/leaf6                  | 1 +
- node1/{ => node2/node1}/leaf1      | 0
- node1/{ => node2/node1}/leaf2      | 0
- {node1 => node2/node1}/leaf5       | 0
- {node1 => node2/node1}/node2/leaf3 | 0
- {node1 => node2/node1}/node2/leaf4 | 0
- 6 files changed, 1 insertion(+)
- create mode 100644 node1/node2/leaf6
- rename node1/{ => node2/node1}/leaf1 (100%)
- rename node1/{ => node2/node1}/leaf2 (100%)
- rename {node1 => node2/node1}/leaf5 (100%)
- rename {node1 => node2/node1}/node2/leaf3 (100%)
- rename {node1 => node2/node1}/node2/leaf4 (100%)
-ok 54 - 12b2: Moving two directory hierarchies into each other
+    -q, --[no-]quiet      be quiet, only report errors
+    --no-refresh          skip refreshing the index after reset
+    --refresh             opposite of --no-refresh
+    --mixed               reset HEAD and index
+    --soft                reset only HEAD
+    --hard                reset HEAD, index and working tree
+    --merge               reset HEAD, index and working tree
+    --keep                reset HEAD but keep local changes
+    --[no-]recurse-submodules[=<reset>]
+                          control recursive updating of submodules
+    -p, --[no-]patch      select hunks interactively
+    -N, --[no-]intent-to-add
+                          record only the fact that removed paths will be added later
+    --[no-]pathspec-from-file <file>
+                          read pathspec from file
+    --[no-]pathspec-file-nul
+                          with --pathspec-from-file, pathspec elements are separated with NUL character
 
-expecting success of 6423.55 '12c1: Moving one directory hierarchy into another w/ content merge': 
-	test_setup_12c1 &&
-	(
-		cd 12c1 &&
+ok 12 - giving unrecognized options should fail
 
-		git checkout A^0 &&
+expecting success of 7102.13 'trying to do reset --soft with pending merge should fail': 
+	git branch branch1 &&
+	git branch branch2 &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-		git ls-files -u >out &&
-		test_line_count = 12 out &&
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
 
-		git rev-parse >actual \
-			:1:node2/node1/leaf1 \
-			:1:node2/node1/leaf2 \
-			:1:node1/node2/leaf3 \
-			:1:node1/node2/leaf4 \
-			:2:node2/node1/leaf1 \
-			:2:node2/node1/leaf2 \
-			:2:node1/node2/leaf3 \
-			:2:node1/node2/leaf4 \
-			:3:node2/node1/leaf1 \
-			:3:node2/node1/leaf2 \
-			:3:node1/node2/leaf3 \
-			:3:node1/node2/leaf4 &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			A:node1/leaf1 \
-			A:node1/leaf2 \
-			A:node1/node2/leaf3 \
-			A:node1/node2/leaf4 \
-			B:node2/node1/leaf1 \
-			B:node2/node1/leaf2 \
-			B:node2/leaf3 \
-			B:node2/leaf4 &&
-		test_cmp expect actual
-	)
+	test_must_fail git merge branch1 &&
+	test_must_fail git reset --soft &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12c1/.git/
-[master (root-commit) 0cf2f73] O
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the change in branch2" &&
+
+	git checkout main &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
+
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
  Author: A U Thor <author@example.com>
- 4 files changed, 36 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A 18ec7be] A
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- rename {node2 => node1/node2}/leaf3 (75%)
- rename {node2 => node1/node2}/leaf4 (75%)
-Switched to branch 'B'
-[B 705044c] B
+ 1 file changed, 1 insertion(+)
+Auto-merging secondfile
+CONFLICT (content): Merge conflict in secondfile
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch2 8e8e261] the change in branch2
  Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- rename {node1 => node2/node1}/leaf1 (75%)
- rename {node1 => node2/node1}/leaf2 (75%)
-Note: switching to 'A^0'.
+Switched to branch 'main'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was 8e8e261).
+ok 13 - trying to do reset --soft with pending merge should fail
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7102.14 'trying to do reset --soft with pending checkout merge should fail': 
+	git branch branch3 &&
+	git branch branch4 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git checkout branch3 &&
+	echo "3rd line in branch3" >>secondfile &&
+	git commit -a -m "line in branch3" &&
 
-  git switch -c <new-branch-name>
+	git checkout branch4 &&
+	echo "3rd line in branch4" >>secondfile &&
 
-Or undo this operation with:
+	git checkout -m branch3 &&
+	test_must_fail git reset --soft &&
 
-  git switch -
+	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
+	git commit -a -m "the line in branch3" &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git checkout main &&
+	git branch -D branch3 branch4 &&
+	check_changes $head5
 
-HEAD is now at 18ec7be A
-Auto-merging node1/node2/leaf3
-CONFLICT (content): Merge conflict in node1/node2/leaf3
-Auto-merging node1/node2/leaf4
-CONFLICT (content): Merge conflict in node1/node2/leaf4
-Auto-merging node2/node1/leaf1
-CONFLICT (content): Merge conflict in node2/node1/leaf1
-Auto-merging node2/node1/leaf2
-CONFLICT (content): Merge conflict in node2/node1/leaf2
-Automatic merge failed; fix conflicts and then commit the result.
-ok 55 - 12c1: Moving one directory hierarchy into another w/ content merge
+Switched to branch 'branch3'
+[branch3 0b5021a] line in branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'branch4'
+Switched to branch 'branch3'
+M	secondfile
+fatal: Cannot do a soft reset in the middle of a merge.
+[branch3 dbe96ed] the line in branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Deleted branch branch3 (was dbe96ed).
+Deleted branch branch4 (was eed6733).
+ok 14 - trying to do reset --soft with pending checkout merge should fail
 
-expecting success of 6423.56 '12c2: Moving one directory hierarchy into another w/ content merge': 
-	test_setup_12c2 &&
-	(
-		cd 12c2 &&
+expecting success of 7102.15 'resetting to HEAD with no changes should succeed and do nothing': 
+	git reset --hard &&
+		check_changes $head5 &&
+	git reset --hard HEAD &&
+		check_changes $head5 &&
+	git reset --soft &&
+		check_changes $head5 &&
+	git reset --soft HEAD &&
+		check_changes $head5 &&
+	git reset --mixed &&
+		check_changes $head5 &&
+	git reset --mixed HEAD &&
+		check_changes $head5 &&
+	git reset &&
+		check_changes $head5 &&
+	git reset HEAD &&
+		check_changes $head5
 
-		git checkout A^0 &&
+HEAD is now at eed6733 modify 2nd file (geändert)
+HEAD is now at eed6733 modify 2nd file (geändert)
+ok 15 - resetting to HEAD with no changes should succeed and do nothing
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7102.16 '--soft reset only should show changes in diff --cached': 
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/secondfile b/secondfile
+	index $head5p1s..$head5s 100644
+	--- a/secondfile
+	+++ b/secondfile
+	@@ -1 +1,2 @@
+	-2nd file
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git reset --soft HEAD^ &&
+	check_changes $head5p1 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-		git ls-files -s >out &&
-		test_line_count = 14 out &&
-		git ls-files -u >out &&
-		test_line_count = 12 out &&
+ok 16 - --soft reset only should show changes in diff --cached
 
-		git rev-parse >actual \
-			:1:node1/node2/node1/leaf1 \
-			:1:node1/node2/node1/leaf2 \
-			:1:node2/node1/node2/leaf3 \
-			:1:node2/node1/node2/leaf4 \
-			:2:node1/node2/node1/leaf1 \
-			:2:node1/node2/node1/leaf2 \
-			:2:node2/node1/node2/leaf3 \
-			:2:node2/node1/node2/leaf4 \
-			:3:node1/node2/node1/leaf1 \
-			:3:node1/node2/node1/leaf2 \
-			:3:node2/node1/node2/leaf3 \
-			:3:node2/node1/node2/leaf4 \
-			:0:node2/node1/leaf5       \
-			:0:node1/node2/leaf6       &&
-		git rev-parse >expect \
-			O:node1/leaf1 \
-			O:node1/leaf2 \
-			O:node2/leaf3 \
-			O:node2/leaf4 \
-			A:node1/leaf1 \
-			A:node1/leaf2 \
-			A:node1/node2/leaf3 \
-			A:node1/node2/leaf4 \
-			B:node2/node1/leaf1 \
-			B:node2/node1/leaf2 \
-			B:node2/leaf3 \
-			B:node2/leaf4 \
-			A:node1/leaf5 \
-			B:node2/leaf6 &&
-		test_cmp expect actual
-	)
+expecting success of 7102.17 'changing files and redo the last commit should succeed': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line 2nd file
+	EOF
+	echo "3rd line 2nd file" >>secondfile &&
+	git commit -a -C ORIG_HEAD &&
+	head4=$(git rev-parse --verify HEAD) &&
+	check_changes $head4 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head5
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12c2/.git/
-[master (root-commit) 0cf2f73] O
- Author: A U Thor <author@example.com>
- 4 files changed, 36 insertions(+)
- create mode 100644 node1/leaf1
- create mode 100644 node1/leaf2
- create mode 100644 node2/leaf3
- create mode 100644 node2/leaf4
-Switched to branch 'A'
-[A c671e72] A
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 node1/leaf5
- rename {node2 => node1/node2}/leaf3 (75%)
- rename {node2 => node1/node2}/leaf4 (75%)
-Switched to branch 'B'
-[B 9d3c6b5] B
+[main b052eb8] modify 2nd file (geändert)
  Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 node2/leaf6
- rename {node1 => node2/node1}/leaf1 (75%)
- rename {node1 => node2/node1}/leaf2 (75%)
-Note: switching to 'A^0'.
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+ok 17 - changing files and redo the last commit should succeed
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7102.18 '--hard reset should change the files and undo commits permanently': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	first:
+	1st file
+	2nd line 1st file
+	second:
+	2nd file
+	EOF
+	git reset --hard HEAD~2 &&
+	check_changes $head5p2 &&
+	test "$(git rev-parse ORIG_HEAD)" = \
+			$head4
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+HEAD is now at ddaefe0 modify 1st file
+ok 18 - --hard reset should change the files and undo commits permanently
 
-  git switch -c <new-branch-name>
+expecting success of 7102.19 'redoing changes adding them without commit them should succeed': 
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	diff --git a/secondfile b/secondfile
+	new file mode 100644
+	index 0000000..$head5s
+	--- /dev/null
+	+++ b/secondfile
+	@@ -0,0 +1,2 @@
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git rm first &&
+	git mv second secondfile &&
 
-Or undo this operation with:
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	git add secondfile &&
+	check_changes $head5p2
 
-  git switch -
+rm 'first'
+ok 19 - redoing changes adding them without commit them should succeed
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7102.20 '--mixed reset to HEAD should unadd the files': 
+	cat >.diff_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git reset &&
+	check_changes $head5p2 &&
+	test "$(git rev-parse ORIG_HEAD)" = $head5p2
 
-HEAD is now at c671e72 A
-Path updated: node2/leaf6 added in B^0 inside a directory that was renamed in HEAD; moving it to node1/node2/leaf6.
-Path updated: node1/leaf1 renamed to node2/node1/leaf1 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf1.
-Auto-merging node1/node2/node1/leaf1
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf1
-Path updated: node1/leaf2 renamed to node2/node1/leaf2 in B^0, inside a directory that was renamed in HEAD; moving it to node1/node2/node1/leaf2.
-Auto-merging node1/node2/node1/leaf2
-CONFLICT (content): Merge conflict in node1/node2/node1/leaf2
-Path updated: node1/leaf5 added in HEAD inside a directory that was renamed in B^0; moving it to node2/node1/leaf5.
-Path updated: node2/leaf3 renamed to node1/node2/leaf3 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf3.
-Auto-merging node2/node1/node2/leaf3
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf3
-Path updated: node2/leaf4 renamed to node1/node2/leaf4 in HEAD, inside a directory that was renamed in B^0; moving it to node2/node1/node2/leaf4.
-Auto-merging node2/node1/node2/leaf4
-CONFLICT (content): Merge conflict in node2/node1/node2/leaf4
-Automatic merge failed; fix conflicts and then commit the result.
-ok 56 - 12c2: Moving one directory hierarchy into another w/ content merge
+Unstaged changes after reset:
+D	first
+D	second
+ok 20 - --mixed reset to HEAD should unadd the files
 
-expecting success of 6423.57 '12d: Rename/merge subdir into the root, variant 1': 
-	test_setup_12d &&
-	(
-		cd 12d &&
+expecting success of 7102.21 'redoing the last two commits should succeed': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git add secondfile &&
+	git reset --hard $head5p2 &&
+	git rm first &&
+	git mv second secondfile &&
+	git commit -a -m "remove 1st and rename 2nd" &&
 
-		git checkout A^0 &&
+	echo "1st line 2nd file" >secondfile &&
+	echo "2nd line 2nd file" >>secondfile &&
+	# "git commit -m" would break MinGW, as Windows refuse to pass
+	# $test_encoding encoded parameter to git.
+	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
+	check_changes $head5
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+HEAD is now at ddaefe0 modify 1st file
+rm 'first'
+[main d1a4bc3] remove 1st and rename 2nd
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 deletions(-)
+ delete mode 100644 first
+ rename second => secondfile (100%)
+[main eed6733] modify 2nd file (geändert)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 21 - redoing the last two commits should succeed
 
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
+expecting success of 7102.22 '--hard reset to HEAD should clear a failed merge': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line in branch2
+	EOF
+	git branch branch1 &&
+	git branch branch2 &&
 
-		git rev-parse >actual \
-			HEAD:subdir/foo.t   HEAD:bar.t &&
-		git rev-parse >expect \
-			O:a/b/subdir/foo.t  B:a/b/bar.t &&
-		test_cmp expect actual &&
+	git checkout branch1 &&
+	echo "3rd line in branch1" >>secondfile &&
+	git commit -a -m "change in branch1" &&
 
-		git hash-object bar.t >actual &&
-		git rev-parse B:a/b/bar.t >expect &&
-		test_cmp expect actual &&
+	git checkout branch2 &&
+	echo "3rd line in branch2" >>secondfile &&
+	git commit -a -m "change in branch2" &&
+	head3=$(git rev-parse --verify HEAD) &&
 
-		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
-		test_must_fail git rev-parse HEAD:a/b/bar.t &&
-		test_path_is_missing a/ &&
-		test_path_is_file bar.t
-	)
+	test_must_fail git pull . branch1 &&
+	git reset --hard &&
+	check_changes $head3
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12d/.git/
-[master (root-commit) eb8da02] a/b/subdir/foo
+Switched to branch 'branch1'
+[branch1 6b78ea5] change in branch1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a/b/subdir/foo.t
-Switched to branch 'A'
-[A 65a80b8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {a/b/subdir => subdir}/foo.t (100%)
-Switched to branch 'B'
-[B f100ab2] a/b/bar
+Switched to branch 'branch2'
+[branch2 f8a209f] change in branch2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a/b/bar.t
-Note: switching to 'A^0'.
+From .
+ * branch            branch1    -> FETCH_HEAD
+hint: You have divergent branches and need to specify how to reconcile them.
+hint: You can do so by running one of the following commands sometime before
+hint: your next pull:
+hint:
+hint:   git config pull.rebase false  # merge
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint:
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+fatal: Need to specify how to reconcile divergent branches.
+HEAD is now at f8a209f change in branch2
+ok 22 - --hard reset to HEAD should clear a failed merge
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7102.23 '--hard reset to ORIG_HEAD should clear a fast-forward merge': 
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+	git reset --hard HEAD^ &&
+	check_changes $head5 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git pull . branch1 &&
+	git reset --hard ORIG_HEAD &&
+	check_changes $head5 &&
 
-  git switch -c <new-branch-name>
+	git checkout main &&
+	git branch -D branch1 branch2 &&
+	check_changes $head5
 
-Or undo this operation with:
+HEAD is now at eed6733 modify 2nd file (geändert)
+From .
+ * branch            branch1    -> FETCH_HEAD
+Updating eed6733..6b78ea5
+Fast-forward
+ secondfile | 1 +
+ 1 file changed, 1 insertion(+)
+HEAD is now at eed6733 modify 2nd file (geändert)
+Switched to branch 'main'
+Deleted branch branch1 (was 6b78ea5).
+Deleted branch branch2 (was eed6733).
+ok 23 - --hard reset to ORIG_HEAD should clear a fast-forward merge
 
-  git switch -
+expecting success of 7102.24 'test --mixed <paths>': 
+	echo 1 >file1 &&
+	echo 2 >file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m files &&
+	before1=$(git rev-parse --short HEAD:file1) &&
+	before2=$(git rev-parse --short HEAD:file2) &&
+	git rm file2 &&
+	echo 3 >file3 &&
+	echo 4 >file4 &&
+	echo 5 >file1 &&
+	after1=$(git rev-parse --short $(git hash-object file1)) &&
+	after4=$(git rev-parse --short $(git hash-object file4)) &&
+	git add file1 file3 file4 &&
+	git reset HEAD -- file1 file2 file3 &&
+	test_must_fail git diff --quiet &&
+	git diff >output &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	cat >expect <<-EOF &&
+	diff --git a/file1 b/file1
+	index $before1..$after1 100644
+	--- a/file1
+	+++ b/file1
+	@@ -1 +1 @@
+	-1
+	+5
+	diff --git a/file2 b/file2
+	deleted file mode 100644
+	index $before2..0000000
+	--- a/file2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2
+	EOF
 
-HEAD is now at 65a80b8 A
-Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
-Merge made by the 'ort' strategy.
- bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-fatal: path 'a/b/subdir/foo.t' does not exist in 'HEAD'
-HEAD:a/b/subdir/foo.t
-fatal: path 'a/b/bar.t' does not exist in 'HEAD'
-HEAD:a/b/bar.t
-ok 57 - 12d: Rename/merge subdir into the root, variant 1
+	test_cmp expect output &&
+	git diff --cached >output &&
 
-expecting success of 6423.58 '12e: Rename/merge subdir into the root, variant 2': 
-	test_setup_12e &&
-	(
-		cd 12e &&
+	cat >cached_expect <<-EOF &&
+	diff --git a/file4 b/file4
+	new file mode 100644
+	index 0000000..$after4
+	--- /dev/null
+	+++ b/file4
+	@@ -0,0 +1 @@
+	+4
+	EOF
 
-		git checkout A^0 &&
+	test_cmp cached_expect output
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+[main 14b96fb] files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+rm 'file2'
+Unstaged changes after reset:
+M	file1
+D	file2
+ok 24 - test --mixed <paths>
 
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
+expecting success of 7102.25 'test resetting the index at give paths': 
+	mkdir sub &&
+	>sub/file1 &&
+	>sub/file2 &&
+	git update-index --add sub/file1 sub/file2 &&
+	T=$(git write-tree) &&
+	git reset HEAD sub/file2 &&
+	test_must_fail git diff --quiet &&
+	U=$(git write-tree) &&
+	echo "$T" &&
+	echo "$U" &&
+	test_must_fail git diff-index --cached --exit-code "$T" &&
+	test "$T" != "$U"
 
-		git rev-parse >actual \
-			HEAD:foo.t   HEAD:bar.t &&
-		git rev-parse >expect \
-			O:a/b/foo.t  B:a/b/bar.t &&
-		test_cmp expect actual &&
+Unstaged changes after reset:
+M	file1
+D	file2
+9571d9b5fb34d9c1274612948c5356f0615744bc
+88880074c0c9957f91fd21817fee120b773fc32c
+:100644 000000 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 D	sub/file2
+ok 25 - test resetting the index at give paths
 
-		git hash-object bar.t >actual &&
-		git rev-parse B:a/b/bar.t >expect &&
-		test_cmp expect actual &&
+expecting success of 7102.26 'resetting an unmodified path is a no-op': 
+	git reset --hard &&
+	git reset -- file1 &&
+	git diff-files --exit-code &&
+	git diff-index --cached --exit-code HEAD
 
-		test_must_fail git rev-parse HEAD:a/b/foo.t &&
-		test_must_fail git rev-parse HEAD:a/b/bar.t &&
-		test_path_is_missing a/ &&
-		test_path_is_file bar.t
-	)
+HEAD is now at 14b96fb files
+ok 26 - resetting an unmodified path is a no-op
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12e/.git/
-[master (root-commit) b044d92] a/b/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/foo.t
-Switched to branch 'A'
-[A de696c4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/b/foo.t => foo.t (100%)
-Switched to branch 'B'
-[B e3eeb6b] a/b/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/b/bar.t
-Note: switching to 'A^0'.
+expecting success of 7102.27 '--mixed refreshes the index': 
+	# Verify default behavior (without --[no-]refresh or reset.refresh)
+	test_reset_refreshes_index &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	# With --quiet
+	test_reset_refreshes_index "" --quiet
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+HEAD is now at 14b96fb files
+rm 'file2'
+HEAD is now at 14b96fb files
+rm 'file2'
+ok 27 - --mixed refreshes the index
 
-  git switch -c <new-branch-name>
+expecting success of 7102.28 '--mixed --[no-]refresh sets refresh behavior': 
+	# Verify that --[no-]refresh controls index refresh
+	test_reset_refreshes_index "" --refresh &&
+	! test_reset_refreshes_index "" --no-refresh
 
-Or undo this operation with:
+HEAD is now at 14b96fb files
+rm 'file2'
+HEAD is now at 14b96fb files
+rm 'file2'
+'output.log' is not empty, it contains:
+:100644 100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 0000000000000000000000000000000000000000 M	file2
+ok 28 - --mixed --[no-]refresh sets refresh behavior
 
-  git switch -
+expecting success of 7102.29 '--mixed preserves skip-worktree': 
+	echo 123 >>file2 &&
+	git add file2 &&
+	git update-index --skip-worktree file2 &&
+	git reset --mixed HEAD >output &&
+	test_must_be_empty output &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	cat >expect <<-\EOF &&
+	Unstaged changes after reset:
+	M	file2
+	EOF
+	git update-index --no-skip-worktree file2 &&
+	git add file2 &&
+	git reset --mixed HEAD >output &&
+	test_cmp expect output
 
-HEAD is now at de696c4 A
-Path updated: a/b/bar.t added in B^0 inside a directory that was renamed in HEAD; moving it to bar.t.
-Merge made by the 'ort' strategy.
- bar.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-fatal: path 'a/b/foo.t' does not exist in 'HEAD'
-HEAD:a/b/foo.t
-fatal: path 'a/b/bar.t' does not exist in 'HEAD'
-HEAD:a/b/bar.t
-ok 58 - 12e: Rename/merge subdir into the root, variant 2
+ok 29 - --mixed preserves skip-worktree
 
-expecting success of 6423.59 '12f: Trivial directory resolve, caching, all kinds of fun': 
-	test_setup_12f &&
-	(
-		cd 12f &&
+expecting success of 7102.30 'resetting specific path that is unmerged': 
+	git rm --cached file2 &&
+	F1=$(git rev-parse HEAD:file1) &&
+	F2=$(git rev-parse HEAD:file2) &&
+	F3=$(git rev-parse HEAD:secondfile) &&
+	{
+		echo "100644 $F1 1	file2" &&
+		echo "100644 $F2 2	file2" &&
+		echo "100644 $F3 3	file2"
+	} | git update-index --index-info &&
+	git ls-files -u &&
+	git reset HEAD file2 &&
+	test_must_fail git diff --quiet &&
+	git diff-index --exit-code --cached HEAD
 
-		git checkout A^0 &&
-		git branch Bmod B &&
+rm 'file2'
+100644 d00491fd7e5bb6fa28c517a0bb32b8b506539d4d 1	file2
+100644 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f 2	file2
+100644 44c5b5884550c17758737edcced463447b91d42b 3	file2
+Unstaged changes after reset:
+M	file2
+ok 30 - resetting specific path that is unmerged
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
+expecting success of 7102.31 'disambiguation (1)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	git reset secondfile &&
+	test_must_fail git diff --quiet -- secondfile &&
+	test -z "$(git diff --cached --name-only)" &&
+	test -f secondfile &&
+	test_must_be_empty secondfile
 
-		echo Checking the pick of B1... &&
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+M	secondfile
+ok 31 - disambiguation (1)
 
-		test_must_fail git rev-parse Bmod~1:dir &&
+expecting success of 7102.32 'disambiguation (2)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	test_must_fail git reset secondfile &&
+	test -n "$(git diff --cached --name-only -- secondfile)" &&
+	test ! -f secondfile
 
-		git ls-tree -r Bmod~1 >out &&
-		test_line_count = 98 out &&
+HEAD is now at 14b96fb files
+fatal: ambiguous argument 'secondfile': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 32 - disambiguation (2)
 
-		git diff --name-status A Bmod~1 >actual &&
-		q_to_tab >expect <<-\EOF &&
-		MQfolder/subdir/Makefile
-		AQfolder/subdir/newfile.c
-		MQfolder/subdir/newsubdir/e
-		AQfolder/subdir/newsubdir/newfile.py
-		MQfolder/subdir/tweaked/Makefile
-		EOF
-		test_cmp expect actual &&
+expecting success of 7102.33 'disambiguation (3)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset HEAD secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-		# Three-way merged files
-		test_seq  2 11 >e_Merge1 &&
-		test_seq 11 21 >Makefile_TOP &&
-		test_seq 21 31 >Makefile_SUB &&
-		git hash-object >expect      \
-			e_Merge1             \
-			Makefile_TOP         \
-			Makefile_SUB         &&
-		git rev-parse >actual              \
-			Bmod~1:folder/subdir/newsubdir/e     \
-			Bmod~1:folder/subdir/Makefile        \
-			Bmod~1:folder/subdir/tweaked/Makefile &&
-		test_cmp expect actual &&
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 33 - disambiguation (3)
 
-		# New files showed up at the right location with right contents
-		git rev-parse >expect                \
-			B~1:dir/subdir/newfile.c            \
-			B~1:dir/subdir/newsubdir/newfile.py &&
-		git rev-parse >actual                      \
-			Bmod~1:folder/subdir/newfile.c            \
-			Bmod~1:folder/subdir/newsubdir/newfile.py &&
-		test_cmp expect actual &&
+expecting success of 7102.34 'disambiguation (4)': 
+	git reset --hard &&
+	>secondfile &&
+	git add secondfile &&
+	rm -f secondfile &&
+	git reset -- secondfile &&
+	test_must_fail git diff --quiet &&
+	test -z "$(git diff --cached --name-only)" &&
+	test ! -f secondfile
 
-		# Removed files
-		test_path_is_missing folder/subdir/tweaked/f &&
-		test_path_is_missing folder/subdir/tweaked/g &&
+HEAD is now at 14b96fb files
+Unstaged changes after reset:
+D	secondfile
+ok 34 - disambiguation (4)
 
-		# Unchanged files or directories
-		git rev-parse >actual        \
-			Bmod~1:folder/subdir/a          \
-			Bmod~1:folder/subdir/b          \
-			Bmod~1:folder/subdir/c          \
-			Bmod~1:folder/subdir/d          \
-			Bmod~1:folder/unchanged         \
-			Bmod~1:folder/subdir/tweaked/h &&
-		git rev-parse >expect          \
-			O:dir/subdir/a         \
-			O:dir/subdir/b         \
-			O:dir/subdir/c         \
-			O:dir/subdir/d         \
-			O:dir/unchanged        \
-			O:dir/subdir/tweaked/h &&
-		test_cmp expect actual &&
+expecting success of 7102.35 'reset with paths accepts tree': 
+	# for simpler tests, drop last commit containing added files
+	git reset --hard HEAD^ &&
+	git reset HEAD^^{tree} -- . &&
+	git diff --cached HEAD^ --exit-code &&
+	git diff HEAD --exit-code
 
-		echo Checking the pick of B2... &&
+HEAD is now at eed6733 modify 2nd file (geändert)
+Unstaged changes after reset:
+M	secondfile
+ok 35 - reset with paths accepts tree
 
-		test_must_fail git rev-parse Bmod:dir &&
+expecting success of 7102.36 'reset -N keeps removed files as intent-to-add': 
+	echo new-file >new-file &&
+	git add new-file &&
+	git reset -N HEAD &&
 
-		git ls-tree -r Bmod >out &&
-		test_line_count = 99 out &&
+	tree=$(git write-tree) &&
+	git ls-tree $tree new-file >actual &&
+	test_must_be_empty actual &&
 
-		git diff --name-status Bmod~1 Bmod >actual &&
-		q_to_tab >expect <<-\EOF &&
-		AQfolder/subdir/newfile.rs
-		MQfolder/subdir/newsubdir/e
-		EOF
-		test_cmp expect actual &&
+	git diff --name-only >actual &&
+	echo new-file >expect &&
+	test_cmp expect actual
 
-		# Three-way merged file
-		test_seq  2 12 >e_Merge2 &&
-		git hash-object e_Merge2 >expect &&
-		git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
-		test_cmp expect actual &&
+Unstaged changes after reset:
+A	new-file
+ok 36 - reset -N keeps removed files as intent-to-add
 
-		grep region_enter.*collect_merge_info trace.output >collect &&
-		test_line_count = 4 collect &&
-		grep region_enter.*process_entries$ trace.output >process &&
-		test_line_count = 2 process
-	)
+expecting success of 7102.37 'reset --mixed sets up work tree': 
+	git init mixed_worktree &&
+	(
+		cd mixed_worktree &&
+		test_commit dummy
+	) &&
+	git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
+	test_must_be_empty actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12f/.git/
-[master (root-commit) 362ed3d] O
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7102-reset/mixed_worktree/.git/
+[main (root-commit) b737dfa] dummy
  Author: A U Thor <author@example.com>
- 98 files changed, 127 insertions(+)
- create mode 100644 dir/subdir/Makefile
- create mode 100644 dir/subdir/a
- create mode 100644 dir/subdir/b
- create mode 100644 dir/subdir/c
- create mode 100644 dir/subdir/d
- create mode 100644 dir/subdir/e
- create mode 100644 dir/subdir/tweaked/Makefile
- create mode 100644 dir/subdir/tweaked/f
- create mode 100644 dir/subdir/tweaked/g
- create mode 100644 dir/subdir/tweaked/h
- create mode 100644 dir/unchanged/file_1
- create mode 100644 dir/unchanged/file_10
- create mode 100644 dir/unchanged/file_11
- create mode 100644 dir/unchanged/file_12
- create mode 100644 dir/unchanged/file_13
- create mode 100644 dir/unchanged/file_14
- create mode 100644 dir/unchanged/file_15
- create mode 100644 dir/unchanged/file_16
- create mode 100644 dir/unchanged/file_17
- create mode 100644 dir/unchanged/file_18
- create mode 100644 dir/unchanged/file_19
- create mode 100644 dir/unchanged/file_2
- create mode 100644 dir/unchanged/file_20
- create mode 100644 dir/unchanged/file_21
- create mode 100644 dir/unchanged/file_22
- create mode 100644 dir/unchanged/file_23
- create mode 100644 dir/unchanged/file_24
- create mode 100644 dir/unchanged/file_25
- create mode 100644 dir/unchanged/file_26
- create mode 100644 dir/unchanged/file_27
- create mode 100644 dir/unchanged/file_28
- create mode 100644 dir/unchanged/file_29
- create mode 100644 dir/unchanged/file_3
- create mode 100644 dir/unchanged/file_30
- create mode 100644 dir/unchanged/file_31
- create mode 100644 dir/unchanged/file_32
- create mode 100644 dir/unchanged/file_33
- create mode 100644 dir/unchanged/file_34
- create mode 100644 dir/unchanged/file_35
- create mode 100644 dir/unchanged/file_36
- create mode 100644 dir/unchanged/file_37
- create mode 100644 dir/unchanged/file_38
- create mode 100644 dir/unchanged/file_39
- create mode 100644 dir/unchanged/file_4
- create mode 100644 dir/unchanged/file_40
- create mode 100644 dir/unchanged/file_41
- create mode 100644 dir/unchanged/file_42
- create mode 100644 dir/unchanged/file_43
- create mode 100644 dir/unchanged/file_44
- create mode 100644 dir/unchanged/file_45
- create mode 100644 dir/unchanged/file_46
- create mode 100644 dir/unchanged/file_47
- create mode 100644 dir/unchanged/file_48
- create mode 100644 dir/unchanged/file_49
- create mode 100644 dir/unchanged/file_5
- create mode 100644 dir/unchanged/file_50
- create mode 100644 dir/unchanged/file_51
- create mode 100644 dir/unchanged/file_52
- create mode 100644 dir/unchanged/file_53
- create mode 100644 dir/unchanged/file_54
- create mode 100644 dir/unchanged/file_55
- create mode 100644 dir/unchanged/file_56
- create mode 100644 dir/unchanged/file_57
- create mode 100644 dir/unchanged/file_58
- create mode 100644 dir/unchanged/file_59
- create mode 100644 dir/unchanged/file_6
- create mode 100644 dir/unchanged/file_60
- create mode 100644 dir/unchanged/file_61
- create mode 100644 dir/unchanged/file_62
- create mode 100644 dir/unchanged/file_63
- create mode 100644 dir/unchanged/file_64
- create mode 100644 dir/unchanged/file_65
- create mode 100644 dir/unchanged/file_66
- create mode 100644 dir/unchanged/file_67
- create mode 100644 dir/unchanged/file_68
- create mode 100644 dir/unchanged/file_69
- create mode 100644 dir/unchanged/file_7
- create mode 100644 dir/unchanged/file_70
- create mode 100644 dir/unchanged/file_71
- create mode 100644 dir/unchanged/file_72
- create mode 100644 dir/unchanged/file_73
- create mode 100644 dir/unchanged/file_74
- create mode 100644 dir/unchanged/file_75
- create mode 100644 dir/unchanged/file_76
- create mode 100644 dir/unchanged/file_77
- create mode 100644 dir/unchanged/file_78
- create mode 100644 dir/unchanged/file_79
- create mode 100644 dir/unchanged/file_8
- create mode 100644 dir/unchanged/file_80
- create mode 100644 dir/unchanged/file_81
- create mode 100644 dir/unchanged/file_82
- create mode 100644 dir/unchanged/file_83
- create mode 100644 dir/unchanged/file_84
- create mode 100644 dir/unchanged/file_85
- create mode 100644 dir/unchanged/file_86
- create mode 100644 dir/unchanged/file_87
- create mode 100644 dir/unchanged/file_88
- create mode 100644 dir/unchanged/file_9
-Switched to branch 'A'
-rm 'dir/subdir/tweaked/f'
-rm 'dir/subdir/tweaked/g'
-[A 9910422] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dummy.t
+ok 37 - reset --mixed sets up work tree
+
+expecting success of 7102.38 'reset handles --end-of-options': 
+	git update-ref refs/heads/--foo HEAD^ &&
+	git log -1 --format=%s refs/heads/--foo >expect &&
+	git reset --hard --end-of-options --foo &&
+	git log -1 --format=%s HEAD >actual &&
+	test_cmp expect actual
+
+HEAD is now at d1a4bc3 remove 1st and rename 2nd
+ok 38 - reset handles --end-of-options
+
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7111-reset-table.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7111-reset-table/.git/
+expecting success of 7111.1 'creating initial commits': 
+	test_commit E file1 &&
+	test_commit D file1 &&
+	test_commit C file1
+
+[master (root-commit) 8464dc0] E
  Author: A U Thor <author@example.com>
- 98 files changed, 5 deletions(-)
- delete mode 100644 dir/subdir/tweaked/f
- delete mode 100644 dir/subdir/tweaked/g
- rename {dir => folder}/subdir/Makefile (90%)
- rename {dir => folder}/subdir/a (100%)
- rename {dir => folder}/subdir/b (100%)
- rename {dir => folder}/subdir/c (100%)
- rename {dir => folder}/subdir/d (100%)
- rename {dir/subdir => folder/subdir/newsubdir}/e (90%)
- rename {dir => folder}/subdir/tweaked/Makefile (90%)
- rename {dir => folder}/subdir/tweaked/h (100%)
- rename {dir => folder}/unchanged/file_1 (100%)
- rename {dir => folder}/unchanged/file_10 (100%)
- rename {dir => folder}/unchanged/file_11 (100%)
- rename {dir => folder}/unchanged/file_12 (100%)
- rename {dir => folder}/unchanged/file_13 (100%)
- rename {dir => folder}/unchanged/file_14 (100%)
- rename {dir => folder}/unchanged/file_15 (100%)
- rename {dir => folder}/unchanged/file_16 (100%)
- rename {dir => folder}/unchanged/file_17 (100%)
- rename {dir => folder}/unchanged/file_18 (100%)
- rename {dir => folder}/unchanged/file_19 (100%)
- rename {dir => folder}/unchanged/file_2 (100%)
- rename {dir => folder}/unchanged/file_20 (100%)
- rename {dir => folder}/unchanged/file_21 (100%)
- rename {dir => folder}/unchanged/file_22 (100%)
- rename {dir => folder}/unchanged/file_23 (100%)
- rename {dir => folder}/unchanged/file_24 (100%)
- rename {dir => folder}/unchanged/file_25 (100%)
- rename {dir => folder}/unchanged/file_26 (100%)
- rename {dir => folder}/unchanged/file_27 (100%)
- rename {dir => folder}/unchanged/file_28 (100%)
- rename {dir => folder}/unchanged/file_29 (100%)
- rename {dir => folder}/unchanged/file_3 (100%)
- rename {dir => folder}/unchanged/file_30 (100%)
- rename {dir => folder}/unchanged/file_31 (100%)
- rename {dir => folder}/unchanged/file_32 (100%)
- rename {dir => folder}/unchanged/file_33 (100%)
- rename {dir => folder}/unchanged/file_34 (100%)
- rename {dir => folder}/unchanged/file_35 (100%)
- rename {dir => folder}/unchanged/file_36 (100%)
- rename {dir => folder}/unchanged/file_37 (100%)
- rename {dir => folder}/unchanged/file_38 (100%)
- rename {dir => folder}/unchanged/file_39 (100%)
- rename {dir => folder}/unchanged/file_4 (100%)
- rename {dir => folder}/unchanged/file_40 (100%)
- rename {dir => folder}/unchanged/file_41 (100%)
- rename {dir => folder}/unchanged/file_42 (100%)
- rename {dir => folder}/unchanged/file_43 (100%)
- rename {dir => folder}/unchanged/file_44 (100%)
- rename {dir => folder}/unchanged/file_45 (100%)
- rename {dir => folder}/unchanged/file_46 (100%)
- rename {dir => folder}/unchanged/file_47 (100%)
- rename {dir => folder}/unchanged/file_48 (100%)
- rename {dir => folder}/unchanged/file_49 (100%)
- rename {dir => folder}/unchanged/file_5 (100%)
- rename {dir => folder}/unchanged/file_50 (100%)
- rename {dir => folder}/unchanged/file_51 (100%)
- rename {dir => folder}/unchanged/file_52 (100%)
- rename {dir => folder}/unchanged/file_53 (100%)
- rename {dir => folder}/unchanged/file_54 (100%)
- rename {dir => folder}/unchanged/file_55 (100%)
- rename {dir => folder}/unchanged/file_56 (100%)
- rename {dir => folder}/unchanged/file_57 (100%)
- rename {dir => folder}/unchanged/file_58 (100%)
- rename {dir => folder}/unchanged/file_59 (100%)
- rename {dir => folder}/unchanged/file_6 (100%)
- rename {dir => folder}/unchanged/file_60 (100%)
- rename {dir => folder}/unchanged/file_61 (100%)
- rename {dir => folder}/unchanged/file_62 (100%)
- rename {dir => folder}/unchanged/file_63 (100%)
- rename {dir => folder}/unchanged/file_64 (100%)
- rename {dir => folder}/unchanged/file_65 (100%)
- rename {dir => folder}/unchanged/file_66 (100%)
- rename {dir => folder}/unchanged/file_67 (100%)
- rename {dir => folder}/unchanged/file_68 (100%)
- rename {dir => folder}/unchanged/file_69 (100%)
- rename {dir => folder}/unchanged/file_7 (100%)
- rename {dir => folder}/unchanged/file_70 (100%)
- rename {dir => folder}/unchanged/file_71 (100%)
- rename {dir => folder}/unchanged/file_72 (100%)
- rename {dir => folder}/unchanged/file_73 (100%)
- rename {dir => folder}/unchanged/file_74 (100%)
- rename {dir => folder}/unchanged/file_75 (100%)
- rename {dir => folder}/unchanged/file_76 (100%)
- rename {dir => folder}/unchanged/file_77 (100%)
- rename {dir => folder}/unchanged/file_78 (100%)
- rename {dir => folder}/unchanged/file_79 (100%)
- rename {dir => folder}/unchanged/file_8 (100%)
- rename {dir => folder}/unchanged/file_80 (100%)
- rename {dir => folder}/unchanged/file_81 (100%)
- rename {dir => folder}/unchanged/file_82 (100%)
- rename {dir => folder}/unchanged/file_83 (100%)
- rename {dir => folder}/unchanged/file_84 (100%)
- rename {dir => folder}/unchanged/file_85 (100%)
- rename {dir => folder}/unchanged/file_86 (100%)
- rename {dir => folder}/unchanged/file_87 (100%)
- rename {dir => folder}/unchanged/file_88 (100%)
- rename {dir => folder}/unchanged/file_9 (100%)
-Switched to branch 'B'
-[B 9770da3] B1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[master 2131783] D
  Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir/subdir/newfile.c
- create mode 100644 dir/subdir/newsubdir/newfile.py
-[B 0eecb62] B2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 4bb0b07] C
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir/subdir/newfile.rs
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - creating initial commits
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7111.2 'check: A B C D --soft A B D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 2 - check: A B C D --soft A B D
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7111.3 'check: A B C D --mixed A D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 3 - check: A B C D --mixed A D D
 
-  git switch -c <new-branch-name>
+expecting success of 7111.4 'check: A B C D --hard D D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 2131783 D
+ok 4 - check: A B C D --hard D D D
 
-Or undo this operation with:
+expecting success of 7111.5 'check: A B C D --merge XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' not uptodate. Cannot merge.
+fatal: Could not reset index file to revision 'D'.
+ok 5 - check: A B C D --merge XXXXX  
 
-  git switch -
+expecting success of 7111.6 'check: A B C D --keep XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' would be overwritten by merge. Cannot merge.
+fatal: Could not reset index file to revision 'D'.
+ok 6 - check: A B C D --keep XXXXX  
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7111.7 'check: A B C C --soft A B C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 7 - check: A B C C --soft A B C
 
-HEAD is now at 9910422 A
-Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/Bmod.
-Checking the pick of B1...
-fatal: path 'dir' does not exist in 'Bmod~1'
-Bmod~1:dir
-Checking the pick of B2...
-fatal: path 'dir' does not exist in 'Bmod'
-Bmod:dir
-ok 59 - 12f: Trivial directory resolve, caching, all kinds of fun
+expecting success of 7111.8 'check: A B C C --mixed A C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 8 - check: A B C C --mixed A C C
 
-expecting success of 6423.60 '12g: Testcase with two kinds of "relevant" renames': 
-	test_setup_12g &&
-	(
-		cd 12g &&
+expecting success of 7111.9 'check: A B C C --hard C C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 4bb0b07 C
+ok 9 - check: A B C C --hard C C C
 
-		git checkout A^0 &&
+expecting success of 7111.10 'check: A B C C --merge XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' not uptodate. Cannot merge.
+fatal: Could not reset index file to revision 'C'.
+ok 10 - check: A B C C --merge XXXXX  
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7111.11 'check: A B C C --keep A C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 11 - check: A B C C --keep A C C
 
-		test_write_lines once upon a time there was a repo >expect &&
-		test_cmp expect newfile &&
+expecting success of 7111.12 'check: B B C D --soft B B D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 12 - check: B B C D --soft B B D
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
+expecting success of 7111.13 'check: B B C D --mixed B D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 13 - check: B B C D --mixed B D D
 
-		git rev-parse >actual \
-			HEAD:newdir/a  HEAD:newdir/b   HEAD:newdir/c &&
-		git rev-parse >expect \
-			B:newdir/a     B:newdir/b      A:subdir/c &&
-		test_cmp expect actual &&
+expecting success of 7111.14 'check: B B C D --hard D D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 2131783 D
+ok 14 - check: B B C D --hard D D D
 
-		test_must_fail git rev-parse HEAD:subdir/a &&
-		test_must_fail git rev-parse HEAD:subdir/b &&
-		test_must_fail git rev-parse HEAD:subdir/c &&
-		test_path_is_missing subdir/ &&
-		test_path_is_file newdir/c
-	)
+expecting success of 7111.15 'check: B B C D --merge D D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 15 - check: B B C D --merge D D D
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12g/.git/
-[master (root-commit) 4f375a3] O
- Author: A U Thor <author@example.com>
- 3 files changed, 22 insertions(+)
- create mode 100644 somefile
- create mode 100644 subdir/a
- create mode 100644 subdir/b
-Switched to branch 'A'
-[A 0338b5a] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 subdir/c
-Switched to branch 'B'
-[B a6ab9df] B
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- rename {subdir => newdir}/a (87%)
- rename {subdir => newdir}/b (82%)
- rename somefile => newfile (82%)
-Note: switching to 'A^0'.
+expecting success of 7111.16 'check: B B C D --keep XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' would be overwritten by merge. Cannot merge.
+fatal: Could not reset index file to revision 'D'.
+ok 16 - check: B B C D --keep XXXXX  
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7111.17 'check: B B C C --soft B B C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 17 - check: B B C C --soft B B C
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7111.18 'check: B B C C --mixed B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 18 - check: B B C C --mixed B C C
 
-  git switch -c <new-branch-name>
+expecting success of 7111.19 'check: B B C C --hard C C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 4bb0b07 C
+ok 19 - check: B B C C --hard C C C
 
-Or undo this operation with:
+expecting success of 7111.20 'check: B B C C --merge C C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 20 - check: B B C C --merge C C C
 
-  git switch -
+expecting success of 7111.21 'check: B B C C --keep B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 21 - check: B B C C --keep B C C
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7111.22 'check: B C C D --soft B C D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 22 - check: B C C D --soft B C D
 
-HEAD is now at 0338b5a A
-Path updated: subdir/c added in HEAD inside a directory that was renamed in B^0; moving it to newdir/c.
-Auto-merging newfile
-Merge made by the 'ort' strategy.
- {subdir => newdir}/a | 1 +
- {subdir => newdir}/b | 1 +
- {subdir => newdir}/c | 0
- somefile => newfile  | 1 +
- 4 files changed, 3 insertions(+)
- rename {subdir => newdir}/a (87%)
- rename {subdir => newdir}/b (82%)
- rename {subdir => newdir}/c (100%)
- rename somefile => newfile (85%)
-fatal: path 'subdir/a' does not exist in 'HEAD'
-HEAD:subdir/a
-fatal: path 'subdir/b' does not exist in 'HEAD'
-HEAD:subdir/b
-fatal: path 'subdir/c' does not exist in 'HEAD'
-HEAD:subdir/c
-ok 60 - 12g: Testcase with two kinds of "relevant" renames
+expecting success of 7111.23 'check: B C C D --mixed B D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 23 - check: B C C D --mixed B D D
 
-checking known breakage of 6423.61 '12h: renaming a file within a renamed directory': 
-	test_setup_12h &&
-	(
-		cd 12h &&
+expecting success of 7111.24 'check: B C C D --hard D D D': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 2131783 D
+ok 24 - check: B C C D --hard D D D
 
-		git checkout A^0 &&
+expecting success of 7111.25 'check: B C C D --merge XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' not uptodate. Cannot merge.
+fatal: Could not reset index file to revision 'D'.
+ok 25 - check: B C C D --merge XXXXX  
 
-		test_might_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+expecting success of 7111.26 'check: B C C D --keep XXXXX  ': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+error: Entry 'file1' not uptodate. Cannot merge.
+fatal: Could not reset index file to revision 'D'.
+ok 26 - check: B C C D --keep XXXXX  
 
-		git ls-files >tracked &&
-		test_line_count = 2 tracked &&
+expecting success of 7111.27 'check: B C C C --soft B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 27 - check: B C C C --soft B C C
 
-		test_path_is_missing olddir/a &&
-		test_path_is_file newdir/alpha &&
-		test_path_is_file newdir/b &&
+expecting success of 7111.28 'check: B C C C --mixed B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+Unstaged changes after reset:
+M	file1
+ok 28 - check: B C C C --mixed B C C
 
-		git rev-parse >actual \
-			HEAD:newdir/alpha  HEAD:newdir/b &&
-		git rev-parse >expect \
-			A:newdir/a         O:oldir/b &&
-		test_cmp expect actual
-	)
+expecting success of 7111.29 'check: B C C C --hard C C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+HEAD is now at 4bb0b07 C
+ok 29 - check: B C C C --hard C C C
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12h/.git/
-[master (root-commit) 94e6431] orig
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 olddir/a
- create mode 100644 olddir/b
-Switched to branch 'A'
-[A 9bdc996] A
+expecting success of 7111.30 'check: B C C C --merge B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 30 - check: B C C C --merge B C C
+
+expecting success of 7111.31 'check: B C C C --keep B C C': 
+	git reset --hard C &&
+	if test "$I1" != "$H1"
+	then
+	    echo "$I1" >file1 &&
+	    git add file1
+	fi &&
+	if test "$W1" != "$I1"
+	then
+	    echo "$W1" >file1
+	fi &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    test "$(cat file1)" = "$W2" &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at 4bb0b07 C
+ok 31 - check: B C C C --keep B C C
+
+expecting success of 7111.32 'setting up branches to test with unmerged entries': 
+	git reset --hard C &&
+	git branch branch1 &&
+	git branch branch2 &&
+	git checkout branch1 &&
+	test_commit B1 file1 &&
+	git checkout branch2 &&
+	test_commit B file1
+
+HEAD is now at 4bb0b07 C
+Switched to branch 'branch1'
+[branch1 5456cd2] B1
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- rename {olddir => newdir}/a (70%)
- rename {olddir => newdir}/b (100%)
-Switched to branch 'B'
-[B bec6409] B
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch2'
+[branch2 aa272d3] B
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename olddir/{a => alpha} (100%)
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 32 - setting up branches to test with unmerged entries
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7111.33 'check: X U B C --soft XXXXX  ': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+ok 33 - check: X U B C --soft XXXXX  
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7111.34 'check: X U B C --mixed X C C': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+Unstaged changes after reset:
+M	file1
+ok 34 - check: X U B C --mixed X C C
 
-  git switch -c <new-branch-name>
+expecting success of 7111.35 'check: X U B C --hard C C C': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 4bb0b07 C
+ok 35 - check: X U B C --hard C C C
 
-Or undo this operation with:
+expecting success of 7111.36 'check: X U B C --merge C C C': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 36 - check: X U B C --merge C C C
 
-  git switch -
+expecting success of 7111.37 'check: X U B C --keep XXXXX  ': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 37 - check: X U B C --keep XXXXX  
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7111.38 'check: X U B B --soft XXXXX  ': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a soft reset in the middle of a merge.
+ok 38 - check: X U B B --soft XXXXX  
 
-HEAD is now at 9bdc996 A
-Path updated: olddir/a renamed to olddir/alpha in B^0, inside a directory that was renamed in HEAD; moving it to newdir/alpha.
-CONFLICT (rename/rename): olddir/a renamed to newdir/a in HEAD and to newdir/alpha in B^0.
+expecting success of 7111.39 'check: X U B B --mixed X B B': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
 Automatic merge failed; fix conflicts and then commit the result.
-test_line_count: line count for tracked != 2
-newdir/a
-newdir/alpha
-newdir/b
-olddir/a
-not ok 61 - 12h: renaming a file within a renamed directory # TODO known breakage
+Unstaged changes after reset:
+M	file1
+ok 39 - check: X U B B --mixed X B B
 
-expecting success of 6423.62 '12i: Directory rename causes rename-to-self': 
-	test_setup_12i &&
-	(
-		cd 12i &&
+expecting success of 7111.40 'check: X U B B --hard B B B': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at aa272d3 B
+ok 40 - check: X U B B --hard B B B
 
-		git checkout A^0 &&
+expecting success of 7111.41 'check: X U B B --merge B B B': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 41 - check: X U B B --merge B B B
 
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+expecting success of 7111.42 'check: X U B B --keep XXXXX  ': 
+	git reset --hard B &&
+	test_must_fail git merge branch1 &&
+	cat file1 >X_file1 &&
+	if test "$W2" != "XXXXX"
+	then
+	    git reset --$opt $T &&
+	    if test "$W2" = "X"
+	    then
+		test_cmp file1 X_file1
+	    else
+		test "$(cat file1)" = "$W2"
+	    fi &&
+	    git checkout-index -f -- file1 &&
+	    test "$(cat file1)" = "$I2" &&
+	    git checkout -f HEAD -- file1 &&
+	    test "$(cat file1)" = "$H2"
+	else
+	    test_must_fail git reset --$opt $T
+	fi
+    
+HEAD is now at aa272d3 B
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Cannot do a keep reset in the middle of a merge.
+ok 42 - check: X U B B --keep XXXXX  
 
-		test_path_is_missing source/subdir &&
-		test_path_is_file source/bar &&
-		test_path_is_file source/baz &&
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7300-clean.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/.git/
+expecting success of 7300.1 'setup': 
 
-		git ls-files >actual &&
-		uniq <actual >tracked &&
-		test_line_count = 3 tracked &&
+	mkdir -p src &&
+	touch src/part1.c Makefile &&
+	echo build >.gitignore &&
+	echo \*.o >>.gitignore &&
+	git add . &&
+	git commit -m setup &&
+	touch src/part2.c README &&
+	git add .
 
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU source/bar
-		 M source/baz
-		EOF
-		test_cmp expect actual
-	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12i/.git/
-[master (root-commit) 552586d] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 source/bar
- create mode 100644 source/baz
- create mode 100644 source/subdir/foo
-Switched to branch 'A'
-[A 46a9eed] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename source/{subdir => }/foo (100%)
-Switched to branch 'B'
-[B 50b462a] B
+[master (root-commit) c1a48e2] setup
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename source/{ => subdir}/bar (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ 3 files changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 Makefile
+ create mode 100644 src/part1.c
+ok 1 - setup
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7300.2 'git clean with skip-worktree .gitignore': 
+	git update-index --skip-worktree .gitignore &&
+	rm .gitignore &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so &&
+	git update-index --no-skip-worktree .gitignore &&
+	git checkout .gitignore
 
-  git switch -c <new-branch-name>
+Removing a.out
+Removing src/part3.c
+Updated 1 path from the index
+ok 2 - git clean with skip-worktree .gitignore
 
-Or undo this operation with:
+expecting success of 7300.3 'git clean': 
 
-  git switch -
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 46a9eed A
-M	source/baz
-CONFLICT (file location): source/subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to source/bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 62 - 12i: Directory rename causes rename-to-self
+Removing a.out
+Removing src/part3.c
+ok 3 - git clean
 
-expecting success of 6423.63 '12j: Directory rename to root causes rename-to-self': 
-	test_setup_12j &&
-	(
-		cd 12j &&
+expecting success of 7300.4 'git clean src/': 
 
-		git checkout A^0 &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
 
-		test_path_is_missing subdir &&
-		test_path_is_file bar &&
-		test_path_is_file baz &&
+Removing src/part3.c
+ok 4 - git clean src/
 
-		git ls-files >actual &&
-		uniq <actual >tracked &&
-		test_line_count = 3 tracked &&
+expecting success of 7300.5 'git clean src/ src/': 
 
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU bar
-		 M baz
-		EOF
-		test_cmp expect actual
-	)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean src/ src/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12j/.git/
-[master (root-commit) 59aeda9] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 bar
- create mode 100644 baz
- create mode 100644 subdir/foo
-Switched to branch 'A'
-[A 493a8b6] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename subdir/foo => foo (100%)
-Switched to branch 'B'
-[B b7d0322] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bar => subdir/bar (100%)
-Note: switching to 'A^0'.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Removing src/part3.c
+ok 5 - git clean src/ src/
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7300.6 'git clean with prefix': 
 
-  git switch -c <new-branch-name>
+	mkdir -p build docs src/test &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
+	(cd src/ && git clean) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file src/test/1.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Or undo this operation with:
 
-  git switch -
+Removing part3.c
+ok 6 - git clean with prefix
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7300.7 'git clean with relative prefix': 
 
-HEAD is now at 493a8b6 A
-M	baz
-CONFLICT (file location): subdir/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 63 - 12j: Directory rename to root causes rename-to-self
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n ../src |
+		grep part3 |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	test "$would_clean" = ../src/part3.c
 
-expecting success of 6423.64 '12k: Directory rename with sibling causes rename-to-self': 
-	test_setup_12k &&
-	(
-		cd 12k &&
+ok 7 - git clean with relative prefix
 
-		git checkout A^0 &&
+expecting success of 7300.8 'git clean with absolute path': 
 
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	would_clean=$(
+		cd docs &&
+		git clean -n "$(pwd)/../src" |
+		grep part3 |
+		sed -n -e "s|^Would remove ||p"
+	) &&
+	test "$would_clean" = ../src/part3.c
 
-		test_path_is_missing dirB &&
-		test_path_is_file dirA/bar &&
-		test_path_is_file dirA/baz &&
+ok 8 - git clean with absolute path
 
-		git ls-files >actual &&
-		uniq <actual >tracked &&
-		test_line_count = 3 tracked &&
+expecting success of 7300.9 'git clean with out of work tree relative path': 
 
-		git status --porcelain -uno >actual &&
-		cat >expect <<-\EOF &&
-		UU dirA/bar
-		 M dirA/baz
-		EOF
-		test_cmp expect actual
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	(
+		cd docs &&
+		test_must_fail git clean -n ../..
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12k/.git/
-[master (root-commit) d90d96e] orig
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dirA/bar
- create mode 100644 dirA/baz
- create mode 100644 dirB/foo
-Switched to branch 'A'
-[A 1e2e223] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dirB => dirA}/foo (100%)
-Switched to branch 'B'
-[B 8f7e5e2] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dirA => dirB}/bar (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
+fatal: ../..: '../..' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean'
+ok 9 - git clean with out of work tree relative path
 
-Or undo this operation with:
+expecting success of 7300.10 'git clean with out of work tree absolute path': 
 
-  git switch -
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	dd=$(cd .. && pwd) &&
+	(
+		cd docs &&
+		test_must_fail git clean -n $dd
+	)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t: '/build/reproducible-path/git-2.49.0+next.20250314/t' is outside repository at '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean'
+ok 10 - git clean with out of work tree absolute path
 
-HEAD is now at 1e2e223 A
-M	dirA/baz
-CONFLICT (file location): dirB/bar added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to dirA/bar.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 64 - 12k: Directory rename with sibling causes rename-to-self
+expecting success of 7300.11 'git clean -d with prefix and path': 
 
-expecting success of 6423.65 '12l (B into A): Rename into each other + add/add conflict': 
-	test_setup_12l BintoA &&
-	(
-		cd 12l_BintoA &&
+	mkdir -p build docs src/feature &&
+	touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
+	(cd src/ && git clean -d feature/) &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing src/feature/file.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		git checkout -q A^0 &&
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+Removing feature/
+ok 11 - git clean -d with prefix and path
 
-		test_stdout_line_count = 5 git ls-files -s &&
+checking prerequisite: SYMLINKS
 
-		git rev-parse >actual \
-			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
-			:2:sub1/sub2/new_add_add_file \
-			:3:sub1/sub2/new_add_add_file &&
-		git rev-parse >expect \
-			O:sub1/file  B:sub1/newfile O:sub2/other \
-			A:sub2/new_add_add_file \
-			B:sub1/sub2/new_add_add_file &&
-		test_cmp expect actual &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-		git ls-files -o >actual &&
-		test_write_lines actual expect >expect &&
-		test_cmp expect actual
-	)
+)
+prerequisite SYMLINKS ok
+expecting success of 7300.12 'git clean symbolic link': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12l_BintoA/.git/
-[master (root-commit) 3d69f53] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub1/file
- create mode 100644 sub2/other
-Switched to branch 'A'
-[A e3180ab] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 sub2/new_add_add_file
- rename {sub1 => sub3}/file (100%)
-Switched to branch 'B'
-[B 4fbab5b] B
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 sub1/newfile
- create mode 100644 sub1/sub2/new_add_add_file
- rename {sub2 => sub1/sub2}/other (100%)
-Path updated: sub2/new_add_add_file added in HEAD inside a directory that was renamed in B^0; moving it to sub1/sub2/new_add_add_file.
-Auto-merging sub1/sub2/new_add_add_file
-CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
-Path updated: sub1/newfile added in B^0 inside a directory that was renamed in HEAD; moving it to sub3/newfile.
-Path updated: sub2/other renamed to sub1/sub2/other in B^0, inside a directory that was renamed in HEAD; moving it to sub3/sub2/other.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 65 - 12l (B into A): Rename into each other + add/add conflict
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	ln -s docs/manual.txt src/part4.c &&
+	git clean &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing src/part4.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-expecting success of 6423.66 '12l (A into B): Rename into each other + add/add conflict': 
-	test_setup_12l AintoB &&
-	(
-		cd 12l_AintoB &&
 
-		git checkout -q B^0 &&
+Removing a.out
+Removing src/part3.c
+Removing src/part4.c
+ok 12 - git clean symbolic link
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 &&
+expecting success of 7300.13 'git clean with wildcard': 
 
-		test_stdout_line_count = 5 git ls-files -s &&
+	touch a.clean b.clean other.c &&
+	git clean "*.clean" &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.clean &&
+	test_path_is_missing b.clean &&
+	test_path_is_file other.c
 
-		git rev-parse >actual \
-			:0:sub3/file :0:sub3/newfile :0:sub3/sub2/other \
-			:2:sub1/sub2/new_add_add_file \
-			:3:sub1/sub2/new_add_add_file &&
-		git rev-parse >expect \
-			O:sub1/file  B:sub1/newfile O:sub2/other \
-			B:sub1/sub2/new_add_add_file \
-			A:sub2/new_add_add_file &&
-		test_cmp expect actual &&
 
-		git ls-files -o >actual &&
-		test_write_lines actual expect >expect &&
-		test_cmp expect actual
-	)
+Removing a.clean
+Removing b.clean
+ok 13 - git clean with wildcard
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12l_AintoB/.git/
-[master (root-commit) 3d69f53] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 sub1/file
- create mode 100644 sub2/other
-Switched to branch 'A'
-[A e3180ab] A
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 sub2/new_add_add_file
- rename {sub1 => sub3}/file (100%)
-Switched to branch 'B'
-[B 4fbab5b] B
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 sub1/newfile
- create mode 100644 sub1/sub2/new_add_add_file
- rename {sub2 => sub1/sub2}/other (100%)
-Path updated: sub2/new_add_add_file added in A^0 inside a directory that was renamed in HEAD; moving it to sub1/sub2/new_add_add_file.
-Auto-merging sub1/sub2/new_add_add_file
-CONFLICT (add/add): Merge conflict in sub1/sub2/new_add_add_file
-Path updated: sub1/newfile added in HEAD inside a directory that was renamed in A^0; moving it to sub3/newfile.
-Path updated: sub2/other renamed to sub1/sub2/other in HEAD, inside a directory that was renamed in A^0; moving it to sub3/sub2/other.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 66 - 12l (A into B): Rename into each other + add/add conflict
+expecting success of 7300.14 'git clean -n': 
 
-expecting success of 6423.67 '12m: Change parent of renamed-dir to symlink on other side': 
-	test_setup_12m &&
-	(
-		cd 12m &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-		git checkout -q A^0 &&
 
-		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+Would remove a.out
+Would remove other.c
+Would remove src/part3.c
+ok 14 - git clean -n
 
-		test_stdout_line_count = 3 git ls-files -s &&
-		test_stdout_line_count = 2 ls -1 renamed-dir &&
-		test_path_is_missing dir
-	)
+expecting success of 7300.15 'git clean -d': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12m/.git/
-[master (root-commit) c5527ce] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/subdir/file
-Switched to branch 'A'
-[A 4ee9449] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {dir => renamed-dir}/subdir/file (100%)
-Switched to branch 'B'
-rm 'dir/subdir/file'
-[B 7225d2a] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 120000 dir/subdir
- delete mode 100644 dir/subdir/file
-CONFLICT (file location): dir/subdir added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to renamed-dir/subdir.
-CONFLICT (rename/delete): dir/subdir/file renamed to renamed-dir/subdir/file in HEAD, but deleted in B^0.
-CONFLICT (file/directory): directory in the way of renamed-dir/subdir from B^0; moving it to renamed-dir/subdir~B^0 instead.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 67 - 12m: Change parent of renamed-dir to symlink on other side
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-expecting success of 6423.68 '12n: Directory rename transitively makes rename back to self': 
-	test_setup_12n &&
-	(
-		cd 12n &&
 
-		git checkout -q B^0 &&
+Removing a.out
+Removing docs/
+Removing other.c
+Removing src/part3.c
+Removing src/test/
+ok 15 - git clean -d
 
-		test_must_fail git cherry-pick A^0 >out &&
-		grep "CONFLICT (file location).*should perhaps be moved" out
-	)
+expecting success of 7300.16 'git clean -d src/ examples/': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/12n/.git/
-[master (root-commit) ce200d8] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tools/hello
-Switched to branch 'A'
-[A dac8a10] Move world into tools/
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename world => tools/world (100%)
-Switched to branch 'B'
-[B 348168e] Move hello from tools/ to toplevel
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename tools/hello => hello (100%)
-error: could not apply dac8a10... Move world into tools/
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-CONFLICT (file location): world renamed to tools/world in dac8a10 (Move world into tools/), inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to world.
-ok 68 - 12n: Directory rename transitively makes rename back to self
+	mkdir -p build docs examples &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
+	git clean -d src/ examples/ &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing examples/1.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-expecting success of 6423.69 '13a(conflict): messages for newly added files': 
-	test_setup_13a conflict &&
-	(
-		cd 13a_conflict &&
 
-		git checkout A^0 &&
+Removing examples/
+Removing src/part3.c
+ok 16 - git clean -d src/ examples/
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
+expecting success of 7300.17 'git clean -x': 
 
-		test_grep CONFLICT..file.location.*z/e/f.added.in.B^0.*y/e/f out &&
-		test_grep CONFLICT..file.location.*z/d.added.in.B^0.*y/d out &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -x &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_file build/lib.so
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/[de]" paths &&
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d &&
-		test_path_is_missing z/e/f &&
-		test_path_is_file    y/e/f
-	)
+Removing a.out
+Removing obj.o
+Removing src/part3.c
+ok 17 - git clean -x
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13a_conflict/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-Note: switching to 'A^0'.
+expecting success of 7300.18 'git clean -d -x': 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
 
-  git switch -c <new-branch-name>
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+Removing src/part3.c
+ok 18 - git clean -d -x
 
-Or undo this operation with:
+expecting success of 7300.19 'git clean -d -x with ignored tracked directory': 
 
-  git switch -
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -x -e src &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_missing docs &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 4e9f86d A
-CONFLICT (file location): z/e/f added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/e/f.
-CONFLICT (file location): z/d added in B^0 inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/e/f
-ok 69 - 13a(conflict): messages for newly added files
+Removing a.out
+Removing build/
+Removing docs/
+Removing obj.o
+ok 19 - git clean -d -x with ignored tracked directory
 
-expecting success of 6423.70 '13a(info): messages for newly added files': 
-	test_setup_13a info &&
-	(
-		cd 13a_info &&
+expecting success of 7300.20 'git clean -X': 
 
-		git reset --hard &&
-		git checkout A^0 &&
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -X &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_file build/lib.so
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		test_grep Path.updated:.*z/e/f.added.in.B^0.*y/e/f out &&
-		test_grep Path.updated:.*z/d.added.in.B^0.*y/d out &&
+Removing obj.o
+ok 20 - git clean -X
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/[de]" paths &&
+expecting success of 7300.21 'git clean -d -X': 
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d &&
-		test_path_is_missing z/e/f &&
-		test_path_is_file    y/e/f
-	)
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13a_info/.git/
-[master (root-commit) 4e96174] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 4e9f86d] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B aa97264] B
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 z/d
- create mode 100644 z/e/f
-HEAD is now at aa97264 B
-Note: switching to 'A^0'.
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Removing build/
+Removing obj.o
+ok 21 - git clean -d -X
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7300.22 'git clean -d -X with ignored tracked directory': 
 
-  git switch -c <new-branch-name>
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -d -X -e src &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_missing obj.o &&
+	test_path_is_missing build
 
-Or undo this operation with:
 
-  git switch -
+Removing build/
+Removing obj.o
+Removing src/part3.c
+ok 22 - git clean -d -X with ignored tracked directory
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7300.23 'clean.requireForce defaults to true': 
 
-HEAD is now at 4e9f86d A
-Path updated: z/e/f added in B^0 inside a directory that was renamed in HEAD; moving it to y/e/f.
-Path updated: z/d added in B^0 inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-y/e/f
-ok 70 - 13a(info): messages for newly added files
+	git config --unset clean.requireForce &&
+	test_must_fail git clean
 
-expecting success of 6423.71 '13b(conflict): messages for transitive rename with conflicted content': 
-	test_setup_13b conflict &&
-	(
-		cd 13b_conflict &&
 
-		git checkout A^0 &&
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 23 - clean.requireForce defaults to true
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
+expecting success of 7300.24 'clean.requireForce': 
 
-		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
-		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+	git config clean.requireForce true &&
+	test_must_fail git clean
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
+fatal: clean.requireForce is true and -f not given: refusing to clean
+ok 24 - clean.requireForce
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13b_conflict/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B cd61ab0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (75%)
-Note: switching to 'A^0'.
+expecting success of 7300.25 'clean.requireForce and -n': 
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	mkdir -p build docs &&
+	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
+	git clean -n &&
+	test_path_is_file Makefile &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_file a.out &&
+	test_path_is_file src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
 
-  git switch -c <new-branch-name>
+Would remove a.out
+Would remove src/part3.c
+ok 25 - clean.requireForce and -n
 
-Or undo this operation with:
+expecting success of 7300.26 'clean.requireForce and -f': 
 
-  git switch -
+	git clean -f &&
+	test_path_is_file README &&
+	test_path_is_file src/part1.c &&
+	test_path_is_file src/part2.c &&
+	test_path_is_missing a.out &&
+	test_path_is_missing src/part3.c &&
+	test_path_is_file docs/manual.txt &&
+	test_path_is_file obj.o &&
+	test_path_is_file build/lib.so
 
-Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at a2010ab A
-CONFLICT (content): Merge conflict in y/d
-CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/d
-y/d
-ok 71 - 13b(conflict): messages for transitive rename with conflicted content
+Removing a.out
+Removing src/part3.c
+ok 26 - clean.requireForce and -f
 
-expecting success of 6423.72 '13b(info): messages for transitive rename with conflicted content': 
-	test_setup_13b info &&
-	(
-		cd 13b_info &&
+expecting success of 7300.27 'clean.requireForce and --interactive': 
+	git clean --interactive </dev/null >output 2>error &&
+	test_grep ! "requireForce is true and" error &&
+	test_grep "\*\*\* Commands \*\*\*" output
 
-		git reset --hard &&
-		git checkout A^0 &&
+*** Commands ***
+ok 27 - clean.requireForce and --interactive
 
-		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+expecting success of 7300.28 'core.excludesfile': 
 
-		test_grep CONFLICT.*content.*Merge.conflict.in.y/d out &&
-		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+	echo excludes >excludes &&
+	echo included >included &&
+	git config core.excludesfile excludes &&
+	output=$(git clean -n excludes included 2>&1) &&
+	expr "$output" : ".*included" >/dev/null &&
+	! expr "$output" : ".*excludes" >/dev/null
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
+ok 28 - core.excludesfile
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13b_info/.git/
-[master (root-commit) f84ec32] O
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+)
- create mode 100644 x/d
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A a2010ab] A
- Author: A U Thor <author@example.com>
- 3 files changed, 1 insertion(+)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
-Switched to branch 'B'
-[B cd61ab0] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename {x => z}/d (75%)
-HEAD is now at cd61ab0 B
-Note: switching to 'A^0'.
+checking prerequisite: SANITY
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
 
-  git switch -c <new-branch-name>
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-Or undo this operation with:
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-  git switch -
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 7300.29 'removal failure': 
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	mkdir foo &&
+	touch foo/bar &&
+	test_when_finished "chmod 755 foo" &&
+	(exec <foo/bar &&
+	 chmod 0 foo &&
+	 test_must_fail git clean -f -d)
 
-HEAD is now at a2010ab A
-CONFLICT (content): Merge conflict in y/d
-Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-y/d
-y/d
-ok 72 - 13b(info): messages for transitive rename with conflicted content
+warning: could not open directory 'foo/': Permission denied
+warning: failed to remove foo/: Directory not empty
+Removing docs/
+Removing error
+Removing included
+Removing output
+ok 29 - removal failure
 
-expecting success of 6423.73 '13c(conflict): messages for rename/rename(1to1) via transitive rename': 
-	test_setup_13c conflict &&
+expecting success of 7300.30 'nested git work tree': 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
 	(
-		cd 13c_conflict &&
-
-		git checkout A^0 &&
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -d &&
+	test_path_is_file foo/.git/index &&
+	test_path_is_file foo/hello.world &&
+	test_path_is_file baz/boo/.git/index &&
+	test_path_is_file baz/boo/deeper.world &&
+	test_path_is_missing bar
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing bar/
+Skipping repository baz/boo
+ok 30 - nested git work tree
 
-		test_grep CONFLICT..file.location.*x/d.renamed.to.z/d.*moved.to.y/d out &&
+expecting success of 7300.31 'should clean things that almost look like git but are not': 
+	rm -fr almost_git almost_bare_git almost_submodule &&
+	mkdir -p almost_git/.git/objects &&
+	mkdir -p almost_git/.git/refs &&
+	cat >almost_git/.git/HEAD <<-\EOF &&
+	garbage
+	EOF
+	cp -r almost_git/.git/ almost_bare_git &&
+	mkdir almost_submodule/ &&
+	cat >almost_submodule/.git <<-\EOF &&
+	garbage
+	EOF
+	test_when_finished "rm -rf almost_*" &&
+	git clean -f -d &&
+	test_path_is_missing almost_git &&
+	test_path_is_missing almost_bare_git &&
+	test_path_is_missing almost_submodule
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
+Removing almost_bare_git/
+Removing almost_git/
+Removing almost_submodule/
+Skipping repository baz/boo
+ok 31 - should clean things that almost look like git but are not
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
+expecting success of 7300.32 'should not clean submodules': 
+	rm -fr repo to_clean sub1 sub2 &&
+	mkdir repo to_clean &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./repo/.git sub1 &&
+	git commit -m "sub1" &&
+	git branch before_sub2 &&
+	git submodule add ./repo/.git sub2 &&
+	git commit -m "sub2" &&
+	git checkout before_sub2 &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file repo/.git/index &&
+	test_path_is_file repo/hello.world &&
+	test_path_is_file sub1/.git &&
+	test_path_is_file sub1/hello.world &&
+	test_path_is_file sub2/.git &&
+	test_path_is_file sub2/hello.world &&
+	test_path_is_missing to_clean
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13c_conflict/.git/
-[master (root-commit) 868129a] O
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
  Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 230cc6a] A
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/sub1'...
+done.
+[master a5d0902] sub1
  Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => y}/d (100%)
-Switched to branch 'B'
-[B e9512b7] B
+ 4 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 README
+ create mode 100644 src/part2.c
+ create mode 160000 sub1
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/sub2'...
+done.
+[master 8525980] sub2
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-Note: switching to 'A^0'.
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub2
+warning: unable to rmdir 'sub2': Directory not empty
+Switched to branch 'before_sub2'
+Removing .gitconfig
+Skipping repository baz/boo
+Removing to_clean/
+ok 32 - should not clean submodules
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7300.33 'should avoid cleaning possible submodules': 
+	rm -fr to_clean possible_sub1 &&
+	mkdir to_clean possible_sub1 &&
+	test_when_finished "rm -rf possible_sub*" &&
+	echo "gitdir: foo" >possible_sub1/.git &&
+	>possible_sub1/hello.world &&
+	chmod 0 possible_sub1/.git &&
+	>to_clean/should_clean.this &&
+	git clean -f -d &&
+	test_path_is_file possible_sub1/.git &&
+	test_path_is_file possible_sub1/hello.world &&
+	test_path_is_missing to_clean
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Skipping repository baz/boo
+Removing to_clean/
+ok 33 - should avoid cleaning possible submodules
 
-  git switch -c <new-branch-name>
+expecting success of 7300.34 'nested (empty) git should be kept': 
+	rm -fr empty_repo to_clean &&
+	git init empty_repo &&
+	mkdir to_clean &&
+	>to_clean/should_clean.this &&
+	# Note that we put the expect file in the .git directory so that it
+	# does not get cleaned.
+	find empty_repo | sort >.git/expect &&
+	git clean -f -d &&
+	find empty_repo | sort >actual &&
+	test_cmp .git/expect actual &&
+	test_path_is_missing to_clean
 
-Or undo this operation with:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/empty_repo/.git/
+Skipping repository baz/boo
+Removing to_clean/
+ok 34 - nested (empty) git should be kept
 
-  git switch -
+expecting success of 7300.35 'nested bare repositories should be cleaned': 
+	rm -fr bare1 bare2 subdir &&
+	git init --bare bare1 &&
+	git clone --local --bare . bare2 &&
+	mkdir subdir &&
+	cp -r bare2 subdir/bare3 &&
+	git clean -f -d &&
+	test_path_is_missing bare1 &&
+	test_path_is_missing bare2 &&
+	test_path_is_missing subdir
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/bare1/
+Cloning into bare repository 'bare2'...
+done.
+Removing actual
+Removing bare1/
+Removing bare2/
+Skipping repository baz/boo
+Removing subdir/
+ok 35 - nested bare repositories should be cleaned
 
-HEAD is now at 230cc6a A
-CONFLICT (file location): x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to y/d.
-y/d
-y/d
-y/d
-ok 73 - 13c(conflict): messages for rename/rename(1to1) via transitive rename
+checking known breakage of 7300.36 'nested (empty) bare repositories should be cleaned even when in .git': 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git init --bare strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
 
-expecting success of 6423.74 '13c(info): messages for rename/rename(1to1) via transitive rename': 
-	test_setup_13c info &&
-	(
-		cd 13c_info &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/strange_bare/.git/
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Mar 17 13:27 strange_bare
+not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
-		git reset --hard &&
-		git checkout A^0 &&
+checking known breakage of 7300.37 'nested (non-empty) bare repositories should be cleaned even when in .git': 
+	rm -fr strange_bare &&
+	mkdir strange_bare &&
+	git clone --local --bare . strange_bare/.git &&
+	git clean -f -d &&
+	test_path_is_missing strange_bare
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+Cloning into bare repository 'strange_bare/.git'...
+done.
+Skipping repository baz/boo
+Path exists:
+drwxr-xr-x 3 pbuilder2 pbuilder2 60 Mar 17 13:27 strange_bare
+not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
-		test_grep Path.updated:.*x/d.renamed.to.z/d.in.B^0.*moving.it.to.y/d out &&
+expecting success of 7300.38 'giving path in nested git work tree will NOT remove it': 
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		mkdir -p bar/baz &&
+		test_commit msg bar/baz/hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/bar/baz &&
+	find repo | sort >actual &&
+	test_cmp expect actual
 
-		git ls-files >paths &&
-		! grep z/ paths &&
-		grep "y/d" paths &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 14dba50] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar/baz/hello.world
+ok 38 - giving path in nested git work tree will NOT remove it
 
-		test_path_is_missing z/d &&
-		test_path_is_file    y/d
-	)
+expecting success of 7300.39 'giving path to nested .git will not remove it': 
+	rm -fr repo &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/.git &&
+	find repo | sort >actual &&
+	test_cmp expect actual &&
+	test_path_is_dir untracked/
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13c_info/.git/
-[master (root-commit) 868129a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 13 insertions(+)
- create mode 100644 x/d
- create mode 100644 x/e
- create mode 100644 z/b
- create mode 100644 z/c
-Switched to branch 'A'
-[A 230cc6a] A
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- rename {z => y}/b (100%)
- rename {z => y}/c (100%)
- rename {x => y}/d (100%)
-Switched to branch 'B'
-[B e9512b7] B
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {x => z}/d (100%)
-HEAD is now at e9512b7 B
-Note: switching to 'A^0'.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 39 - giving path to nested .git will not remove it
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7300.40 'giving path to nested .git/ will NOT remove contents': 
+	rm -fr repo untracked &&
+	mkdir repo untracked &&
+	(
+		cd repo &&
+		git init &&
+		test_commit msg hello.world
+	) &&
+	find repo | sort >expect &&
+	git clean -f -d repo/.git/ &&
+	find repo | sort >actual &&
+	test_cmp expect actual &&
+	test_path_is_dir untracked/
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
+[master (root-commit) 1af9d3b] msg
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+ok 40 - giving path to nested .git/ will NOT remove contents
 
-  git switch -c <new-branch-name>
+expecting success of 7300.41 'force removal of nested git work tree': 
+	rm -fr foo bar baz &&
+	mkdir -p foo bar baz/boo &&
+	(
+		cd foo &&
+		git init &&
+		test_commit nested hello.world
+	) &&
+	(
+		cd bar &&
+		>goodbye.people
+	) &&
+	(
+		cd baz/boo &&
+		git init &&
+		test_commit deeply.nested deeper.world
+	) &&
+	git clean -f -f -d &&
+	test_path_is_missing foo &&
+	test_path_is_missing bar &&
+	test_path_is_missing baz
 
-Or undo this operation with:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/foo/.git/
+[master (root-commit) abd8674] nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 hello.world
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/baz/boo/.git/
+[master (root-commit) 3f7f1fc] deeply.nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 deeper.world
+Removing actual
+Removing bar/
+Removing baz/
+Removing empty_repo/
+Removing expect
+Removing foo/
+Removing repo/
+Removing strange_bare/
+Removing sub2/
+Removing untracked/
+ok 41 - force removal of nested git work tree
 
-  git switch -
+expecting success of 7300.42 'git clean -e': 
+	rm -fr repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		touch known 1 2 3 &&
+		git add known &&
+		git clean -f -e 1 -e 2 &&
+		test_path_exists 1 &&
+		test_path_exists 2 &&
+		test_path_is_missing 3 &&
+		test_path_exists known
+	)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/repo/.git/
+Removing 3
+ok 42 - git clean -e
 
-HEAD is now at 230cc6a A
-Path updated: x/d renamed to z/d in B^0, inside a directory that was renamed in HEAD; moving it to y/d.
-y/d
-ok 74 - 13c(info): messages for rename/rename(1to1) via transitive rename
+expecting success of 7300.43 'git clean -d with an unreadable empty directory': 
+	mkdir foo &&
+	chmod a= foo &&
+	git clean -dfx foo &&
+	test_path_is_missing foo
 
-expecting success of 6423.75 '13d(conflict): messages for rename/rename(1to1) via dual transitive rename': 
-	test_setup_13d conflict &&
-	(
-		cd 13d_conflict &&
+warning: could not open directory 'foo/': Permission denied
+Removing foo/
+ok 43 - git clean -d with an unreadable empty directory
 
-		git checkout A^0 &&
+expecting success of 7300.44 'git clean -d respects pathspecs (dir is prefix of pathspec)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foobar &&
+	test_path_is_dir foo &&
+	test_path_is_missing foobar
 
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
+Removing foobar/
+ok 44 - git clean -d respects pathspecs (dir is prefix of pathspec)
 
-		test_grep CONFLICT..file.location.*a/y.renamed.to.b/y.*moved.to.d/y out &&
-		test_grep CONFLICT..file.location.*a/y.renamed.to.c/y.*moved.to.d/y out &&
+expecting success of 7300.45 'git clean -d respects pathspecs (pathspec is prefix of dir)': 
+	mkdir -p foo &&
+	mkdir -p foobar &&
+	git clean -df foo &&
+	test_path_is_missing foo &&
+	test_path_is_dir foobar
 
-		git ls-files >paths &&
-		! grep b/ paths &&
-		! grep c/ paths &&
-		grep "d/y" paths &&
+Removing foo/
+ok 45 - git clean -d respects pathspecs (pathspec is prefix of dir)
 
-		test_path_is_missing b/y &&
-		test_path_is_missing c/y &&
-		test_path_is_file    d/y
-	)
+expecting success of 7300.46 'git clean -d skips untracked dirs containing ignored files': 
+	echo /foo/bar >.gitignore &&
+	echo ignoreme >>.gitignore &&
+	rm -rf foo &&
+	mkdir -p foo/a/aa/aaa foo/b/bb/bbb &&
+	touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 &&
+	git clean -df &&
+	test_path_is_dir foo &&
+	test_path_is_file foo/bar &&
+	test_path_is_missing foo/baz &&
+	test_path_is_file foo/a/aa/ignoreme &&
+	test_path_is_missing foo/a/aa/aaa &&
+	test_path_is_file foo/b/ignoreme &&
+	test_path_is_missing foo/b/bb
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13d_conflict/.git/
-[master (root-commit) c14d00a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
- create mode 100644 b/x
- create mode 100644 c/w
-Switched to branch 'A'
-[A e246998] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {c => d}/w (100%)
-Switched to branch 'B'
-[B 0624e26] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => c}/y (100%)
- rename {b => d}/x (100%)
-Note: switching to 'A^0'.
+Removing build/
+Removing foo/a/aa/aaa/
+Removing foo/b/bb/
+Removing foo/baz
+Removing foobar/
+Removing obj.o
+ok 46 - git clean -d skips untracked dirs containing ignored files
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7300.47 'git clean -d skips nested repo containing ignored files': 
+	test_when_finished "rm -rf nested-repo-with-ignored-file" &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	git init nested-repo-with-ignored-file &&
+	(
+		cd nested-repo-with-ignored-file &&
+		>file &&
+		git add file &&
+		git commit -m Initial &&
 
-  git switch -c <new-branch-name>
+		# This file is ignored by a .gitignore rule in the outer repo
+		# added in the previous test.
+		>ignoreme
+	) &&
 
-Or undo this operation with:
+	git clean -fd &&
 
-  git switch -
+	test_path_is_file nested-repo-with-ignored-file/.git/index &&
+	test_path_is_file nested-repo-with-ignored-file/ignoreme &&
+	test_path_is_file nested-repo-with-ignored-file/file
 
-Turn off this advice by setting config variable advice.detachedHead to false
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/nested-repo-with-ignored-file/.git/
+[master (root-commit) 4208a61] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+ok 47 - git clean -d skips nested repo containing ignored files
 
-HEAD is now at e246998 A
-CONFLICT (file location): a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0, suggesting it should perhaps be moved to d/y.
-CONFLICT (file location): a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to d/y.
-d/y
-d/y
-d/y
-ok 75 - 13d(conflict): messages for rename/rename(1to1) via dual transitive rename
+expecting success of 7300.48 'git clean handles being told what to clean': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
 
-expecting success of 6423.76 '13d(info): messages for rename/rename(1to1) via dual transitive rename': 
-	test_setup_13d info &&
-	(
-		cd 13d_info &&
+Removing d1/ut
+Removing d2/ut
+ok 48 - git clean handles being told what to clean
 
-		git reset --hard &&
-		git checkout A^0 &&
+expecting success of 7300.49 'git clean handles being told what to clean, with -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd */ut &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+Removing d1/ut
+Removing d2/ut
+ok 49 - git clean handles being told what to clean, with -d
 
-		test_grep Path.updated.*a/y.renamed.to.b/y.*moving.it.to.d/y out &&
-		test_grep Path.updated.*a/y.renamed.to.c/y.*moving.it.to.d/y out &&
+expecting success of 7300.50 'git clean works if a glob is passed without -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -f "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
 
-		git ls-files >paths &&
-		! grep b/ paths &&
-		! grep c/ paths &&
-		grep "d/y" paths &&
+Removing d1/ut
+Removing d2/ut
+ok 50 - git clean works if a glob is passed without -d
 
-		test_path_is_missing b/y &&
-		test_path_is_missing c/y &&
-		test_path_is_file    d/y
-	)
+expecting success of 7300.51 'git clean works if a glob is passed with -d': 
+	mkdir -p d1 d2 &&
+	touch d1/ut d2/ut &&
+	git clean -ffd "*ut" &&
+	test_path_is_missing d1/ut &&
+	test_path_is_missing d2/ut
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13d_info/.git/
-[master (root-commit) c14d00a] O
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
- create mode 100644 b/x
- create mode 100644 c/w
-Switched to branch 'A'
-[A e246998] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {c => d}/w (100%)
-Switched to branch 'B'
-[B 0624e26] B
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => c}/y (100%)
- rename {b => d}/x (100%)
-HEAD is now at 0624e26 B
-Note: switching to 'A^0'.
+Removing d1/ut
+Removing d2/ut
+ok 51 - git clean works if a glob is passed with -d
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 52 # skip handle clean & core.longpaths = false nicely (missing MINGW)
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7300.53 'clean untracked paths by pathspec': 
+	git init untracked &&
+	mkdir untracked/dir &&
+	echo >untracked/dir/file.txt &&
+	git -C untracked clean -f dir/file.txt &&
+	ls untracked/dir >actual &&
+	test_must_be_empty actual
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/untracked/.git/
+Removing dir/file.txt
+ok 53 - clean untracked paths by pathspec
 
-Or undo this operation with:
+expecting success of 7300.54 'avoid traversing into ignored directories': 
+	test_when_finished rm -f output error trace.* &&
+	test_create_repo avoid-traversing-deep-hierarchy &&
+	(
+		cd avoid-traversing-deep-hierarchy &&
 
-  git switch -
+		mkdir -p untracked/subdir/with/a &&
+		>untracked/subdir/with/a/random-file.txt &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+		git clean -ffdxn -e untracked
+	) &&
 
-HEAD is now at e246998 A
-Path updated: a/y renamed to b/y in HEAD, inside a directory that was renamed in B^0; moving it to d/y.
-Path updated: a/y renamed to c/y in B^0, inside a directory that was renamed in HEAD; moving it to d/y.
-d/y
-ok 76 - 13d(info): messages for rename/rename(1to1) via dual transitive rename
+	# Make sure we only visited into the top-level directory, and did
+	# not traverse into the "untracked" subdirectory since it was excluded
+	grep data.*read_directo.*directories-visited trace.output |
+		cut -d "|" -f 9 >trace.relevant &&
+	cat >trace.expect <<-EOF &&
+	 ..directories-visited:1
+	EOF
+	test_cmp trace.expect trace.relevant
 
-expecting success of 6423.77 '13e: directory rename detection in recursive case': 
-	test_setup_13e &&
-	(
-		cd 13e &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/avoid-traversing-deep-hierarchy/.git/
+ok 54 - avoid traversing into ignored directories
 
-		git checkout --quiet D^0 &&
+expecting success of 7300.55 'traverse into directories that may have ignored entries': 
+	test_when_finished rm -f output &&
+	test_create_repo need-to-traverse-into-hierarchy &&
+	(
+		cd need-to-traverse-into-hierarchy &&
+		mkdir -p modules/foobar/src/generated &&
+		> modules/foobar/src/generated/code.c &&
+		> modules/foobar/Makefile &&
+		echo "/modules/**/src/generated/" >.gitignore &&
 
-		git -c merge.directoryRenames=conflict merge -s recursive C^0 >out 2>err &&
+		git clean -fX modules/foobar >../output &&
 
-		test_grep ! CONFLICT out &&
-		test_grep ! BUG: err &&
-		test_grep ! core.dumped err &&
-		test_must_be_empty err &&
+		grep Removing ../output &&
 
-		git ls-files >paths &&
-		! grep a/x paths &&
-		grep b/x paths
+		test_path_is_missing modules/foobar/src/generated/code.c &&
+		test_path_is_file modules/foobar/Makefile
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6423-merge-rename-directories/13e/.git/
-[master (root-commit) 3de9c0f] O
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a/y
- create mode 100644 a/z
-Switched to branch 'A'
-[A 8654583] A
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- rename {a => b}/y (100%)
- rename {a => b}/z (100%)
-Switched to branch 'B'
-[B 4f343f5] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/x
-Switched to branch 'C'
-CONFLICT (file location): a/x added in B inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to b/x.
-Automatic merge failed; fix conflicts and then commit the result.
-[C 95c9ae8] C
- Author: A U Thor <author@example.com>
-Switched to branch 'D'
-CONFLICT (file location): a/x added in HEAD inside a directory that was renamed in A, suggesting it should perhaps be moved to b/x.
-Automatic merge failed; fix conflicts and then commit the result.
-[D e07996f] D
- Author: A U Thor <author@example.com>
-b/x
-ok 77 - 13e: directory rename detection in recursive case
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7300-clean/need-to-traverse-into-hierarchy/.git/
+Removing modules/foobar/src/
+ok 55 - traverse into directories that may have ignored entries
 
 # still have 2 known breakage(s)
-# passed all remaining 75 test(s)
-1..77
+# passed all remaining 53 test(s)
+1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7006-pager.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7006-pager/.git/
-expecting success of 7006.1 'determine default pager': 
-	test_might_fail git config --unset core.pager &&
-	less=$(
-		sane_unset PAGER GIT_PAGER &&
-		git var GIT_PAGER
-	) &&
-	test -n "$less"
+*** t7201-co.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7201-co/.git/
+expecting success of 7201.1 'setup': 
+	fill x y z >same &&
+	fill 1 2 3 4 5 6 7 8 >one &&
+	fill a b c d e >two &&
+	git add same one two &&
+	git commit -m "Initial A one, A two" &&
 
-ok 1 - determine default pager
+	git checkout -b renamer &&
+	rm -f one &&
+	fill 1 3 4 5 6 7 8 >uno &&
+	git add uno &&
+	fill a b c d e f >two &&
+	git commit -a -m "Renamer R one->uno, M two" &&
 
-expecting success of 7006.2 'setup': 
-	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
-	test_unconfig core.pager &&
+	git checkout -b side main &&
+	fill 1 2 3 4 5 6 7 >one &&
+	fill A B C D E >three &&
+	rm -f two &&
+	git update-index --add --remove one two three &&
+	git commit -m "Side M one, D two, A three" &&
 
-	PAGER="cat >paginated.out" &&
-	export PAGER &&
+	git checkout -b simple main &&
+	rm -f one &&
+	fill a c e >two &&
+	git commit -a -m "Simple D one, M two" &&
 
-	test_commit initial
+	git checkout main
 
-[master (root-commit) 24b24cf] initial
+[main (root-commit) 7329388] Initial A one, A two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 2 - setup
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+ 3 files changed, 16 insertions(+)
+ create mode 100644 one
+ create mode 100644 same
+ create mode 100644 two
+Switched to a new branch 'renamer'
+[renamer 0420b41] Renamer R one->uno, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename one => uno (87%)
+Switched to a new branch 'side'
+[side ab76817] Side M one, D two, A three
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+ create mode 100644 three
+ delete mode 100644 two
+Switched to a new branch 'simple'
+[simple 022ff9d] Simple D one, M two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 deletions(-)
+ delete mode 100644 one
+Switched to branch 'main'
+ok 1 - setup
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+expecting success of 7201.2 'checkout from non-existing branch': 
+	git checkout -b delete-me main &&
+	git update-ref -d --no-deref refs/heads/delete-me &&
+	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
+	git checkout main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+Switched to a new branch 'delete-me'
+Switched to branch 'main'
+ok 2 - checkout from non-existing branch
 
-)
-prerequisite TTY ok
-expecting success of 7006.3 'some commands use a pager': 
-	rm -f paginated.out &&
-	test_terminal git log &&
-	test_path_is_file paginated.out
+expecting success of 7201.3 'checkout with dirty tree without -m': 
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	if git checkout side
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi
 
-ok 3 - some commands use a pager
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+ok 3 - checkout with dirty tree without -m
 
-checking known breakage of 7006.4 'pager runs from subdir': 
-	echo subdir/paginated.out >expected &&
-	mkdir -p subdir &&
-	rm -f paginated.out subdir/paginated.out &&
-	(
-		cd subdir &&
-		test_terminal git log
-	) &&
-	{
-		ls paginated.out subdir/paginated.out ||
-		:
-	} >actual &&
-	test_cmp expected actual
+expecting success of 7201.4 'checkout with unrelated dirty tree without -m': 
+	git checkout -f main &&
+	fill 0 1 2 3 4 5 6 7 8 >same &&
+	cp same kept &&
+	git checkout side >messages &&
+	test_cmp same kept &&
+	printf "M\t%s\n" same >messages.expect &&
+	test_cmp messages.expect messages
 
-ls: cannot access 'subdir/paginated.out': No such file or directory
---- expected	2026-04-19 19:23:07.047659440 +0000
-+++ actual	2026-04-19 19:23:07.255659440 +0000
-@@ -1 +1 @@
--subdir/paginated.out
-+paginated.out
-not ok 4 - pager runs from subdir # TODO known breakage
+Already on 'main'
+Switched to branch 'side'
+ok 4 - checkout with unrelated dirty tree without -m
 
-expecting success of 7006.5 'LESS and LV envvars are set for pagination': 
-	(
-		sane_unset LESS LV &&
-		PAGER="env >pager-env.out; wc" &&
-		export PAGER &&
+expecting success of 7201.5 'checkout -m with dirty tree': 
+	git checkout -f main &&
+	git clean -f &&
 
-		test_terminal git log
-	) &&
-	grep ^LESS= pager-env.out &&
-	grep ^LV= pager-env.out
+	fill 0 1 2 3 4 5 6 7 8 >one &&
+	git checkout -m side >messages &&
 
-      5      20     248
-LESS=FRX
-LV=-c
-ok 5 - LESS and LV envvars are set for pagination
+	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
 
-expecting success of 7006.6 'LESS and LV envvars set by git-sh-setup': 
-	(
-		sane_unset LESS LV &&
-		PAGER="env >pager-env.out; wc" &&
-		export PAGER &&
-		PATH="$(git --exec-path):$PATH" &&
-		export PATH &&
-		test_terminal sh -c ". git-sh-setup && git_pager"
-	) &&
-	grep ^LESS= pager-env.out &&
-	grep ^LV= pager-env.out
+	printf "M\t%s\n" one >expect.messages &&
+	test_cmp expect.messages messages &&
 
-      0       0       0
-LESS=FRX
-LV=-c
-ok 6 - LESS and LV envvars set by git-sh-setup
+	fill "M	one" "A	three" "D	two" >expect.main &&
+	git diff --name-status main >current.main &&
+	test_cmp expect.main current.main &&
 
-expecting success of 7006.7 'some commands do not use a pager': 
-	rm -f paginated.out &&
-	test_terminal git rev-list HEAD &&
-	test_path_is_missing paginated.out
+	fill "M	one" >expect.side &&
+	git diff --name-status side >current.side &&
+	test_cmp expect.side current.side &&
 
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-ok 7 - some commands do not use a pager
+	git diff --cached >current.index &&
+	test_must_be_empty current.index
 
-expecting success of 7006.8 'no pager when stdout is a pipe': 
-	rm -f paginated.out &&
-	git log | cat &&
-	test_path_is_missing paginated.out
+Switched to branch 'main'
+Removing kept
+Removing messages
+Removing messages.expect
+Switched to branch 'side'
+ok 5 - checkout -m with dirty tree
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 7201.6 'checkout -m with dirty tree, renamed': 
+	git checkout -f main && git clean -f &&
 
-    initial
-ok 8 - no pager when stdout is a pipe
+	fill 1 2 3 4 5 7 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
 
-expecting success of 7006.9 'no pager when stdout is a regular file': 
-	rm -f paginated.out &&
-	git log >file &&
-	test_path_is_missing paginated.out
+	git checkout -m renamer &&
+	fill 1 3 4 5 7 8 >expect &&
+	test_cmp expect uno &&
+	! test -f one &&
+	git diff --cached >current &&
+	test_must_be_empty current
 
-ok 9 - no pager when stdout is a regular file
+Switched to branch 'main'
+Removing current.index
+Removing current.main
+Removing current.side
+Removing expect.main
+Removing expect.messages
+Removing expect.side
+Removing messages
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 6 - checkout -m with dirty tree, renamed
 
-expecting success of 7006.10 'git --paginate rev-list uses a pager': 
-	rm -f paginated.out &&
-	test_terminal git --paginate rev-list HEAD &&
-	test_path_is_file paginated.out
+expecting success of 7201.7 'checkout -m with merge conflict': 
+	git checkout -f main && git clean -f &&
 
-ok 10 - git --paginate rev-list uses a pager
+	fill 1 T 3 4 5 6 S 8 >one &&
+	if git checkout renamer
+	then
+		echo Not happy
+		false
+	else
+		echo "happy - failed correctly"
+	fi &&
 
-expecting success of 7006.11 'no pager even with --paginate when stdout is a pipe': 
-	rm -f file paginated.out &&
-	git --paginate log | cat &&
-	test_path_is_missing paginated.out
+	git checkout -m renamer &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+	git diff main:one :3:uno |
+	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
+	fill d2 aT d7 aS >expect &&
+	test_cmp expect current &&
+	git diff --cached two >current &&
+	test_must_be_empty current
 
-    initial
-ok 11 - no pager even with --paginate when stdout is a pipe
+Switched to branch 'main'
+Removing current
+Removing expect
+error: Your local changes to the following files would be overwritten by checkout:
+	one
+Please commit your changes or stash them before you switch branches.
+Aborting
+happy - failed correctly
+Switched to branch 'renamer'
+M	uno
+ok 7 - checkout -m with merge conflict
 
-expecting success of 7006.12 'no pager with --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git --no-pager log &&
-	test_path_is_missing paginated.out
+expecting success of 7201.8 'format of merge conflict from checkout -m': 
+	git checkout -f main &&
+	git clean -f &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380 (HEAD -> master, tag: initial)
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+	fill b d >two &&
+	git checkout -m simple &&
 
-    initial
-ok 12 - no pager with --no-pager
+	git ls-files >current &&
+	fill same two two two >expect &&
+	test_cmp expect current &&
 
-expecting success of 7006.13 'configuration can disable pager': 
-	rm -f paginated.out &&
-	test_unconfig pager.grep &&
-	test_terminal git grep initial &&
-	test_path_is_file paginated.out &&
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
 
-	rm -f paginated.out &&
-	test_config pager.grep false &&
-	test_terminal git grep initial &&
-	test_path_is_missing paginated.out
+Switched to branch 'main'
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 8 - format of merge conflict from checkout -m
 
-initial.t:initial
-ok 13 - configuration can disable pager
+expecting success of 7201.9 'checkout --merge --conflict=diff3 <branch>': 
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
 
-expecting success of 7006.14 'configuration can enable pager (from subdir)': 
-	rm -f paginated.out &&
-	mkdir -p subdir &&
-	test_config pager.bundle true &&
+	fill b d >two &&
+	git checkout --merge --conflict=diff3 simple &&
 
-	git bundle create test.bundle --all &&
-	rm -f paginated.out subdir/paginated.out &&
-	(
-		cd subdir &&
-		test_terminal git bundle unbundle ../test.bundle
-	) &&
-	{
-		test_path_is_file paginated.out ||
-		test_path_is_file subdir/paginated.out
-	}
+	cat <<-EOF >expect &&
+	<<<<<<< simple
+	a
+	c
+	e
+	||||||| main
+	a
+	b
+	c
+	d
+	e
+	=======
+	b
+	d
+	>>>>>>> local
+	EOF
+	test_cmp expect two
 
-ok 14 - configuration can enable pager (from subdir)
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Removing current
+Removing expect
+Switched to branch 'simple'
+M	two
+ok 9 - checkout --merge --conflict=diff3 <branch>
 
-expecting success of 7006.15 'git tag -l defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git tag -l &&
-	test_path_is_file paginated.out
+expecting success of 7201.10 'switch to another branch while carrying a deletion': 
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
+	git rm two &&
 
-ok 15 - git tag -l defaults to paging
+	test_must_fail git checkout simple 2>errs &&
+	test_grep overwritten errs &&
 
-expecting success of 7006.16 'git tag -l respects pager.tag': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag -l &&
-	test_path_is_missing paginated.out
+	test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
+	test_must_be_empty errs
 
-initial
-ok 16 - git tag -l respects pager.tag
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Removing expect
+rm 'two'
+error: Your local changes to the following files would be overwritten by checkout:
+ok 10 - switch to another branch while carrying a deletion
 
-expecting success of 7006.17 'git tag -l respects --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag --no-pager tag -l &&
-	test_path_is_missing paginated.out
+expecting success of 7201.11 'checkout to detach HEAD (with advice declined)': 
+	git config set advice.detachedHead false &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
+	git checkout renamer^ 2>messages &&
+	test_grep "HEAD is now at $rev" messages &&
+	test_line_count = 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
 
-initial
-ok 17 - git tag -l respects --no-pager
+Switched to branch 'renamer'
+Removing errs
+HEAD is now at 7329388 Initial A one, A two
+ok 11 - checkout to detach HEAD (with advice declined)
 
-expecting success of 7006.18 'git tag with no args defaults to paging': 
-	# no args implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git tag &&
-	test_path_is_file paginated.out
+expecting success of 7201.12 'checkout to detach HEAD': 
+	git config set advice.detachedHead true &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
+	git checkout renamer^ 2>messages &&
+	grep "HEAD is now at $rev" messages &&
+	test_line_count -gt 1 messages &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
 
-ok 18 - git tag with no args defaults to paging
+Previous HEAD position was 7329388 Initial A one, A two
+Switched to branch 'renamer'
+Removing messages
+HEAD is now at 7329388 Initial A one, A two
+ok 12 - checkout to detach HEAD
 
-expecting success of 7006.19 'git tag with no args respects pager.tag': 
-	# no args implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag &&
-	test_path_is_missing paginated.out
+expecting success of 7201.13 'checkout to detach HEAD with branchname^': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout renamer^ &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
 
-initial
-ok 19 - git tag with no args respects pager.tag
+Switched to branch 'main'
+Removing messages
+Note: switching to 'renamer^'.
 
-expecting success of 7006.20 'git tag --contains defaults to paging': 
-	# --contains implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git tag --contains &&
-	test_path_is_file paginated.out
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 20 - git tag --contains defaults to paging
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.21 'git tag --contains respects pager.tag': 
-	# --contains implies -l so this should page like -l
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false tag --contains &&
-	test_path_is_missing paginated.out
+  git switch -c <new-branch-name>
 
-initial
-ok 21 - git tag --contains respects pager.tag
+Or undo this operation with:
 
-expecting success of 7006.22 'git tag -a defaults to not paging': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git tag -am message newtag &&
-	test_path_is_missing paginated.out
+  git switch -
 
-Deleted tag 'newtag' (was a052248)
-ok 22 - git tag -a defaults to not paging
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.23 'git tag -a ignores pager.tag': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag tag -am message newtag &&
-	test_path_is_missing paginated.out
+HEAD is now at 7329388 Initial A one, A two
+ok 13 - checkout to detach HEAD with branchname^
 
-Deleted tag 'newtag' (was a052248)
-ok 23 - git tag -a ignores pager.tag
+expecting success of 7201.14 'checkout to detach HEAD with :/message': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout ":/Initial" &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
 
-expecting success of 7006.24 'git tag -a respects --paginate': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git --paginate tag -am message newtag &&
-	test_path_is_file paginated.out
+Switched to branch 'main'
+Note: switching to ':/Initial'.
 
-Deleted tag 'newtag' (was a052248)
-ok 24 - git tag -a respects --paginate
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.25 'git tag as alias ignores pager.tag with -a': 
-	test_when_finished "git tag -d newtag" &&
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
-	test_path_is_missing paginated.out
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Deleted tag 'newtag' (was a052248)
-ok 25 - git tag as alias ignores pager.tag with -a
+  git switch -c <new-branch-name>
 
-expecting success of 7006.26 'git tag as alias respects pager.tag with -l': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
-	test_path_is_missing paginated.out
+Or undo this operation with:
 
-initial
-ok 26 - git tag as alias respects pager.tag with -l
+  git switch -
 
-expecting success of 7006.27 'git branch defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git branch &&
-	test_path_is_file paginated.out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 27 - git branch defaults to paging
+HEAD is now at 7329388 Initial A one, A two
+ok 14 - checkout to detach HEAD with :/message
 
-expecting success of 7006.28 'git branch respects pager.branch': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.branch=false branch &&
-	test_path_is_missing paginated.out
+expecting success of 7201.15 'checkout to detach HEAD with HEAD^0': 
+	git checkout -f main &&
+	git clean -f &&
+	git checkout HEAD^0 &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	if git symbolic-ref HEAD >/dev/null 2>&1
+	then
+		echo "OOPS, HEAD is still symbolic???"
+		false
+	else
+		: happy
+	fi
 
-* master
-ok 28 - git branch respects pager.branch
+Switched to branch 'main'
+Note: switching to 'HEAD^0'.
 
-expecting success of 7006.29 'git branch respects --no-pager': 
-	rm -f paginated.out &&
-	test_terminal git --no-pager branch &&
-	test_path_is_missing paginated.out
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-* master
-ok 29 - git branch respects --no-pager
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.30 'git branch --edit-description ignores pager.branch': 
-	rm -f paginated.out editor.used &&
-	write_script editor <<-\EOF &&
-		echo "New description" >"$1"
-		touch editor.used
-	EOF
-	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
-	test_path_is_missing paginated.out &&
-	test_path_is_file editor.used
+  git switch -c <new-branch-name>
 
-hint: Waiting for your editor to close the file... 
ok 30 - git branch --edit-description ignores pager.branch
+Or undo this operation with:
 
-expecting success of 7006.31 'git branch --set-upstream-to ignores pager.branch': 
-	rm -f paginated.out &&
-	git branch other &&
-	test_when_finished "git branch -D other" &&
-	test_terminal git -c pager.branch branch --set-upstream-to=other &&
-	test_when_finished "git branch --unset-upstream" &&
-	test_path_is_missing paginated.out
+  git switch -
 
-branch 'master' set up to track 'other'.
-Deleted branch other (was 24b24cf).
-ok 31 - git branch --set-upstream-to ignores pager.branch
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.32 'git config ignores pager.config when setting': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config config foo.bar bar &&
-	test_path_is_missing paginated.out
+HEAD is now at 7329388 Initial A one, A two
+ok 15 - checkout to detach HEAD with HEAD^0
 
-ok 32 - git config ignores pager.config when setting
+expecting success of 7201.16 'checkout with ambiguous tag/branch names': 
+	git tag both side &&
+	git branch both main &&
+	git reset --hard &&
+	git checkout main &&
 
-expecting success of 7006.33 'git config --edit ignores pager.config': 
-	rm -f paginated.out editor.used &&
-	write_script editor <<-\EOF &&
-		touch editor.used
-	EOF
-	EDITOR=./editor test_terminal git -c pager.config config --edit &&
-	test_path_is_missing paginated.out &&
-	test_path_is_file editor.used
+	git checkout both &&
+	H=$(git rev-parse --verify HEAD) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
+	test "z$H" = "z$M" &&
+	name=$(git symbolic-ref HEAD 2>/dev/null) &&
+	test "z$name" = zrefs/heads/both
 
-hint: Waiting for your editor to close the file... 
ok 33 - git config --edit ignores pager.config
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'main'
+warning: refname 'both' is ambiguous.
+Switched to branch 'both'
+ok 16 - checkout with ambiguous tag/branch names
 
-expecting success of 7006.34 'git config --get ignores pager.config': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config config --get foo.bar &&
-	test_path_is_missing paginated.out
+expecting success of 7201.17 'checkout with ambiguous tag/branch names': 
+	git reset --hard &&
+	git checkout main &&
 
-bar
-ok 34 - git config --get ignores pager.config
+	git tag frotz side &&
+	git branch frotz main &&
+	git reset --hard &&
+	git checkout main &&
 
-expecting success of 7006.35 'git config --get-urlmatch defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git -c http."https://foo.com/".bar=foo \
-			  config --get-urlmatch http https://foo.com &&
-	test_path_is_file paginated.out
+	git checkout tags/frotz &&
+	H=$(git rev-parse --verify HEAD) &&
+	S=$(git show-ref -s --verify refs/heads/side) &&
+	test "z$H" = "z$S" &&
+	if name=$(git symbolic-ref HEAD 2>/dev/null)
+	then
+		echo "Bad -- should have detached"
+		false
+	else
+		: happy
+	fi
 
-ok 35 - git config --get-urlmatch defaults to paging
+HEAD is now at 7329388 Initial A one, A two
+Switched to branch 'main'
+HEAD is now at 7329388 Initial A one, A two
+Already on 'main'
+Note: switching to 'tags/frotz'.
 
-expecting success of 7006.36 'git config --get-all respects pager.config': 
-	rm -f paginated.out &&
-	test_terminal git -c pager.config=false config --get-all foo.bar &&
-	test_path_is_missing paginated.out
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-bar
-ok 36 - git config --get-all respects pager.config
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.37 'git config --list defaults to paging': 
-	rm -f paginated.out &&
-	test_terminal git config --list &&
-	test_path_is_file paginated.out
+  git switch -c <new-branch-name>
 
-ok 37 - git config --list defaults to paging
+Or undo this operation with:
 
-expecting success of 7006.38 'tests can detect color': 
-	rm -f colorful.log colorless.log &&
-	git log --no-color >colorless.log &&
-	git log --color >colorful.log &&
-	! colorful colorless.log &&
-	colorful colorful.log
+  git switch -
 
-ok 38 - tests can detect color
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.39 'no color when stdout is a regular file': 
-	rm -f colorless.log &&
-	test_config color.ui auto &&
-	git log >colorless.log &&
-	! colorful colorless.log
+HEAD is now at ab76817 Side M one, D two, A three
+ok 17 - checkout with ambiguous tag/branch names
 
-ok 39 - no color when stdout is a regular file
+expecting success of 7201.18 'switch branches while in subdirectory': 
+	git reset --hard &&
+	git checkout main &&
 
-expecting success of 7006.40 'color when writing to a pager': 
-	rm -f paginated.out &&
-	test_config color.ui auto &&
-	test_terminal git log &&
-	colorful paginated.out
+	mkdir subs &&
+	git -C subs checkout side &&
+	! test -f subs/one &&
+	rm -fr subs
 
-ok 40 - color when writing to a pager
+HEAD is now at ab76817 Side M one, D two, A three
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to branch 'main'
+Switched to branch 'side'
+ok 18 - switch branches while in subdirectory
 
-expecting success of 7006.41 'colors are suppressed by color.pager': 
-	rm -f paginated.out &&
-	test_config color.ui auto &&
-	test_config color.pager false &&
-	test_terminal git log &&
-	! colorful paginated.out
+expecting success of 7201.19 'checkout specific path while in subdirectory': 
+	git reset --hard &&
+	git checkout side &&
+	mkdir subs &&
+	>subs/bero &&
+	git add subs/bero &&
+	git commit -m "add subs/bero" &&
 
-ok 41 - colors are suppressed by color.pager
+	git checkout main &&
+	mkdir -p subs &&
+	git -C subs checkout side -- bero &&
+	test -f subs/bero
 
-expecting success of 7006.42 'color when writing to a file intended for a pager': 
-	rm -f colorful.log &&
-	test_config color.ui auto &&
-	(
-		TERM=vt100 &&
-		GIT_PAGER_IN_USE=true &&
-		export TERM GIT_PAGER_IN_USE &&
-		git log >colorful.log
-	) &&
-	colorful colorful.log
+HEAD is now at ab76817 Side M one, D two, A three
+Already on 'side'
+[side bb04aa0] add subs/bero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subs/bero
+Switched to branch 'main'
+ok 19 - checkout specific path while in subdirectory
 
-ok 42 - color when writing to a file intended for a pager
+expecting success of 7201.20 'checkout w/--track sets up tracking': 
+	git config branch.autosetupmerge false &&
+	git checkout main &&
+	git checkout --track -b track1 &&
+	test "$(git config branch.track1.remote)" &&
+	test "$(git config branch.track1.merge)"
 
-expecting success of 7006.43 'colors are sent to pager for external commands': 
-	test_config alias.externallog "!git log" &&
-	test_config color.ui auto &&
-	test_terminal git -p externallog &&
-	colorful paginated.out
+Already on 'main'
+A	subs/bero
+Switched to a new branch 'track1'
+A	subs/bero
+branch 'track1' set up to track 'main'.
+ok 20 - checkout w/--track sets up tracking
 
-ok 43 - colors are sent to pager for external commands
+expecting success of 7201.21 'checkout w/autosetupmerge=always sets up tracking': 
+	test_when_finished git config branch.autosetupmerge false &&
+	git config branch.autosetupmerge always &&
+	git checkout main &&
+	git checkout -b track2 &&
+	test "$(git config branch.track2.remote)" &&
+	test "$(git config branch.track2.merge)"
 
-expecting success of 7006.44 'setup: some aliases': 
-	git config alias.aliasedlog log &&
-	git config alias.true "!true"
+Switched to branch 'main'
+A	subs/bero
+Switched to a new branch 'track2'
+branch 'track2' set up to track 'main'.
+ok 21 - checkout w/autosetupmerge=always sets up tracking
 
-ok 44 - setup: some aliases
+expecting success of 7201.22 'checkout w/--track from non-branch HEAD fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 
-expecting success of 7006.45 'git log - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git log
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 45 - git log - default pager is used by default
+Note: switching to 'main^0'.
 
-expecting success of 7006.46 'git log - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git log &&
-		test_path_is_file PAGER_used
-	
-ok 46 - git log - PAGER overrides default pager
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.47 'git log - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git log &&
-		test_path_is_file core.pager_used
-	
-ok 47 - git log - repository-local core.pager setting overrides PAGER
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.48 'git log - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git log
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 48 - git log - core.pager overrides PAGER from subdirectory
+  git switch -c <new-branch-name>
 
-expecting success of 7006.49 'git log - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git log &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 49 - git log - GIT_PAGER overrides core.pager
+Or undo this operation with:
 
-expecting success of 7006.50 'git -p log - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p log
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 50 - git -p log - default pager is used by default
+  git switch -
 
-expecting success of 7006.51 'git -p log - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p log &&
-		test_path_is_file PAGER_used
-	
-ok 51 - git -p log - PAGER overrides default pager
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.52 'git -p log - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p log &&
-		test_path_is_file core.pager_used
-	
-ok 52 - git -p log - repository-local core.pager setting overrides PAGER
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+fatal: cannot set up tracking information; starting point 'HEAD' is not a branch
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 22 - checkout w/--track from non-branch HEAD fails
 
-expecting success of 7006.53 'git -p log - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p log
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 53 - git -p log - core.pager overrides PAGER from subdirectory
+expecting success of 7201.23 'checkout w/--track from tag fails': 
+	git checkout main^0 &&
+	test_must_fail git symbolic-ref HEAD &&
+	test_must_fail git checkout --track -b track frotz &&
+	test_must_fail git rev-parse --verify track &&
+	test_must_fail git symbolic-ref HEAD &&
+	test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 
-expecting success of 7006.54 'git -p log - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p log &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 54 - git -p log - GIT_PAGER overrides core.pager
+HEAD is now at 7329388 Initial A one, A two
+A	subs/bero
+fatal: ref HEAD is not a symbolic ref
+warning: refname 'frotz' is ambiguous.
+warning: refname 'frotz' is ambiguous.
+fatal: ambiguous object name: 'frotz'
+A	subs/bero
+fatal: Needed a single revision
+fatal: ref HEAD is not a symbolic ref
+ok 23 - checkout w/--track from tag fails
 
-expecting success of 7006.55 'git aliasedlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git aliasedlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 55 - git aliasedlog - default pager is used by default
+expecting success of 7201.24 'detach a symbolic link HEAD': 
+	git checkout main &&
+	git config --bool core.prefersymlinkrefs yes &&
+	git checkout side &&
+	git checkout main &&
+	it=$(git symbolic-ref HEAD) &&
+	test "z$it" = zrefs/heads/main &&
+	here=$(git rev-parse --verify refs/heads/main) &&
+	git checkout side^ &&
+	test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
 
-expecting success of 7006.56 'git aliasedlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file PAGER_used
-	
-ok 56 - git aliasedlog - PAGER overrides default pager
+Switched to branch 'main'
+A	subs/bero
+Switched to branch 'side'
+Switched to branch 'main'
+Note: switching to 'side^'.
 
-expecting success of 7006.57 'git aliasedlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file core.pager_used
-	
-ok 57 - git aliasedlog - repository-local core.pager setting overrides PAGER
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.58 'git aliasedlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git aliasedlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 58 - git aliasedlog - core.pager overrides PAGER from subdirectory
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7006.59 'git aliasedlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git aliasedlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 59 - git aliasedlog - GIT_PAGER overrides core.pager
+  git switch -c <new-branch-name>
 
-expecting success of 7006.60 'git -p aliasedlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p aliasedlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 60 - git -p aliasedlog - default pager is used by default
+Or undo this operation with:
 
-expecting success of 7006.61 'git -p aliasedlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file PAGER_used
-	
-ok 61 - git -p aliasedlog - PAGER overrides default pager
+  git switch -
 
-expecting success of 7006.62 'git -p aliasedlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file core.pager_used
-	
-ok 62 - git -p aliasedlog - repository-local core.pager setting overrides PAGER
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7006.63 'git -p aliasedlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p aliasedlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 63 - git -p aliasedlog - core.pager overrides PAGER from subdirectory
+HEAD is now at ab76817 Side M one, D two, A three
+ok 24 - detach a symbolic link HEAD
 
-expecting success of 7006.64 'git -p aliasedlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p aliasedlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 64 - git -p aliasedlog - GIT_PAGER overrides core.pager
+expecting success of 7201.25 'checkout with --track fakes a sensible -b <name>': 
+	git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
+	git update-ref refs/remotes/origin/koala/bear renamer &&
 
-expecting success of 7006.65 'git -p true - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p true
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 65 - git -p true - default pager is used by default
+	git checkout --track origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-expecting success of 7006.66 'git -p true - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git -p true &&
-		test_path_is_file PAGER_used
-	
-ok 66 - git -p true - PAGER overrides default pager
+	git checkout main && git branch -D koala/bear &&
 
-expecting success of 7006.67 'git -p true - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git -p true &&
-		test_path_is_file core.pager_used
-	
-ok 67 - git -p true - repository-local core.pager setting overrides PAGER
+	git checkout --track refs/remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-expecting success of 7006.68 'git -p true - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p true
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 68 - git -p true - core.pager overrides PAGER from subdirectory
+	git checkout main && git branch -D koala/bear &&
 
-expecting success of 7006.69 'git -p true - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git -p true &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 69 - git -p true - GIT_PAGER overrides core.pager
+	git checkout --track remotes/origin/koala/bear &&
+	test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
 
-expecting success of 7006.70 'git -p request-pull - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_must_fail test_terminal  git -p request-pull
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 70 - git -p request-pull - default pager is used by default
+Previous HEAD position was ab76817 Side M one, D two, A three
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+Switched to branch 'main'
+Deleted branch koala/bear (was 0420b41).
+Switched to a new branch 'koala/bear'
+branch 'koala/bear' set up to track 'origin/koala/bear'.
+ok 25 - checkout with --track fakes a sensible -b <name>
 
-expecting success of 7006.71 'git -p request-pull - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file PAGER_used
-	
-ok 71 - git -p request-pull - PAGER overrides default pager
+expecting success of 7201.26 'checkout with --track, but without -b, fails with too short tracked name': 
+	test_must_fail git checkout --track renamer
 
-expecting success of 7006.72 'git -p request-pull - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file core.pager_used
-	
-ok 72 - git -p request-pull - repository-local core.pager setting overrides PAGER
+fatal: missing branch name; try -b
+ok 26 - checkout with --track, but without -b, fails with too short tracked name
 
-expecting success of 7006.73 'git -p request-pull - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p request-pull
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 73 - git -p request-pull - core.pager overrides PAGER from subdirectory
+expecting success of 7201.27 'checkout an unmerged path should fail': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	test_must_fail git checkout fild file filf &&
+	test_cmp sample fild &&
+	test_cmp sample filf &&
+	test_cmp sample file
 
-expecting success of 7006.74 'git -p request-pull - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p request-pull &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 74 - git -p request-pull - GIT_PAGER overrides core.pager
+error: path 'file' is unmerged
+ok 27 - checkout an unmerged path should fail
 
-expecting success of 7006.75 'git -p - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_must_fail test_terminal  git -p
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 75 - git -p - default pager is used by default
+expecting success of 7201.28 'checkout with an unmerged path can be ignored': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -f fild file filf &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp sample file
 
-expecting success of 7006.76 'git -p - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_must_fail test_terminal  git -p &&
-		test_path_is_file PAGER_used
-	
-ok 76 - git -p - PAGER overrides default pager
+warning: path 'file' is unmerged
+Updated 2 paths from the index
+ok 28 - checkout with an unmerged path can be ignored
 
-checking known breakage of 7006.77 'git -p - repository-local core.pager setting is not used': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_must_fail test_terminal  git -p &&
-		! test_path_is_file core.pager_used
-	
-not ok 77 - git -p - repository-local core.pager setting is not used # TODO known breakage
+expecting success of 7201.29 'checkout unmerged stage': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --ours . &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp expect file &&
+	git checkout --theirs file &&
+	test ztheirside = "z$(cat file)"
 
-expecting success of 7006.78 'git -p - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 78 - git -p - GIT_PAGER overrides core.pager
+Updated 3 paths from the index
+Updated 1 path from the index
+ok 29 - checkout unmerged stage
 
-expecting success of 7006.79 'core.pager in repo config works and retains cwd': 
-	sane_unset GIT_PAGER &&
-	test_config core.pager "cat >cwd-retained" &&
-	(
-		cd sub &&
-		rm -f cwd-retained &&
-		test_terminal git -p rev-parse HEAD &&
-		test_path_is_file cwd-retained
-	)
+expecting success of 7201.30 'checkout --ours is incompatible with switching': 
+	test_must_fail git checkout --ours 2>error &&
+	test_grep "needs the paths to check out" error &&
 
-ok 79 - core.pager in repo config works and retains cwd
+	test_must_fail git checkout --ours HEAD 2>error &&
+	test_grep "cannot be used with switching" error &&
 
-expecting success of 7006.80 'core.pager is found via alias in subdirectory': 
-	sane_unset GIT_PAGER &&
-	test_config core.pager "cat >via-alias" &&
-	(
-		cd sub &&
-		rm -f via-alias &&
-		test_terminal git -c alias.r="-p rev-parse" r HEAD &&
-		test_path_is_file via-alias
-	)
+	test_must_fail git checkout --ours main 2>error &&
+	test_grep "cannot be used with switching" error &&
 
-ok 80 - core.pager is found via alias in subdirectory
+	git checkout --ours file
 
-checking known breakage of 7006.81 'no pager for 'git -p nonsense'': 
-		rm -f GIT_PAGER_used &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_must_fail test_terminal  git -p nonsense &&
-		test_path_is_missing GIT_PAGER_used
-	
-Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 24 Apr 19 19:23 GIT_PAGER_used
-not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
+fatal: '--ours/--theirs' needs the paths to check out
+fatal: '--ours/--theirs' cannot be used with switching branches
+fatal: '--ours/--theirs' cannot be used with switching branches
+Updated 1 path from the index
+ok 30 - checkout --ours is incompatible with switching
 
-expecting success of 7006.82 'git shortlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git shortlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 82 - git shortlog - default pager is used by default
+expecting success of 7201.31 'checkout path with --merge from tree-ish is a no-no': 
+	setup_conflicting_index &&
+	test_must_fail git checkout -m HEAD -- file
 
-expecting success of 7006.83 'git shortlog - PAGER overrides default pager': 
-		sane_unset GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f PAGER_used &&
-		PAGER='wc >PAGER_used' &&
-		export PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_file PAGER_used
-	
-ok 83 - git shortlog - PAGER overrides default pager
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+ok 31 - checkout path with --merge from tree-ish is a no-no
 
-expecting success of 7006.84 'git shortlog - repository-local core.pager setting overrides PAGER': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		PAGER=wc &&
-		export PAGER &&
-		test_config core.pager 'wc >core.pager_used' &&
-		test_terminal  git shortlog &&
-		test_path_is_file core.pager_used
-	
-ok 84 - git shortlog - repository-local core.pager setting overrides PAGER
+expecting success of 7201.32 'checkout with --merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.85 'git shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 85 - git shortlog - core.pager overrides PAGER from subdirectory
+ok 32 - checkout with --merge
 
-expecting success of 7006.86 'git shortlog - GIT_PAGER overrides core.pager': 
-		rm -f GIT_PAGER_used &&
-		test_config core.pager wc &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_file GIT_PAGER_used
-	
-ok 86 - git shortlog - GIT_PAGER overrides core.pager
+expecting success of 7201.33 'checkout -m works after (mistaken) resolution': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	# resolve to something
+	git add file &&
+	git checkout --merge -- fild file filf &&
+	{
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	} >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.87 'setup: configure shortlog not to paginate': 
-	git config pager.shortlog false
+ok 33 - checkout -m works after (mistaken) resolution
 
-ok 87 - setup: configure shortlog not to paginate
+expecting success of 7201.34 'checkout -m works after (mistaken) resolution to remove': 
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	# resolve to remove
+	git rm file &&
+	git checkout --merge -- fild file filf &&
+	{
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	} >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.88 'no pager for 'git shortlog'': 
-		rm -f GIT_PAGER_used &&
-		GIT_PAGER='wc >GIT_PAGER_used' &&
-		export GIT_PAGER &&
-		test_terminal  git shortlog &&
-		test_path_is_missing GIT_PAGER_used
-	
-ok 88 - no pager for 'git shortlog'
+rm 'file'
+ok 34 - checkout -m works after (mistaken) resolution to remove
 
-expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git shortlog
-		) &&
-		! test_path_is_file core.pager_used
-	
-File core.pager_used doesn't exist
-ok 89 - git shortlog - core.pager is not used from subdirectory
+expecting success of 7201.35 'checkout with --merge, in diff3 -m style': 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout -m -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.90 'git -p shortlog - default pager is used by default': 
-		sane_unset PAGER GIT_PAGER &&
-		test_unconfig core.pager &&
-		rm -f default_pager_used &&
-		cat >$less <<-\EOF &&
-		#!/bin/sh
-		wc >default_pager_used
-		EOF
-		chmod +x $less &&
-		(
-			PATH=.:$PATH &&
-			export PATH &&
-			test_terminal  git -p shortlog
-		) &&
-		test_path_is_file default_pager_used
-	
-ok 90 - git -p shortlog - default pager is used by default
+ok 35 - checkout with --merge, in diff3 -m style
 
-expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_terminal  git -p shortlog
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 91 - git -p shortlog - core.pager overrides PAGER from subdirectory
+expecting success of 7201.36 'checkout --conflict=merge, overriding config': 
+	git config merge.conflictstyle diff3 &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=merge -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-expecting success of 7006.92 'git -p apply </dev/null - core.pager overrides PAGER from subdirectory': 
-		sane_unset GIT_PAGER &&
-		rm -f core.pager_used &&
-		rm -fr sub &&
-		PAGER=wc &&
-		stampname=$(pwd)/core.pager_used &&
-		export PAGER stampname &&
-		test_config core.pager 'wc >"$stampname"' &&
-		mkdir sub &&
-		(
-			cd sub &&
-			test_must_fail test_terminal  git -p apply </dev/null
-		) &&
-		test_path_is_file core.pager_used
-	
-ok 92 - git -p apply </dev/null - core.pager overrides PAGER from subdirectory
+ok 36 - checkout --conflict=merge, overriding config
 
-expecting success of 7006.93 'command-specific pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_unconfig core.pager &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.37 'checkout --conflict=diff3': 
+	test_unconfig merge.conflictstyle &&
+	setup_conflicting_index &&
+	echo "none of the above" >sample &&
+	echo ourside >expect &&
+	cat sample >fild &&
+	cat sample >file &&
+	cat sample >filf &&
+	git checkout --conflict=diff3 -- fild file filf &&
+	(
+		echo "<<<<<<< ours" &&
+		echo ourside &&
+		echo "||||||| base" &&
+		echo original &&
+		echo "=======" &&
+		echo theirside &&
+		echo ">>>>>>> theirs"
+	) >merged &&
+	test_cmp expect fild &&
+	test_cmp expect filf &&
+	test_cmp merged file
 
-ok 93 - command-specific pager
+ok 37 - checkout --conflict=diff3
 
-expecting success of 7006.94 'command-specific pager overrides core.pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config core.pager "exit 1" &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.38 'checkout --conflict=diff3 --no-conflict does not merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >expect &&
+	cat expect >fild &&
+	cat expect >file &&
+	test_must_fail git checkout --conflict=diff3 --no-conflict -- fild file 2>err &&
+	test_cmp expect file &&
+	test_cmp expect fild &&
+	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
+	test_cmp expect err
 
-ok 94 - command-specific pager overrides core.pager
+ok 38 - checkout --conflict=diff3 --no-conflict does not merge
 
-expecting success of 7006.95 'command-specific pager overridden by environment': 
-	GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
-	>actual &&
-	echo "foo:initial" >expect &&
-	test_config pager.log "exit 1" &&
-	test_terminal git log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.39 'checkout --conflict=diff3 --no-merge does not merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >expect &&
+	cat expect >fild &&
+	cat expect >file &&
+	test_must_fail git checkout --conflict=diff3 --no-merge -- fild file 2>err &&
+	test_cmp expect file &&
+	test_cmp expect fild &&
+	echo "error: path ${SQ}file${SQ} is unmerged" >expect &&
+	test_cmp expect err
 
-ok 95 - command-specific pager overridden by environment
+ok 39 - checkout --conflict=diff3 --no-merge does not merge
 
-expecting success of 7006.96 'setup external command': 
-	cat >git-external <<-\EOF &&
-	#!/bin/sh
-	git "$@"
+expecting success of 7201.40 'checkout --no-merge --conflict=diff3 does merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >fild &&
+	echo "none of the above" >file &&
+	git checkout --no-merge --conflict=diff3 -- fild file &&
+	echo "ourside" >expect &&
+	test_cmp expect fild &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	||||||| base
+	original
+	=======
+	theirside
+	>>>>>>> theirs
 	EOF
-	chmod +x git-external
+	test_cmp expect file
 
-ok 96 - setup external command
+ok 40 - checkout --no-merge --conflict=diff3 does merge
 
-expecting success of 7006.97 'command-specific pager works for external commands': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.external "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path="$(pwd)" external log --format=%s -1 &&
-	test_cmp expect actual
+expecting success of 7201.41 'checkout --merge --conflict=diff3 --no-conflict does merge': 
+	setup_conflicting_index &&
+	echo "none of the above" >fild &&
+	echo "none of the above" >file &&
+	git checkout --merge --conflict=diff3 --no-conflict -- fild file &&
+	echo "ourside" >expect &&
+	test_cmp expect fild &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
 
-ok 97 - command-specific pager works for external commands
+ok 41 - checkout --merge --conflict=diff3 --no-conflict does merge
 
-expecting success of 7006.98 'sub-commands of externals use their own pager': 
-	sane_unset PAGER GIT_PAGER &&
-	echo "foo:initial" >expect &&
-	>actual &&
-	test_config pager.log "sed s/^/foo:/ >actual" &&
-	test_terminal git --exec-path=. external log --format=%s -1 &&
+expecting success of 7201.42 'checkout with invalid conflict style': 
+	test_must_fail git checkout --conflict=bad 2>actual -- file &&
+	echo "error: unknown conflict style ${SQ}bad${SQ}" >expect &&
 	test_cmp expect actual
 
-ok 98 - sub-commands of externals use their own pager
-
-expecting success of 7006.99 'external command pagers override sub-commands': 
-	sane_unset PAGER GIT_PAGER &&
-	>actual &&
-	test_config pager.external false &&
-	test_config pager.log "sed s/^/log:/ >actual" &&
-	test_terminal git --exec-path=. external log --format=%s -1 &&
-	test_must_be_empty actual
-
-initial
-ok 99 - external command pagers override sub-commands
-
-expecting success of 7006.100 'command with underscores does not complain': 
-	write_script git-under_score <<-\EOF &&
-	echo ok
-	EOF
-	git --exec-path=. under_score >actual 2>&1 &&
-	echo ok >expect &&
-	test_cmp expect actual
+ok 42 - checkout with invalid conflict style
 
-ok 100 - command with underscores does not complain
+expecting success of 7201.43 'failing checkout -b should not break working tree': 
+	git clean -fd &&  # Remove untracked files in the way
+	git reset --hard main &&
+	git symbolic-ref HEAD refs/heads/main &&
+	test_must_fail git checkout -b renamer side^ &&
+	test $(git symbolic-ref HEAD) = refs/heads/main &&
+	git diff --exit-code &&
+	git diff --cached --exit-code
 
-expecting success of 7006.101 'git tag with auto-columns ': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
-	test_commit five &&
-	cat >expect <<-\EOF &&
-	initial  one      two      three    four     five
-	EOF
-	test_terminal env PAGER="cat >actual" COLUMNS=80 \
-		git -c column.ui=auto tag --sort=authordate &&
-	test_cmp expect actual
+Removing actual
+Removing err
+Removing error
+Removing expect
+Removing merged
+Removing same
+Removing sample
+Removing two
+Removing uno
+HEAD is now at 7329388 Initial A one, A two
+fatal: a branch named 'renamer' already exists
+ok 43 - failing checkout -b should not break working tree
 
-[master bdf0f03] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master c613728] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master dbd092b] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master a0ce8ac] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-[master 03bd18b] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-ok 101 - git tag with auto-columns 
+expecting success of 7201.44 'switch out of non-branch': 
+	git reset --hard main &&
+	git checkout main^0 &&
+	echo modified >one &&
+	test_must_fail git checkout renamer 2>error.log &&
+	! grep "^Previous HEAD" error.log
 
-expecting success of 7006.102 'setup trace2': 
-	GIT_TRACE2_BRIEF=1 &&
-	export GIT_TRACE2_BRIEF
+HEAD is now at 7329388 Initial A one, A two
+Note: switching to 'main^0'.
 
-ok 102 - setup trace2
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7006.103 'setup large log output': 
-	perl -e "
-		print \"this is a long commit message\" x 50000
-	" >commit-msg &&
-	git commit --allow-empty -F commit-msg
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-[master 06d9144] this is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit message
- Author: A U Thor <author@example.com>
-ok 103 - setup large log output
+  git switch -c <new-branch-name>
 
-expecting success of 7006.104 'git returns SIGPIPE on early pager exit': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; head -n 1; exit 0" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+Or undo this operation with:
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+  git switch -
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:0 " child-exits &&
-	test_path_is_file pager-used
+Turn off this advice by setting config variable advice.detachedHead to false
 
-died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
-child_exit[0] pid:2160401 code:0 elapsed:0.035014
-ok 104 - git returns SIGPIPE on early pager exit
+HEAD is now at 7329388 Initial A one, A two
+ok 44 - switch out of non-branch
 
-expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; head -n 1; exit 1" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+expecting success of 7201.45 'custom merge driver with checkout -m': 
+	git reset --hard &&
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+	git config merge.filfre.driver "./filfre.sh %O %A %B" &&
+	git config merge.filfre.name "Feel-free merge driver" &&
+	git config merge.filfre.recursive binary &&
+	echo "arm merge=filfre" >.gitattributes &&
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:1 " child-exits &&
-	test_path_is_file pager-used
+	git checkout -b left &&
+	echo neutral >arm &&
+	git add arm .gitattributes &&
+	test_tick &&
+	git commit -m neutral &&
+	git branch right &&
 
-died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
-child_exit[0] pid:2160706 code:1 elapsed:0.023999
-ok 105 - git returns SIGPIPE on early pager non-zero exit
+	echo left >arm &&
+	test_tick &&
+	git commit -a -m left &&
+	git checkout right &&
 
-expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager "wc >pager-used; exit 1" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+	echo right >arm &&
+	test_tick &&
+	git commit -a -m right &&
 
-	test_terminal git log &&
+	test_must_fail git merge left &&
+	(
+		for t in filfre-common left right
+		do
+			grep $t arm || exit 1
+		done
+	) &&
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:1 " child-exits &&
-	test_path_is_file pager-used
+	mv arm expect &&
+	git checkout -m arm &&
+	test_cmp expect arm
 
-child_exit[0] pid:2160932 code:1 elapsed:0.046037
-ok 106 - git discards pager non-zero exit without SIGPIPE
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'left'
+[left b257dc6] neutral
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 arm
+[left 2459c9d] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'right'
+[right 6b476b9] right
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging arm
+CONFLICT (content): Merge conflict in arm
+Automatic merge failed; fix conflicts and then commit the result.
+||||||| filfre-common
+left
+right
+Recreated 1 merge conflict
+ok 45 - custom merge driver with checkout -m
 
-expecting success of 7006.107 'git errors when asked to execute nonexisting pager': 
-	test_when_finished "rm -f err" &&
-	test_config core.pager "does-not-exist" &&
-	test_must_fail test_terminal git log 2>err &&
-	test_grep "unable to execute pager" err
+expecting success of 7201.46 'tracking info copied with autoSetupMerge=inherit': 
+	git reset --hard main &&
+	# default config does not copy tracking info
+	git checkout -b foo-no-inherit koala/bear &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.remote &&
+	test_cmp_config "" --default "" branch.foo-no-inherit.merge &&
+	# with autoSetupMerge=inherit, we copy tracking info from koala/bear
+	test_config branch.autoSetupMerge inherit &&
+	git checkout -b foo koala/bear &&
+	test_cmp_config origin branch.foo.remote &&
+	test_cmp_config refs/heads/koala/bear branch.foo.merge &&
+	# no tracking info to inherit from main
+	git checkout -b main2 main &&
+	test_cmp_config "" --default "" branch.main2.remote &&
+	test_cmp_config "" --default "" branch.main2.merge
 
-fatal: unable to execute pager 'does-not-exist'
-ok 107 - git errors when asked to execute nonexisting pager
+HEAD is now at 7329388 Initial A one, A two
+Switched to a new branch 'foo-no-inherit'
+Switched to a new branch 'foo'
+branch 'foo' set up to track 'origin/koala/bear'.
+warning: asked to inherit tracking from 'main', but no remote is set
+Switched to a new branch 'main2'
+ok 46 - tracking info copied with autoSetupMerge=inherit
 
-expecting success of 7006.108 'git returns SIGPIPE on propagated signals from pager': 
-	test_when_finished "rm pager-used trace.normal" &&
-	test_config core.pager ">pager-used; exec test-tool sigchain" &&
-	GIT_TRACE2="$(pwd)/trace.normal" &&
-	export GIT_TRACE2 &&
-	test_when_finished "unset GIT_TRACE2" &&
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7409-submodule-detached-work-tree.sh ***
+expecting success of 7409.1 'setup': 
+	git config --global protocol.file.allow always
 
-	if test_have_prereq !MINGW
-	then
-		{ test_terminal git log >/dev/null; OUT=$?; } &&
-		test_match_signal 13 "$OUT"
-	else
-		test_terminal git log
-	fi &&
+ok 1 - setup
 
-	grep child_exit trace.normal >child-exits &&
-	test_line_count = 1 child-exits &&
-	grep " code:143 " child-exits &&
-	test_path_is_file pager-used
+expecting success of 7409.2 'submodule on detached working tree': 
+	git init --bare remote &&
+	test_create_repo bundle1 &&
+	(
+		cd bundle1 &&
+		test_commit "shoot" &&
+		git rev-parse --verify HEAD >../expect
+	) &&
+	mkdir home &&
+	(
+		cd home &&
+		GIT_WORK_TREE="$(pwd)" &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_WORK_TREE GIT_DIR &&
+		git clone --bare ../remote .dotfiles &&
+		git submodule add ../bundle1 .vim/bundle/sogood &&
+		test_commit "sogood" &&
+		(
+			unset GIT_WORK_TREE GIT_DIR &&
+			cd .vim/bundle/sogood &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		) &&
+		git push origin main
+	) &&
+	mkdir home2 &&
+	(
+		cd home2 &&
+		git clone --bare ../remote .dotfiles &&
+		GIT_WORK_TREE="$(pwd)" &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_WORK_TREE GIT_DIR &&
+		git checkout main &&
+		git submodule update --init &&
+		(
+			unset GIT_WORK_TREE GIT_DIR &&
+			cd .vim/bundle/sogood &&
+			git rev-parse --verify HEAD >actual &&
+			test_cmp ../../../../expect actual
+		)
+	)
 
-died of signal 13 at /build/reproducible-path/git-2.49.0+next.20250314/t/test-terminal.perl line 33.
-child_exit[0] pid:2161381 code:143 elapsed:0.027161
-ok 108 - git returns SIGPIPE on propagated signals from pager
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/remote/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/bundle1/.git/
+[main (root-commit) d074fcf] shoot
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shoot.t
+Cloning into bare repository '.dotfiles'...
+warning: You appear to have cloned an empty repository.
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/sogood'...
+done.
+[main (root-commit) 2f89248] sogood
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 .vim/bundle/sogood
+ create mode 100644 sogood.t
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
+ * [new branch]      main -> main
+Cloning into bare repository '.dotfiles'...
+done.
+Already on 'main'
+Submodule '.vim/bundle/sogood' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home2/.vim/bundle/sogood'...
+done.
+Submodule path '.vim/bundle/sogood': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
+ok 2 - submodule on detached working tree
 
-expecting success of 7006.109 'non-existent pager doesnt cause crash': 
-	test_config pager.show invalid-pager &&
-	test_must_fail test_terminal git show
+expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
+	mkdir home3 &&
+	(
+		cd home3 &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git clone --bare ../remote "$GIT_DIR" &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git checkout main &&
+		git submodule add ../bundle1 .vim/bundle/dupe &&
+		test_commit "dupe" &&
+		git push origin main
+	) &&
+	(
+		cd home &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git pull &&
+		git submodule update --init &&
+		test -f .vim/bundle/dupe/shoot.t
+	)
 
-error: cannot run invalid-pager: No such file or directory
-fatal: unable to execute pager 'invalid-pager'
-ok 109 - non-existent pager doesnt cause crash
+Cloning into bare repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
+done.
+Already on 'main'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/.vim/bundle/dupe'...
+done.
+[main e996493] dupe
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 160000 .vim/bundle/dupe
+ create mode 100644 dupe.t
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
+   2f89248..e996493  main -> main
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
+ * branch            HEAD       -> FETCH_HEAD
+Updating 2f89248..e996493
+Fast-forward
+ .gitmodules      | 3 +++
+ .vim/bundle/dupe | 1 +
+ dupe.t           | 1 +
+ 3 files changed, 5 insertions(+)
+ create mode 160000 .vim/bundle/dupe
+ create mode 100644 dupe.t
+Submodule '.vim/bundle/dupe' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/dupe'...
+done.
+Submodule path '.vim/bundle/dupe': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
+ok 3 - submodule on detached working pointed by core.worktree
 
-# still have 3 known breakage(s)
-# passed all remaining 106 test(s)
-1..109
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7063-status-untracked-cache.sh ***
@@ -467033,293 +467113,2293 @@
 changes and commit them, and you can discard any commits you make in this
 state without impacting any branches by switching back to a branch.
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 53 - "status" after symlink replacement should be clean with UC=true
+
+expecting success of 7063.54 '"status" after symlink replacement should be clean with UC=false': 
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout main &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 54 - "status" after symlink replacement should be clean with UC=false
+
+expecting success of 7063.55 'setup worktree for non-symlink test': 
+	git init worktree-non-symlink &&
+	cd worktree-non-symlink &&
+	git config core.untrackedCache true &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add one/file two/file &&
+	git commit -m"first commit" &&
+	git rm -rf one &&
+	cp two/file one &&
+	git add one &&
+	git commit -m"second commit"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/.git/
+[main (root-commit) 294fddc] first commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 one/file
+ create mode 100644 two/file
+rm 'one/file'
+[main 0558445] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one/file => one (100%)
+ok 55 - setup worktree for non-symlink test
+
+expecting success of 7063.56 '"status" after file replacement should be clean with UC=true': 
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout main &&
+	avoid_racy &&
+	status_is_clean &&
+	test-tool dump-untracked-cache >../actual &&
+	grep -F "recurse valid" ../actual >../actual.grep &&
+	cat >../expect.grep <<EOF &&
+/ $ZERO_OID recurse valid
+/two/ $ZERO_OID recurse valid
+EOF
+	status_is_clean &&
+	test_cmp ../expect.grep ../actual.grep
+
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 56 - "status" after file replacement should be clean with UC=true
+
+expecting success of 7063.57 '"status" after file replacement should be clean with UC=false': 
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout main &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 57 - "status" after file replacement should be clean with UC=false
+
+expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
+	git init emptyrepo &&
+	git -C emptyrepo -c core.untrackedCache=true write-tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
+4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 58 - empty repo (no index) and core.untrackedCache
+
+# passed all 58 test(s)
+1..58
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7401-submodule-summary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success of 7401.1 'added submodule': 
+	git add sm1 &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 0000000...a2c4dab (2):
+	  > Add foo2
+
+	EOF
+	test_cmp expected actual
+
+warning: adding embedded git repository: sm1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 1 - added submodule
+
+expecting success of 7401.2 'added submodule (subdirectory)': 
+	mkdir sub &&
+	(
+		cd sub &&
+		git submodule summary >../actual
+	) &&
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
+
+	EOF
+	test_cmp expected actual
+
+ok 2 - added submodule (subdirectory)
+
+expecting success of 7401.3 'added submodule (subdirectory only)': 
+	(
+		cd sub &&
+		git submodule summary . >../actual
+	) &&
+	test_must_be_empty actual
+
+ok 3 - added submodule (subdirectory only)
+
+expecting success of 7401.4 'added submodule (subdirectory with explicit path)': 
+	(
+		cd sub &&
+		git submodule summary ../sm1 >../actual
+	) &&
+	cat >expected <<-EOF &&
+	* ../sm1 0000000...a2c4dab (2):
+	  > Add foo2
+
+	EOF
+	test_cmp expected actual
+
+ok 4 - added submodule (subdirectory with explicit path)
+
+expecting success of 7401.5 'modified submodule(forward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
+
+	EOF
+	test_cmp expected actual
+
+ok 5 - modified submodule(forward)
+
+expecting success of 7401.6 'modified submodule(forward), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
+
+	EOF
+	test_cmp expected actual
+
+ok 6 - modified submodule(forward), --files
+
+expecting success of 7401.7 'no ignore=all setting has any effect': 
+	git config -f .gitmodules submodule.sm1.path sm1 &&
+	git config -f .gitmodules submodule.sm1.ignore all &&
+	git config submodule.sm1.ignore all &&
+	git config diff.ignoreSubmodules all &&
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 a2c4dab...4c8d358 (1):
+	  > Add foo3
+
+	EOF
+	test_cmp expected actual &&
+	git config --unset diff.ignoreSubmodules &&
+	git config --remove-section submodule.sm1 &&
+	git config -f .gitmodules --remove-section submodule.sm1
+
+ok 7 - no ignore=all setting has any effect
+
+expecting success of 7401.8 'modified submodule(backward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...db425b6 (2):
+	  < Add foo3
+	  < Add foo2
+
+	EOF
+	test_cmp expected actual
+
+ok 8 - modified submodule(backward)
+
+expecting success of 7401.9 'modified submodule(backward and forward)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...41fbea9 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
+	  < Add foo2
+
+	EOF
+	test_cmp expected actual
+
+ok 9 - modified submodule(backward and forward)
+
+expecting success of 7401.10 '--summary-limit': 
+	git submodule summary -n 3 >actual &&
+	cat >expected <<-EOF &&
+	* sm1 4c8d358...41fbea9 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
+
+	EOF
+	test_cmp expected actual
+
+ok 10 - --summary-limit
+
+expecting success of 7401.11 'typechanged submodule(submodule->blob), --cached': 
+	git submodule summary --cached >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
+	  < Add foo5
+
+	EOF
+	test_cmp expected actual
+
+ok 11 - typechanged submodule(submodule->blob), --cached
+
+expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
+	git submodule summary --files >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
+	  > Add foo5
+
+	EOF
+	test_cmp expected actual
+
+ok 12 - typechanged submodule(submodule->blob), --files
+
+expecting success of 7401.13 'typechanged submodule(submodule->blob)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9(submodule)->9da5fb8(blob):
+
+	EOF
+	test_cmp expected actual
+
+fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
+ok 13 - typechanged submodule(submodule->blob)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm1/.git/
+expecting success of 7401.14 'nonexistent commit': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 41fbea9...6858906:
+	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
+
+	EOF
+	test_cmp expected actual
+
+ok 14 - nonexistent commit
+
+expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 9da5fb8(blob)->6858906(submodule) (2):
+	  > Add foo7
+
+	EOF
+	test_cmp expected actual
+
+ok 15 - typechanged submodule(blob->submodule)
+
+expecting success of 7401.16 'deleted submodule': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	EOF
+	test_cmp expected actual
+
+ok 16 - deleted submodule
+
+expecting success of 7401.17 'create second submodule': 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 17 - create second submodule
+
+expecting success of 7401.18 'multiple submodules': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 18 - multiple submodules
+
+expecting success of 7401.19 'path filter': 
+	git submodule summary sm2 >actual &&
+	cat >expected <<-EOF &&
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 19 - path filter
+
+expecting success of 7401.20 'given commit': 
+	git submodule summary HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+	test_cmp expected actual
+
+ok 20 - given commit
+
+expecting success of 7401.21 '--for-status': 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_cmp - actual <<-EOF
+	* sm1 6858906...0000000:
+
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
+
+	EOF
+
+ok 21 - --for-status
+
+expecting success of 7401.22 'fail when using --files together with --cached': 
+	test_must_fail git submodule summary --files --cached
+
+fatal: options '--cached' and '--files' cannot be used together
+ok 22 - fail when using --files together with --cached
+
+expecting success of 7401.23 'should not fail in an empty repo': 
+	git init xyzzy &&
+	cd xyzzy &&
+	git submodule summary >output 2>&1 &&
+	test_must_be_empty output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/xyzzy/.git/
+ok 23 - should not fail in an empty repo
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t6438-submodule-directory-file-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
+expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_test_func: added submodule creates empty directory
+
+expecting success of 6438.2 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 6438.3 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 6438.4 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_test_func: replace directory with submodule
+
+expecting success of 6438.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6438.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6438.7 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 7 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 6438.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6438.9 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge replace_sub1_with_file
+not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 6438.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge replace_sub1_with_file
+not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6438.11 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_test_func: modified submodule does not update submodule work tree
 
-  git switch -c <new-branch-name>
+expecting success of 6438.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-Or undo this operation with:
+expecting success of 6438.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-  git switch -
+expecting success of 6438.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6438.15 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - git_test_func: added submodule creates empty directory
 
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 53 - "status" after symlink replacement should be clean with UC=true
+expecting success of 6438.16 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 7063.54 '"status" after symlink replacement should be clean with UC=false': 
-	git config core.untrackedCache false &&
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
+expecting success of 6438.17 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - git_test_func: replace tracked file with submodule creates empty directory
 
-Note: switching to 'HEAD~'.
+expecting success of 6438.18 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - git_test_func: replace directory with submodule
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6438.19 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 19 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6438.20 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 20 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-  git switch -c <new-branch-name>
+expecting success of 6438.21 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 21 - git_test_func: replace submodule with a directory must fail
 
-Or undo this operation with:
+expecting success of 6438.22 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 22 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-  git switch -
+checking known breakage of 6438.23 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
+not ok 23 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-Turn off this advice by setting config variable advice.detachedHead to false
+checking known breakage of 6438.24 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
+not ok 24 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 54 - "status" after symlink replacement should be clean with UC=false
+expecting success of 6438.25 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 7063.55 'setup worktree for non-symlink test': 
-	git init worktree-non-symlink &&
-	cd worktree-non-symlink &&
-	git config core.untrackedCache true &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add one/file two/file &&
-	git commit -m"first commit" &&
-	git rm -rf one &&
-	cp two/file one &&
-	git add one &&
-	git commit -m"second commit"
+expecting success of 6438.26 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/.git/
-[main (root-commit) 294fddc] first commit
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 one/file
- create mode 100644 two/file
-rm 'one/file'
-[main 0558445] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one/file => one (100%)
-ok 55 - setup worktree for non-symlink test
+expecting success of 6438.27 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 7063.56 '"status" after file replacement should be clean with UC=true': 
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	test-tool dump-untracked-cache >../actual &&
-	grep -F "recurse valid" ../actual >../actual.grep &&
-	cat >../expect.grep <<EOF &&
-/ $ZERO_OID recurse valid
-/two/ $ZERO_OID recurse valid
-EOF
-	status_is_clean &&
-	test_cmp ../expect.grep ../actual.grep
+expecting success of 6438.28 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 28 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-Note: switching to 'HEAD~'.
+expecting success of 6438.29 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 29 - git_test_func: added submodule creates empty directory
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6438.30 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 30 - git_test_func: added submodule leaves existing empty directory alone
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6438.31 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 31 - git_test_func: replace tracked file with submodule creates empty directory
 
-  git switch -c <new-branch-name>
+expecting success of 6438.32 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 32 - git_test_func: replace directory with submodule
 
-Or undo this operation with:
+expecting success of 6438.33 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 33 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-  git switch -
+expecting success of 6438.34 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 34 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6438.35 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 35 - git_test_func: replace submodule with a directory must fail
 
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 56 - "status" after file replacement should be clean with UC=true
+expecting success of 6438.36 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 36 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-expecting success of 7063.57 '"status" after file replacement should be clean with UC=false': 
-	git config core.untrackedCache false &&
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
+checking known breakage of 6438.37 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
+not ok 37 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-Note: switching to 'HEAD~'.
+checking known breakage of 6438.38 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
+not ok 38 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6438.39 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 39 - git_test_func: modified submodule does not update submodule work tree
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6438.40 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 40 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-  git switch -c <new-branch-name>
+expecting success of 6438.41 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-Or undo this operation with:
+expecting success of 6438.42 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 42 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-  git switch -
+expecting success of 6438.43 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_test_func: added submodule creates empty directory
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6438.44 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_test_func: added submodule leaves existing empty directory alone
 
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 57 - "status" after file replacement should be clean with UC=false
+expecting success of 6438.45 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 45 - git_test_func: replace tracked file with submodule creates empty directory
 
-expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
-	git init emptyrepo &&
-	git -C emptyrepo -c core.untrackedCache=true write-tree
+expecting success of 6438.46 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 46 - git_test_func: replace directory with submodule
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 58 - empty repo (no index) and core.untrackedCache
+expecting success of 6438.47 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 47 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-# passed all 58 test(s)
-1..58
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7409-submodule-detached-work-tree.sh ***
-expecting success of 7409.1 'setup': 
-	git config --global protocol.file.allow always
+expecting success of 6438.48 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 48 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-ok 1 - setup
+expecting success of 6438.49 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 49 - git_test_func: replace submodule with a directory must fail
 
-expecting success of 7409.2 'submodule on detached working tree': 
-	git init --bare remote &&
-	test_create_repo bundle1 &&
-	(
-		cd bundle1 &&
-		test_commit "shoot" &&
-		git rev-parse --verify HEAD >../expect
-	) &&
-	mkdir home &&
-	(
-		cd home &&
-		GIT_WORK_TREE="$(pwd)" &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_WORK_TREE GIT_DIR &&
-		git clone --bare ../remote .dotfiles &&
-		git submodule add ../bundle1 .vim/bundle/sogood &&
-		test_commit "sogood" &&
+expecting success of 6438.50 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
 		(
-			unset GIT_WORK_TREE GIT_DIR &&
-			cd .vim/bundle/sogood &&
-			git rev-parse --verify HEAD >actual &&
-			test_cmp ../../../../expect actual
-		) &&
-		git push origin main
-	) &&
-	mkdir home2 &&
-	(
-		cd home2 &&
-		git clone --bare ../remote .dotfiles &&
-		GIT_WORK_TREE="$(pwd)" &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_WORK_TREE GIT_DIR &&
-		git checkout main &&
-		git submodule update --init &&
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 50 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6438.51 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
 		(
-			unset GIT_WORK_TREE GIT_DIR &&
-			cd .vim/bundle/sogood &&
-			git rev-parse --verify HEAD >actual &&
-			test_cmp ../../../../expect actual
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
 		)
-	)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
+not ok 51 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/remote/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/bundle1/.git/
-[main (root-commit) d074fcf] shoot
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shoot.t
-Cloning into bare repository '.dotfiles'...
-warning: You appear to have cloned an empty repository.
+checking known breakage of 6438.52 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/sogood'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
 done.
-[main (root-commit) 2f89248] sogood
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 .vim/bundle/sogood
- create mode 100644 sogood.t
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
- * [new branch]      main -> main
-Cloning into bare repository '.dotfiles'...
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
+not ok 52 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6438.53 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
 done.
-Already on 'main'
-Submodule '.vim/bundle/sogood' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home2/.vim/bundle/sogood'...
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
 done.
-Submodule path '.vim/bundle/sogood': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
-ok 2 - submodule on detached working tree
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Merge made by the 'ort' strategy.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 53 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
-	mkdir home3 &&
-	(
-		cd home3 &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_DIR &&
-		git clone --bare ../remote "$GIT_DIR" &&
-		git config core.bare false &&
-		git config core.worktree .. &&
-		git checkout main &&
-		git submodule add ../bundle1 .vim/bundle/dupe &&
-		test_commit "dupe" &&
-		git push origin main
-	) &&
-	(
-		cd home &&
-		GIT_DIR="$(pwd)/.dotfiles" &&
-		export GIT_DIR &&
-		git config core.bare false &&
-		git config core.worktree .. &&
-		git pull &&
-		git submodule update --init &&
-		test -f .vim/bundle/dupe/shoot.t
-	)
+expecting success of 6438.54 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Merge made by the 'ort' strategy.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 54 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-Cloning into bare repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
+expecting success of 6438.55 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
 done.
-Already on 'main'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/.vim/bundle/dupe'...
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Merge made by the 'ort' strategy.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
 done.
-[main e996493] dupe
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 160000 .vim/bundle/dupe
- create mode 100644 dupe.t
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
-   2f89248..e996493  main -> main
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
- * branch            HEAD       -> FETCH_HEAD
-Updating 2f89248..e996493
-Fast-forward
- .gitmodules      | 3 +++
- .vim/bundle/dupe | 1 +
- dupe.t           | 1 +
- 3 files changed, 5 insertions(+)
- create mode 160000 .vim/bundle/dupe
- create mode 100644 dupe.t
-Submodule '.vim/bundle/dupe' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/dupe'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
 done.
-Submodule path '.vim/bundle/dupe': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
-ok 3 - submodule on detached working pointed by core.worktree
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-# passed all 3 test(s)
-1..3
+expecting success of 6438.56 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 56 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+# still have 8 known breakage(s)
+# passed all remaining 48 test(s)
+1..56
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7411-submodule-config.sh ***
@@ -467639,310 +469719,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7401-submodule-summary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.1 'added submodule': 
-	git add sm1 &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-warning: adding embedded git repository: sm1
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm1
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm1
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 1 - added submodule
-
-expecting success of 7401.2 'added submodule (subdirectory)': 
-	mkdir sub &&
-	(
-		cd sub &&
-		git submodule summary >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 2 - added submodule (subdirectory)
-
-expecting success of 7401.3 'added submodule (subdirectory only)': 
-	(
-		cd sub &&
-		git submodule summary . >../actual
-	) &&
-	test_must_be_empty actual
-
-ok 3 - added submodule (subdirectory only)
-
-expecting success of 7401.4 'added submodule (subdirectory with explicit path)': 
-	(
-		cd sub &&
-		git submodule summary ../sm1 >../actual
-	) &&
-	cat >expected <<-EOF &&
-	* ../sm1 0000000...a2c4dab (2):
-	  > Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 4 - added submodule (subdirectory with explicit path)
-
-expecting success of 7401.5 'modified submodule(forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 5 - modified submodule(forward)
-
-expecting success of 7401.6 'modified submodule(forward), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 6 - modified submodule(forward), --files
-
-expecting success of 7401.7 'no ignore=all setting has any effect': 
-	git config -f .gitmodules submodule.sm1.path sm1 &&
-	git config -f .gitmodules submodule.sm1.ignore all &&
-	git config submodule.sm1.ignore all &&
-	git config diff.ignoreSubmodules all &&
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 a2c4dab...4c8d358 (1):
-	  > Add foo3
-
-	EOF
-	test_cmp expected actual &&
-	git config --unset diff.ignoreSubmodules &&
-	git config --remove-section submodule.sm1 &&
-	git config -f .gitmodules --remove-section submodule.sm1
-
-ok 7 - no ignore=all setting has any effect
-
-expecting success of 7401.8 'modified submodule(backward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...db425b6 (2):
-	  < Add foo3
-	  < Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 8 - modified submodule(backward)
-
-expecting success of 7401.9 'modified submodule(backward and forward)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
-	  < Add foo2
-
-	EOF
-	test_cmp expected actual
-
-ok 9 - modified submodule(backward and forward)
-
-expecting success of 7401.10 '--summary-limit': 
-	git submodule summary -n 3 >actual &&
-	cat >expected <<-EOF &&
-	* sm1 4c8d358...41fbea9 (4):
-	  > Add foo5
-	  > Add foo4
-	  < Add foo3
-
-	EOF
-	test_cmp expected actual
-
-ok 10 - --summary-limit
-
-expecting success of 7401.11 'typechanged submodule(submodule->blob), --cached': 
-	git submodule summary --cached >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob) (3):
-	  < Add foo5
-
-	EOF
-	test_cmp expected actual
-
-ok 11 - typechanged submodule(submodule->blob), --cached
-
-expecting success of 7401.12 'typechanged submodule(submodule->blob), --files': 
-	git submodule summary --files >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->41fbea9(submodule) (3):
-	  > Add foo5
-
-	EOF
-	test_cmp expected actual
-
-ok 12 - typechanged submodule(submodule->blob), --files
-
-expecting success of 7401.13 'typechanged submodule(submodule->blob)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9(submodule)->9da5fb8(blob):
-
-	EOF
-	test_cmp expected actual
-
-fatal: exec 'rev-parse': cd to 'sm1' failed: Not a directory
-ok 13 - typechanged submodule(submodule->blob)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm1/.git/
-expecting success of 7401.14 'nonexistent commit': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 41fbea9...6858906:
-	  Warn: sm1 doesn't contain commit 41fbea99b81568012be3e9bcc31431971c1e5bc5
-
-	EOF
-	test_cmp expected actual
-
-ok 14 - nonexistent commit
-
-expecting success of 7401.15 'typechanged submodule(blob->submodule)': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 9da5fb8(blob)->6858906(submodule) (2):
-	  > Add foo7
-
-	EOF
-	test_cmp expected actual
-
-ok 15 - typechanged submodule(blob->submodule)
-
-expecting success of 7401.16 'deleted submodule': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	EOF
-	test_cmp expected actual
-
-ok 16 - deleted submodule
-
-expecting success of 7401.17 'create second submodule': 
-	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
-	git add sm2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 17 - create second submodule
-
-expecting success of 7401.18 'multiple submodules': 
-	git submodule summary >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 18 - multiple submodules
-
-expecting success of 7401.19 'path filter': 
-	git submodule summary sm2 >actual &&
-	cat >expected <<-EOF &&
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 19 - path filter
-
-expecting success of 7401.20 'given commit': 
-	git submodule summary HEAD^ >actual &&
-	cat >expected <<-EOF &&
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-	test_cmp expected actual
-
-ok 20 - given commit
-
-expecting success of 7401.21 '--for-status': 
-	git submodule summary --for-status HEAD^ >actual &&
-	test_cmp - actual <<-EOF
-	* sm1 6858906...0000000:
-
-	* sm2 0000000...fa9eeaf (2):
-	  > Add foo9
-
-	EOF
-
-ok 21 - --for-status
-
-expecting success of 7401.22 'fail when using --files together with --cached': 
-	test_must_fail git submodule summary --files --cached
-
-fatal: options '--cached' and '--files' cannot be used together
-ok 22 - fail when using --files together with --cached
-
-expecting success of 7401.23 'should not fail in an empty repo': 
-	git init xyzzy &&
-	cd xyzzy &&
-	git submodule summary >output 2>&1 &&
-	test_must_be_empty output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7401-submodule-summary/xyzzy/.git/
-ok 23 - should not fail in an empty repo
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7414-submodule-mistakes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7414-submodule-mistakes/.git/
 expecting success of 7414.1 'create embedded repository': 
@@ -468014,164 +469790,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7413-submodule-is-active.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/.git/
-expecting success of 7413.1 'setup': 
-	git config --global protocol.file.allow always &&
-	git init sub &&
-	test_commit -C sub initial &&
-	git init super &&
-	test_commit -C super initial &&
-	git -C super submodule add ../sub sub1 &&
-	git -C super submodule add ../sub sub2 &&
-
-	# Remove submodule.<name>.active entries in order to test in an
-	# environment where only URLs are present in the config
-	git -C super config --unset submodule.sub1.active &&
-	git -C super config --unset submodule.sub2.active &&
-
-	git -C super commit -a -m "add 2 submodules at sub{1,2}"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/sub/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/.git/
-[master (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/sub2'...
-done.
-[master b6e0cac] add 2 submodules at sub{1,2}
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
- create mode 160000 sub2
-ok 1 - setup
-
-expecting success of 7413.2 'is-active works with urls': 
-	test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2 &&
-
-	git -C super config --unset submodule.sub1.URL &&
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	git -C super config submodule.sub1.URL ../sub &&
-	test-tool -C super submodule is-active sub1
-
-ok 2 - is-active works with urls
-
-expecting success of 7413.3 'is-active works with submodule.<name>.active config': 
-	test_when_finished "git -C super config --unset submodule.sub1.active" &&
-	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
-
-	git -C super config --bool submodule.sub1.active "false" &&
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-
-	git -C super config --bool submodule.sub1.active "true" &&
-	git -C super config --unset submodule.sub1.URL &&
-	test-tool -C super submodule is-active sub1
-
-ok 3 - is-active works with submodule.<name>.active config
-
-expecting success of 7413.4 'is-active handles submodule.active config missing a value': 
-	cp super/.git/config super/.git/config.orig &&
-	test_when_finished mv super/.git/config.orig super/.git/config &&
-
-	cat >>super/.git/config <<-\EOF &&
-	[submodule]
-		active
-	EOF
-
-	cat >expect <<-\EOF &&
-	error: missing value for 'submodule.active'
-	EOF
-	test-tool -C super submodule is-active sub1 2>actual &&
-	test_cmp expect actual
-
-ok 4 - is-active handles submodule.active config missing a value
-
-expecting success of 7413.5 'is-active works with basic submodule.active config': 
-	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	git -C super config --add submodule.active "." &&
-	git -C super config --unset submodule.sub1.URL &&
-
-	test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 5 - is-active works with basic submodule.active config
-
-expecting success of 7413.6 'is-active correctly works with paths that are not submodules': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	test_must_fail test-tool -C super submodule is-active not-a-submodule &&
-
-	git -C super config --add submodule.active "." &&
-	test_must_fail test-tool -C super submodule is-active not-a-submodule
-
-ok 6 - is-active correctly works with paths that are not submodules
-
-expecting success of 7413.7 'is-active works with exclusions in submodule.active config': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	git -C super config --add submodule.active "." &&
-	git -C super config --add submodule.active ":(exclude)sub1" &&
-
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 7 - is-active works with exclusions in submodule.active config
-
-expecting success of 7413.8 'is-active with submodule.active and submodule.<name>.active': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-	test_when_finished "git -C super config --unset submodule.sub1.active" &&
-	test_when_finished "git -C super config --unset submodule.sub2.active" &&
-
-	git -C super config --add submodule.active "sub1" &&
-	git -C super config --bool submodule.sub1.active "false" &&
-	git -C super config --bool submodule.sub2.active "true" &&
-
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 8 - is-active with submodule.active and submodule.<name>.active
-
-expecting success of 7413.9 'is-active, submodule.active and submodule add': 
-	test_when_finished "rm -rf super2" &&
-	git init super2 &&
-	test_commit -C super2 initial &&
-	git -C super2 config --add submodule.active "sub*" &&
-
-	# submodule add should only add submodule.<name>.active
-	# to the config if not matched by the pathspec
-	git -C super2 submodule add ../sub sub1 &&
-	test_must_fail git -C super2 config --get submodule.sub1.active &&
-
-	git -C super2 submodule add ../sub mod &&
-	git -C super2 config --get submodule.mod.active
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/.git/
-[master (root-commit) d39e3de] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/mod'...
-done.
-true
-ok 9 - is-active, submodule.active and submodule add
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7403-submodule-sync.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7403-submodule-sync/.git/
 expecting success of 7403.1 'setup': 
@@ -468720,286 +470338,162 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7412-submodule-absorbgitdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/.git/
-expecting success of 7412.1 'setup a real submodule': 
-	cwd="$(pwd)" &&
-	git init sub1 &&
-	test_commit -C sub1 first &&
-	git submodule add ./sub1 &&
-	test_tick &&
-	git commit -m superproject
+*** t7413-submodule-is-active.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/.git/
+expecting success of 7413.1 'setup': 
+	git config --global protocol.file.allow always &&
+	git init sub &&
+	test_commit -C sub initial &&
+	git init super &&
+	test_commit -C super initial &&
+	git -C super submodule add ../sub sub1 &&
+	git -C super submodule add ../sub sub2 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
-[master (root-commit) 50e526b] first
+	# Remove submodule.<name>.active entries in order to test in an
+	# environment where only URLs are present in the config
+	git -C super config --unset submodule.sub1.active &&
+	git -C super config --unset submodule.sub2.active &&
+
+	git -C super commit -a -m "add 2 submodules at sub{1,2}"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/sub/.git/
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Adding existing repo at 'sub1' to the index
-[master (root-commit) 807c578] superproject
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/.git/
+[master (root-commit) 5e30013] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super/sub2'...
+done.
+[master b6e0cac] add 2 submodules at sub{1,2}
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
  create mode 160000 sub1
-ok 1 - setup a real submodule
+ create mode 160000 sub2
+ok 1 - setup
 
-expecting success of 7412.2 'absorb the git dir': 
-	>expect &&
-	>actual &&
-	>expect.1 &&
-	>expect.2 &&
-	>actual.1 &&
-	>actual.2 &&
-	git status >expect.1 &&
-	git -C sub1 rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	git fsck &&
-	test -f sub1/.git &&
-	test -d .git/modules/sub1 &&
-	git status >actual.1 &&
-	git -C sub1 rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
+expecting success of 7413.2 'is-active works with urls': 
+	test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2 &&
 
-ok 2 - absorb the git dir
+	git -C super config --unset submodule.sub1.URL &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	git -C super config submodule.sub1.URL ../sub &&
+	test-tool -C super submodule is-active sub1
 
-expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
-	test_when_finished "git submodule update --init" &&
-	git submodule deinit --all &&
-	git submodule absorbgitdirs 2>err &&
-	test_must_be_empty err &&
-	test -d .git/modules/sub1 &&
-	test -d sub1 &&
-	! test -e sub1/.git
+ok 2 - is-active works with urls
 
-Cleared directory 'sub1'
-Submodule 'sub1' (./sub1) unregistered for path 'sub1'
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
-Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
-ok 3 - absorbing does not fail for deinitialized submodules
+expecting success of 7413.3 'is-active works with submodule.<name>.active config': 
+	test_when_finished "git -C super config --unset submodule.sub1.active" &&
+	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
 
-expecting success of 7412.4 'setup nested submodule': 
-	git init sub1/nested &&
-	test_commit -C sub1/nested first_nested &&
-	git -C sub1 submodule add ./nested &&
-	test_tick &&
-	git -C sub1 commit -m "add nested" &&
-	git add sub1 &&
-	git commit -m "sub1 to include nested submodule"
+	git -C super config --bool submodule.sub1.active "false" &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
-[master (root-commit) 2139925] first_nested
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_nested.t
-Adding existing repo at 'nested' to the index
-[detached HEAD 838ca49] add nested
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested
-[master 4a7bb23] sub1 to include nested submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - setup nested submodule
+	git -C super config --bool submodule.sub1.active "true" &&
+	git -C super config --unset submodule.sub1.URL &&
+	test-tool -C super submodule is-active sub1
 
-expecting success of 7412.5 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1/nested' from
-	'$cwd/sub1/nested/.git' to
-	'$cwd/.git/modules/sub1/modules/nested'
+ok 3 - is-active works with submodule.<name>.active config
+
+expecting success of 7413.4 'is-active handles submodule.active config missing a value': 
+	cp super/.git/config super/.git/config.orig &&
+	test_when_finished mv super/.git/config.orig super/.git/config &&
+
+	cat >>super/.git/config <<-\EOF &&
+	[submodule]
+		active
 	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
 
-ok 5 - absorb the git dir in a nested submodule
+	cat >expect <<-\EOF &&
+	error: missing value for 'submodule.active'
+	EOF
+	test-tool -C super submodule is-active sub1 2>actual &&
+	test_cmp expect actual
 
-expecting success of 7412.6 're-setup nested submodule': 
-	# un-absorb the direct submodule, to test if the nested submodule
-	# is still correct (needs a rewrite of the gitfile only)
-	rm -rf sub1/.git &&
-	mv .git/modules/sub1 sub1/.git &&
-	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
-	# fixup the nested submodule
-	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
-	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
-		core.worktree "../../../nested" &&
-	# make sure this re-setup is correct
-	git status --ignore-submodules=none &&
+ok 4 - is-active handles submodule.active config missing a value
 
-	# also make sure this old setup does not regress
-	git submodule update --init --recursive >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
+expecting success of 7413.5 'is-active works with basic submodule.active config': 
+	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.1
-	actual.2
-	err
-	expect
-	expect.1
-	expect.2
+	git -C super config --add submodule.active "." &&
+	git -C super config --unset submodule.sub1.URL &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 6 - re-setup nested submodule
+	test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-expecting success of 7412.7 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/.git &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
+ok 5 - is-active works with basic submodule.active config
 
-ok 7 - absorb the git dir in a nested submodule
+expecting success of 7413.6 'is-active correctly works with paths that are not submodules': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-expecting success of 7412.8 'absorb the git dir outside of primary worktree': 
-	test_when_finished "rm -rf repo-bare.git" &&
-	git clone --bare . repo-bare.git &&
-	test_when_finished "rm -rf repo-wt" &&
-	git -C repo-bare.git worktree add ../repo-wt &&
+	test_must_fail test-tool -C super submodule is-active not-a-submodule &&
 
-	test_when_finished "rm -f .gitconfig" &&
-	test_config_global protocol.file.allow always &&
-	git -C repo-wt submodule update --init &&
-	git init repo-wt/sub2 &&
-	test_commit -C repo-wt/sub2 A &&
-	git -C repo-wt submodule add ./sub2 sub2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub2' from
-	'$cwd/repo-wt/sub2/.git' to
-	'$cwd/repo-bare.git/worktrees/repo-wt/modules/sub2'
-	EOF
-	git -C repo-wt submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
+	git -C super config --add submodule.active "." &&
+	test_must_fail test-tool -C super submodule is-active not-a-submodule
 
-Cloning into bare repository 'repo-bare.git'...
-done.
-Preparing worktree (new branch 'repo-wt')
-HEAD is now at 4a7bb23 sub1 to include nested submodule
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub1'...
-done.
-Submodule path 'sub1': checked out '838ca4973c32382bdf90170c18433708c487b6c3'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
-[master (root-commit) c8e0c53] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Adding existing repo at 'sub2' to the index
-ok 8 - absorb the git dir outside of primary worktree
+ok 6 - is-active correctly works with paths that are not submodules
 
-expecting success of 7412.9 'setup a gitlink with missing .gitmodules entry': 
-	git init sub2 &&
-	test_commit -C sub2 first &&
-	git add sub2 &&
-	git commit -m superproject
+expecting success of 7413.7 'is-active works with exclusions in submodule.active config': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub2/.git/
-[master (root-commit) b9419e0] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-warning: adding embedded git repository: sub2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master 930a24c] superproject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub2
-ok 9 - setup a gitlink with missing .gitmodules entry
+	git -C super config --add submodule.active "." &&
+	git -C super config --add submodule.active ":(exclude)sub1" &&
 
-expecting success of 7412.10 'absorbing the git dir fails for incomplete submodules': 
-	git status >expect.1 &&
-	git -C sub2 rev-parse HEAD >expect.2 &&
-	cat >expect <<-\EOF &&
-	fatal: could not lookup name for submodule 'sub2'
-	EOF
-	test_must_fail git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	git -C sub2 fsck &&
-	test -d sub2/.git &&
-	git status >actual &&
-	git -C sub2 rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-ok 10 - absorbing the git dir fails for incomplete submodules
+ok 7 - is-active works with exclusions in submodule.active config
 
-expecting success of 7412.11 'setup a submodule with multiple worktrees': 
-	# first create another unembedded git dir in a new submodule
-	git init sub3 &&
-	test_commit -C sub3 first &&
-	git submodule add ./sub3 &&
-	test_tick &&
-	git commit -m "add another submodule" &&
-	git -C sub3 worktree add ../sub3_second_work_tree
+expecting success of 7413.8 'is-active with submodule.active and submodule.<name>.active': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
+	test_when_finished "git -C super config --unset submodule.sub1.active" &&
+	test_when_finished "git -C super config --unset submodule.sub2.active" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
-[master (root-commit) dbecd43] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Adding existing repo at 'sub3' to the index
-[master 54b05d9] add another submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub3
-Preparing worktree (new branch 'sub3_second_work_tree')
-HEAD is now at dbecd43 first
-ok 11 - setup a submodule with multiple worktrees
+	git -C super config --add submodule.active "sub1" &&
+	git -C super config --bool submodule.sub1.active "false" &&
+	git -C super config --bool submodule.sub2.active "true" &&
 
-expecting success of 7412.12 'absorbing fails for a submodule with multiple worktrees': 
-	cat >expect <<-\EOF &&
-	fatal: could not lookup name for submodule 'sub2'
-	EOF
-	test_must_fail git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-ok 12 - absorbing fails for a submodule with multiple worktrees
+ok 8 - is-active with submodule.active and submodule.<name>.active
 
-# passed all 12 test(s)
-1..12
+expecting success of 7413.9 'is-active, submodule.active and submodule add': 
+	test_when_finished "rm -rf super2" &&
+	git init super2 &&
+	test_commit -C super2 initial &&
+	git -C super2 config --add submodule.active "sub*" &&
+
+	# submodule add should only add submodule.<name>.active
+	# to the config if not matched by the pathspec
+	git -C super2 submodule add ../sub sub1 &&
+	test_must_fail git -C super2 config --get submodule.sub1.active &&
+
+	git -C super2 submodule add ../sub mod &&
+	git -C super2 config --get submodule.mod.active
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/.git/
+[master (root-commit) d39e3de] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7413-submodule-is-active/super2/mod'...
+done.
+true
+ok 9 - is-active, submodule.active and submodule add
+
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7408-submodule-reference.sh ***
@@ -469388,6 +470882,403 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7412-submodule-absorbgitdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/.git/
+expecting success of 7412.1 'setup a real submodule': 
+	cwd="$(pwd)" &&
+	git init sub1 &&
+	test_commit -C sub1 first &&
+	git submodule add ./sub1 &&
+	test_tick &&
+	git commit -m superproject
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Adding existing repo at 'sub1' to the index
+[master (root-commit) 807c578] superproject
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 1 - setup a real submodule
+
+expecting success of 7412.2 'absorb the git dir': 
+	>expect &&
+	>actual &&
+	>expect.1 &&
+	>expect.2 &&
+	>actual.1 &&
+	>actual.2 &&
+	git status >expect.1 &&
+	git -C sub1 rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	git fsck &&
+	test -f sub1/.git &&
+	test -d .git/modules/sub1 &&
+	git status >actual.1 &&
+	git -C sub1 rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
+
+ok 2 - absorb the git dir
+
+expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
+	test_when_finished "git submodule update --init" &&
+	git submodule deinit --all &&
+	git submodule absorbgitdirs 2>err &&
+	test_must_be_empty err &&
+	test -d .git/modules/sub1 &&
+	test -d sub1 &&
+	! test -e sub1/.git
+
+Cleared directory 'sub1'
+Submodule 'sub1' (./sub1) unregistered for path 'sub1'
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
+Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
+ok 3 - absorbing does not fail for deinitialized submodules
+
+expecting success of 7412.4 'setup nested submodule': 
+	git init sub1/nested &&
+	test_commit -C sub1/nested first_nested &&
+	git -C sub1 submodule add ./nested &&
+	test_tick &&
+	git -C sub1 commit -m "add nested" &&
+	git add sub1 &&
+	git commit -m "sub1 to include nested submodule"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
+[master (root-commit) 2139925] first_nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_nested.t
+Adding existing repo at 'nested' to the index
+[detached HEAD 838ca49] add nested
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested
+[master 4a7bb23] sub1 to include nested submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - setup nested submodule
+
+expecting success of 7412.5 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1/nested' from
+	'$cwd/sub1/nested/.git' to
+	'$cwd/.git/modules/sub1/modules/nested'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
+
+ok 5 - absorb the git dir in a nested submodule
+
+expecting success of 7412.6 're-setup nested submodule': 
+	# un-absorb the direct submodule, to test if the nested submodule
+	# is still correct (needs a rewrite of the gitfile only)
+	rm -rf sub1/.git &&
+	mv .git/modules/sub1 sub1/.git &&
+	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
+	# fixup the nested submodule
+	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
+	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
+		core.worktree "../../../nested" &&
+	# make sure this re-setup is correct
+	git status --ignore-submodules=none &&
+
+	# also make sure this old setup does not regress
+	git submodule update --init --recursive >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
+
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.1
+	actual.2
+	err
+	expect
+	expect.1
+	expect.2
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 6 - re-setup nested submodule
+
+expecting success of 7412.7 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/.git &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
+
+ok 7 - absorb the git dir in a nested submodule
+
+expecting success of 7412.8 'absorb the git dir outside of primary worktree': 
+	test_when_finished "rm -rf repo-bare.git" &&
+	git clone --bare . repo-bare.git &&
+	test_when_finished "rm -rf repo-wt" &&
+	git -C repo-bare.git worktree add ../repo-wt &&
+
+	test_when_finished "rm -f .gitconfig" &&
+	test_config_global protocol.file.allow always &&
+	git -C repo-wt submodule update --init &&
+	git init repo-wt/sub2 &&
+	test_commit -C repo-wt/sub2 A &&
+	git -C repo-wt submodule add ./sub2 sub2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub2' from
+	'$cwd/repo-wt/sub2/.git' to
+	'$cwd/repo-bare.git/worktrees/repo-wt/modules/sub2'
+	EOF
+	git -C repo-wt submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'repo-bare.git'...
+done.
+Preparing worktree (new branch 'repo-wt')
+HEAD is now at 4a7bb23 sub1 to include nested submodule
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub1'...
+done.
+Submodule path 'sub1': checked out '838ca4973c32382bdf90170c18433708c487b6c3'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
+[master (root-commit) c8e0c53] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Adding existing repo at 'sub2' to the index
+ok 8 - absorb the git dir outside of primary worktree
+
+expecting success of 7412.9 'setup a gitlink with missing .gitmodules entry': 
+	git init sub2 &&
+	test_commit -C sub2 first &&
+	git add sub2 &&
+	git commit -m superproject
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub2/.git/
+[master (root-commit) b9419e0] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+warning: adding embedded git repository: sub2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master 930a24c] superproject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub2
+ok 9 - setup a gitlink with missing .gitmodules entry
+
+expecting success of 7412.10 'absorbing the git dir fails for incomplete submodules': 
+	git status >expect.1 &&
+	git -C sub2 rev-parse HEAD >expect.2 &&
+	cat >expect <<-\EOF &&
+	fatal: could not lookup name for submodule 'sub2'
+	EOF
+	test_must_fail git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	git -C sub2 fsck &&
+	test -d sub2/.git &&
+	git status >actual &&
+	git -C sub2 rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
+
+ok 10 - absorbing the git dir fails for incomplete submodules
+
+expecting success of 7412.11 'setup a submodule with multiple worktrees': 
+	# first create another unembedded git dir in a new submodule
+	git init sub3 &&
+	test_commit -C sub3 first &&
+	git submodule add ./sub3 &&
+	test_tick &&
+	git commit -m "add another submodule" &&
+	git -C sub3 worktree add ../sub3_second_work_tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
+[master (root-commit) dbecd43] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Adding existing repo at 'sub3' to the index
+[master 54b05d9] add another submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub3
+Preparing worktree (new branch 'sub3_second_work_tree')
+HEAD is now at dbecd43 first
+ok 11 - setup a submodule with multiple worktrees
+
+expecting success of 7412.12 'absorbing fails for a submodule with multiple worktrees': 
+	cat >expect <<-\EOF &&
+	fatal: could not lookup name for submodule 'sub2'
+	EOF
+	test_must_fail git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
+
+ok 12 - absorbing fails for a submodule with multiple worktrees
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7420-submodule-set-url.sh ***
+expecting success of 7420.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7420.2 'submodule config cache setup': 
+	mkdir submodule &&
+	(
+		cd submodule &&
+		git init &&
+		echo a >file &&
+		git add file &&
+		git commit -ma
+	) &&
+	mkdir namedsubmodule &&
+	(
+		cd namedsubmodule &&
+		git init &&
+		echo 1 >file &&
+		git add file &&
+		git commit -m1
+	) &&
+	mkdir super &&
+	(
+		cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git submodule add --name thename ../namedsubmodule thepath &&
+		git commit -m "add submodules"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/submodule/.git/
+[master (root-commit) 18350fc] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/namedsubmodule/.git/
+[master (root-commit) c663a66] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/thepath'...
+done.
+[master (root-commit) 7cd7856] add submodules
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ create mode 160000 thepath
+ok 2 - submodule config cache setup
+
+expecting success of 7420.3 'test submodule set-url': 
+	# add commits and move the submodules (change the urls)
+	(
+		cd submodule &&
+		echo b >>file &&
+		git add file &&
+		git commit -mb
+	) &&
+	mv submodule newsubmodule &&
+
+	(
+		cd namedsubmodule &&
+		echo 2 >>file &&
+		git add file &&
+		git commit -m2
+	) &&
+	mv namedsubmodule newnamedsubmodule &&
+
+	git -C newsubmodule show >expect &&
+	git -C newnamedsubmodule show >>expect &&
+	(
+		cd super &&
+		test_must_fail git submodule update --remote &&
+		git submodule set-url submodule ../newsubmodule &&
+		test_cmp_config ../newsubmodule -f .gitmodules submodule.submodule.url &&
+		git submodule set-url thepath ../newnamedsubmodule &&
+		test_cmp_config ../newnamedsubmodule -f .gitmodules submodule.thename.url &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.thepath.url &&
+		git submodule update --remote
+	) &&
+	git -C super/submodule show >actual &&
+	git -C super/thepath show >>actual &&
+	test_cmp expect actual
+
+[master 8063db2] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 35c4e2f] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/submodule' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+fatal: Unable to fetch in submodule path 'submodule'
+Synchronizing submodule url for 'submodule'
+Synchronizing submodule url for 'thepath'
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/newsubmodule
+   18350fc..8063db2  master     -> origin/master
+Submodule path 'submodule': checked out '8063db2e93a425b6bc293b09198d2c4c1480f345'
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/newnamedsubmodule
+   c663a66..35c4e2f  master     -> origin/master
+Submodule path 'thepath': checked out '35c4e2f484f028248d55b9394adcdfb7266988b7'
+ok 3 - test submodule set-url
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7416-submodule-dash-url.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7416-submodule-dash-url/.git/
 expecting success of 7416.1 'setup': 
@@ -469755,121 +471646,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7420-submodule-set-url.sh ***
-expecting success of 7420.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7420.2 'submodule config cache setup': 
-	mkdir submodule &&
-	(
-		cd submodule &&
-		git init &&
-		echo a >file &&
-		git add file &&
-		git commit -ma
-	) &&
-	mkdir namedsubmodule &&
-	(
-		cd namedsubmodule &&
-		git init &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m1
-	) &&
-	mkdir super &&
-	(
-		cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add --name thename ../namedsubmodule thepath &&
-		git commit -m "add submodules"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/submodule/.git/
-[master (root-commit) 18350fc] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/namedsubmodule/.git/
-[master (root-commit) c663a66] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/super/thepath'...
-done.
-[master (root-commit) 7cd7856] add submodules
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
- create mode 160000 thepath
-ok 2 - submodule config cache setup
-
-expecting success of 7420.3 'test submodule set-url': 
-	# add commits and move the submodules (change the urls)
-	(
-		cd submodule &&
-		echo b >>file &&
-		git add file &&
-		git commit -mb
-	) &&
-	mv submodule newsubmodule &&
-
-	(
-		cd namedsubmodule &&
-		echo 2 >>file &&
-		git add file &&
-		git commit -m2
-	) &&
-	mv namedsubmodule newnamedsubmodule &&
-
-	git -C newsubmodule show >expect &&
-	git -C newnamedsubmodule show >>expect &&
-	(
-		cd super &&
-		test_must_fail git submodule update --remote &&
-		git submodule set-url submodule ../newsubmodule &&
-		test_cmp_config ../newsubmodule -f .gitmodules submodule.submodule.url &&
-		git submodule set-url thepath ../newnamedsubmodule &&
-		test_cmp_config ../newnamedsubmodule -f .gitmodules submodule.thename.url &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.thepath.url &&
-		git submodule update --remote
-	) &&
-	git -C super/submodule show >actual &&
-	git -C super/thepath show >>actual &&
-	test_cmp expect actual
-
-[master 8063db2] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35c4e2f] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/submodule' does not appear to be a git repository
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-fatal: Unable to fetch in submodule path 'submodule'
-Synchronizing submodule url for 'submodule'
-Synchronizing submodule url for 'thepath'
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/newsubmodule
-   18350fc..8063db2  master     -> origin/master
-Submodule path 'submodule': checked out '8063db2e93a425b6bc293b09198d2c4c1480f345'
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7420-submodule-set-url/newnamedsubmodule
-   c663a66..35c4e2f  master     -> origin/master
-Submodule path 'thepath': checked out '35c4e2f484f028248d55b9394adcdfb7266988b7'
-ok 3 - test submodule set-url
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7418-submodule-sparse-gitmodules.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
 expecting success of 7418.1 'setup': 
@@ -470044,6 +471820,107 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7421-submodule-summary-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/.git/
+expecting success of 7421.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7421.2 'summary test environment setup': 
+	git init sm &&
+	test_commit -C sm "add file" file file-content file-tag &&
+
+	git submodule add ./sm my-subm &&
+	test_tick &&
+	git commit -m "add submodule"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm/.git/
+[master (root-commit) 35b40f1] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/my-subm'...
+done.
+[master (root-commit) 0d0296a] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my-subm
+ok 2 - summary test environment setup
+
+expecting success of 7421.3 'submodule summary output for initialized submodule': 
+	test_commit -C sm "add file2" file2 file2-content file2-tag &&
+	git submodule update --remote &&
+	test_tick &&
+	git commit -m "update submodule" my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
+
+	EOF
+	test_cmp expected actual
+
+[master dbd5fc8] add file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm
+   35b40f1..dbd5fc8  master     -> origin/master
+ * [new tag]         file2-tag  -> file2-tag
+Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
+[master c7068f0] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - submodule summary output for initialized submodule
+
+expecting success of 7421.4 'submodule summary output for deinitialized submodule': 
+	git submodule deinit my-subm &&
+	git submodule summary HEAD^ >actual &&
+	test_must_be_empty actual &&
+	git submodule update --init my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
+
+	EOF
+	test_cmp expected actual
+
+Cleared directory 'my-subm'
+Submodule 'my-subm' (./sm) unregistered for path 'my-subm'
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'my-subm' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm) registered for path 'my-subm'
+Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
+ok 4 - submodule summary output for deinitialized submodule
+
+expecting success of 7421.5 'submodule summary output for submodules with changed paths': 
+	git mv my-subm subm &&
+	git commit -m "change submodule path" &&
+	rev=$(git -C sm rev-parse --short HEAD^) &&
+	git submodule summary HEAD^^ -- my-subm >actual 2>err &&
+	test_must_be_empty err &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev}...0000000:
+
+	EOF
+	test_cmp expected actual
+
+[master 02e2066] change submodule path
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename my-subm => subm (100%)
+ok 5 - submodule summary output for submodules with changed paths
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7423-submodule-symlinks.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7423-submodule-symlinks/.git/
 expecting success of 7423.1 'prepare': 
@@ -470154,107 +472031,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7421-submodule-summary-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/.git/
-expecting success of 7421.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7421.2 'summary test environment setup': 
-	git init sm &&
-	test_commit -C sm "add file" file file-content file-tag &&
-
-	git submodule add ./sm my-subm &&
-	test_tick &&
-	git commit -m "add submodule"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm/.git/
-[master (root-commit) 35b40f1] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/my-subm'...
-done.
-[master (root-commit) 0d0296a] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my-subm
-ok 2 - summary test environment setup
-
-expecting success of 7421.3 'submodule summary output for initialized submodule': 
-	test_commit -C sm "add file2" file2 file2-content file2-tag &&
-	git submodule update --remote &&
-	test_tick &&
-	git commit -m "update submodule" my-subm &&
-	git submodule summary HEAD^ >actual &&
-	rev1=$(git -C sm rev-parse --short HEAD^) &&
-	rev2=$(git -C sm rev-parse --short HEAD) &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev1}...${rev2} (1):
-	  > add file2
-
-	EOF
-	test_cmp expected actual
-
-[master dbd5fc8] add file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm
-   35b40f1..dbd5fc8  master     -> origin/master
- * [new tag]         file2-tag  -> file2-tag
-Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
-[master c7068f0] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - submodule summary output for initialized submodule
-
-expecting success of 7421.4 'submodule summary output for deinitialized submodule': 
-	git submodule deinit my-subm &&
-	git submodule summary HEAD^ >actual &&
-	test_must_be_empty actual &&
-	git submodule update --init my-subm &&
-	git submodule summary HEAD^ >actual &&
-	rev1=$(git -C sm rev-parse --short HEAD^) &&
-	rev2=$(git -C sm rev-parse --short HEAD) &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev1}...${rev2} (1):
-	  > add file2
-
-	EOF
-	test_cmp expected actual
-
-Cleared directory 'my-subm'
-Submodule 'my-subm' (./sm) unregistered for path 'my-subm'
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'my-subm' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7421-submodule-summary-add/sm) registered for path 'my-subm'
-Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
-ok 4 - submodule summary output for deinitialized submodule
-
-expecting success of 7421.5 'submodule summary output for submodules with changed paths': 
-	git mv my-subm subm &&
-	git commit -m "change submodule path" &&
-	rev=$(git -C sm rev-parse --short HEAD^) &&
-	git submodule summary HEAD^^ -- my-subm >actual 2>err &&
-	test_must_be_empty err &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev}...0000000:
-
-	EOF
-	test_cmp expected actual
-
-[master 02e2066] change submodule path
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename my-subm => subm (100%)
-ok 5 - submodule summary output for submodules with changed paths
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7419-submodule-set-branch.sh ***
 expecting success of 7419.1 'setup': 
 	git config --global protocol.file.allow always
@@ -470646,6 +472422,366 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
+expecting success of 7503.1 'root commit': 
+	echo "root" >file &&
+	git add file &&
+	git commit -m "zeroth" &&
+	git checkout -b side &&
+	echo "foo" >foo &&
+	git add foo &&
+	git commit -m "make it non-ff" &&
+	git branch side-orig side &&
+	git checkout main
+
+[main (root-commit) 0e29351] zeroth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side f4a0fae] make it non-ff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to branch 'main'
+ok 1 - root commit
+
+expecting success of 7503.2 'setup conflicting branches': 
+	test_when_finished "git checkout main" &&
+	git checkout -b conflicting-a main &&
+	echo a >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-a &&
+	git checkout -b conflicting-b main &&
+	echo b >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-b
+
+Switched to a new branch 'conflicting-a'
+[conflicting-a 3f25523] conflicting-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to a new branch 'conflicting-b'
+[conflicting-b 8c264fe] conflicting-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to branch 'main'
+ok 2 - setup conflicting branches
+
+expecting success of 7503.3 'with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "foo" >file &&
+	git add file &&
+	git commit -m "first" &&
+	test_path_is_missing actual_hooks
+
+[main e0ed36d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - with no hook
+
+expecting success of 7503.4 'with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 4 - with no hook (merge)
+
+expecting success of 7503.5 '--no-verify with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "bar" >file &&
+	git add file &&
+	git commit --no-verify -m "bar" &&
+	test_path_is_missing actual_hooks
+
+[main 9b1e6a8] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - --no-verify with no hook
+
+expecting success of 7503.6 '--no-verify with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 6 - --no-verify with no hook (merge)
+
+expecting success of 7503.7 'with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m "more" &&
+	test_cmp expected_hooks actual_hooks
+
+[main 7901543] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 7 - with succeeding hook
+
+expecting success of 7503.8 'with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 8 - with succeeding hook (merge)
+
+expecting success of 7503.9 'automatic merge fails; both hooks are available': 
+	setup_success_hook "pre-commit" &&
+	setup_success_hook "pre-merge-commit" &&
+
+	git checkout conflicting-a &&
+	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+	test_path_is_missing actual_hooks &&
+
+	echo "pre-commit" >expected_hooks &&
+	echo a+b >conflicting &&
+	git add conflicting &&
+	git commit -m "resolve conflict" &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'conflicting-a'
+Auto-merging conflicting
+CONFLICT (add/add): Merge conflict in conflicting
+Automatic merge failed; fix conflicts and then commit the result.
+[conflicting-a ff0069b] resolve conflict
+ Author: A U Thor <author@example.com>
+ok 9 - automatic merge fails; both hooks are available
+
+expecting success of 7503.10 '--no-verify with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "even more" >>file &&
+	git add file &&
+	git commit --no-verify -m "even more" &&
+	test_path_is_missing actual_hooks
+
+[conflicting-a 79fc96c] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - --no-verify with succeeding hook
+
+expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 11 - --no-verify with succeeding hook (merge)
+
+expecting success of 7503.12 'with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	test_when_finished "rm -f expected_hooks" &&
+	echo "pre-commit-failing-hook" >expected_hooks &&
+
+	echo "another" >>file &&
+	git add file &&
+	test_must_fail git commit -m "another" &&
+	test_cmp expected_hooks actual_hooks
+
+ok 12 - with failing hook
+
+expecting success of 7503.13 '--no-verify with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	echo "stuff" >>file &&
+	git add file &&
+	git commit --no-verify -m "stuff" &&
+	test_path_is_missing actual_hooks
+
+[main 9073eff] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 13 - --no-verify with failing hook
+
+expecting success of 7503.14 'with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+	echo "pre-merge-commit-failing-hook" >expected_hooks &&
+	git checkout side &&
+	test_must_fail git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Not committing merge; use 'git commit' to complete the merge.
+Switched to branch 'main'
+ok 14 - with failing hook (merge)
+
+expecting success of 7503.15 '--no-verify with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 15 - --no-verify with failing hook (merge)
+
+expecting success of 7503.16 'with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "content" >>file &&
+	git add file &&
+	git commit -m "content" &&
+	test_path_is_missing actual_hooks
+
+hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config set advice.ignoredHook false`.
+[main be1df3a] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 16 - with non-executable hook
+
+expecting success of 7503.17 '--no-verify with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "more content" >>file &&
+	git add file &&
+	git commit --no-verify -m "more content" &&
+	test_path_is_missing actual_hooks
+
+[main dd373ff] more content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 17 - --no-verify with non-executable hook
+
+expecting success of 7503.18 'with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 18 - with non-executable hook (merge)
+
+expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 19 - --no-verify with non-executable hook (merge)
+
+expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks success" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir success &&
+	(
+		cd success &&
+		git commit -m "hook requires GIT_PREFIX = success/"
+	) &&
+	test_cmp expected_hooks actual_hooks
+
+[main 91e0a75] hook requires GIT_PREFIX = success/
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 20 - with hook requiring GIT_PREFIX
+
+expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks fail" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir fail &&
+	(
+		cd fail &&
+		test_must_fail git commit -m "hook must fail"
+	) &&
+	git checkout -- file &&
+	test_cmp expected_hooks actual_hooks
+
+ok 21 - with failing hook requiring GIT_PREFIX
+
+expecting success of 7503.22 'check the author in hook': 
+	setup_require_author_hook &&
+	cat >expected_hooks <<-EOF &&
+	check-author
+	check-author
+	check-author
+	EOF
+	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+	(
+		GIT_AUTHOR_NAME="New Author" &&
+		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+		git commit --allow-empty -m "by new.author via env" &&
+		git show -s
+	) &&
+	git commit --author="New Author <newauthor@example.com>" \
+		--allow-empty -m "by new.author via command line" &&
+	git show -s &&
+	test_cmp expected_hooks actual_hooks
+
+[main 1b3a79e] by new.author via env
+ Author: New Author <newauthor@example.com>
+ 1 file changed, 1 insertion(+)
+commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via env
+[main 155e737] by new.author via command line
+ Author: New Author <newauthor@example.com>
+commit 155e73716852370372b22eca0576dacb5016aa2e
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via command line
+ok 22 - check the author in hook
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7450-bad-git-dotfiles.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/.git/
 expecting success of 7450.1 'setup': 
@@ -470902,13 +473038,13 @@
  create mode 100644 .gitmodules
 169+0 records in
 169+0 records out
-169 bytes copied, 0.00015292 s, 1.1 MB/s
+169 bytes copied, 0.000148041 s, 1.1 MB/s
 50+0 records in
 50+0 records out
-50 bytes copied, 7.048e-05 s, 709 kB/s
+50 bytes copied, 6.2521e-05 s, 800 kB/s
 128+0 records in
 128+0 records out
-128 bytes copied, 0.00012528 s, 1.0 MB/s
+128 bytes copied, 0.000121721 s, 1.1 MB/s
 ok 12 - create oddly ordered pack
 
 expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
@@ -471561,15 +473697,15 @@
 Submodule 'hippo' (.) registered for path 'thing1'
 Submodule 'hippo/hooks' (.) registered for path 'thing2'
 Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
-done.
-error: submodule git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
-fatal: refusing to create/use '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' in another submodule's git dir
-Failed to clone 'thing2'. Retry scheduled
-error: submodule git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
-fatal: refusing to create/use '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' in another submodule's git dir
-Failed to clone 'thing2' a second time, aborting
-error: submodule git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
-error: submodule git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo already exists
+fatal: clone of '.' into submodule path '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1' failed
+Failed to clone 'thing1'. Retry scheduled
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2'...
+done.
+fatal: not a git repository: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1/../.git/modules/hippo
+Failed to clone 'thing1' a second time, aborting
+fatal: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo already exists
+fatal: not a git repository: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1/../.git/modules/hippo
 ok 48 - submodule git dir nesting detection must work with parallel cloning
 
 expecting success of 7450.49 'checkout -f --recurse-submodules must not use a nested gitdir': 
@@ -473556,573 +475692,1161 @@
 
 	git reset --hard &&
 	test_tick &&
-	git commit --allow-empty -m "old commit" &&
-	old=$(git rev-parse --verify HEAD) &&
+	git commit --allow-empty -m "old commit" &&
+	old=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty -m "new commit" &&
+	new=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty --amend -C "$old" &&
+	git show --pretty="format:%ad %s" "$old" >expected &&
+	git show --pretty="format:%ad %s" HEAD >actual &&
+	test_cmp expected actual
+
+
+HEAD is now at 44c65f1 empty really ok
+[main 7a687e6] old commit
+ Author: A U Thor <author@example.com>
+[main e73fb50] new commit
+ Author: A U Thor <author@example.com>
+[main e29d4f8] old commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ok 71 - amend using the message from another commit
+
+expecting success of 7501.72 'amend using the message from a commit named with tag': 
+
+	git reset --hard &&
+	test_tick &&
+	git commit --allow-empty -m "old commit" &&
+	old=$(git rev-parse --verify HEAD) &&
+	git tag -a -m "tag on old" tagged-old HEAD &&
+	test_tick &&
+	git commit --allow-empty -m "new commit" &&
+	new=$(git rev-parse --verify HEAD) &&
+	test_tick &&
+	git commit --allow-empty --amend -C tagged-old &&
+	git show --pretty="format:%ad %s" "$old" >expected &&
+	git show --pretty="format:%ad %s" HEAD >actual &&
+	test_cmp expected actual
+
+
+HEAD is now at e29d4f8 old commit
+[main a5814b1] old commit
+ Author: A U Thor <author@example.com>
+[main 18cb5ca] new commit
+ Author: A U Thor <author@example.com>
+[main 8a9a45e] old commit
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ok 72 - amend using the message from a commit named with tag
+
+expecting success of 7501.73 'amend can copy notes': 
+
+	git config notes.rewrite.amend true &&
+	git config notes.rewriteRef "refs/notes/*" &&
+	test_commit foo &&
+	git notes add -m"a note" &&
+	test_tick &&
+	git commit --amend -m"new foo" &&
+	test "$(git notes show)" = "a note"
+
+
+[main 2767bb7] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[main 96004d0] new foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:25:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 73 - amend can copy notes
+
+expecting success of 7501.74 'commit a file whose name is a dash': 
+	git reset --hard &&
+	test_write_lines 1 2 3 4 5 >./- &&
+	git add ./- &&
+	test_tick &&
+	git commit -m "add dash" >output </dev/null &&
+	test_grep " changed, 5 insertions" output
+
+HEAD is now at 96004d0 new foo
+ 1 file changed, 5 insertions(+)
+ok 74 - commit a file whose name is a dash
+
+expecting success of 7501.75 '--only works on to-be-born branch': 
+	# This test relies on having something in the index, as it
+	# would not otherwise actually prove much.  So check this.
+	test -n "$(git ls-files)" &&
+	git checkout --orphan orphan &&
+	echo foo >newfile &&
+	git add newfile &&
+	git commit --only newfile -m"--only on unborn branch" &&
+	echo newfile >expected &&
+	git ls-tree -r --name-only HEAD >actual &&
+	test_cmp expected actual
+
+Switched to a new branch 'orphan'
+[orphan (root-commit) 9d2da19] --only on unborn branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 newfile
+ok 75 - --only works on to-be-born branch
+
+expecting success of 7501.76 '--dry-run with conflicts fixed from a merge': 
+	# setup two branches with conflicting information
+	# in the same file, resolve the conflict,
+	# call commit with --dry-run
+	echo "Initial contents, unimportant" >test-file &&
+	git add test-file &&
+	git commit -m "Initial commit" &&
+	echo "commit-1-state" >test-file &&
+	git commit -m "commit 1" -i test-file &&
+	git tag commit-1 &&
+	git checkout -b branch-2 HEAD^1 &&
+	echo "commit-2-state" >test-file &&
+	git commit -m "commit 2" -i test-file &&
+	test_must_fail git merge --no-commit commit-1 &&
+	echo "commit-2-state" >test-file &&
+	git add test-file &&
+	git commit --dry-run &&
+	git commit -m "conflicts fixed from merge."
+
+[orphan adcd2ff] Initial commit
+ Author: A U Thor <author@example.com>
+ 8 files changed, 15 insertions(+)
+ create mode 100644 -
+ create mode 100644 baz
+ create mode 100644 elif
+ create mode 100644 file
+ create mode 100644 foo.t
+ create mode 100644 negative
+ create mode 100644 positive
+ create mode 100644 test-file
+[orphan d0112e6] commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch-2'
+[branch-2 395e7f6] commit 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging test-file
+CONFLICT (content): Merge conflict in test-file
+Automatic merge failed; fix conflicts and then commit the result.
+On branch branch-2
+All conflicts fixed but you are still merging.
+  (use "git commit" to conclude merge)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.msg
+	commit
+	current
+	diff
+	diff1
+	diff2
+	editor
+	err
+	expect
+	expect.msg
+	expected
+	file.actual
+	file.expect
+	ident
+	msg
+	out
+	output
+	remaining
+	replace
+	stat
+	subject
+
+[branch-2 ff9dcf0] conflicts fixed from merge.
+ Author: A U Thor <author@example.com>
+ok 76 - --dry-run with conflicts fixed from a merge
+
+expecting success of 7501.77 '--dry-run --short': 
+	>test-file &&
+	git add test-file &&
+	git commit --dry-run --short
+
+M  test-file
+?? actual
+?? actual.msg
+?? commit
+?? current
+?? diff
+?? diff1
+?? diff2
+?? editor
+?? err
+?? expect
+?? expect.msg
+?? expected
+?? file.actual
+?? file.expect
+?? ident
+?? msg
+?? out
+?? output
+?? remaining
+?? replace
+?? stat
+?? subject
+ok 77 - --dry-run --short
+
+# passed all 77 test(s)
+1..77
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7003-filter-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/.git/
+expecting success of 7003.1 'setup': 
+	test_commit A &&
+	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
+	test_commit --notick B &&
+	git checkout -b branch B &&
+	test_commit D &&
+	mkdir dir &&
+	test_commit dir/D &&
+	test_commit E &&
+	git checkout main &&
+	test_commit C &&
+	git checkout branch &&
+	git merge C &&
+	git tag F &&
+	test_commit G &&
+	test_commit H
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main e86e545] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'branch'
+[branch bd662c1] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch 3abb9b5] dir/D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/D.t
+[branch 48ac83b] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'main'
+[main 0e63577] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'branch'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch 3c39262] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[branch 110eac9] H
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+ok 1 - setup
+
+expecting success of 7003.2 'rewrite identically': 
+	git filter-branch branch
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/branch' is unchanged
+ok 2 - rewrite identically
+
+expecting success of 7003.3 'result is really identical': 
+	test $H = $(git rev-parse HEAD)
+
+ok 3 - result is really identical
+
+expecting success of 7003.4 'rewrite bare repository identically': 
+	(git config core.bare true && cd .git &&
+	 git filter-branch branch > filter-output 2>&1 &&
+	! grep fatal filter-output)
+
+ok 4 - rewrite bare repository identically
+
+expecting success of 7003.5 'result is really identical': 
+	test $H = $(git rev-parse HEAD)
+
+ok 5 - result is really identical
+
+expecting success of 7003.6 'correct GIT_DIR while using -d': 
+	mkdir drepo &&
+	( cd drepo &&
+	git init &&
+	test_commit drepo &&
+	git filter-branch -d "$TRASHDIR/dfoo" \
+		--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
+	) &&
+	grep drepo "$TRASHDIR/backup-refs"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/drepo/.git/
+[main (root-commit) 9f96758] drepo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 drepo.t
+
Rewrite 9f9675864b1443cf5a1e281c740a8ba331951fba (1/1) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+9f9675864b1443cf5a1e281c740a8ba331951fba commit	refs/tags/drepo
+ok 6 - correct GIT_DIR while using -d
+
+expecting success of 7003.7 'tree-filter works with -d': 
+	git init drepo-tree &&
+	(
+		cd drepo-tree &&
+		test_commit one &&
+		git filter-branch -d "$TRASHDIR/dfoo" \
+			--tree-filter "echo changed >one.t" &&
+		echo changed >expect &&
+		git cat-file blob HEAD:one.t >actual &&
+		test_cmp expect actual &&
+		test_cmp one.t actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/drepo-tree/.git/
+[main (root-commit) d944c64] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+
Rewrite d944c643197c4e8b1e89974e6d9ba85df421b65d (1/1) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 7 - tree-filter works with -d
+
+expecting success of 7003.8 'Fail if commit filter fails': 
+	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    could not write rewritten commit
+ok 8 - Fail if commit filter fails
+
+expecting success of 7003.9 'rewrite, renaming a specific file': 
+	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    mv: cannot stat 'D.t': No such file or directory
+
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 9 - rewrite, renaming a specific file
+
+expecting success of 7003.10 'test that the file was renamed': 
+	test D = "$(git show HEAD:doh --)" &&
+	! test -f D.t &&
+	test -f doh &&
+	test D = "$(cat doh)"
+
+ok 10 - test that the file was renamed
+
+expecting success of 7003.11 'rewrite, renaming a specific directory': 
+	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (2 seconds passed, remaining 1 predicted)    mv: cannot stat 'dir': No such file or directory
+
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (8/9) (2 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (8/9) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 11 - rewrite, renaming a specific directory
+
+expecting success of 7003.12 'test that the directory was renamed': 
+	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
+	! test -d dir &&
+	test -d diroh &&
+	! test -d diroh/dir &&
+	test -f diroh/D.t &&
+	test dir/D = "$(cat diroh/D.t)"
+
+ok 12 - test that the directory was renamed
+
+expecting success of 7003.13 'populate --state-branch': 
+	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
+
+Branch state does not exist. Will create
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (3 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (8/9) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+Saving rewrite state to state
+ok 13 - populate --state-branch
+
+expecting success of 7003.14 'using --state-branch to skip already rewritten commits': 
+	test_when_finished git reset --hard $V &&
+	git reset --hard $V &&
+	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD &&
+	test_cmp_rev $W HEAD
+
+HEAD is now at 8a3423e H
+Populating map from state (62b9c9fa908324bba33ac79ad962e765fd9a3958)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+Saving rewrite state to state
+HEAD is now at 8a3423e H
+ok 14 - using --state-branch to skip already rewritten commits
+
+expecting success of 7003.15 'rewrite one branch, keeping a side branch': 
+	git branch modD oldD &&
+	git filter-branch -f --tree-filter "mv B.t boh || :" D..modD
+
+
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/modD' was rewritten
+ok 15 - rewrite one branch, keeping a side branch
+
+expecting success of 7003.16 'common ancestor is still common (unchanged)': 
+	test "$(git merge-base modD D)" = "$(git rev-parse B)"
+
+ok 16 - common ancestor is still common (unchanged)
+
+expecting success of 7003.17 'filter subdirectory only': 
+	mkdir subdir &&
+	touch subdir/new &&
+	git add subdir/new &&
+	test_tick &&
+	git commit -m "subdir" &&
+	echo H > A.t &&
+	test_tick &&
+	git commit -m "not subdir" A.t &&
+	echo A > subdir/new &&
+	test_tick &&
+	git commit -m "again subdir" subdir/new &&
+	git rm A.t &&
+	test_tick &&
+	git commit -m "again not subdir" &&
+	git branch sub &&
+	git branch sub-earlier HEAD~2 &&
+	git filter-branch -f --subdirectory-filter subdir \
+		refs/heads/sub refs/heads/sub-earlier
+
+[branch bb8f80d] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 subdir/new
+[branch 5bae69c] not subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[branch 140072e] again subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+rm 'A.t'
+[branch ead226b] again not subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A.t
+
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/sub' was rewritten
+Ref 'refs/heads/sub-earlier' was rewritten
+ok 17 - filter subdirectory only
+
+expecting success of 7003.18 'subdirectory filter result looks okay': 
+	test 2 = $(git rev-list sub | wc -l) &&
+	git show sub:new &&
+	test_must_fail git show sub:subdir &&
+	git show sub-earlier:new &&
+	test_must_fail git show sub-earlier:subdir
+
+A
+fatal: path 'subdir' exists on disk, but not in 'sub'
+fatal: path 'subdir' exists on disk, but not in 'sub-earlier'
+ok 18 - subdirectory filter result looks okay
+
+expecting success of 7003.19 'more setup': 
+	git checkout main &&
+	mkdir subdir &&
+	echo A > subdir/new &&
+	git add subdir/new &&
+	test_tick &&
+	git commit -m "subdir on main" subdir/new &&
+	git rm A.t &&
+	test_tick &&
+	git commit -m "again subdir on main" &&
+	git merge branch
+
+Switched to branch 'main'
+[main cb42fbf] subdir on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/new
+rm 'A.t'
+[main a1f80b9] again subdir on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 A.t
+Merge made by the 'ort' strategy.
+ E.t       | 1 +
+ G.t       | 1 +
+ H.t       | 1 +
+ diroh/D.t | 1 +
+ doh       | 1 +
+ 5 files changed, 5 insertions(+)
+ create mode 100644 E.t
+ create mode 100644 G.t
+ create mode 100644 H.t
+ create mode 100644 diroh/D.t
+ create mode 100644 doh
+ok 19 - more setup
+
+expecting success of 7003.20 'use index-filter to move into a subdirectory': 
+	git branch directorymoved &&
+	git filter-branch -f --index-filter \
+		 "git ls-files -s | sed \"s-	-&newsubdir/-\" |
+	          GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
+			git update-index --index-info &&
+		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
+	git diff --exit-code HEAD directorymoved:newsubdir
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/16) (4 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/16) (4 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/directorymoved' was rewritten
+ok 20 - use index-filter to move into a subdirectory
+
+expecting success of 7003.21 'stops when msg filter fails': 
+	old=$(git rev-parse HEAD) &&
+	test_must_fail git filter-branch -f --msg-filter false HEAD &&
+	test $old = $(git rev-parse HEAD) &&
+	rm -rf .git-rewrite
+
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    msg filter failed: false
+ok 21 - stops when msg filter fails
+
+expecting success of 7003.22 'author information is preserved': 
+	: > i &&
+	git add i &&
+	test_tick &&
+	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
+	git branch preserved-author &&
+	(sane_unset GIT_AUTHOR_NAME &&
+	 git filter-branch -f --msg-filter "cat; \
+			test \$GIT_COMMIT != $(git rev-parse main) || \
+			echo Hallo" \
+		preserved-author) &&
+	git rev-list --author="B V Uips" preserved-author >actual &&
+	test_line_count = 1 actual
+
+[main 7da14ef] bvuips
+ Author: B V Uips <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 i
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/17) (1 seconds passed, remaining 4 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (7/17) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/17) (3 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/17) (3 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/17) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/preserved-author' was rewritten
+ok 22 - author information is preserved
+
+expecting success of 7003.23 'remove a certain author's commits': 
+	echo i > i &&
+	test_tick &&
+	git commit -m i i &&
+	git branch removed-author &&
+	git filter-branch -f --commit-filter "\
+		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
+		then\
+			skip_commit \"\$@\";
+		else\
+			git commit-tree \"\$@\";\
+		fi" removed-author &&
+	cnt1=$(git rev-list main | wc -l) &&
+	cnt2=$(git rev-list removed-author | wc -l) &&
+	test $cnt1 -eq $(($cnt2 + 1)) &&
+	git rev-list --author="B V Uips" removed-author >actual &&
+	test_line_count = 0 actual
+
+[main 0261af1] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/18) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/18) (2 seconds passed, remaining 2 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (14/18) (3 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (14/18) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/removed-author' was rewritten
+ok 23 - remove a certain author's commits
+
+expecting success of 7003.24 'barf on invalid name': 
+	test_must_fail git filter-branch -f main xy-problem &&
+	test_must_fail git filter-branch -f HEAD^
+
+fatal: ambiguous argument 'xy-problem': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+You must specify a ref to rewrite.
+ok 24 - barf on invalid name
+
+expecting success of 7003.25 '"map" works in commit filter': 
+	git filter-branch -f --commit-filter "\
+		parent=\$(git rev-parse \$GIT_COMMIT^) &&
+		mapped=\$(map \$parent) &&
+		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
+		test \$mapped = \$actual &&
+		git commit-tree \"\$@\";" main~2..main &&
+	git rev-parse --verify main
+
+
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+0261af146239dd954a19d76ae2a417dd3af8b791
+ok 25 - "map" works in commit filter
+
+expecting success of 7003.26 'Name needing quotes': 
+
+	git checkout -b rerere A &&
+	mkdir foo &&
+	name="れれれ" &&
+	>foo/$name &&
+	git add foo &&
+	git commit -m "Adding a file" &&
+	git filter-branch --tree-filter "rm -fr foo" &&
+	test_must_fail git ls-files --error-unmatch "foo/$name" &&
+	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
+
+
+Switched to a new branch 'rerere'
+[rerere 1d45e88] Adding a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "foo/\343\202\214\343\202\214\343\202\214"
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (1 seconds passed, remaining 1 predicted)    
Rewrite 1d45e8854f1dd5452938be2dedb173087134c05c (1/2) (1 seconds passed, remaining 1 predicted)    
+Ref 'refs/heads/rerere' was rewritten
+error: pathspec 'foo/れれれ' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 26 - Name needing quotes
+
+expecting success of 7003.27 'Subdirectory filter with disappearing trees': 
+	git reset --hard &&
+	git checkout main &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
+	test_tick &&
+	git commit -m "Adding foo" &&
+
+	git rm -r foo &&
 	test_tick &&
-	git commit --allow-empty -m "new commit" &&
-	new=$(git rev-parse --verify HEAD) &&
+	git commit -m "Removing foo" &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
 	test_tick &&
-	git commit --allow-empty --amend -C "$old" &&
-	git show --pretty="format:%ad %s" "$old" >expected &&
-	git show --pretty="format:%ad %s" HEAD >actual &&
-	test_cmp expected actual
+	git commit -m "Re-adding foo" &&
 
+	git filter-branch -f --subdirectory-filter foo &&
+	git rev-list main >actual &&
+	test_line_count = 3 actual
 
-HEAD is now at 44c65f1 empty really ok
-[main 7a687e6] old commit
+HEAD is now at 643bd56 Adding a file
+Switched to branch 'main'
+[main f7eadb2] Adding foo
  Author: A U Thor <author@example.com>
-[main e73fb50] new commit
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+rm 'foo/bar'
+[main ee48524] Removing foo
  Author: A U Thor <author@example.com>
-[main e29d4f8] old commit
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 foo/bar
+[main 14fe8c6] Re-adding foo
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
-ok 71 - amend using the message from another commit
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 27 - Subdirectory filter with disappearing trees
 
-expecting success of 7501.72 'amend using the message from a commit named with tag': 
+expecting success of 7003.28 'Tag name filtering retains tag message': 
+	git tag -m atag T &&
+	git cat-file tag T > expect &&
+	git filter-branch -f --tag-name-filter cat &&
+	git cat-file tag T > actual &&
+	test_cmp expect actual
 
-	git reset --hard &&
-	test_tick &&
-	git commit --allow-empty -m "old commit" &&
-	old=$(git rev-parse --verify HEAD) &&
-	git tag -a -m "tag on old" tagged-old HEAD &&
-	test_tick &&
-	git commit --allow-empty -m "new commit" &&
-	new=$(git rev-parse --verify HEAD) &&
-	test_tick &&
-	git commit --allow-empty --amend -C tagged-old &&
-	git show --pretty="format:%ad %s" "$old" >expected &&
-	git show --pretty="format:%ad %s" HEAD >actual &&
-	test_cmp expected actual
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 28 - Tag name filtering retains tag message
 
+expecting success of 7003.29 'Tag name filtering strips gpg signature': 
+	sha1=$(git rev-parse HEAD) &&
+	sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
+	git update-ref "refs/tags/S" "$sha1t" &&
+	echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
+	git filter-branch -f --tag-name-filter cat &&
+	git cat-file tag S > actual &&
+	test_cmp expect actual
 
-HEAD is now at e29d4f8 old commit
-[main a5814b1] old commit
- Author: A U Thor <author@example.com>
-[main 18cb5ca] new commit
- Author: A U Thor <author@example.com>
-[main 8a9a45e] old commit
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
-ok 72 - amend using the message from a commit named with tag
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+S -> S (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+gpg signature stripped from tag object 5e10caf7d74c3ace8930aa1d5449d4d0ceb2e9e0
+T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 29 - Tag name filtering strips gpg signature
 
-expecting success of 7501.73 'amend can copy notes': 
+checking prerequisite: GPG
 
-	git config notes.rewrite.amend true &&
-	git config notes.rewriteRef "refs/notes/*" &&
-	test_commit foo &&
-	git notes add -m"a note" &&
-	test_tick &&
-	git commit --amend -m"new foo" &&
-	test "$(git notes show)" = "a note"
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
 
-[main 2767bb7] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main 96004d0] new foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:25:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 73 - amend can copy notes
+)
+prerequisite GPG not satisfied
+ok 30 # skip Filtering retains message of gpg signed commit (missing GPG)
 
-expecting success of 7501.74 'commit a file whose name is a dash': 
-	git reset --hard &&
-	test_write_lines 1 2 3 4 5 >./- &&
-	git add ./- &&
-	test_tick &&
-	git commit -m "add dash" >output </dev/null &&
-	test_grep " changed, 5 insertions" output
+expecting success of 7003.31 'Tag name filtering allows slashes in tag names': 
+	git tag -m tag-with-slash X/1 &&
+	git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
+	git filter-branch -f --tag-name-filter "echo X/2" &&
+	git cat-file tag X/2 > actual &&
+	test_cmp expect actual
 
-HEAD is now at 96004d0 new foo
- 1 file changed, 5 insertions(+)
-ok 74 - commit a file whose name is a dash
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (1 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (2/3) (1 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+S -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+T -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+X/1 -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 31 - Tag name filtering allows slashes in tag names
 
-expecting success of 7501.75 '--only works on to-be-born branch': 
-	# This test relies on having something in the index, as it
-	# would not otherwise actually prove much.  So check this.
-	test -n "$(git ls-files)" &&
-	git checkout --orphan orphan &&
-	echo foo >newfile &&
-	git add newfile &&
-	git commit --only newfile -m"--only on unborn branch" &&
-	echo newfile >expected &&
-	git ls-tree -r --name-only HEAD >actual &&
-	test_cmp expected actual
+expecting success of 7003.32 'setup --prune-empty comparisons': 
+	git checkout --orphan main-no-a &&
+	git rm -rf . &&
+	unset test_tick &&
+	test_tick &&
+	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
+	test_commit --notick B B.t B Bx &&
+	git checkout -b branch-no-a Bx &&
+	test_commit D D.t D Dx &&
+	mkdir dir &&
+	test_commit dir/D dir/D.t dir/D dir/Dx &&
+	test_commit E E.t E Ex &&
+	git checkout main-no-a &&
+	test_commit C C.t C Cx &&
+	git checkout branch-no-a &&
+	git merge Cx -m "Merge tag 'C' into branch" &&
+	git tag Fx &&
+	test_commit G G.t G Gx &&
+	test_commit H H.t H Hx &&
+	git checkout branch
 
-Switched to a new branch 'orphan'
-[orphan (root-commit) 9d2da19] --only on unborn branch
+Switched to a new branch 'main-no-a'
+rm 'bar'
+[main-no-a (root-commit) 8d95d31] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 newfile
-ok 75 - --only works on to-be-born branch
-
-expecting success of 7501.76 '--dry-run with conflicts fixed from a merge': 
-	# setup two branches with conflicting information
-	# in the same file, resolve the conflict,
-	# call commit with --dry-run
-	echo "Initial contents, unimportant" >test-file &&
-	git add test-file &&
-	git commit -m "Initial commit" &&
-	echo "commit-1-state" >test-file &&
-	git commit -m "commit 1" -i test-file &&
-	git tag commit-1 &&
-	git checkout -b branch-2 HEAD^1 &&
-	echo "commit-2-state" >test-file &&
-	git commit -m "commit 2" -i test-file &&
-	test_must_fail git merge --no-commit commit-1 &&
-	echo "commit-2-state" >test-file &&
-	git add test-file &&
-	git commit --dry-run &&
-	git commit -m "conflicts fixed from merge."
-
-[orphan adcd2ff] Initial commit
+ create mode 100644 B.t
+Switched to a new branch 'branch-no-a'
+[branch-no-a 2d0b6b2] D
  Author: A U Thor <author@example.com>
- 8 files changed, 15 insertions(+)
- create mode 100644 -
- create mode 100644 baz
- create mode 100644 elif
- create mode 100644 file
- create mode 100644 foo.t
- create mode 100644 negative
- create mode 100644 positive
- create mode 100644 test-file
-[orphan d0112e6] commit 1
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[branch-no-a 6b73242] dir/D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch-2'
-[branch-2 395e7f6] commit 2
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/D.t
+[branch-no-a 6e45985] E
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging test-file
-CONFLICT (content): Merge conflict in test-file
-Automatic merge failed; fix conflicts and then commit the result.
-On branch branch-2
-All conflicts fixed but you are still merging.
-  (use "git commit" to conclude merge)
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.msg
-	commit
-	current
-	diff
-	diff1
-	diff2
-	editor
-	err
-	expect
-	expect.msg
-	expected
-	file.actual
-	file.expect
-	ident
-	msg
-	out
-	output
-	remaining
-	replace
-	stat
-	subject
-
-[branch-2 ff9dcf0] conflicts fixed from merge.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'main-no-a'
+[main-no-a 5a68040] C
  Author: A U Thor <author@example.com>
-ok 76 - --dry-run with conflicts fixed from a merge
-
-expecting success of 7501.77 '--dry-run --short': 
-	>test-file &&
-	git add test-file &&
-	git commit --dry-run --short
-
-M  test-file
-?? actual
-?? actual.msg
-?? commit
-?? current
-?? diff
-?? diff1
-?? diff2
-?? editor
-?? err
-?? expect
-?? expect.msg
-?? expected
-?? file.actual
-?? file.expect
-?? ident
-?? msg
-?? out
-?? output
-?? remaining
-?? replace
-?? stat
-?? subject
-ok 77 - --dry-run --short
-
-# passed all 77 test(s)
-1..77
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
-expecting success of 7503.1 'root commit': 
-	echo "root" >file &&
-	git add file &&
-	git commit -m "zeroth" &&
-	git checkout -b side &&
-	echo "foo" >foo &&
-	git add foo &&
-	git commit -m "make it non-ff" &&
-	git branch side-orig side &&
-	git checkout main
-
-[main (root-commit) 0e29351] zeroth
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'branch-no-a'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[branch-no-a f0368e4] G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'side'
-[side f4a0fae] make it non-ff
+ create mode 100644 G.t
+[branch-no-a 00fc75b] H
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to branch 'main'
-ok 1 - root commit
+ create mode 100644 H.t
+Switched to branch 'branch'
+ok 32 - setup --prune-empty comparisons
 
-expecting success of 7503.2 'setup conflicting branches': 
-	test_when_finished "git checkout main" &&
-	git checkout -b conflicting-a main &&
-	echo a >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-a &&
-	git checkout -b conflicting-b main &&
-	echo b >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-b
+expecting success of 7003.33 'Prune empty commits': 
+	git rev-list HEAD > expect &&
+	test_commit to_remove &&
+	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
+	git rev-list HEAD > actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'conflicting-a'
-[conflicting-a 3f25523] conflicting-a
+[branch 219a992] to_remove
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to a new branch 'conflicting-b'
-[conflicting-b 8c264fe] conflicting-b
+ create mode 100644 to_remove.t
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/14) (1 seconds passed, remaining 6 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (3 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (11/14) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 33 - Prune empty commits
+
+expecting success of 7003.34 'prune empty collapsed merges': 
+	test_config merge.ff false &&
+	git rev-list HEAD >expect &&
+	test_commit to_remove_2 &&
+	git reset --hard HEAD^ &&
+	test_merge non-ff to_remove_2 &&
+	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
+
+[branch cb86908] to_remove_2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 conflicting
-Switched to branch 'main'
-ok 2 - setup conflicting branches
+ create mode 100644 to_remove_2.t
+HEAD is now at ead226b again not subdir
+Merge made by the 'ort' strategy.
+ to_remove_2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove_2.t
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (1 seconds passed, remaining 14 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (1/15) (1 seconds passed, remaining 14 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (1 seconds passed, remaining 4 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (3/15) (1 seconds passed, remaining 4 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (3/15) (1 seconds passed, remaining 4 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/15) (1 seconds passed, remaining 4 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/15) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/15) (2 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/15) (2 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (11/15) (3 seconds passed, remaining 1 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (15/15) (4 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 34 - prune empty collapsed merges
 
-expecting success of 7503.3 'with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "foo" >file &&
-	git add file &&
-	git commit -m "first" &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.35 'prune empty works even without index/tree filters': 
+	git rev-list HEAD >expect &&
+	git commit --allow-empty -m empty &&
+	git filter-branch -f --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
 
-[main e0ed36d] first
+[branch 5b6cb84] empty
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - with no hook
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/14) (2 seconds passed, remaining 1 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 35 - prune empty works even without index/tree filters
 
-expecting success of 7503.4 'with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.36 '--prune-empty is able to prune root commit': 
+	git rev-list branch-no-a >expect &&
+	git branch testing H &&
+	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
+	git rev-list testing >actual &&
+	git branch -D testing &&
+	test_cmp expect actual
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 4 - with no hook (merge)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (2 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (7/9) (2 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (7/9) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/testing' was rewritten
+Deleted branch testing (was 00fc75b).
+ok 36 - --prune-empty is able to prune root commit
 
-expecting success of 7503.5 '--no-verify with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "bar" >file &&
-	git add file &&
-	git commit --no-verify -m "bar" &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.37 '--prune-empty is able to prune entire branch': 
+	git branch prune-entire B &&
+	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
+	test_must_fail git rev-parse refs/heads/prune-entire &&
+	test_must_fail git reflog exists refs/heads/prune-entire
 
-[main 9b1e6a8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - --no-verify with no hook
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/prune-entire' was deleted
+fatal: ambiguous argument 'refs/heads/prune-entire': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/heads/prune-entire
+ok 37 - --prune-empty is able to prune entire branch
 
-expecting success of 7503.6 '--no-verify with no hook (merge)': 
-	test_when_finished "rm -f actual_hooks" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
+expecting success of 7003.38 '--remap-to-ancestor with filename filters': 
 	git checkout main &&
-	test_path_is_missing actual_hooks
+	git reset --hard A &&
+	test_commit add-foo foo 1 &&
+	git branch moved-foo &&
+	test_commit add-bar bar a &&
+	git branch invariant &&
+	orig_invariant=$(git rev-parse invariant) &&
+	git branch moved-bar &&
+	test_commit change-foo foo 2 &&
+	git filter-branch -f --remap-to-ancestor \
+		moved-foo moved-bar A..main \
+		-- -- foo &&
+	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
+	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
+	test $orig_invariant = $(git rev-parse invariant)
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'main'
-ok 6 - --no-verify with no hook (merge)
-
-expecting success of 7503.7 'with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "more" >>file &&
-	git add file &&
-	git commit -m "more" &&
-	test_cmp expected_hooks actual_hooks
-
-[main 7901543] more
+HEAD is now at 0ddfaf1 A
+[main 7d21991] add-foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 7 - with succeeding hook
+ create mode 100644 foo
+[main 2ff770b] add-bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main b2d4813] change-foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (1 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/moved-foo' is unchanged
+Ref 'refs/heads/moved-bar' was rewritten
+Ref 'refs/heads/main' was rewritten
+ok 38 - --remap-to-ancestor with filename filters
 
-expecting success of 7503.8 'with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git checkout side &&
-	git merge -m "merge main" main &&
+expecting success of 7003.39 'automatic remapping to ancestor with filename filters': 
 	git checkout main &&
-	test_cmp expected_hooks actual_hooks
+	git reset --hard A &&
+	test_commit add-foo2 foo 1 &&
+	git branch moved-foo2 &&
+	test_commit add-bar2 bar a &&
+	git branch invariant2 &&
+	orig_invariant=$(git rev-parse invariant2) &&
+	git branch moved-bar2 &&
+	test_commit change-foo2 foo 2 &&
+	git filter-branch -f \
+		moved-foo2 moved-bar2 A..main \
+		-- -- foo &&
+	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
+	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
+	test $orig_invariant = $(git rev-parse invariant2)
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 1 +
+Already on 'main'
+HEAD is now at 0ddfaf1 A
+[main 59b5b5a] add-foo2
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'main'
-ok 8 - with succeeding hook (merge)
-
-expecting success of 7503.9 'automatic merge fails; both hooks are available': 
-	setup_success_hook "pre-commit" &&
-	setup_success_hook "pre-merge-commit" &&
-
-	git checkout conflicting-a &&
-	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
-	test_path_is_missing actual_hooks &&
-
-	echo "pre-commit" >expected_hooks &&
-	echo a+b >conflicting &&
-	git add conflicting &&
-	git commit -m "resolve conflict" &&
-	test_cmp expected_hooks actual_hooks
-
-Switched to branch 'conflicting-a'
-Auto-merging conflicting
-CONFLICT (add/add): Merge conflict in conflicting
-Automatic merge failed; fix conflicts and then commit the result.
-[conflicting-a ff0069b] resolve conflict
+ create mode 100644 foo
+[main 20d4afa] add-bar2
  Author: A U Thor <author@example.com>
-ok 9 - automatic merge fails; both hooks are available
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 1fe7e14] change-foo2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
Rewrite 59b5b5af49738cc3e3cc6618c173c3d768334f67 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fe7e1483a7337eb5fecbd426d19506d3422d75d (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/moved-foo2' is unchanged
+Ref 'refs/heads/moved-bar2' was rewritten
+Ref 'refs/heads/main' was rewritten
+ok 39 - automatic remapping to ancestor with filename filters
 
-expecting success of 7503.10 '--no-verify with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "even more" >>file &&
-	git add file &&
-	git commit --no-verify -m "even more" &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.40 'setup submodule': 
+	rm -fr ?* .git &&
+	git init &&
+	test_commit file &&
+	mkdir submod &&
+	submodurl="$PWD/submod" &&
+	( cd submod &&
+	  git init &&
+	  test_commit file-in-submod ) &&
+	git submodule add "$submodurl" &&
+	git commit -m "added submodule" &&
+	test_commit add-file &&
+	( cd submod && test_commit add-in-submodule ) &&
+	git add submod &&
+	git commit -m "changed submodule" &&
+	git branch original HEAD
 
-[conflicting-a 79fc96c] even more
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/.git/
+[main (root-commit) cc5d755] file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 10 - --no-verify with succeeding hook
-
-expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
-	setup_success_hook "pre-merge-commit" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
-
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 11 - --no-verify with succeeding hook (merge)
+ create mode 100644 file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/submod/.git/
+[main (root-commit) bd0b946] file-in-submod
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file-in-submod.t
+Adding existing repo at 'submod' to the index
+[main 1fac80d] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submod
+[main 2a85aed] add-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-file.t
+[main bf0f869] add-in-submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-in-submodule.t
+[main a3b930e] changed submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 40 - setup submodule
 
-expecting success of 7503.12 'with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	test_when_finished "rm -f expected_hooks" &&
-	echo "pre-commit-failing-hook" >expected_hooks &&
+expecting success of 7003.41 'rewrite submodule with another content': 
+	git filter-branch --tree-filter "test -d submod && {
+					 rm -rf submod &&
+					 git rm -rf --quiet submod &&
+					 mkdir submod &&
+					 : > submod/file
+					 } || :" HEAD &&
+	test $orig_head != $(git show-ref --hash --head HEAD)
 
-	echo "another" >>file &&
-	git add file &&
-	test_must_fail git commit -m "another" &&
-	test_cmp expected_hooks actual_hooks
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fac80dffdedfa43ee816ab71eb75efeb8af5021 (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite 2a85aed61b58f4b534ec65cca9f8c07c0590543d (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (2/4) (1 seconds passed, remaining 1 predicted)    
+Ref 'refs/heads/main' was rewritten
+warning: unable to rmdir 'submod': Directory not empty
+ok 41 - rewrite submodule with another content
 
-ok 12 - with failing hook
+expecting success of 7003.42 'replace submodule revision': 
+	invalid=$(test_oid numeric) &&
+	git reset --hard original &&
+	git filter-branch -f --tree-filter \
+	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
+	     then git update-index --cacheinfo 160000 $invalid submod
+	     fi" HEAD &&
+	test $orig_head != $(git show-ref --hash --head HEAD)
 
-expecting success of 7503.13 '--no-verify with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	echo "stuff" >>file &&
-	git add file &&
-	git commit --no-verify -m "stuff" &&
-	test_path_is_missing actual_hooks
+HEAD is now at a3b930e changed submodule
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fac80dffdedfa43ee816ab71eb75efeb8af5021 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 2a85aed61b58f4b534ec65cca9f8c07c0590543d (3/4) (1 seconds passed, remaining 0 predicted)    
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (3/4) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 42 - replace submodule revision
 
-[main 9073eff] stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 13 - --no-verify with failing hook
+expecting success of 7003.43 'filter commit message without trailing newline': 
+	git reset --hard original &&
+	commit=$(printf "no newline" | git commit-tree HEAD^{tree}) &&
+	git update-ref refs/heads/no-newline $commit &&
+	git filter-branch -f refs/heads/no-newline &&
+	echo $commit >expect &&
+	git rev-parse refs/heads/no-newline >actual &&
+	test_cmp expect actual
 
-expecting success of 7503.14 'with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-	echo "pre-merge-commit-failing-hook" >expected_hooks &&
-	git checkout side &&
-	test_must_fail git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
+HEAD is now at a3b930e changed submodule
+
Rewrite 3138087b49cfe2728b88f0e57c6d86bc3dd66c60 (1/1) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/no-newline' is unchanged
+ok 43 - filter commit message without trailing newline
 
-Switched to branch 'side'
-Not committing merge; use 'git commit' to complete the merge.
-Switched to branch 'main'
-ok 14 - with failing hook (merge)
+expecting success of 7003.44 'tree-filter deals with object name vs pathname ambiguity': 
+	test_when_finished "git reset --hard original" &&
+	ambiguous=$(git rev-list -1 HEAD) &&
+	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
+	git show HEAD:$ambiguous
 
-expecting success of 7503.15 '--no-verify with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
+
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (1/1) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+file
+HEAD is now at a3b930e changed submodule
+ok 44 - tree-filter deals with object name vs pathname ambiguity
 
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.45 'rewrite repository including refs that point at non-commit object': 
+	test_when_finished "git reset --hard original" &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	test_when_finished "git replace -d $tree" &&
+	echo A >new &&
+	git add new &&
+	new_tree=$(git write-tree) &&
+	git replace $tree $new_tree &&
+	git tag -a -m "tag to a tree" treetag $new_tree &&
+	git reset --hard HEAD &&
+	git filter-branch -f -- --all >filter-output 2>&1 &&
+	! grep fatal filter-output
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 15 - --no-verify with failing hook (merge)
+HEAD is now at a3b930e changed submodule
+Deleted replace ref '339ef39c910aedf9ce16075111e2ae7ace4a59ab'
+HEAD is now at a3b930e changed submodule
+ok 45 - rewrite repository including refs that point at non-commit object
 
-expecting success of 7503.16 'with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "content" >>file &&
-	git add file &&
-	git commit -m "content" &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.46 'filter-branch handles ref deletion': 
+	git switch --orphan empty-commit &&
+	git commit --allow-empty -m "empty commit" &&
+	git tag empty &&
+	git branch to-delete &&
+	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
+	grep "to-delete.*was deleted" out &&
+	test_must_fail git rev-parse --verify to-delete
 
-hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config set advice.ignoredHook false`.
-[main be1df3a] content
+warning: unable to rmdir 'submod': Directory not empty
+Switched to a new branch 'empty-commit'
+[empty-commit (root-commit) dfb35d9] empty commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 16 - with non-executable hook
+Ref 'refs/heads/to-delete' was deleted
+fatal: Needed a single revision
+ok 46 - filter-branch handles ref deletion
 
-expecting success of 7503.17 '--no-verify with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "more content" >>file &&
-	git add file &&
-	git commit --no-verify -m "more content" &&
-	test_path_is_missing actual_hooks
+expecting success of 7003.47 'filter-branch handles ref rewrite': 
+	git checkout empty &&
+	test_commit to-drop &&
+	git branch rewrite &&
+	git filter-branch -f \
+		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
+		 rewrite >out 2>&1 &&
+	grep "rewrite.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree empty rewrite
 
-[main dd373ff] more content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 17 - --no-verify with non-executable hook
+Note: switching to 'empty'.
 
-expecting success of 7503.18 'with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 18 - with non-executable hook (merge)
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
-	setup_non_exec_hook "pre-merge" &&
-	git branch -f side side-orig &&
-	git checkout side &&
-	git merge --no-verify -m "merge main" main &&
-	git checkout main &&
-	test_path_is_missing actual_hooks
+  git switch -c <new-branch-name>
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-Switched to branch 'main'
-ok 19 - --no-verify with non-executable hook (merge)
+Or undo this operation with:
 
-expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks success" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir success &&
-	(
-		cd success &&
-		git commit -m "hook requires GIT_PREFIX = success/"
-	) &&
-	test_cmp expected_hooks actual_hooks
+  git switch -
 
-[main 91e0a75] hook requires GIT_PREFIX = success/
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at dfb35d9 empty commit
+[detached HEAD 01ece84] to-drop
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 20 - with hook requiring GIT_PREFIX
-
-expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
-	test_when_finished "rm -rf actual_hooks fail" &&
-	setup_require_prefix_hook &&
-	echo "more content" >>file &&
-	git add file &&
-	mkdir fail &&
-	(
-		cd fail &&
-		test_must_fail git commit -m "hook must fail"
-	) &&
-	git checkout -- file &&
-	test_cmp expected_hooks actual_hooks
-
-ok 21 - with failing hook requiring GIT_PREFIX
+ create mode 100644 to-drop.t
+Ref 'refs/heads/rewrite' was rewritten
+ok 47 - filter-branch handles ref rewrite
 
-expecting success of 7503.22 'check the author in hook': 
-	setup_require_author_hook &&
-	cat >expected_hooks <<-EOF &&
-	check-author
-	check-author
-	check-author
-	EOF
-	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
-	(
-		GIT_AUTHOR_NAME="New Author" &&
-		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
-		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-		git commit --allow-empty -m "by new.author via env" &&
-		git show -s
-	) &&
-	git commit --author="New Author <newauthor@example.com>" \
-		--allow-empty -m "by new.author via command line" &&
-	git show -s &&
-	test_cmp expected_hooks actual_hooks
+expecting success of 7003.48 'filter-branch handles ancestor rewrite': 
+	test_commit to-exclude &&
+	git branch ancestor &&
+	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
+	grep "ancestor.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree HEAD^ ancestor
 
-[main 1b3a79e] by new.author via env
- Author: New Author <newauthor@example.com>
+[detached HEAD 07a3627] to-exclude
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via env
-[main 155e737] by new.author via command line
- Author: New Author <newauthor@example.com>
-commit 155e73716852370372b22eca0576dacb5016aa2e
-Author: New Author <newauthor@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    by new.author via command line
-ok 22 - check the author in hook
+ create mode 100644 to-exclude.t
+Ref 'refs/heads/ancestor' was rewritten
+ok 48 - filter-branch handles ancestor rewrite
 
-# passed all 22 test(s)
-1..22
+# passed all 48 test(s)
+1..48
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7422-submodule-output.sh ***
@@ -474482,1422 +477206,6 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7502-commit-porcelain.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7502-commit-porcelain/.git/
-expecting success of 7502.1 'output summary format': 
-
-	echo new >file1 &&
-	git add file1 &&
-	check_summary_oneline "root-commit" "initial" &&
-
-	echo change >>file1 &&
-	git add file1
-
-ok 1 - output summary format
-
-expecting success of 7502.2 'output summary format: root-commit': 
-	check_summary_oneline "" "a change"
-
-ok 2 - output summary format: root-commit
-
-expecting success of 7502.3 'output summary format for commit with an empty diff': 
-
-	check_summary_oneline "" "empty" "--allow-empty"
-
-ok 3 - output summary format for commit with an empty diff
-
-expecting success of 7502.4 'output summary format for merges': 
-
-	git checkout -b recursive-base &&
-	test_commit base file1 &&
-
-	git checkout -b recursive-a recursive-base &&
-	test_commit commit-a file1 &&
-
-	git checkout -b recursive-b recursive-base &&
-	test_commit commit-b file1 &&
-
-	# conflict
-	git checkout recursive-a &&
-	test_must_fail git merge recursive-b &&
-	# resolve the conflict
-	echo commit-a >file1 &&
-	git add file1 &&
-	check_summary_oneline "" "Merge"
-
-Switched to a new branch 'recursive-base'
-[recursive-base e6f945f] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-Switched to a new branch 'recursive-a'
-[recursive-a 9300328] commit-a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'recursive-b'
-[recursive-b 2f9e083] commit-b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'recursive-a'
-Auto-merging file1
-CONFLICT (content): Merge conflict in file1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - output summary format for merges
-
-expecting success of 7502.5 'the basics': 
-
-	output_tests_cleanup &&
-
-	echo doing partial >"commit is" &&
-	mkdir not &&
-	echo very much encouraged but we should >not/forbid &&
-	git add "commit is" not &&
-	echo update added "commit is" file >"commit is" &&
-	echo also update another >not/forbid &&
-	test_tick &&
-	git commit -a -m "initial with -a" &&
-
-	git cat-file blob HEAD:"commit is" >current.1 &&
-	git cat-file blob HEAD:not/forbid >current.2 &&
-
-	cmp current.1 "commit is" &&
-	cmp current.2 not/forbid
-
-
-Switched to branch 'main'
-rm 'file1'
-[main 34ca441] cleanup
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 file1
-[main 8a2203d] initial with -a
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 commit is
- create mode 100644 not/forbid
-ok 5 - the basics
-
-expecting success of 7502.6 'partial': 
-
-	echo another >"commit is" &&
-	echo another >not/forbid &&
-	test_tick &&
-	git commit -m "partial commit to handle a file" "commit is" &&
-
-	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
-	test "$changed" = "commit is"
-
-
-[main 3302250] partial commit to handle a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - partial
-
-expecting success of 7502.7 'partial modification in a subdirectory': 
-
-	test_tick &&
-	git commit -m "partial commit to subdirectory" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid"
-
-
-[main 742b3a6] partial commit to subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - partial modification in a subdirectory
-
-expecting success of 7502.8 'partial removal': 
-
-	git rm not/forbid &&
-	git commit -m "partial commit to remove not/forbid" not &&
-
-	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
-	test "$changed" = "not/forbid" &&
-	remain=$(git ls-tree -r --name-only HEAD) &&
-	test "$remain" = "commit is"
-
-
-rm 'not/forbid'
-[main 09fd303] partial commit to remove not/forbid
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 not/forbid
-ok 8 - partial removal
-
-expecting success of 7502.9 'sign off': 
-
-	>positive &&
-	git add positive &&
-	git commit -s -m "thank you" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
-	git var GIT_COMMITTER_IDENT >ident &&
-	sed -e "s/>.*/>/" ident >expected &&
-	test_cmp expected actual
-
-
-[main cc1232b] thank you
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 positive
-ok 9 - sign off
-
-expecting success of 7502.10 'commit --trailer with "="': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main c563787] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 10 - commit --trailer with "="
-
-expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C3 E3
-	EOF
-	git -c trailer.ifexists="replace" \
-		commit --trailer "Mentored-by: C4 E4" \
-		 --trailer "Helped-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 9c665b9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 743970c] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 11 - commit --trailer with -c and "replace" as ifexists
-
-expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.ifexists="add" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main c0ed76d] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3065ecb] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 12 - commit --trailer with -c and "add" as ifexists
-
-expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reviewed-by: C6 E6
-	EOF
-	git -c trailer.ifexists="donothing" \
-		commit --trailer "Mentored-by: C5 E5" \
-		--trailer "Reviewed-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 2dad5db] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 86cc013] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 13 - commit --trailer with -c and "donothing" as ifexists
-
-expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.ifexists="addIfDifferent" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main bacbe07] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 9b53fef] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 14 - commit --trailer with -c and "addIfDifferent" as ifexists
-
-expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	EOF
-	git -c trailer.ifexists="addIfDifferentNeighbor" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Reported-by: C3 E3" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d"  commit.msg >actual &&
-	test_cmp expected actual
-
-[main 5b19760] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ea6f7b2] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
-
-expecting success of 7502.16 'commit --trailer with -c and "end" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="end" \
-		commit --trailer "Reported-by: C3 E3" \
-		--trailer "Mentored-by: C4 E4" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6edd712] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main abac1a7] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 16 - commit --trailer with -c and "end" as where
-
-expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C1 E1
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="start" \
-		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
-		--trailer "Signed-off-by: C1 E1" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 49719a0] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3210bcd] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 17 - commit --trailer with -c and "start" as where
-
-expecting success of 7502.18 'commit --trailer with -c and "after" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Mentored-by: C5 E5
-	EOF
-	git -c trailer.where="after" \
-		commit --trailer "Mentored-by: C4 E4" \
-		--trailer "Mentored-by: C5 E5" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 3a4a38a] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 30c3647] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 18 - commit --trailer with -c and "after" as where
-
-expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C2 E2
-	Mentored-by: C3 E3
-	Mentored-by: C4 E4
-	EOF
-	git -c trailer.where="before" \
-		commit --trailer "Mentored-by: C3 E3" \
-		--trailer "Mentored-by: C2 E2" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main e5407b4] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2e57a8f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 19 - commit --trailer with -c and "before" as where
-
-expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	EOF
-	git -c trailer.ifmissing="donothing" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 4b3be69] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main e71943e] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 20 - commit --trailer with -c and "donothing" as ifmissing
-
-expecting success of 7502.21 'commit --trailer with -c and "add" as ifmissing': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Reported-by: C3 E3
-	Mentored-by: C4 E4
-	Helped-by: C5 E5
-	Based-by: C6 E6
-	EOF
-	git -c trailer.ifmissing="add" \
-		commit --trailer "Helped-by: C5 E5" \
-		--trailer "Based-by: C6 E6" \
-		--amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 8576769] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 3741b21] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 21 - commit --trailer with -c and "add" as ifmissing
-
-expecting success of 7502.22 'commit --trailer with -c ack.key ': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		hello
-
-		Acked-by: Peff
-	EOF
-	git -c trailer.ack.key="Acked-by" \
-		commit --trailer "ack = Peff" -m "hello" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 5789976] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 22 - commit --trailer with -c ack.key 
-
-expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
-	echo "fun" >>file1 &&
-	git add file1 &&
-	cat >expected <<-\EOF &&
-		I hate bug
-
-		Bug #42
-	EOF
-	git -c trailer.separators=":=#" \
-		-c trailer.bug.key="Bug #" \
-		commit --trailer "bug = 42" -m "I hate bug" &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6e78fd4] I hate bug
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 23 - commit --trailer with -c and ":=#" as separators
-
-expecting success of 7502.24 'commit --trailer with -c and command': 
-	trailer_commit_base &&
-	cat >expected <<-\EOF &&
-	hello
-
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: C1 E1
-	Helped-by: C2 E2
-	Mentored-by: C4 E4
-	Reported-by: A U Thor <author@example.com>
-	EOF
-	git -c trailer.report.key="Reported-by: " \
-		-c trailer.report.ifexists="replace" \
-		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
-		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
-		commit --trailer "report = author" --amend &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 6b1e5e9] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 336e96f] hello
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
- 1 file changed, 1 insertion(+)
-ok 24 - commit --trailer with -c and command
-
-expecting success of 7502.25 'commit --trailer not confused by --- separator': 
-	cat >msg <<-\EOF &&
-	subject
-
-	body with dashes
-	---
-	in it
-	EOF
-	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
-	{
-		cat msg &&
-		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 244a002] subject
- Author: A U Thor <author@example.com>
-ok 25 - commit --trailer not confused by --- separator
-
-expecting success of 7502.26 'commit --trailer with --verbose': 
-	cat >msg <<-\EOF &&
-	subject
-
-	body
-	EOF
-	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
-		--trailer="my-trailer: value" --verbose &&
-	{
-		cat msg &&
-		echo &&
-		echo "my-trailer: value"
-	} >expected &&
-	git cat-file commit HEAD >commit.msg &&
-	sed -e "1,/^\$/d" commit.msg >actual &&
-	test_cmp expected actual
-
-[main 64da097] subject
- Author: A U Thor <author@example.com>
-ok 26 - commit --trailer with --verbose
-
-expecting success of 7502.27 'multiple -m': 
-
-	>negative &&
-	git add negative &&
-	git commit -m "one" -m "two" -m "three" &&
-	actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
-	expected=$(test_write_lines "one" "" "two" "" "three") &&
-	test "z$actual" = "z$expected"
-
-
-[main a7c1b01] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 negative
-ok 27 - multiple -m
-
-expecting success of 7502.28 'verbose': 
-
-	echo minus >negative &&
-	git add negative &&
-	git status -v >raw &&
-	sed -ne "/^diff --git /p" raw >actual &&
-	echo "diff --git a/negative b/negative" >expect &&
-	test_cmp expect actual
-
-
-ok 28 - verbose
-
-expecting success of 7502.29 'verbose respects diff config': 
-
-	test_config diff.noprefix true &&
-	git status -v >actual &&
-	grep "diff --git negative negative" actual
-
-diff --git negative negative
-ok 29 - verbose respects diff config
-
-expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 30 - prepare file with comment line and trailing newlines
-
-expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim --no-status -t expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 8914337] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 31 - cleanup commit messages (verbatim option,-t)
-
-expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -F expect -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 50317d6] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 32 - cleanup commit messages (verbatim option,-F)
-
-expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
-
-	echo >>negative &&
-	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 3ead1ca] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 33 - cleanup commit messages (verbatim option,-m)
-
-expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
-
-	echo >>negative &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git commit --cleanup=whitespace -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 77206d3] # text
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 34 - cleanup commit messages (whitespace option,-F)
-
-expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
-
-	cat >expect <<-\EOF &&
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git commit --cleanup=scissors -e -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-[main e047c4e] # to be kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 35 - cleanup commit messages (scissors option,-F,-e)
-
-expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
-
-	echo >>negative &&
-	cat >text <<-\EOF &&
-	# ------------------------ >8 ------------------------
-	to be removed
-	EOF
-	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_must_be_empty actual
-
-[main 5e5571b] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
-
-expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
-
-	echo >>negative &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git commit --cleanup=strip -F text -a &&
-	git cat-file -p HEAD >raw &&
-	sed -e "1,/^\$/d" raw >actual &&
-	test_cmp expect actual
-
-
-[main 5968d26] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 37 - cleanup commit messages (strip option,-F)
-
-expecting success of 7502.38 'cleanup commit messages (strip option,-F,-e)': 
-
-	echo >>negative &&
-	test_write_lines "" "sample" "" >text &&
-	git commit -e -F text -a &&
-	head -n 4 .git/COMMIT_EDITMSG >actual
-
-[main 6ab3315] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 38 - cleanup commit messages (strip option,-F,-e)
-
-expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
-	test_cmp expect actual
-
-ok 39 - cleanup commit messages (strip option,-F,-e): output
-
-expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
-	test_must_fail git commit --cleanup=non-existent
-
-fatal: Invalid cleanup mode non-existent
-ok 40 - cleanup commit message (fail on invalid cleanup mode option)
-
-expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
-	test_must_fail git -c commit.cleanup=non-existent commit
-
-fatal: Invalid cleanup mode non-existent
-ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
-
-expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --no-status
-	) &&
-	commit_msg_is "commit message"
-
-[main 06a0f0b] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 42 - cleanup commit message (no config and no option uses default)
-
-expecting success of 7502.43 'cleanup commit message (option overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git commit --cleanup=whitespace --no-status
-	) &&
-	commit_msg_is "commit message # comment"
-
-[main 8348171] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 43 - cleanup commit message (option overrides default)
-
-expecting success of 7502.44 'cleanup commit message (config overrides default)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --no-status
-	) &&
-	commit_msg_is "commit message # comment"
-
-[main c4a33b1] commit message # comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 44 - cleanup commit message (config overrides default)
-
-expecting success of 7502.45 'cleanup commit message (option overrides config)': 
-	echo content >>file &&
-	git add file &&
-	(
-	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
-	  git -c commit.cleanup=whitespace commit --cleanup=default
-	) &&
-	commit_msg_is "commit message"
-
-[main 7b9798a] commit message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 45 - cleanup commit message (option overrides config)
-
-expecting success of 7502.46 'cleanup commit message (default, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main f675c53] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 46 - cleanup commit message (default, -m)
-
-expecting success of 7502.47 'cleanup commit message (whitespace option, -m)': 
-	echo content >>file &&
-	git add file &&
-	git commit --cleanup=whitespace --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main 8e56e6c] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 47 - cleanup commit message (whitespace option, -m)
-
-expecting success of 7502.48 'cleanup commit message (whitespace config, -m)': 
-	echo content >>file &&
-	git add file &&
-	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
-	commit_msg_is "message #comment"
-
-[main 7207f92] message #comment
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 48 - cleanup commit message (whitespace config, -m)
-
-expecting success of 7502.49 'message shows author when it is not equal to committer': 
-	echo >>negative &&
-	git commit -e -m "sample" -a &&
-	test_grep \
-	  "^# Author: *A U Thor <author@example.com>\$" \
-	  .git/COMMIT_EDITMSG
-
-[main 96a295c] sample
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Author:    A U Thor <author@example.com>
-ok 49 - message shows author when it is not equal to committer
-
-expecting success of 7502.50 'message shows date when it is explicitly set': 
-	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
-	test_grep \
-	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
-	  .git/COMMIT_EDITMSG
-
-[main 1d86a4b] foo
- Author: A U Thor <author@example.com>
- Date: Sat Jan 2 03:04:05 2010 +0000
-# Date:      Sat Jan 2 03:04:05 2010 +0000
-ok 50 - message shows date when it is explicitly set
-
-expecting success of 7502.51 'message does not have multiple scissors lines': 
-	git commit --cleanup=scissors -v --allow-empty -e -m foo &&
-	test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
-
-[main 215259a] foo
- Author: A U Thor <author@example.com>
-ok 51 - message does not have multiple scissors lines
-
-checking prerequisite: AUTOIDENT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
-	sane_unset GIT_AUTHOR_NAME &&
-	sane_unset GIT_AUTHOR_EMAIL &&
-	git var GIT_AUTHOR_IDENT
-
-)
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 52 # skip message shows committer when it is automatic (missing AUTOIDENT)
-
-checking prerequisite: FAIL_PREREQS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
-		test_bool_env GIT_TEST_FAIL_PREREQS false
-	
-)
-prerequisite FAIL_PREREQS not satisfied
-expecting success of 7502.53 'do not fire editor when committer is bogus': 
-	>.git/result &&
-
-	echo >>negative &&
-	(
-		sane_unset GIT_COMMITTER_EMAIL &&
-		sane_unset GIT_COMMITTER_NAME &&
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -e -m sample -a
-	) &&
-	test_must_be_empty .git/result
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-ok 53 - do not fire editor when committer is bogus
-
-expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
-	echo tick >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[main d97654e] tick
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 20 deletions(-)
-ok 54 - do not fire editor if -m <msg> was given
-
-expecting success of 7502.55 'do not fire editor if -m "" was given': 
-	echo tock >file &&
-	git add file &&
-	echo "editor not started" >.git/result &&
-	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
-	 git commit -m "" --allow-empty-message) &&
-	test "$(cat .git/result)" = "editor not started"
-
-[main 84f6bcc] 
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 55 - do not fire editor if -m "" was given
-
-expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
-
-	git clean -f &&
-	echo f >g &&
-	git add g &&
-	git commit -m "add g" &&
-	git branch second &&
-	echo main >g &&
-	echo g >h &&
-	git add g h &&
-	git commit -m "modify g and add h" &&
-	git checkout second &&
-	echo second >g &&
-	git add g &&
-	git commit -m second &&
-	# Must fail due to conflict
-	test_must_fail git cherry-pick -n main &&
-	echo "editor not started" >.git/result &&
-	(
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit
-	) &&
-	test "$(cat .git/result)" = "editor not started"
-
-Removing act
-Removing actual
-Removing commit.msg
-Removing commit_msg_is.actual
-Removing commit_msg_is.expect
-Removing current.1
-Removing current.2
-Removing exp
-Removing expect
-Removing expected
-Removing ident
-Removing msg
-Removing raw
-Removing text
-[main 133e0fd] add g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g
-[main 6488bdd] modify g and add h
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 h
-Switched to branch 'second'
-M	negative
-[second 42e48b3] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-error: could not apply 6488bdd... modify g and add h
-hint: after resolving the conflicts, mark the corrected paths
-hint: with 'git add <paths>' or 'git rm <paths>'
-hint: Disable this message with "git config set advice.mergeConflict false"
-error: Committing is not possible because you have unmerged files.
-hint: Fix them up in the work tree, and then use 'git add/rm <file>'
-hint: as appropriate to mark resolution and make a commit.
-fatal: Exiting because of an unresolved conflict.
-U	g
-ok 56 - do not fire editor in the presence of conflicts
-
-expecting success of 7502.57 'a SIGTERM should break locks': 
-	echo >>negative &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >>.git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git commit -a' &&
-	test ! -f .git/index.lock
-
-Terminated
-ok 57 - a SIGTERM should break locks
-
-expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
-
-	git rev-parse second main >expect &&
-	test_must_fail git merge second main &&
-	git checkout main g &&
-	EDITOR=: git commit -a &&
-	git cat-file commit HEAD >raw &&
-	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
-	test_cmp expect actual
-
-
-Auto-merging g
-CONFLICT (content): Merge conflict in g
-Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 890ab14
-[second 287266c] Merge branch 'main' into second
- Author: A U Thor <author@example.com>
-ok 58 - Hand committing of a redundant merge removes dups
-
-expecting success of 7502.59 'A single-liner subject with a token plus colon is not a footer': 
-
-	git reset --hard &&
-	git commit -s -m "hello: kitty" --allow-empty &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_line_count = 3 actual
-
-
-HEAD is now at 287266c Merge branch 'main' into second
-[second 8c7277e] hello: kitty
- Author: A U Thor <author@example.com>
-ok 59 - A single-liner subject with a token plus colon is not a footer
-
-expecting success of 7502.60 'commit -s places sob on third line after two empty lines': 
-	git commit -s --allow-empty --allow-empty-message &&
-	cat <<-EOF >expect &&
-
-
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-
-	EOF
-	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
-	test_cmp expect actual
-
-[second 56e2ef7] Signed-off-by: C O Mitter <committer@example.com>
- Author: A U Thor <author@example.com>
-ok 60 - commit -s places sob on third line after two empty lines
-
-expecting success of 7502.61 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 56e2ef7 Signed-off-by: C O Mitter <committer@example.com>
-[second 7d4c5ba] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 61 - commit
-
-expecting success of 7502.62 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 7d4c5ba message
-[second 24b9005] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 62 - commit --status
-
-expecting success of 7502.63 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 24b9005 message
-[second 6f35a31] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 63 - commit --no-status
-
-expecting success of 7502.64 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 6f35a31 message
-[second fb0e1b7] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 64 - commit with commit.status = yes
-
-expecting success of 7502.65 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at fb0e1b7 message
-[second 19f43d6] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 65 - commit with commit.status = no
-
-expecting success of 7502.66 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 19f43d6 message
-[second a6956b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 66 - commit --status with commit.status = yes
-
-expecting success of 7502.67 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at a6956b4 message
-[second 3388dc5] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 67 - commit --no-status with commit.status = yes
-
-expecting success of 7502.68 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 3388dc5 message
-[second 517e0b4] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-# Changes to be committed:
-ok 68 - commit --status with commit.status = no
-
-expecting success of 7502.69 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 517e0b4 message
-[second 2ee1433] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 69 - commit --no-status with commit.status = no
-
-expecting success of 7502.70 'commit': 
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2ee1433 message
-[second 2e8ac9b] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 70 - commit
-
-expecting success of 7502.71 'commit --status': 
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 2e8ac9b message
-[second baeb21a] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 71 - commit --status
-
-expecting success of 7502.72 'commit --no-status': 
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at baeb21a message
-[second c2fe270] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 72 - commit --no-status
-
-expecting success of 7502.73 'commit with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit "" &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at c2fe270 message
-[second 34e9ff1] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 73 - commit with commit.status = yes
-
-expecting success of 7502.74 'commit with commit.status = no': 
-		test_config commit.status no &&
-		try_commit "" &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 34e9ff1 message
-[second 76b6c0d] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 74 - commit with commit.status = no
-
-expecting success of 7502.75 'commit --status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 76b6c0d message
-[second f761932] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 75 - commit --status with commit.status = yes
-
-expecting success of 7502.76 'commit --no-status with commit.status = yes': 
-		test_config commit.status yes &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at f761932 message
-[second 69efec9] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 76 - commit --no-status with commit.status = yes
-
-expecting success of 7502.77 'commit --status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --status &&
-		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 69efec9 message
-[second 8d9fa13] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-# Changes to be committed:
-ok 77 - commit --status with commit.status = no
-
-expecting success of 7502.78 'commit --no-status with commit.status = no': 
-		test_config commit.status no &&
-		try_commit --no-status &&
-		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
-	
-HEAD is now at 8d9fa13 message
-[second 32b4909] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-ok 78 - commit --no-status with commit.status = no
-
-expecting success of 7502.79 'commit --status with custom comment character': 
-	test_config core.commentchar ";" &&
-	try_commit --status &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
-
-HEAD is now at 32b4909 message
-[second 8e6fd00] message ## Custom template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-## Custom template
-; Changes to be committed:
-ok 79 - commit --status with custom comment character
-
-expecting success of 7502.80 'switch core.commentchar': 
-	test_commit "#foo" foo &&
-	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
-	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
-
-[second 0f719bb] #foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[second e03ca23] message #foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-; Changes to be committed:
-ok 80 - switch core.commentchar
-
-expecting success of 7502.81 'switch core.commentchar but out of options': 
-	cat >text <<\EOF &&
-# 1
-; 2
-@ 3
-! 4
-$ 5
-% 6
-^ 7
-& 8
-| 9
-: 10
-EOF
-	git commit --amend -F text &&
-	(
-		test_set_editor .git/FAKE_EDITOR &&
-		test_must_fail git -c core.commentChar=auto commit --amend
-	)
-
-[second cbf85e8] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:23:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: unable to select a comment character that is not used
-in the current commit message
-ok 81 - switch core.commentchar but out of options
-
-# passed all 81 test(s)
-1..81
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7504-commit-msg-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7504-commit-msg-hook/.git/
 expecting success of 7504.1 'with no hook': 
@@ -476822,1988 +478130,159 @@
 		git rev-parse --resolve-git-dir nested1/nested2/.git &&
 		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
 		test -f .git/modules/nested1/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
-		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
-	)
-
-Cloning into 'common objects'...
-done.
-Cloning into 'clone5'...
-done.
-fatal: not a gitdir 'd'
-Submodule 'nested1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Submodule 'foo1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
-Submodule 'foo2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
-Submodule 'foo3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
-ok 17 - test "update --recursive" with a flag with spaces
-
-expecting success of 7407.18 'use "update --recursive nested1" to checkout all submodules rooted in nested1': 
-	git clone super clone6 &&
-	(
-		cd clone6 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
-		git submodule update --init --recursive -- nested1 &&
-		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
-		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
-		git rev-parse --resolve-git-dir nested1/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
-		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
-	)
-
-Cloning into 'clone6'...
-done.
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-fatal: not a gitdir 'nested1/.git'
-Submodule 'nested1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
-done.
-Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
-Submodule 'nested2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
-done.
-Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
-Submodule 'nested3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
-done.
-Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
-done.
-Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
-fatal: not a gitdir 'sub1/.git'
-fatal: not a gitdir 'sub2/.git'
-fatal: not a gitdir 'sub3/.git'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
-ok 18 - use "update --recursive nested1" to checkout all submodules rooted in nested1
-
-expecting success of 7407.19 'command passed to foreach retains notion of stdin': 
-	(
-		cd super &&
-		git submodule foreach echo success >../expected &&
-		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
-
-ok 19 - command passed to foreach retains notion of stdin
-
-expecting success of 7407.20 'command passed to foreach --recursive retains notion of stdin': 
-	(
-		cd clone2 &&
-		git submodule foreach --recursive echo success >../expected &&
-		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
-	) &&
-	test_cmp expected actual
-
-ok 20 - command passed to foreach --recursive retains notion of stdin
-
-expecting success of 7407.21 'multi-argument command passed to foreach is not shell-evaluated twice': 
-	(
-		cd super &&
-		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
-		git submodule foreach echo \"quoted\" > ../actual
-	) &&
-	test_cmp expected actual
-
-ok 21 - multi-argument command passed to foreach is not shell-evaluated twice
-
-expecting success of 7407.22 'option-like arguments passed to foreach commands are not lost': 
-	(
-		cd super &&
-		git submodule foreach "echo be --quiet" > ../expected &&
-		git submodule foreach echo be --quiet > ../actual
-	) &&
-	test_grep -e "--quiet" expected &&
-	test_cmp expected actual
-
-be --quiet
-be --quiet
-be --quiet
-be --quiet
-ok 22 - option-like arguments passed to foreach commands are not lost
-
-expecting success of 7407.23 'option-like arguments passed to foreach recurse correctly': 
-	git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
-	git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
-	test_grep -e "--an-option" expect &&
-	test_cmp expect actual
-
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-be --an-option
-ok 23 - option-like arguments passed to foreach recurse correctly
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t6438-submodule-directory-file-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
-expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.2 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.3 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.4 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_test_func: replace directory with submodule
-
-expecting success of 6438.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.7 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 7 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.9 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge replace_sub1_with_file
-not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge replace_sub1_with_file
-not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.11 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6438.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 6438.15 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.16 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.17 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.18 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - git_test_func: replace directory with submodule
-
-expecting success of 6438.19 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 19 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.20 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 20 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.21 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 21 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.22 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 22 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.23 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
-not ok 23 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.24 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
-not ok 24 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.25 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.26 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6438.27 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.28 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 28 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 6438.29 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 29 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.30 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 30 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.31 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 31 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.32 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 32 - git_test_func: replace directory with submodule
-
-expecting success of 6438.33 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 33 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.34 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 34 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.35 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 35 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.36 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 36 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.37 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
-not ok 37 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.38 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
-not ok 38 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.39 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 39 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.40 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 40 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6438.41 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.42 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 42 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 6438.43 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.44 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.45 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 45 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.46 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 46 - git_test_func: replace directory with submodule
-
-expecting success of 6438.47 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 47 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.48 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 48 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.49 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 49 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.50 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 50 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.51 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+		test -f .git/modules/nested1/modules/nested2/objects/info/alternates &&
+		test -f .git/modules/nested1/modules/nested2/modules/nested3/objects/info/alternates
+	)
+
+Cloning into 'common objects'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+Cloning into 'clone5'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
-not ok 51 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.52 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+fatal: not a gitdir 'd'
+Submodule 'nested1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Submodule 'foo1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub1'
+Submodule 'foo2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub2'
+Submodule 'foo3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'sub3'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub1'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
-not ok 52 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.53 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub2'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/sub3'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Merge made by the 'ort' strategy.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 53 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.54 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Merge made by the 'ort' strategy.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 54 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+Submodule path 'sub1': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub2': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'sub3': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone5/.git/modules/nested1/modules/nested2/modules/nested3
+ok 17 - test "update --recursive" with a flag with spaces
 
-expecting success of 6438.55 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
+expecting success of 7407.18 'use "update --recursive nested1" to checkout all submodules rooted in nested1': 
+	git clone super clone6 &&
+	(
+		cd clone6 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		test_must_fail git rev-parse --resolve-git-dir nested1/.git &&
+		git submodule update --init --recursive -- nested1 &&
+		test_must_fail git rev-parse --resolve-git-dir sub1/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub2/.git &&
+		test_must_fail git rev-parse --resolve-git-dir sub3/.git &&
+		git rev-parse --resolve-git-dir nested1/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/.git &&
+		git rev-parse --resolve-git-dir nested1/nested2/nested3/submodule/.git
+	)
+
+Cloning into 'clone6'...
 done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Merge made by the 'ort' strategy.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+fatal: not a gitdir 'nested1/.git'
+Submodule 'nested1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested1) registered for path 'nested1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+Submodule path 'nested1': checked out 'b23f134787d96fae589a6b76da41f4db112fc8db'
+Submodule 'nested2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested2) registered for path 'nested1/nested2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.56 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
+Submodule path 'nested1/nested2': checked out '2e69c85de92bf5f316f3c67b5e492f287f5a6542'
+Submodule 'nested3' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/nested3) registered for path 'nested1/nested2/nested3'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3'...
 done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 56 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+Submodule path 'nested1/nested2/nested3': checked out '5ec83512b76a0b8170b899f8e643913c3e9b72d9'
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/submodule) registered for path 'nested1/nested2/nested3/submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/nested1/nested2/nested3/submodule'...
+done.
+Submodule path 'nested1/nested2/nested3/submodule': checked out '509f622a4f36a3e472affcf28fa959174f3dd5b5'
+fatal: not a gitdir 'sub1/.git'
+fatal: not a gitdir 'sub2/.git'
+fatal: not a gitdir 'sub3/.git'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7407-submodule-foreach/clone6/.git/modules/nested1/modules/nested2/modules/nested3/modules/submodule
+ok 18 - use "update --recursive nested1" to checkout all submodules rooted in nested1
 
-# still have 8 known breakage(s)
-# passed all remaining 48 test(s)
-1..56
+expecting success of 7407.19 'command passed to foreach retains notion of stdin': 
+	(
+		cd super &&
+		git submodule foreach echo success >../expected &&
+		yes | git submodule foreach "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 19 - command passed to foreach retains notion of stdin
+
+expecting success of 7407.20 'command passed to foreach --recursive retains notion of stdin': 
+	(
+		cd clone2 &&
+		git submodule foreach --recursive echo success >../expected &&
+		yes | git submodule foreach --recursive "read y && test \"x\$y\" = xy && echo success" >../actual
+	) &&
+	test_cmp expected actual
+
+ok 20 - command passed to foreach --recursive retains notion of stdin
+
+expecting success of 7407.21 'multi-argument command passed to foreach is not shell-evaluated twice': 
+	(
+		cd super &&
+		git submodule foreach "echo \\\"quoted\\\"" > ../expected &&
+		git submodule foreach echo \"quoted\" > ../actual
+	) &&
+	test_cmp expected actual
+
+ok 21 - multi-argument command passed to foreach is not shell-evaluated twice
+
+expecting success of 7407.22 'option-like arguments passed to foreach commands are not lost': 
+	(
+		cd super &&
+		git submodule foreach "echo be --quiet" > ../expected &&
+		git submodule foreach echo be --quiet > ../actual
+	) &&
+	test_grep -e "--quiet" expected &&
+	test_cmp expected actual
+
+be --quiet
+be --quiet
+be --quiet
+be --quiet
+ok 22 - option-like arguments passed to foreach commands are not lost
+
+expecting success of 7407.23 'option-like arguments passed to foreach recurse correctly': 
+	git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
+	git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
+	test_grep -e "--an-option" expect &&
+	test_cmp expect actual
+
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+be --an-option
+ok 23 - option-like arguments passed to foreach recurse correctly
+
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7510-signed-commit.sh ***
@@ -479270,6 +478749,1470 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7502-commit-porcelain.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7502-commit-porcelain/.git/
+expecting success of 7502.1 'output summary format': 
+
+	echo new >file1 &&
+	git add file1 &&
+	check_summary_oneline "root-commit" "initial" &&
+
+	echo change >>file1 &&
+	git add file1
+
+ok 1 - output summary format
+
+expecting success of 7502.2 'output summary format: root-commit': 
+	check_summary_oneline "" "a change"
+
+ok 2 - output summary format: root-commit
+
+expecting success of 7502.3 'output summary format for commit with an empty diff': 
+
+	check_summary_oneline "" "empty" "--allow-empty"
+
+ok 3 - output summary format for commit with an empty diff
+
+expecting success of 7502.4 'output summary format for merges': 
+
+	git checkout -b recursive-base &&
+	test_commit base file1 &&
+
+	git checkout -b recursive-a recursive-base &&
+	test_commit commit-a file1 &&
+
+	git checkout -b recursive-b recursive-base &&
+	test_commit commit-b file1 &&
+
+	# conflict
+	git checkout recursive-a &&
+	test_must_fail git merge recursive-b &&
+	# resolve the conflict
+	echo commit-a >file1 &&
+	git add file1 &&
+	check_summary_oneline "" "Merge"
+
+Switched to a new branch 'recursive-base'
+[recursive-base e6f945f] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+Switched to a new branch 'recursive-a'
+[recursive-a 9300328] commit-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'recursive-b'
+[recursive-b 2f9e083] commit-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'recursive-a'
+Auto-merging file1
+CONFLICT (content): Merge conflict in file1
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - output summary format for merges
+
+expecting success of 7502.5 'the basics': 
+
+	output_tests_cleanup &&
+
+	echo doing partial >"commit is" &&
+	mkdir not &&
+	echo very much encouraged but we should >not/forbid &&
+	git add "commit is" not &&
+	echo update added "commit is" file >"commit is" &&
+	echo also update another >not/forbid &&
+	test_tick &&
+	git commit -a -m "initial with -a" &&
+
+	git cat-file blob HEAD:"commit is" >current.1 &&
+	git cat-file blob HEAD:not/forbid >current.2 &&
+
+	cmp current.1 "commit is" &&
+	cmp current.2 not/forbid
+
+
+Switched to branch 'main'
+rm 'file1'
+[main 34ca441] cleanup
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 file1
+[main 8a2203d] initial with -a
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 commit is
+ create mode 100644 not/forbid
+ok 5 - the basics
+
+expecting success of 7502.6 'partial': 
+
+	echo another >"commit is" &&
+	echo another >not/forbid &&
+	test_tick &&
+	git commit -m "partial commit to handle a file" "commit is" &&
+
+	changed=$(git diff-tree --name-only HEAD^ HEAD) &&
+	test "$changed" = "commit is"
+
+
+[main 3302250] partial commit to handle a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - partial
+
+expecting success of 7502.7 'partial modification in a subdirectory': 
+
+	test_tick &&
+	git commit -m "partial commit to subdirectory" not &&
+
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid"
+
+
+[main 742b3a6] partial commit to subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - partial modification in a subdirectory
+
+expecting success of 7502.8 'partial removal': 
+
+	git rm not/forbid &&
+	git commit -m "partial commit to remove not/forbid" not &&
+
+	changed=$(git diff-tree -r --name-only HEAD^ HEAD) &&
+	test "$changed" = "not/forbid" &&
+	remain=$(git ls-tree -r --name-only HEAD) &&
+	test "$remain" = "commit is"
+
+
+rm 'not/forbid'
+[main 09fd303] partial commit to remove not/forbid
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 not/forbid
+ok 8 - partial removal
+
+expecting success of 7502.9 'sign off': 
+
+	>positive &&
+	git add positive &&
+	git commit -s -m "thank you" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -ne "s/Signed-off-by: //p" commit.msg >actual &&
+	git var GIT_COMMITTER_IDENT >ident &&
+	sed -e "s/>.*/>/" ident >expected &&
+	test_cmp expected actual
+
+
+[main cc1232b] thank you
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 positive
+ok 9 - sign off
+
+expecting success of 7502.10 'commit --trailer with "="': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main c563787] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 10 - commit --trailer with "="
+
+expecting success of 7502.11 'commit --trailer with -c and "replace" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C3 E3
+	EOF
+	git -c trailer.ifexists="replace" \
+		commit --trailer "Mentored-by: C4 E4" \
+		 --trailer "Helped-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+
+[main 9c665b9] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 743970c] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 11 - commit --trailer with -c and "replace" as ifexists
+
+expecting success of 7502.12 'commit --trailer with -c and "add" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.ifexists="add" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+
+[main c0ed76d] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3065ecb] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 12 - commit --trailer with -c and "add" as ifexists
+
+expecting success of 7502.13 'commit --trailer with -c and "donothing" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reviewed-by: C6 E6
+	EOF
+	git -c trailer.ifexists="donothing" \
+		commit --trailer "Mentored-by: C5 E5" \
+		--trailer "Reviewed-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+
+[main 2dad5db] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 86cc013] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 13 - commit --trailer with -c and "donothing" as ifexists
+
+expecting success of 7502.14 'commit --trailer with -c and "addIfDifferent" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.ifexists="addIfDifferent" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+
+[main bacbe07] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 9b53fef] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 14 - commit --trailer with -c and "addIfDifferent" as ifexists
+
+expecting success of 7502.15 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	EOF
+	git -c trailer.ifexists="addIfDifferentNeighbor" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Reported-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+
+[main 5b19760] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main ea6f7b2] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 15 - commit --trailer with -c and "addIfDifferentNeighbor" as ifexists
+
+expecting success of 7502.16 'commit --trailer with -c and "end" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="end" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 6edd712] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main abac1a7] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 16 - commit --trailer with -c and "end" as where
+
+expecting success of 7502.17 'commit --trailer with -c and "start" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C1 E1
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="start" \
+		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
+		--trailer "Signed-off-by: C1 E1" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 49719a0] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3210bcd] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 17 - commit --trailer with -c and "start" as where
+
+expecting success of 7502.18 'commit --trailer with -c and "after" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.where="after" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 3a4a38a] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 30c3647] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 18 - commit --trailer with -c and "after" as where
+
+expecting success of 7502.19 'commit --trailer with -c and "before" as where': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C2 E2
+	Mentored-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="before" \
+		commit --trailer "Mentored-by: C3 E3" \
+		--trailer "Mentored-by: C2 E2" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main e5407b4] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 2e57a8f] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 19 - commit --trailer with -c and "before" as where
+
+expecting success of 7502.20 'commit --trailer with -c and "donothing" as ifmissing': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	EOF
+	git -c trailer.ifmissing="donothing" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 4b3be69] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main e71943e] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 20 - commit --trailer with -c and "donothing" as ifmissing
+
+expecting success of 7502.21 'commit --trailer with -c and "add" as ifmissing': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	Based-by: C6 E6
+	EOF
+	git -c trailer.ifmissing="add" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 8576769] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 3741b21] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 21 - commit --trailer with -c and "add" as ifmissing
+
+expecting success of 7502.22 'commit --trailer with -c ack.key ': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		hello
+
+		Acked-by: Peff
+	EOF
+	git -c trailer.ack.key="Acked-by" \
+		commit --trailer "ack = Peff" -m "hello" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 5789976] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 22 - commit --trailer with -c ack.key 
+
+expecting success of 7502.23 'commit --trailer with -c and ":=#" as separators': 
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		I hate bug
+
+		Bug #42
+	EOF
+	git -c trailer.separators=":=#" \
+		-c trailer.bug.key="Bug #" \
+		commit --trailer "bug = 42" -m "I hate bug" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 6e78fd4] I hate bug
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 23 - commit --trailer with -c and ":=#" as separators
+
+expecting success of 7502.24 'commit --trailer with -c and command': 
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Mentored-by: C4 E4
+	Reported-by: A U Thor <author@example.com>
+	EOF
+	git -c trailer.report.key="Reported-by: " \
+		-c trailer.report.ifexists="replace" \
+		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
+		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
+		commit --trailer "report = author" --amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 6b1e5e9] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 336e96f] hello
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ok 24 - commit --trailer with -c and command
+
+expecting success of 7502.25 'commit --trailer not confused by --- separator': 
+	cat >msg <<-\EOF &&
+	subject
+
+	body with dashes
+	---
+	in it
+	EOF
+	git commit --allow-empty --trailer="my-trailer: value" -F msg &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 244a002] subject
+ Author: A U Thor <author@example.com>
+ok 25 - commit --trailer not confused by --- separator
+
+expecting success of 7502.26 'commit --trailer with --verbose': 
+	cat >msg <<-\EOF &&
+	subject
+
+	body
+	EOF
+	GIT_EDITOR=: git commit --edit -F msg --allow-empty \
+		--trailer="my-trailer: value" --verbose &&
+	{
+		cat msg &&
+		echo &&
+		echo "my-trailer: value"
+	} >expected &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+
+[main 64da097] subject
+ Author: A U Thor <author@example.com>
+ok 26 - commit --trailer with --verbose
+
+expecting success of 7502.27 'multiple -m': 
+
+	>negative &&
+	git add negative &&
+	git commit -m "one" -m "two" -m "three" &&
+	actual=$(git cat-file commit HEAD >tmp && sed -e "1,/^\$/d" tmp && rm tmp) &&
+	expected=$(test_write_lines "one" "" "two" "" "three") &&
+	test "z$actual" = "z$expected"
+
+
+[main a7c1b01] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 negative
+ok 27 - multiple -m
+
+expecting success of 7502.28 'verbose': 
+
+	echo minus >negative &&
+	git add negative &&
+	git status -v >raw &&
+	sed -ne "/^diff --git /p" raw >actual &&
+	echo "diff --git a/negative b/negative" >expect &&
+	test_cmp expect actual
+
+
+ok 28 - verbose
+
+expecting success of 7502.29 'verbose respects diff config': 
+
+	test_config diff.noprefix true &&
+	git status -v >actual &&
+	grep "diff --git negative negative" actual
+
+diff --git negative negative
+ok 29 - verbose respects diff config
+
+expecting success of 7502.30 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
+
+ok 30 - prepare file with comment line and trailing newlines
+
+expecting success of 7502.31 'cleanup commit messages (verbatim option,-t)': 
+
+	echo >>negative &&
+	git commit --cleanup=verbatim --no-status -t expect -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 8914337] # text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 31 - cleanup commit messages (verbatim option,-t)
+
+expecting success of 7502.32 'cleanup commit messages (verbatim option,-F)': 
+
+	echo >>negative &&
+	git commit --cleanup=verbatim -F expect -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 50317d6] # text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 32 - cleanup commit messages (verbatim option,-F)
+
+expecting success of 7502.33 'cleanup commit messages (verbatim option,-m)': 
+
+	echo >>negative &&
+	git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 3ead1ca] # text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 33 - cleanup commit messages (verbatim option,-m)
+
+expecting success of 7502.34 'cleanup commit messages (whitespace option,-F)': 
+
+	echo >>negative &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git commit --cleanup=whitespace -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 77206d3] # text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 34 - cleanup commit messages (whitespace option,-F)
+
+expecting success of 7502.35 'cleanup commit messages (scissors option,-F,-e)': 
+
+	echo >>negative &&
+	cat >text <<-\EOF &&
+
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
+
+	cat >expect <<-\EOF &&
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git commit --cleanup=scissors -e -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+[main e047c4e] # to be kept
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 35 - cleanup commit messages (scissors option,-F,-e)
+
+expecting success of 7502.36 'cleanup commit messages (scissors option,-F,-e, scissors on first line)': 
+
+	echo >>negative &&
+	cat >text <<-\EOF &&
+	# ------------------------ >8 ------------------------
+	to be removed
+	EOF
+	git commit --cleanup=scissors -e -F text -a --allow-empty-message &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_must_be_empty actual
+
+[main 5e5571b] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 36 - cleanup commit messages (scissors option,-F,-e, scissors on first line)
+
+expecting success of 7502.37 'cleanup commit messages (strip option,-F)': 
+
+	echo >>negative &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git commit --cleanup=strip -F text -a &&
+	git cat-file -p HEAD >raw &&
+	sed -e "1,/^\$/d" raw >actual &&
+	test_cmp expect actual
+
+
+[main 5968d26] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 37 - cleanup commit messages (strip option,-F)
+
+expecting success of 7502.38 'cleanup commit messages (strip option,-F,-e)': 
+
+	echo >>negative &&
+	test_write_lines "" "sample" "" >text &&
+	git commit -e -F text -a &&
+	head -n 4 .git/COMMIT_EDITMSG >actual
+
+[main 6ab3315] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 38 - cleanup commit messages (strip option,-F,-e)
+
+expecting success of 7502.39 'cleanup commit messages (strip option,-F,-e): output': 
+	test_cmp expect actual
+
+ok 39 - cleanup commit messages (strip option,-F,-e): output
+
+expecting success of 7502.40 'cleanup commit message (fail on invalid cleanup mode option)': 
+	test_must_fail git commit --cleanup=non-existent
+
+fatal: Invalid cleanup mode non-existent
+ok 40 - cleanup commit message (fail on invalid cleanup mode option)
+
+expecting success of 7502.41 'cleanup commit message (fail on invalid cleanup mode configuration)': 
+	test_must_fail git -c commit.cleanup=non-existent commit
+
+fatal: Invalid cleanup mode non-existent
+ok 41 - cleanup commit message (fail on invalid cleanup mode configuration)
+
+expecting success of 7502.42 'cleanup commit message (no config and no option uses default)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --no-status
+	) &&
+	commit_msg_is "commit message"
+
+[main 06a0f0b] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 42 - cleanup commit message (no config and no option uses default)
+
+expecting success of 7502.43 'cleanup commit message (option overrides default)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git commit --cleanup=whitespace --no-status
+	) &&
+	commit_msg_is "commit message # comment"
+
+[main 8348171] commit message # comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 43 - cleanup commit message (option overrides default)
+
+expecting success of 7502.44 'cleanup commit message (config overrides default)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --no-status
+	) &&
+	commit_msg_is "commit message # comment"
+
+[main c4a33b1] commit message # comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 44 - cleanup commit message (config overrides default)
+
+expecting success of 7502.45 'cleanup commit message (option overrides config)': 
+	echo content >>file &&
+	git add file &&
+	(
+	  test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment &&
+	  git -c commit.cleanup=whitespace commit --cleanup=default
+	) &&
+	commit_msg_is "commit message"
+
+[main 7b9798a] commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 45 - cleanup commit message (option overrides config)
+
+expecting success of 7502.46 'cleanup commit message (default, -m)': 
+	echo content >>file &&
+	git add file &&
+	git commit -m "message #comment " &&
+	commit_msg_is "message #comment"
+
+[main f675c53] message #comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 46 - cleanup commit message (default, -m)
+
+expecting success of 7502.47 'cleanup commit message (whitespace option, -m)': 
+	echo content >>file &&
+	git add file &&
+	git commit --cleanup=whitespace --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
+
+[main 8e56e6c] message #comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 47 - cleanup commit message (whitespace option, -m)
+
+expecting success of 7502.48 'cleanup commit message (whitespace config, -m)': 
+	echo content >>file &&
+	git add file &&
+	git -c commit.cleanup=whitespace commit --no-status -m "message #comment " &&
+	commit_msg_is "message #comment"
+
+[main 7207f92] message #comment
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 48 - cleanup commit message (whitespace config, -m)
+
+expecting success of 7502.49 'message shows author when it is not equal to committer': 
+	echo >>negative &&
+	git commit -e -m "sample" -a &&
+	test_grep \
+	  "^# Author: *A U Thor <author@example.com>\$" \
+	  .git/COMMIT_EDITMSG
+
+[main 96a295c] sample
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Author:    A U Thor <author@example.com>
+ok 49 - message shows author when it is not equal to committer
+
+expecting success of 7502.50 'message shows date when it is explicitly set': 
+	git commit --allow-empty -e -m foo --date="2010-01-02T03:04:05" &&
+	test_grep \
+	  "^# Date: *Sat Jan 2 03:04:05 2010 +0000" \
+	  .git/COMMIT_EDITMSG
+
+[main 1d86a4b] foo
+ Author: A U Thor <author@example.com>
+ Date: Sat Jan 2 03:04:05 2010 +0000
+# Date:      Sat Jan 2 03:04:05 2010 +0000
+ok 50 - message shows date when it is explicitly set
+
+expecting success of 7502.51 'message does not have multiple scissors lines': 
+	git commit --cleanup=scissors -v --allow-empty -e -m foo &&
+	test $(grep -c -e "--- >8 ---" .git/COMMIT_EDITMSG) -eq 1
+
+[main 215259a] foo
+ Author: A U Thor <author@example.com>
+ok 51 - message does not have multiple scissors lines
+
+checking prerequisite: AUTOIDENT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-AUTOIDENT" &&
+	sane_unset GIT_AUTHOR_NAME &&
+	sane_unset GIT_AUTHOR_EMAIL &&
+	git var GIT_AUTHOR_IDENT
+
+)
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
+expecting success of 7502.52 'message shows committer when it is automatic': 
+
+	echo >>negative &&
+	(
+		sane_unset GIT_COMMITTER_EMAIL &&
+		sane_unset GIT_COMMITTER_NAME &&
+		git commit -e -m "sample" -a
+	) &&
+	# the ident is calculated from the system, so we cannot
+	# check the actual value, only that it is there
+	test_grep "^# Committer: " .git/COMMIT_EDITMSG
+
+[main f5ce206] sample
+ Author: A U Thor <author@example.com>
+ Committer: second user <pbuilder2@codethink04-arm64.debian.net>
+Your name and email address were configured automatically based
+on your username and hostname. Please check that they are accurate.
+You can suppress this message by setting them explicitly. Run the
+following command and follow the instructions in your editor to edit
+your configuration file:
+
+    git config --global --edit
+
+After doing this, you may fix the identity used for this commit with:
+
+    git commit --amend --reset-author
+
+ 1 file changed, 1 insertion(+)
+# Committer: second user <pbuilder2@codethink04-arm64.debian.net>
+ok 52 - message shows committer when it is automatic
+
+checking prerequisite: FAIL_PREREQS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FAIL_PREREQS" &&
+		test_bool_env GIT_TEST_FAIL_PREREQS false
+	
+)
+prerequisite FAIL_PREREQS not satisfied
+ok 53 # skip do not fire editor when committer is bogus (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
+
+expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
+	echo tick >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
+	test "$(cat .git/result)" = "editor not started"
+
+[main b3aefca] tick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 20 deletions(-)
+ok 54 - do not fire editor if -m <msg> was given
+
+expecting success of 7502.55 'do not fire editor if -m "" was given': 
+	echo tock >file &&
+	git add file &&
+	echo "editor not started" >.git/result &&
+	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" \
+	 git commit -m "" --allow-empty-message) &&
+	test "$(cat .git/result)" = "editor not started"
+
+[main 6fc5d44] 
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 55 - do not fire editor if -m "" was given
+
+expecting success of 7502.56 'do not fire editor in the presence of conflicts': 
+
+	git clean -f &&
+	echo f >g &&
+	git add g &&
+	git commit -m "add g" &&
+	git branch second &&
+	echo main >g &&
+	echo g >h &&
+	git add g h &&
+	git commit -m "modify g and add h" &&
+	git checkout second &&
+	echo second >g &&
+	git add g &&
+	git commit -m second &&
+	# Must fail due to conflict
+	test_must_fail git cherry-pick -n main &&
+	echo "editor not started" >.git/result &&
+	(
+		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
+		export GIT_EDITOR &&
+		test_must_fail git commit
+	) &&
+	test "$(cat .git/result)" = "editor not started"
+
+Removing act
+Removing actual
+Removing commit.msg
+Removing commit_msg_is.actual
+Removing commit_msg_is.expect
+Removing current.1
+Removing current.2
+Removing exp
+Removing expect
+Removing expected
+Removing ident
+Removing msg
+Removing raw
+Removing text
+[main d6e1120] add g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g
+[main c77b361] modify g and add h
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 h
+Switched to branch 'second'
+[second cb85b8b] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+error: could not apply c77b361... modify g and add h
+hint: after resolving the conflicts, mark the corrected paths
+hint: with 'git add <paths>' or 'git rm <paths>'
+hint: Disable this message with "git config set advice.mergeConflict false"
+error: Committing is not possible because you have unmerged files.
+hint: Fix them up in the work tree, and then use 'git add/rm <file>'
+hint: as appropriate to mark resolution and make a commit.
+fatal: Exiting because of an unresolved conflict.
+U	g
+ok 56 - do not fire editor in the presence of conflicts
+
+expecting success of 7502.57 'a SIGTERM should break locks': 
+	echo >>negative &&
+	! "$SHELL_PATH" -c '
+	  echo kill -TERM $$ >>.git/FAKE_EDITOR
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git commit -a' &&
+	test ! -f .git/index.lock
+
+Terminated
+ok 57 - a SIGTERM should break locks
+
+expecting success of 7502.58 'Hand committing of a redundant merge removes dups': 
+
+	git rev-parse second main >expect &&
+	test_must_fail git merge second main &&
+	git checkout main g &&
+	EDITOR=: git commit -a &&
+	git cat-file commit HEAD >raw &&
+	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
+	test_cmp expect actual
+
+
+Auto-merging g
+CONFLICT (content): Merge conflict in g
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from b907ba1
+[second b94b2b3] Merge branch 'main' into second
+ Author: A U Thor <author@example.com>
+ok 58 - Hand committing of a redundant merge removes dups
+
+expecting success of 7502.59 'A single-liner subject with a token plus colon is not a footer': 
+
+	git reset --hard &&
+	git commit -s -m "hello: kitty" --allow-empty &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_line_count = 3 actual
+
+
+HEAD is now at b94b2b3 Merge branch 'main' into second
+[second 8408c70] hello: kitty
+ Author: A U Thor <author@example.com>
+ok 59 - A single-liner subject with a token plus colon is not a footer
+
+expecting success of 7502.60 'commit -s places sob on third line after two empty lines': 
+	git commit -s --allow-empty --allow-empty-message &&
+	cat <<-EOF >expect &&
+
+
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+
+	EOF
+	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
+	test_cmp expect actual
+
+[second 335a239] Signed-off-by: C O Mitter <committer@example.com>
+ Author: A U Thor <author@example.com>
+ok 60 - commit -s places sob on third line after two empty lines
+
+expecting success of 7502.61 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 335a239 Signed-off-by: C O Mitter <committer@example.com>
+[second e6896a3] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 61 - commit
+
+expecting success of 7502.62 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at e6896a3 message
+[second aae0cd6] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 62 - commit --status
+
+expecting success of 7502.63 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at aae0cd6 message
+[second 5ca52f0] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 63 - commit --no-status
+
+expecting success of 7502.64 'commit with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 5ca52f0 message
+[second a3f2728] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 64 - commit with commit.status = yes
+
+expecting success of 7502.65 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at a3f2728 message
+[second a4be5c9] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 65 - commit with commit.status = no
+
+expecting success of 7502.66 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at a4be5c9 message
+[second ccf5b3a] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 66 - commit --status with commit.status = yes
+
+expecting success of 7502.67 'commit --no-status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at ccf5b3a message
+[second ffcb402] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 67 - commit --no-status with commit.status = yes
+
+expecting success of 7502.68 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at ffcb402 message
+[second 3e1b053] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+# Changes to be committed:
+ok 68 - commit --status with commit.status = no
+
+expecting success of 7502.69 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 3e1b053 message
+[second fb6395e] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 69 - commit --no-status with commit.status = no
+
+expecting success of 7502.70 'commit': 
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at fb6395e message
+[second 1dcf2b5] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 70 - commit
+
+expecting success of 7502.71 'commit --status': 
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 1dcf2b5 message
+[second b4fd6ef] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 71 - commit --status
+
+expecting success of 7502.72 'commit --no-status': 
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at b4fd6ef message
+[second f6d1bea] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 72 - commit --no-status
+
+expecting success of 7502.73 'commit with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit "" &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at f6d1bea message
+[second 13cf604] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 73 - commit with commit.status = yes
+
+expecting success of 7502.74 'commit with commit.status = no': 
+		test_config commit.status no &&
+		try_commit "" &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 13cf604 message
+[second e261d72] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 74 - commit with commit.status = no
+
+expecting success of 7502.75 'commit --status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at e261d72 message
+[second 6fdba1b] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 75 - commit --status with commit.status = yes
+
+expecting success of 7502.76 'commit --no-status with commit.status = yes': 
+		test_config commit.status yes &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 6fdba1b message
+[second c35b18a] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 76 - commit --no-status with commit.status = yes
+
+expecting success of 7502.77 'commit --status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --status &&
+		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at c35b18a message
+[second 6c72121] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+# Changes to be committed:
+ok 77 - commit --status with commit.status = no
+
+expecting success of 7502.78 'commit --no-status with commit.status = no': 
+		test_config commit.status no &&
+		try_commit --no-status &&
+		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
+	
+HEAD is now at 6c72121 message
+[second 8d921f5] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+ok 78 - commit --no-status with commit.status = no
+
+expecting success of 7502.79 'commit --status with custom comment character': 
+	test_config core.commentchar ";" &&
+	try_commit --status &&
+	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+
+HEAD is now at 8d921f5 message
+[second 21fb741] message ## Custom template
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+## Custom template
+; Changes to be committed:
+ok 79 - commit --status with custom comment character
+
+expecting success of 7502.80 'switch core.commentchar': 
+	test_commit "#foo" foo &&
+	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
+	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
+
+[second 936c61f] #foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[second 7327b29] message #foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+; Changes to be committed:
+ok 80 - switch core.commentchar
+
+expecting success of 7502.81 'switch core.commentchar but out of options': 
+	cat >text <<\EOF &&
+# 1
+; 2
+@ 3
+! 4
+$ 5
+% 6
+^ 7
+& 8
+| 9
+: 10
+EOF
+	git commit --amend -F text &&
+	(
+		test_set_editor .git/FAKE_EDITOR &&
+		test_must_fail git -c core.commentChar=auto commit --amend
+	)
+
+[second 1a16233] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: unable to select a comment character that is not used
+in the current commit message
+ok 81 - switch core.commentchar but out of options
+
+# passed all 81 test(s)
+1..81
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7514-commit-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7514-commit-patch/.git/
+expecting success of 7514.1 'setup (initial)': 
+	echo line1 >file &&
+	git add file &&
+	git commit -m commit1
+
+[master (root-commit) 8d800e1] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup (initial)
+
+expecting success of 7514.2 'edit hunk "commit -p -m message"': 
+	test_when_finished "rm -f editor_was_started" &&
+	rm -f editor_was_started &&
+	echo more >>file &&
+	echo e | env GIT_EDITOR=": >editor_was_started" git commit -p -m commit2 file &&
+	test -r editor_was_started
+
+diff --git a/file b/file
+index a29bdeb..3049d20 100644
+--- a/file
++++ b/file
+@@ -1 +1,2 @@
+ line1
++more
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+[master 1e5318c] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 2 - edit hunk "commit -p -m message"
+
+expecting success of 7514.3 'edit hunk "commit --dry-run -p -m message"': 
+	test_when_finished "rm -f editor_was_started" &&
+	rm -f editor_was_started &&
+	echo more >>file &&
+	echo e | env GIT_EDITOR=": >editor_was_started" git commit -p -m commit3 file &&
+	test -r editor_was_started
+
+diff --git a/file b/file
+index 3049d20..c1dcbdb 100644
+--- a/file
++++ b/file
+@@ -1,2 +1,3 @@
+ line1
+ more
++more
+(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
+[master 0e7b2ea] commit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 3 - edit hunk "commit --dry-run -p -m message"
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7511-status-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7511-status-index/.git/
 expecting success of 7511.1 'status, filename length 1': 
@@ -480452,6 +481395,72 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7515-status-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7515-status-symlinks/.git/
+expecting success of 7515.1 'setup': 
+	echo .gitignore >.gitignore &&
+	echo actual >>.gitignore &&
+	echo expect >>.gitignore &&
+	mkdir dir &&
+	echo x >dir/file1 &&
+	echo y >dir/file2 &&
+	git add dir &&
+	git commit -m initial &&
+	git tag initial
+
+[master (root-commit) 1048606] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir/file1
+ create mode 100644 dir/file2
+ok 1 - setup
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 7515.2 'symlink to a directory': 
+	test_when_finished "rm symlink" &&
+	ln -s dir symlink &&
+	echo "?? symlink" >expect &&
+	git status --porcelain >actual &&
+	test_cmp expect actual
+
+ok 2 - symlink to a directory
+
+expecting success of 7515.3 'symlink replacing a directory': 
+	test_when_finished "rm -rf copy && git reset --hard initial" &&
+	mkdir copy &&
+	cp dir/file1 copy/file1 &&
+	echo "changed in copy" >copy/file2 &&
+	git add copy &&
+	git commit -m second &&
+	rm -rf copy &&
+	ln -s dir copy &&
+	echo " D copy/file1" >expect &&
+	echo " D copy/file2" >>expect &&
+	echo "?? copy" >>expect &&
+	git status --porcelain >actual &&
+	test_cmp expect actual
+
+[master a9708ba] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 copy/file1
+ create mode 100644 copy/file2
+HEAD is now at 1048606 initial
+ok 3 - symlink replacing a directory
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7505-prepare-commit-msg-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7505-prepare-commit-msg-hook/.git/
 expecting success of 7505.1 'set up commits for rebasing': 
@@ -480980,645 +481989,48 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7514-commit-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7514-commit-patch/.git/
-expecting success of 7514.1 'setup (initial)': 
-	echo line1 >file &&
-	git add file &&
-	git commit -m commit1
-
-[master (root-commit) 8d800e1] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup (initial)
-
-expecting success of 7514.2 'edit hunk "commit -p -m message"': 
-	test_when_finished "rm -f editor_was_started" &&
-	rm -f editor_was_started &&
-	echo more >>file &&
-	echo e | env GIT_EDITOR=": >editor_was_started" git commit -p -m commit2 file &&
-	test -r editor_was_started
-
-diff --git a/file b/file
-index a29bdeb..3049d20 100644
---- a/file
-+++ b/file
-@@ -1 +1,2 @@
- line1
-+more
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-[master 1e5318c] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 2 - edit hunk "commit -p -m message"
-
-expecting success of 7514.3 'edit hunk "commit --dry-run -p -m message"': 
-	test_when_finished "rm -f editor_was_started" &&
-	rm -f editor_was_started &&
-	echo more >>file &&
-	echo e | env GIT_EDITOR=": >editor_was_started" git commit -p -m commit3 file &&
-	test -r editor_was_started
-
-diff --git a/file b/file
-index 3049d20..c1dcbdb 100644
---- a/file
-+++ b/file
-@@ -1,2 +1,3 @@
- line1
- more
-+more
-(1/1) Stage this hunk [y,n,q,a,d,e,p,?]? 
-[master 0e7b2ea] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 3 - edit hunk "commit --dry-run -p -m message"
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7506-status-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/.git/
-expecting success of 7506.1 'setup': 
-	test_create_repo_with_commit sub &&
-	echo output > .gitignore &&
-	git add sub .gitignore &&
-	git commit -m "Add submodule sub"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub/.git/
-[master (root-commit) 5dffd93]  Add bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-[master 3b5520a]  Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-[master (root-commit) b687689] Add submodule sub
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitignore
- create mode 160000 sub
-ok 1 - setup
-
-expecting success of 7506.2 'status clean': 
-	git status >output &&
-	test_grep "nothing to commit" output
-
-nothing to commit, working tree clean
-ok 2 - status clean
-
-expecting success of 7506.3 'commit --dry-run -a clean': 
-	test_must_fail git commit --dry-run -a >output &&
-	test_grep "nothing to commit" output
-
-nothing to commit, working tree clean
-ok 3 - commit --dry-run -a clean
-
-expecting success of 7506.4 'status with modified file in submodule': 
-	(cd sub && git reset --hard) &&
-	echo "changed" >sub/foo &&
-	git status >output &&
-	test_grep "modified:   sub (modified content)" output
-
-HEAD is now at 3b5520a  Add foo
-	modified:   sub (modified content)
-ok 4 - status with modified file in submodule
-
-expecting success of 7506.5 'status with modified file in submodule (porcelain)': 
-	(cd sub && git reset --hard) &&
-	echo "changed" >sub/foo &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-HEAD is now at 3b5520a  Add foo
-ok 5 - status with modified file in submodule (porcelain)
-
-expecting success of 7506.6 'status with modified file in submodule (short)': 
-	(cd sub && git reset --hard) &&
-	echo "changed" >sub/foo &&
-	git status --short >output &&
-	diff output - <<-\EOF
-	 m sub
-	EOF
-
-HEAD is now at 3b5520a  Add foo
-ok 6 - status with modified file in submodule (short)
-
-expecting success of 7506.7 'status with added file in submodule': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status >output &&
-	test_grep "modified:   sub (modified content)" output
-
-HEAD is now at 3b5520a  Add foo
-	modified:   sub (modified content)
-ok 7 - status with added file in submodule
-
-expecting success of 7506.8 'status with added file in submodule (porcelain)': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-HEAD is now at 3b5520a  Add foo
-ok 8 - status with added file in submodule (porcelain)
-
-expecting success of 7506.9 'status with added file in submodule (short)': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status --short >output &&
-	diff output - <<-\EOF
-	 m sub
-	EOF
-
-HEAD is now at 3b5520a  Add foo
-ok 9 - status with added file in submodule (short)
-
-expecting success of 7506.10 'status with untracked file in submodule': 
-	(cd sub && git reset --hard) &&
-	echo "content" >sub/new-file &&
-	git status >output &&
-	test_grep "modified:   sub (untracked content)" output
-
-HEAD is now at 3b5520a  Add foo
-	modified:   sub (untracked content)
-ok 10 - status with untracked file in submodule
-
-expecting success of 7506.11 'status -uno with untracked file in submodule': 
-	git status -uno >output &&
-	test_grep "^nothing to commit" output
-
-nothing to commit (use -u to show untracked files)
-ok 11 - status -uno with untracked file in submodule
-
-expecting success of 7506.12 'status with untracked file in submodule (porcelain)': 
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-ok 12 - status with untracked file in submodule (porcelain)
-
-expecting success of 7506.13 'status with untracked file in submodule (short)': 
-	git status --short >output &&
-	diff output - <<-\EOF
-	 ? sub
-	EOF
-
-ok 13 - status with untracked file in submodule (short)
-
-expecting success of 7506.14 'status with added and untracked file in submodule': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	echo "content" >sub/new-file &&
-	git status >output &&
-	test_grep "modified:   sub (modified content, untracked content)" output
-
-HEAD is now at 3b5520a  Add foo
-	modified:   sub (modified content, untracked content)
-ok 14 - status with added and untracked file in submodule
-
-expecting success of 7506.15 'status with added and untracked file in submodule (porcelain)': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	echo "content" >sub/new-file &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-HEAD is now at 3b5520a  Add foo
-ok 15 - status with added and untracked file in submodule (porcelain)
-
-expecting success of 7506.16 'status with modified file in modified submodule': 
-	(cd sub && git reset --hard) &&
-	rm sub/new-file &&
-	(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
-	echo "changed" >sub/foo &&
-	git status >output &&
-	test_grep "modified:   sub (new commits, modified content)" output
-
-HEAD is now at 3b5520a  Add foo
-[master f86d50b] next change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-	modified:   sub (new commits, modified content)
-ok 16 - status with modified file in modified submodule
-
-expecting success of 7506.17 'status with modified file in modified submodule (porcelain)': 
-	(cd sub && git reset --hard) &&
-	echo "changed" >sub/foo &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-HEAD is now at f86d50b next change
-ok 17 - status with modified file in modified submodule (porcelain)
-
-expecting success of 7506.18 'status with added file in modified submodule': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status >output &&
-	test_grep "modified:   sub (new commits, modified content)" output
-
-HEAD is now at f86d50b next change
-	modified:   sub (new commits, modified content)
-ok 18 - status with added file in modified submodule
-
-expecting success of 7506.19 'status with added file in modified submodule (porcelain)': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-HEAD is now at f86d50b next change
-ok 19 - status with added file in modified submodule (porcelain)
-
-expecting success of 7506.20 'status with untracked file in modified submodule': 
-	(cd sub && git reset --hard) &&
-	echo "content" >sub/new-file &&
-	git status >output &&
-	test_grep "modified:   sub (new commits, untracked content)" output
-
-HEAD is now at f86d50b next change
-	modified:   sub (new commits, untracked content)
-ok 20 - status with untracked file in modified submodule
-
-expecting success of 7506.21 'status with untracked file in modified submodule (porcelain)': 
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
-	EOF
-
-ok 21 - status with untracked file in modified submodule (porcelain)
-
-expecting success of 7506.22 'status with added and untracked file in modified submodule': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	echo "content" >sub/new-file &&
-	git status >output &&
-	test_grep "modified:   sub (new commits, modified content, untracked content)" output
-
-HEAD is now at f86d50b next change
-	modified:   sub (new commits, modified content, untracked content)
-ok 22 - status with added and untracked file in modified submodule
-
-expecting success of 7506.23 'status with added and untracked file in modified submodule (porcelain)': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	echo "content" >sub/new-file &&
-	git status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub
+*** t7516-commit-races.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7516-commit-races/.git/
+expecting success of 7516.1 'race to create orphan commit': 
+	write_script hare-editor <<-\EOF &&
+	git commit --allow-empty -m hare
 	EOF
+	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep hare subject &&
+	git show -s --pretty=format:%P >out &&
+	test_must_be_empty out
 
-HEAD is now at f86d50b next change
-ok 23 - status with added and untracked file in modified submodule (porcelain)
-
-expecting success of 7506.24 'setup .git file for sub': 
-	(cd sub &&
-	 rm -f new-file &&
-	 REAL="$(pwd)/../.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git) &&
-	 echo .real >>.gitignore &&
-	 git commit -m "added .real to .gitignore" .gitignore
-
-[master 0444747] added .real to .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 24 - setup .git file for sub
-
-expecting success of 7506.25 'status with added file in modified submodule with .git file': 
-	(cd sub && git reset --hard && echo >foo && git add foo) &&
-	git status >output &&
-	test_grep "modified:   sub (new commits, modified content)" output
-
-HEAD is now at f86d50b next change
-	modified:   sub (new commits, modified content)
-ok 25 - status with added file in modified submodule with .git file
-
-expecting success of 7506.26 'status with a lot of untracked files in the submodule': 
-	(
-		cd sub &&
-		i=0 &&
-		while test $i -lt 1024
-		do
-			>some-file-$i &&
-			i=$(( $i + 1 )) || exit 1
-		done
-	) &&
-	git status --porcelain sub 2>err.actual &&
-	test_must_be_empty err.actual &&
-	rm err.actual
-
- M sub
-ok 26 - status with a lot of untracked files in the submodule
-
-expecting success of 7506.27 'rm submodule contents': 
-	rm -rf sub &&
-	mkdir sub
-
-ok 27 - rm submodule contents
-
-expecting success of 7506.28 'status clean (empty submodule dir)': 
-	git status >output &&
-	test_grep "nothing to commit" output
-
-nothing to commit, working tree clean
-ok 28 - status clean (empty submodule dir)
-
-expecting success of 7506.29 'status -a clean (empty submodule dir)': 
-	test_must_fail git commit --dry-run -a >output &&
-	test_grep "nothing to commit" output
-
-nothing to commit, working tree clean
-ok 29 - status -a clean (empty submodule dir)
-
-expecting success of 7506.30 'status with merge conflict in .gitmodules': 
-	git clone . super &&
-	test_create_repo_with_commit sub1 &&
-	test_tick &&
-	test_create_repo_with_commit sub2 &&
-	test_config_global protocol.file.allow always &&
-	(
-		cd super &&
-		prev=$(git rev-parse HEAD) &&
-		git checkout -b add_sub1 &&
-		git submodule add ../sub1 &&
-		git commit -m "add sub1" &&
-		git checkout -b add_sub2 $prev &&
-		git submodule add ../sub2 &&
-		git commit -m "add sub2" &&
-		git checkout -b merge_conflict_gitmodules &&
-		test_must_fail git merge add_sub1 &&
-		git status -s >../status_actual 2>&1
-	) &&
-	test_cmp status_actual status_expect
-
-Cloning into 'super'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub1/.git/
-[master (root-commit) 5dffd93]  Add bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-[master 3b5520a]  Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub2/.git/
-[master (root-commit) f4dd8ee]  Add bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-[master 0c53b86]  Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub1'...
-done.
-[add_sub1 7faba24] add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to a new branch 'add_sub2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub2'...
-done.
-[add_sub2 b4b6be0] add sub2
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-Switched to a new branch 'merge_conflict_gitmodules'
-Auto-merging .gitmodules
-CONFLICT (add/add): Merge conflict in .gitmodules
-Automatic merge failed; fix conflicts and then commit the result.
-ok 30 - status with merge conflict in .gitmodules
-
-expecting success of 7506.31 'diff with merge conflict in .gitmodules': 
-	(
-		cd super &&
-		git diff >../diff_actual 2>&1
-	) &&
-	sanitize_diff diff_actual >diff_sanitized &&
-	test_cmp diff_expect diff_sanitized
-
-ok 31 - diff with merge conflict in .gitmodules
-
-expecting success of 7506.32 'diff --submodule with merge conflict in .gitmodules': 
-	(
-		cd super &&
-		git diff --submodule >../diff_submodule_actual 2>&1
-	) &&
-	sanitize_diff diff_submodule_actual >diff_sanitized &&
-	test_cmp diff_submodule_expect diff_sanitized
-
-ok 32 - diff --submodule with merge conflict in .gitmodules
-
-expecting success of 7506.33 'setup superproject with untracked file in nested submodule': 
-	test_config_global protocol.file.allow always &&
-	(
-		cd super &&
-		git clean -dfx &&
-		git rm .gitmodules &&
-		git commit -m "remove .gitmodules" &&
-		git submodule add -f ./sub1 &&
-		git submodule add -f ./sub2 &&
-		git submodule add -f ./sub1 sub3 &&
-		git commit -a -m "messy merge in superproject" &&
-		(
-			cd sub1 &&
-			git submodule add ../sub2 &&
-			git commit -a -m "add sub2 to sub1"
-		) &&
-		git add sub1 &&
-		git commit -a -m "update sub1 to contain nested sub"
-	) &&
-	echo content >super/sub1/sub2/file &&
-	echo content >super/sub2/file &&
-	git -C super/sub3 clone ../../sub2 untracked_repository
-
-rm '.gitmodules'
-[merge_conflict_gitmodules 13fb2a3] remove .gitmodules
- Author: A U Thor <author@example.com>
-Adding existing repo at 'sub1' to the index
-Adding existing repo at 'sub2' to the index
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub3'...
-done.
-[merge_conflict_gitmodules cbf5b44] messy merge in superproject
- Author: A U Thor <author@example.com>
- 2 files changed, 10 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub3
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub1/sub2'...
-done.
-[master 3f03b6e] add sub2 to sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[merge_conflict_gitmodules 7b9e69d] update sub1 to contain nested sub
+[master (root-commit) ba9015c] hare
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'untracked_repository'...
-done.
-ok 33 - setup superproject with untracked file in nested submodule
-
-expecting success of 7506.34 'status with untracked file in nested submodule (porcelain)': 
-	git -C super status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub1
-	 M sub2
-	 M sub3
-	EOF
-
-ok 34 - status with untracked file in nested submodule (porcelain)
-
-expecting success of 7506.35 'status with untracked file in nested submodule (porcelain=2)': 
-	git -C super status --porcelain=2 >output &&
-	sanitize_output output &&
-	diff output - <<-\EOF
-	1 .M S..U 160000 160000 160000 HASH HASH sub1
-	1 .M S..U 160000 160000 160000 HASH HASH sub2
-	1 .M S..U 160000 160000 160000 HASH HASH sub3
-	EOF
-
-ok 35 - status with untracked file in nested submodule (porcelain=2)
-
-expecting success of 7506.36 'status with untracked file in nested submodule (short)': 
-	git -C super status --short >output &&
-	diff output - <<-\EOF
-	 ? sub1
-	 ? sub2
-	 ? sub3
-	EOF
-
-ok 36 - status with untracked file in nested submodule (short)
-
-expecting success of 7506.37 'setup superproject with modified file in nested submodule': 
-	git -C super/sub1/sub2 add file &&
-	git -C super/sub2 add file
-
-ok 37 - setup superproject with modified file in nested submodule
-
-expecting success of 7506.38 'status with added file in nested submodule (porcelain)': 
-	git -C super status --porcelain >output &&
-	diff output - <<-\EOF
-	 M sub1
-	 M sub2
-	 M sub3
-	EOF
-
-ok 38 - status with added file in nested submodule (porcelain)
-
-expecting success of 7506.39 'status with added file in nested submodule (porcelain=2)': 
-	git -C super status --porcelain=2 >output &&
-	sanitize_output output &&
-	diff output - <<-\EOF
-	1 .M S.M. 160000 160000 160000 HASH HASH sub1
-	1 .M S.M. 160000 160000 160000 HASH HASH sub2
-	1 .M S..U 160000 160000 160000 HASH HASH sub3
-	EOF
-
-ok 39 - status with added file in nested submodule (porcelain=2)
+fatal: cannot lock ref 'HEAD': reference already exists
+hare
+ok 1 - race to create orphan commit
 
-expecting success of 7506.40 'status with added file in nested submodule (short)': 
-	git -C super status --short >output &&
-	diff output - <<-\EOF
-	 m sub1
-	 m sub2
-	 ? sub3
+expecting success of 7516.2 'race to create non-orphan commit': 
+	write_script airplane-editor <<-\EOF &&
+	git commit --allow-empty -m airplane
 	EOF
+	git checkout --orphan branch &&
+	git commit --allow-empty -m base &&
+	git rev-parse HEAD >base &&
+	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
+	git show -s --pretty=format:%s >subject &&
+	grep airplane subject &&
+	git rev-parse HEAD^ >parent &&
+	test_cmp base parent
 
-ok 40 - status with added file in nested submodule (short)
-
-# passed all 40 test(s)
-1..40
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7515-status-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7515-status-symlinks/.git/
-expecting success of 7515.1 'setup': 
-	echo .gitignore >.gitignore &&
-	echo actual >>.gitignore &&
-	echo expect >>.gitignore &&
-	mkdir dir &&
-	echo x >dir/file1 &&
-	echo y >dir/file2 &&
-	git add dir &&
-	git commit -m initial &&
-	git tag initial
-
-[master (root-commit) 1048606] initial
+Switched to a new branch 'branch'
+[branch (root-commit) a4b5938] base
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir/file1
- create mode 100644 dir/file2
-ok 1 - setup
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7515.2 'symlink to a directory': 
-	test_when_finished "rm symlink" &&
-	ln -s dir symlink &&
-	echo "?? symlink" >expect &&
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-ok 2 - symlink to a directory
-
-expecting success of 7515.3 'symlink replacing a directory': 
-	test_when_finished "rm -rf copy && git reset --hard initial" &&
-	mkdir copy &&
-	cp dir/file1 copy/file1 &&
-	echo "changed in copy" >copy/file2 &&
-	git add copy &&
-	git commit -m second &&
-	rm -rf copy &&
-	ln -s dir copy &&
-	echo " D copy/file1" >expect &&
-	echo " D copy/file2" >>expect &&
-	echo "?? copy" >>expect &&
-	git status --porcelain >actual &&
-	test_cmp expect actual
-
-[master a9708ba] second
+[branch 7381062] airplane
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 copy/file1
- create mode 100644 copy/file2
-HEAD is now at 1048606 initial
-ok 3 - symlink replacing a directory
+fatal: cannot lock ref 'HEAD': is at 7381062986c200ad56d9a48e7a49719e434604a0 but expected a4b5938bdb0638bd7b0fd149a017cda4db88b551
+airplane
+ok 2 - race to create non-orphan commit
 
-# passed all 3 test(s)
-1..3
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7507-commit-verbose.sh ***
@@ -482213,48 +482625,521 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7516-commit-races.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7516-commit-races/.git/
-expecting success of 7516.1 'race to create orphan commit': 
-	write_script hare-editor <<-\EOF &&
-	git commit --allow-empty -m hare
+*** t7506-status-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/.git/
+expecting success of 7506.1 'setup': 
+	test_create_repo_with_commit sub &&
+	echo output > .gitignore &&
+	git add sub .gitignore &&
+	git commit -m "Add submodule sub"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub/.git/
+[master (root-commit) 5dffd93]  Add bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+[master 3b5520a]  Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+[master (root-commit) b687689] Add submodule sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitignore
+ create mode 160000 sub
+ok 1 - setup
+
+expecting success of 7506.2 'status clean': 
+	git status >output &&
+	test_grep "nothing to commit" output
+
+nothing to commit, working tree clean
+ok 2 - status clean
+
+expecting success of 7506.3 'commit --dry-run -a clean': 
+	test_must_fail git commit --dry-run -a >output &&
+	test_grep "nothing to commit" output
+
+nothing to commit, working tree clean
+ok 3 - commit --dry-run -a clean
+
+expecting success of 7506.4 'status with modified file in submodule': 
+	(cd sub && git reset --hard) &&
+	echo "changed" >sub/foo &&
+	git status >output &&
+	test_grep "modified:   sub (modified content)" output
+
+HEAD is now at 3b5520a  Add foo
+	modified:   sub (modified content)
+ok 4 - status with modified file in submodule
+
+expecting success of 7506.5 'status with modified file in submodule (porcelain)': 
+	(cd sub && git reset --hard) &&
+	echo "changed" >sub/foo &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
 	EOF
-	test_must_fail env EDITOR=./hare-editor git commit --allow-empty -m tortoise -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep hare subject &&
-	git show -s --pretty=format:%P >out &&
-	test_must_be_empty out
 
-[master (root-commit) ba9015c] hare
+HEAD is now at 3b5520a  Add foo
+ok 5 - status with modified file in submodule (porcelain)
+
+expecting success of 7506.6 'status with modified file in submodule (short)': 
+	(cd sub && git reset --hard) &&
+	echo "changed" >sub/foo &&
+	git status --short >output &&
+	diff output - <<-\EOF
+	 m sub
+	EOF
+
+HEAD is now at 3b5520a  Add foo
+ok 6 - status with modified file in submodule (short)
+
+expecting success of 7506.7 'status with added file in submodule': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status >output &&
+	test_grep "modified:   sub (modified content)" output
+
+HEAD is now at 3b5520a  Add foo
+	modified:   sub (modified content)
+ok 7 - status with added file in submodule
+
+expecting success of 7506.8 'status with added file in submodule (porcelain)': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+HEAD is now at 3b5520a  Add foo
+ok 8 - status with added file in submodule (porcelain)
+
+expecting success of 7506.9 'status with added file in submodule (short)': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status --short >output &&
+	diff output - <<-\EOF
+	 m sub
+	EOF
+
+HEAD is now at 3b5520a  Add foo
+ok 9 - status with added file in submodule (short)
+
+expecting success of 7506.10 'status with untracked file in submodule': 
+	(cd sub && git reset --hard) &&
+	echo "content" >sub/new-file &&
+	git status >output &&
+	test_grep "modified:   sub (untracked content)" output
+
+HEAD is now at 3b5520a  Add foo
+	modified:   sub (untracked content)
+ok 10 - status with untracked file in submodule
+
+expecting success of 7506.11 'status -uno with untracked file in submodule': 
+	git status -uno >output &&
+	test_grep "^nothing to commit" output
+
+nothing to commit (use -u to show untracked files)
+ok 11 - status -uno with untracked file in submodule
+
+expecting success of 7506.12 'status with untracked file in submodule (porcelain)': 
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+ok 12 - status with untracked file in submodule (porcelain)
+
+expecting success of 7506.13 'status with untracked file in submodule (short)': 
+	git status --short >output &&
+	diff output - <<-\EOF
+	 ? sub
+	EOF
+
+ok 13 - status with untracked file in submodule (short)
+
+expecting success of 7506.14 'status with added and untracked file in submodule': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	echo "content" >sub/new-file &&
+	git status >output &&
+	test_grep "modified:   sub (modified content, untracked content)" output
+
+HEAD is now at 3b5520a  Add foo
+	modified:   sub (modified content, untracked content)
+ok 14 - status with added and untracked file in submodule
+
+expecting success of 7506.15 'status with added and untracked file in submodule (porcelain)': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	echo "content" >sub/new-file &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+HEAD is now at 3b5520a  Add foo
+ok 15 - status with added and untracked file in submodule (porcelain)
+
+expecting success of 7506.16 'status with modified file in modified submodule': 
+	(cd sub && git reset --hard) &&
+	rm sub/new-file &&
+	(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
+	echo "changed" >sub/foo &&
+	git status >output &&
+	test_grep "modified:   sub (new commits, modified content)" output
+
+HEAD is now at 3b5520a  Add foo
+[master f86d50b] next change
  Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': reference already exists
-hare
-ok 1 - race to create orphan commit
+ 1 file changed, 1 insertion(+)
+	modified:   sub (new commits, modified content)
+ok 16 - status with modified file in modified submodule
 
-expecting success of 7516.2 'race to create non-orphan commit': 
-	write_script airplane-editor <<-\EOF &&
-	git commit --allow-empty -m airplane
+expecting success of 7506.17 'status with modified file in modified submodule (porcelain)': 
+	(cd sub && git reset --hard) &&
+	echo "changed" >sub/foo &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
 	EOF
-	git checkout --orphan branch &&
-	git commit --allow-empty -m base &&
-	git rev-parse HEAD >base &&
-	test_must_fail env EDITOR=./airplane-editor git commit --allow-empty -m ship -e &&
-	git show -s --pretty=format:%s >subject &&
-	grep airplane subject &&
-	git rev-parse HEAD^ >parent &&
-	test_cmp base parent
 
-Switched to a new branch 'branch'
-[branch (root-commit) a4b5938] base
+HEAD is now at f86d50b next change
+ok 17 - status with modified file in modified submodule (porcelain)
+
+expecting success of 7506.18 'status with added file in modified submodule': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status >output &&
+	test_grep "modified:   sub (new commits, modified content)" output
+
+HEAD is now at f86d50b next change
+	modified:   sub (new commits, modified content)
+ok 18 - status with added file in modified submodule
+
+expecting success of 7506.19 'status with added file in modified submodule (porcelain)': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+HEAD is now at f86d50b next change
+ok 19 - status with added file in modified submodule (porcelain)
+
+expecting success of 7506.20 'status with untracked file in modified submodule': 
+	(cd sub && git reset --hard) &&
+	echo "content" >sub/new-file &&
+	git status >output &&
+	test_grep "modified:   sub (new commits, untracked content)" output
+
+HEAD is now at f86d50b next change
+	modified:   sub (new commits, untracked content)
+ok 20 - status with untracked file in modified submodule
+
+expecting success of 7506.21 'status with untracked file in modified submodule (porcelain)': 
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+ok 21 - status with untracked file in modified submodule (porcelain)
+
+expecting success of 7506.22 'status with added and untracked file in modified submodule': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	echo "content" >sub/new-file &&
+	git status >output &&
+	test_grep "modified:   sub (new commits, modified content, untracked content)" output
+
+HEAD is now at f86d50b next change
+	modified:   sub (new commits, modified content, untracked content)
+ok 22 - status with added and untracked file in modified submodule
+
+expecting success of 7506.23 'status with added and untracked file in modified submodule (porcelain)': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	echo "content" >sub/new-file &&
+	git status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub
+	EOF
+
+HEAD is now at f86d50b next change
+ok 23 - status with added and untracked file in modified submodule (porcelain)
+
+expecting success of 7506.24 'setup .git file for sub': 
+	(cd sub &&
+	 rm -f new-file &&
+	 REAL="$(pwd)/../.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git) &&
+	 echo .real >>.gitignore &&
+	 git commit -m "added .real to .gitignore" .gitignore
+
+[master 0444747] added .real to .gitignore
  Author: A U Thor <author@example.com>
-[branch 7381062] airplane
+ 1 file changed, 1 insertion(+)
+ok 24 - setup .git file for sub
+
+expecting success of 7506.25 'status with added file in modified submodule with .git file': 
+	(cd sub && git reset --hard && echo >foo && git add foo) &&
+	git status >output &&
+	test_grep "modified:   sub (new commits, modified content)" output
+
+HEAD is now at f86d50b next change
+	modified:   sub (new commits, modified content)
+ok 25 - status with added file in modified submodule with .git file
+
+expecting success of 7506.26 'status with a lot of untracked files in the submodule': 
+	(
+		cd sub &&
+		i=0 &&
+		while test $i -lt 1024
+		do
+			>some-file-$i &&
+			i=$(( $i + 1 )) || exit 1
+		done
+	) &&
+	git status --porcelain sub 2>err.actual &&
+	test_must_be_empty err.actual &&
+	rm err.actual
+
+ M sub
+ok 26 - status with a lot of untracked files in the submodule
+
+expecting success of 7506.27 'rm submodule contents': 
+	rm -rf sub &&
+	mkdir sub
+
+ok 27 - rm submodule contents
+
+expecting success of 7506.28 'status clean (empty submodule dir)': 
+	git status >output &&
+	test_grep "nothing to commit" output
+
+nothing to commit, working tree clean
+ok 28 - status clean (empty submodule dir)
+
+expecting success of 7506.29 'status -a clean (empty submodule dir)': 
+	test_must_fail git commit --dry-run -a >output &&
+	test_grep "nothing to commit" output
+
+nothing to commit, working tree clean
+ok 29 - status -a clean (empty submodule dir)
+
+expecting success of 7506.30 'status with merge conflict in .gitmodules': 
+	git clone . super &&
+	test_create_repo_with_commit sub1 &&
+	test_tick &&
+	test_create_repo_with_commit sub2 &&
+	test_config_global protocol.file.allow always &&
+	(
+		cd super &&
+		prev=$(git rev-parse HEAD) &&
+		git checkout -b add_sub1 &&
+		git submodule add ../sub1 &&
+		git commit -m "add sub1" &&
+		git checkout -b add_sub2 $prev &&
+		git submodule add ../sub2 &&
+		git commit -m "add sub2" &&
+		git checkout -b merge_conflict_gitmodules &&
+		test_must_fail git merge add_sub1 &&
+		git status -s >../status_actual 2>&1
+	) &&
+	test_cmp status_actual status_expect
+
+Cloning into 'super'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub1/.git/
+[master (root-commit) 5dffd93]  Add bar
  Author: A U Thor <author@example.com>
-fatal: cannot lock ref 'HEAD': is at 7381062986c200ad56d9a48e7a49719e434604a0 but expected a4b5938bdb0638bd7b0fd149a017cda4db88b551
-airplane
-ok 2 - race to create non-orphan commit
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+[master 3b5520a]  Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/sub2/.git/
+[master (root-commit) f4dd8ee]  Add bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+[master 0c53b86]  Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub1'...
+done.
+[add_sub1 7faba24] add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to a new branch 'add_sub2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub2'...
+done.
+[add_sub2 b4b6be0] add sub2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+Switched to a new branch 'merge_conflict_gitmodules'
+Auto-merging .gitmodules
+CONFLICT (add/add): Merge conflict in .gitmodules
+Automatic merge failed; fix conflicts and then commit the result.
+ok 30 - status with merge conflict in .gitmodules
 
-# passed all 2 test(s)
-1..2
+expecting success of 7506.31 'diff with merge conflict in .gitmodules': 
+	(
+		cd super &&
+		git diff >../diff_actual 2>&1
+	) &&
+	sanitize_diff diff_actual >diff_sanitized &&
+	test_cmp diff_expect diff_sanitized
+
+ok 31 - diff with merge conflict in .gitmodules
+
+expecting success of 7506.32 'diff --submodule with merge conflict in .gitmodules': 
+	(
+		cd super &&
+		git diff --submodule >../diff_submodule_actual 2>&1
+	) &&
+	sanitize_diff diff_submodule_actual >diff_sanitized &&
+	test_cmp diff_submodule_expect diff_sanitized
+
+ok 32 - diff --submodule with merge conflict in .gitmodules
+
+expecting success of 7506.33 'setup superproject with untracked file in nested submodule': 
+	test_config_global protocol.file.allow always &&
+	(
+		cd super &&
+		git clean -dfx &&
+		git rm .gitmodules &&
+		git commit -m "remove .gitmodules" &&
+		git submodule add -f ./sub1 &&
+		git submodule add -f ./sub2 &&
+		git submodule add -f ./sub1 sub3 &&
+		git commit -a -m "messy merge in superproject" &&
+		(
+			cd sub1 &&
+			git submodule add ../sub2 &&
+			git commit -a -m "add sub2 to sub1"
+		) &&
+		git add sub1 &&
+		git commit -a -m "update sub1 to contain nested sub"
+	) &&
+	echo content >super/sub1/sub2/file &&
+	echo content >super/sub2/file &&
+	git -C super/sub3 clone ../../sub2 untracked_repository
+
+rm '.gitmodules'
+[merge_conflict_gitmodules 13fb2a3] remove .gitmodules
+ Author: A U Thor <author@example.com>
+Adding existing repo at 'sub1' to the index
+Adding existing repo at 'sub2' to the index
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub3'...
+done.
+[merge_conflict_gitmodules cbf5b44] messy merge in superproject
+ Author: A U Thor <author@example.com>
+ 2 files changed, 10 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub3
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7506-status-submodule/super/sub1/sub2'...
+done.
+[master 3f03b6e] add sub2 to sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[merge_conflict_gitmodules 7b9e69d] update sub1 to contain nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'untracked_repository'...
+done.
+ok 33 - setup superproject with untracked file in nested submodule
+
+expecting success of 7506.34 'status with untracked file in nested submodule (porcelain)': 
+	git -C super status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub1
+	 M sub2
+	 M sub3
+	EOF
+
+ok 34 - status with untracked file in nested submodule (porcelain)
+
+expecting success of 7506.35 'status with untracked file in nested submodule (porcelain=2)': 
+	git -C super status --porcelain=2 >output &&
+	sanitize_output output &&
+	diff output - <<-\EOF
+	1 .M S..U 160000 160000 160000 HASH HASH sub1
+	1 .M S..U 160000 160000 160000 HASH HASH sub2
+	1 .M S..U 160000 160000 160000 HASH HASH sub3
+	EOF
+
+ok 35 - status with untracked file in nested submodule (porcelain=2)
+
+expecting success of 7506.36 'status with untracked file in nested submodule (short)': 
+	git -C super status --short >output &&
+	diff output - <<-\EOF
+	 ? sub1
+	 ? sub2
+	 ? sub3
+	EOF
+
+ok 36 - status with untracked file in nested submodule (short)
+
+expecting success of 7506.37 'setup superproject with modified file in nested submodule': 
+	git -C super/sub1/sub2 add file &&
+	git -C super/sub2 add file
+
+ok 37 - setup superproject with modified file in nested submodule
+
+expecting success of 7506.38 'status with added file in nested submodule (porcelain)': 
+	git -C super status --porcelain >output &&
+	diff output - <<-\EOF
+	 M sub1
+	 M sub2
+	 M sub3
+	EOF
+
+ok 38 - status with added file in nested submodule (porcelain)
+
+expecting success of 7506.39 'status with added file in nested submodule (porcelain=2)': 
+	git -C super status --porcelain=2 >output &&
+	sanitize_output output &&
+	diff output - <<-\EOF
+	1 .M S.M. 160000 160000 160000 HASH HASH sub1
+	1 .M S.M. 160000 160000 160000 HASH HASH sub2
+	1 .M S..U 160000 160000 160000 HASH HASH sub3
+	EOF
+
+ok 39 - status with added file in nested submodule (porcelain=2)
+
+expecting success of 7506.40 'status with added file in nested submodule (short)': 
+	git -C super status --short >output &&
+	diff output - <<-\EOF
+	 m sub1
+	 m sub2
+	 ? sub3
+	EOF
+
+ok 40 - status with added file in nested submodule (short)
+
+# passed all 40 test(s)
+1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7518-ident-corner-cases.sh ***
@@ -482408,6 +483293,260 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7517-per-repo-email.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7517-per-repo-email/.git/
+expecting success of 7517.1 'setup a likely user.useConfigOnly use case': 
+	# we want to make sure a reflog is written, since that needs
+	# a non-strict ident. So be sure we have an actual commit.
+	test_commit foo &&
+
+	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+	git config user.name "test" &&
+	git config --global user.useConfigOnly true
+
+[main (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - setup a likely user.useConfigOnly use case
+
+expecting success of 7517.2 'fails committing if clone email is not set': 
+	test_must_fail git commit --allow-empty -m msg
+
+Author identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 2 - fails committing if clone email is not set
+
+expecting success of 7517.3 'fails committing if clone email is not set, but EMAIL set': 
+	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
+
+Author identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 3 - fails committing if clone email is not set, but EMAIL set
+
+expecting success of 7517.4 'succeeds committing if clone email is set': 
+	test_config user.email "test@ok.com" &&
+	git commit --allow-empty -m msg
+
+[main f3d9b79] msg
+ok 4 - succeeds committing if clone email is set
+
+expecting success of 7517.5 'succeeds cloning if global email is not set': 
+	git clone . clone
+
+Cloning into 'clone'...
+done.
+ok 5 - succeeds cloning if global email is not set
+
+expecting success of 7517.6 'set up rebase scenarios': 
+	# temporarily enable an actual ident for this setup
+	test_config user.email foo@example.com &&
+	test_commit new &&
+	git branch side-without-commit HEAD^ &&
+	git checkout -b side-with-commit HEAD^ &&
+	test_commit side
+
+[main a31892e] new
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Switched to a new branch 'side-with-commit'
+[side-with-commit 1946d3f] side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side.t
+ok 6 - set up rebase scenarios
+
+expecting success of 7517.7 'fast-forward rebase does not care about ident': 
+	git checkout -B tmp side-without-commit &&
+	git rebase main
+
+Switched to a new branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 7 - fast-forward rebase does not care about ident
+
+expecting success of 7517.8 'non-fast-forward rebase refuses to write commits': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase main
+
+Reset branch 'tmp'
+Rebasing (1/1)
Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 8 - non-fast-forward rebase refuses to write commits
+
+expecting success of 7517.9 'fast-forward rebase does not care about ident (interactive)': 
+	git checkout -B tmp side-without-commit &&
+	git rebase -i main
+
+Reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 9 - fast-forward rebase does not care about ident (interactive)
+
+expecting success of 7517.10 'non-fast-forward rebase refuses to write commits (interactive)': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -B tmp side-with-commit &&
+	test_must_fail git rebase -i main
+
+Reset branch 'tmp'
+Rebasing (1/1)
Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: no email was given and auto-detection is disabled
+ok 10 - non-fast-forward rebase refuses to write commits (interactive)
+
+expecting success of 7517.11 'noop interactive rebase does not care about ident': 
+	git checkout -B tmp side-with-commit &&
+	git rebase -i HEAD^
+
+Reset branch 'tmp'
+Successfully rebased and updated refs/heads/tmp.
+ok 11 - noop interactive rebase does not care about ident
+
+expecting success of 7517.12 'author.name overrides user.name': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.name author &&
+	test_commit author-name-override-user &&
+	echo author user@example.com > expected-author &&
+	echo user user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp 52999d1] author-name-override-user
+ Author: author <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 author-name-override-user.t
+ok 12 - author.name overrides user.name
+
+expecting success of 7517.13 'author.email overrides user.email': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.email author@example.com &&
+	test_commit author-email-override-user &&
+	echo user author@example.com > expected-author &&
+	echo user user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp e6f53d6] author-email-override-user
+ Author: user <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 author-email-override-user.t
+ok 13 - author.email overrides user.email
+
+expecting success of 7517.14 'committer.name overrides user.name': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config committer.name committer &&
+	test_commit committer-name-override-user &&
+	echo user user@example.com > expected-author &&
+	echo committer user@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp bdc357a] committer-name-override-user
+ Author: user <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 committer-name-override-user.t
+ok 14 - committer.name overrides user.name
+
+expecting success of 7517.15 'committer.email overrides user.email': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config committer.email committer@example.com &&
+	test_commit committer-email-override-user &&
+	echo user user@example.com > expected-author &&
+	echo user committer@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp de2310d] committer-email-override-user
+ Author: user <user@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 committer-email-override-user.t
+ok 15 - committer.email overrides user.email
+
+expecting success of 7517.16 'author and committer environment variables override config settings': 
+	test_config user.name user &&
+	test_config user.email user@example.com &&
+	test_config author.name author &&
+	test_config author.email author@example.com &&
+	test_config committer.name committer &&
+	test_config committer.email committer@example.com &&
+	GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
+	GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
+	GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
+	test_commit env-override-conf &&
+	echo env_author env_author@example.com > expected-author &&
+	echo env_commit env_commit@example.com > expected-committer &&
+	git log --format="%an %ae" -1 > actual-author &&
+	git log --format="%cn %ce" -1 > actual-committer &&
+	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
+	test_cmp expected-author actual-author &&
+	test_cmp expected-committer actual-committer
+
+[tmp 9b4fdf4] env-override-conf
+ Author: env_author <env_author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 env-override-conf.t
+ok 16 - author and committer environment variables override config settings
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7521-ignored-mode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7521-ignored-mode/.git/
 expecting success of 7521.1 'setup initial commit and ignore file': 
@@ -482725,260 +483864,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7517-per-repo-email.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7517-per-repo-email/.git/
-expecting success of 7517.1 'setup a likely user.useConfigOnly use case': 
-	# we want to make sure a reflog is written, since that needs
-	# a non-strict ident. So be sure we have an actual commit.
-	test_commit foo &&
-
-	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
-	git config user.name "test" &&
-	git config --global user.useConfigOnly true
-
-[main (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - setup a likely user.useConfigOnly use case
-
-expecting success of 7517.2 'fails committing if clone email is not set': 
-	test_must_fail git commit --allow-empty -m msg
-
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 2 - fails committing if clone email is not set
-
-expecting success of 7517.3 'fails committing if clone email is not set, but EMAIL set': 
-	test_must_fail env EMAIL=test@fail.com git commit --allow-empty -m msg
-
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 3 - fails committing if clone email is not set, but EMAIL set
-
-expecting success of 7517.4 'succeeds committing if clone email is set': 
-	test_config user.email "test@ok.com" &&
-	git commit --allow-empty -m msg
-
-[main f3d9b79] msg
-ok 4 - succeeds committing if clone email is set
-
-expecting success of 7517.5 'succeeds cloning if global email is not set': 
-	git clone . clone
-
-Cloning into 'clone'...
-done.
-ok 5 - succeeds cloning if global email is not set
-
-expecting success of 7517.6 'set up rebase scenarios': 
-	# temporarily enable an actual ident for this setup
-	test_config user.email foo@example.com &&
-	test_commit new &&
-	git branch side-without-commit HEAD^ &&
-	git checkout -b side-with-commit HEAD^ &&
-	test_commit side
-
-[main a31892e] new
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-Switched to a new branch 'side-with-commit'
-[side-with-commit 1946d3f] side
- 1 file changed, 1 insertion(+)
- create mode 100644 side.t
-ok 6 - set up rebase scenarios
-
-expecting success of 7517.7 'fast-forward rebase does not care about ident': 
-	git checkout -B tmp side-without-commit &&
-	git rebase main
-
-Switched to a new branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 7 - fast-forward rebase does not care about ident
-
-expecting success of 7517.8 'non-fast-forward rebase refuses to write commits': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase main
-
-Reset branch 'tmp'
-Rebasing (1/1)
Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 8 - non-fast-forward rebase refuses to write commits
-
-expecting success of 7517.9 'fast-forward rebase does not care about ident (interactive)': 
-	git checkout -B tmp side-without-commit &&
-	git rebase -i main
-
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 9 - fast-forward rebase does not care about ident (interactive)
-
-expecting success of 7517.10 'non-fast-forward rebase refuses to write commits (interactive)': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -i main
-
-Reset branch 'tmp'
-Rebasing (1/1)
Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: no email was given and auto-detection is disabled
-ok 10 - non-fast-forward rebase refuses to write commits (interactive)
-
-expecting success of 7517.11 'noop interactive rebase does not care about ident': 
-	git checkout -B tmp side-with-commit &&
-	git rebase -i HEAD^
-
-Reset branch 'tmp'
-Successfully rebased and updated refs/heads/tmp.
-ok 11 - noop interactive rebase does not care about ident
-
-expecting success of 7517.12 'author.name overrides user.name': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.name author &&
-	test_commit author-name-override-user &&
-	echo author user@example.com > expected-author &&
-	echo user user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
-
-[tmp 52999d1] author-name-override-user
- Author: author <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 author-name-override-user.t
-ok 12 - author.name overrides user.name
-
-expecting success of 7517.13 'author.email overrides user.email': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.email author@example.com &&
-	test_commit author-email-override-user &&
-	echo user author@example.com > expected-author &&
-	echo user user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
-
-[tmp e6f53d6] author-email-override-user
- Author: user <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 author-email-override-user.t
-ok 13 - author.email overrides user.email
-
-expecting success of 7517.14 'committer.name overrides user.name': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config committer.name committer &&
-	test_commit committer-name-override-user &&
-	echo user user@example.com > expected-author &&
-	echo committer user@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
-
-[tmp bdc357a] committer-name-override-user
- Author: user <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 committer-name-override-user.t
-ok 14 - committer.name overrides user.name
-
-expecting success of 7517.15 'committer.email overrides user.email': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config committer.email committer@example.com &&
-	test_commit committer-email-override-user &&
-	echo user user@example.com > expected-author &&
-	echo user committer@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
-
-[tmp de2310d] committer-email-override-user
- Author: user <user@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 committer-email-override-user.t
-ok 15 - committer.email overrides user.email
-
-expecting success of 7517.16 'author and committer environment variables override config settings': 
-	test_config user.name user &&
-	test_config user.email user@example.com &&
-	test_config author.name author &&
-	test_config author.email author@example.com &&
-	test_config committer.name committer &&
-	test_config committer.email committer@example.com &&
-	GIT_AUTHOR_NAME=env_author && export GIT_AUTHOR_NAME &&
-	GIT_AUTHOR_EMAIL=env_author@example.com && export GIT_AUTHOR_EMAIL &&
-	GIT_COMMITTER_NAME=env_commit && export GIT_COMMITTER_NAME &&
-	GIT_COMMITTER_EMAIL=env_commit@example.com && export GIT_COMMITTER_EMAIL &&
-	test_commit env-override-conf &&
-	echo env_author env_author@example.com > expected-author &&
-	echo env_commit env_commit@example.com > expected-committer &&
-	git log --format="%an %ae" -1 > actual-author &&
-	git log --format="%cn %ce" -1 > actual-committer &&
-	sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
-	sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
-	test_cmp expected-author actual-author &&
-	test_cmp expected-committer actual-committer
-
-[tmp 9b4fdf4] env-override-conf
- Author: env_author <env_author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 env-override-conf.t
-ok 16 - author and committer environment variables override config settings
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7525-status-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7525-status-rename/.git/
 expecting success of 7525.1 'setup': 
@@ -483505,6 +484390,262 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7604-merge-custom-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7604-merge-custom-message/.git/
+expecting success of 7604.1 'setup': 
+	echo c0 >c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 >c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 >c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	create_merge_msgs
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success of 7604.2 'merge c2 with a custom message': 
+	git reset --hard c1 &&
+	git merge -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.subject actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c2 with a custom message
+
+expecting success of 7604.3 'merge --log appends to custom message': 
+	git reset --hard c1 &&
+	git merge --log -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.log actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge --log appends to custom message
+
+expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
+
+ok 4 - prepare file with comment line and trailing newlines
+
+expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
+	git reset --hard c1 &&
+	git merge --cleanup=verbatim -F expect c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 5 - cleanup commit messages (verbatim option)
+
+expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git merge --cleanup=whitespace -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 6 - cleanup commit messages (whitespace option)
+
+expecting success of 7604.7 'cleanup merge messages (scissors option)': 
+	git reset --hard c1 &&
+	cat >text <<-\EOF &&
+
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
+
+	cat >expect <<-\EOF &&
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git merge --cleanup=scissors -e -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 7 - cleanup merge messages (scissors option)
+
+expecting success of 7604.8 'cleanup commit messages (strip option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git merge --cleanup=strip -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 8 - cleanup commit messages (strip option)
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7605-merge-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7605-merge-resolve/.git/
+expecting success of 7605.1 'setup': 
+	echo c0 > c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 > c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 > c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	git reset --hard c0 &&
+	echo c3 > c2.c &&
+	git add c2.c &&
+	git commit -m c3 &&
+	git tag c3
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at e4f5a3c c0
+[master c984a5f] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success of 7605.2 'merge c1 to c2': 
+	git reset --hard c1 &&
+	git merge -s resolve c2 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test 3 = $(git ls-tree -r HEAD | wc -l) &&
+	test 3 = $(git ls-files | wc -l)
+
+HEAD is now at 429abf0 c1
+Trying really trivial in-index merge...
+Wonderful.
+In-index merge
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c1 to c2
+
+expecting success of 7605.3 'merge c1 to c2, again': 
+	git reset --hard c1 &&
+	git merge -s resolve c2 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test 3 = $(git ls-tree -r HEAD | wc -l) &&
+	test 3 = $(git ls-files | wc -l)
+
+HEAD is now at 429abf0 c1
+Trying really trivial in-index merge...
+Wonderful.
+In-index merge
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge c1 to c2, again
+
+expecting success of 7605.4 'merge c2 to c3 (fails)': 
+	git reset --hard c2 &&
+	test_must_fail git merge -s resolve c3
+
+HEAD is now at 028ea41 c2
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Added c2.c in both, but differently.
+fatal: unable to read blob object e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+error: Could not stat : No such file or directory
+ERROR: content conflict in c2.c
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge c2 to c3 (fails)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7603-merge-reduce-heads.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7603-merge-reduce-heads/.git/
 expecting success of 7603.1 'setup': 
@@ -483828,6 +484969,131 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7606-merge-custom.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7606-merge-custom/.git/
+expecting success of 7606.1 'set up custom strategy': 
+	cat >git-merge-theirs <<-EOF &&
+	#!$SHELL_PATH
+	eval git read-tree --reset -u \\\$\$#
+	EOF
+
+	chmod +x git-merge-theirs &&
+	PATH=.:$PATH &&
+	export PATH
+
+ok 1 - set up custom strategy
+
+expecting success of 7606.2 'setup': 
+	test_commit c0 c0.c &&
+	test_commit c1 c1.c &&
+	git reset --keep c0 &&
+	echo c1c1 >c1.c &&
+	git add c1.c &&
+	test_commit c2 c2.c &&
+	git reset --keep c0 &&
+	test_commit c3 c3.c
+
+[master (root-commit) 934056f] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 7b51d7c] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+[master f06910a] c2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c1.c
+ create mode 100644 c2.c
+[master 934e277] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+ok 2 - setup
+
+expecting success of 7606.3 'merge c2 with a custom strategy': 
+	git reset --hard c1 &&
+
+	git rev-parse c1 >head.old &&
+	git rev-parse c2 >second-parent.expected &&
+	git rev-parse c2^{tree} >tree.expected &&
+	git merge -s theirs c2 &&
+
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c2 HEAD &&
+	git diff --exit-code c2 &&
+
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	grep c1c1 c1.c &&
+	test -f c2.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 2 +-
+ c2.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c2.c
+--- head.old	2025-03-17 13:28:35.907457663 +0000
++++ head.new	2025-03-17 13:28:36.095458851 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++5127482d58f03334905cdbe3564c8d092aa56dbe
+c1c1
+ok 3 - merge c2 with a custom strategy
+
+expecting success of 7606.4 'trivial merge with custom strategy': 
+	git reset --hard c1 &&
+
+	git rev-parse c1 >head.old &&
+	git rev-parse c3 >second-parent.expected &&
+	git rev-parse c3^{tree} >tree.expected &&
+	git merge -s theirs c3 &&
+
+	git rev-parse HEAD >head.new &&
+	git rev-parse HEAD^1 >first-parent &&
+	git rev-parse HEAD^2 >second-parent &&
+	git rev-parse HEAD^{tree} >tree &&
+	git update-index --refresh &&
+	git diff --exit-code &&
+	git diff --exit-code c3 HEAD &&
+	git diff --exit-code c3 &&
+
+	! test_cmp head.old head.new &&
+	test_cmp head.old first-parent &&
+	test_cmp second-parent.expected second-parent &&
+	test_cmp tree.expected tree &&
+	test -f c0.c &&
+	! test -e c1.c &&
+	test -f c3.c
+
+HEAD is now at 7b51d7c c1
+Merge made by the 'theirs' strategy.
+ c1.c | 1 -
+ c3.c | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 c1.c
+ create mode 100644 c3.c
+--- head.old	2025-03-17 13:28:36.395460746 +0000
++++ head.new	2025-03-17 13:28:36.567461833 +0000
+@@ -1 +1 @@
+-7b51d7cdbd54b8c470d864639e1136d88ce718ef
++f5f2abda42595469639ae786a37808202e35dcf0
+ok 4 - trivial merge with custom strategy
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7512-status-help.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7512-status-help/.git/
 expecting success of 7512.1 'prepare for conflicts': 
@@ -485699,154 +486965,6 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7604-merge-custom-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7604-merge-custom-message/.git/
-expecting success of 7604.1 'setup': 
-	echo c0 >c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 >c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 >c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	create_merge_msgs
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success of 7604.2 'merge c2 with a custom message': 
-	git reset --hard c1 &&
-	git merge -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.subject actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c2 with a custom message
-
-expecting success of 7604.3 'merge --log appends to custom message': 
-	git reset --hard c1 &&
-	git merge --log -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.log actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge --log appends to custom message
-
-expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 4 - prepare file with comment line and trailing newlines
-
-expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
-	git reset --hard c1 &&
-	git merge --cleanup=verbatim -F expect c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 5 - cleanup commit messages (verbatim option)
-
-expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git merge --cleanup=whitespace -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 6 - cleanup commit messages (whitespace option)
-
-expecting success of 7604.7 'cleanup merge messages (scissors option)': 
-	git reset --hard c1 &&
-	cat >text <<-\EOF &&
-
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
-
-	cat >expect <<-\EOF &&
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git merge --cleanup=scissors -e -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 7 - cleanup merge messages (scissors option)
-
-expecting success of 7604.8 'cleanup commit messages (strip option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git merge --cleanup=strip -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 8 - cleanup commit messages (strip option)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7519-status-fsmonitor.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7519-status-fsmonitor/.git/
 expecting success of 7519.1 'incompatible bare repo': 
@@ -485927,7 +487045,7 @@
 
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fsmonitor last update 1776626648488389360
+fsmonitor last update 1742218103599831363
 ok 6 - update-index --fsmonitor" adds the fsmonitor extension
 
 expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
@@ -486602,10 +487720,10 @@
 done.
 Cloning into 'sparse'...
 done.
-{"event":"region_enter","sid":"20260419T192420.320273Z-H8d819085-P0021a100","thread":"main","time":"2026-04-19T19:24:20.321012Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260419T192420.320273Z-H8d819085-P0021a100","thread":"main","time":"2026-04-19T19:24:20.361378Z","file":"fsmonitor.c","line":186,"t_rel":0.040365,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20260419T192420.551456Z-H8d819085-P0021a1e3","thread":"main","time":"2026-04-19T19:24:20.552245Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260419T192420.551456Z-H8d819085-P0021a1e3","thread":"main","time":"2026-04-19T19:24:20.578750Z","file":"fsmonitor.c","line":186,"t_rel":0.026505,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250317T132837.035604Z-H5c947e1c-P00344661","thread":"main","time":"2025-03-17T13:28:37.036298Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250317T132837.035604Z-H5c947e1c-P00344661","thread":"main","time":"2025-03-17T13:28:37.058852Z","file":"fsmonitor.c","line":186,"t_rel":0.022553,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250317T132837.312950Z-H5c947e1c-P0034472a","thread":"main","time":"2025-03-17T13:28:37.313729Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250317T132837.312950Z-H5c947e1c-P0034472a","thread":"main","time":"2025-03-17T13:28:37.331119Z","file":"fsmonitor.c","line":186,"t_rel":0.017389,"nesting":1,"category":"fsm_hook","label":"query"}
 [master 1279bb5] add dir1a
  Author: A U Thor <author@example.com>
  2 files changed, 0 insertions(+), 0 deletions(-)
@@ -486622,126 +487740,67 @@
 hint: see your sparse-checkout definition and compare it to your working
 hint: directory contents. Running 'git clean' may assist in this cleanup.
 hint: Disable this message with "git config set advice.sparseIndexExpanded false"
-{"event":"region_enter","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.155980Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.183094Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.156612Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000632,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.183138Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000044,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.134850Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.174843Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.155818Z","file":"fsmonitor.c","line":186,"t_rel":0.020967,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20260419T192421.134057Z-H8d819085-P0021a3ee","thread":"main","time":"2026-04-19T19:24:21.182035Z","file":"fsmonitor.c","line":186,"t_rel":0.007191,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.947801Z","file":"sparse-index.c","line":372,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.987828Z","file":"sparse-index.c","line":372,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.948314Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000513,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.987872Z","file":"sparse-index.c","line":455,"repo":1,"t_rel":0.000044,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.934348Z","file":"fsmonitor.c","line":176,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.969202Z","file":"fsmonitor.c","line":176,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.947640Z","file":"fsmonitor.c","line":186,"t_rel":0.013291,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20250317T132837.933637Z-H5c947e1c-P003448e8","thread":"main","time":"2025-03-17T13:28:37.986809Z","file":"fsmonitor.c","line":186,"t_rel":0.017606,"nesting":2,"category":"fsm_hook","label":"query"}
 ok 33 - status succeeds with sparse index
 
 # passed all 33 test(s)
 1..33
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7605-merge-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7605-merge-resolve/.git/
-expecting success of 7605.1 'setup': 
-	echo c0 > c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 > c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 > c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	git reset --hard c0 &&
-	echo c3 > c2.c &&
-	git add c2.c &&
-	git commit -m c3 &&
-	git tag c3
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at e4f5a3c c0
-[master c984a5f] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
+*** t7607-merge-state.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7607-merge-state/.git/
+expecting success of 7607.1 'Ensure we restore original state if no merge strategy handles it': 
+	test_commit --no-tag "Initial" base base &&
 
-expecting success of 7605.2 'merge c1 to c2': 
-	git reset --hard c1 &&
-	git merge -s resolve c2 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test 3 = $(git ls-tree -r HEAD | wc -l) &&
-	test 3 = $(git ls-files | wc -l)
+	for b in branch1 branch2 branch3
+	do
+		git checkout -b $b main &&
+		test_commit --no-tag "Change on $b" base $b || return 1
+	done &&
 
-HEAD is now at 429abf0 c1
-Trying really trivial in-index merge...
-Wonderful.
-In-index merge
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c1 to c2
+	git checkout branch1 &&
+	# This is a merge that octopus cannot handle.  Note, that it does not
+	# just hit conflicts, it completely fails and says that it cannot
+	# handle this type of merge.
+	test_expect_code 2 git merge branch2 branch3 >output 2>&1 &&
+	grep "fatal: merge program failed" output &&
+	grep "Should not be doing an octopus" output &&
 
-expecting success of 7605.3 'merge c1 to c2, again': 
-	git reset --hard c1 &&
-	git merge -s resolve c2 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test 3 = $(git ls-tree -r HEAD | wc -l) &&
-	test 3 = $(git ls-files | wc -l)
+	# Make sure we did not leave stray changes around when no appropriate
+	# merge strategy was found
+	git diff --exit-code --name-status &&
+	test_path_is_missing .git/MERGE_HEAD
 
-HEAD is now at 429abf0 c1
-Trying really trivial in-index merge...
-Wonderful.
-In-index merge
- c2.c | 1 +
+[main (root-commit) 9d985b8] Initial
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge c1 to c2, again
-
-expecting success of 7605.4 'merge c2 to c3 (fails)': 
-	git reset --hard c2 &&
-	test_must_fail git merge -s resolve c3
-
-HEAD is now at 028ea41 c2
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Added c2.c in both, but differently.
-fatal: unable to read blob object e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-error: Could not stat : No such file or directory
-ERROR: content conflict in c2.c
+ create mode 100644 base
+Switched to a new branch 'branch1'
+[branch1 8246e40] Change on branch1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch2'
+[branch2 34744a5] Change on branch2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branch3'
+[branch3 efa3c31] Change on branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'branch1'
 fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge c2 to c3 (fails)
+Should not be doing an octopus.
+ok 1 - Ensure we restore original state if no merge strategy handles it
 
-# passed all 4 test(s)
-1..4
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7602-merge-octopus-many.sh ***
@@ -487067,1128 +488126,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7606-merge-custom.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7606-merge-custom/.git/
-expecting success of 7606.1 'set up custom strategy': 
-	cat >git-merge-theirs <<-EOF &&
-	#!$SHELL_PATH
-	eval git read-tree --reset -u \\\$\$#
-	EOF
-
-	chmod +x git-merge-theirs &&
-	PATH=.:$PATH &&
-	export PATH
-
-ok 1 - set up custom strategy
-
-expecting success of 7606.2 'setup': 
-	test_commit c0 c0.c &&
-	test_commit c1 c1.c &&
-	git reset --keep c0 &&
-	echo c1c1 >c1.c &&
-	git add c1.c &&
-	test_commit c2 c2.c &&
-	git reset --keep c0 &&
-	test_commit c3 c3.c
-
-[master (root-commit) 934056f] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 7b51d7c] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-[master f06910a] c2
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c1.c
- create mode 100644 c2.c
-[master 934e277] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-ok 2 - setup
-
-expecting success of 7606.3 'merge c2 with a custom strategy': 
-	git reset --hard c1 &&
-
-	git rev-parse c1 >head.old &&
-	git rev-parse c2 >second-parent.expected &&
-	git rev-parse c2^{tree} >tree.expected &&
-	git merge -s theirs c2 &&
-
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c2 HEAD &&
-	git diff --exit-code c2 &&
-
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	grep c1c1 c1.c &&
-	test -f c2.c
-
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 2 +-
- c2.c | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 c2.c
---- head.old	2026-04-19 19:24:22.131659440 +0000
-+++ head.new	2026-04-19 19:24:22.279659440 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+5127482d58f03334905cdbe3564c8d092aa56dbe
-c1c1
-ok 3 - merge c2 with a custom strategy
-
-expecting success of 7606.4 'trivial merge with custom strategy': 
-	git reset --hard c1 &&
-
-	git rev-parse c1 >head.old &&
-	git rev-parse c3 >second-parent.expected &&
-	git rev-parse c3^{tree} >tree.expected &&
-	git merge -s theirs c3 &&
-
-	git rev-parse HEAD >head.new &&
-	git rev-parse HEAD^1 >first-parent &&
-	git rev-parse HEAD^2 >second-parent &&
-	git rev-parse HEAD^{tree} >tree &&
-	git update-index --refresh &&
-	git diff --exit-code &&
-	git diff --exit-code c3 HEAD &&
-	git diff --exit-code c3 &&
-
-	! test_cmp head.old head.new &&
-	test_cmp head.old first-parent &&
-	test_cmp second-parent.expected second-parent &&
-	test_cmp tree.expected tree &&
-	test -f c0.c &&
-	! test -e c1.c &&
-	test -f c3.c
-
-HEAD is now at 7b51d7c c1
-Merge made by the 'theirs' strategy.
- c1.c | 1 -
- c3.c | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 c1.c
- create mode 100644 c3.c
---- head.old	2026-04-19 19:24:22.475659440 +0000
-+++ head.new	2026-04-19 19:24:22.599659440 +0000
-@@ -1 +1 @@
--7b51d7cdbd54b8c470d864639e1136d88ce718ef
-+f5f2abda42595469639ae786a37808202e35dcf0
-ok 4 - trivial merge with custom strategy
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7607-merge-state.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7607-merge-state/.git/
-expecting success of 7607.1 'Ensure we restore original state if no merge strategy handles it': 
-	test_commit --no-tag "Initial" base base &&
-
-	for b in branch1 branch2 branch3
-	do
-		git checkout -b $b main &&
-		test_commit --no-tag "Change on $b" base $b || return 1
-	done &&
-
-	git checkout branch1 &&
-	# This is a merge that octopus cannot handle.  Note, that it does not
-	# just hit conflicts, it completely fails and says that it cannot
-	# handle this type of merge.
-	test_expect_code 2 git merge branch2 branch3 >output 2>&1 &&
-	grep "fatal: merge program failed" output &&
-	grep "Should not be doing an octopus" output &&
-
-	# Make sure we did not leave stray changes around when no appropriate
-	# merge strategy was found
-	git diff --exit-code --name-status &&
-	test_path_is_missing .git/MERGE_HEAD
-
-[main (root-commit) 9d985b8] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base
-Switched to a new branch 'branch1'
-[branch1 8246e40] Change on branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch2'
-[branch2 34744a5] Change on branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch3'
-[branch3 efa3c31] Change on branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'branch1'
-fatal: merge program failed
-Should not be doing an octopus.
-ok 1 - Ensure we restore original state if no merge strategy handles it
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7003-filter-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/.git/
-expecting success of 7003.1 'setup': 
-	test_commit A &&
-	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
-	test_commit --notick B &&
-	git checkout -b branch B &&
-	test_commit D &&
-	mkdir dir &&
-	test_commit dir/D &&
-	test_commit E &&
-	git checkout main &&
-	test_commit C &&
-	git checkout branch &&
-	git merge C &&
-	git tag F &&
-	test_commit G &&
-	test_commit H
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main e86e545] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'branch'
-[branch bd662c1] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch 3abb9b5] dir/D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/D.t
-[branch 48ac83b] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'main'
-[main 0e63577] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'branch'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch 3c39262] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[branch 110eac9] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-ok 1 - setup
-
-expecting success of 7003.2 'rewrite identically': 
-	git filter-branch branch
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/branch' is unchanged
-ok 2 - rewrite identically
-
-expecting success of 7003.3 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
-
-ok 3 - result is really identical
-
-expecting success of 7003.4 'rewrite bare repository identically': 
-	(git config core.bare true && cd .git &&
-	 git filter-branch branch > filter-output 2>&1 &&
-	! grep fatal filter-output)
-
-ok 4 - rewrite bare repository identically
-
-expecting success of 7003.5 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
-
-ok 5 - result is really identical
-
-expecting success of 7003.6 'correct GIT_DIR while using -d': 
-	mkdir drepo &&
-	( cd drepo &&
-	git init &&
-	test_commit drepo &&
-	git filter-branch -d "$TRASHDIR/dfoo" \
-		--index-filter "cp \"$TRASHDIR\"/dfoo/backup-refs \"$TRASHDIR\"" \
-	) &&
-	grep drepo "$TRASHDIR/backup-refs"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/drepo/.git/
-[main (root-commit) 9f96758] drepo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 drepo.t
-
Rewrite 9f9675864b1443cf5a1e281c740a8ba331951fba (1/1) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-9f9675864b1443cf5a1e281c740a8ba331951fba commit	refs/tags/drepo
-ok 6 - correct GIT_DIR while using -d
-
-expecting success of 7003.7 'tree-filter works with -d': 
-	git init drepo-tree &&
-	(
-		cd drepo-tree &&
-		test_commit one &&
-		git filter-branch -d "$TRASHDIR/dfoo" \
-			--tree-filter "echo changed >one.t" &&
-		echo changed >expect &&
-		git cat-file blob HEAD:one.t >actual &&
-		test_cmp expect actual &&
-		test_cmp one.t actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/drepo-tree/.git/
-[main (root-commit) d944c64] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-
Rewrite d944c643197c4e8b1e89974e6d9ba85df421b65d (1/1) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 7 - tree-filter works with -d
-
-expecting success of 7003.8 'Fail if commit filter fails': 
-	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    could not write rewritten commit
-ok 8 - Fail if commit filter fails
-
-expecting success of 7003.9 'rewrite, renaming a specific file': 
-	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 9 - rewrite, renaming a specific file
-
-expecting success of 7003.10 'test that the file was renamed': 
-	test D = "$(git show HEAD:doh --)" &&
-	! test -f D.t &&
-	test -f doh &&
-	test D = "$(cat doh)"
-
-ok 10 - test that the file was renamed
-
-expecting success of 7003.11 'rewrite, renaming a specific directory': 
-	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 28e3b83a5f2c2b87fa77b674df1529da9f4a66b4 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite b0e1a7fc77c44f8710a324ce0cdaa5f0e3f41f41 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    mv: cannot stat 'dir': No such file or directory
-
Rewrite 284d35b48d5c7cf8f258f9d25690e5c3c38bb8c3 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (5/9) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 11 - rewrite, renaming a specific directory
-
-expecting success of 7003.12 'test that the directory was renamed': 
-	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
-	! test -d dir &&
-	test -d diroh &&
-	! test -d diroh/dir &&
-	test -f diroh/D.t &&
-	test dir/D = "$(cat diroh/D.t)"
-
-ok 12 - test that the directory was renamed
-
-expecting success of 7003.13 'populate --state-branch': 
-	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
-
-Branch state does not exist. Will create
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/9) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-Saving rewrite state to state
-ok 13 - populate --state-branch
-
-expecting success of 7003.14 'using --state-branch to skip already rewritten commits': 
-	test_when_finished git reset --hard $V &&
-	git reset --hard $V &&
-	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD &&
-	test_cmp_rev $W HEAD
-
-HEAD is now at 8a3423e H
-Populating map from state (62b9c9fa908324bba33ac79ad962e765fd9a3958)
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/9) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/9) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-Saving rewrite state to state
-HEAD is now at 8a3423e H
-ok 14 - using --state-branch to skip already rewritten commits
-
-expecting success of 7003.15 'rewrite one branch, keeping a side branch': 
-	git branch modD oldD &&
-	git filter-branch -f --tree-filter "mv B.t boh || :" D..modD
-
-
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/modD' was rewritten
-ok 15 - rewrite one branch, keeping a side branch
-
-expecting success of 7003.16 'common ancestor is still common (unchanged)': 
-	test "$(git merge-base modD D)" = "$(git rev-parse B)"
-
-ok 16 - common ancestor is still common (unchanged)
-
-expecting success of 7003.17 'filter subdirectory only': 
-	mkdir subdir &&
-	touch subdir/new &&
-	git add subdir/new &&
-	test_tick &&
-	git commit -m "subdir" &&
-	echo H > A.t &&
-	test_tick &&
-	git commit -m "not subdir" A.t &&
-	echo A > subdir/new &&
-	test_tick &&
-	git commit -m "again subdir" subdir/new &&
-	git rm A.t &&
-	test_tick &&
-	git commit -m "again not subdir" &&
-	git branch sub &&
-	git branch sub-earlier HEAD~2 &&
-	git filter-branch -f --subdirectory-filter subdir \
-		refs/heads/sub refs/heads/sub-earlier
-
-[branch bb8f80d] subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subdir/new
-[branch 5bae69c] not subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch 140072e] again subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-rm 'A.t'
-[branch ead226b] again not subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A.t
-
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (2/2) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/sub' was rewritten
-Ref 'refs/heads/sub-earlier' was rewritten
-ok 17 - filter subdirectory only
-
-expecting success of 7003.18 'subdirectory filter result looks okay': 
-	test 2 = $(git rev-list sub | wc -l) &&
-	git show sub:new &&
-	test_must_fail git show sub:subdir &&
-	git show sub-earlier:new &&
-	test_must_fail git show sub-earlier:subdir
-
-A
-fatal: path 'subdir' exists on disk, but not in 'sub'
-fatal: path 'subdir' exists on disk, but not in 'sub-earlier'
-ok 18 - subdirectory filter result looks okay
-
-expecting success of 7003.19 'more setup': 
-	git checkout main &&
-	mkdir subdir &&
-	echo A > subdir/new &&
-	git add subdir/new &&
-	test_tick &&
-	git commit -m "subdir on main" subdir/new &&
-	git rm A.t &&
-	test_tick &&
-	git commit -m "again subdir on main" &&
-	git merge branch
-
-Switched to branch 'main'
-[main cb42fbf] subdir on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/new
-rm 'A.t'
-[main a1f80b9] again subdir on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A.t
-Merge made by the 'ort' strategy.
- E.t       | 1 +
- G.t       | 1 +
- H.t       | 1 +
- diroh/D.t | 1 +
- doh       | 1 +
- 5 files changed, 5 insertions(+)
- create mode 100644 E.t
- create mode 100644 G.t
- create mode 100644 H.t
- create mode 100644 diroh/D.t
- create mode 100644 doh
-ok 19 - more setup
-
-expecting success of 7003.20 'use index-filter to move into a subdirectory': 
-	git branch directorymoved &&
-	git filter-branch -f --index-filter \
-		 "git ls-files -s | sed \"s-	-&newsubdir/-\" |
-	          GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
-			git update-index --index-info &&
-		  mv \"\$GIT_INDEX_FILE.new\" \"\$GIT_INDEX_FILE\"" directorymoved &&
-	git diff --exit-code HEAD directorymoved:newsubdir
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/16) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/16) (1 seconds passed, remaining 4 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/16) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/16) (3 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/16) (4 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/16) (4 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/directorymoved' was rewritten
-ok 20 - use index-filter to move into a subdirectory
-
-expecting success of 7003.21 'stops when msg filter fails': 
-	old=$(git rev-parse HEAD) &&
-	test_must_fail git filter-branch -f --msg-filter false HEAD &&
-	test $old = $(git rev-parse HEAD) &&
-	rm -rf .git-rewrite
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    msg filter failed: false
-ok 21 - stops when msg filter fails
-
-expecting success of 7003.22 'author information is preserved': 
-	: > i &&
-	git add i &&
-	test_tick &&
-	GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
-	git branch preserved-author &&
-	(sane_unset GIT_AUTHOR_NAME &&
-	 git filter-branch -f --msg-filter "cat; \
-			test \$GIT_COMMIT != $(git rev-parse main) || \
-			echo Hallo" \
-		preserved-author) &&
-	git rev-list --author="B V Uips" preserved-author >actual &&
-	test_line_count = 1 actual
-
-[main 7da14ef] bvuips
- Author: B V Uips <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 i
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/17) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/17) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/17) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/17) (1 seconds passed, remaining 3 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (4/17) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (4/17) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/17) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/17) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/17) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/17) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (14/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (14/17) (2 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (14/17) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/preserved-author' was rewritten
-ok 22 - author information is preserved
-
-expecting success of 7003.23 'remove a certain author's commits': 
-	echo i > i &&
-	test_tick &&
-	git commit -m i i &&
-	git branch removed-author &&
-	git filter-branch -f --commit-filter "\
-		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
-		then\
-			skip_commit \"\$@\";
-		else\
-			git commit-tree \"\$@\";\
-		fi" removed-author &&
-	cnt1=$(git rev-list main | wc -l) &&
-	cnt2=$(git rev-list removed-author | wc -l) &&
-	test $cnt1 -eq $(($cnt2 + 1)) &&
-	git rev-list --author="B V Uips" removed-author >actual &&
-	test_line_count = 0 actual
-
-[main 0261af1] i
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/18) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/18) (1 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (13/18) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (13/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (13/18) (2 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (13/18) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/removed-author' was rewritten
-ok 23 - remove a certain author's commits
-
-expecting success of 7003.24 'barf on invalid name': 
-	test_must_fail git filter-branch -f main xy-problem &&
-	test_must_fail git filter-branch -f HEAD^
-
-fatal: ambiguous argument 'xy-problem': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-You must specify a ref to rewrite.
-ok 24 - barf on invalid name
-
-expecting success of 7003.25 '"map" works in commit filter': 
-	git filter-branch -f --commit-filter "\
-		parent=\$(git rev-parse \$GIT_COMMIT^) &&
-		mapped=\$(map \$parent) &&
-		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
-		test \$mapped = \$actual &&
-		git commit-tree \"\$@\";" main~2..main &&
-	git rev-parse --verify main
-
-
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-0261af146239dd954a19d76ae2a417dd3af8b791
-ok 25 - "map" works in commit filter
-
-expecting success of 7003.26 'Name needing quotes': 
-
-	git checkout -b rerere A &&
-	mkdir foo &&
-	name="れれれ" &&
-	>foo/$name &&
-	git add foo &&
-	git commit -m "Adding a file" &&
-	git filter-branch --tree-filter "rm -fr foo" &&
-	test_must_fail git ls-files --error-unmatch "foo/$name" &&
-	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
-
-
-Switched to a new branch 'rerere'
-[rerere 1d45e88] Adding a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 "foo/\343\202\214\343\202\214\343\202\214"
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d45e8854f1dd5452938be2dedb173087134c05c (2/2) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/rerere' was rewritten
-error: pathspec 'foo/れれれ' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 26 - Name needing quotes
-
-expecting success of 7003.27 'Subdirectory filter with disappearing trees': 
-	git reset --hard &&
-	git checkout main &&
-
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Adding foo" &&
-
-	git rm -r foo &&
-	test_tick &&
-	git commit -m "Removing foo" &&
-
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Re-adding foo" &&
-
-	git filter-branch -f --subdirectory-filter foo &&
-	git rev-list main >actual &&
-	test_line_count = 3 actual
-
-HEAD is now at 643bd56 Adding a file
-Switched to branch 'main'
-[main f7eadb2] Adding foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-rm 'foo/bar'
-[main ee48524] Removing foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 foo/bar
-[main 14fe8c6] Re-adding foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 27 - Subdirectory filter with disappearing trees
-
-expecting success of 7003.28 'Tag name filtering retains tag message': 
-	git tag -m atag T &&
-	git cat-file tag T > expect &&
-	git filter-branch -f --tag-name-filter cat &&
-	git cat-file tag T > actual &&
-	test_cmp expect actual
-
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 28 - Tag name filtering retains tag message
-
-expecting success of 7003.29 'Tag name filtering strips gpg signature': 
-	sha1=$(git rev-parse HEAD) &&
-	sha1t=$(echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | git mktag) &&
-	git update-ref "refs/tags/S" "$sha1t" &&
-	echo "$faux_gpg_tag" | sed -e s/XXXXXX/$sha1/ | head -n 6 > expect &&
-	git filter-branch -f --tag-name-filter cat &&
-	git cat-file tag S > actual &&
-	test_cmp expect actual
-
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (1 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (2/3) (1 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-S -> S (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-gpg signature stripped from tag object 5e10caf7d74c3ace8930aa1d5449d4d0ceb2e9e0
-T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 29 - Tag name filtering strips gpg signature
-
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-ok 30 # skip Filtering retains message of gpg signed commit (missing GPG)
-
-expecting success of 7003.31 'Tag name filtering allows slashes in tag names': 
-	git tag -m tag-with-slash X/1 &&
-	git cat-file tag X/1 | sed -e s,X/1,X/2, > expect &&
-	git filter-branch -f --tag-name-filter "echo X/2" &&
-	git cat-file tag X/2 > actual &&
-	test_cmp expect actual
-
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-S -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-T -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-X/1 -> X/2 (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 31 - Tag name filtering allows slashes in tag names
-
-expecting success of 7003.32 'setup --prune-empty comparisons': 
-	git checkout --orphan main-no-a &&
-	git rm -rf . &&
-	unset test_tick &&
-	test_tick &&
-	GIT_COMMITTER_DATE="@0 +0000" GIT_AUTHOR_DATE="@0 +0000" &&
-	test_commit --notick B B.t B Bx &&
-	git checkout -b branch-no-a Bx &&
-	test_commit D D.t D Dx &&
-	mkdir dir &&
-	test_commit dir/D dir/D.t dir/D dir/Dx &&
-	test_commit E E.t E Ex &&
-	git checkout main-no-a &&
-	test_commit C C.t C Cx &&
-	git checkout branch-no-a &&
-	git merge Cx -m "Merge tag 'C' into branch" &&
-	git tag Fx &&
-	test_commit G G.t G Gx &&
-	test_commit H H.t H Hx &&
-	git checkout branch
-
-Switched to a new branch 'main-no-a'
-rm 'bar'
-[main-no-a (root-commit) 8d95d31] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'branch-no-a'
-[branch-no-a 2d0b6b2] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[branch-no-a 6b73242] dir/D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/D.t
-[branch-no-a 6e45985] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'main-no-a'
-[main-no-a 5a68040] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'branch-no-a'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[branch-no-a f0368e4] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[branch-no-a 00fc75b] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to branch 'branch'
-ok 32 - setup --prune-empty comparisons
-
-expecting success of 7003.33 'Prune empty commits': 
-	git rev-list HEAD > expect &&
-	test_commit to_remove &&
-	git filter-branch -f --index-filter "git update-index --remove to_remove.t" --prune-empty HEAD &&
-	git rev-list HEAD > actual &&
-	test_cmp expect actual
-
-[branch 219a992] to_remove
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (13/14) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 33 - Prune empty commits
-
-expecting success of 7003.34 'prune empty collapsed merges': 
-	test_config merge.ff false &&
-	git rev-list HEAD >expect &&
-	test_commit to_remove_2 &&
-	git reset --hard HEAD^ &&
-	test_merge non-ff to_remove_2 &&
-	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
-	git rev-list HEAD >actual &&
-	test_cmp expect actual
-
-[branch cb86908] to_remove_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-HEAD is now at ead226b again not subdir
-Merge made by the 'ort' strategy.
- to_remove_2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (6/15) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/15) (2 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (13/15) (2 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (13/15) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 34 - prune empty collapsed merges
-
-expecting success of 7003.35 'prune empty works even without index/tree filters': 
-	git rev-list HEAD >expect &&
-	git commit --allow-empty -m empty &&
-	git filter-branch -f --prune-empty HEAD &&
-	git rev-list HEAD >actual &&
-	test_cmp expect actual
-
-[branch 5b6cb84] empty
- Author: A U Thor <author@example.com>
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (11/14) (2 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 35 - prune empty works even without index/tree filters
-
-expecting success of 7003.36 '--prune-empty is able to prune root commit': 
-	git rev-list branch-no-a >expect &&
-	git branch testing H &&
-	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
-	git rev-list testing >actual &&
-	git branch -D testing &&
-	test_cmp expect actual
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (5/9) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/testing' was rewritten
-Deleted branch testing (was 00fc75b).
-ok 36 - --prune-empty is able to prune root commit
-
-expecting success of 7003.37 '--prune-empty is able to prune entire branch': 
-	git branch prune-entire B &&
-	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
-	test_must_fail git rev-parse refs/heads/prune-entire &&
-	test_must_fail git reflog exists refs/heads/prune-entire
-
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/2) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/prune-entire' was deleted
-fatal: ambiguous argument 'refs/heads/prune-entire': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/heads/prune-entire
-ok 37 - --prune-empty is able to prune entire branch
-
-expecting success of 7003.38 '--remap-to-ancestor with filename filters': 
-	git checkout main &&
-	git reset --hard A &&
-	test_commit add-foo foo 1 &&
-	git branch moved-foo &&
-	test_commit add-bar bar a &&
-	git branch invariant &&
-	orig_invariant=$(git rev-parse invariant) &&
-	git branch moved-bar &&
-	test_commit change-foo foo 2 &&
-	git filter-branch -f --remap-to-ancestor \
-		moved-foo moved-bar A..main \
-		-- -- foo &&
-	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
-	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
-	test $orig_invariant = $(git rev-parse invariant)
-
-Switched to branch 'main'
-HEAD is now at 0ddfaf1 A
-[main 7d21991] add-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 2ff770b] add-bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main b2d4813] change-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
Rewrite 7d219912875c3b539add35fdb1e3d70e5572ca7c (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite b2d4813d3ebe523582008cb287d933f8c14917be (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/moved-foo' is unchanged
-Ref 'refs/heads/moved-bar' was rewritten
-Ref 'refs/heads/main' was rewritten
-ok 38 - --remap-to-ancestor with filename filters
-
-expecting success of 7003.39 'automatic remapping to ancestor with filename filters': 
-	git checkout main &&
-	git reset --hard A &&
-	test_commit add-foo2 foo 1 &&
-	git branch moved-foo2 &&
-	test_commit add-bar2 bar a &&
-	git branch invariant2 &&
-	orig_invariant=$(git rev-parse invariant2) &&
-	git branch moved-bar2 &&
-	test_commit change-foo2 foo 2 &&
-	git filter-branch -f \
-		moved-foo2 moved-bar2 A..main \
-		-- -- foo &&
-	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
-	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
-	test $orig_invariant = $(git rev-parse invariant2)
-
-Already on 'main'
-HEAD is now at 0ddfaf1 A
-[main 59b5b5a] add-foo2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 20d4afa] add-bar2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 1fe7e14] change-foo2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
Rewrite 59b5b5af49738cc3e3cc6618c173c3d768334f67 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fe7e1483a7337eb5fecbd426d19506d3422d75d (2/2) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/moved-foo2' is unchanged
-Ref 'refs/heads/moved-bar2' was rewritten
-Ref 'refs/heads/main' was rewritten
-ok 39 - automatic remapping to ancestor with filename filters
-
-expecting success of 7003.40 'setup submodule': 
-	rm -fr ?* .git &&
-	git init &&
-	test_commit file &&
-	mkdir submod &&
-	submodurl="$PWD/submod" &&
-	( cd submod &&
-	  git init &&
-	  test_commit file-in-submod ) &&
-	git submodule add "$submodurl" &&
-	git commit -m "added submodule" &&
-	test_commit add-file &&
-	( cd submod && test_commit add-in-submodule ) &&
-	git add submod &&
-	git commit -m "changed submodule" &&
-	git branch original HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/.git/
-[main (root-commit) cc5d755] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7003-filter-branch/submod/.git/
-[main (root-commit) bd0b946] file-in-submod
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-in-submod.t
-Adding existing repo at 'submod' to the index
-[main 1fac80d] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submod
-[main 2a85aed] add-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-file.t
-[main bf0f869] add-in-submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-in-submodule.t
-[main a3b930e] changed submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 40 - setup submodule
-
-expecting success of 7003.41 'rewrite submodule with another content': 
-	git filter-branch --tree-filter "test -d submod && {
-					 rm -rf submod &&
-					 git rm -rf --quiet submod &&
-					 mkdir submod &&
-					 : > submod/file
-					 } || :" HEAD &&
-	test $orig_head != $(git show-ref --hash --head HEAD)
-
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fac80dffdedfa43ee816ab71eb75efeb8af5021 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 2a85aed61b58f4b534ec65cca9f8c07c0590543d (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (4/4) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-warning: unable to rmdir 'submod': Directory not empty
-ok 41 - rewrite submodule with another content
-
-expecting success of 7003.42 'replace submodule revision': 
-	invalid=$(test_oid numeric) &&
-	git reset --hard original &&
-	git filter-branch -f --tree-filter \
-	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
-	     then git update-index --cacheinfo 160000 $invalid submod
-	     fi" HEAD &&
-	test $orig_head != $(git show-ref --hash --head HEAD)
-
-HEAD is now at a3b930e changed submodule
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1fac80dffdedfa43ee816ab71eb75efeb8af5021 (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 2a85aed61b58f4b534ec65cca9f8c07c0590543d (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (4/4) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 42 - replace submodule revision
-
-expecting success of 7003.43 'filter commit message without trailing newline': 
-	git reset --hard original &&
-	commit=$(printf "no newline" | git commit-tree HEAD^{tree}) &&
-	git update-ref refs/heads/no-newline $commit &&
-	git filter-branch -f refs/heads/no-newline &&
-	echo $commit >expect &&
-	git rev-parse refs/heads/no-newline >actual &&
-	test_cmp expect actual
-
-HEAD is now at a3b930e changed submodule
-
Rewrite 3138087b49cfe2728b88f0e57c6d86bc3dd66c60 (1/1) (0 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/no-newline' is unchanged
-ok 43 - filter commit message without trailing newline
-
-expecting success of 7003.44 'tree-filter deals with object name vs pathname ambiguity': 
-	test_when_finished "git reset --hard original" &&
-	ambiguous=$(git rev-list -1 HEAD) &&
-	git filter-branch --tree-filter "mv file.t $ambiguous" HEAD^.. &&
-	git show HEAD:$ambiguous
-
-
Rewrite a3b930e495518274a2bd7541bce6f2e1312d1263 (1/1) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-file
-HEAD is now at a3b930e changed submodule
-ok 44 - tree-filter deals with object name vs pathname ambiguity
-
-expecting success of 7003.45 'rewrite repository including refs that point at non-commit object': 
-	test_when_finished "git reset --hard original" &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	test_when_finished "git replace -d $tree" &&
-	echo A >new &&
-	git add new &&
-	new_tree=$(git write-tree) &&
-	git replace $tree $new_tree &&
-	git tag -a -m "tag to a tree" treetag $new_tree &&
-	git reset --hard HEAD &&
-	git filter-branch -f -- --all >filter-output 2>&1 &&
-	! grep fatal filter-output
-
-HEAD is now at a3b930e changed submodule
-Deleted replace ref '339ef39c910aedf9ce16075111e2ae7ace4a59ab'
-HEAD is now at a3b930e changed submodule
-ok 45 - rewrite repository including refs that point at non-commit object
-
-expecting success of 7003.46 'filter-branch handles ref deletion': 
-	git switch --orphan empty-commit &&
-	git commit --allow-empty -m "empty commit" &&
-	git tag empty &&
-	git branch to-delete &&
-	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
-	grep "to-delete.*was deleted" out &&
-	test_must_fail git rev-parse --verify to-delete
-
-warning: unable to rmdir 'submod': Directory not empty
-Switched to a new branch 'empty-commit'
-[empty-commit (root-commit) dfb35d9] empty commit
- Author: A U Thor <author@example.com>
-Ref 'refs/heads/to-delete' was deleted
-fatal: Needed a single revision
-ok 46 - filter-branch handles ref deletion
-
-expecting success of 7003.47 'filter-branch handles ref rewrite': 
-	git checkout empty &&
-	test_commit to-drop &&
-	git branch rewrite &&
-	git filter-branch -f \
-		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
-		 rewrite >out 2>&1 &&
-	grep "rewrite.*was rewritten" out &&
-	! grep -i warning out &&
-	git diff-tree empty rewrite
-
-Note: switching to 'empty'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at dfb35d9 empty commit
-[detached HEAD 01ece84] to-drop
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-drop.t
-Ref 'refs/heads/rewrite' was rewritten
-ok 47 - filter-branch handles ref rewrite
-
-expecting success of 7003.48 'filter-branch handles ancestor rewrite': 
-	test_commit to-exclude &&
-	git branch ancestor &&
-	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
-	grep "ancestor.*was rewritten" out &&
-	! grep -i warning out &&
-	git diff-tree HEAD^ ancestor
-
-[detached HEAD 07a3627] to-exclude
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to-exclude.t
-Ref 'refs/heads/ancestor' was rewritten
-ok 48 - filter-branch handles ancestor rewrite
-
-# passed all 48 test(s)
-1..48
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7608-merge-messages.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7608-merge-messages/.git/
 expecting success of 7608.1 'merge local branch': 
@@ -488415,87 +488352,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7614-merge-signoff/.git/
-expecting success of 7614.1 'setup': 
-	test_setup
-
-[main (root-commit) 6c54391] Initial empty commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'other-branch'
-[other-branch 5599d17] other-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 1 - setup
-
-expecting success of 7614.2 'git merge --signoff adds a sign-off line': 
-	git checkout main &&
-	test_commit main-branch-2 file2 2 &&
-	git checkout other-branch &&
-	git merge main --signoff --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
-
-Switched to branch 'main'
-[main 3d2fc9d] main-branch-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file2 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 2 - git merge --signoff adds a sign-off line
-
-expecting success of 7614.3 'git merge does not add a sign-off line': 
-	git checkout main &&
-	test_commit main-branch-3 file3 3 &&
-	git checkout other-branch &&
-	git merge main --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-
-Switched to branch 'main'
-[main fb2817d] main-branch-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file3 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 3 - git merge does not add a sign-off line
-
-expecting success of 7614.4 'git merge --no-signoff flag cancels --signoff flag': 
-	git checkout main &&
-	test_commit main-branch-4 file4 4 &&
-	git checkout other-branch &&
-	git merge main --no-edit --signoff --no-signoff &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-
-Switched to branch 'main'
-[main 6807046] main-branch-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file4 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-ok 4 - git merge --no-signoff flag cancels --signoff flag
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7611-merge-abort.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7611-merge-abort/.git/
 expecting success of 7611.1 'setup': 
@@ -488755,6 +488611,87 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7614-merge-signoff/.git/
+expecting success of 7614.1 'setup': 
+	test_setup
+
+[main (root-commit) 6c54391] Initial empty commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'other-branch'
+[other-branch 5599d17] other-branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 1 - setup
+
+expecting success of 7614.2 'git merge --signoff adds a sign-off line': 
+	git checkout main &&
+	test_commit main-branch-2 file2 2 &&
+	git checkout other-branch &&
+	git merge main --signoff --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-signed actual
+
+Switched to branch 'main'
+[main 3d2fc9d] main-branch-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
+Merge made by the 'ort' strategy.
+ file2 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 2 - git merge --signoff adds a sign-off line
+
+expecting success of 7614.3 'git merge does not add a sign-off line': 
+	git checkout main &&
+	test_commit main-branch-3 file3 3 &&
+	git checkout other-branch &&
+	git merge main --no-edit &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned actual
+
+Switched to branch 'main'
+[main fb2817d] main-branch-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
+Merge made by the 'ort' strategy.
+ file3 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 3 - git merge does not add a sign-off line
+
+expecting success of 7614.4 'git merge --no-signoff flag cancels --signoff flag': 
+	git checkout main &&
+	test_commit main-branch-4 file4 4 &&
+	git checkout other-branch &&
+	git merge main --no-edit --signoff --no-signoff &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	test_cmp expected-unsigned actual
+
+Switched to branch 'main'
+[main 6807046] main-branch-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+warning: refname 'other-branch' is ambiguous.
+Switched to branch 'other-branch'
+Merge made by the 'ort' strategy.
+ file4 | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+ok 4 - git merge --no-signoff flag cancels --signoff flag
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7615-diff-algo-with-mergy-operations.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7615-diff-algo-with-mergy-operations/.git/
 expecting success of 7615.1 'setup': 
@@ -488870,6 +488807,33 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7702-repack-cyclic-alternate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7702-repack-cyclic-alternate/.git/
+expecting success of 7702.1 'setup': 
+	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
+	export GIT_OBJECT_DIRECTORY &&
+	touch a &&
+	git add a &&
+	git commit -m 1 &&
+	git repack -adl &&
+	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
+
+[master (root-commit) 9b08673] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
+
+expecting success of 7702.2 're-packing repository with itself as alternate': 
+	git repack -adl &&
+	git fsck
+
+ok 2 - re-packing repository with itself as alternate
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7513-interpret-trailers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7513-interpret-trailers/.git/
 expecting success of 7513.1 'setup': 
@@ -490984,31 +490948,303 @@
 1..99
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7702-repack-cyclic-alternate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7702-repack-cyclic-alternate/.git/
-expecting success of 7702.1 'setup': 
-	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
-	export GIT_OBJECT_DIRECTORY &&
-	touch a &&
-	git add a &&
-	git commit -m 1 &&
-	git repack -adl &&
-	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
+*** t7701-repack-unpack-unreachable.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7701-repack-unpack-unreachable/.git/
+expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
+	echo content > file1 &&
+	git add . &&
+	test_tick &&
+	git commit -m initial_commit &&
+	# create a transient branch with unique content
+	git checkout -b transient_branch &&
+	echo more content >> file1 &&
+	# record the objects created in the database for file, commit, tree
+	fsha1=$(git hash-object file1) &&
+	test_tick &&
+	git commit -a -m more_content &&
+	csha1=$(git rev-parse HEAD^{commit}) &&
+	tsha1=$(git rev-parse HEAD^{tree}) &&
+	git checkout main &&
+	echo even more content >> file1 &&
+	test_tick &&
+	git commit -a -m even_more_content &&
+	# delete the transient branch
+	git branch -D transient_branch &&
+	# pack the repo
+	git repack -A -d -l &&
+	# verify objects are packed in repository
+	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1 &&
+	# now expire the reflog, while keeping reachable ones but expiring
+	# unreachables immediately
+	test_tick &&
+	sometimeago=$(( $test_tick - 10000 )) &&
+	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
+	# and repack
+	git repack -A -d -l &&
+	# verify objects are retained unpacked
+	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
 
-[master (root-commit) 9b08673] 1
+[main (root-commit) 5236a77] initial_commit
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+Switched to a new branch 'transient_branch'
+[transient_branch 24d3dd6] more_content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+[main 934cb86] even_more_content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Deleted branch transient_branch (was 24d3dd6).
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
 
-expecting success of 7702.2 're-packing repository with itself as alternate': 
-	git repack -adl &&
-	git fsck
+    more_content
 
-ok 2 - re-packing repository with itself as alternate
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
 
-# passed all 2 test(s)
-1..2
+file1
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    more_content
+
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
+
+file1
+ok 1 - -A with -d option leaves unreachable objects unpacked
+
+expecting success of 7701.2 '-A without -d option leaves unreachable objects packed': 
+	fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
+	fsha1path=".git/objects/$fsha1path" &&
+	csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
+	csha1path=".git/objects/$csha1path" &&
+	tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
+	tsha1path=".git/objects/$tsha1path" &&
+	git branch transient_branch $csha1 &&
+	git repack -a -d -l &&
+	test ! -f "$fsha1path" &&
+	test ! -f "$csha1path" &&
+	test ! -f "$tsha1path" &&
+	test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
+	packfile=$(ls .git/objects/pack/pack-*.pack) &&
+	git branch -D transient_branch &&
+	test_tick &&
+	git repack -A -l &&
+	test ! -f "$fsha1path" &&
+	test ! -f "$csha1path" &&
+	test ! -f "$tsha1path" &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
+
+Deleted branch transient_branch (was 24d3dd6).
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    more_content
+
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
+
+file1
+ok 2 - -A without -d option leaves unreachable objects packed
+
+expecting success of 7701.3 'unpacked objects receive timestamp of pack file': 
+	tmppack=".git/objects/pack/tmp_pack" &&
+	ln "$packfile" "$tmppack" &&
+	git repack -A -l -d &&
+	test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
+		> mtimes &&
+	compare_mtimes < mtimes
+
+ok 3 - unpacked objects receive timestamp of pack file
+
+expecting success of 7701.4 'do not bother loosening old objects': 
+	obj1=$(echo one | git hash-object -w --stdin) &&
+	obj2=$(echo two | git hash-object -w --stdin) &&
+	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
+	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
+	git repack -A -d --unpack-unreachable=1.hour.ago &&
+	git cat-file -p $obj1 &&
+	test_must_fail git cat-file -p $obj2
+
+one
+two
+one
+fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
+ok 4 - do not bother loosening old objects
+
+expecting success of 7701.5 'gc.recentObjectsHook': 
+	obj1=$(echo one | git hash-object -w --stdin) &&
+	obj2=$(echo two | git hash-object -w --stdin) &&
+	obj3=$(echo three | git hash-object -w --stdin) &&
+	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
+	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
+	pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj3 &&
+
+	# make an unreachable annotated tag object to ensure we rescue objects
+	# which are reachable from non-pruned unreachable objects
+	obj2_tag="$(git mktag <<-EOF
+	object $obj2
+	type blob
+	tag obj2-tag
+	tagger T A Gger <tagger@example.com> 1234567890 -0000
+	EOF
+	)" &&
+
+	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
+	git prune-packed &&
+
+	write_script precious-objects <<-EOF &&
+	echo $obj2_tag
+	EOF
+	git config gc.recentObjectsHook ./precious-objects &&
+
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
+	test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
+	git repack -A -d --unpack-unreachable=1.hour.ago &&
+
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj2_tag &&
+	test_must_fail git cat-file -p $obj3
+
+one
+two
+three
+one
+two
+object f719efd430d52bcfc8566a43b2eb655688d38871
+type blob
+tag obj2-tag
+tagger T A Gger <tagger@example.com> 1234567890 -0000
+fatal: Not a valid object name 2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
+ok 5 - gc.recentObjectsHook
+
+expecting success of 7701.6 'keep packed objects found only in index': 
+	echo my-unique-content >file &&
+	git add file &&
+	git commit -m "make it reachable" &&
+	git gc &&
+	git reset HEAD^ &&
+	git reflog expire --expire=now --all &&
+	git add file &&
+	test-tool chmtime =-86400 .git/objects/pack/* &&
+	git gc --prune=1.hour.ago &&
+	git cat-file blob :file
+
+[main 73784a1] make it reachable
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+my-unique-content
+ok 6 - keep packed objects found only in index
+
+expecting success of 7701.7 'repack -k keeps unreachable packed objects': 
+	# create packed-but-unreachable object
+	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
+	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
+	git prune-packed &&
+
+	# -k should keep it
+	git repack -adk &&
+	git cat-file -p $sha1 &&
+
+	# and double check that without -k it would have been removed
+	git repack -ad &&
+	test_must_fail git cat-file -p $sha1
+
+unreachable-packed
+fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
+ok 7 - repack -k keeps unreachable packed objects
+
+expecting success of 7701.8 'repack -k packs unreachable loose objects': 
+	# create loose unreachable object
+	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
+	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
+	test_path_is_file $objpath &&
+
+	# and confirm that the loose object goes away, but we can
+	# still access it (ergo, it is packed)
+	git repack -adk &&
+	test_path_is_missing $objpath &&
+	git cat-file -p $sha1
+
+would-be-deleted-loose
+ok 8 - repack -k packs unreachable loose objects
+
+expecting success of 7701.9 'repack -k packs unreachable loose objects without existing packfiles': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		oid=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
+		objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
+		test_path_is_file $objpath &&
+
+		git repack -ad --keep-unreachable &&
+		test_path_is_missing $objpath &&
+		git cat-file -p $oid
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7701-repack-unpack-unreachable/repo/.git/
+would-be-deleted-loose
+ok 9 - repack -k packs unreachable loose objects without existing packfiles
+
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7601-merge-pull-config.sh ***
@@ -491442,2820 +491678,465 @@
 
 HEAD is now at e4f5a3c c0
 From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 38 - --no-rebase works with --ff
-
-expecting success of 7601.39 '--no-rebase does ff if pull.ff unset': 
-	test_does_fast_forward pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 39 - --no-rebase does ff if pull.ff unset
-
-expecting success of 7601.40 '--no-rebase heeds pull.ff=true': 
-	test_does_fast_forward -c pull.ff=true pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 40 - --no-rebase heeds pull.ff=true
-
-expecting success of 7601.41 '--no-rebase heeds pull.ff=false': 
-	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 41 - --no-rebase heeds pull.ff=false
-
-expecting success of 7601.42 'pull.rebase=true and --no-ff': 
-	test_does_rebase -c pull.rebase=true pull --no-ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 42 - pull.rebase=true and --no-ff
-
-expecting success of 7601.43 'pull.rebase=true and --ff': 
-	test_does_rebase -c pull.rebase=true pull --ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-ok 43 - pull.rebase=true and --ff
-
-expecting success of 7601.44 'pull.rebase=false and --no-ff': 
-	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 44 - pull.rebase=false and --no-ff
-
-expecting success of 7601.45 'pull.rebase=false and --ff, ff possible': 
-	test_does_fast_forward -c pull.rebase=false pull --ff
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 45 - pull.rebase=false and --ff, ff possible
-
-expecting success of 7601.46 'pull.rebase=false and --ff, ff not possible': 
-	test_falls_back_to_full_merge -c pull.rebase=false pull --ff
-
-HEAD is now at 028ea41 c2
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 46 - pull.rebase=false and --ff, ff not possible
-
-expecting success of 7601.47 'Multiple heads warns about inability to fast forward': 
-	git reset --hard c1 &&
-	test_must_fail git pull . c2 c3 2>err &&
-	test_grep "You have divergent branches" err
-
-HEAD is now at 429abf0 c1
-hint: You have divergent branches and need to specify how to reconcile them.
-ok 47 - Multiple heads warns about inability to fast forward
-
-expecting success of 7601.48 'Multiple can never be fast forwarded': 
-	git reset --hard c0 &&
-	test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
-	test_grep ! "You have divergent branches" err &&
-	# In addition to calling out "cannot fast-forward", we very much
-	# want the "multiple branches" piece to be called out to users.
-	test_grep "Cannot fast-forward to multiple branches" err
-
-HEAD is now at e4f5a3c c0
-fatal: Cannot fast-forward to multiple branches.
-ok 48 - Multiple can never be fast forwarded
-
-expecting success of 7601.49 'Cannot rebase with multiple heads': 
-	git reset --hard c0 &&
-	test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
-	test_grep ! "You have divergent branches" err &&
-	test_grep "Cannot rebase onto multiple branches." err
-
-HEAD is now at e4f5a3c c0
-fatal: Cannot rebase onto multiple branches.
-ok 49 - Cannot rebase with multiple heads
-
-expecting success of 7601.50 'merge c1 with c2': 
-	git reset --hard c1 &&
-	test_path_is_file c0.c &&
-	test_path_is_file c1.c &&
-	test_path_is_missing c2.c &&
-	test_path_is_missing c3.c &&
-	git merge c2 &&
-	test_path_is_file c1.c &&
-	test_path_is_file c2.c
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 50 - merge c1 with c2
-
-expecting success of 7601.51 'fast-forward pull succeeds with "true" in pull.ff': 
-	git reset --hard c0 &&
-	test_config pull.ff true &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 51 - fast-forward pull succeeds with "true" in pull.ff
-
-expecting success of 7601.52 'pull.ff=true overrides merge.ff=false': 
-	git reset --hard c0 &&
-	test_config merge.ff false &&
-	test_config pull.ff true &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Updating e4f5a3c..429abf0
-Fast-forward
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 52 - pull.ff=true overrides merge.ff=false
-
-expecting success of 7601.53 'fast-forward pull creates merge with "false" in pull.ff': 
-	git reset --hard c0 &&
-	test_config pull.ff false &&
-	git pull . c1 &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
-
-HEAD is now at e4f5a3c c0
-From .
- * tag               c1         -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- c1.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-ok 53 - fast-forward pull creates merge with "false" in pull.ff
-
-expecting success of 7601.54 'pull prevents non-fast-forward with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	test_must_fail git pull . c3
-
-HEAD is now at 429abf0 c1
-From .
- * tag               c3         -> FETCH_HEAD
-hint: Diverging branches can't be fast-forwarded, you need to either:
-hint:
-hint: 	git merge --no-ff
-hint:
-hint: or:
-hint:
-hint: 	git rebase
-hint:
-hint: Disable this message with "git config set advice.diverging false"
-fatal: Not possible to fast-forward, aborting.
-ok 54 - pull prevents non-fast-forward with "only" in pull.ff
-
-expecting success of 7601.55 'already-up-to-date pull succeeds with unspecified pull.ff': 
-	git reset --hard c1 &&
-	git pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 55 - already-up-to-date pull succeeds with unspecified pull.ff
-
-expecting success of 7601.56 'already-up-to-date pull succeeds with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	git pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 56 - already-up-to-date pull succeeds with "only" in pull.ff
-
-expecting success of 7601.57 'already-up-to-date pull/rebase succeeds with "only" in pull.ff': 
-	git reset --hard c1 &&
-	test_config pull.ff only &&
-	git -c pull.rebase=true pull . c0 &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
-
-HEAD is now at 429abf0 c1
-From .
- * tag               c0         -> FETCH_HEAD
-Already up to date.
-ok 57 - already-up-to-date pull/rebase succeeds with "only" in pull.ff
-
-expecting success of 7601.58 'merge c1 with c2 (ours in pull.twohead)': 
-	git reset --hard c1 &&
-	git config pull.twohead ours &&
-	git merge c2 &&
-	test_path_is_file c1.c &&
-	test_path_is_missing c2.c
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ours' strategy.
-ok 58 - merge c1 with c2 (ours in pull.twohead)
-
-expecting success of 7601.59 'merge c1 with c2 and c3 (recursive in pull.octopus)': 
-	git reset --hard c1 &&
-	git config pull.octopus "recursive" &&
-	test_must_fail git merge c2 c3 &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
-
-HEAD is now at 429abf0 c1
-error: Not handling anything other than two heads merge.
-Merge with strategy ort failed.
-ok 59 - merge c1 with c2 and c3 (recursive in pull.octopus)
-
-expecting success of 7601.60 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)': 
-	git reset --hard c1 &&
-	git config pull.octopus "recursive octopus" &&
-	git merge c2 c3 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
-	git diff --exit-code &&
-	test_path_is_file c0.c &&
-	test_path_is_file c1.c &&
-	test_path_is_file c2.c &&
-	test_path_is_file c3.c
-
-HEAD is now at 429abf0 c1
-error: Not handling anything other than two heads merge.
-Trying merge strategy ort...
-Rewinding the tree to pristine...
-Trying merge strategy octopus...
-Trying simple merge with c2
-Trying simple merge with c3
-Merge made by the 'octopus' strategy.
- c2.c | 1 +
- c3.c | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 c2.c
- create mode 100644 c3.c
-ok 60 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
-
-expecting success of 7601.61 'setup conflicted merge': 
-	git reset --hard c0 &&
-	echo A >conflict.c &&
-	git add conflict.c &&
-	echo contents >foo.c &&
-	git add foo.c &&
-	git commit -m c4 &&
-	git tag c4 &&
-	echo B >conflict.c &&
-	git add conflict.c &&
-	git mv foo.c bar.c &&
-	git commit -m c5 &&
-	git tag c5 &&
-	git reset --hard c4 &&
-	echo C >conflict.c &&
-	git add conflict.c &&
-	echo secondline >> foo.c &&
-	git add foo.c &&
-	git commit -m c6 &&
-	git tag c6
-
-HEAD is now at e4f5a3c c0
-[master fc941b1] c4
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 conflict.c
- create mode 100644 foo.c
-[master 085299c] c5
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename foo.c => bar.c (100%)
-HEAD is now at fc941b1 c4
-[master cad9e93] c6
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
-ok 61 - setup conflicted merge
-
-expecting success of 7601.62 'merge picks up the best result': 
-	git config --unset-all pull.twohead &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s resolve c6 &&
-	resolve_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive c6 &&
-	recursive_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive -s resolve c6 &&
-	auto_count=$(conflict_count) &&
-	test $auto_count = $recursive_count &&
-	test $auto_count != $resolve_count
-
-HEAD is now at 085299c c5
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Trying merge strategy ort...
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Rewinding the tree to pristine...
-Using the ort strategy to prepare resolving by hand.
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-ok 62 - merge picks up the best result
-
-expecting success of 7601.63 'merge picks up the best result (from config)': 
-	git config pull.twohead "recursive resolve" &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s resolve c6 &&
-	resolve_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s recursive c6 &&
-	recursive_count=$(conflict_count) &&
-	git reset --hard c5 &&
-	test_must_fail git merge c6 &&
-	auto_count=$(conflict_count) &&
-	test $auto_count = $recursive_count &&
-	test $auto_count != $resolve_count
-
-HEAD is now at 085299c c5
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-HEAD is now at 085299c c5
-Trying merge strategy ort...
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Rewinding the tree to pristine...
-Trying merge strategy resolve...
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging conflict.c
-ERROR: content conflict in conflict.c
-ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
-fatal: merge program failed
-Rewinding the tree to pristine...
-Using the ort strategy to prepare resolving by hand.
-Auto-merging conflict.c
-CONFLICT (content): Merge conflict in conflict.c
-Automatic merge failed; fix conflicts and then commit the result.
-ok 63 - merge picks up the best result (from config)
-
-expecting success of 7601.64 'merge errors out on invalid strategy': 
-	git config pull.twohead "foobar" &&
-	git reset --hard c5 &&
-	test_must_fail git merge c6
-
-HEAD is now at 085299c c5
-Could not find merge strategy 'foobar'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 64 - merge errors out on invalid strategy
-
-expecting success of 7601.65 'merge errors out on invalid strategy': 
-	git config --unset-all pull.twohead &&
-	git reset --hard c5 &&
-	test_must_fail git merge -s "resolve recursive" c6
-
-HEAD is now at 085299c c5
-Could not find merge strategy 'resolve recursive'.
-Available strategies are: octopus ours recursive resolve subtree.
-ok 65 - merge errors out on invalid strategy
-
-# passed all 65 test(s)
-1..65
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7701-repack-unpack-unreachable.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7701-repack-unpack-unreachable/.git/
-expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
-	echo content > file1 &&
-	git add . &&
-	test_tick &&
-	git commit -m initial_commit &&
-	# create a transient branch with unique content
-	git checkout -b transient_branch &&
-	echo more content >> file1 &&
-	# record the objects created in the database for file, commit, tree
-	fsha1=$(git hash-object file1) &&
-	test_tick &&
-	git commit -a -m more_content &&
-	csha1=$(git rev-parse HEAD^{commit}) &&
-	tsha1=$(git rev-parse HEAD^{tree}) &&
-	git checkout main &&
-	echo even more content >> file1 &&
-	test_tick &&
-	git commit -a -m even_more_content &&
-	# delete the transient branch
-	git branch -D transient_branch &&
-	# pack the repo
-	git repack -A -d -l &&
-	# verify objects are packed in repository
-	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1 &&
-	# now expire the reflog, while keeping reachable ones but expiring
-	# unreachables immediately
-	test_tick &&
-	sometimeago=$(( $test_tick - 10000 )) &&
-	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
-	# and repack
-	git repack -A -d -l &&
-	# verify objects are retained unpacked
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-[main (root-commit) 5236a77] initial_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'transient_branch'
-[transient_branch 24d3dd6] more_content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-[main 934cb86] even_more_content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 1 - -A with -d option leaves unreachable objects unpacked
-
-expecting success of 7701.2 '-A without -d option leaves unreachable objects packed': 
-	fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
-	fsha1path=".git/objects/$fsha1path" &&
-	csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
-	csha1path=".git/objects/$csha1path" &&
-	tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
-	tsha1path=".git/objects/$tsha1path" &&
-	git branch transient_branch $csha1 &&
-	git repack -a -d -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
-	packfile=$(ls .git/objects/pack/pack-*.pack) &&
-	git branch -D transient_branch &&
-	test_tick &&
-	git repack -A -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 2 - -A without -d option leaves unreachable objects packed
-
-expecting success of 7701.3 'unpacked objects receive timestamp of pack file': 
-	tmppack=".git/objects/pack/tmp_pack" &&
-	ln "$packfile" "$tmppack" &&
-	git repack -A -l -d &&
-	test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
-		> mtimes &&
-	compare_mtimes < mtimes
-
-ok 3 - unpacked objects receive timestamp of pack file
-
-expecting success of 7701.4 'do not bother loosening old objects': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-	git cat-file -p $obj1 &&
-	test_must_fail git cat-file -p $obj2
-
-one
-two
-one
-fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
-ok 4 - do not bother loosening old objects
-
-expecting success of 7701.5 'gc.recentObjectsHook': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	obj3=$(echo three | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj3 &&
-
-	# make an unreachable annotated tag object to ensure we rescue objects
-	# which are reachable from non-pruned unreachable objects
-	obj2_tag="$(git mktag <<-EOF
-	object $obj2
-	type blob
-	tag obj2-tag
-	tagger T A Gger <tagger@example.com> 1234567890 -0000
-	EOF
-	)" &&
-
-	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
-	git prune-packed &&
-
-	write_script precious-objects <<-EOF &&
-	echo $obj2_tag
-	EOF
-	git config gc.recentObjectsHook ./precious-objects &&
-
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj2_tag &&
-	test_must_fail git cat-file -p $obj3
-
-one
-two
-three
-one
-two
-object f719efd430d52bcfc8566a43b2eb655688d38871
-type blob
-tag obj2-tag
-tagger T A Gger <tagger@example.com> 1234567890 -0000
-fatal: Not a valid object name 2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 5 - gc.recentObjectsHook
-
-expecting success of 7701.6 'keep packed objects found only in index': 
-	echo my-unique-content >file &&
-	git add file &&
-	git commit -m "make it reachable" &&
-	git gc &&
-	git reset HEAD^ &&
-	git reflog expire --expire=now --all &&
-	git add file &&
-	test-tool chmtime =-86400 .git/objects/pack/* &&
-	git gc --prune=1.hour.ago &&
-	git cat-file blob :file
-
-[main 73784a1] make it reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-my-unique-content
-ok 6 - keep packed objects found only in index
-
-expecting success of 7701.7 'repack -k keeps unreachable packed objects': 
-	# create packed-but-unreachable object
-	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
-	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	# -k should keep it
-	git repack -adk &&
-	git cat-file -p $sha1 &&
-
-	# and double check that without -k it would have been removed
-	git repack -ad &&
-	test_must_fail git cat-file -p $sha1
-
-unreachable-packed
-fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
-ok 7 - repack -k keeps unreachable packed objects
-
-expecting success of 7701.8 'repack -k packs unreachable loose objects': 
-	# create loose unreachable object
-	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
-	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
-	test_path_is_file $objpath &&
-
-	# and confirm that the loose object goes away, but we can
-	# still access it (ergo, it is packed)
-	git repack -adk &&
-	test_path_is_missing $objpath &&
-	git cat-file -p $sha1
-
-would-be-deleted-loose
-ok 8 - repack -k packs unreachable loose objects
-
-expecting success of 7701.9 'repack -k packs unreachable loose objects without existing packfiles': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		oid=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
-		objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
-		test_path_is_file $objpath &&
-
-		git repack -ad --keep-unreachable &&
-		test_path_is_missing $objpath &&
-		git cat-file -p $oid
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7701-repack-unpack-unreachable/repo/.git/
-would-be-deleted-loose
-ok 9 - repack -k packs unreachable loose objects without existing packfiles
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7406-submodule-update.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/.git/
-expecting success of 7406.1 'setup a submodule tree': 
-	git config --global protocol.file.allow always &&
-	echo file > file &&
-	git add file &&
-	test_tick &&
-	git commit -m upstream &&
-	git clone . super &&
-	git clone super submodule &&
-	git clone super rebasing &&
-	git clone super merging &&
-	git clone super none &&
-	(cd super &&
-	 git submodule add ../submodule submodule &&
-	 test_tick &&
-	 git commit -m "submodule" &&
-	 git submodule init submodule
-	) &&
-	(cd submodule &&
-	echo "line2" > file &&
-	git add file &&
-	git commit -m "Commit 2"
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  git pull --rebase origin
-	 ) &&
-	 git add submodule &&
-	 git commit -m "submodule update"
-	) &&
-	(cd super &&
-	 git submodule add ../rebasing rebasing &&
-	 test_tick &&
-	 git commit -m "rebasing"
-	) &&
-	(cd super &&
-	 git submodule add ../merging merging &&
-	 test_tick &&
-	 git commit -m "rebasing"
-	) &&
-	(cd super &&
-	 git submodule add ../none none &&
-	 test_tick &&
-	 git commit -m "none"
-	) &&
-	git clone . recursivesuper &&
-	( cd recursivesuper &&
-	 git submodule add ../super super
-	)
-
-[main (root-commit) 0c90624] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'super'...
-done.
-Cloning into 'submodule'...
-done.
-Cloning into 'rebasing'...
-done.
-Cloning into 'merging'...
-done.
-Cloning into 'none'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule'...
-done.
-[main 3ae95bc] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[main 4301fd3] Commit 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
-   0c90624..4301fd3  main       -> origin/main
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main fed7cea] submodule update
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/rebasing'...
-done.
-[main 5366fa1] rebasing
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 rebasing
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/merging'...
-done.
-[main 7cb8417] rebasing
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 merging
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/none'...
-done.
-[main e1c6586] none
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 none
-Cloning into 'recursivesuper'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/recursivesuper/super'...
-done.
-ok 1 - setup a submodule tree
-
-expecting success of 7406.2 'update --remote falls back to using HEAD': 
-	test_create_repo main-branch-submodule &&
-	test_commit -C main-branch-submodule initial &&
-
-	test_create_repo main-branch &&
-	git -C main-branch submodule add ../main-branch-submodule &&
-	git -C main-branch commit -m add-submodule &&
-
-	git -C main-branch-submodule switch -c hello &&
-	test_commit -C main-branch-submodule world &&
-
-	git clone --recursive main-branch main-branch-clone &&
-	git -C main-branch-clone submodule update --remote main-branch-submodule &&
-	test_path_exists main-branch-clone/main-branch-submodule/world.t
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-submodule/.git/
-[main (root-commit) 5e30013] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch/main-branch-submodule'...
-done.
-[main (root-commit) afd8121] add-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 main-branch-submodule
-Switched to a new branch 'hello'
-[hello 5390c56] world
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 world.t
-Cloning into 'main-branch-clone'...
-done.
-Submodule 'main-branch-submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-submodule) registered for path 'main-branch-submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-clone/main-branch-submodule'...
-done.
-Submodule path 'main-branch-submodule': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
-Submodule path 'main-branch-submodule': checked out '5390c56ee161c05a0e2e1d93e2ec9669e11defb7'
-ok 2 - update --remote falls back to using HEAD
-
-expecting success of 7406.3 'submodule update detaching the HEAD ': 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 3 - submodule update detaching the HEAD 
-
-expecting success of 7406.4 'submodule update from subdirectory': 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1
-	) &&
-	mkdir super/sub &&
-	(cd super/sub &&
-	 (cd ../submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update ../submodule &&
-	 cd ../submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path '../submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 4 - submodule update from subdirectory
-
-expecting success of 7406.5 'submodule update --init --recursive from subdirectory': 
-	git -C recursivesuper/super reset --hard HEAD^ &&
-	(cd recursivesuper &&
-	 mkdir tmp &&
-	 cd tmp &&
-	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
-	) &&
-	test_cmp expect actual &&
-	sort actual2 >actual2.sorted &&
-	test_cmp expect2 actual2.sorted
-
-HEAD is now at 7cb8417 rebasing
-ok 5 - submodule update --init --recursive from subdirectory
-
-expecting success of 7406.6 'submodule update --init from and of subdirectory': 
-	git init withsubs &&
-	(cd withsubs &&
-	 mkdir foo &&
-	 git submodule add "$(pwd)/../rebasing" foo/sub &&
-	 (cd foo &&
-	  git submodule deinit -f sub &&
-	  git submodule update --init sub 2>../../actual2
-	 )
-	) &&
-	test_cmp expect2 actual2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
-done.
-Cleared directory 'sub'
-Submodule 'foo/sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/../rebasing) unregistered for path 'sub'
-Submodule path 'sub': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-ok 6 - submodule update --init from and of subdirectory
-
-expecting success of 7406.7 'submodule update does not fetch already present commits': 
-	(cd submodule &&
-	  echo line3 >> file &&
-	  git add file &&
-	  test_tick &&
-	  git commit -m "upstream line3"
-	) &&
-	(cd super/submodule &&
-	  head=$(git rev-parse --verify HEAD) &&
-	  echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	  git submodule update > ../actual 2> ../actual.err
-	) &&
-	test_cmp expected actual &&
-	test_must_be_empty actual.err
-
-[main 640baa4] upstream line3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c90624 upstream
-ok 7 - submodule update does not fetch already present commits
-
-expecting success of 7406.8 'submodule update should fail due to local changes': 
-	(cd super/submodule &&
-	 git reset --hard HEAD~1 &&
-	 echo "local change" > file
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 test_must_fail git submodule update submodule 2>../actual.raw
-	) &&
-	sed "s/^> //" >expect <<-\EOF &&
-	> error: Your local changes to the following files would be overwritten by checkout:
-	> 	file
-	> Please commit your changes or stash them before you switch branches.
-	> Aborting
-	> fatal: Unable to checkout OID in submodule path 'submodule'
-	EOF
-	sed -e "s/checkout $SQ[^$SQ]*$SQ/checkout OID/" <actual.raw >actual &&
-	test_cmp expect actual
-
-
-HEAD is now at 0c90624 upstream
-ok 8 - submodule update should fail due to local changes
-
-expecting success of 7406.9 'submodule update should throw away changes with --force ': 
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --force submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 9 - submodule update should throw away changes with --force 
-
-expecting success of 7406.10 'submodule update --force forcibly checks out submodules': 
-	(cd super &&
-	 (cd submodule &&
-	  rm -f file
-	 ) &&
-	 git submodule update --force submodule &&
-	 (cd submodule &&
-	  test "$(git status -s file)" = ""
-	 )
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 10 - submodule update --force forcibly checks out submodules
-
-expecting success of 7406.11 'submodule update --remote should fetch upstream changes': 
-	(cd submodule &&
-	 echo line4 >> file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m "upstream line4"
-	) &&
-	(cd super &&
-	 git submodule update --remote --force submodule &&
-	 cd submodule &&
-	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
-	)
-
-[main 2758ea9] upstream line4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
-   4301fd3..2758ea9  main       -> origin/main
-Submodule path 'submodule': checked out '2758ea9cdd3f551b89e5fc3424c881031158c70d'
-ok 11 - submodule update --remote should fetch upstream changes
-
-expecting success of 7406.12 'submodule update --remote should fetch upstream changes with .': 
-	(
-		cd super &&
-		git config -f .gitmodules submodule."submodule".branch "." &&
-		git add .gitmodules &&
-		git commit -m "submodules: update from the respective superproject branch"
-	) &&
-	(
-		cd submodule &&
-		echo line4a >> file &&
-		git add file &&
-		test_tick &&
-		git commit -m "upstream line4a" &&
-		git checkout -b test-branch &&
-		test_commit on-test-branch
-	) &&
-	(
-		cd super &&
-		git submodule update --remote --force submodule &&
-		git -C submodule log -1 --oneline >actual &&
-		git -C ../submodule log -1 --oneline main >expect &&
-		test_cmp expect actual &&
-		git checkout -b test-branch &&
-		git submodule update --remote --force submodule &&
-		git -C submodule log -1 --oneline >actual &&
-		git -C ../submodule log -1 --oneline test-branch >expect &&
-		test_cmp expect actual &&
-		git checkout main &&
-		git branch -d test-branch &&
-		git reset --hard HEAD^
-	)
-
-[main 5031a7c] submodules: update from the respective superproject branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main e64979d] upstream line4a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'test-branch'
-[test-branch 6b9ecc1] on-test-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-test-branch.t
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
-   2758ea9..e64979d  main           -> origin/main
- * [new branch]      test-branch    -> origin/test-branch
- * [new tag]         on-test-branch -> on-test-branch
-Submodule path 'submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-Switched to a new branch 'test-branch'
-Submodule path 'submodule': checked out '6b9ecc16dba533ab8642ff93fc3b7fe9267a8c51'
-Switched to branch 'main'
-M	submodule
-Your branch is ahead of 'origin/main' by 6 commits.
-  (use "git push" to publish your local commits)
-Deleted branch test-branch (was 5031a7c).
-HEAD is now at e1c6586 none
-ok 12 - submodule update --remote should fetch upstream changes with .
-
-expecting success of 7406.13 'local config should override .gitmodules branch': 
-	(cd submodule &&
-	 git checkout test-branch &&
-	 echo line5 >> file &&
-	 git add file &&
-	 test_tick &&
-	 git commit -m "upstream line5" &&
-	 git checkout main
-	) &&
-	(cd super &&
-	 git config submodule.submodule.branch test-branch &&
-	 git submodule update --remote --force submodule &&
-	 cd submodule &&
-	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
-	)
-
-Already on 'test-branch'
-[test-branch 5124f33] upstream line5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Your branch is ahead of 'origin/main' by 4 commits.
-  (use "git push" to publish your local commits)
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
-   6b9ecc1..5124f33  test-branch -> origin/test-branch
-Submodule path 'submodule': checked out '5124f33c895d18ac768733c2d5ce5a12240babd9'
-ok 13 - local config should override .gitmodules branch
-
-expecting success of 7406.14 'submodule update --rebase staying on main': 
-	(cd super/submodule &&
-	  git checkout main
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --rebase submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-Previous HEAD position was 5124f33 upstream line5
-Switched to branch 'main'
-Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-Successfully rebased and updated refs/heads/main.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 14 - submodule update --rebase staying on main
-
-expecting success of 7406.15 'submodule update --merge staying on main': 
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --merge submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 15 - submodule update --merge staying on main
-
-expecting success of 7406.16 'submodule update - rebase in .git/config': 
-	(cd super &&
-	 git config submodule.submodule.update rebase
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Successfully rebased and updated refs/heads/main.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 16 - submodule update - rebase in .git/config
-
-expecting success of 7406.17 'submodule update - checkout in .git/config but --rebase given': 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --rebase submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Successfully rebased and updated refs/heads/main.
-Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 17 - submodule update - checkout in .git/config but --rebase given
-
-expecting success of 7406.18 'submodule update - merge in .git/config': 
-	(cd super &&
-	 git config submodule.submodule.update merge
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 18 - submodule update - merge in .git/config
-
-expecting success of 7406.19 'submodule update - checkout in .git/config but --merge given': 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD~1
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update --merge submodule &&
-	 cd submodule &&
-	 compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Updating 0c90624..4301fd3
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 19 - submodule update - checkout in .git/config but --merge given
-
-expecting success of 7406.20 'submodule update - checkout in .git/config': 
-	(cd super &&
-	 git config submodule.submodule.update checkout
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD^
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 20 - submodule update - checkout in .git/config
-
-expecting success of 7406.21 'submodule update - command in .git/config': 
-	(cd super &&
-	 git config submodule.submodule.update "!git checkout"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard HEAD^
-	) &&
-	(cd super &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git submodule update submodule &&
-	 cd submodule &&
-	 ! compare_head
-	)
-
-HEAD is now at 0c90624 upstream
-Previous HEAD position was 0c90624 upstream
-HEAD is now at 4301fd3 Commit 2
-Submodule path 'submodule': 'git checkout 4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 21 - submodule update - command in .git/config
-
-expecting success of 7406.22 'submodule update - command in .gitmodules is rejected': 
-	test_when_finished "git -C super reset --hard HEAD^" &&
-	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
-	git -C super commit -a -m "add command to .gitmodules file" &&
-	git -C super/submodule reset --hard $submodulesha1^ &&
-	test_must_fail git -C super submodule update submodule
-
-[main 9916237] add command to .gitmodules file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at 0c90624 upstream
-fatal: invalid value for 'submodule.submodule.update'
-HEAD is now at e1c6586 none
-ok 22 - submodule update - command in .gitmodules is rejected
-
-expecting success of 7406.23 'fsck detects command in .gitmodules': 
-	git init command-in-gitmodules &&
-	(
-		cd command-in-gitmodules &&
-		git submodule add ../submodule submodule &&
-		test_commit adding-submodule &&
-
-		git config -f .gitmodules submodule.submodule.update "!false" &&
-		git add .gitmodules &&
-		test_commit configuring-update &&
-		test_must_fail git fsck
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/command-in-gitmodules/submodule'...
-done.
-[main (root-commit) 54d926f] adding-submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 adding-submodule.t
- create mode 160000 submodule
-[main 663bd8b] configuring-update
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 configuring-update.t
-error in blob 34075c13cf76fa2281e921a63acb1c52594ee0a0: gitmodulesUpdate: disallowed submodule update setting: !false
-ok 23 - fsck detects command in .gitmodules
-
-expecting success of 7406.24 'submodule update - command in .git/config catches failure': 
-	(cd super &&
-	 git config submodule.submodule.update "!false"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard $submodulesha1^
-	) &&
-	(cd super &&
-	 test_must_fail git submodule update submodule 2>../actual
-	) &&
-	test_cmp actual expect
-
-HEAD is now at 0c90624 upstream
-ok 24 - submodule update - command in .git/config catches failure
-
-expecting success of 7406.25 'submodule update - command in .git/config catches failure -- subdirectory': 
-	(cd super &&
-	 git config submodule.submodule.update "!false"
-	) &&
-	(cd super/submodule &&
-	  git reset --hard $submodulesha1^
-	) &&
-	(cd super &&
-	 mkdir tmp && cd tmp &&
-	 test_must_fail git submodule update ../submodule 2>../../actual
-	) &&
-	test_cmp actual expect
-
-HEAD is now at 0c90624 upstream
-ok 25 - submodule update - command in .git/config catches failure -- subdirectory
-
-expecting success of 7406.26 'submodule update - command run for initial population of submodule': 
-	cat >expect <<-EOF &&
-	fatal: Execution of 'false $submodulesha1' failed in submodule path 'submodule'
-	EOF
-	rm -rf super/submodule &&
-	test_must_fail git -C super submodule update 2>actual &&
-	test_cmp expect actual &&
-	git -C super submodule update --checkout
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 26 - submodule update - command run for initial population of submodule
-
-expecting success of 7406.27 'recursive submodule update - command in .git/config catches failure -- subdirectory': 
-	(cd recursivesuper &&
-	 git submodule update --remote super &&
-	 git add super &&
-	 git commit -m "update to latest to have more than one commit in submodules"
-	) &&
-	git -C recursivesuper/super config submodule.submodule.update "!false" &&
-	git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
-	(cd recursivesuper &&
-	 mkdir -p tmp && cd tmp &&
-	 test_must_fail git submodule update --recursive ../super 2>../../actual
-	) &&
-	test_cmp actual expect
-
-[main eae22a2] update to latest to have more than one commit in submodules
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 super
-HEAD is now at 0c90624 upstream
-ok 27 - recursive submodule update - command in .git/config catches failure -- subdirectory
-
-expecting success of 7406.28 'submodule init does not copy command into .git/config': 
-	test_when_finished "git -C super update-index --force-remove submodule1" &&
-	test_when_finished git config -f super/.gitmodules \
-		--remove-section submodule.submodule1 &&
-	(cd super &&
-	 git ls-files -s submodule >out &&
-	 H=$(cut -d" " -f2 out) &&
-	 mkdir submodule1 &&
-	 git update-index --add --cacheinfo 160000 $H submodule1 &&
-	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
-	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
-	 git config -f .gitmodules submodule.submodule1.update !false &&
-	 test_must_fail git submodule init submodule1 &&
-	 test_expect_code 1 git config submodule.submodule1.update >actual &&
-	 test_must_be_empty actual
-	)
-
-fatal: invalid value for 'submodule.submodule1.update'
-ok 28 - submodule init does not copy command into .git/config
-
-expecting success of 7406.29 'submodule init picks up rebase': 
-	(cd super &&
-	 git config -f .gitmodules submodule.rebasing.update rebase &&
-	 git submodule init rebasing &&
-	 test "rebase" = "$(git config submodule.rebasing.update)"
-	)
-
-ok 29 - submodule init picks up rebase
-
-expecting success of 7406.30 'submodule init picks up merge': 
-	(cd super &&
-	 git config -f .gitmodules submodule.merging.update merge &&
-	 git submodule init merging &&
-	 test "merge" = "$(git config submodule.merging.update)"
-	)
-
-ok 30 - submodule init picks up merge
-
-expecting success of 7406.31 'submodule update --merge  - ignores --merge  for new submodules': 
-	test_config -C super submodule.submodule.update checkout &&
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git submodule update --merge submodule &&
-	 git status -s submodule >actual &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 31 - submodule update --merge  - ignores --merge  for new submodules
-
-expecting success of 7406.32 'submodule update --rebase - ignores --rebase for new submodules': 
-	test_config -C super submodule.submodule.update checkout &&
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git submodule update --rebase submodule &&
-	 git status -s submodule >actual &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 32 - submodule update --rebase - ignores --rebase for new submodules
-
-expecting success of 7406.33 'submodule update ignores update=merge config for new submodules': 
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git config submodule.submodule.update merge &&
-	 git submodule update submodule &&
-	 git status -s submodule >actual &&
-	 git config --unset submodule.submodule.update &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 33 - submodule update ignores update=merge config for new submodules
-
-expecting success of 7406.34 'submodule update ignores update=rebase config for new submodules': 
-	(cd super &&
-	 rm -rf submodule &&
-	 git submodule update submodule &&
-	 git status -s submodule >expect &&
-	 rm -rf submodule &&
-	 git config submodule.submodule.update rebase &&
-	 git submodule update submodule &&
-	 git status -s submodule >actual &&
-	 git config --unset submodule.submodule.update &&
-	 test_cmp expect actual
-	)
-
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 34 - submodule update ignores update=rebase config for new submodules
-
-expecting success of 7406.35 'submodule init picks up update=none': 
-	(cd super &&
-	 git config -f .gitmodules submodule.none.update none &&
-	 git submodule init none &&
-	 test "none" = "$(git config submodule.none.update)"
-	)
-
-ok 35 - submodule init picks up update=none
-
-expecting success of 7406.36 'submodule update - update=none in .git/config': 
-	(cd super &&
-	 git config submodule.submodule.update none &&
-	 (cd submodule &&
-	  git checkout main &&
-	  compare_head
-	 ) &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 git submodule update &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 (cd submodule &&
-	  compare_head
-	 ) &&
-	 git config --unset submodule.submodule.update &&
-	 git submodule update submodule
-	)
-
-Previous HEAD position was 4301fd3 Commit 2
-Switched to branch 'main'
-Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-submodule
-Skipping submodule 'none'
-Skipping submodule 'submodule'
-submodule
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 36 - submodule update - update=none in .git/config
-
-expecting success of 7406.37 'submodule update - update=none in .git/config but --checkout given': 
-	(cd super &&
-	 git config submodule.submodule.update none &&
-	 (cd submodule &&
-	  git checkout main &&
-	  compare_head
-	 ) &&
-	 git diff --name-only >out &&
-	 grep ^submodule$ out &&
-	 git submodule update --checkout &&
-	 git diff --name-only >out &&
-	 ! grep ^submodule$ out &&
-	 (cd submodule &&
-	  ! compare_head
-	 ) &&
-	 git config --unset submodule.submodule.update
-	)
-
-Previous HEAD position was 4301fd3 Commit 2
-Switched to branch 'main'
-Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-submodule
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 37 - submodule update - update=none in .git/config but --checkout given
-
-expecting success of 7406.38 'submodule update --init skips submodule with update=none': 
-	(cd super &&
-	 git add .gitmodules &&
-	 git commit -m ".gitmodules"
-	) &&
-	git clone super cloned &&
-	(cd cloned &&
-	 git submodule update --init &&
-	 test_path_exists submodule/.git &&
-	 test_path_is_missing none/.git
-	)
-
-[main aaa14d4] .gitmodules
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-Cloning into 'cloned'...
-done.
-Submodule 'merging' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/merging'...
-done.
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/rebasing'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/submodule'...
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 38 - submodule update --init skips submodule with update=none
-
-expecting success of 7406.39 'submodule update with pathspec warns against uninitialized ones': 
-	test_when_finished "rm -fr selective" &&
-	git clone super selective &&
-	(
-		cd selective &&
-		git submodule init submodule &&
-
-		git submodule update submodule 2>err &&
-		! grep "Submodule path .* not initialized" err &&
-
-		git submodule update rebasing 2>err &&
-		grep "Submodule path .rebasing. not initialized" err &&
-
-		test_path_exists submodule/.git &&
-		test_path_is_missing rebasing/.git
-	)
-
-
-Cloning into 'selective'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-Submodule path 'rebasing' not initialized
-ok 39 - submodule update with pathspec warns against uninitialized ones
-
-expecting success of 7406.40 'submodule update without pathspec updates only initialized ones': 
-	test_when_finished "rm -fr selective" &&
-	git clone super selective &&
-	(
-		cd selective &&
-		git submodule init submodule &&
-		git submodule update 2>err &&
-		test_path_exists submodule/.git &&
-		test_path_is_missing rebasing/.git &&
-		! grep "Submodule path .* not initialized" err
-	)
-
-
-Cloning into 'selective'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 40 - submodule update without pathspec updates only initialized ones
-
-expecting success of 7406.41 'submodule update continues after checkout error': 
-	(cd super &&
-	 git reset --hard HEAD &&
-	 git submodule add ../submodule submodule2 &&
-	 git submodule init &&
-	 git commit -am "new_submodule" &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 (cd submodule &&
-	  test_commit "update_submodule" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  echo "" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-HEAD is now at aaa14d4 .gitmodules
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule2'...
-done.
-[main eac0b19] new_submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 submodule2
-[detached HEAD bf859b9] update_submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main a877e2d] update_submodule2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-[main 589bc5b] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at eac0b19 new_submodule
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-fatal: Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
-Submodule path 'submodule2': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-ok 41 - submodule update continues after checkout error
-
-expecting success of 7406.42 'submodule update continues after recursive checkout error': 
-	(cd super &&
-	 git reset --hard HEAD &&
-	 git checkout main &&
-	 git submodule update &&
-	 (cd submodule &&
-	  git submodule add ../submodule subsubmodule &&
-	  git submodule init &&
-	  git commit -m "new_subsubmodule"
-	 ) &&
-	 git add submodule &&
-	 git commit -m "update_submodule" &&
-	 (cd submodule &&
-	  (cd subsubmodule &&
-	   test_commit "update_subsubmodule" file
-	  ) &&
-	  git add subsubmodule &&
-	  test_commit "update_submodule_again" file &&
-	  (cd subsubmodule &&
-	   test_commit "update_subsubmodule_again" file
-	  ) &&
-	  test_commit "update_submodule_again_again" file
-	 ) &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect &&
-	  test_commit "update_submodule2_again" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "new_commits" &&
-	 git checkout HEAD^ &&
-	 (cd submodule &&
-	  git checkout HEAD^ &&
-	  (cd subsubmodule &&
-	   echo "" > file
-	  )
-	 ) &&
-	 test_expect_code 1 git submodule update --recursive &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-HEAD is now at eac0b19 new_submodule
-Previous HEAD position was eac0b19 new_submodule
-Switched to branch 'main'
-M	submodule
-M	submodule2
-Your branch is ahead of 'origin/main' by 8 commits.
-  (use "git push" to publish your local commits)
-Skipping submodule 'none'
-Submodule path 'submodule2': checked out 'a877e2d4bf03b4d9f4617d9894698a04062cafcb'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule/subsubmodule'...
-done.
-[detached HEAD 13e98de] new_subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-[main 550d814] update_submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main c5b9177] update_subsubmodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-[detached HEAD 7a52240] update_submodule_again
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-[main c86226f] update_subsubmodule_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 36cba07] update_submodule_again_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 6f5fed0] update_submodule2_again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main ddd1b9e] new_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 550d814 update_submodule
-M	submodule
-M	submodule2
-Previous HEAD position was 36cba07 update_submodule_again_again
-HEAD is now at 7a52240 update_submodule_again
-M	subsubmodule
-Skipping submodule 'none'
-Submodule path 'submodule': checked out '13e98de6d21cfd4c0d0ac89f9801423fd4a8848c'
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-fatal: Unable to checkout 'e64979d13b9a9301a3030b8c005b1d9fd5397a44' in submodule path 'submodule/subsubmodule'
-fatal: Failed to recurse into submodule path 'submodule'
-Submodule path 'submodule2': checked out 'a877e2d4bf03b4d9f4617d9894698a04062cafcb'
-ok 42 - submodule update continues after recursive checkout error
-
-expecting success of 7406.43 'submodule update exit immediately in case of merge conflict': 
-	(cd super &&
-	 git checkout main &&
-	 git reset --hard HEAD &&
-	 (cd submodule &&
-	  (cd subsubmodule &&
-	   git reset --hard HEAD
-	  )
-	 ) &&
-	 git submodule update --recursive &&
-	 (cd submodule &&
-	  test_commit "update_submodule_2" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2_2" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  git checkout main &&
-	  test_commit "conflict" file &&
-	  echo "conflict" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 git config submodule.submodule.update merge &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-Previous HEAD position was 550d814 update_submodule
-Switched to branch 'main'
-M	submodule
-M	submodule2
-Your branch is ahead of 'origin/main' by 10 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at ddd1b9e new_commits
-HEAD is now at c86226f update_subsubmodule_again
-Skipping submodule 'none'
-Submodule path 'submodule': checked out '36cba07de2dd3db68a7098ceff6e2441982207b1'
-Submodule path 'submodule/subsubmodule': checked out 'c5b9177e5e719279dd558d927533a748252168f7'
-Submodule path 'submodule2': checked out '6f5fed0da411cfed33516e12e385e026134bad56'
-[detached HEAD ef00442] update_submodule_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD a8b9c2b] update_submodule2_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main b5c2539] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-warning: unable to rmdir 'subsubmodule': Directory not empty
-Previous HEAD position was ef00442 update_submodule_2
-Switched to branch 'main'
-Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-[main d727295] conflict
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at ddd1b9e new_commits
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Unable to merge '36cba07de2dd3db68a7098ceff6e2441982207b1' in submodule path 'submodule'
-ok 43 - submodule update exit immediately in case of merge conflict
-
-expecting success of 7406.44 'submodule update exit immediately after recursive rebase error': 
-	(cd super &&
-	 git checkout main &&
-	 git reset --hard HEAD &&
-	 (cd submodule &&
-	  git reset --hard HEAD &&
-	  git submodule update --recursive
-	 ) &&
-	 (cd submodule &&
-	  test_commit "update_submodule_3" file
-	 ) &&
-	 (cd submodule2 &&
-	  test_commit "update_submodule2_3" file
-	 ) &&
-	 git add submodule &&
-	 git add submodule2 &&
-	 git commit -m "two_new_submodule_commits" &&
-	 (cd submodule &&
-	  git checkout main &&
-	  test_commit "conflict2" file &&
-	  echo "conflict" > file
-	 ) &&
-	 git checkout HEAD^ &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../expect
-	 ) &&
-	 git config submodule.submodule.update rebase &&
-	 test_must_fail git submodule update &&
-	 (cd submodule2 &&
-	  git rev-parse --verify HEAD >../actual
-	 ) &&
-	 test_cmp expect actual
-	)
-
-Previous HEAD position was ddd1b9e new_commits
-Switched to branch 'main'
-M	submodule
-Your branch is ahead of 'origin/main' by 11 commits.
-  (use "git push" to publish your local commits)
-HEAD is now at b5c2539 two_new_submodule_commits
-warning: unable to rmdir 'subsubmodule': Directory not empty
-HEAD is now at d727295 conflict
-[main b3ea5df] update_submodule_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 9f300bf] update_submodule2_3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 45a22d0] two_new_submodule_commits
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Already on 'main'
-Your branch and 'origin/main' have diverged,
-and have 2 and 4 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-[main cf8450a] conflict2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at b5c2539 two_new_submodule_commits
-M	submodule
-M	submodule2
-Skipping submodule 'none'
-error: cannot rebase: You have unstaged changes.
-error: Please commit or stash them.
-fatal: Unable to rebase 'ef00442dab3d569479883a2d86505b87d824a88b' in submodule path 'submodule'
-ok 44 - submodule update exit immediately after recursive rebase error
-
-expecting success of 7406.45 'add different submodules to the same path': 
-	(cd super &&
-	 git submodule add ../submodule s1 &&
-	 test_must_fail git submodule add ../merging s1
-	)
-
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/s1'...
-done.
-fatal: 's1' already exists in the index
-ok 45 - add different submodules to the same path
-
-expecting success of 7406.46 'submodule add places git-dir in superprojects git-dir': 
-	(cd super &&
-	 mkdir deeper &&
-	 git submodule add ../submodule deeper/submodule &&
-	 (cd deeper/submodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/deeper/submodule &&
-	  git log > ../../../../actual
-	 ) &&
-	 test_cmp expected actual
-	)
-
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/deeper/submodule'...
-done.
-ok 46 - submodule add places git-dir in superprojects git-dir
-
-expecting success of 7406.47 'submodule update places git-dir in superprojects git-dir': 
-	(cd super &&
-	 git commit -m "added submodule"
-	) &&
-	git clone super super2 &&
-	(cd super2 &&
-	 git submodule init deeper/submodule &&
-	 git submodule update &&
-	 (cd deeper/submodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/deeper/submodule &&
-	  git log > ../../../../actual
-	 ) &&
-	 test_cmp expected actual
-	)
-
-[detached HEAD 3a6f187] added submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 160000 deeper/submodule
- create mode 160000 s1
-Cloning into 'super2'...
-done.
-Note: switching to '3a6f1872cb4f0ffb018914be6f6215cb5d81f789'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-Submodule 'deeper/submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
-done.
-Skipping submodule 'none'
-Submodule path 'deeper/submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-ok 47 - submodule update places git-dir in superprojects git-dir
-
-expecting success of 7406.48 'submodule add places git-dir in superprojects git-dir recursive': 
-	(cd super2 &&
-	 (cd deeper/submodule &&
-	  git submodule add ../submodule subsubmodule &&
-	  (cd subsubmodule &&
-	   git log > ../../../expected
-	  ) &&
-	  git commit -m "added subsubmodule" &&
-	  git push origin :
-	 ) &&
-	 (cd .git/modules/deeper/submodule/modules/subsubmodule &&
-	  git log > ../../../../../actual
-	 ) &&
-	 git add deeper/submodule &&
-	 git commit -m "update submodule" &&
-	 git push origin : &&
-	 test_cmp expected actual
-	)
-
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
-done.
-[detached HEAD 0642c0f] added subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-Everything up-to-date
-[detached HEAD 7b048b2] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Everything up-to-date
-ok 48 - submodule add places git-dir in superprojects git-dir recursive
-
-expecting success of 7406.49 'submodule update places git-dir in superprojects git-dir recursive': 
-	mkdir super_update_r &&
-	(cd super_update_r &&
-	 git init --bare
-	) &&
-	mkdir subsuper_update_r &&
-	(cd subsuper_update_r &&
-	 git init --bare
-	) &&
-	mkdir subsubsuper_update_r &&
-	(cd subsubsuper_update_r &&
-	 git init --bare
-	) &&
-	git clone subsubsuper_update_r subsubsuper_update_r2 &&
-	(cd subsubsuper_update_r2 &&
-	 test_commit "update_subsubsuper" file &&
-	 git push origin main
-	) &&
-	git clone subsuper_update_r subsuper_update_r2 &&
-	(cd subsuper_update_r2 &&
-	 test_commit "update_subsuper" file &&
-	 git submodule add ../subsubsuper_update_r subsubmodule &&
-	 git commit -am "subsubmodule" &&
-	 git push origin main
-	) &&
-	git clone super_update_r super_update_r2 &&
-	(cd super_update_r2 &&
-	 test_commit "update_super" file &&
-	 git submodule add ../subsuper_update_r submodule &&
-	 git commit -am "submodule" &&
-	 git push origin main
-	) &&
-	rm -rf super_update_r2 &&
-	git clone super_update_r super_update_r2 &&
-	(cd super_update_r2 &&
-	 git submodule update --init --recursive >actual &&
-	 test_grep "Submodule path .submodule/subsubmodule.: checked out" actual &&
-	 (cd submodule/subsubmodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/submodule/modules/subsubmodule &&
-	  git log > ../../../../../actual
-	 ) &&
-	 test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
-Cloning into 'subsubsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) 0d20a78] update_subsubsuper
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r
- * [new branch]      main -> main
-Cloning into 'subsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) 635883b] update_subsuper
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
-done.
-[main 86a3496] subsubmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r
- * [new branch]      main -> main
-Cloning into 'super_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) c2de1fa] update_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
-done.
-[main 2d70acb] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r
- * [new branch]      main -> main
-Cloning into 'super_update_r2'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
-done.
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
-done.
-Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
-ok 49 - submodule update places git-dir in superprojects git-dir recursive
-
-expecting success of 7406.50 'submodule add properly re-creates deeper level submodules': 
-	(cd super &&
-	 git reset --hard main &&
-	 rm -rf deeper/ &&
-	 git submodule add --force ../submodule deeper/submodule
-	)
-
-warning: unable to rmdir 'deeper/submodule': Directory not empty
-warning: unable to rmdir 's1': Directory not empty
-HEAD is now at 45a22d0 two_new_submodule_commits
-Reactivating local git directory for submodule 'deeper/submodule'
-ok 50 - submodule add properly re-creates deeper level submodules
-
-expecting success of 7406.51 'submodule update properly revives a moved submodule': 
-	(cd super &&
-	 H=$(git rev-parse --short HEAD) &&
-	 git commit -am "pre move" &&
-	 H2=$(git rev-parse --short HEAD) &&
-	 git status >out &&
-	 sed "s/$H/XXX/" out >expect &&
-	 H=$(cd submodule2 && git rev-parse HEAD) &&
-	 git rm --cached submodule2 &&
-	 rm -rf submodule2 &&
-	 mkdir -p "moved/sub module" &&
-	 git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
-	 git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
-	 git commit -am "post move" &&
-	 git submodule update &&
-	 git status > out &&
-	 sed "s/$H2/XXX/" out >actual &&
-	 test_cmp expect actual
-	)
-
-[detached HEAD d262110] pre move
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 1 deletion(-)
- create mode 160000 deeper/submodule
-rm 'submodule2'
-[detached HEAD db0a21b] post move
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename submodule2 => moved/sub module (100%)
-Skipping submodule 'none'
-Submodule path 'moved/sub module': checked out '9f300bf70a08f60a240990d98de1aaa8040994a1'
-ok 51 - submodule update properly revives a moved submodule
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7406.52 'submodule update can handle symbolic links in pwd': 
-	mkdir -p linked/dir &&
-	ln -s linked/dir linkto &&
-	(cd linkto &&
-	 git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
-	 (cd super &&
-	  git submodule update --init --recursive
-	 )
-	)
-
-Cloning into 'super'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
-done.
-Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
-done.
-Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
-ok 52 - submodule update can handle symbolic links in pwd
-
-expecting success of 7406.53 'submodule update clone shallow submodule': 
-	test_when_finished "rm -rf super3" &&
-	first=$(git -C cloned rev-parse HEAD:submodule) &&
-	second=$(git -C submodule rev-parse HEAD) &&
-	commit_count=$(git -C submodule rev-list --count $first^..$second) &&
-	git clone cloned super3 &&
-	pwd=$(pwd) &&
-	(
-		cd super3 &&
-		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
-		mv -f .gitmodules.tmp .gitmodules &&
-		git submodule update --init --depth=$commit_count &&
-		git -C submodule log --oneline >out &&
-		test_line_count = 1 out
-	)
-
-Cloning into 'super3'...
-done.
-Submodule 'merging' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/merging'...
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/rebasing'...
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/submodule'...
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 53 - submodule update clone shallow submodule
-
-expecting success of 7406.54 'submodule update clone shallow submodule outside of depth': 
-	test_when_finished "rm -rf super3" &&
-	git clone cloned super3 &&
-	pwd=$(pwd) &&
-	(
-		cd super3 &&
-		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
-		mv -f .gitmodules.tmp .gitmodules &&
-		# Some protocol versions (e.g. 2) support fetching
-		# unadvertised objects, so restrict this test to v0.
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-			git submodule update --init --depth=1 2>actual &&
-		test_grep "Direct fetching of that commit failed." actual &&
-		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
-		git submodule update --init --depth=1 >actual &&
-		git -C submodule log --oneline >out &&
-		test_line_count = 1 out
-	)
-
-Cloning into 'super3'...
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-fatal: Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
-Skipping submodule 'none'
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
- * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
-ok 54 - submodule update clone shallow submodule outside of depth
-
-expecting success of 7406.55 'submodule update --recursive drops module name before recursing': 
-	(cd super2 &&
-	 (cd deeper/submodule/subsubmodule &&
-	  git checkout HEAD^
-	 ) &&
-	 git submodule update --recursive deeper/submodule >actual &&
-	 test_grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
-	)
-
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 2758ea9 upstream line4
-Submodule path 'deeper/submodule/subsubmodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-ok 55 - submodule update --recursive drops module name before recursing
-
-expecting success of 7406.56 'submodule update can be run in parallel': 
-	(cd super2 &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
-	 grep "7 tasks" trace.out &&
-	 git config submodule.fetchJobs 8 &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update &&
-	 grep "8 tasks" trace.out &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
-	 grep "9 tasks" trace.out
-	)
-
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 7 tasks
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 8 tasks
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 9 tasks
-ok 56 - submodule update can be run in parallel
-
-expecting success of 7406.57 'git clone passes the parallel jobs config on to submodules': 
-	test_when_finished "rm -rf super4" &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
-	grep "7 tasks" trace.out &&
-	rm -rf super4 &&
-	git config --global submodule.fetchJobs 8 &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
-	grep "8 tasks" trace.out &&
-	rm -rf super4 &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
-	grep "9 tasks" trace.out &&
-	rm -rf super4
-
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 7 tasks
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 8 tasks
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 9 tasks
-ok 57 - git clone passes the parallel jobs config on to submodules
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 38 - --no-rebase works with --ff
 
-expecting success of 7406.58 'submodule update --quiet passes quietness to merge/rebase': 
-	(cd super &&
-	 test_commit -C rebasing message &&
-	 git submodule update --rebase --quiet >out 2>err &&
-	 test_must_be_empty out &&
-	 test_must_be_empty err &&
-	 git submodule update --rebase >out 2>err &&
-	 test_file_not_empty out &&
-	 test_must_be_empty err
-	)
+expecting success of 7601.39 '--no-rebase does ff if pull.ff unset': 
+	test_does_fast_forward pull --no-rebase
 
-[main 271c4a7] message
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 message.t
-ok 58 - submodule update --quiet passes quietness to merge/rebase
+ create mode 100644 c1.c
+ok 39 - --no-rebase does ff if pull.ff unset
 
-expecting success of 7406.59 'submodule update --quiet passes quietness to fetch with a shallow clone': 
-	test_when_finished "rm -rf super4 super5 super6" &&
-	git clone . super4 &&
-	(cd super4 &&
-	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
-	 git commit -am "setup submodule3"
-	) &&
-	(cd submodule &&
-	  test_commit line6 file
-	) &&
-	git clone super4 super5 &&
-	(cd super5 &&
-	 # This test var can mess with the stderr output checked in this test.
-	 GIT_TEST_NAME_HASH_VERSION=1 \
-		git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
-	 test_must_be_empty out &&
-	 test_must_be_empty err
-	) &&
-	git clone super4 super6 &&
-	(cd super6 &&
-	 git submodule update --init --depth=1 submodule3 >out 2>err &&
-	 test_file_not_empty out &&
-	 test_file_not_empty err
-	)
+expecting success of 7601.40 '--no-rebase heeds pull.ff=true': 
+	test_does_fast_forward -c pull.ff=true pull --no-rebase
 
-Cloning into 'super4'...
-done.
-[main e87103b] setup submodule3
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule3
-[main a93a1f3] line6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-Cloning into 'super5'...
-done.
-Cloning into 'super6'...
-done.
-ok 59 - submodule update --quiet passes quietness to fetch with a shallow clone
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 40 - --no-rebase heeds pull.ff=true
 
-expecting success of 7406.60 'submodule update --filter requires --init': 
-	test_expect_code 129 git -C super submodule update --filter blob:none
+expecting success of 7601.41 '--no-rebase heeds pull.ff=false': 
+	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
 
-usage: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 41 - --no-rebase heeds pull.ff=false
 
-    -f, --[no-]force      force checkout updates
-    --[no-]init           initialize uninitialized submodules before update
-    --[no-]remote         use SHA-1 of submodule's remote tracking branch
-    --[no-]recursive      traverse submodules recursively
-    -N, --no-fetch        don't fetch new objects from the remote site
-    --fetch               opposite of --no-fetch
-    --[no-]checkout       use the 'checkout' update strategy (default)
-    -m, --[no-]merge      use the 'merge' update strategy
-    -r, --[no-]rebase     use the 'rebase' update strategy
-    --[no-]reference <repo>
-                          reference repository
-    --[no-]ref-format <format>
-                          specify the reference format to use
-    --[no-]dissociate     use --reference only while cloning
-    --[no-]depth <n>      create a shallow clone truncated to the specified number of revisions
-    -j, --[no-]jobs <n>   parallel jobs
-    --[no-]recommend-shallow
-                          whether the initial clone should follow the shallow recommendation
-    -q, --[no-]quiet      don't print cloning progress
-    --[no-]progress       force cloning progress
-    --[no-]require-init   disallow cloning into non-empty directory, implies --init
-    --[no-]single-branch  clone only one branch, HEAD or --branch
-    --[no-]filter <args>  object filtering
+expecting success of 7601.42 'pull.rebase=true and --no-ff': 
+	test_does_rebase -c pull.rebase=true pull --no-ff
 
-ok 60 - submodule update --filter requires --init
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 42 - pull.rebase=true and --no-ff
 
-expecting success of 7406.61 'submodule update --filter sets partial clone settings': 
-	test_when_finished "rm -rf super-filter" &&
-	git clone cloned super-filter &&
-	git -C super-filter submodule update --init --filter blob:none &&
-	test_cmp_config -C super-filter/submodule true remote.origin.promisor &&
-	test_cmp_config -C super-filter/submodule blob:none remote.origin.partialclonefilter
+expecting success of 7601.43 'pull.rebase=true and --ff': 
+	test_does_rebase -c pull.rebase=true pull --ff
 
-Cloning into 'super-filter'...
-done.
-Submodule 'merging' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/merging'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/rebasing'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/submodule'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 61 - submodule update --filter sets partial clone settings
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+ok 43 - pull.rebase=true and --ff
 
-expecting success of 7406.62 'setup clean recursive superproject': 
-	git init bottom &&
-	test_commit -C bottom "bottom" &&
-	git init middle &&
-	git -C middle submodule add ../bottom bottom &&
-	git -C middle commit -m "middle" &&
-	git init top &&
-	git -C top submodule add ../middle middle &&
-	git -C top commit -m "top" &&
-	git clone --recurse-submodules top top-clean
+expecting success of 7601.44 'pull.rebase=false and --no-ff': 
+	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom/.git/
-[main (root-commit) 581bdeb] bottom
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 bottom.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle/bottom'...
-done.
-[main (root-commit) 8c7b95e] middle
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 bottom
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top/.git/
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top/middle'...
-done.
-[main (root-commit) ab8145a] top
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 middle
-Cloning into 'top-clean'...
-done.
-Submodule 'middle' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top-clean/middle'...
-done.
-Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-Submodule 'bottom' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
-done.
-Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
-ok 62 - setup clean recursive superproject
-
-expecting success of 7406.63 'submodule update should skip unmerged submodules': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
+ create mode 100644 c1.c
+ok 44 - pull.rebase=false and --no-ff
 
-	# Create an upstream commit in each repo, starting with bottom
-	test_commit -C bottom upstream_commit &&
-	# Create middle commit
-	git -C middle/bottom fetch &&
-	git -C middle/bottom checkout -f FETCH_HEAD &&
-	git -C middle add bottom &&
-	git -C middle commit -m "upstream_commit" &&
-	# Create top commit
-	git -C top/middle fetch &&
-	git -C top/middle checkout -f FETCH_HEAD &&
-	git -C top add middle &&
-	git -C top commit -m "upstream_commit" &&
+expecting success of 7601.45 'pull.rebase=false and --ff, ff possible': 
+	test_does_fast_forward -c pull.rebase=false pull --ff
 
-	# Create a downstream conflict
-	test_commit -C top-cloned/middle/bottom downstream_commit &&
-	git -C top-cloned/middle add bottom &&
-	git -C top-cloned/middle commit -m "downstream_commit" &&
-	git -C top-cloned/middle fetch --recurse-submodules origin &&
-	test_must_fail git -C top-cloned/middle merge origin/main &&
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 45 - pull.rebase=false and --ff, ff possible
 
-	# Make the update of "middle" a no-op, otherwise we error out
-	# because of its unmerged state
-	test_config -C top-cloned submodule.middle.update !true &&
-	git -C top-cloned submodule update --recursive 2>actual.err &&
-	cat >expect.err <<-\EOF &&
-	Skipping unmerged submodule middle/bottom
-	EOF
-	test_cmp expect.err actual.err
+expecting success of 7601.46 'pull.rebase=false and --ff, ff not possible': 
+	test_falls_back_to_full_merge -c pull.rebase=false pull --ff
 
-[main 1214144] upstream_commit
- Author: A U Thor <author@example.com>
+HEAD is now at 028ea41 c2
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 upstream_commit.t
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-Note: switching to 'FETCH_HEAD'.
+ create mode 100644 c1.c
+ok 46 - pull.rebase=false and --ff, ff not possible
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7601.47 'Multiple heads warns about inability to fast forward': 
+	git reset --hard c1 &&
+	test_must_fail git pull . c2 c3 2>err &&
+	test_grep "You have divergent branches" err
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+HEAD is now at 429abf0 c1
+hint: You have divergent branches and need to specify how to reconcile them.
+ok 47 - Multiple heads warns about inability to fast forward
 
-  git switch -c <new-branch-name>
+expecting success of 7601.48 'Multiple can never be fast forwarded': 
+	git reset --hard c0 &&
+	test_must_fail git -c pull.ff=only pull . c1 c2 c3 2>err &&
+	test_grep ! "You have divergent branches" err &&
+	# In addition to calling out "cannot fast-forward", we very much
+	# want the "multiple branches" piece to be called out to users.
+	test_grep "Cannot fast-forward to multiple branches" err
 
-Or undo this operation with:
+HEAD is now at e4f5a3c c0
+fatal: Cannot fast-forward to multiple branches.
+ok 48 - Multiple can never be fast forwarded
 
-  git switch -
+expecting success of 7601.49 'Cannot rebase with multiple heads': 
+	git reset --hard c0 &&
+	test_must_fail git -c pull.rebase=true pull . c1 c2 c3 2>err &&
+	test_grep ! "You have divergent branches" err &&
+	test_grep "Cannot rebase onto multiple branches." err
 
-Turn off this advice by setting config variable advice.detachedHead to false
+HEAD is now at e4f5a3c c0
+fatal: Cannot rebase onto multiple branches.
+ok 49 - Cannot rebase with multiple heads
 
-HEAD is now at 1214144 upstream_commit
-[main 02206c0] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Note: switching to 'FETCH_HEAD'.
+expecting success of 7601.50 'merge c1 with c2': 
+	git reset --hard c1 &&
+	test_path_is_file c0.c &&
+	test_path_is_file c1.c &&
+	test_path_is_missing c2.c &&
+	test_path_is_missing c3.c &&
+	git merge c2 &&
+	test_path_is_file c1.c &&
+	test_path_is_file c2.c
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 50 - merge c1 with c2
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7601.51 'fast-forward pull succeeds with "true" in pull.ff': 
+	git reset --hard c0 &&
+	test_config pull.ff true &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 
-  git switch -c <new-branch-name>
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 51 - fast-forward pull succeeds with "true" in pull.ff
 
-Or undo this operation with:
+expecting success of 7601.52 'pull.ff=true overrides merge.ff=false': 
+	git reset --hard c0 &&
+	test_config merge.ff false &&
+	test_config pull.ff true &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 
-  git switch -
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Updating e4f5a3c..429abf0
+Fast-forward
+ c1.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+ok 52 - pull.ff=true overrides merge.ff=false
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7601.53 'fast-forward pull creates merge with "false" in pull.ff': 
+	git reset --hard c0 &&
+	test_config pull.ff false &&
+	git pull . c1 &&
+	test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" &&
+	test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)"
 
-HEAD is now at 02206c0 upstream_commit
-[main 3de434e] upstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 732f4af] downstream_commit
- Author: A U Thor <author@example.com>
+HEAD is now at e4f5a3c c0
+From .
+ * tag               c1         -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ c1.c | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-[detached HEAD bd1874b] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Fetching submodule bottom
-From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (bottom), and either merge commit 1214144
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
+ create mode 100644 c1.c
+ok 53 - fast-forward pull creates merge with "false" in pull.ff
+
+expecting success of 7601.54 'pull prevents non-fast-forward with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	test_must_fail git pull . c3
+
+HEAD is now at 429abf0 c1
+From .
+ * tag               c3         -> FETCH_HEAD
+hint: Diverging branches can't be fast-forwarded, you need to either:
 hint:
-hint:       git add bottom
+hint: 	git merge --no-ff
 hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
+hint: or:
 hint:
-hint: Disable this message with "git config set advice.submoduleMergeConflict false"
-Failed to merge submodule bottom
-CONFLICT (submodule): Merge conflict in bottom
-Automatic merge failed; fix conflicts and then commit the result.
-Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-ok 63 - submodule update should skip unmerged submodules
+hint: 	git rebase
+hint:
+hint: Disable this message with "git config set advice.diverging false"
+fatal: Not possible to fast-forward, aborting.
+ok 54 - pull prevents non-fast-forward with "only" in pull.ff
 
-expecting success of 7406.64 'submodule update --recursive skip submodules with strategy=none': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
+expecting success of 7601.55 'already-up-to-date pull succeeds with unspecified pull.ff': 
+	git reset --hard c1 &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 
-	test_commit -C top-cloned/middle/bottom downstream_commit &&
-	git -C top-cloned/middle config submodule.bottom.update none &&
-	git -C top-cloned submodule update --recursive 2>actual.err &&
-	cat >expect.err <<-\EOF &&
-	Skipping submodule 'middle/bottom'
-	EOF
-	test_cmp expect.err actual.err
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 55 - already-up-to-date pull succeeds with unspecified pull.ff
 
-[detached HEAD 4ad2ba9] downstream_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-ok 64 - submodule update --recursive skip submodules with strategy=none
+expecting success of 7601.56 'already-up-to-date pull succeeds with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 
-expecting success of 7406.65 'commit with staged submodule change': 
-	add_submodule_commit_and_validate
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 56 - already-up-to-date pull succeeds with "only" in pull.ff
 
-[main f3de040] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 65 - commit with staged submodule change
+expecting success of 7601.57 'already-up-to-date pull/rebase succeeds with "only" in pull.ff': 
+	git reset --hard c1 &&
+	test_config pull.ff only &&
+	git -c pull.rebase=true pull . c0 &&
+	test "$(git rev-parse HEAD)" = "$(git rev-parse c1)"
 
-expecting success of 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
-	test_config diff.ignoreSubmodules dirty &&
-	add_submodule_commit_and_validate
+HEAD is now at 429abf0 c1
+From .
+ * tag               c0         -> FETCH_HEAD
+Already up to date.
+ok 57 - already-up-to-date pull/rebase succeeds with "only" in pull.ff
 
-[main 9dbf457] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 66 - commit with staged submodule change with ignoreSubmodules dirty
+expecting success of 7601.58 'merge c1 with c2 (ours in pull.twohead)': 
+	git reset --hard c1 &&
+	git config pull.twohead ours &&
+	git merge c2 &&
+	test_path_is_file c1.c &&
+	test_path_is_missing c2.c
 
-expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
-	test_config diff.ignoreSubmodules all &&
-	add_submodule_commit_and_validate
+HEAD is now at 429abf0 c1
+Merge made by the 'ours' strategy.
+ok 58 - merge c1 with c2 (ours in pull.twohead)
 
-[main 70ee70e] create submodule
+expecting success of 7601.59 'merge c1 with c2 and c3 (recursive in pull.octopus)': 
+	git reset --hard c1 &&
+	git config pull.octopus "recursive" &&
+	test_must_fail git merge c2 c3 &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD)"
+
+HEAD is now at 429abf0 c1
+error: Not handling anything other than two heads merge.
+Merge with strategy ort failed.
+ok 59 - merge c1 with c2 and c3 (recursive in pull.octopus)
+
+expecting success of 7601.60 'merge c1 with c2 and c3 (recursive and octopus in pull.octopus)': 
+	git reset --hard c1 &&
+	git config pull.octopus "recursive octopus" &&
+	git merge c2 c3 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
+	git diff --exit-code &&
+	test_path_is_file c0.c &&
+	test_path_is_file c1.c &&
+	test_path_is_file c2.c &&
+	test_path_is_file c3.c
+
+HEAD is now at 429abf0 c1
+error: Not handling anything other than two heads merge.
+Trying merge strategy ort...
+Rewinding the tree to pristine...
+Trying merge strategy octopus...
+Trying simple merge with c2
+Trying simple merge with c3
+Merge made by the 'octopus' strategy.
+ c2.c | 1 +
+ c3.c | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c2.c
+ create mode 100644 c3.c
+ok 60 - merge c1 with c2 and c3 (recursive and octopus in pull.octopus)
+
+expecting success of 7601.61 'setup conflicted merge': 
+	git reset --hard c0 &&
+	echo A >conflict.c &&
+	git add conflict.c &&
+	echo contents >foo.c &&
+	git add foo.c &&
+	git commit -m c4 &&
+	git tag c4 &&
+	echo B >conflict.c &&
+	git add conflict.c &&
+	git mv foo.c bar.c &&
+	git commit -m c5 &&
+	git tag c5 &&
+	git reset --hard c4 &&
+	echo C >conflict.c &&
+	git add conflict.c &&
+	echo secondline >> foo.c &&
+	git add foo.c &&
+	git commit -m c6 &&
+	git tag c6
+
+HEAD is now at e4f5a3c c0
+[master fc941b1] c4
  Author: A U Thor <author@example.com>
-ok 67 - commit with staged submodule change with ignoreSubmodules all
+ 2 files changed, 2 insertions(+)
+ create mode 100644 conflict.c
+ create mode 100644 foo.c
+[master 085299c] c5
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename foo.c => bar.c (100%)
+HEAD is now at fc941b1 c4
+[master cad9e93] c6
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ok 61 - setup conflicted merge
 
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 7601.62 'merge picks up the best result': 
+	git config --unset-all pull.twohead &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s resolve c6 &&
+	resolve_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive c6 &&
+	recursive_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive -s resolve c6 &&
+	auto_count=$(conflict_count) &&
+	test $auto_count = $recursive_count &&
+	test $auto_count != $resolve_count
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
+HEAD is now at 085299c c5
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Trying merge strategy ort...
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Rewinding the tree to pristine...
+Using the ort strategy to prepare resolving by hand.
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+ok 62 - merge picks up the best result
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+expecting success of 7601.63 'merge picks up the best result (from config)': 
+	git config pull.twohead "recursive resolve" &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s resolve c6 &&
+	resolve_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s recursive c6 &&
+	recursive_count=$(conflict_count) &&
+	git reset --hard c5 &&
+	test_must_fail git merge c6 &&
+	auto_count=$(conflict_count) &&
+	test $auto_count = $recursive_count &&
+	test $auto_count != $resolve_count
 
-# passed all 68 test(s)
-1..68
+HEAD is now at 085299c c5
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+HEAD is now at 085299c c5
+Trying merge strategy ort...
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Rewinding the tree to pristine...
+Trying merge strategy resolve...
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging conflict.c
+ERROR: content conflict in conflict.c
+ERROR: foo.c: Not handling case 12f00e90b6ef79117ce6e650416b8cf517099b78 ->  -> f09d25f6fef310fe4501c2b3ad8106df35603251
+fatal: merge program failed
+Rewinding the tree to pristine...
+Using the ort strategy to prepare resolving by hand.
+Auto-merging conflict.c
+CONFLICT (content): Merge conflict in conflict.c
+Automatic merge failed; fix conflicts and then commit the result.
+ok 63 - merge picks up the best result (from config)
+
+expecting success of 7601.64 'merge errors out on invalid strategy': 
+	git config pull.twohead "foobar" &&
+	git reset --hard c5 &&
+	test_must_fail git merge c6
+
+HEAD is now at 085299c c5
+Could not find merge strategy 'foobar'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 64 - merge errors out on invalid strategy
+
+expecting success of 7601.65 'merge errors out on invalid strategy': 
+	git config --unset-all pull.twohead &&
+	git reset --hard c5 &&
+	test_must_fail git merge -s "resolve recursive" c6
+
+HEAD is now at 085299c c5
+Could not find merge strategy 'resolve recursive'.
+Available strategies are: octopus ours recursive resolve subtree.
+ok 65 - merge errors out on invalid strategy
+
+# passed all 65 test(s)
+1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7600-merge.sh ***
@@ -496138,8 +494019,8 @@
 CONFLICT (content): Merge conflict in base.t
 Recorded preimage for 'base.t'
 Automatic merge failed; fix conflicts and then commit the result.
---- rerere.after	2026-04-19 19:24:34.259659440 +0000
-+++ rerere.before	2026-04-19 19:24:34.235659440 +0000
+--- rerere.after	2025-03-17 13:28:54.811577105 +0000
++++ rerere.before	2025-03-17 13:28:54.779576903 +0000
 @@ -0,0 +1 @@
 +base.t
 ok 77 - merge --quit
@@ -497109,8 +494990,8 @@
 
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
---- shared-objects	2026-04-19 19:24:35.051659440 +0000
-+++ member-objects	2026-04-19 19:24:35.083659440 +0000
+--- shared-objects	2025-03-17 13:28:55.007578344 +0000
++++ member-objects	2025-03-17 13:28:55.067578723 +0000
 @@ -1,3 +1,3 @@
 -04646a23dde207060dc8a802fc9bd5d3c2c976bd
 -a0054e492840f572e48a3cb791d2e083afaf08f6
@@ -497208,6572 +495089,4518 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7811-grep-open/.git/
-expecting success of 7811.1 'determine default pager': 
-	test_might_fail git config --unset core.pager &&
-	less=$(
-		sane_unset PAGER GIT_PAGER &&
-		git var GIT_PAGER
+*** t7406-submodule-update.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/.git/
+expecting success of 7406.1 'setup a submodule tree': 
+	git config --global protocol.file.allow always &&
+	echo file > file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
+	git clone super rebasing &&
+	git clone super merging &&
+	git clone super none &&
+	(cd super &&
+	 git submodule add ../submodule submodule &&
+	 test_tick &&
+	 git commit -m "submodule" &&
+	 git submodule init submodule
 	) &&
-	test -n "$less"
-
-ok 1 - determine default pager
-
-expecting success of 7811.2 'setup': 
-	test_commit initial grep.h "
-enum grep_pat_token {
-	GREP_PATTERN,
-	GREP_PATTERN_HEAD,
-	GREP_PATTERN_BODY,
-	GREP_AND,
-	GREP_OPEN_PAREN,
-	GREP_CLOSE_PAREN,
-	GREP_NOT,
-	GREP_OR,
-};" &&
-
-	test_commit add-user revision.c "
-	}
-	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
-	strbuf_release(&sb);
-}
-
-static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
-{
-	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
-" &&
-
-	mkdir subdir &&
-	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
-
-	test_commit uninteresting unrelated "hello, world" &&
-
-	echo GREP_PATTERN >untracked
-
-[master (root-commit) 6a780d2] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 grep.h
-[master 7eeae3c] add-user
- Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 revision.c
-[master 22c3f1e] subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/grep.c
-[master cd972f3] uninteresting
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated
-ok 2 - setup
-
-expecting success of 7811.3 'git grep -O': 
-	cat >$less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >pager-args
-	EOF
-	chmod +x $less &&
-	cat >expect.less <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-	echo grep.h >expect.notless &&
-
-	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
-	{
-		test_cmp expect.less pager-args ||
-		test_cmp expect.notless pager-args
-	} &&
-	test_must_be_empty out
-
---- expect.less	2026-04-19 19:24:35.579659440 +0000
-+++ pager-args	2026-04-19 19:24:35.607659440 +0000
-@@ -1,2 +1 @@
--+/*GREP_PATTERN
- grep.h
-ok 3 - git grep -O
-
-expecting success of 7811.4 'git grep -O --cached': 
-	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-	test_grep open-files-in-pager msg
-
-fatal: --open-files-in-pager only works on the worktree
-ok 4 - git grep -O --cached
-
-expecting success of 7811.5 'git grep -O --no-index': 
-	rm -f expect.less pager-args out &&
-	cat >expect <<-\EOF &&
-	grep.h
-	untracked
-	EOF
-
-	(
-		GIT_PAGER='printf "%s\n" >pager-args' &&
-		export GIT_PAGER &&
-		git grep --no-index -O GREP_PATTERN >out
+	(cd submodule &&
+	echo "line2" > file &&
+	git add file &&
+	git commit -m "Commit 2"
 	) &&
-	test_cmp expect pager-args &&
-	test_must_be_empty out
-
-ok 5 - git grep -O --no-index
-
-expecting success of 7811.6 'setup: fake "less"': 
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
-	EOF
-	chmod +x less
-
-ok 6 - setup: fake "less"
-
-expecting success of 7811.7 'git grep -O jumps to line in less': 
-	cat >expect <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
-	EOF
-
-	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out &&
-
-	git grep -O./less GREP_PATTERN >out2 &&
-	test_cmp expect actual &&
-	test_must_be_empty out2
-
-ok 7 - git grep -O jumps to line in less
-
-expecting success of 7811.8 'modified file': 
-	rm -f actual &&
-	cat >expect <<-\EOF &&
-	+/*enum grep_pat_token
-	grep.h
-	revision.c
-	subdir/grep.c
-	unrelated
-	EOF
-
-	test_when_finished "git reset --hard" &&
-	echo "enum grep_pat_token" >unrelated &&
-	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out
-
-HEAD is now at cd972f3 uninteresting
-ok 8 - modified file
-
-expecting success of 7811.9 'copes with color settings': 
-	rm -f actual &&
-	echo grep.h >expect &&
-	test_config color.grep always &&
-	test_config color.grep.filename yellow &&
-	test_config color.grep.separator green &&
-	git grep -O'printf "%s\n" >actual' GREP_AND &&
-	test_cmp expect actual
-
-ok 9 - copes with color settings
-
-expecting success of 7811.10 'run from subdir': 
-	rm -f actual &&
-	echo grep.c >expect &&
-
-	(
-		cd subdir &&
-		export GIT_PAGER &&
-		GIT_PAGER='printf "%s\n" >../args' &&
-		git grep -O "enum grep_pat_token" >../out &&
-		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
+	(cd super &&
+	 (cd submodule &&
+	  git pull --rebase origin
+	 ) &&
+	 git add submodule &&
+	 git commit -m "submodule update"
 	) &&
-	case $(cat dir) in
-	*subdir)
-		: good
-		;;
-	*)
-		false
-		;;
-	esac &&
-	test_cmp expect args &&
-	test_must_be_empty out &&
-	test_must_be_empty out2
-
-ok 10 - run from subdir
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7813-grep-icase-iso.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7813-grep-icase-iso/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
-
-ok 2 # skip grep pcre string (missing GETTEXT_ISO_LOCALE of GETTEXT_ISO_LOCALE,PCRE)
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7812-grep-icase-non-ascii.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7812-grep-icase-non-ascii/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 7812.1 'setup': 
-	test_write_lines "TILRAUN: Halló Heimur!" >file &&
-	git add file &&
-	LC_ALL="$is_IS_locale" &&
-	export LC_ALL
-
-ok 1 - setup
-
-expecting success of 7812.2 'setup REGEX_LOCALE prerequisite': 
-	# This "test-tool" invocation is identical...
-	if test-tool regex "HALLÓ" "Halló" ICASE
-	then
-		test_set_prereq REGEX_LOCALE
-	else
-
-		# ... to this one, but this way "test_must_fail" will
-		# tell a segfault or abort() from the regexec() test
-		# itself
-		test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
-	fi
-
-ok 2 - setup REGEX_LOCALE prerequisite
-
-expecting success of 7812.3 'grep literal string, no -F': 
-	git grep -i "TILRAUN: Halló Heimur!" &&
-	git grep -i "TILRAUN: HALLÓ HEIMUR!"
-
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 3 - grep literal string, no -F
-
-expecting success of 7812.4 'grep pcre utf-8 icase': 
-	git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
-	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
-	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
-
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 4 - grep pcre utf-8 icase
-
-expecting success of 7812.5 'grep pcre utf-8 string with "+"': 
-	test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
-	git add file2 &&
-	git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
-	echo file >expected &&
-	echo file2 >>expected &&
-	test_cmp expected actual
-
-ok 5 - grep pcre utf-8 string with "+"
-
-expecting success of 7812.6 'grep literal string, with -F': 
-	git grep -i -F "TILRAUN: Halló Heimur!" &&
-	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
-
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 6 - grep literal string, with -F
-
-expecting success of 7812.7 'grep string with regex, with -F': 
-	test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
-	git add file3 &&
-	git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
-
-file3:TILRAUN: Halló Heimur [abc]!
-ok 7 - grep string with regex, with -F
-
-expecting success of 7812.8 'pickaxe -i on non-ascii': 
-	git commit -m first &&
-	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
-	echo first >expected &&
-	test_cmp expected actual
-
-[master (root-commit) 891c4a2] first
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 file
- create mode 100644 file2
- create mode 100644 file3
-ok 8 - pickaxe -i on non-ascii
-
-expecting success of 7812.9 'PCRE v2: setup invalid UTF-8 data': 
-	printf "\\200\\n" >invalid-0x80 &&
-	echo "ævar" >expected &&
-	cat expected >>invalid-0x80 &&
-	git add invalid-0x80 &&
-
-	# Test for PCRE2_MATCH_INVALID_UTF bug
-	# https://bugs.exim.org/show_bug.cgi?id=2642
-	printf "\\345Aæ\\n" >invalid-0xe5 &&
-	git add invalid-0xe5
-
-ok 9 - PCRE v2: setup invalid UTF-8 data
-
-expecting success of 7812.10 'PCRE v2: grep ASCII from invalid UTF-8 data': 
-	git grep -h "var" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
-	test_cmp expected actual
-
-ok 10 - PCRE v2: grep ASCII from invalid UTF-8 data
-
-expecting success of 7812.11 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
-	git grep -h "Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
-
-ok 11 - PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)
-
-expecting success of 7812.12 'PCRE v2: grep non-ASCII from invalid UTF-8 data': 
-	git grep -h "æ" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
-	test_cmp expected actual
-
-ok 12 - PCRE v2: grep non-ASCII from invalid UTF-8 data
-
-expecting success of 7812.13 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
-	git grep -h "Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
-
-ok 13 - PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)
-
-expecting success of 7812.14 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
-	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
-	test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
-
-ok 14 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
-
-checking prerequisite: PCRE2_MATCH_INVALID_UTF
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
-	test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
-
-)
-prerequisite PCRE2_MATCH_INVALID_UTF ok
-expecting success of 7812.15 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
-	git grep -hi "Æ" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
-	test_cmp expected actual
-
-ok 15 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
-
-expecting success of 7812.16 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)': 
-	git grep -hi "Æ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-
-	# Only the case of grepping the ASCII part in a way that
-	# relies on -i fails
-	git grep -hi "aÆ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
-
-ok 16 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)
-
-expecting success of 7812.17 'PCRE v2: grep non-literal ASCII from UTF-8': 
-	git grep --perl-regexp -h -o -e ll. file >actual &&
-	echo "lló" >expected &&
-	test_cmp expected actual
-
-ok 17 - PCRE v2: grep non-literal ASCII from UTF-8
-
-expecting success of 7812.18 'PCRE v2: grep avoid endless loop bug': 
-	echo " Halló" >leading-whitespace &&
-	git add leading-whitespace &&
-	doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
-
-leading-whitespace: Halló
-ok 18 - PCRE v2: grep avoid endless loop bug
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7704-repack-cruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/.git/
-expecting success of 7704.1 '--expire-to stores pruned objects (now)': 
-	git init expire-to-now &&
-	(
-		cd expire-to-now &&
-
-		git branch -M main &&
-
-		test_commit base &&
-
-		git checkout -b cruft &&
-		test_commit --no-tag cruft &&
-
-		git rev-list --objects --no-object-names main..cruft >moved.raw &&
-		sort moved.raw >moved.want &&
-
-		git rev-list --all --objects --no-object-names >expect.raw &&
-		sort expect.raw >expect &&
-
-		git checkout main &&
-		git branch -D cruft &&
-		git reflog expire --all --expire=all &&
-
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration="now" \
-			--expire-to="expired.git/objects/pack/pack" &&
-
-		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
-		test_path_is_file "${expired%.idx}.mtimes" &&
-
-		# Since the `--cruft-expiration` is "now", the effective
-		# behavior is to move _all_ unreachable objects out to
-		# the location in `--expire-to`.
-		git show-index <$expired >expired.raw &&
-		cut -d" " -f2 expired.raw | sort >expired.objects &&
-		git rev-list --all --objects --no-object-names \
-			>remaining.objects &&
-
-		# ...in other words, the combined contents of this
-		# repository and expired.git should be the same as the
-		# set of objects we started with.
-		sort expired.objects remaining.objects >actual &&
-		test_cmp expect actual &&
-
-		# The "moved" objects (i.e., those in expired.git)
-		# should be the same as the cruft objects which were
-		# expired in the previous step.
-		test_cmp moved.want expired.objects
+	(cd super &&
+	 git submodule add ../rebasing rebasing &&
+	 test_tick &&
+	 git commit -m "rebasing"
+	) &&
+	(cd super &&
+	 git submodule add ../merging merging &&
+	 test_tick &&
+	 git commit -m "rebasing"
+	) &&
+	(cd super &&
+	 git submodule add ../none none &&
+	 test_tick &&
+	 git commit -m "none"
+	) &&
+	git clone . recursivesuper &&
+	( cd recursivesuper &&
+	 git submodule add ../super super
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-now/.git/
-[main (root-commit) d1ff1c9] base
+[main (root-commit) 0c90624] upstream
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'cruft'
-[cruft 7b73700] cruft
+ create mode 100644 file
+Cloning into 'super'...
+done.
+Cloning into 'submodule'...
+done.
+Cloning into 'rebasing'...
+done.
+Cloning into 'merging'...
+done.
+Cloning into 'none'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule'...
+done.
+[main 3ae95bc] submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-Switched to branch 'main'
-Deleted branch cruft (was 7b73700).
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
-ok 1 - --expire-to stores pruned objects (now)
-
-expecting success of 7704.2 '--expire-to stores pruned objects (5.minutes.ago)': 
-	git init expire-to-5.minutes.ago &&
-	(
-		cd expire-to-5.minutes.ago &&
-
-		git branch -M main &&
-
-		test_commit base &&
-
-		# Create two classes of unreachable objects, one which
-		# is older than 5 minutes (stale), and another which is
-		# newer (recent).
-		for kind in stale recent
-		do
-			git checkout -b $kind main &&
-			test_commit --no-tag $kind || return 1
-		done &&
-
-		git rev-list --objects --no-object-names main..stale >in &&
-		stale="$(git pack-objects $objdir/pack/pack <in)" &&
-		mtime="$(test-tool chmtime --get =-600 $objdir/pack/pack-$stale.pack)" &&
-
-		# expect holds the set of objects we expect to find in
-		# this repository after repacking
-		git rev-list --objects --no-object-names recent >expect.raw &&
-		sort expect.raw >expect &&
-
-		# moved.want holds the set of objects we expect to find
-		# in expired.git
-		git rev-list --objects --no-object-names main..stale >out &&
-		sort out >moved.want &&
-
-		git checkout main &&
-		git branch -D stale recent &&
-		git reflog expire --all --expire=all &&
-		git prune-packed &&
-
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration=5.minutes.ago \
-			--expire-to="expired.git/objects/pack/pack" &&
-
-		# Some of the remaining objects in this repository are
-		# unreachable, so use `cat-file --batch-all-objects`
-		# instead of `rev-list` to get their names
-		git cat-file --batch-all-objects --batch-check="%(objectname)" \
-			>remaining.objects &&
-		sort remaining.objects >actual &&
-		test_cmp expect actual &&
-
-		(
-			cd expired.git &&
-
-			expired="$(ls objects/pack/pack-*.mtimes)" &&
-			test-tool pack-mtimes $(basename $expired) >out &&
-			cut -d" " -f1 out | sort >../moved.got &&
-
-			# Ensure that there are as many objects with the
-			# expected mtime as were moved to expired.git.
-			#
-			# In other words, ensure that the recorded
-			# mtimes of any moved objects was written
-			# correctly.
-			grep " $mtime$" out >matching &&
-			test_line_count = $(wc -l <../moved.want) matching
-		) &&
-		test_cmp moved.want moved.got
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
-[main (root-commit) d1ff1c9] base
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[main 4301fd3] Commit 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'stale'
-[stale aad0965] stale
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
+   0c90624..4301fd3  main       -> origin/main
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main fed7cea] submodule update
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stale.t
-Switched to a new branch 'recent'
-[recent 52849af] recent
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/rebasing'...
+done.
+[main 5366fa1] rebasing
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 recent.t
-Switched to branch 'main'
-Deleted branch stale (was aad0965).
-Deleted branch recent (was 52849af).
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/expired.git/
-ok 2 - --expire-to stores pruned objects (5.minutes.ago)
-
-expecting success of 7704.3 '--max-cruft-size creates new packs when above threshold': 
-	git init max-cruft-size-large &&
-	(
-		cd max-cruft-size-large &&
-		test_commit base &&
+ 2 files changed, 4 insertions(+)
+ create mode 160000 rebasing
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/merging'...
+done.
+[main 7cb8417] rebasing
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 merging
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/none'...
+done.
+[main e1c6586] none
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 none
+Cloning into 'recursivesuper'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/recursivesuper/super'...
+done.
+ok 1 - setup a submodule tree
 
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
+expecting success of 7406.2 'update --remote falls back to using HEAD': 
+	test_create_repo main-branch-submodule &&
+	test_commit -C main-branch-submodule initial &&
 
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=1M &&
-		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
+	test_create_repo main-branch &&
+	git -C main-branch submodule add ../main-branch-submodule &&
+	git -C main-branch commit -m add-submodule &&
 
-		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
-		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
+	git -C main-branch-submodule switch -c hello &&
+	test_commit -C main-branch-submodule world &&
 
-		grep "^$foo" foo.objects &&
-		test_line_count = 1 foo.objects &&
-		grep "^$bar" bar.objects &&
-		test_line_count = 1 bar.objects
-	)
+	git clone --recursive main-branch main-branch-clone &&
+	git -C main-branch-clone submodule update --remote main-branch-submodule &&
+	test_path_exists main-branch-clone/main-branch-submodule/world.t
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-large/.git/
-[master (root-commit) d1ff1c9] base
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-submodule/.git/
+[main (root-commit) 5e30013] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1776626671
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1776626671
-ok 3 - --max-cruft-size creates new packs when above threshold
-
-expecting success of 7704.4 '--max-cruft-size combines existing packs when below threshold': 
-	git init max-cruft-size-small &&
-	(
-		cd max-cruft-size-small &&
-		test_commit base &&
-
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=10M &&
-
-		cruft=$(ls $packdir/pack-*.mtimes) &&
-		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
-
-		grep "^$foo" cruft.objects &&
-		grep "^$bar" cruft.objects &&
-		test_line_count = 2 cruft.objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-small/.git/
-[master (root-commit) d1ff1c9] base
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch/main-branch-submodule'...
+done.
+[main (root-commit) afd8121] add-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 main-branch-submodule
+Switched to a new branch 'hello'
+[hello 5390c56] world
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1776626671
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1776626672
-ok 4 - --max-cruft-size combines existing packs when below threshold
-
-expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
-	git init max-cruft-size-consume-small &&
-	(
-		cd max-cruft-size-consume-small &&
-
-		test_commit base &&
-		git repack -ad &&
-
-		cruft_foo="$(generate_cruft_pack foo 524288)" &&    # 0.5 MiB
-		cruft_bar="$(generate_cruft_pack bar 524288)" &&    # 0.5 MiB
-		cruft_baz="$(generate_cruft_pack baz 1048576)" &&   # 1.0 MiB
-		cruft_quux="$(generate_cruft_pack quux 1572864)" && # 1.5 MiB
-
-		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
-		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
-		sort expect.raw >expect.objects &&
-
-		# repacking with `--max-cruft-size=2M` should combine
-		# both 0.5 MiB packs together, instead of, say, one of
-		# the 0.5 MiB packs with the 1.0 MiB pack
-		ls $packdir/pack-*.mtimes | sort >cruft.before &&
-		git repack -d --cruft --max-cruft-size=2M &&
-		ls $packdir/pack-*.mtimes | sort >cruft.after &&
-
-		comm -13 cruft.before cruft.after >cruft.new &&
-		comm -23 cruft.before cruft.after >cruft.removed &&
-
-		test_line_count = 1 cruft.new &&
-		test_line_count = 2 cruft.removed &&
+ create mode 100644 world.t
+Cloning into 'main-branch-clone'...
+done.
+Submodule 'main-branch-submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-submodule) registered for path 'main-branch-submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/main-branch-clone/main-branch-submodule'...
+done.
+Submodule path 'main-branch-submodule': checked out '5e3001300c8a533bee3e24efd70fbfae3dfa27e3'
+Submodule path 'main-branch-submodule': checked out '5390c56ee161c05a0e2e1d93e2ec9669e11defb7'
+ok 2 - update --remote falls back to using HEAD
 
-		# the two smaller packs should be rolled up first
-		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
-		test_cmp expect.removed cruft.removed &&
+expecting success of 7406.3 'submodule update detaching the HEAD ': 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
 
-		# ...and contain the set of objects rolled up
-		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
-		sort actual.raw >actual.objects &&
+HEAD is now at 0c90624 upstream
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 3 - submodule update detaching the HEAD 
 
-		test_cmp expect.objects actual.objects
+expecting success of 7406.4 'submodule update from subdirectory': 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1
+	) &&
+	mkdir super/sub &&
+	(cd super/sub &&
+	 (cd ../submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update ../submodule &&
+	 cd ../submodule &&
+	 ! compare_head
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-consume-small/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 5 - --max-cruft-size combines smaller packs first
+HEAD is now at 0c90624 upstream
+Submodule path '../submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 4 - submodule update from subdirectory
 
-expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
-	git init max-cruft-size-freshen &&
-	(
-		cd max-cruft-size-freshen &&
+expecting success of 7406.5 'submodule update --init --recursive from subdirectory': 
+	git -C recursivesuper/super reset --hard HEAD^ &&
+	(cd recursivesuper &&
+	 mkdir tmp &&
+	 cd tmp &&
+	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
+	) &&
+	test_cmp expect actual &&
+	sort actual2 >actual2.sorted &&
+	test_cmp expect2 actual2.sorted
 
-		test_commit base &&
-		git repack -ad &&
+HEAD is now at 7cb8417 rebasing
+ok 5 - submodule update --init --recursive from subdirectory
 
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -10000 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
+expecting success of 7406.6 'submodule update --init from and of subdirectory': 
+	git init withsubs &&
+	(cd withsubs &&
+	 mkdir foo &&
+	 git submodule add "$(pwd)/../rebasing" foo/sub &&
+	 (cd foo &&
+	  git submodule deinit -f sub &&
+	  git submodule update --init sub 2>../../actual2
+	 )
+	) &&
+	test_cmp expect2 actual2
 
-		git repack --cruft -d &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/foo/sub'...
+done.
+Cleared directory 'sub'
+Submodule 'foo/sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/withsubs/../rebasing) unregistered for path 'sub'
+Submodule path 'sub': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+ok 6 - submodule update --init from and of subdirectory
 
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
+expecting success of 7406.7 'submodule update does not fetch already present commits': 
+	(cd submodule &&
+	  echo line3 >> file &&
+	  git add file &&
+	  test_tick &&
+	  git commit -m "upstream line3"
+	) &&
+	(cd super/submodule &&
+	  head=$(git rev-parse --verify HEAD) &&
+	  echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	  git submodule update > ../actual 2> ../actual.err
+	) &&
+	test_cmp expected actual &&
+	test_must_be_empty actual.err
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-freshen/.git/
-[master (root-commit) d1ff1c9] base
+[main 640baa4] upstream line3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 6 - setup --max-cruft-size with freshened objects
+HEAD is now at 0c90624 upstream
+ok 7 - submodule update does not fetch already present commits
 
-expecting success of 7704.7 '--max-cruft-size with freshened objects (loose)': 
-	(
-		cd max-cruft-size-freshen &&
+expecting success of 7406.8 'submodule update should fail due to local changes': 
+	(cd super/submodule &&
+	 git reset --hard HEAD~1 &&
+	 echo "local change" > file
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 test_must_fail git submodule update submodule 2>../actual.raw
+	) &&
+	sed "s/^> //" >expect <<-\EOF &&
+	> error: Your local changes to the following files would be overwritten by checkout:
+	> 	file
+	> Please commit your changes or stash them before you switch branches.
+	> Aborting
+	> fatal: Unable to checkout OID in submodule path 'submodule'
+	EOF
+	sed -e "s/checkout $SQ[^$SQ]*$SQ/checkout OID/" <actual.raw >actual &&
+	test_cmp expect actual
 
-		# regenerate the object, setting its mtime to be more recent
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -100 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
 
-		git repack --cruft -d &&
+HEAD is now at 0c90624 upstream
+ok 8 - submodule update should fail due to local changes
 
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
+expecting success of 7406.9 'submodule update should throw away changes with --force ': 
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --force submodule &&
+	 cd submodule &&
+	 ! compare_head
 	)
 
-ok 7 - --max-cruft-size with freshened objects (loose)
-
-expecting success of 7704.8 '--max-cruft-size with freshened objects (packed)': 
-	(
-		cd max-cruft-size-freshen &&
-
-		# regenerate the object and store it in a packfile,
-		# setting its mtime to be more recent
-		#
-		# store it alongside another cruft object so that we
-		# do not create an identical copy of the existing
-		# cruft pack (which contains $foo).
-		foo="$(generate_random_blob foo 64)" &&
-		bar="$(generate_random_blob bar 64)" &&
-		foo_pack="$(printf "%s\n" $foo $bar | git pack-objects $packdir/pack)" &&
-		git prune-packed &&
-
-		test-tool chmtime --get -10 \
-			"$packdir/pack-$foo_pack.pack" >foo.mtime &&
-
-		git repack --cruft -d &&
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 9 - submodule update should throw away changes with --force 
 
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect.raw &&
-		echo "$bar $(cat foo.mtime)" >>expect.raw &&
-		sort expect.raw >expect &&
-		test_cmp expect actual
+expecting success of 7406.10 'submodule update --force forcibly checks out submodules': 
+	(cd super &&
+	 (cd submodule &&
+	  rm -f file
+	 ) &&
+	 git submodule update --force submodule &&
+	 (cd submodule &&
+	  test "$(git status -s file)" = ""
+	 )
 	)
 
-ok 8 - --max-cruft-size with freshened objects (packed)
-
-expecting success of 7704.9 '--max-cruft-size with pruning': 
-	git init max-cruft-size-prune &&
-	(
-		cd max-cruft-size-prune &&
-
-		test_commit base &&
-		foo="$(generate_random_blob foo $((1024*1024)))" &&
-		bar="$(generate_random_blob bar $((1024*1024)))" &&
-		baz="$(generate_random_blob baz $((1024*1024)))" &&
-
-		test-tool chmtime -10000 "$objdir/$(test_oid_to_path "$foo")" &&
-
-		git repack -d --cruft --max-cruft-size=1M &&
-
-		# backdate the mtimes of all cruft packs to validate
-		# that they were rewritten as a result of pruning
-		ls $packdir/pack-*.mtimes | sort >cruft.before &&
-		for cruft in $(cat cruft.before)
-		do
-			mtime="$(test-tool chmtime --get -10000 "$cruft")" &&
-			echo $cruft $mtime >>mtimes || return 1
-		done &&
-
-		# repack (and prune) with a --max-cruft-size to ensure
-		# that we appropriately split the resulting set of packs
-		git repack -d --cruft --max-cruft-size=1M \
-			--cruft-expiration=1000.seconds.ago &&
-		ls $packdir/pack-*.mtimes | sort >cruft.after &&
-
-		for cruft in $(cat cruft.after)
-		do
-			old_mtime="$(grep $cruft mtimes | cut -d" " -f2)" &&
-			new_mtime="$(test-tool chmtime --get $cruft)" &&
-			test $old_mtime -lt $new_mtime || return 1
-		done &&
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 10 - submodule update --force forcibly checks out submodules
 
-		test_line_count = 3 cruft.before &&
-		test_line_count = 2 cruft.after &&
-		test_must_fail git cat-file -e $foo &&
-		git cat-file -e $bar &&
-		git cat-file -e $baz
+expecting success of 7406.11 'submodule update --remote should fetch upstream changes': 
+	(cd submodule &&
+	 echo line4 >> file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m "upstream line4"
+	) &&
+	(cd super &&
+	 git submodule update --remote --force submodule &&
+	 cd submodule &&
+	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-prune/.git/
-[master (root-commit) d1ff1c9] base
+[main 2758ea9] upstream line4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 9 - --max-cruft-size with pruning
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
+   4301fd3..2758ea9  main       -> origin/main
+Submodule path 'submodule': checked out '2758ea9cdd3f551b89e5fc3424c881031158c70d'
+ok 11 - submodule update --remote should fetch upstream changes
 
-expecting success of 7704.10 '--max-cruft-size ignores non-local packs': 
-	repo="max-cruft-size-non-local" &&
-	git init $repo &&
+expecting success of 7406.12 'submodule update --remote should fetch upstream changes with .': 
 	(
-		cd $repo &&
-		test_commit base &&
-		generate_random_blob foo 64 &&
-		git repack --cruft -d
+		cd super &&
+		git config -f .gitmodules submodule."submodule".branch "." &&
+		git add .gitmodules &&
+		git commit -m "submodules: update from the respective superproject branch"
 	) &&
-
-	git clone --reference=$repo $repo $repo-alt &&
 	(
-		cd $repo-alt &&
-
-		test_commit other &&
-		generate_random_blob bar 64 &&
-
-		# ensure that we do not attempt to pick up packs from
-		# the non-alternated repository, which would result in a
-		# crash
-		git repack --cruft --max-cruft-size=1M -d
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-non-local/.git/
-[master (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-54e90c3729eb77c2e36713e4c8ffddb3d282a270
-Cloning into 'max-cruft-size-non-local-alt'...
-done.
-[master c5d7d1d] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-38614f4581a1b39849954e788ae9d75096235951
-ok 10 - --max-cruft-size ignores non-local packs
-
-expecting success of 7704.11 'reachable packs are preferred over cruft ones': 
-	repo="cruft-preferred-packs" &&
-	git init "$repo" &&
+		cd submodule &&
+		echo line4a >> file &&
+		git add file &&
+		test_tick &&
+		git commit -m "upstream line4a" &&
+		git checkout -b test-branch &&
+		test_commit on-test-branch
+	) &&
 	(
-		cd "$repo" &&
-
-		# This test needs to exercise careful control over when a MIDX
-		# is and is not written. Unset the corresponding TEST variable
-		# accordingly.
-		sane_unset GIT_TEST_MULTI_PACK_INDEX &&
-
-		test_commit base &&
-		test_commit --no-tag cruft &&
-
-		non_cruft="$(echo base | git pack-objects --revs $packdir/pack)" &&
-		# Write a cruft pack which both (a) sorts ahead of the non-cruft
-		# pack in lexical order, and (b) has an older mtime to appease
-		# the MIDX preferred pack selection routine.
-		cruft="$(echo pack-$non_cruft.pack | git pack-objects --cruft $packdir/pack-A)" &&
-		test-tool chmtime -1000 $packdir/pack-A-$cruft.pack &&
-
-		test_commit other &&
-		git repack -d &&
-
-		git repack --geometric 2 -d --write-midx --write-bitmap-index &&
-
-		# After repacking, there are two packs left: one reachable one
-		# (which is the result of combining both of the existing two
-		# non-cruft packs), and one cruft pack.
-		find .git/objects/pack -type f -name "*.pack" >packs &&
-		test_line_count = 2 packs &&
-
-		# Make sure that the pack we just wrote is marked as preferred,
-		# not the cruft one.
-		pack="$(test-tool read-midx --preferred-pack $objdir)" &&
-		test_path_is_missing "$packdir/$(basename "$pack" ".idx").mtimes"
+		cd super &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual &&
+		git -C ../submodule log -1 --oneline main >expect &&
+		test_cmp expect actual &&
+		git checkout -b test-branch &&
+		git submodule update --remote --force submodule &&
+		git -C submodule log -1 --oneline >actual &&
+		git -C ../submodule log -1 --oneline test-branch >expect &&
+		test_cmp expect actual &&
+		git checkout main &&
+		git branch -d test-branch &&
+		git reset --hard HEAD^
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/cruft-preferred-packs/.git/
-[master (root-commit) d1ff1c9] base
+[main 5031a7c] submodules: update from the respective superproject branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 7b73700] cruft
+[main e64979d] upstream line4a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 cruft.t
-[master be186e2] other
+Switched to a new branch 'test-branch'
+[test-branch 6b9ecc1] on-test-branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 other.t
-ok 11 - reachable packs are preferred over cruft ones
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7815-grep-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7815-grep-binary/.git/
-expecting success of 7815.1 'setup': 
-	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
-	git add a &&
-	git commit -m.
-
-[master (root-commit) 8fc33fb] .
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success of 7815.2 'git grep ina a': 
-	echo Binary file a matches >expect &&
-	git grep ina a >actual &&
-	test_cmp expect actual
-
-ok 2 - git grep ina a
-
-expecting success of 7815.3 'git grep -ah ina a': 
-	git grep -ah ina a >actual &&
-	test_cmp a actual
-
-ok 3 - git grep -ah ina a
-
-expecting success of 7815.4 'git grep -I ina a': 
-	test_must_fail git grep -I ina a >actual &&
-	test_must_be_empty actual
-
-ok 4 - git grep -I ina a
-
-expecting success of 7815.5 'git grep -c ina a': 
-	echo a:1 >expect &&
-	git grep -c ina a >actual &&
-	test_cmp expect actual
-
-ok 5 - git grep -c ina a
-
-expecting success of 7815.6 'git grep -l ina a': 
-	echo a >expect &&
-	git grep -l ina a >actual &&
-	test_cmp expect actual
-
-ok 6 - git grep -l ina a
-
-expecting success of 7815.7 'git grep -L bar a': 
-	echo a >expect &&
-	git grep -L bar a >actual &&
-	test_cmp expect actual
-
-ok 7 - git grep -L bar a
-
-expecting success of 7815.8 'git grep -q ina a': 
-	git grep -q ina a >actual &&
-	test_must_be_empty actual
-
-ok 8 - git grep -q ina a
-
-expecting success of 7815.9 'git grep -F ile a': 
-	git grep -F ile a
-
-Binary file a matches
-ok 9 - git grep -F ile a
-
-expecting success of 7815.10 'git grep -Fi iLE a': 
-	git grep -Fi iLE a
-
-Binary file a matches
-ok 10 - git grep -Fi iLE a
-
-expecting success of 7815.11 'git grep ile a': 
-	git grep ile a
-
-Binary file a matches
-ok 11 - git grep ile a
-
-checking known breakage of 7815.12 'git grep .fi a': 
-	git grep .fi a
-
-not ok 12 - git grep .fi a # TODO known breakage
-
-expecting success of 7815.13 'grep respects binary diff attribute': 
-	echo text >t &&
-	git add t &&
-	echo t:text >expect &&
-	git grep text t >actual &&
-	test_cmp expect actual &&
-	echo "t -diff" >.gitattributes &&
-	echo "Binary file t matches" >expect &&
-	git grep text t >actual &&
-	test_cmp expect actual
-
-ok 13 - grep respects binary diff attribute
-
-expecting success of 7815.14 'grep --cached respects binary diff attribute': 
-	git grep --cached text t >actual &&
-	test_cmp expect actual
-
-ok 14 - grep --cached respects binary diff attribute
-
-expecting success of 7815.15 'grep --cached respects binary diff attribute (2)': 
-	git add .gitattributes &&
-	rm .gitattributes &&
-	git grep --cached text t >actual &&
-	test_when_finished "git rm --cached .gitattributes" &&
-	test_when_finished "git checkout .gitattributes" &&
-	test_cmp expect actual
-
-Updated 1 path from the index
-rm '.gitattributes'
-ok 15 - grep --cached respects binary diff attribute (2)
-
-expecting success of 7815.16 'grep revision respects binary diff attribute': 
-	git commit -m new &&
-	echo "Binary file HEAD:t matches" >expect &&
-	git grep text HEAD -- t >actual &&
-	test_when_finished "git reset HEAD^" &&
-	test_cmp expect actual
-
-[master 7e398e6] new
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 t
-ok 16 - grep revision respects binary diff attribute
-
-expecting success of 7815.17 'grep respects not-binary diff attribute': 
-	echo binQary | q_to_nul >b &&
-	git add b &&
-	echo "Binary file b matches" >expect &&
-	git grep bin b >actual &&
-	test_cmp expect actual &&
-	echo "b diff" >.gitattributes &&
-	echo "b:binQary" >expect &&
-	git grep bin b >actual.raw &&
-	nul_to_q <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 17 - grep respects not-binary diff attribute
-
-expecting success of 7815.18 'setup textconv filters': 
-	echo a diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
-
-ok 18 - setup textconv filters
-
-expecting success of 7815.19 'grep does not honor textconv': 
-	test_must_fail git grep Qfile
-
-ok 19 - grep does not honor textconv
-
-expecting success of 7815.20 'grep --textconv honors textconv': 
-	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile >actual &&
-	test_cmp expect actual
-
-ok 20 - grep --textconv honors textconv
-
-expecting success of 7815.21 'grep --no-textconv does not honor textconv': 
-	test_must_fail git grep --no-textconv Qfile
-
-ok 21 - grep --no-textconv does not honor textconv
-
-expecting success of 7815.22 'grep --textconv blob honors textconv': 
-	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile HEAD:a >actual &&
-	test_cmp expect actual
-
-ok 22 - grep --textconv blob honors textconv
-
-# still have 1 known breakage(s)
-# passed all remaining 21 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7817-grep-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/.git/
-expecting success of 7817.1 'setup': 
-	echo "text" >a &&
-	echo "text" >b &&
-	mkdir dir &&
-	echo "text" >dir/c &&
-
-	git init sub &&
-	(
-		cd sub &&
-		mkdir A B &&
-		echo "text" >A/a &&
-		echo "text" >B/b &&
-		git add A B &&
-		git commit -m sub &&
-		git sparse-checkout init --cone &&
-		git sparse-checkout set B
-	) &&
+ create mode 100644 on-test-branch.t
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
+   2758ea9..e64979d  main           -> origin/main
+ * [new branch]      test-branch    -> origin/test-branch
+ * [new tag]         on-test-branch -> on-test-branch
+Submodule path 'submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+Switched to a new branch 'test-branch'
+Submodule path 'submodule': checked out '6b9ecc16dba533ab8642ff93fc3b7fe9267a8c51'
+Switched to branch 'main'
+M	submodule
+Your branch is ahead of 'origin/main' by 6 commits.
+  (use "git push" to publish your local commits)
+Deleted branch test-branch (was 5031a7c).
+HEAD is now at e1c6586 none
+ok 12 - submodule update --remote should fetch upstream changes with .
 
-	git init sub2 &&
-	(
-		cd sub2 &&
-		echo "text" >a &&
-		git add a &&
-		git commit -m sub2
+expecting success of 7406.13 'local config should override .gitmodules branch': 
+	(cd submodule &&
+	 git checkout test-branch &&
+	 echo line5 >> file &&
+	 git add file &&
+	 test_tick &&
+	 git commit -m "upstream line5" &&
+	 git checkout main
 	) &&
+	(cd super &&
+	 git config submodule.submodule.branch test-branch &&
+	 git submodule update --remote --force submodule &&
+	 cd submodule &&
+	 test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)"
+	)
 
-	git submodule add ./sub &&
-	git submodule add ./sub2 &&
-	git add a b dir &&
-	git commit -m super &&
-	git sparse-checkout init --no-cone &&
-	git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
-
-	git tag -am tag-to-commit tag-to-commit HEAD &&
-	tree=$(git rev-parse HEAD^{tree}) &&
-	git tag -am tag-to-tree tag-to-tree $tree &&
-
-	test_path_is_missing b &&
-	test_path_is_missing dir &&
-	test_path_is_missing sub/A &&
-	test_path_is_file a &&
-	test_path_is_file sub/B/b &&
-	test_path_is_file sub2/a &&
-	git branch -m main
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/sub/.git/
-[master (root-commit) e98dfe7] sub
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 A/a
- create mode 100644 B/b
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/sub2/.git/
-[master (root-commit) 4767315] sub2
+Already on 'test-branch'
+[test-branch 5124f33] upstream line5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'sub' to the index
-Adding existing repo at 'sub2' to the index
-[master (root-commit) 26900e7] super
- Author: A U Thor <author@example.com>
- 6 files changed, 11 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 a
- create mode 100644 b
- create mode 100644 dir/c
- create mode 160000 sub
- create mode 160000 sub2
-warning: unable to rmdir 'sub': Directory not empty
-warning: unable to rmdir 'sub2': Directory not empty
-warning: pass a leading slash before paths such as 'sub' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
-warning: unable to rmdir 'sub2': Directory not empty
-ok 1 - setup
-
-expecting success of 7817.2 'working tree grep honors sparse checkout': 
-	cat >expect <<-EOF &&
-	a:text
-	b:new-text
-	EOF
-	test_when_finished "rm -f b" &&
-	echo "new-text" >b &&
-	git grep "text" >actual &&
-	test_cmp expect actual
-
-ok 2 - working tree grep honors sparse checkout
-
-expecting success of 7817.3 'grep searches unmerged file despite not matching sparsity patterns': 
-	cat >expect <<-EOF &&
-	b:modified-b-in-branchX
-	b:modified-b-in-branchY
-	EOF
-	test_when_finished "test_might_fail git merge --abort && \
-			    git checkout main && git sparse-checkout init" &&
-
-	git sparse-checkout disable &&
-	git checkout -b branchY main &&
-	test_commit modified-b-in-branchY b &&
-	git checkout -b branchX main &&
-	test_commit modified-b-in-branchX b &&
-
-	git sparse-checkout init &&
-	test_path_is_missing b &&
-	test_must_fail git merge branchY &&
-	git grep "modified-b" >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'branchY'
-[branchY 69623d1] modified-b-in-branchY
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branchX'
-[branchX 2555150] modified-b-in-branchX
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-Auto-merging b
-CONFLICT (content): Merge conflict in b
-Automatic merge failed; fix conflicts and then commit the result.
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
 Switched to branch 'main'
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unable to rmdir 'sub2': Directory not empty
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 3 - grep searches unmerged file despite not matching sparsity patterns
+Your branch is ahead of 'origin/main' by 4 commits.
+  (use "git push" to publish your local commits)
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
+   6b9ecc1..5124f33  test-branch -> origin/test-branch
+Submodule path 'submodule': checked out '5124f33c895d18ac768733c2d5ce5a12240babd9'
+ok 13 - local config should override .gitmodules branch
 
-expecting success of 7817.4 'grep --cached searches entries with the SKIP_WORKTREE bit': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
-	EOF
-	git grep --cached "text" >actual &&
-	test_cmp expect actual
+expecting success of 7406.14 'submodule update --rebase staying on main': 
+	(cd super/submodule &&
+	  git checkout main
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --rebase submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
+Previous HEAD position was 5124f33 upstream line5
+Switched to branch 'main'
+Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+Successfully rebased and updated refs/heads/main.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 14 - submodule update --rebase staying on main
 
-expecting success of 7817.5 'grep --recurse-submodules honors sparse checkout in submodule': 
-	cat >expect <<-EOF &&
-	a:text
-	sub/B/b:text
-	sub2/a:text
-	EOF
-	git update-index --skip-worktree sub2 &&
-	git grep --recurse-submodules "text" >actual &&
-	test_cmp expect actual
+expecting success of 7406.15 'submodule update --merge staying on main': 
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --merge submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 5 - grep --recurse-submodules honors sparse checkout in submodule
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 15 - submodule update --merge staying on main
 
-expecting success of 7817.6 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
-	sub/A/a:text
-	sub/B/b:text
-	sub2/a:text
-	EOF
-	git grep --recurse-submodules --cached "text" >actual &&
-	test_cmp expect actual
+expecting success of 7406.16 'submodule update - rebase in .git/config': 
+	(cd super &&
+	 git config submodule.submodule.update rebase
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 6 - grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit
+HEAD is now at 0c90624 upstream
+Successfully rebased and updated refs/heads/main.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 16 - submodule update - rebase in .git/config
 
-expecting success of 7817.7 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE': 
-	cat >expect <<-EOF &&
-	a:text
-	EOF
-	test_when_finished "git update-index --no-assume-unchanged b" &&
-	git update-index --assume-unchanged b &&
-	git grep text >actual &&
-	test_cmp expect actual
+expecting success of 7406.17 'submodule update - checkout in .git/config but --rebase given': 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --rebase submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 7 - working tree grep does not search the index with CE_VALID and SKIP_WORKTREE
+HEAD is now at 0c90624 upstream
+Successfully rebased and updated refs/heads/main.
+Submodule path 'submodule': rebased into '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 17 - submodule update - checkout in .git/config but --rebase given
 
-expecting success of 7817.8 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE': 
-	cat >expect <<-EOF &&
-	a:text
-	b:text
-	dir/c:text
-	EOF
-	test_when_finished "git update-index --no-assume-unchanged b" &&
-	git update-index --assume-unchanged b &&
-	git grep --cached text >actual &&
-	test_cmp expect actual
+expecting success of 7406.18 'submodule update - merge in .git/config': 
+	(cd super &&
+	 git config submodule.submodule.update merge
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-warning: unrecognized pattern: 'b'
-warning: disabling cone pattern matching
-ok 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 18 - submodule update - merge in .git/config
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7700-repack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/.git/
-expecting success of 7700.1 'objects in packs marked .keep are not repacked': 
-	echo content1 >file1 &&
-	echo content2 >file2 &&
-	git add . &&
-	test_tick &&
-	git commit -m initial_commit &&
-	# Create two packs
-	# The first pack will contain all of the objects except one
-	git rev-list --objects --all >objs &&
-	grep -v file2 objs | git pack-objects pack &&
-	# The second pack will contain the excluded object
-	packid=$(grep file2 objs | git pack-objects pack) &&
-	>pack-$packid.keep &&
-	git verify-pack -v pack-$packid.idx >packlist &&
-	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
-	mv pack-* .git/objects/pack/ &&
-	git repack -A -d -l &&
-	git prune-packed &&
-	test_has_duplicate_object false
+expecting success of 7406.19 'submodule update - checkout in .git/config but --merge given': 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD~1
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update --merge submodule &&
+	 cd submodule &&
+	 compare_head
+	)
 
-[master (root-commit) 3677360] initial_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-647acebd8748a0656779e97a3d770aa9b59026ae
-ok 1 - objects in packs marked .keep are not repacked
+HEAD is now at 0c90624 upstream
+Updating 0c90624..4301fd3
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'submodule': merged in '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 19 - submodule update - checkout in .git/config but --merge given
 
-expecting success of 7700.2 'writing bitmaps via command-line can duplicate .keep objects': 
-	# build on $oid, $packid, and .keep state from previous
-	git repack -Adbl &&
-	test_has_duplicate_object true
+expecting success of 7406.20 'submodule update - checkout in .git/config': 
+	(cd super &&
+	 git config submodule.submodule.update checkout
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD^
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
 
-637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
-DUPLICATE OBJECT FOUND
-ok 2 - writing bitmaps via command-line can duplicate .keep objects
+HEAD is now at 0c90624 upstream
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 20 - submodule update - checkout in .git/config
 
-expecting success of 7700.3 'writing bitmaps via config can duplicate .keep objects': 
-	# build on $oid, $packid, and .keep state from previous
-	git -c repack.writebitmaps=true repack -Adl &&
-	test_has_duplicate_object true
+expecting success of 7406.21 'submodule update - command in .git/config': 
+	(cd super &&
+	 git config submodule.submodule.update "!git checkout"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard HEAD^
+	) &&
+	(cd super &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git submodule update submodule &&
+	 cd submodule &&
+	 ! compare_head
+	)
 
-637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
-DUPLICATE OBJECT FOUND
-ok 3 - writing bitmaps via config can duplicate .keep objects
+HEAD is now at 0c90624 upstream
+Previous HEAD position was 0c90624 upstream
+HEAD is now at 4301fd3 Commit 2
+Submodule path 'submodule': 'git checkout 4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 21 - submodule update - command in .git/config
 
-expecting success of 7700.4 'loose objects in alternate ODB are not repacked': 
-	mkdir alt_objects &&
-	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
-	echo content3 >file3 &&
-	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
-	git add file3 &&
-	test_tick &&
-	git commit -m commit_file3 &&
-	git repack -a -d -l &&
-	git prune-packed &&
-	test_has_duplicate_object false
+expecting success of 7406.22 'submodule update - command in .gitmodules is rejected': 
+	test_when_finished "git -C super reset --hard HEAD^" &&
+	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
+	git -C super commit -a -m "add command to .gitmodules file" &&
+	git -C super/submodule reset --hard $submodulesha1^ &&
+	test_must_fail git -C super submodule update submodule
 
-[master 6f105e6] commit_file3
+[main 9916237] add command to .gitmodules file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 4 - loose objects in alternate ODB are not repacked
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+HEAD is now at 0c90624 upstream
+fatal: invalid value for 'submodule.submodule.update'
+HEAD is now at e1c6586 none
+ok 22 - submodule update - command in .gitmodules is rejected
 
-)
-prerequisite SYMLINKS ok
-expecting success of 7700.5 '--local keeps packs when alternate is objectdir ': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	test_commit -C repo A &&
+expecting success of 7406.23 'fsck detects command in .gitmodules': 
+	git init command-in-gitmodules &&
 	(
-		cd repo &&
-		git repack -a &&
-		ls .git/objects/pack/*.pack >../expect &&
-		ln -s objects .git/alt_objects &&
-		echo "$(pwd)/.git/alt_objects" >.git/objects/info/alternates &&
-		git repack -a -d -l &&
-		ls .git/objects/pack/*.pack >../actual
-	) &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 5 - --local keeps packs when alternate is objectdir 
-
-expecting success of 7700.6 '--local disables writing bitmaps when connected to alternate ODB': 
-	test_when_finished "rm -rf shared member" &&
+		cd command-in-gitmodules &&
+		git submodule add ../submodule submodule &&
+		test_commit adding-submodule &&
 
-	git init shared &&
-	git clone --shared shared member &&
-	(
-		cd member &&
-		test_commit "object" &&
-		git repack -Adl --write-bitmap-index 2>err &&
-		cat >expect <<-EOF &&
-		warning: disabling bitmap writing, as some objects are not being packed
-		EOF
-		test_cmp expect err &&
-		test_path_is_missing .git/objects/pack-*.bitmap
+		git config -f .gitmodules submodule.submodule.update "!false" &&
+		git add .gitmodules &&
+		test_commit configuring-update &&
+		test_must_fail git fsck
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/shared/.git/
-Cloning into 'member'...
-warning: You appear to have cloned an empty repository.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/command-in-gitmodules/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/command-in-gitmodules/submodule'...
 done.
-[master (root-commit) c58cb10] object
+[main (root-commit) 54d926f] adding-submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 object.t
-ok 6 - --local disables writing bitmaps when connected to alternate ODB
-
-expecting success of 7700.7 'packed obs in alt ODB are repacked even when local repo is packless': 
-	mkdir alt_objects/pack &&
-	mv .git/objects/pack/* alt_objects/pack &&
-	git repack -a &&
-	test_no_missing_in_packs
-
-ok 7 - packed obs in alt ODB are repacked even when local repo is packless
-
-expecting success of 7700.8 'packed obs in alt ODB are repacked when local repo has packs': 
-	rm -f .git/objects/pack/* &&
-	echo new_content >>file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m more_content &&
-	git repack &&
-	git repack -a -d &&
-	test_no_missing_in_packs
-
-[master 0e4e267] more_content
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 adding-submodule.t
+ create mode 160000 submodule
+[main 663bd8b] configuring-update
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - packed obs in alt ODB are repacked when local repo has packs
+ 2 files changed, 2 insertions(+)
+ create mode 100644 configuring-update.t
+error in blob 34075c13cf76fa2281e921a63acb1c52594ee0a0: gitmodulesUpdate: disallowed submodule update setting: !false
+ok 23 - fsck detects command in .gitmodules
 
-expecting success of 7700.9 'packed obs in alternate ODB kept pack are repacked': 
-	# swap the .keep so the commit object is in the pack with .keep
-	for p in alt_objects/pack/*.pack
-	do
-		base_name=$(basename $p .pack) &&
-		if test_path_is_file alt_objects/pack/$base_name.keep
-		then
-			rm alt_objects/pack/$base_name.keep
-		else
-			touch alt_objects/pack/$base_name.keep
-		fi || return 1
-	done &&
-	git repack -a -d &&
-	test_no_missing_in_packs
+expecting success of 7406.24 'submodule update - command in .git/config catches failure': 
+	(cd super &&
+	 git config submodule.submodule.update "!false"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard $submodulesha1^
+	) &&
+	(cd super &&
+	 test_must_fail git submodule update submodule 2>../actual
+	) &&
+	test_cmp actual expect
 
-File alt_objects/pack/pack-09df7d90d739b5b997442ec62fb88ac0d68d7b68.keep doesn't exist
-ok 9 - packed obs in alternate ODB kept pack are repacked
+HEAD is now at 0c90624 upstream
+ok 24 - submodule update - command in .git/config catches failure
 
-expecting success of 7700.10 'packed unreachable obs in alternate ODB are not loosened': 
-	rm -f alt_objects/pack/*.keep &&
-	mv .git/objects/pack/* alt_objects/pack/ &&
-	coid=$(git rev-parse HEAD^{commit}) &&
-	git reset --hard HEAD^ &&
-	test_tick &&
-	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
-	# The pack-objects call on the next line is equivalent to
-	# git repack -A -d without the call to prune-packed
-	git pack-objects --honor-pack-keep --non-empty --all --reflog \
-	    --unpack-unreachable </dev/null pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
-	! grep "^$coid " packlist &&
-	echo >.git/objects/info/alternates &&
-	test_must_fail git show $coid
+expecting success of 7406.25 'submodule update - command in .git/config catches failure -- subdirectory': 
+	(cd super &&
+	 git config submodule.submodule.update "!false"
+	) &&
+	(cd super/submodule &&
+	  git reset --hard $submodulesha1^
+	) &&
+	(cd super &&
+	 mkdir tmp && cd tmp &&
+	 test_must_fail git submodule update ../submodule 2>../../actual
+	) &&
+	test_cmp actual expect
 
-HEAD is now at 6f105e6 commit_file3
-85f93d7925f6a606964869128f786c6de753b60c
-fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
-ok 10 - packed unreachable obs in alternate ODB are not loosened
+HEAD is now at 0c90624 upstream
+ok 25 - submodule update - command in .git/config catches failure -- subdirectory
 
-expecting success of 7700.11 'local packed unreachable obs that exist in alternate ODB are not loosened': 
-	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
-	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	# The pack-objects call on the next line is equivalent to
-	# git repack -A -d without the call to prune-packed
-	git pack-objects --honor-pack-keep --non-empty --all --reflog \
-	    --unpack-unreachable </dev/null pack &&
-	rm -f .git/objects/pack/* &&
-	mv pack-* .git/objects/pack/ &&
-	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
-	! grep "^$coid " &&
-	echo >.git/objects/info/alternates &&
-	test_must_fail git show $coid
+expecting success of 7406.26 'submodule update - command run for initial population of submodule': 
+	cat >expect <<-EOF &&
+	fatal: Execution of 'false $submodulesha1' failed in submodule path 'submodule'
+	EOF
+	rm -rf super/submodule &&
+	test_must_fail git -C super submodule update 2>actual &&
+	test_cmp expect actual &&
+	git -C super submodule update --checkout
 
-4f27fb8d5b73124b8c94f72b938bde9ae4f6999a
-85f93d7925f6a606964869128f786c6de753b60c
-fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
-ok 11 - local packed unreachable obs that exist in alternate ODB are not loosened
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 26 - submodule update - command run for initial population of submodule
 
-expecting success of 7700.12 'objects made unreachable by grafts only are kept': 
-	test_tick &&
-	git commit --allow-empty -m "commit 4" &&
-	H0=$(git rev-parse HEAD) &&
-	H1=$(git rev-parse HEAD^) &&
-	H2=$(git rev-parse HEAD^^) &&
-	echo "$H0 $H2" >.git/info/grafts &&
-	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
-	git repack -a -d &&
-	git cat-file -t $H1
+expecting success of 7406.27 'recursive submodule update - command in .git/config catches failure -- subdirectory': 
+	(cd recursivesuper &&
+	 git submodule update --remote super &&
+	 git add super &&
+	 git commit -m "update to latest to have more than one commit in submodules"
+	) &&
+	git -C recursivesuper/super config submodule.submodule.update "!false" &&
+	git -C recursivesuper/super/submodule reset --hard $submodulesha1^ &&
+	(cd recursivesuper &&
+	 mkdir -p tmp && cd tmp &&
+	 test_must_fail git submodule update --recursive ../super 2>../../actual
+	) &&
+	test_cmp actual expect
 
-[master 95a9e53] commit 4
+[main eae22a2] update to latest to have more than one commit in submodules
  Author: A U Thor <author@example.com>
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-commit
-ok 12 - objects made unreachable by grafts only are kept
-
-expecting success of 7700.13 'repack --keep-pack': 
-	test_create_repo keep-pack &&
-	(
-		cd keep-pack &&
-		# avoid producing different packs due to delta/base choices
-		git config pack.window 0 &&
-		P1=$(commit_and_pack 1) &&
-		P2=$(commit_and_pack 2) &&
-		P3=$(commit_and_pack 3) &&
-		P4=$(commit_and_pack 4) &&
-		ls .git/objects/pack/*.pack >old-counts &&
-		test_line_count = 4 old-counts &&
-		git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
-		ls .git/objects/pack/*.pack >new-counts &&
-		grep -q $P1 new-counts &&
-		grep -q $P4 new-counts &&
-		test_line_count = 3 new-counts &&
-		git fsck &&
-
-		P5=$(commit_and_pack --no-tag 5) &&
-		git reset --hard HEAD^ &&
-		git reflog expire --all --expire=all &&
-		rm -f ".git/objects/pack/${P5%.pack}.idx" &&
-		rm -f ".git/objects/info/commit-graph" &&
-		for from in $(find .git/objects/pack -type f -name "${P5%.pack}.*")
-		do
-			to="$(dirname "$from")/.tmp-1234-$(basename "$from")" &&
-			mv "$from" "$to" || return 1
-		done &&
-
-		# A .idx file without a .pack should not stop us from
-		# repacking what we can.
-		touch .git/objects/pack/pack-does-not-exist.idx &&
-
-		git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 super
+HEAD is now at 0c90624 upstream
+ok 27 - recursive submodule update - command in .git/config catches failure -- subdirectory
 
-		ls .git/objects/pack/*.pack >newer-counts &&
-		test_cmp new-counts newer-counts &&
-		git fsck
+expecting success of 7406.28 'submodule init does not copy command into .git/config': 
+	test_when_finished "git -C super update-index --force-remove submodule1" &&
+	test_when_finished git config -f super/.gitmodules \
+		--remove-section submodule.submodule1 &&
+	(cd super &&
+	 git ls-files -s submodule >out &&
+	 H=$(cut -d" " -f2 out) &&
+	 mkdir submodule1 &&
+	 git update-index --add --cacheinfo 160000 $H submodule1 &&
+	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
+	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
+	 git config -f .gitmodules submodule.submodule1.update !false &&
+	 test_must_fail git submodule init submodule1 &&
+	 test_expect_code 1 git config submodule.submodule1.update >actual &&
+	 test_must_be_empty actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-pack/.git/
-[master (root-commit) c034eb4] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 97f32c4] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master b19c9f9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master a9c77cf] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 0964b20] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-HEAD is now at a9c77cf 4
-ok 13 - repack --keep-pack
-
-expecting success of 7700.14 'repacking fails when missing .pack actually means missing objects': 
-	test_create_repo idx-without-pack &&
-	(
-		cd idx-without-pack &&
-
-		# Avoid producing different packs due to delta/base choices
-		git config pack.window 0 &&
-		P1=$(commit_and_pack 1) &&
-		P2=$(commit_and_pack 2) &&
-		P3=$(commit_and_pack 3) &&
-		P4=$(commit_and_pack 4) &&
-		ls .git/objects/pack/*.pack >old-counts &&
-		test_line_count = 4 old-counts &&
-
-		# Remove one .pack file
-		rm .git/objects/pack/$P2 &&
-
-		ls .git/objects/pack/*.pack >before-pack-dir &&
-
-		test_must_fail git fsck &&
-		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git repack --cruft -d 2>err &&
-		grep "bad object" err &&
+fatal: invalid value for 'submodule.submodule1.update'
+ok 28 - submodule init does not copy command into .git/config
 
-		# Before failing, the repack did not modify the
-		# pack directory.
-		ls .git/objects/pack/*.pack >after-pack-dir &&
-		test_cmp before-pack-dir after-pack-dir
+expecting success of 7406.29 'submodule init picks up rebase': 
+	(cd super &&
+	 git config -f .gitmodules submodule.rebasing.update rebase &&
+	 git submodule init rebasing &&
+	 test "rebase" = "$(git config submodule.rebasing.update)"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/idx-without-pack/.git/
-[master (root-commit) c034eb4] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 97f32c4] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master b19c9f9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master a9c77cf] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-error: refs/tags/2: invalid sha1 pointer 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-broken link from  commit b19c9f990f8204f55aebfaadd643e918b14bd0de
-              to  commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-missing blob 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
-missing commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
-fatal: bad object refs/tags/2
-ok 14 - repacking fails when missing .pack actually means missing objects
-
-expecting success of 7700.15 'bitmaps are created by default in bare repos': 
-	git clone --bare .git bare.git &&
-	rm -f bare.git/objects/pack/*.bitmap &&
-	git -C bare.git repack -ad &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
-	test_path_is_file "$bitmap"
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 15 - bitmaps are created by default in bare repos
-
-expecting success of 7700.16 'incremental repack does not complain': 
-	git -C bare.git repack -q 2>repack.err &&
-	test_must_be_empty repack.err
-
-ok 16 - incremental repack does not complain
-
-expecting success of 7700.17 'bitmaps can be disabled on bare repos': 
-	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
-	test -z "$bitmap"
-
-ls: cannot access 'bare.git/objects/pack/*.bitmap': No such file or directory
-ok 17 - bitmaps can be disabled on bare repos
-
-expecting success of 7700.18 'no bitmaps created if .keep files present': 
-	pack=$(ls bare.git/objects/pack/*.pack) &&
-	test_path_is_file "$pack" &&
-	keep=${pack%.pack}.keep &&
-	test_when_finished "rm -f \"\$keep\"" &&
-	>"$keep" &&
-
-	# Disable --name-hash-version test due to stderr comparison.
-	GIT_TEST_NAME_HASH_VERSION=1 \
-		git -C bare.git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
-	find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
-	test_must_be_empty actual
-
-Nothing new to pack.
-ok 18 - no bitmaps created if .keep files present
-
-expecting success of 7700.19 'auto-bitmaps do not complain if unavailable': 
-	test_config -C bare.git pack.packSizeLimit 1M &&
-	blob=$(test-tool genrandom big $((1024*1024)) |
-	       git -C bare.git hash-object -w --stdin) &&
-	git -C bare.git update-ref refs/tags/big $blob &&
-
-	# Disable --name-hash-version test due to stderr comparison.
-	GIT_TEST_NAME_HASH_VERSION=1 \
-		git -C bare.git repack -ad 2>stderr &&
-	test_must_be_empty stderr &&
-	find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
-	test_must_be_empty actual
-
-ok 19 - auto-bitmaps do not complain if unavailable
-
-expecting success of 7700.20 'repacking with a filter works': 
-	git -C bare.git repack -a -d &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
-	git -C bare.git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
-	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
-	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
-	test "$commit_pack" != "$blob_pack" &&
-	tree_pack=$(test-tool -C bare.git find-pack -c 1 HEAD^{tree}) &&
-	test "$tree_pack" = "$commit_pack" &&
-	blob_pack2=$(test-tool -C bare.git find-pack -c 1 HEAD:file2) &&
-	test "$blob_pack2" = "$blob_pack"
-
-ok 20 - repacking with a filter works
-
-expecting success of 7700.21 '--filter fails with --write-bitmap-index': 
-	test_must_fail git -C bare.git repack -a -d --write-bitmap-index --filter=blob:none
-
-warning: Failed to write bitmap index. Packfile doesn't have full closure (object ac3e272b72bbf89def8657766b855d0656630ed4 is missing)
-fatal: failed to write bitmap index
-ok 21 - --filter fails with --write-bitmap-index
-
-expecting success of 7700.22 'repacking with two filters works': 
-	git init two-filters &&
-	(
-		cd two-filters &&
-		mkdir subdir &&
-		test_commit foo &&
-		test_commit subdir_bar subdir/bar &&
-		test_commit subdir_baz subdir/baz
-	) &&
-	git clone --no-local --bare two-filters two-filters.git &&
-	(
-		cd two-filters.git &&
-		test_stdout_line_count = 1 ls objects/pack/*.pack &&
-		git -c repack.writebitmaps=false repack -a -d \
-			--filter=blob:none --filter=tree:1 &&
-		test_stdout_line_count = 2 ls objects/pack/*.pack &&
-		commit_pack=$(test-tool find-pack -c 1 HEAD) &&
-		blob_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		root_tree_pack=$(test-tool find-pack -c 1 HEAD^{tree}) &&
-		subdir_tree_hash=$(git ls-tree --object-only HEAD -- subdir) &&
-		subdir_tree_pack=$(test-tool find-pack -c 1 "$subdir_tree_hash") &&
+ok 29 - submodule init picks up rebase
 
-		# Root tree and subdir tree are not in the same packfiles
-		test "$commit_pack" != "$blob_pack" &&
-		test "$commit_pack" = "$root_tree_pack" &&
-		test "$blob_pack" = "$subdir_tree_pack"
+expecting success of 7406.30 'submodule init picks up merge': 
+	(cd super &&
+	 git config -f .gitmodules submodule.merging.update merge &&
+	 git submodule init merging &&
+	 test "merge" = "$(git config submodule.merging.update)"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/two-filters/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 4eb4067] subdir_bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/bar
-[master 0e7eef3] subdir_baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/baz
-Cloning into bare repository 'two-filters.git'...
-ok 22 - repacking with two filters works
-
-expecting success of 7700.23 '--filter works with .keep packs': 
-	prepare_for_keep_packs &&
-	(
-		cd keep-packs.git &&
-
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack=$(test-tool find-pack -c 1 HEAD) &&
-
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" = "$head_pack" &&
-
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
-
-		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack_1=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
-
-		# Object bar is still only in the old .keep pack
-		test "$foo_pack_1" != "$foo_pack" &&
-		test "$bar_pack_1" = "$bar_pack" &&
-		test "$head_pack_1" != "$head_pack" &&
+ok 30 - submodule init picks up merge
 
-		test "$foo_pack_1" != "$bar_pack_1" &&
-		test "$foo_pack_1" != "$head_pack_1" &&
-		test "$bar_pack_1" != "$head_pack_1"
+expecting success of 7406.31 'submodule update --merge  - ignores --merge  for new submodules': 
+	test_config -C super submodule.submodule.update checkout &&
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git submodule update --merge submodule &&
+	 git status -s submodule >actual &&
+	 test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-packs/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 6cdf4f6] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Cloning into bare repository 'keep-packs.git'...
-ab13c7a16ee24dc55b0123c11524c0f93444a00b
-ok 23 - --filter works with .keep packs
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 31 - submodule update --merge  - ignores --merge  for new submodules
 
-expecting success of 7700.24 '--filter works with --pack-kept-objects and .keep packs': 
-	rm -rf keep-packs keep-packs.git &&
-	prepare_for_keep_packs &&
-	(
-		cd keep-packs.git &&
+expecting success of 7406.32 'submodule update --rebase - ignores --rebase for new submodules': 
+	test_config -C super submodule.submodule.update checkout &&
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git submodule update --rebase submodule &&
+	 git status -s submodule >actual &&
+	 test_cmp expect actual
+	)
 
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
-		head_pack=$(test-tool find-pack -c 1 HEAD) &&
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 32 - submodule update --rebase - ignores --rebase for new submodules
 
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" = "$head_pack" &&
+expecting success of 7406.33 'submodule update ignores update=merge config for new submodules': 
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git config submodule.submodule.update merge &&
+	 git submodule update submodule &&
+	 git status -s submodule >actual &&
+	 git config --unset submodule.submodule.update &&
+	 test_cmp expect actual
+	)
 
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
-			--pack-kept-objects &&
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 33 - submodule update ignores update=merge config for new submodules
 
-		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
-		test-tool find-pack -c 2 HEAD:bar.t >bar_pack_1 &&
-		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
+expecting success of 7406.34 'submodule update ignores update=rebase config for new submodules': 
+	(cd super &&
+	 rm -rf submodule &&
+	 git submodule update submodule &&
+	 git status -s submodule >expect &&
+	 rm -rf submodule &&
+	 git config submodule.submodule.update rebase &&
+	 git submodule update submodule &&
+	 git status -s submodule >actual &&
+	 git config --unset submodule.submodule.update &&
+	 test_cmp expect actual
+	)
 
-		test "$foo_pack_1" != "$foo_pack" &&
-		test "$foo_pack_1" != "$bar_pack" &&
-		test "$head_pack_1" != "$head_pack" &&
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 34 - submodule update ignores update=rebase config for new submodules
 
-		# Object bar is in both the old .keep pack and the new
-		# pack that contained the filtered out objects
-		grep "$bar_pack" bar_pack_1 &&
-		grep "$foo_pack_1" bar_pack_1 &&
-		test "$foo_pack_1" != "$head_pack_1"
+expecting success of 7406.35 'submodule init picks up update=none': 
+	(cd super &&
+	 git config -f .gitmodules submodule.none.update none &&
+	 git submodule init none &&
+	 test "none" = "$(git config submodule.none.update)"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-packs/.git/
-[master (root-commit) 898d072] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[master 6cdf4f6] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Cloning into bare repository 'keep-packs.git'...
-ab13c7a16ee24dc55b0123c11524c0f93444a00b
-./objects/pack/pack-34a84b0f4b3b87454ca39e0a5c6995cbcd831e78.pack
-./objects/pack/pack-363177a6806037aa6bdc933b4c6cd4df16c8340f.pack
-ok 24 - --filter works with --pack-kept-objects and .keep packs
-
-expecting success of 7700.25 '--filter-to stores filtered out objects': 
-	git -C bare.git repack -a -d &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
+ok 35 - submodule init picks up update=none
 
-	git init --bare filtered.git &&
-	git -C bare.git -c repack.writebitmaps=false repack -a -d \
-		--filter=blob:none \
-		--filter-to=../filtered.git/objects/pack/pack &&
-	test_stdout_line_count = 1 ls bare.git/objects/pack/pack-*.pack &&
-	test_stdout_line_count = 1 ls filtered.git/objects/pack/pack-*.pack &&
+expecting success of 7406.36 'submodule update - update=none in .git/config': 
+	(cd super &&
+	 git config submodule.submodule.update none &&
+	 (cd submodule &&
+	  git checkout main &&
+	  compare_head
+	 ) &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 git submodule update &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 (cd submodule &&
+	  compare_head
+	 ) &&
+	 git config --unset submodule.submodule.update &&
+	 git submodule update submodule
+	)
 
-	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 0 HEAD:file1) &&
-	blob_hash=$(git -C bare.git rev-parse HEAD:file1) &&
-	test -n "$blob_hash" &&
-	blob_pack=$(test-tool -C filtered.git find-pack -c 1 $blob_hash) &&
+Previous HEAD position was 4301fd3 Commit 2
+Switched to branch 'main'
+Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+submodule
+Skipping submodule 'none'
+Skipping submodule 'submodule'
+submodule
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 36 - submodule update - update=none in .git/config
 
-	echo $(pwd)/filtered.git/objects >bare.git/objects/info/alternates &&
-	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
-	blob_content=$(git -C bare.git show $blob_hash) &&
-	test "$blob_content" = "content1"
+expecting success of 7406.37 'submodule update - update=none in .git/config but --checkout given': 
+	(cd super &&
+	 git config submodule.submodule.update none &&
+	 (cd submodule &&
+	  git checkout main &&
+	  compare_head
+	 ) &&
+	 git diff --name-only >out &&
+	 grep ^submodule$ out &&
+	 git submodule update --checkout &&
+	 git diff --name-only >out &&
+	 ! grep ^submodule$ out &&
+	 (cd submodule &&
+	  ! compare_head
+	 ) &&
+	 git config --unset submodule.submodule.update
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/filtered.git/
-ok 25 - --filter-to stores filtered out objects
+Previous HEAD position was 4301fd3 Commit 2
+Switched to branch 'main'
+Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+submodule
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 37 - submodule update - update=none in .git/config but --checkout given
 
-expecting success of 7700.26 '--filter works with --max-pack-size': 
-	rm -rf filtered.git &&
-	git init --bare filtered.git &&
-	git init max-pack-size &&
-	(
-		cd max-pack-size &&
-		test_commit base &&
-		# two blobs which exceed the maximum pack size
-		test-tool genrandom foo 1048576 >foo &&
-		git hash-object -w foo &&
-		test-tool genrandom bar 1048576 >bar &&
-		git hash-object -w bar &&
-		git add foo bar &&
-		git commit -m "adding foo and bar"
+expecting success of 7406.38 'submodule update --init skips submodule with update=none': 
+	(cd super &&
+	 git add .gitmodules &&
+	 git commit -m ".gitmodules"
 	) &&
-	git clone --no-local --bare max-pack-size max-pack-size.git &&
-	(
-		cd max-pack-size.git &&
-		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
-			--max-pack-size=1M \
-			--filter-to=../filtered.git/objects/pack/pack &&
-		echo $(cd .. && pwd)/filtered.git/objects >objects/info/alternates &&
-
-		# Check that the 3 blobs are in different packfiles in filtered.git
-		test_stdout_line_count = 3 ls ../filtered.git/objects/pack/pack-*.pack &&
-		test_stdout_line_count = 1 ls objects/pack/pack-*.pack &&
-		foo_pack=$(test-tool find-pack -c 1 HEAD:foo) &&
-		bar_pack=$(test-tool find-pack -c 1 HEAD:bar) &&
-		base_pack=$(test-tool find-pack -c 1 HEAD:base.t) &&
-		test "$foo_pack" != "$bar_pack" &&
-		test "$foo_pack" != "$base_pack" &&
-		test "$bar_pack" != "$base_pack" &&
-		for pack in "$foo_pack" "$bar_pack" "$base_pack"
-		do
-			case "$foo_pack" in */filtered.git/objects/pack/*) true ;; *) return 1 ;; esac
-		done
+	git clone super cloned &&
+	(cd cloned &&
+	 git submodule update --init &&
+	 test_path_exists submodule/.git &&
+	 test_path_is_missing none/.git
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/filtered.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/max-pack-size/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c
-[master 8791424] adding foo and bar
+[main aaa14d4] .gitmodules
  Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
- create mode 100644 foo
-Cloning into bare repository 'max-pack-size.git'...
-ok 26 - --filter works with --max-pack-size
+ 1 file changed, 3 insertions(+)
+Cloning into 'cloned'...
+done.
+Submodule 'merging' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/merging'...
+done.
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/rebasing'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/cloned/submodule'...
+done.
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 38 - submodule update --init skips submodule with update=none
 
-expecting success of 7700.27 'setup for --write-midx tests': 
-	git init midx &&
+expecting success of 7406.39 'submodule update with pathspec warns against uninitialized ones': 
+	test_when_finished "rm -fr selective" &&
+	git clone super selective &&
 	(
-		cd midx &&
-		git config core.multiPackIndex true &&
-
-		test_commit base
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/midx/.git/
-[master (root-commit) bf71f7c] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 27 - setup for --write-midx tests
+		cd selective &&
+		git submodule init submodule &&
 
-expecting success of 7700.28 '--write-midx unchanged': 
-	(
-		cd midx &&
-		git repack &&
-		test_path_is_missing $midx &&
-		test_path_is_missing $midx-*.bitmap &&
+		git submodule update submodule 2>err &&
+		! grep "Submodule path .* not initialized" err &&
 
-		git repack --write-midx &&
+		git submodule update rebasing 2>err &&
+		grep "Submodule path .rebasing. not initialized" err &&
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
+		test_path_exists submodule/.git &&
+		test_path_is_missing rebasing/.git
 	)
 
-Nothing new to pack.
-ok 28 - --write-midx unchanged
-
-expecting success of 7700.29 '--write-midx with a new pack': 
-	(
-		cd midx &&
-		test_commit loose &&
-
-		git repack --write-midx &&
-
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
-	)
 
-[master add4380] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 29 - --write-midx with a new pack
+Cloning into 'selective'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+Submodule path 'rebasing' not initialized
+ok 39 - submodule update with pathspec warns against uninitialized ones
 
-expecting success of 7700.30 '--write-midx with -b': 
+expecting success of 7406.40 'submodule update without pathspec updates only initialized ones': 
+	test_when_finished "rm -fr selective" &&
+	git clone super selective &&
 	(
-		cd midx &&
-		git repack -mb &&
-
-		test_path_is_file $midx &&
-		test_path_is_file $midx-*.bitmap &&
-		test_midx_consistent $objdir
+		cd selective &&
+		git submodule init submodule &&
+		git submodule update 2>err &&
+		test_path_exists submodule/.git &&
+		test_path_is_missing rebasing/.git &&
+		! grep "Submodule path .* not initialized" err
 	)
 
-Nothing new to pack.
-ok 30 - --write-midx with -b
-
-expecting success of 7700.31 '--write-midx with -d': 
-	(
-		cd midx &&
-		test_commit repack &&
 
-		git repack -Ad --write-midx &&
+Cloning into 'selective'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 40 - submodule update without pathspec updates only initialized ones
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-*.bitmap &&
-		test_midx_consistent $objdir
+expecting success of 7406.41 'submodule update continues after checkout error': 
+	(cd super &&
+	 git reset --hard HEAD &&
+	 git submodule add ../submodule submodule2 &&
+	 git submodule init &&
+	 git commit -am "new_submodule" &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 (cd submodule &&
+	  test_commit "update_submodule" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  echo "" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
 	)
 
-[master c5a8e1e] repack
+HEAD is now at aaa14d4 .gitmodules
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule2'...
+done.
+[main eac0b19] new_submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack.t
-ok 31 - --write-midx with -d
-
-expecting success of 7700.32 'cleans up MIDX when appropriate': 
-	(
-		cd midx &&
-
-		test_commit repack-2 &&
-		git repack -Adb --write-midx &&
-
-		checksum=$(midx_checksum $objdir) &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$checksum.bitmap &&
-
-		test_commit repack-3 &&
-		git repack -Adb --write-midx &&
-
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-$checksum.bitmap &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-
-		test_commit repack-4 &&
-		git repack -Adb &&
-
-		find $objdir/pack -type f -name "multi-pack-index*" >files &&
-		test_must_be_empty files
-	)
-
-[master 10c6ab2] repack-2
+ 2 files changed, 4 insertions(+)
+ create mode 160000 submodule2
+[detached HEAD bf859b9] update_submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-2.t
-[master 789d6b0] repack-3
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a877e2d] update_submodule2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-3.t
-[master 97148f2] repack-4
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+[main 589bc5b] two_new_submodule_commits
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 repack-4.t
-ok 32 - cleans up MIDX when appropriate
-
-expecting success of 7700.33 '--write-midx with preferred bitmap tips': 
-	git init midx-preferred-tips &&
-	test_when_finished "rm -fr midx-preferred-tips" &&
-	(
-		cd midx-preferred-tips &&
-
-		test_commit_bulk --message="%s" 103 &&
-
-		git log --format="%H" >commits.raw &&
-		sort <commits.raw >commits &&
-
-		git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
-		git update-ref --stdin <refs &&
-
-		git repack --write-midx --write-bitmap-index &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-
-		test-tool bitmap list-commits | sort >bitmaps &&
-		comm -13 bitmaps commits >before &&
-		test_line_count = 1 before &&
-
-		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-		rm -fr $midx &&
-
-		# instead of constructing the snapshot ourselves (c.f., the test
-		# "write a bitmap with --refs-snapshot (preferred tips)" in
-		# t5326), mark the missing commit as preferred by adding it to
-		# the pack.preferBitmapTips configuration.
-		git for-each-ref --format="%(refname:rstrip=1)" \
-			--points-at="$(cat before)" >missing &&
-		git config pack.preferBitmapTips "$(cat missing)" &&
-		git repack --write-midx --write-bitmap-index &&
-
-		test-tool bitmap list-commits | sort >bitmaps &&
-		comm -13 bitmaps commits >after &&
-
-		! test_cmp before after
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/midx-preferred-tips/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          309 (         0 duplicates                  )
-      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
-      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:            103
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26909 /      26909
----------------------------------------------------------------------
-
-Nothing new to pack.
-Nothing new to pack.
---- before	2026-04-19 19:24:39.367659440 +0000
-+++ after	2026-04-19 19:24:39.607659440 +0000
-@@ -1 +1 @@
--8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
-+3d2725684b43b31e3b81e5070d1847c9f1e2cf00
-ok 33 - --write-midx with preferred bitmap tips
-
-expecting success of 7700.34 '--write-midx -b packs non-kept objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Note: switching to 'HEAD^'.
 
-		# Create a kept pack-file
-		test_commit base &&
-		git repack -ad &&
-		find $objdir/pack -name "*.idx" >before &&
-		test_line_count = 1 before &&
-		before_name=$(cat before) &&
-		>${before_name%.idx}.keep &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		# Create a non-kept pack-file
-		test_commit other &&
-		git repack &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		# Create loose objects
-		test_commit loose &&
+  git switch -c <new-branch-name>
 
-		# Repack everything
-		git repack --write-midx -a -b -d &&
+Or undo this operation with:
 
-		# There should be two pack-files now, the
-		# old, kept pack and the new, non-kept pack.
-		find $objdir/pack -name "*.idx" | sort >after &&
-		test_line_count = 2 after &&
-		find $objdir/pack -name "*.keep" >kept &&
-		kept_name=$(cat kept) &&
-		echo ${kept_name%.keep}.idx >kept-idx &&
-		test_cmp before kept-idx &&
+  git switch -
 
-		# Get object list from the kept pack.
-		get_sorted_objects_from_pack before >old.objects &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		# Get object list from the one non-kept pack-file
-		comm -13 before after >new-pack &&
-		test_line_count = 1 new-pack &&
-		get_sorted_objects_from_pack new-pack >new.objects &&
+HEAD is now at eac0b19 new_submodule
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+error: Your local changes to the following files would be overwritten by checkout:
+	file
+Please commit your changes or stash them before you switch branches.
+Aborting
+fatal: Unable to checkout '4301fd3e4110d3b6212c19aed3094150392545b9' in submodule path 'submodule'
+Submodule path 'submodule2': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+ok 41 - submodule update continues after checkout error
 
-		# None of the objects in the new pack should
-		# exist within the kept pack.
-		comm -12 old.objects new.objects >shared.objects &&
-		test_must_be_empty shared.objects
+expecting success of 7406.42 'submodule update continues after recursive checkout error': 
+	(cd super &&
+	 git reset --hard HEAD &&
+	 git checkout main &&
+	 git submodule update &&
+	 (cd submodule &&
+	  git submodule add ../submodule subsubmodule &&
+	  git submodule init &&
+	  git commit -m "new_subsubmodule"
+	 ) &&
+	 git add submodule &&
+	 git commit -m "update_submodule" &&
+	 (cd submodule &&
+	  (cd subsubmodule &&
+	   test_commit "update_subsubmodule" file
+	  ) &&
+	  git add subsubmodule &&
+	  test_commit "update_submodule_again" file &&
+	  (cd subsubmodule &&
+	   test_commit "update_subsubmodule_again" file
+	  ) &&
+	  test_commit "update_submodule_again_again" file
+	 ) &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect &&
+	  test_commit "update_submodule2_again" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "new_commits" &&
+	 git checkout HEAD^ &&
+	 (cd submodule &&
+	  git checkout HEAD^ &&
+	  (cd subsubmodule &&
+	   echo "" > file
+	  )
+	 ) &&
+	 test_expect_code 1 git submodule update --recursive &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) bf71f7c] base
+HEAD is now at eac0b19 new_submodule
+Previous HEAD position was eac0b19 new_submodule
+Switched to branch 'main'
+M	submodule
+M	submodule2
+Your branch is ahead of 'origin/main' by 8 commits.
+  (use "git push" to publish your local commits)
+Skipping submodule 'none'
+Submodule path 'submodule2': checked out 'a877e2d4bf03b4d9f4617d9894698a04062cafcb'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/submodule/subsubmodule'...
+done.
+[detached HEAD 13e98de] new_subsubmodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 29fd16f] other
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+[main 550d814] update_submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other.t
-[master abf480b] loose
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main c5b9177] update_subsubmodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 34 - --write-midx -b packs non-kept objects
-
-expecting success of 7700.35 '--write-midx removes stale pack-based bitmaps': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-		test_commit base &&
-		git repack -Ab &&
-
-		pack_bitmap=$(ls $objdir/pack/pack-*.bitmap) &&
-		test_path_is_file "$pack_bitmap" &&
-
-		test_commit tip &&
-		git repack -bm &&
-
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-		test_path_is_missing $pack_bitmap
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) bf71f7c] base
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+[detached HEAD 7a52240] update_submodule_again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 80dd058] tip
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+[main c86226f] update_subsubmodule_again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 tip.t
-ok 35 - --write-midx removes stale pack-based bitmaps
-
-expecting success of 7700.36 '--write-midx with --pack-kept-objects': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
-
-		test_commit one &&
-		test_commit two &&
-
-		one="$(echo "one" | git pack-objects --revs $objdir/pack/pack)" &&
-		two="$(echo "one..two" | git pack-objects --revs $objdir/pack/pack)" &&
-
-		keep="$objdir/pack/pack-$one.keep" &&
-		touch "$keep" &&
-
-		git repack --write-midx --write-bitmap-index --geometric=2 -d \
-			--pack-kept-objects &&
-
-		test_path_is_file $keep &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
-[master (root-commit) 06e07da] one
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 36cba07] update_submodule_again_again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 738d2f7] two
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 6f5fed0] update_submodule2_again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 36 - --write-midx with --pack-kept-objects
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 7700.37 '--quiet disables progress': 
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		git -C midx repack -ad --quiet --write-midx 2>stderr &&
-	test_must_be_empty stderr
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main ddd1b9e] new_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Note: switching to 'HEAD^'.
 
-ok 37 - --quiet disables progress
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7700.38 'clean up .tmp-* packs on error': 
-	test_must_fail ok=sigpipe git \
-		-c repack.cruftwindow=bogus \
-		repack -ad --cruft &&
-	find $objdir/pack -name .tmp-* >tmpfiles &&
-	test_must_be_empty tmpfiles
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-error: option `window' expects a numerical value
-ok 38 - clean up .tmp-* packs on error
+  git switch -c <new-branch-name>
 
-expecting success of 7700.39 'repack -ad cleans up old .tmp-* packs': 
-	git rev-parse HEAD >input &&
-	git pack-objects $objdir/pack/.tmp-1234 <input &&
-	git repack -ad &&
-	find $objdir/pack -name .tmp-* >tmpfiles &&
-	test_must_be_empty tmpfiles
+Or undo this operation with:
 
-e3eb4c912613cba004926473486638766e8cc44e
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-ok 39 - repack -ad cleans up old .tmp-* packs
+  git switch -
 
-expecting success of 7700.40 '--name-hash-version option passes through to pack-objects': 
-	GIT_TRACE2_EVENT="$(pwd)/hash-trace.txt" \
-		git repack -a --name-hash-version=2 &&
-	test_subcommand_flex git pack-objects --name-hash-version=2 <hash-trace.txt
+Turn off this advice by setting config variable advice.detachedHead to false
 
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-{"event":"child_start","sid":"20260419T192441.444843Z-H8d819085-P0021f7ef","thread":"main","time":"2026-04-19T19:24:41.445459Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--name-hash-version=2","--delta-base-offset",".git/objects/pack/.tmp-2226159-pack","--keep-true-parents","--honor-pack-keep","--non-empty","--all","--reflog","--indexed-objects"]}
-ok 40 - --name-hash-version option passes through to pack-objects
+HEAD is now at 550d814 update_submodule
+M	submodule
+M	submodule2
+Previous HEAD position was 36cba07 update_submodule_again_again
+HEAD is now at 7a52240 update_submodule_again
+M	subsubmodule
+Skipping submodule 'none'
+Submodule path 'submodule': checked out '13e98de6d21cfd4c0d0ac89f9801423fd4a8848c'
+error: Your local changes to the following files would be overwritten by checkout:
+	file
+Please commit your changes or stash them before you switch branches.
+Aborting
+fatal: Unable to checkout 'e64979d13b9a9301a3030b8c005b1d9fd5397a44' in submodule path 'submodule/subsubmodule'
+fatal: Failed to recurse into submodule path 'submodule'
+Submodule path 'submodule2': checked out 'a877e2d4bf03b4d9f4617d9894698a04062cafcb'
+ok 42 - submodule update continues after recursive checkout error
 
-expecting success of 7700.41 'setup for update-server-info': 
-	git init update-server-info &&
-	test_commit -C update-server-info message
+expecting success of 7406.43 'submodule update exit immediately in case of merge conflict': 
+	(cd super &&
+	 git checkout main &&
+	 git reset --hard HEAD &&
+	 (cd submodule &&
+	  (cd subsubmodule &&
+	   git reset --hard HEAD
+	  )
+	 ) &&
+	 git submodule update --recursive &&
+	 (cd submodule &&
+	  test_commit "update_submodule_2" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2_2" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  git checkout main &&
+	  test_commit "conflict" file &&
+	  echo "conflict" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 git config submodule.submodule.update merge &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/update-server-info/.git/
-[master (root-commit) c5363f9] message
+Previous HEAD position was 550d814 update_submodule
+Switched to branch 'main'
+M	submodule
+M	submodule2
+Your branch is ahead of 'origin/main' by 10 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at ddd1b9e new_commits
+HEAD is now at c86226f update_subsubmodule_again
+Skipping submodule 'none'
+Submodule path 'submodule': checked out '36cba07de2dd3db68a7098ceff6e2441982207b1'
+Submodule path 'submodule/subsubmodule': checked out 'c5b9177e5e719279dd558d927533a748252168f7'
+Submodule path 'submodule2': checked out '6f5fed0da411cfed33516e12e385e026134bad56'
+[detached HEAD ef00442] update_submodule_2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 message.t
-ok 41 - setup for update-server-info
-
-expecting success of 7700.42 'updates server info by default': 
-	test_server_info_cleanup &&
-	git -C update-server-info repack &&
-	test_server_info_present
-
-ok 42 - updates server info by default
-
-expecting success of 7700.43 '-n skips updating server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info repack -n &&
-	test_server_info_missing
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD a8b9c2b] update_submodule2_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main b5c2539] two_new_submodule_commits
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+warning: unable to rmdir 'subsubmodule': Directory not empty
+Previous HEAD position was ef00442 update_submodule_2
+Switched to branch 'main'
+Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+[main d727295] conflict
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'HEAD^'.
 
-Nothing new to pack.
-ok 43 - -n skips updating server info
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7700.44 'repack.updateServerInfo=true updates server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=true repack &&
-	test_server_info_present
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-Nothing new to pack.
-ok 44 - repack.updateServerInfo=true updates server info
+  git switch -c <new-branch-name>
 
-expecting success of 7700.45 'repack.updateServerInfo=false skips updating server info': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=false repack &&
-	test_server_info_missing
+Or undo this operation with:
 
-Nothing new to pack.
-ok 45 - repack.updateServerInfo=false skips updating server info
+  git switch -
 
-expecting success of 7700.46 '-n overrides repack.updateServerInfo=true': 
-	test_server_info_cleanup &&
-	git -C update-server-info -c repack.updateServerInfo=true repack -n &&
-	test_server_info_missing
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Nothing new to pack.
-ok 46 - -n overrides repack.updateServerInfo=true
+HEAD is now at ddd1b9e new_commits
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Unable to merge '36cba07de2dd3db68a7098ceff6e2441982207b1' in submodule path 'submodule'
+ok 43 - submodule update exit immediately in case of merge conflict
 
-# passed all 46 test(s)
-1..46
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7112-reset-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/.git/
-expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
+expecting success of 7406.44 'submodule update exit immediately after recursive rebase error': 
+	(cd super &&
+	 git checkout main &&
+	 git reset --hard HEAD &&
+	 (cd submodule &&
+	  git reset --hard HEAD &&
+	  git submodule update --recursive
+	 ) &&
+	 (cd submodule &&
+	  test_commit "update_submodule_3" file
+	 ) &&
+	 (cd submodule2 &&
+	  test_commit "update_submodule2_3" file
+	 ) &&
+	 git add submodule &&
+	 git add submodule2 &&
+	 git commit -m "two_new_submodule_commits" &&
+	 (cd submodule &&
+	  git checkout main &&
+	  test_commit "conflict2" file &&
+	  echo "conflict" > file
+	 ) &&
+	 git checkout HEAD^ &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../expect
+	 ) &&
+	 git config submodule.submodule.update rebase &&
+	 test_must_fail git submodule update &&
+	 (cd submodule2 &&
+	  git rev-parse --verify HEAD >../actual
+	 ) &&
+	 test_cmp expect actual
+	)
+
+Previous HEAD position was ddd1b9e new_commits
+Switched to branch 'main'
+M	submodule
+Your branch is ahead of 'origin/main' by 11 commits.
+  (use "git push" to publish your local commits)
+HEAD is now at b5c2539 two_new_submodule_commits
+warning: unable to rmdir 'subsubmodule': Directory not empty
+HEAD is now at d727295 conflict
+[main b3ea5df] update_submodule_3
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 9f300bf] update_submodule2_3
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 45a22d0] two_new_submodule_commits
  Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Already on 'main'
+Your branch and 'origin/main' have diverged,
+and have 2 and 4 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+[main cf8450a] conflict2
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
-
-expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'HEAD^'.
 
-expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
+  git switch -c <new-branch-name>
 
-expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
+Or undo this operation with:
 
-expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
+  git switch -
 
-expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
-not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+HEAD is now at b5c2539 two_new_submodule_commits
+M	submodule
+M	submodule2
+Skipping submodule 'none'
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+fatal: Unable to rebase 'ef00442dab3d569479883a2d86505b87d824a88b' in submodule path 'submodule'
+ok 44 - submodule update exit immediately after recursive rebase error
 
-expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
+expecting success of 7406.45 'add different submodules to the same path': 
+	(cd super &&
+	 git submodule add ../submodule s1 &&
+	 test_must_fail git submodule add ../merging s1
+	)
 
-expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/s1'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
+fatal: 's1' already exists in the index
+ok 45 - add different submodules to the same path
 
-expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
+expecting success of 7406.46 'submodule add places git-dir in superprojects git-dir': 
+	(cd super &&
+	 mkdir deeper &&
+	 git submodule add ../submodule deeper/submodule &&
+	 (cd deeper/submodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/deeper/submodule &&
+	  git log > ../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
 
-expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super/deeper/submodule'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
+ok 46 - submodule add places git-dir in superprojects git-dir
 
-expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			test_must_fail $command add_sub1 &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
+expecting success of 7406.47 'submodule update places git-dir in superprojects git-dir': 
+	(cd super &&
+	 git commit -m "added submodule"
+	) &&
+	git clone super super2 &&
+	(cd super2 &&
+	 git submodule init deeper/submodule &&
+	 git submodule update &&
+	 (cd deeper/submodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/deeper/submodule &&
+	  git log > ../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
 
-expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
-		test_when_finished "rm -rf submodule_update/.git/info" &&
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			mkdir .git/info &&
-			echo sub1 >.git/info/exclude &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+[detached HEAD 3a6f187] added submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 160000 deeper/submodule
+ create mode 160000 s1
+Cloning into 'super2'...
 done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
+Note: switching to '3a6f1872cb4f0ffb018914be6f6215cb5d81f789'.
 
-checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_submodule_content sub1 origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
-		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm -rf .git/modules/sub1/info &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			mkdir .git/modules/sub1/info &&
-			echo ignored >.git/modules/sub1/info/exclude &&
-			: >sub1/ignored &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+  git switch -c <new-branch-name>
 
-expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			git -c submodule.recurse=true $cmd_args modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
+Or undo this operation with:
 
-expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
+  git switch -
 
-expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Submodule 'deeper/submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
 done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
+Skipping submodule 'none'
+Submodule path 'deeper/submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+ok 47 - submodule update places git-dir in superprojects git-dir
 
-expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
-ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
+expecting success of 7406.48 'submodule add places git-dir in superprojects git-dir recursive': 
+	(cd super2 &&
+	 (cd deeper/submodule &&
+	  git submodule add ../submodule subsubmodule &&
+	  (cd subsubmodule &&
+	   git log > ../../../expected
+	  ) &&
+	  git commit -m "added subsubmodule" &&
+	  git push origin :
+	 ) &&
+	 (cd .git/modules/deeper/submodule/modules/subsubmodule &&
+	  git log > ../../../../../actual
+	 ) &&
+	 git add deeper/submodule &&
+	 git commit -m "update submodule" &&
+	 git push origin : &&
+	 test_cmp expected actual
+	)
 
-expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
 done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
-ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
+[detached HEAD 0642c0f] added subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+Everything up-to-date
+[detached HEAD 7b048b2] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Everything up-to-date
+ok 48 - submodule add places git-dir in superprojects git-dir recursive
 
-expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-HEAD is now at 953e869 update sub1, that updates nested sub
-ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
+expecting success of 7406.49 'submodule update places git-dir in superprojects git-dir recursive': 
+	mkdir super_update_r &&
+	(cd super_update_r &&
+	 git init --bare
+	) &&
+	mkdir subsuper_update_r &&
+	(cd subsuper_update_r &&
+	 git init --bare
+	) &&
+	mkdir subsubsuper_update_r &&
+	(cd subsubsuper_update_r &&
+	 git init --bare
+	) &&
+	git clone subsubsuper_update_r subsubsuper_update_r2 &&
+	(cd subsubsuper_update_r2 &&
+	 test_commit "update_subsubsuper" file &&
+	 git push origin main
+	) &&
+	git clone subsuper_update_r subsuper_update_r2 &&
+	(cd subsuper_update_r2 &&
+	 test_commit "update_subsuper" file &&
+	 git submodule add ../subsubsuper_update_r subsubmodule &&
+	 git commit -am "subsubmodule" &&
+	 git push origin main
+	) &&
+	git clone super_update_r super_update_r2 &&
+	(cd super_update_r2 &&
+	 test_commit "update_super" file &&
+	 git submodule add ../subsuper_update_r submodule &&
+	 git commit -am "submodule" &&
+	 git push origin main
+	) &&
+	rm -rf super_update_r2 &&
+	git clone super_update_r super_update_r2 &&
+	(cd super_update_r2 &&
+	 git submodule update --init --recursive >actual &&
+	 test_grep "Submodule path .submodule/subsubmodule.: checked out" actual &&
+	 (cd submodule/subsubmodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/submodule/modules/subsubmodule &&
+	  git log > ../../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
 
-expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
+Cloning into 'subsubsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+[main (root-commit) 0d20a78] update_subsubsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r
+ * [new branch]      main -> main
+Cloning into 'subsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
+[main (root-commit) 635883b] update_subsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+[main 86a3496] subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r
+ * [new branch]      main -> main
+Cloning into 'super_update_r2'...
+warning: You appear to have cloned an empty repository.
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
+[main (root-commit) c2de1fa] update_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+[main 2d70acb] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r
+ * [new branch]      main -> main
+Cloning into 'super_update_r2'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
-
-checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
-not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
+ok 49 - submodule update places git-dir in superprojects git-dir recursive
 
-expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-HEAD is now at 27611a5 Base
-ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
+expecting success of 7406.50 'submodule add properly re-creates deeper level submodules': 
+	(cd super &&
+	 git reset --hard main &&
+	 rm -rf deeper/ &&
+	 git submodule add --force ../submodule deeper/submodule
+	)
 
-expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
+warning: unable to rmdir 'deeper/submodule': Directory not empty
+warning: unable to rmdir 's1': Directory not empty
+HEAD is now at 45a22d0 two_new_submodule_commits
+Reactivating local git directory for submodule 'deeper/submodule'
+ok 50 - submodule add properly re-creates deeper level submodules
 
-expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
+expecting success of 7406.51 'submodule update properly revives a moved submodule': 
+	(cd super &&
+	 H=$(git rev-parse --short HEAD) &&
+	 git commit -am "pre move" &&
+	 H2=$(git rev-parse --short HEAD) &&
+	 git status >out &&
+	 sed "s/$H/XXX/" out >expect &&
+	 H=$(cd submodule2 && git rev-parse HEAD) &&
+	 git rm --cached submodule2 &&
+	 rm -rf submodule2 &&
+	 mkdir -p "moved/sub module" &&
+	 git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
+	 git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
+	 git commit -am "post move" &&
+	 git submodule update &&
+	 git status > out &&
+	 sed "s/$H2/XXX/" out >actual &&
+	 test_cmp expect actual
+	)
 
-expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-fatal: ref HEAD is not a symbolic ref
-ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
+[detached HEAD d262110] pre move
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 160000 deeper/submodule
+rm 'submodule2'
+[detached HEAD db0a21b] post move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename submodule2 => moved/sub module (100%)
+Skipping submodule 'none'
+Submodule path 'moved/sub module': checked out '9f300bf70a08f60a240990d98de1aaa8040994a1'
+ok 51 - submodule update properly revives a moved submodule
 
-expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+checking prerequisite: SYMLINKS
 
-expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-HEAD is now at cb28587 Replace sub1 with directory
-ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules/sub1 &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at cb28587 Replace sub1 with directory
-ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+)
+prerequisite SYMLINKS ok
+expecting success of 7406.52 'submodule update can handle symbolic links in pwd': 
+	mkdir -p linked/dir &&
+	ln -s linked/dir linkto &&
+	(cd linkto &&
+	 git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
+	 (cd super &&
+	  git submodule update --init --recursive
+	 )
+	)
 
-expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/expect &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file
-		)
-	
-Cloning into 'submodule_update'...
+Cloning into 'super'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
-
-expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to_interested invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
 done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-HEAD is now at 3036e4e Revert "Invalid sub1 commit"
-ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
+ok 52 - submodule update can handle symbolic links in pwd
 
-expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			echo "gitdir: bogus/path" >sub1/.git &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
+expecting success of 7406.53 'submodule update clone shallow submodule': 
+	test_when_finished "rm -rf super3" &&
+	first=$(git -C cloned rev-parse HEAD:submodule) &&
+	second=$(git -C submodule rev-parse HEAD) &&
+	commit_count=$(git -C submodule rev-list --count $first^..$second) &&
+	git clone cloned super3 &&
+	pwd=$(pwd) &&
+	(
+		cd super3 &&
+		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+		mv -f .gitmodules.tmp .gitmodules &&
+		git submodule update --init --depth=$commit_count &&
+		git -C submodule log --oneline >out &&
+		test_line_count = 1 out
+	)
 
-expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm sub1/file1 &&
-			: >sub1/new_file &&
-			git -C sub1 add new_file &&
-			$command HEAD &&
-			test_path_is_file sub1/file1 &&
-			test_path_is_missing sub1/new_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into 'super3'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-HEAD is now at 09bcf53 Add sub1
-ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
+Submodule 'merging' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/merging'...
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/rebasing'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super3/submodule'...
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 53 - submodule update clone shallow submodule
 
-expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_test_func: added submodule creates empty directory
+expecting success of 7406.54 'submodule update clone shallow submodule outside of depth': 
+	test_when_finished "rm -rf super3" &&
+	git clone cloned super3 &&
+	pwd=$(pwd) &&
+	(
+		cd super3 &&
+		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+		mv -f .gitmodules.tmp .gitmodules &&
+		# Some protocol versions (e.g. 2) support fetching
+		# unadvertised objects, so restrict this test to v0.
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+			git submodule update --init --depth=1 2>actual &&
+		test_grep "Direct fetching of that commit failed." actual &&
+		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
+		git submodule update --init --depth=1 >actual &&
+		git -C submodule log --oneline >out &&
+		test_line_count = 1 out
+	)
 
-expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+Cloning into 'super3'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 42 - git_test_func: added submodule leaves existing empty directory alone
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+fatal: Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
+Skipping submodule 'none'
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule
+ * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
+ok 54 - submodule update clone shallow submodule outside of depth
 
-expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 7406.55 'submodule update --recursive drops module name before recursing': 
+	(cd super2 &&
+	 (cd deeper/submodule/subsubmodule &&
+	  git checkout HEAD^
+	 ) &&
+	 git submodule update --recursive deeper/submodule >actual &&
+	 test_grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
+	)
 
-expecting success of 7112.44 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_test_func: replace directory with submodule
+Note: switching to 'HEAD^'.
 
-expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 47 - git_test_func: replace submodule with a directory must fail
+  git switch -c <new-branch-name>
 
-expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
+Or undo this operation with:
 
-checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
+  git switch -
 
-checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 51 - git_test_func: modified submodule does not update submodule work tree
+HEAD is now at 2758ea9 upstream line4
+Submodule path 'deeper/submodule/subsubmodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+ok 55 - submodule update --recursive drops module name before recursing
 
-expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+expecting success of 7406.56 'submodule update can be run in parallel': 
+	(cd super2 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
+	 grep "7 tasks" trace.out &&
+	 git config submodule.fetchJobs 8 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update &&
+	 grep "8 tasks" trace.out &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
+	 grep "9 tasks" trace.out
+	)
 
-expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 7 tasks
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 8 tasks
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 9 tasks
+ok 56 - submodule update can be run in parallel
 
-expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+expecting success of 7406.57 'git clone passes the parallel jobs config on to submodules': 
+	test_when_finished "rm -rf super4" &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
+	grep "7 tasks" trace.out &&
+	rm -rf super4 &&
+	git config --global submodule.fetchJobs 8 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
+	grep "8 tasks" trace.out &&
+	rm -rf super4 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
+	grep "9 tasks" trace.out &&
+	rm -rf super4
 
-expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Cloning into 'super4'...
 done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+run_processes_parallel: preparing to run up to 7 tasks
+Cloning into 'super4'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+run_processes_parallel: preparing to run up to 8 tasks
+Cloning into 'super4'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_test_func: added submodule creates empty directory
+run_processes_parallel: preparing to run up to 9 tasks
+ok 57 - git clone passes the parallel jobs config on to submodules
 
-expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 56 - git_test_func: added submodule leaves existing empty directory alone
+expecting success of 7406.58 'submodule update --quiet passes quietness to merge/rebase': 
+	(cd super &&
+	 test_commit -C rebasing message &&
+	 git submodule update --rebase --quiet >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err &&
+	 git submodule update --rebase >out 2>err &&
+	 test_file_not_empty out &&
+	 test_must_be_empty err
+	)
 
-expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 57 - git_test_func: replace tracked file with submodule creates empty directory
+[main 271c4a7] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 message.t
+ok 58 - submodule update --quiet passes quietness to merge/rebase
 
-expecting success of 7112.58 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 58 - git_test_func: replace directory with submodule
+expecting success of 7406.59 'submodule update --quiet passes quietness to fetch with a shallow clone': 
+	test_when_finished "rm -rf super4 super5 super6" &&
+	git clone . super4 &&
+	(cd super4 &&
+	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
+	 git commit -am "setup submodule3"
+	) &&
+	(cd submodule &&
+	  test_commit line6 file
+	) &&
+	git clone super4 super5 &&
+	(cd super5 &&
+	 # This test var can mess with the stderr output checked in this test.
+	 GIT_TEST_NAME_HASH_VERSION=1 \
+		git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err
+	) &&
+	git clone super4 super6 &&
+	(cd super6 &&
+	 git submodule update --init --depth=1 submodule3 >out 2>err &&
+	 test_file_not_empty out &&
+	 test_file_not_empty err
+	)
 
-expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into 'super4'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+[main e87103b] setup submodule3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule3
+[main a93a1f3] line6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Cloning into 'super5'...
 done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into 'super6'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+ok 59 - submodule update --quiet passes quietness to fetch with a shallow clone
 
-expecting success of 7112.61 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 61 - git_test_func: replace submodule with a directory must fail
+expecting success of 7406.60 'submodule update --filter requires --init': 
+	test_expect_code 129 git -C super submodule update --filter blob:none
 
-expecting success of 7112.62 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
+usage: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
 
-checking known breakage of 7112.63 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+    -f, --[no-]force      force checkout updates
+    --[no-]init           initialize uninitialized submodules before update
+    --[no-]remote         use SHA-1 of submodule's remote tracking branch
+    --[no-]recursive      traverse submodules recursively
+    -N, --no-fetch        don't fetch new objects from the remote site
+    --fetch               opposite of --no-fetch
+    --[no-]checkout       use the 'checkout' update strategy (default)
+    -m, --[no-]merge      use the 'merge' update strategy
+    -r, --[no-]rebase     use the 'rebase' update strategy
+    --[no-]reference <repo>
+                          reference repository
+    --[no-]ref-format <format>
+                          specify the reference format to use
+    --[no-]dissociate     use --reference only while cloning
+    --[no-]depth <n>      create a shallow clone truncated to the specified number of revisions
+    -j, --[no-]jobs <n>   parallel jobs
+    --[no-]recommend-shallow
+                          whether the initial clone should follow the shallow recommendation
+    -q, --[no-]quiet      don't print cloning progress
+    --[no-]progress       force cloning progress
+    --[no-]require-init   disallow cloning into non-empty directory, implies --init
+    --[no-]single-branch  clone only one branch, HEAD or --branch
+    --[no-]filter <args>  object filtering
 
-checking known breakage of 7112.64 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 60 - submodule update --filter requires --init
 
-expecting success of 7112.65 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 65 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 7406.61 'submodule update --filter sets partial clone settings': 
+	test_when_finished "rm -rf super-filter" &&
+	git clone cloned super-filter &&
+	git -C super-filter submodule update --init --filter blob:none &&
+	test_cmp_config -C super-filter/submodule true remote.origin.promisor &&
+	test_cmp_config -C super-filter/submodule blob:none remote.origin.partialclonefilter
 
-expecting success of 7112.66 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Cloning into 'super-filter'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 7112.67 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
+Submodule 'merging' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/merging'...
+warning: --filter is ignored in local clones; use file:// instead.
 done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/rebasing'...
+warning: --filter is ignored in local clones; use file:// instead.
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/super-filter/submodule'...
+warning: --filter is ignored in local clones; use file:// instead.
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 61 - submodule update --filter sets partial clone settings
 
-expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+expecting success of 7406.62 'setup clean recursive superproject': 
+	git init bottom &&
+	test_commit -C bottom "bottom" &&
+	git init middle &&
+	git -C middle submodule add ../bottom bottom &&
+	git -C middle commit -m "middle" &&
+	git init top &&
+	git -C top submodule add ../middle middle &&
+	git -C top commit -m "top" &&
+	git clone --recurse-submodules top top-clean
 
-expecting success of 7112.69 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom/.git/
+[main (root-commit) 581bdeb] bottom
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bottom.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle/bottom'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+[main (root-commit) 8c7b95e] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 bottom
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top/.git/
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top/middle'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 69 - git_test_func: added submodule creates empty directory
-
-expecting success of 7112.70 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
+[main (root-commit) ab8145a] top
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 middle
+Cloning into 'top-clean'...
 done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+Submodule 'middle' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top-clean/middle'...
 done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+Submodule 'bottom' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 70 - git_test_func: added submodule leaves existing empty directory alone
+Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
+ok 62 - setup clean recursive superproject
 
-expecting success of 7112.71 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 71 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 7406.63 'submodule update should skip unmerged submodules': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
 
-expecting success of 7112.72 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 72 - git_test_func: replace directory with submodule
+	# Create an upstream commit in each repo, starting with bottom
+	test_commit -C bottom upstream_commit &&
+	# Create middle commit
+	git -C middle/bottom fetch &&
+	git -C middle/bottom checkout -f FETCH_HEAD &&
+	git -C middle add bottom &&
+	git -C middle commit -m "upstream_commit" &&
+	# Create top commit
+	git -C top/middle fetch &&
+	git -C top/middle checkout -f FETCH_HEAD &&
+	git -C top add middle &&
+	git -C top commit -m "upstream_commit" &&
 
-expecting success of 7112.73 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
+	# Create a downstream conflict
+	test_commit -C top-cloned/middle/bottom downstream_commit &&
+	git -C top-cloned/middle add bottom &&
+	git -C top-cloned/middle commit -m "downstream_commit" &&
+	git -C top-cloned/middle fetch --recurse-submodules origin &&
+	test_must_fail git -C top-cloned/middle merge origin/main &&
 
-expecting success of 7112.74 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+	# Make the update of "middle" a no-op, otherwise we error out
+	# because of its unmerged state
+	test_config -C top-cloned submodule.middle.update !true &&
+	git -C top-cloned submodule update --recursive 2>actual.err &&
+	cat >expect.err <<-\EOF &&
+	Skipping unmerged submodule middle/bottom
+	EOF
+	test_cmp expect.err actual.err
 
-checking known breakage of 7112.75 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+[main 1214144] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_commit.t
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+Note: switching to 'FETCH_HEAD'.
 
-checking known breakage of 7112.76 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-checking known breakage of 7112.77 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-checking known breakage of 7112.78 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+  git switch -c <new-branch-name>
 
-expecting success of 7112.79 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 79 - git_test_func: modified submodule does not update submodule work tree
+Or undo this operation with:
 
-expecting success of 7112.80 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-HEAD is now at e6169bf Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+  git switch -
 
-expecting success of 7112.81 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-HEAD is now at 3036e4e Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+HEAD is now at 1214144 upstream_commit
+[main 02206c0] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  main       -> origin/main
+Note: switching to 'FETCH_HEAD'.
 
-# still have 12 known breakage(s)
-# passed all remaining 70 test(s)
-1..82
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7508-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/.git/
-expecting success of 7508.1 'status -h in broken repository': 
-	git config --global advice.statusuoption false &&
-	mkdir broken &&
-	test_when_finished "rm -fr broken" &&
-	(
-		cd broken &&
-		git init &&
-		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
-		test_expect_code 129 git status -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/broken/.git/
-usage: git status [<options>] [--] [<pathspec>...]
-ok 1 - status -h in broken repository
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7508.2 'commit -h in broken repository': 
-	mkdir broken &&
-	test_when_finished "rm -fr broken" &&
-	(
-		cd broken &&
-		git init &&
-		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
-		test_expect_code 129 git commit -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/broken/.git/
-usage: git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]
-ok 2 - commit -h in broken repository
+Or undo this operation with:
 
-expecting success of 7508.3 'create upstream branch': 
-	git checkout -b upstream &&
-	test_commit upstream1 &&
-	test_commit upstream2 &&
-	# leave the first commit on main as root because several
-	# tests depend on this case; for our upstream we only
-	# care about commit counts anyway, so a totally divergent
-	# history is OK
-	git checkout --orphan main
+  git switch -
 
-Switched to a new branch 'upstream'
-[upstream (root-commit) 8d383b3] upstream1
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 02206c0 upstream_commit
+[main 3de434e] upstream_commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream1.t
-[upstream 726fd3a] upstream2
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 732f4af] downstream_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 upstream2.t
-Switched to a new branch 'main'
-ok 3 - create upstream branch
+ create mode 100644 downstream_commit.t
+[detached HEAD bd1874b] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  main       -> origin/main
+Fetching submodule bottom
+From /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (bottom), and either merge commit 1214144
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add bottom
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config set advice.submoduleMergeConflict false"
+Failed to merge submodule bottom
+CONFLICT (submodule): Merge conflict in bottom
+Automatic merge failed; fix conflicts and then commit the result.
+Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+ok 63 - submodule update should skip unmerged submodules
 
-expecting success of 7508.4 'setup': 
-	: >tracked &&
-	: >modified &&
-	mkdir dir1 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	mkdir dir2 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	git add . &&
+expecting success of 7406.64 'submodule update --recursive skip submodules with strategy=none': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
 
-	git status >output &&
+	test_commit -C top-cloned/middle/bottom downstream_commit &&
+	git -C top-cloned/middle config submodule.bottom.update none &&
+	git -C top-cloned submodule update --recursive 2>actual.err &&
+	cat >expect.err <<-\EOF &&
+	Skipping submodule 'middle/bottom'
+	EOF
+	test_cmp expect.err actual.err
 
-	test_tick &&
-	git commit -m initial &&
-	: >untracked &&
-	: >dir1/untracked &&
-	: >dir2/untracked &&
-	echo 1 >dir1/modified &&
-	echo 2 >dir2/modified &&
-	echo 3 >dir2/added &&
-	git add dir2/added &&
+[detached HEAD 4ad2ba9] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+ok 64 - submodule update --recursive skip submodules with strategy=none
 
-	git branch --set-upstream-to=upstream
+expecting success of 7406.65 'commit with staged submodule change': 
+	add_submodule_commit_and_validate
 
-[main (root-commit) 5b37b0a] initial
+[main f3de040] create submodule
  Author: A U Thor <author@example.com>
- 7 files changed, 4 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 modified
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-branch 'main' set up to track 'upstream'.
-ok 4 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+ok 65 - commit with staged submodule change
 
-expecting success of 7508.5 'status (1)': 
-	test_grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
+expecting success of 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
+	test_config diff.ignoreSubmodules dirty &&
+	add_submodule_commit_and_validate
 
-  (use "git rm --cached <file>..." to unstage)
-ok 5 - status (1)
+[main 9dbf457] create submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 66 - commit with staged submodule change with ignoreSubmodules dirty
 
-expecting success of 7508.6 'status --column': 
-	cat >expect <<\EOF &&
-# On branch main
-# Your branch and 'upstream' have diverged,
-# and have 1 and 2 different commits each, respectively.
-#   (use "git pull" if you want to integrate the remote branch with yours)
-#
-# Changes to be committed:
-#   (use "git restore --staged <file>..." to unstage)
-#	new file:   dir2/added
-#
-# Changes not staged for commit:
-#   (use "git add <file>..." to update what will be committed)
-#   (use "git restore <file>..." to discard changes in working directory)
-#	modified:   dir1/modified
-#
-# Untracked files:
-#   (use "git add <file>..." to include in what will be committed)
-#	dir1/untracked dir2/untracked
-#	dir2/modified  untracked
-#
-EOF
-	COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
-	test_cmp expect output
+expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
+	test_config diff.ignoreSubmodules all &&
+	add_submodule_commit_and_validate
 
-ok 6 - status --column
+[main 70ee70e] create submodule
+ Author: A U Thor <author@example.com>
+ok 67 - commit with staged submodule change with ignoreSubmodules all
 
-expecting success of 7508.7 'status --column status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
-	test_cmp expect output
+checking prerequisite: CASE_INSENSITIVE_FS
 
-ok 7 - status --column status.displayCommentPrefix=false
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
 
-expecting success of 7508.8 'status with status.displayCommentPrefix=true': 
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect output
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
 
-ok 8 - status with status.displayCommentPrefix=true
+# passed all 68 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7811-grep-open/.git/
+expecting success of 7811.1 'determine default pager': 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		sane_unset PAGER GIT_PAGER &&
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
 
-expecting success of 7508.9 'status with status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	git -c status.displayCommentPrefix=false status >output &&
-	test_cmp expect output
+ok 1 - determine default pager
 
-ok 9 - status with status.displayCommentPrefix=false
+expecting success of 7811.2 'setup': 
+	test_commit initial grep.h "
+enum grep_pat_token {
+	GREP_PATTERN,
+	GREP_PATTERN_HEAD,
+	GREP_PATTERN_BODY,
+	GREP_AND,
+	GREP_OPEN_PAREN,
+	GREP_CLOSE_PAREN,
+	GREP_NOT,
+	GREP_OR,
+};" &&
 
-expecting success of 7508.10 'status -v': 
-	(cat expect && git diff --cached) >expect-with-v &&
-	git status -v >output &&
-	test_cmp expect-with-v output
+	test_commit add-user revision.c "
+	}
+	if (seen_dashdash)
+		read_pathspec_from_stdin(revs, &sb, prune);
+	strbuf_release(&sb);
+}
 
-ok 10 - status -v
+static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
+{
+	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
+" &&
 
-expecting success of 7508.11 'status -v -v': 
-	(cat expect &&
-	 echo "Changes to be committed:" &&
-	 git -c diff.mnemonicprefix=true diff --cached &&
-	 echo "--------------------------------------------------" &&
-	 echo "Changes not staged for commit:" &&
-	 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
-	git status -v -v >output &&
-	test_cmp expect-with-v output
+	mkdir subdir &&
+	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
 
-ok 11 - status -v -v
+	test_commit uninteresting unrelated "hello, world" &&
 
-expecting success of 7508.12 'setup fake editor': 
-	cat >.git/editor <<-\EOF &&
-	#! /bin/sh
-	cp "$1" output
-EOF
-	chmod 755 .git/editor
+	echo GREP_PATTERN >untracked
 
-ok 12 - setup fake editor
+[master (root-commit) 6a780d2] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 grep.h
+[master 7eeae3c] add-user
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 revision.c
+[master 22c3f1e] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/grep.c
+[master cd972f3] uninteresting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated
+ok 2 - setup
 
-expecting success of 7508.13 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG': 
-	commit_template_commented
+expecting success of 7811.3 'git grep -O': 
+	cat >$less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >pager-args
+	EOF
+	chmod +x $less &&
+	cat >expect.less <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
+	echo grep.h >expect.notless &&
 
-Aborting commit due to empty commit message.
-ok 13 - commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG
+	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
+	{
+		test_cmp expect.less pager-args ||
+		test_cmp expect.notless pager-args
+	} &&
+	test_must_be_empty out
 
-expecting success of 7508.14 'status (advice.statusHints false)': 
-	test_config advice.statusHints false &&
-	git status >output &&
-	test_cmp expect output
+--- expect.less	2025-03-17 13:28:56.979590803 +0000
++++ pager-args	2025-03-17 13:28:57.011591005 +0000
+@@ -1,2 +1 @@
+-+/*GREP_PATTERN
+ grep.h
+ok 3 - git grep -O
 
+expecting success of 7811.4 'git grep -O --cached': 
+	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
+	test_grep open-files-in-pager msg
 
-ok 14 - status (advice.statusHints false)
+fatal: --open-files-in-pager only works on the worktree
+ok 4 - git grep -O --cached
 
-expecting success of 7508.15 'status -s': 
+expecting success of 7811.5 'git grep -O --no-index': 
+	rm -f expect.less pager-args out &&
+	cat >expect <<-\EOF &&
+	grep.h
+	untracked
+	EOF
 
-	git status -s >output &&
-	test_cmp expect output
+	(
+		GIT_PAGER='printf "%s\n" >pager-args' &&
+		export GIT_PAGER &&
+		git grep --no-index -O GREP_PATTERN >out
+	) &&
+	test_cmp expect pager-args &&
+	test_must_be_empty out
 
+ok 5 - git grep -O --no-index
 
-ok 15 - status -s
+expecting success of 7811.6 'setup: fake "less"': 
+	cat >less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >actual
+	EOF
+	chmod +x less
 
-expecting success of 7508.16 'status with gitignore': 
-	{
-		echo ".gitignore" &&
-		echo "expect*" &&
-		echo "output" &&
-		echo "untracked"
-	} >.gitignore &&
+ok 6 - setup: fake "less"
 
+expecting success of 7811.7 'git grep -O jumps to line in less': 
 	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	?? dir2/modified
+	+/*GREP_PATTERN
+	grep.h
 	EOF
-	git status -s >output &&
-	test_cmp expect output &&
 
+	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out &&
+
+	git grep -O./less GREP_PATTERN >out2 &&
+	test_cmp expect actual &&
+	test_must_be_empty out2
+
+ok 7 - git grep -O jumps to line in less
+
+expecting success of 7811.8 'modified file': 
+	rm -f actual &&
 	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	?? dir2/modified
-	!! .gitignore
-	!! dir1/untracked
-	!! dir2/untracked
-	!! expect
-	!! expect-with-v
-	!! output
-	!! untracked
+	+/*enum grep_pat_token
+	grep.h
+	revision.c
+	subdir/grep.c
+	unrelated
 	EOF
-	git status -s --ignored >output &&
-	test_cmp expect output &&
 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+	test_when_finished "git reset --hard" &&
+	echo "enum grep_pat_token" >unrelated &&
+	GIT_PAGER=./less git grep -F -O "enum grep_pat_token" >out &&
+	test_cmp expect actual &&
+	test_must_be_empty out
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+HEAD is now at cd972f3 uninteresting
+ok 8 - modified file
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+expecting success of 7811.9 'copes with color settings': 
+	rm -f actual &&
+	echo grep.h >expect &&
+	test_config color.grep always &&
+	test_config color.grep.filename yellow &&
+	test_config color.grep.separator green &&
+	git grep -O'printf "%s\n" >actual' GREP_AND &&
+	test_cmp expect actual
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir2/modified
+ok 9 - copes with color settings
 
-Ignored files:
-  (use "git add -f <file>..." to include in what will be committed)
-	.gitignore
-	dir1/untracked
-	dir2/untracked
-	expect
-	expect-with-v
-	output
-	untracked
+expecting success of 7811.10 'run from subdir': 
+	rm -f actual &&
+	echo grep.c >expect &&
 
-EOF
-	git status --ignored >output &&
-	test_cmp expect output
+	(
+		cd subdir &&
+		export GIT_PAGER &&
+		GIT_PAGER='printf "%s\n" >../args' &&
+		git grep -O "enum grep_pat_token" >../out &&
+		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
+	) &&
+	case $(cat dir) in
+	*subdir)
+		: good
+		;;
+	*)
+		false
+		;;
+	esac &&
+	test_cmp expect args &&
+	test_must_be_empty out &&
+	test_must_be_empty out2
 
-ok 16 - status with gitignore
+ok 10 - run from subdir
 
-expecting success of 7508.17 'status with gitignore (nothing untracked)': 
-	{
-		echo ".gitignore" &&
-		echo "expect*" &&
-		echo "dir2/modified" &&
-		echo "output" &&
-		echo "untracked"
-	} >.gitignore &&
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7813-grep-icase-iso.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7813-grep-icase-iso/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
 
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	EOF
-	git status -s >output &&
-	test_cmp expect output &&
+ok 2 # skip grep pcre string (missing GETTEXT_ISO_LOCALE of GETTEXT_ISO_LOCALE,PCRE)
 
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	!! .gitignore
-	!! dir1/untracked
-	!! dir2/modified
-	!! dir2/untracked
-	!! expect
-	!! expect-with-v
-	!! output
-	!! untracked
-	EOF
-	git status -s --ignored >output &&
-	test_cmp expect output &&
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7704-repack-cruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/.git/
+expecting success of 7704.1 '--expire-to stores pruned objects (now)': 
+	git init expire-to-now &&
+	(
+		cd expire-to-now &&
 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		git branch -M main &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+		test_commit base &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		git checkout -b cruft &&
+		test_commit --no-tag cruft &&
 
-Ignored files:
-  (use "git add -f <file>..." to include in what will be committed)
-	.gitignore
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	expect
-	expect-with-v
-	output
-	untracked
+		git rev-list --objects --no-object-names main..cruft >moved.raw &&
+		sort moved.raw >moved.want &&
 
-EOF
-	git status --ignored >output &&
-	test_cmp expect output
+		git rev-list --all --objects --no-object-names >expect.raw &&
+		sort expect.raw >expect &&
 
-ok 17 - status with gitignore (nothing untracked)
+		git checkout main &&
+		git branch -D cruft &&
+		git reflog expire --all --expire=all &&
 
-expecting success of 7508.18 'status -s -b': 
+		git init --bare expired.git &&
+		git repack -d \
+			--cruft --cruft-expiration="now" \
+			--expire-to="expired.git/objects/pack/pack" &&
 
-	git status -s -b >output &&
-	test_cmp expect output
+		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
+		test_path_is_file "${expired%.idx}.mtimes" &&
 
+		# Since the `--cruft-expiration` is "now", the effective
+		# behavior is to move _all_ unreachable objects out to
+		# the location in `--expire-to`.
+		git show-index <$expired >expired.raw &&
+		cut -d" " -f2 expired.raw | sort >expired.objects &&
+		git rev-list --all --objects --no-object-names \
+			>remaining.objects &&
 
-ok 18 - status -s -b
+		# ...in other words, the combined contents of this
+		# repository and expired.git should be the same as the
+		# set of objects we started with.
+		sort expired.objects remaining.objects >actual &&
+		test_cmp expect actual &&
 
-expecting success of 7508.19 'status -s -z -b': 
-	tr "\\n" Q <expect >expect.q &&
-	mv expect.q expect &&
-	git status -s -z -b >output &&
-	nul_to_q <output >output.q &&
-	mv output.q output &&
-	test_cmp expect output
+		# The "moved" objects (i.e., those in expired.git)
+		# should be the same as the cruft objects which were
+		# expired in the previous step.
+		test_cmp moved.want expired.objects
+	)
 
-ok 19 - status -s -z -b
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-now/.git/
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'cruft'
+[cruft 7b73700] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+Switched to branch 'main'
+Deleted branch cruft (was 7b73700).
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
+ok 1 - --expire-to stores pruned objects (now)
 
-expecting success of 7508.20 'setup dir3': 
-	mkdir dir3 &&
-	: >dir3/untracked1 &&
-	: >dir3/untracked2
+expecting success of 7704.2 '--expire-to stores pruned objects (5.minutes.ago)': 
+	git init expire-to-5.minutes.ago &&
+	(
+		cd expire-to-5.minutes.ago &&
 
-ok 20 - setup dir3
+		git branch -M main &&
 
-expecting success of 7508.21 'status -uno': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		test_commit base &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+		# Create two classes of unreachable objects, one which
+		# is older than 5 minutes (stale), and another which is
+		# newer (recent).
+		for kind in stale recent
+		do
+			git checkout -b $kind main &&
+			test_commit --no-tag $kind || return 1
+		done &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		git rev-list --objects --no-object-names main..stale >in &&
+		stale="$(git pack-objects $objdir/pack/pack <in)" &&
+		mtime="$(test-tool chmtime --get =-600 $objdir/pack/pack-$stale.pack)" &&
 
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git status -uno >output &&
-	test_cmp expect output &&
-	git status -ufalse >output &&
-	test_cmp expect output
+		# expect holds the set of objects we expect to find in
+		# this repository after repacking
+		git rev-list --objects --no-object-names recent >expect.raw &&
+		sort expect.raw >expect &&
 
-ok 21 - status -uno
+		# moved.want holds the set of objects we expect to find
+		# in expired.git
+		git rev-list --objects --no-object-names main..stale >out &&
+		sort out >moved.want &&
 
-expecting success of 7508.22 'status (status.showUntrackedFiles no)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 22 - status (status.showUntrackedFiles no)
+		git checkout main &&
+		git branch -D stale recent &&
+		git reflog expire --all --expire=all &&
+		git prune-packed &&
 
-expecting success of 7508.23 'status (status.showUntrackedFiles false)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 23 - status (status.showUntrackedFiles false)
+		git init --bare expired.git &&
+		git repack -d \
+			--cruft --cruft-expiration=5.minutes.ago \
+			--expire-to="expired.git/objects/pack/pack" &&
 
-expecting success of 7508.24 'status (status.showUntrackedFiles 0)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 24 - status (status.showUntrackedFiles 0)
+		# Some of the remaining objects in this repository are
+		# unreachable, so use `cat-file --batch-all-objects`
+		# instead of `rev-list` to get their names
+		git cat-file --batch-all-objects --batch-check="%(objectname)" \
+			>remaining.objects &&
+		sort remaining.objects >actual &&
+		test_cmp expect actual &&
 
-expecting success of 7508.25 'status -uno (advice.statusHints false)': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
+		(
+			cd expired.git &&
 
-Changes to be committed:
-	new file:   dir2/added
+			expired="$(ls objects/pack/pack-*.mtimes)" &&
+			test-tool pack-mtimes $(basename $expired) >out &&
+			cut -d" " -f1 out | sort >../moved.got &&
 
-Changes not staged for commit:
-	modified:   dir1/modified
+			# Ensure that there are as many objects with the
+			# expected mtime as were moved to expired.git.
+			#
+			# In other words, ensure that the recorded
+			# mtimes of any moved objects was written
+			# correctly.
+			grep " $mtime$" out >matching &&
+			test_line_count = $(wc -l <../moved.want) matching
+		) &&
+		test_cmp moved.want moved.got
+	)
 
-Untracked files not listed
-EOF
-	test_config advice.statusHints false &&
-	git status -uno >output &&
-	test_cmp expect output
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'stale'
+[stale aad0965] stale
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 stale.t
+Switched to a new branch 'recent'
+[recent 52849af] recent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 recent.t
+Switched to branch 'main'
+Deleted branch stale (was aad0965).
+Deleted branch recent (was 52849af).
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/expired.git/
+ok 2 - --expire-to stores pruned objects (5.minutes.ago)
 
-ok 25 - status -uno (advice.statusHints false)
+expecting success of 7704.3 '--max-cruft-size creates new packs when above threshold': 
+	git init max-cruft-size-large &&
+	(
+		cd max-cruft-size-large &&
+		test_commit base &&
 
-expecting success of 7508.26 'status -s -uno': 
-	git status -s -uno >output &&
-	test_cmp expect output
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
+		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
 
-ok 26 - status -s -uno
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=1M &&
+		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
 
-expecting success of 7508.27 'status -s (status.showUntrackedFiles no)': 
-	git config status.showuntrackedfiles no &&
-	git status -s >output &&
-	test_cmp expect output
+		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
+		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
 
-ok 27 - status -s (status.showUntrackedFiles no)
+		grep "^$foo" foo.objects &&
+		test_line_count = 1 foo.objects &&
+		grep "^$bar" bar.objects &&
+		test_line_count = 1 bar.objects
+	)
 
-expecting success of 7508.28 'status -unormal': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-large/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423 1742218130
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1742218130
+ok 3 - --max-cruft-size creates new packs when above threshold
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+expecting success of 7704.4 '--max-cruft-size combines existing packs when below threshold': 
+	git init max-cruft-size-small &&
+	(
+		cd max-cruft-size-small &&
+		test_commit base &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	dir3/
-	untracked
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=10M &&
 
-EOF
-	git status -unormal >output &&
-	test_cmp expect output &&
-	git status -utrue >output &&
-	test_cmp expect output &&
-	git status -uyes >output &&
-	test_cmp expect output
+		cruft=$(ls $packdir/pack-*.mtimes) &&
+		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
 
-ok 28 - status -unormal
+		grep "^$foo" cruft.objects &&
+		grep "^$bar" cruft.objects &&
+		test_line_count = 2 cruft.objects
+	)
 
-expecting success of 7508.29 'status (status.showUntrackedFiles normal)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 29 - status (status.showUntrackedFiles normal)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-small/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423 1742218131
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1742218131
+ok 4 - --max-cruft-size combines existing packs when below threshold
 
-expecting success of 7508.30 'status (status.showUntrackedFiles true)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 30 - status (status.showUntrackedFiles true)
+expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
+	git init max-cruft-size-consume-small &&
+	(
+		cd max-cruft-size-consume-small &&
 
-expecting success of 7508.31 'status (status.showUntrackedFiles 1)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 31 - status (status.showUntrackedFiles 1)
+		test_commit base &&
+		git repack -ad &&
 
-expecting success of 7508.32 'status -s -unormal': 
-	git status -s -unormal >output &&
-	test_cmp expect output
+		cruft_foo="$(generate_cruft_pack foo 524288)" &&    # 0.5 MiB
+		cruft_bar="$(generate_cruft_pack bar 524288)" &&    # 0.5 MiB
+		cruft_baz="$(generate_cruft_pack baz 1048576)" &&   # 1.0 MiB
+		cruft_quux="$(generate_cruft_pack quux 1572864)" && # 1.5 MiB
 
-ok 32 - status -s -unormal
+		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
+		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
+		sort expect.raw >expect.objects &&
 
-expecting success of 7508.33 'status -s (status.showUntrackedFiles normal)': 
-	git config status.showuntrackedfiles normal &&
-	git status -s >output &&
-	test_cmp expect output
+		# repacking with `--max-cruft-size=2M` should combine
+		# both 0.5 MiB packs together, instead of, say, one of
+		# the 0.5 MiB packs with the 1.0 MiB pack
+		ls $packdir/pack-*.mtimes | sort >cruft.before &&
+		git repack -d --cruft --max-cruft-size=2M &&
+		ls $packdir/pack-*.mtimes | sort >cruft.after &&
 
-ok 33 - status -s (status.showUntrackedFiles normal)
+		comm -13 cruft.before cruft.after >cruft.new &&
+		comm -23 cruft.before cruft.after >cruft.removed &&
 
-expecting success of 7508.34 'status -uall': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		test_line_count = 1 cruft.new &&
+		test_line_count = 2 cruft.removed &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+		# the two smaller packs should be rolled up first
+		printf "%s\n" $cruft_foo $cruft_bar | sort >expect.removed &&
+		test_cmp expect.removed cruft.removed &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		# ...and contain the set of objects rolled up
+		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
+		sort actual.raw >actual.objects &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	dir3/untracked1
-	dir3/untracked2
-	untracked
+		test_cmp expect.objects actual.objects
+	)
 
-EOF
-	git status -uall >output &&
-	test_cmp expect output
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-consume-small/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 5 - --max-cruft-size combines smaller packs first
 
-ok 34 - status -uall
+expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
+	git init max-cruft-size-freshen &&
+	(
+		cd max-cruft-size-freshen &&
 
-expecting success of 7508.35 'status (status.showUntrackedFiles all)': 
-	test_config status.showuntrackedfiles all &&
-	git status >output &&
-	test_cmp expect output
+		test_commit base &&
+		git repack -ad &&
 
-ok 35 - status (status.showUntrackedFiles all)
+		foo="$(generate_random_blob foo 64)" &&
+		test-tool chmtime --get -10000 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
 
-expecting success of 7508.36 'teardown dir3': 
-	rm -rf dir3
+		git repack --cruft -d &&
 
-ok 36 - teardown dir3
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
 
-expecting success of 7508.37 'status -s -uall': 
-	test_unconfig status.showuntrackedfiles &&
-	git status -s -uall >output &&
-	test_cmp expect output
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-freshen/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 6 - setup --max-cruft-size with freshened objects
 
-ok 37 - status -s -uall
+expecting success of 7704.7 '--max-cruft-size with freshened objects (loose)': 
+	(
+		cd max-cruft-size-freshen &&
 
-expecting success of 7508.38 'status -s (status.showUntrackedFiles all)': 
-	test_config status.showuntrackedfiles all &&
-	git status -s >output &&
-	rm -rf dir3 &&
-	test_cmp expect output
+		# regenerate the object, setting its mtime to be more recent
+		foo="$(generate_random_blob foo 64)" &&
+		test-tool chmtime --get -100 \
+			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
 
-ok 38 - status -s (status.showUntrackedFiles all)
+		git repack --cruft -d &&
 
-expecting success of 7508.39 'status with relative paths': 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect &&
+		test_cmp expect actual
+	)
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   ../dir2/added
+ok 7 - --max-cruft-size with freshened objects (loose)
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   modified
+expecting success of 7704.8 '--max-cruft-size with freshened objects (packed)': 
+	(
+		cd max-cruft-size-freshen &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	untracked
-	../dir2/modified
-	../dir2/untracked
-	../untracked
+		# regenerate the object and store it in a packfile,
+		# setting its mtime to be more recent
+		#
+		# store it alongside another cruft object so that we
+		# do not create an identical copy of the existing
+		# cruft pack (which contains $foo).
+		foo="$(generate_random_blob foo 64)" &&
+		bar="$(generate_random_blob bar 64)" &&
+		foo_pack="$(printf "%s\n" $foo $bar | git pack-objects $packdir/pack)" &&
+		git prune-packed &&
 
-EOF
-	(cd dir1 && git status) >output &&
-	test_cmp expect output
+		test-tool chmtime --get -10 \
+			"$packdir/pack-$foo_pack.pack" >foo.mtime &&
 
-ok 39 - status with relative paths
+		git repack --cruft -d &&
 
-expecting success of 7508.40 'status -s with relative paths': 
+		cruft="$(ls $packdir/pack-*.mtimes)" &&
+		test-tool pack-mtimes "$(basename $cruft)" >actual &&
+		echo "$foo $(cat foo.mtime)" >expect.raw &&
+		echo "$bar $(cat foo.mtime)" >>expect.raw &&
+		sort expect.raw >expect &&
+		test_cmp expect actual
+	)
 
-	(cd dir1 && git status -s) >output &&
-	test_cmp expect output
+ok 8 - --max-cruft-size with freshened objects (packed)
 
+expecting success of 7704.9 '--max-cruft-size with pruning': 
+	git init max-cruft-size-prune &&
+	(
+		cd max-cruft-size-prune &&
 
-ok 40 - status -s with relative paths
+		test_commit base &&
+		foo="$(generate_random_blob foo $((1024*1024)))" &&
+		bar="$(generate_random_blob bar $((1024*1024)))" &&
+		baz="$(generate_random_blob baz $((1024*1024)))" &&
 
-expecting success of 7508.41 'status --porcelain ignores relative paths setting': 
+		test-tool chmtime -10000 "$objdir/$(test_oid_to_path "$foo")" &&
 
-	(cd dir1 && git status --porcelain) >output &&
-	test_cmp expect output
+		git repack -d --cruft --max-cruft-size=1M &&
 
+		# backdate the mtimes of all cruft packs to validate
+		# that they were rewritten as a result of pruning
+		ls $packdir/pack-*.mtimes | sort >cruft.before &&
+		for cruft in $(cat cruft.before)
+		do
+			mtime="$(test-tool chmtime --get -10000 "$cruft")" &&
+			echo $cruft $mtime >>mtimes || return 1
+		done &&
 
-ok 41 - status --porcelain ignores relative paths setting
+		# repack (and prune) with a --max-cruft-size to ensure
+		# that we appropriately split the resulting set of packs
+		git repack -d --cruft --max-cruft-size=1M \
+			--cruft-expiration=1000.seconds.ago &&
+		ls $packdir/pack-*.mtimes | sort >cruft.after &&
 
-expecting success of 7508.42 'setup unique colors': 
+		for cruft in $(cat cruft.after)
+		do
+			old_mtime="$(grep $cruft mtimes | cut -d" " -f2)" &&
+			new_mtime="$(test-tool chmtime --get $cruft)" &&
+			test $old_mtime -lt $new_mtime || return 1
+		done &&
 
-	git config status.color.untracked blue &&
-	git config status.color.branch green &&
-	git config status.color.localBranch yellow &&
-	git config status.color.remoteBranch cyan
+		test_line_count = 3 cruft.before &&
+		test_line_count = 2 cruft.after &&
+		test_must_fail git cat-file -e $foo &&
+		git cat-file -e $bar &&
+		git cat-file -e $baz
+	)
 
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-prune/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 9 - --max-cruft-size with pruning
 
-ok 42 - setup unique colors
+expecting success of 7704.10 '--max-cruft-size ignores non-local packs': 
+	repo="max-cruft-size-non-local" &&
+	git init $repo &&
+	(
+		cd $repo &&
+		test_commit base &&
+		generate_random_blob foo 64 &&
+		git repack --cruft -d
+	) &&
 
-checking prerequisite: TTY
+	git clone --reference=$repo $repo $repo-alt &&
+	(
+		cd $repo-alt &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+		test_commit other &&
+		generate_random_blob bar 64 &&
 
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
+		# ensure that we do not attempt to pick up packs from
+		# the non-alternated repository, which would result in a
+		# crash
+		git repack --cruft --max-cruft-size=1M -d
+	)
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/max-cruft-size-non-local/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+54e90c3729eb77c2e36713e4c8ffddb3d282a270
+Cloning into 'max-cruft-size-non-local-alt'...
+done.
+[master c5d7d1d] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+38614f4581a1b39849954e788ae9d75096235951
+ok 10 - --max-cruft-size ignores non-local packs
 
-)
-prerequisite TTY ok
-expecting success of 7508.43 'status with color.ui': 
-	cat >expect <<\EOF &&
-On branch <GREEN>main<RESET>
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+expecting success of 7704.11 'reachable packs are preferred over cruft ones': 
+	repo="cruft-preferred-packs" &&
+	git init "$repo" &&
+	(
+		cd "$repo" &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	<GREEN>new file:   dir2/added<RESET>
+		# This test needs to exercise careful control over when a MIDX
+		# is and is not written. Unset the corresponding TEST variable
+		# accordingly.
+		sane_unset GIT_TEST_MULTI_PACK_INDEX &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	<RED>modified:   dir1/modified<RESET>
+		test_commit base &&
+		test_commit --no-tag cruft &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	<BLUE>dir1/untracked<RESET>
-	<BLUE>dir2/modified<RESET>
-	<BLUE>dir2/untracked<RESET>
-	<BLUE>untracked<RESET>
+		non_cruft="$(echo base | git pack-objects --revs $packdir/pack)" &&
+		# Write a cruft pack which both (a) sorts ahead of the non-cruft
+		# pack in lexical order, and (b) has an older mtime to appease
+		# the MIDX preferred pack selection routine.
+		cruft="$(echo pack-$non_cruft.pack | git pack-objects --cruft $packdir/pack-A)" &&
+		test-tool chmtime -1000 $packdir/pack-A-$cruft.pack &&
 
-EOF
-	test_config color.ui auto &&
-	test_terminal git status | test_decode_color >output &&
-	test_cmp expect output
+		test_commit other &&
+		git repack -d &&
 
-ok 43 - status with color.ui
+		git repack --geometric 2 -d --write-midx --write-bitmap-index &&
 
-expecting success of 7508.44 'status with color.status': 
-	test_config color.status auto &&
-	test_terminal git status | test_decode_color >output &&
-	test_cmp expect output
+		# After repacking, there are two packs left: one reachable one
+		# (which is the result of combining both of the existing two
+		# non-cruft packs), and one cruft pack.
+		find .git/objects/pack -type f -name "*.pack" >packs &&
+		test_line_count = 2 packs &&
 
-ok 44 - status with color.status
+		# Make sure that the pack we just wrote is marked as preferred,
+		# not the cruft one.
+		pack="$(test-tool read-midx --preferred-pack $objdir)" &&
+		test_path_is_missing "$packdir/$(basename "$pack" ".idx").mtimes"
+	)
 
-expecting success of 7508.45 'status -s with color.ui': 
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7704-repack-cruft/cruft-preferred-packs/.git/
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 7b73700] cruft
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 cruft.t
+[master be186e2] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+ok 11 - reachable packs are preferred over cruft ones
 
-	git config color.ui auto &&
-	test_terminal git status -s | test_decode_color >output &&
-	test_cmp expect output
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7812-grep-icase-non-ascii.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7812-grep-icase-non-ascii/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 7812.1 'setup': 
+	test_write_lines "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_locale" &&
+	export LC_ALL
 
+ok 1 - setup
 
-ok 45 - status -s with color.ui
+expecting success of 7812.2 'setup REGEX_LOCALE prerequisite': 
+	# This "test-tool" invocation is identical...
+	if test-tool regex "HALLÓ" "Halló" ICASE
+	then
+		test_set_prereq REGEX_LOCALE
+	else
 
-expecting success of 7508.46 'status -s with color.status': 
+		# ... to this one, but this way "test_must_fail" will
+		# tell a segfault or abort() from the regexec() test
+		# itself
+		test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
+	fi
 
-	git config --unset color.ui &&
-	git config color.status auto &&
-	test_terminal git status -s | test_decode_color >output &&
-	test_cmp expect output
+ok 2 - setup REGEX_LOCALE prerequisite
 
+expecting success of 7812.3 'grep literal string, no -F': 
+	git grep -i "TILRAUN: Halló Heimur!" &&
+	git grep -i "TILRAUN: HALLÓ HEIMUR!"
 
-ok 46 - status -s with color.status
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 3 - grep literal string, no -F
 
-expecting success of 7508.47 'status -s -b with color.status': 
+expecting success of 7812.4 'grep pcre utf-8 icase': 
+	git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
 
-	test_terminal git status -s -b | test_decode_color >output &&
-	test_cmp expect output
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 4 - grep pcre utf-8 icase
 
+expecting success of 7812.5 'grep pcre utf-8 string with "+"': 
+	test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
+	git add file2 &&
+	git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
+	echo file >expected &&
+	echo file2 >>expected &&
+	test_cmp expected actual
 
-ok 47 - status -s -b with color.status
+ok 5 - grep pcre utf-8 string with "+"
 
-expecting success of 7508.48 'status --porcelain ignores color.ui': 
+expecting success of 7812.6 'grep literal string, with -F': 
+	git grep -i -F "TILRAUN: Halló Heimur!" &&
+	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
 
-	git config --unset color.status &&
-	git config color.ui auto &&
-	test_terminal git status --porcelain | test_decode_color >output &&
-	test_cmp expect output
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 6 - grep literal string, with -F
 
+expecting success of 7812.7 'grep string with regex, with -F': 
+	test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
+	git add file3 &&
+	git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
 
-ok 48 - status --porcelain ignores color.ui
+file3:TILRAUN: Halló Heimur [abc]!
+ok 7 - grep string with regex, with -F
 
-expecting success of 7508.49 'status --porcelain ignores color.status': 
+expecting success of 7812.8 'pickaxe -i on non-ascii': 
+	git commit -m first &&
+	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
+	echo first >expected &&
+	test_cmp expected actual
 
-	git config --unset color.ui &&
-	git config color.status auto &&
-	test_terminal git status --porcelain | test_decode_color >output &&
-	test_cmp expect output
+[master (root-commit) 891c4a2] first
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+ create mode 100644 file3
+ok 8 - pickaxe -i on non-ascii
 
+expecting success of 7812.9 'PCRE v2: setup invalid UTF-8 data': 
+	printf "\\200\\n" >invalid-0x80 &&
+	echo "ævar" >expected &&
+	cat expected >>invalid-0x80 &&
+	git add invalid-0x80 &&
 
-ok 49 - status --porcelain ignores color.status
+	# Test for PCRE2_MATCH_INVALID_UTF bug
+	# https://bugs.exim.org/show_bug.cgi?id=2642
+	printf "\\345Aæ\\n" >invalid-0xe5 &&
+	git add invalid-0xe5
 
-expecting success of 7508.50 'status --porcelain respects -b': 
+ok 9 - PCRE v2: setup invalid UTF-8 data
 
-	git status --porcelain -b >output &&
-	{
-		echo "## main...upstream [ahead 1, behind 2]" &&
-		cat expect
-	} >tmp &&
-	mv tmp expect &&
-	test_cmp expect output
+expecting success of 7812.10 'PCRE v2: grep ASCII from invalid UTF-8 data': 
+	git grep -h "var" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
+	test_cmp expected actual
 
+ok 10 - PCRE v2: grep ASCII from invalid UTF-8 data
 
-ok 50 - status --porcelain respects -b
+expecting success of 7812.11 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
 
-expecting success of 7508.51 'status without relative paths': 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+ok 11 - PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+expecting success of 7812.12 'PCRE v2: grep non-ASCII from invalid UTF-8 data': 
+	git grep -h "æ" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
+	test_cmp expected actual
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+ok 12 - PCRE v2: grep non-ASCII from invalid UTF-8 data
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7812.13 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
 
-EOF
-	test_config status.relativePaths false &&
-	(cd dir1 && git status) >output &&
-	test_cmp expect output
+ok 13 - PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)
 
+expecting success of 7812.14 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
+	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
+	test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
 
-ok 51 - status without relative paths
+ok 14 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
 
-expecting success of 7508.52 'status -s without relative paths': 
+checking prerequisite: PCRE2_MATCH_INVALID_UTF
 
-	test_config status.relativePaths false &&
-	(cd dir1 && git status -s) >output &&
-	test_cmp expect output
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
+	test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
 
+)
+prerequisite PCRE2_MATCH_INVALID_UTF ok
+expecting success of 7812.15 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
+	git grep -hi "Æ" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
+	test_cmp expected actual
 
-ok 52 - status -s without relative paths
+ok 15 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
 
-expecting success of 7508.53 'status -s without relative paths': 
-	test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
-	>"file with spaces" &&
-	>"file with spaces 2" &&
-	>"expect with spaces" &&
-	git add "file with spaces" &&
+expecting success of 7812.16 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)': 
+	git grep -hi "Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
 
-	git status -s >output &&
-	test_cmp expect output &&
+	# Only the case of grepping the ASCII part in a way that
+	# relies on -i fails
+	git grep -hi "aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
 
-	git status -s --ignored >output &&
-	grep "^!! \"expect with spaces\"$" output &&
-	grep -v "^!! " output >output-wo-ignored &&
-	test_cmp expect output-wo-ignored
+ok 16 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)
 
-!! "expect with spaces"
-rm 'file with spaces'
-ok 53 - status -s without relative paths
+expecting success of 7812.17 'PCRE v2: grep non-literal ASCII from UTF-8': 
+	git grep --perl-regexp -h -o -e ll. file >actual &&
+	echo "lló" >expected &&
+	test_cmp expected actual
 
-expecting success of 7508.54 'dry-run of partial commit excluding new file in index': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
+ok 17 - PCRE v2: grep non-literal ASCII from UTF-8
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   dir1/modified
+expecting success of 7812.18 'PCRE v2: grep avoid endless loop bug': 
+	echo " Halló" >leading-whitespace &&
+	git add leading-whitespace &&
+	doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/
-	untracked
+leading-whitespace: Halló
+ok 18 - PCRE v2: grep avoid endless loop bug
 
-EOF
-	git commit --dry-run dir1/modified >output &&
-	test_cmp expect output
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7700-repack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/.git/
+expecting success of 7700.1 'objects in packs marked .keep are not repacked': 
+	echo content1 >file1 &&
+	echo content2 >file2 &&
+	git add . &&
+	test_tick &&
+	git commit -m initial_commit &&
+	# Create two packs
+	# The first pack will contain all of the objects except one
+	git rev-list --objects --all >objs &&
+	grep -v file2 objs | git pack-objects pack &&
+	# The second pack will contain the excluded object
+	packid=$(grep file2 objs | git pack-objects pack) &&
+	>pack-$packid.keep &&
+	git verify-pack -v pack-$packid.idx >packlist &&
+	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
+	mv pack-* .git/objects/pack/ &&
+	git repack -A -d -l &&
+	git prune-packed &&
+	test_has_duplicate_object false
 
-ok 54 - dry-run of partial commit excluding new file in index
+[master (root-commit) 3677360] initial_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+647acebd8748a0656779e97a3d770aa9b59026ae
+ok 1 - objects in packs marked .keep are not repacked
 
-expecting success of 7508.55 'status refreshes the index': 
-	touch dir2/added &&
-	git status &&
-	git diff-files >output &&
-	test_cmp expect output
+expecting success of 7700.2 'writing bitmaps via command-line can duplicate .keep objects': 
+	# build on $oid, $packid, and .keep state from previous
+	git repack -Adbl &&
+	test_has_duplicate_object true
 
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
+DUPLICATE OBJECT FOUND
+ok 2 - writing bitmaps via command-line can duplicate .keep objects
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
+expecting success of 7700.3 'writing bitmaps via config can duplicate .keep objects': 
+	# build on $oid, $packid, and .keep state from previous
+	git -c repack.writebitmaps=true repack -Adl &&
+	test_has_duplicate_object true
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+637f0347d31dad180d6fc7f6720c187b05a8754c blob   9 18 162
+DUPLICATE OBJECT FOUND
+ok 3 - writing bitmaps via config can duplicate .keep objects
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7700.4 'loose objects in alternate ODB are not repacked': 
+	mkdir alt_objects &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo content3 >file3 &&
+	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
+	git add file3 &&
+	test_tick &&
+	git commit -m commit_file3 &&
+	git repack -a -d -l &&
+	git prune-packed &&
+	test_has_duplicate_object false
 
-ok 55 - status refreshes the index
+[master 6f105e6] commit_file3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 4 - loose objects in alternate ODB are not repacked
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 7700.5 '--local keeps packs when alternate is objectdir ': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	test_commit -C repo A &&
+	(
+		cd repo &&
+		git repack -a &&
+		ls .git/objects/pack/*.pack >../expect &&
+		ln -s objects .git/alt_objects &&
+		echo "$(pwd)/.git/alt_objects" >.git/objects/info/alternates &&
+		git repack -a -d -l &&
+		ls .git/objects/pack/*.pack >../actual
+	) &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 5 - --local keeps packs when alternate is objectdir 
+
+expecting success of 7700.6 '--local disables writing bitmaps when connected to alternate ODB': 
+	test_when_finished "rm -rf shared member" &&
+
+	git init shared &&
+	git clone --shared shared member &&
+	(
+		cd member &&
+		test_commit "object" &&
+		git repack -Adl --write-bitmap-index 2>err &&
+		cat >expect <<-EOF &&
+		warning: disabling bitmap writing, as some objects are not being packed
+		EOF
+		test_cmp expect err &&
+		test_path_is_missing .git/objects/pack-*.bitmap
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/shared/.git/
+Cloning into 'member'...
+warning: You appear to have cloned an empty repository.
+done.
+[master (root-commit) c58cb10] object
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 object.t
+ok 6 - --local disables writing bitmaps when connected to alternate ODB
 
-expecting success of 7508.56 'status shows detached HEAD properly after checking out non-local upstream branch': 
-	test_when_finished rm -rf upstream downstream actual &&
+expecting success of 7700.7 'packed obs in alt ODB are repacked even when local repo is packless': 
+	mkdir alt_objects/pack &&
+	mv .git/objects/pack/* alt_objects/pack &&
+	git repack -a &&
+	test_no_missing_in_packs
 
-	test_create_repo upstream &&
-	test_commit -C upstream foo &&
+ok 7 - packed obs in alt ODB are repacked even when local repo is packless
 
-	git clone upstream downstream &&
-	git -C downstream checkout @{u} &&
-	git -C downstream status >actual &&
-	grep -E "HEAD detached at [0-9a-f]+" actual
+expecting success of 7700.8 'packed obs in alt ODB are repacked when local repo has packs': 
+	rm -f .git/objects/pack/* &&
+	echo new_content >>file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m more_content &&
+	git repack &&
+	git repack -a -d &&
+	test_no_missing_in_packs
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/upstream/.git/
-[master (root-commit) f80cabb] foo
+[master 0e4e267] more_content
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'downstream'...
-done.
-Note: switching to '@{u}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 8 - packed obs in alt ODB are repacked when local repo has packs
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7700.9 'packed obs in alternate ODB kept pack are repacked': 
+	# swap the .keep so the commit object is in the pack with .keep
+	for p in alt_objects/pack/*.pack
+	do
+		base_name=$(basename $p .pack) &&
+		if test_path_is_file alt_objects/pack/$base_name.keep
+		then
+			rm alt_objects/pack/$base_name.keep
+		else
+			touch alt_objects/pack/$base_name.keep
+		fi || return 1
+	done &&
+	git repack -a -d &&
+	test_no_missing_in_packs
 
-  git switch -c <new-branch-name>
+File alt_objects/pack/pack-09df7d90d739b5b997442ec62fb88ac0d68d7b68.keep doesn't exist
+ok 9 - packed obs in alternate ODB kept pack are repacked
 
-Or undo this operation with:
+expecting success of 7700.10 'packed unreachable obs in alternate ODB are not loosened': 
+	rm -f alt_objects/pack/*.keep &&
+	mv .git/objects/pack/* alt_objects/pack/ &&
+	coid=$(git rev-parse HEAD^{commit}) &&
+	git reset --hard HEAD^ &&
+	test_tick &&
+	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
+	# The pack-objects call on the next line is equivalent to
+	# git repack -A -d without the call to prune-packed
+	git pack-objects --honor-pack-keep --non-empty --all --reflog \
+	    --unpack-unreachable </dev/null pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " packlist &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 
-  git switch -
+HEAD is now at 6f105e6 commit_file3
+85f93d7925f6a606964869128f786c6de753b60c
+fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
+ok 10 - packed unreachable obs in alternate ODB are not loosened
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7700.11 'local packed unreachable obs that exist in alternate ODB are not loosened': 
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	# The pack-objects call on the next line is equivalent to
+	# git repack -A -d without the call to prune-packed
+	git pack-objects --honor-pack-keep --non-empty --all --reflog \
+	    --unpack-unreachable </dev/null pack &&
+	rm -f .git/objects/pack/* &&
+	mv pack-* .git/objects/pack/ &&
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 
-HEAD is now at f80cabb foo
-HEAD detached at f80cabb
-ok 56 - status shows detached HEAD properly after checking out non-local upstream branch
+4f27fb8d5b73124b8c94f72b938bde9ae4f6999a
+85f93d7925f6a606964869128f786c6de753b60c
+fatal: bad object 0e4e2678b2cc15890fb9bac6ad40f9c31198b8af
+ok 11 - local packed unreachable obs that exist in alternate ODB are not loosened
 
-expecting success of 7508.57 'setup status submodule summary': 
-	test_create_repo sm && (
-		cd sm &&
-		>foo &&
-		git add foo &&
-		git commit -m "Add foo"
-	) &&
-	git add sm
+expecting success of 7700.12 'objects made unreachable by grafts only are kept': 
+	test_tick &&
+	git commit --allow-empty -m "commit 4" &&
+	H0=$(git rev-parse HEAD) &&
+	H1=$(git rev-parse HEAD^) &&
+	H2=$(git rev-parse HEAD^^) &&
+	echo "$H0 $H2" >.git/info/grafts &&
+	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
+	git repack -a -d &&
+	git cat-file -t $H1
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/sm/.git/
-[master (root-commit) a2af2f1] Add foo
+[master 95a9e53] commit 4
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-warning: adding embedded git repository: sm
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
 hint:
-hint: 	git submodule add <url> sm
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
 hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
 hint:
-hint: 	git rm --cached sm
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
 hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config set advice.addEmbeddedRepo false"
-ok 57 - setup status submodule summary
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+commit
+ok 12 - objects made unreachable by grafts only are kept
 
-expecting success of 7508.58 'status submodule summary is disabled by default': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+expecting success of 7700.13 'repack --keep-pack': 
+	test_create_repo keep-pack &&
+	(
+		cd keep-pack &&
+		# avoid producing different packs due to delta/base choices
+		git config pack.window 0 &&
+		P1=$(commit_and_pack 1) &&
+		P2=$(commit_and_pack 2) &&
+		P3=$(commit_and_pack 3) &&
+		P4=$(commit_and_pack 4) &&
+		ls .git/objects/pack/*.pack >old-counts &&
+		test_line_count = 4 old-counts &&
+		git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
+		ls .git/objects/pack/*.pack >new-counts &&
+		grep -q $P1 new-counts &&
+		grep -q $P4 new-counts &&
+		test_line_count = 3 new-counts &&
+		git fsck &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
+		P5=$(commit_and_pack --no-tag 5) &&
+		git reset --hard HEAD^ &&
+		git reflog expire --all --expire=all &&
+		rm -f ".git/objects/pack/${P5%.pack}.idx" &&
+		rm -f ".git/objects/info/commit-graph" &&
+		for from in $(find .git/objects/pack -type f -name "${P5%.pack}.*")
+		do
+			to="$(dirname "$from")/.tmp-1234-$(basename "$from")" &&
+			mv "$from" "$to" || return 1
+		done &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		# A .idx file without a .pack should not stop us from
+		# repacking what we can.
+		touch .git/objects/pack/pack-does-not-exist.idx &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+		git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
 
-EOF
-	git status >output &&
-	test_cmp expect output
+		ls .git/objects/pack/*.pack >newer-counts &&
+		test_cmp new-counts newer-counts &&
+		git fsck
+	)
 
-ok 58 - status submodule summary is disabled by default
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-pack/.git/
+[master (root-commit) c034eb4] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 97f32c4] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master b19c9f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master a9c77cf] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 0964b20] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+HEAD is now at a9c77cf 4
+ok 13 - repack --keep-pack
 
-expecting success of 7508.59 'status --untracked-files=all does not show submodule': 
-	git status --untracked-files=all >output &&
-	test_cmp expect output
+expecting success of 7700.14 'repacking fails when missing .pack actually means missing objects': 
+	test_create_repo idx-without-pack &&
+	(
+		cd idx-without-pack &&
 
-ok 59 - status --untracked-files=all does not show submodule
+		# Avoid producing different packs due to delta/base choices
+		git config pack.window 0 &&
+		P1=$(commit_and_pack 1) &&
+		P2=$(commit_and_pack 2) &&
+		P3=$(commit_and_pack 3) &&
+		P4=$(commit_and_pack 4) &&
+		ls .git/objects/pack/*.pack >old-counts &&
+		test_line_count = 4 old-counts &&
 
-expecting success of 7508.60 'status -s submodule summary is disabled by default': 
-	git status -s >output &&
-	test_cmp expect output
+		# Remove one .pack file
+		rm .git/objects/pack/$P2 &&
 
-ok 60 - status -s submodule summary is disabled by default
+		ls .git/objects/pack/*.pack >before-pack-dir &&
 
-expecting success of 7508.61 'status -s --untracked-files=all does not show submodule': 
-	git status -s --untracked-files=all >output &&
-	test_cmp expect output
+		test_must_fail git fsck &&
+		test_must_fail env GIT_COMMIT_GRAPH_PARANOIA=true git repack --cruft -d 2>err &&
+		grep "bad object" err &&
 
-ok 61 - status -s --untracked-files=all does not show submodule
+		# Before failing, the repack did not modify the
+		# pack directory.
+		ls .git/objects/pack/*.pack >after-pack-dir &&
+		test_cmp before-pack-dir after-pack-dir
+	)
 
-expecting success of 7508.62 'status submodule summary': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/idx-without-pack/.git/
+[master (root-commit) c034eb4] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 97f32c4] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master b19c9f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master a9c77cf] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+error: refs/tags/2: invalid sha1 pointer 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: HEAD: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+error: refs/heads/master: invalid reflog entry 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+broken link from  commit b19c9f990f8204f55aebfaadd643e918b14bd0de
+              to  commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+missing blob 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f
+missing commit 97f32c44b41c1b35fc2e00112f763c4e916df4b9
+fatal: bad object refs/tags/2
+ok 14 - repacking fails when missing .pack actually means missing objects
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
+expecting success of 7700.15 'bitmaps are created by default in bare repos': 
+	git clone --bare .git bare.git &&
+	rm -f bare.git/objects/pack/*.bitmap &&
+	git -C bare.git repack -ad &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap) &&
+	test_path_is_file "$bitmap"
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+Cloning into bare repository 'bare.git'...
+done.
+ok 15 - bitmaps are created by default in bare repos
 
-Submodule changes to be committed:
+expecting success of 7700.16 'incremental repack does not complain': 
+	git -C bare.git repack -q 2>repack.err &&
+	test_must_be_empty repack.err
 
-* sm 0000000...$head (1):
-  > Add foo
+ok 16 - incremental repack does not complain
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7700.17 'bitmaps can be disabled on bare repos': 
+	git -c repack.writeBitmaps=false -C bare.git repack -ad &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
+	test -z "$bitmap"
 
-EOF
-	git config status.submodulesummary 10 &&
-	git status >output &&
-	test_cmp expect output
+ls: cannot access 'bare.git/objects/pack/*.bitmap': No such file or directory
+ok 17 - bitmaps can be disabled on bare repos
 
-ok 62 - status submodule summary
+expecting success of 7700.18 'no bitmaps created if .keep files present': 
+	pack=$(ls bare.git/objects/pack/*.pack) &&
+	test_path_is_file "$pack" &&
+	keep=${pack%.pack}.keep &&
+	test_when_finished "rm -f \"\$keep\"" &&
+	>"$keep" &&
 
-expecting success of 7508.63 'status submodule summary with status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	git -c status.displayCommentPrefix=false status >output &&
-	test_cmp expect output
+	# Disable --name-hash-version test due to stderr comparison.
+	GIT_TEST_NAME_HASH_VERSION=1 \
+		git -C bare.git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
+	find bare.git/objects/pack/ -type f -name "*.bitmap" >actual &&
+	test_must_be_empty actual
 
-ok 63 - status submodule summary with status.displayCommentPrefix=false
+Nothing new to pack.
+ok 18 - no bitmaps created if .keep files present
 
-expecting success of 7508.64 'commit with submodule summary ignores status.displayCommentPrefix': 
-	commit_template_commented
+expecting success of 7700.19 'auto-bitmaps do not complain if unavailable': 
+	test_config -C bare.git pack.packSizeLimit 1M &&
+	blob=$(test-tool genrandom big $((1024*1024)) |
+	       git -C bare.git hash-object -w --stdin) &&
+	git -C bare.git update-ref refs/tags/big $blob &&
 
-Aborting commit due to empty commit message.
-ok 64 - commit with submodule summary ignores status.displayCommentPrefix
+	# Disable --name-hash-version test due to stderr comparison.
+	GIT_TEST_NAME_HASH_VERSION=1 \
+		git -C bare.git repack -ad 2>stderr &&
+	test_must_be_empty stderr &&
+	find bare.git/objects/pack -type f -name "*.bitmap" >actual &&
+	test_must_be_empty actual
 
-expecting success of 7508.65 'status -s submodule summary': 
-	git status -s >output &&
-	test_cmp expect output
+ok 19 - auto-bitmaps do not complain if unavailable
 
-ok 65 - status -s submodule summary
+expecting success of 7700.20 'repacking with a filter works': 
+	git -C bare.git repack -a -d &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
+	git -C bare.git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
+	test_stdout_line_count = 2 ls bare.git/objects/pack/*.pack &&
+	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
+	test "$commit_pack" != "$blob_pack" &&
+	tree_pack=$(test-tool -C bare.git find-pack -c 1 HEAD^{tree}) &&
+	test "$tree_pack" = "$commit_pack" &&
+	blob_pack2=$(test-tool -C bare.git find-pack -c 1 HEAD:file2) &&
+	test "$blob_pack2" = "$blob_pack"
 
-expecting success of 7508.66 'status submodule summary (clean submodule): commit': 
-	cat >expect-status <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+ok 20 - repacking with a filter works
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+expecting success of 7700.21 '--filter fails with --write-bitmap-index': 
+	test_must_fail git -C bare.git repack -a -d --write-bitmap-index --filter=blob:none
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+warning: Failed to write bitmap index. Packfile doesn't have full closure (object ac3e272b72bbf89def8657766b855d0656630ed4 is missing)
+fatal: failed to write bitmap index
+ok 21 - --filter fails with --write-bitmap-index
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	sed "/git pull/d" expect-status > expect-commit &&
-	git commit -m "commit submodule" &&
-	git config status.submodulesummary 10 &&
-	test_must_fail git commit --dry-run >output &&
-	test_cmp expect-commit output &&
-	git status >output &&
-	test_cmp expect-status output
+expecting success of 7700.22 'repacking with two filters works': 
+	git init two-filters &&
+	(
+		cd two-filters &&
+		mkdir subdir &&
+		test_commit foo &&
+		test_commit subdir_bar subdir/bar &&
+		test_commit subdir_baz subdir/baz
+	) &&
+	git clone --no-local --bare two-filters two-filters.git &&
+	(
+		cd two-filters.git &&
+		test_stdout_line_count = 1 ls objects/pack/*.pack &&
+		git -c repack.writebitmaps=false repack -a -d \
+			--filter=blob:none --filter=tree:1 &&
+		test_stdout_line_count = 2 ls objects/pack/*.pack &&
+		commit_pack=$(test-tool find-pack -c 1 HEAD) &&
+		blob_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		root_tree_pack=$(test-tool find-pack -c 1 HEAD^{tree}) &&
+		subdir_tree_hash=$(git ls-tree --object-only HEAD -- subdir) &&
+		subdir_tree_pack=$(test-tool find-pack -c 1 "$subdir_tree_hash") &&
 
-[main 49f874e] commit submodule
+		# Root tree and subdir tree are not in the same packfiles
+		test "$commit_pack" != "$blob_pack" &&
+		test "$commit_pack" = "$root_tree_pack" &&
+		test "$blob_pack" = "$subdir_tree_pack"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/two-filters/.git/
+[master (root-commit) 898d072] foo
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir2/added
- create mode 160000 sm
-ok 66 - status submodule summary (clean submodule): commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 4eb4067] subdir_bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/bar
+[master 0e7eef3] subdir_baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/baz
+Cloning into bare repository 'two-filters.git'...
+ok 22 - repacking with two filters works
 
-expecting success of 7508.67 'status -s submodule summary (clean submodule)': 
-	git status -s >output &&
-	test_cmp expect output
+expecting success of 7700.23 '--filter works with .keep packs': 
+	prepare_for_keep_packs &&
+	(
+		cd keep-packs.git &&
 
-ok 67 - status -s submodule summary (clean submodule)
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack=$(test-tool find-pack -c 1 HEAD) &&
 
-expecting success of 7508.68 'status -z implies porcelain': 
-	git status --porcelain |
-	perl -pe "s/\012/\000/g" >expect &&
-	git status -z >output &&
-	test_cmp expect output
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" = "$head_pack" &&
 
-ok 68 - status -z implies porcelain
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none &&
 
-expecting success of 7508.69 'commit --dry-run submodule summary (--amend)': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
+		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack_1=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
 
-Changes to be committed:
-  (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
+		# Object bar is still only in the old .keep pack
+		test "$foo_pack_1" != "$foo_pack" &&
+		test "$bar_pack_1" = "$bar_pack" &&
+		test "$head_pack_1" != "$head_pack" &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		test "$foo_pack_1" != "$bar_pack_1" &&
+		test "$foo_pack_1" != "$head_pack_1" &&
+		test "$bar_pack_1" != "$head_pack_1"
+	)
 
-Submodule changes to be committed:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-packs/.git/
+[master (root-commit) 898d072] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 6cdf4f6] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Cloning into bare repository 'keep-packs.git'...
+ab13c7a16ee24dc55b0123c11524c0f93444a00b
+ok 23 - --filter works with .keep packs
 
-* sm 0000000...$head (1):
-  > Add foo
+expecting success of 7700.24 '--filter works with --pack-kept-objects and .keep packs': 
+	rm -rf keep-packs keep-packs.git &&
+	prepare_for_keep_packs &&
+	(
+		cd keep-packs.git &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar.t) &&
+		head_pack=$(test-tool find-pack -c 1 HEAD) &&
 
-EOF
-	git config status.submodulesummary 10 &&
-	git commit --dry-run --amend >output &&
-	test_cmp expect output
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" = "$head_pack" &&
 
-ok 69 - commit --dry-run submodule summary (--amend)
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
+			--pack-kept-objects &&
 
-checking prerequisite: SANITY
+		foo_pack_1=$(test-tool find-pack -c 1 HEAD:foo.t) &&
+		test-tool find-pack -c 2 HEAD:bar.t >bar_pack_1 &&
+		head_pack_1=$(test-tool find-pack -c 1 HEAD) &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+		test "$foo_pack_1" != "$foo_pack" &&
+		test "$foo_pack_1" != "$bar_pack" &&
+		test "$head_pack_1" != "$head_pack" &&
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+		# Object bar is in both the old .keep pack and the new
+		# pack that contained the filtered out objects
+		grep "$bar_pack" bar_pack_1 &&
+		grep "$foo_pack_1" bar_pack_1 &&
+		test "$foo_pack_1" != "$head_pack_1"
+	)
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/keep-packs/.git/
+[master (root-commit) 898d072] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[master 6cdf4f6] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+Cloning into bare repository 'keep-packs.git'...
+ab13c7a16ee24dc55b0123c11524c0f93444a00b
+./objects/pack/pack-34a84b0f4b3b87454ca39e0a5c6995cbcd831e78.pack
+./objects/pack/pack-363177a6806037aa6bdc933b4c6cd4df16c8340f.pack
+ok 24 - --filter works with --pack-kept-objects and .keep packs
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+expecting success of 7700.25 '--filter-to stores filtered out objects': 
+	git -C bare.git repack -a -d &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&
 
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 7508.70 'status succeeds in a read-only repository': 
-	test_when_finished "chmod 775 .git" &&
-	(
-		chmod a-w .git &&
-		# make dir1/tracked stat-dirty
-		>dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
-		git status -s >output &&
-		! grep dir1/tracked output &&
-		# make sure "status" succeeded without writing index out
-		git diff-files | grep dir1/tracked
-	)
+	git init --bare filtered.git &&
+	git -C bare.git -c repack.writebitmaps=false repack -a -d \
+		--filter=blob:none \
+		--filter-to=../filtered.git/objects/pack/pack &&
+	test_stdout_line_count = 1 ls bare.git/objects/pack/pack-*.pack &&
+	test_stdout_line_count = 1 ls filtered.git/objects/pack/pack-*.pack &&
 
-:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M	dir1/tracked
-ok 70 - status succeeds in a read-only repository
+	commit_pack=$(test-tool -C bare.git find-pack -c 1 HEAD) &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 0 HEAD:file1) &&
+	blob_hash=$(git -C bare.git rev-parse HEAD:file1) &&
+	test -n "$blob_hash" &&
+	blob_pack=$(test-tool -C filtered.git find-pack -c 1 $blob_hash) &&
 
-expecting success of 7508.71 '--ignore-submodules=untracked suppresses submodules with untracked content': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+	echo $(pwd)/filtered.git/objects >bare.git/objects/info/alternates &&
+	blob_pack=$(test-tool -C bare.git find-pack -c 1 HEAD:file1) &&
+	blob_content=$(git -C bare.git show $blob_hash) &&
+	test "$blob_content" = "content1"
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/filtered.git/
+ok 25 - --filter-to stores filtered out objects
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+expecting success of 7700.26 '--filter works with --max-pack-size': 
+	rm -rf filtered.git &&
+	git init --bare filtered.git &&
+	git init max-pack-size &&
+	(
+		cd max-pack-size &&
+		test_commit base &&
+		# two blobs which exceed the maximum pack size
+		test-tool genrandom foo 1048576 >foo &&
+		git hash-object -w foo &&
+		test-tool genrandom bar 1048576 >bar &&
+		git hash-object -w bar &&
+		git add foo bar &&
+		git commit -m "adding foo and bar"
+	) &&
+	git clone --no-local --bare max-pack-size max-pack-size.git &&
+	(
+		cd max-pack-size.git &&
+		git -c repack.writebitmaps=false repack -a -d --filter=blob:none \
+			--max-pack-size=1M \
+			--filter-to=../filtered.git/objects/pack/pack &&
+		echo $(cd .. && pwd)/filtered.git/objects >objects/info/alternates &&
 
-Submodule changes to be committed:
+		# Check that the 3 blobs are in different packfiles in filtered.git
+		test_stdout_line_count = 3 ls ../filtered.git/objects/pack/pack-*.pack &&
+		test_stdout_line_count = 1 ls objects/pack/pack-*.pack &&
+		foo_pack=$(test-tool find-pack -c 1 HEAD:foo) &&
+		bar_pack=$(test-tool find-pack -c 1 HEAD:bar) &&
+		base_pack=$(test-tool find-pack -c 1 HEAD:base.t) &&
+		test "$foo_pack" != "$bar_pack" &&
+		test "$foo_pack" != "$base_pack" &&
+		test "$bar_pack" != "$base_pack" &&
+		for pack in "$foo_pack" "$bar_pack" "$base_pack"
+		do
+			case "$foo_pack" in */filtered.git/objects/pack/*) true ;; *) return 1 ;; esac
+		done
+	)
 
-* sm $head...$new_head (1):
-  > Add bar
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/filtered.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/max-pack-size/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+4f336f3df31054eabc05ac05f98bc024c8e05423
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c
+[master 8791424] adding foo and bar
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+ create mode 100644 foo
+Cloning into bare repository 'max-pack-size.git'...
+ok 26 - --filter works with --max-pack-size
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7700.27 'setup for --write-midx tests': 
+	git init midx &&
+	(
+		cd midx &&
+		git config core.multiPackIndex true &&
 
-EOF
-	echo modified  sm/untracked &&
-	git status --ignore-submodules=untracked >output &&
-	test_cmp expect output
+		test_commit base
+	)
 
-modified sm/untracked
-ok 71 - --ignore-submodules=untracked suppresses submodules with untracked content
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/midx/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 27 - setup for --write-midx tests
 
-expecting success of 7508.72 '.gitmodules ignore=untracked suppresses submodules with untracked content': 
-	test_config diff.ignoreSubmodules dirty &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+expecting success of 7700.28 '--write-midx unchanged': 
+	(
+		cd midx &&
+		git repack &&
+		test_path_is_missing $midx &&
+		test_path_is_missing $midx-*.bitmap &&
 
-ok 72 - .gitmodules ignore=untracked suppresses submodules with untracked content
+		git repack --write-midx &&
 
-expecting success of 7508.73 '.git/config ignore=untracked suppresses submodules with untracked content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
 
-ok 73 - .git/config ignore=untracked suppresses submodules with untracked content
+Nothing new to pack.
+ok 28 - --write-midx unchanged
 
-expecting success of 7508.74 '--ignore-submodules=dirty suppresses submodules with untracked content': 
-	git status --ignore-submodules=dirty >output &&
-	test_cmp expect output
+expecting success of 7700.29 '--write-midx with a new pack': 
+	(
+		cd midx &&
+		test_commit loose &&
 
-ok 74 - --ignore-submodules=dirty suppresses submodules with untracked content
+		git repack --write-midx &&
 
-expecting success of 7508.75 '.gitmodules ignore=dirty suppresses submodules with untracked content': 
-	test_config diff.ignoreSubmodules dirty &&
-	git status >output &&
-	! test -s actual &&
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
 
-ok 75 - .gitmodules ignore=dirty suppresses submodules with untracked content
+[master add4380] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 29 - --write-midx with a new pack
 
-expecting success of 7508.76 '.git/config ignore=dirty suppresses submodules with untracked content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+expecting success of 7700.30 '--write-midx with -b': 
+	(
+		cd midx &&
+		git repack -mb &&
 
-ok 76 - .git/config ignore=dirty suppresses submodules with untracked content
+		test_path_is_file $midx &&
+		test_path_is_file $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
 
-expecting success of 7508.77 '--ignore-submodules=dirty suppresses submodules with modified content': 
-	echo modified >sm/foo &&
-	git status --ignore-submodules=dirty >output &&
-	test_cmp expect output
+Nothing new to pack.
+ok 30 - --write-midx with -b
 
-ok 77 - --ignore-submodules=dirty suppresses submodules with modified content
+expecting success of 7700.31 '--write-midx with -d': 
+	(
+		cd midx &&
+		test_commit repack &&
 
-expecting success of 7508.78 '.gitmodules ignore=dirty suppresses submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		git repack -Ad --write-midx &&
 
-ok 78 - .gitmodules ignore=dirty suppresses submodules with modified content
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-*.bitmap &&
+		test_midx_consistent $objdir
+	)
 
-expecting success of 7508.79 '.git/config ignore=dirty suppresses submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+[master c5a8e1e] repack
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack.t
+ok 31 - --write-midx with -d
 
-ok 79 - .git/config ignore=dirty suppresses submodules with modified content
+expecting success of 7700.32 'cleans up MIDX when appropriate': 
+	(
+		cd midx &&
 
-expecting success of 7508.80 '--ignore-submodules=untracked doesn't suppress submodules with modified content': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		test_commit repack-2 &&
+		git repack -Adb --write-midx &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+		checksum=$(midx_checksum $objdir) &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$checksum.bitmap &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-  (commit or discard the untracked or modified content in submodules)
-	modified:   dir1/modified
-	modified:   sm (modified content)
+		test_commit repack-3 &&
+		git repack -Adb --write-midx &&
 
-Submodule changes to be committed:
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$checksum.bitmap &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-* sm $head...$new_head (1):
-  > Add bar
+		test_commit repack-4 &&
+		git repack -Adb &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+		find $objdir/pack -type f -name "multi-pack-index*" >files &&
+		test_must_be_empty files
+	)
 
-EOF
-	git status --ignore-submodules=untracked > output &&
-	test_cmp expect output
+[master 10c6ab2] repack-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-2.t
+[master 789d6b0] repack-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-3.t
+[master 97148f2] repack-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 repack-4.t
+ok 32 - cleans up MIDX when appropriate
 
-ok 80 - --ignore-submodules=untracked doesn't suppress submodules with modified content
+expecting success of 7700.33 '--write-midx with preferred bitmap tips': 
+	git init midx-preferred-tips &&
+	test_when_finished "rm -fr midx-preferred-tips" &&
+	(
+		cd midx-preferred-tips &&
 
-expecting success of 7508.81 '.gitmodules ignore=untracked doesn't suppress submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		test_commit_bulk --message="%s" 103 &&
 
-ok 81 - .gitmodules ignore=untracked doesn't suppress submodules with modified content
+		git log --format="%H" >commits.raw &&
+		sort <commits.raw >commits &&
 
-expecting success of 7508.82 '.git/config ignore=untracked doesn't suppress submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
 
-ok 82 - .git/config ignore=untracked doesn't suppress submodules with modified content
+		git repack --write-midx --write-bitmap-index &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-expecting success of 7508.83 '--ignore-submodules=untracked doesn't suppress submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >before &&
+		test_line_count = 1 before &&
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+		rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+		rm -fr $midx &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-	modified:   sm (new commits)
+		# instead of constructing the snapshot ourselves (c.f., the test
+		# "write a bitmap with --refs-snapshot (preferred tips)" in
+		# t5326), mark the missing commit as preferred by adding it to
+		# the pack.preferBitmapTips configuration.
+		git for-each-ref --format="%(refname:rstrip=1)" \
+			--points-at="$(cat before)" >missing &&
+		git config pack.preferBitmapTips "$(cat missing)" &&
+		git repack --write-midx --write-bitmap-index &&
 
-Submodule changes to be committed:
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
 
-* sm $head...$new_head (1):
-  > Add bar
+		! test_cmp before after
+	)
 
-Submodules changed but not updated:
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/midx-preferred-tips/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          309 (         0 duplicates                  )
+      blobs  :          103 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :          103 (         0 duplicates        100 deltas of        100 attempts)
+      commits:          103 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:            103
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26909 /      26909
+---------------------------------------------------------------------
 
-* sm $new_head...$head2 (1):
-  > 2nd commit
+Nothing new to pack.
+Nothing new to pack.
+--- before	2025-03-17 13:28:58.167598309 +0000
++++ after	2025-03-17 13:28:58.463600180 +0000
+@@ -1 +1 @@
+-8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
++3d2725684b43b31e3b81e5070d1847c9f1e2cf00
+ok 33 - --write-midx with preferred bitmap tips
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7700.34 '--write-midx -b packs non-kept objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-EOF
-	git status --ignore-submodules=untracked > output &&
-	test_cmp expect output
+		# Create a kept pack-file
+		test_commit base &&
+		git repack -ad &&
+		find $objdir/pack -name "*.idx" >before &&
+		test_line_count = 1 before &&
+		before_name=$(cat before) &&
+		>${before_name%.idx}.keep &&
 
-ok 83 - --ignore-submodules=untracked doesn't suppress submodule summary
+		# Create a non-kept pack-file
+		test_commit other &&
+		git repack &&
 
-expecting success of 7508.84 '.gitmodules ignore=untracked doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		# Create loose objects
+		test_commit loose &&
 
-ok 84 - .gitmodules ignore=untracked doesn't suppress submodule summary
+		# Repack everything
+		git repack --write-midx -a -b -d &&
 
-expecting success of 7508.85 '.git/config ignore=untracked doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		# There should be two pack-files now, the
+		# old, kept pack and the new, non-kept pack.
+		find $objdir/pack -name "*.idx" | sort >after &&
+		test_line_count = 2 after &&
+		find $objdir/pack -name "*.keep" >kept &&
+		kept_name=$(cat kept) &&
+		echo ${kept_name%.keep}.idx >kept-idx &&
+		test_cmp before kept-idx &&
 
-ok 85 - .git/config ignore=untracked doesn't suppress submodule summary
+		# Get object list from the kept pack.
+		get_sorted_objects_from_pack before >old.objects &&
 
-expecting success of 7508.86 '--ignore-submodules=dirty doesn't suppress submodule summary': 
-	git status --ignore-submodules=dirty > output &&
-	test_cmp expect output
+		# Get object list from the one non-kept pack-file
+		comm -13 before after >new-pack &&
+		test_line_count = 1 new-pack &&
+		get_sorted_objects_from_pack new-pack >new.objects &&
 
-ok 86 - --ignore-submodules=dirty doesn't suppress submodule summary
+		# None of the objects in the new pack should
+		# exist within the kept pack.
+		comm -12 old.objects new.objects >shared.objects &&
+		test_must_be_empty shared.objects
+	)
 
-expecting success of 7508.87 '.gitmodules ignore=dirty doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 29fd16f] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+[master abf480b] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 34 - --write-midx -b packs non-kept objects
 
-ok 87 - .gitmodules ignore=dirty doesn't suppress submodule summary
+expecting success of 7700.35 '--write-midx removes stale pack-based bitmaps': 
+	rm -fr repo &&
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+		test_commit base &&
+		git repack -Ab &&
 
-expecting success of 7508.88 '.git/config ignore=dirty doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+		pack_bitmap=$(ls $objdir/pack/pack-*.bitmap) &&
+		test_path_is_file "$pack_bitmap" &&
 
-ok 88 - .git/config ignore=dirty doesn't suppress submodule summary
+		test_commit tip &&
+		git repack -bm &&
 
-expecting success of 7508.89 'status (core.commentchar with submodule summary)': 
-	test_config core.commentchar ";" &&
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect output
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $pack_bitmap
+	)
 
-ok 89 - status (core.commentchar with submodule summary)
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) bf71f7c] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 80dd058] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tip.t
+ok 35 - --write-midx removes stale pack-based bitmaps
 
-expecting success of 7508.90 'status (core.commentchar with two chars with submodule summary)': 
-	test_config core.commentchar ";;" &&
-	sed "s/^/;/" <expect >expect.double &&
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect.double output
+expecting success of 7700.36 '--write-midx with --pack-kept-objects': 
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
 
-ok 90 - status (core.commentchar with two chars with submodule summary)
+		test_commit one &&
+		test_commit two &&
 
-expecting success of 7508.91 '--ignore-submodules=all suppresses submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+		one="$(echo "one" | git pack-objects --revs $objdir/pack/pack)" &&
+		two="$(echo "one..two" | git pack-objects --revs $objdir/pack/pack)" &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+		keep="$objdir/pack/pack-$one.keep" &&
+		touch "$keep" &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+		git repack --write-midx --write-bitmap-index --geometric=2 -d \
+			--pack-kept-objects &&
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --ignore-submodules=all > output &&
-	test_cmp expect output
+		test_path_is_file $keep &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	)
 
-ok 91 - --ignore-submodules=all suppresses submodule summary
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/repo/.git/
+[master (root-commit) 06e07da] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 738d2f7] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 36 - --write-midx with --pack-kept-objects
 
-expecting success of 7508.92 '.gitmodules ignore=all suppresses unstaged submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+checking prerequisite: TTY
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-EOF
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status > output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+)
+prerequisite TTY ok
+expecting success of 7700.37 '--quiet disables progress': 
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -C midx repack -ad --quiet --write-midx 2>stderr &&
+	test_must_be_empty stderr
 
-ok 92 - .gitmodules ignore=all suppresses unstaged submodule summary
+ok 37 - --quiet disables progress
 
-expecting success of 7508.93 '.git/config ignore=all suppresses unstaged submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore all &&
-	git config --add submodule.subname.path sm &&
-	git status > output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+expecting success of 7700.38 'clean up .tmp-* packs on error': 
+	test_must_fail ok=sigpipe git \
+		-c repack.cruftwindow=bogus \
+		repack -ad --cruft &&
+	find $objdir/pack -name .tmp-* >tmpfiles &&
+	test_must_be_empty tmpfiles
 
-ok 93 - .git/config ignore=all suppresses unstaged submodule summary
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+error: option `window' expects a numerical value
+ok 38 - clean up .tmp-* packs on error
 
-expecting success of 7508.94 'setup of test environment': 
-	git config status.showUntrackedFiles no &&
-	git status -s >expected_short &&
-	git status --no-short >expected_noshort
+expecting success of 7700.39 'repack -ad cleans up old .tmp-* packs': 
+	git rev-parse HEAD >input &&
+	git pack-objects $objdir/pack/.tmp-1234 <input &&
+	git repack -ad &&
+	find $objdir/pack -name .tmp-* >tmpfiles &&
+	test_must_be_empty tmpfiles
 
-ok 94 - setup of test environment
+e3eb4c912613cba004926473486638766e8cc44e
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+ok 39 - repack -ad cleans up old .tmp-* packs
 
-expecting success of 7508.95 '"status.short=true" same as "-s"': 
-	git -c status.short=true status >actual &&
-	test_cmp expected_short actual
+expecting success of 7700.40 '--name-hash-version option passes through to pack-objects': 
+	GIT_TRACE2_EVENT="$(pwd)/hash-trace.txt" \
+		git repack -a --name-hash-version=2 &&
+	test_subcommand_flex git pack-objects --name-hash-version=2 <hash-trace.txt
 
-ok 95 - "status.short=true" same as "-s"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+{"event":"child_start","sid":"20250317T132901.035834Z-H5c947e1c-P0034927f","thread":"main","time":"2025-03-17T13:29:01.036441Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--name-hash-version=2","--delta-base-offset",".git/objects/pack/.tmp-3445375-pack","--keep-true-parents","--honor-pack-keep","--non-empty","--all","--reflog","--indexed-objects"]}
+ok 40 - --name-hash-version option passes through to pack-objects
 
-expecting success of 7508.96 '"status.short=true" weaker than "--no-short"': 
-	git -c status.short=true status --no-short >actual &&
-	test_cmp expected_noshort actual
+expecting success of 7700.41 'setup for update-server-info': 
+	git init update-server-info &&
+	test_commit -C update-server-info message
 
-ok 96 - "status.short=true" weaker than "--no-short"
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7700-repack/update-server-info/.git/
+[master (root-commit) c5363f9] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 message.t
+ok 41 - setup for update-server-info
 
-expecting success of 7508.97 '"status.short=false" same as "--no-short"': 
-	git -c status.short=false status >actual &&
-	test_cmp expected_noshort actual
+expecting success of 7700.42 'updates server info by default': 
+	test_server_info_cleanup &&
+	git -C update-server-info repack &&
+	test_server_info_present
 
-ok 97 - "status.short=false" same as "--no-short"
+ok 42 - updates server info by default
 
-expecting success of 7508.98 '"status.short=false" weaker than "-s"': 
-	git -c status.short=false status -s >actual &&
-	test_cmp expected_short actual
+expecting success of 7700.43 '-n skips updating server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info repack -n &&
+	test_server_info_missing
 
-ok 98 - "status.short=false" weaker than "-s"
+Nothing new to pack.
+ok 43 - -n skips updating server info
 
-expecting success of 7508.99 '"status.branch=true" same as "-b"': 
-	git status -sb >expected_branch &&
-	git -c status.branch=true status -s >actual &&
-	test_cmp expected_branch actual
+expecting success of 7700.44 'repack.updateServerInfo=true updates server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=true repack &&
+	test_server_info_present
 
-ok 99 - "status.branch=true" same as "-b"
+Nothing new to pack.
+ok 44 - repack.updateServerInfo=true updates server info
 
-expecting success of 7508.100 '"status.branch=true" different from "--no-branch"': 
-	git status -s --no-branch  >expected_nobranch &&
-	git -c status.branch=true status -s >actual &&
-	! test_cmp expected_nobranch actual
+expecting success of 7700.45 'repack.updateServerInfo=false skips updating server info': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=false repack &&
+	test_server_info_missing
 
---- expected_nobranch	2026-04-19 19:24:37.343659440 +0000
-+++ actual	2026-04-19 19:24:37.371659440 +0000
-@@ -1,2 +1,3 @@
-+## main...upstream [ahead 2, behind 2]
-  M dir1/modified
- MM sm
-ok 100 - "status.branch=true" different from "--no-branch"
+Nothing new to pack.
+ok 45 - repack.updateServerInfo=false skips updating server info
 
-expecting success of 7508.101 '"status.branch=true" weaker than "--no-branch"': 
-	git -c status.branch=true status -s --no-branch >actual &&
-	test_cmp expected_nobranch actual
+expecting success of 7700.46 '-n overrides repack.updateServerInfo=true': 
+	test_server_info_cleanup &&
+	git -C update-server-info -c repack.updateServerInfo=true repack -n &&
+	test_server_info_missing
 
-ok 101 - "status.branch=true" weaker than "--no-branch"
+Nothing new to pack.
+ok 46 - -n overrides repack.updateServerInfo=true
 
-expecting success of 7508.102 '"status.branch=true" weaker than "--porcelain"': 
-	git -c status.branch=true status --porcelain >actual &&
-	test_cmp expected_nobranch actual
+# passed all 46 test(s)
+1..46
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7815-grep-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7815-grep-binary/.git/
+expecting success of 7815.1 'setup': 
+	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
+	git add a &&
+	git commit -m.
 
-ok 102 - "status.branch=true" weaker than "--porcelain"
+[master (root-commit) 8fc33fb] .
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+ok 1 - setup
 
-expecting success of 7508.103 '"status.branch=false" same as "--no-branch"': 
-	git -c status.branch=false status -s >actual &&
-	test_cmp expected_nobranch actual
+expecting success of 7815.2 'git grep ina a': 
+	echo Binary file a matches >expect &&
+	git grep ina a >actual &&
+	test_cmp expect actual
 
-ok 103 - "status.branch=false" same as "--no-branch"
+ok 2 - git grep ina a
 
-expecting success of 7508.104 '"status.branch=false" weaker than "-b"': 
-	git -c status.branch=false status -sb >actual &&
-	test_cmp expected_branch actual
+expecting success of 7815.3 'git grep -ah ina a': 
+	git grep -ah ina a >actual &&
+	test_cmp a actual
 
-ok 104 - "status.branch=false" weaker than "-b"
+ok 3 - git grep -ah ina a
 
-expecting success of 7508.105 'Restore default test environment': 
-	git config --unset status.showUntrackedFiles
+expecting success of 7815.4 'git grep -I ina a': 
+	test_must_fail git grep -I ina a >actual &&
+	test_must_be_empty actual
 
-ok 105 - Restore default test environment
+ok 4 - git grep -I ina a
 
-expecting success of 7508.106 'git commit will commit a staged but ignored submodule': 
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore all &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep "^M. sm" output &&
-	GIT_EDITOR="echo hello >>\"\$1\"" &&
-	export GIT_EDITOR &&
-	git commit -uno &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep ! "^M. sm" output
+expecting success of 7815.5 'git grep -c ina a': 
+	echo a:1 >expect &&
+	git grep -c ina a >actual &&
+	test_cmp expect actual
 
-MM sm
-[main 51a9b42] hello /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/.git/COMMIT_EDITMSG
- Author: A U Thor <author@example.com>
-ok 106 - git commit will commit a staged but ignored submodule
+ok 5 - git grep -c ina a
 
-expecting success of 7508.107 'git commit --dry-run will show a staged but ignored submodule': 
-	git reset HEAD^ &&
-	git add sm &&
-	cat >expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
+expecting success of 7815.6 'git grep -l ina a': 
+	echo a >expect &&
+	git grep -l ina a >actual &&
+	test_cmp expect actual
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+ok 6 - git grep -l ina a
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+expecting success of 7815.7 'git grep -L bar a': 
+	echo a >expect &&
+	git grep -L bar a >actual &&
+	test_cmp expect actual
 
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git commit -uno --dry-run >output &&
-	test_cmp expect output &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep "^M. sm" output
+ok 7 - git grep -L bar a
 
-Unstaged changes after reset:
-M	dir1/modified
-M	sm
-M  sm
-ok 107 - git commit --dry-run will show a staged but ignored submodule
+expecting success of 7815.8 'git grep -q ina a': 
+	git grep -q ina a >actual &&
+	test_must_be_empty actual
 
-expecting success of 7508.108 'git commit -m will commit a staged but ignored submodule': 
-	git commit -uno -m message &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep ! "^M. sm" output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+ok 8 - git grep -q ina a
 
-[main 45c17dd] message
- Author: A U Thor <author@example.com>
-ok 108 - git commit -m will commit a staged but ignored submodule
+expecting success of 7815.9 'git grep -F ile a': 
+	git grep -F ile a
 
-expecting success of 7508.109 'show stash info with "--show-stash"': 
-	git reset --hard &&
-	git stash clear &&
-	echo 1 >file &&
-	git add file &&
-	git stash &&
-	git status >expected_default &&
-	git status --show-stash >expected_with_stash &&
-	test_grep "^Your stash currently has 1 entry$" expected_with_stash
+Binary file a matches
+ok 9 - git grep -F ile a
 
-HEAD is now at 45c17dd message
-Saved working directory and index state WIP on main: 45c17dd message
-Your stash currently has 1 entry
-ok 109 - show stash info with "--show-stash"
+expecting success of 7815.10 'git grep -Fi iLE a': 
+	git grep -Fi iLE a
 
-expecting success of 7508.110 'no stash info with "--show-stash --no-show-stash"': 
-	git status --show-stash --no-show-stash >expected_without_stash &&
-	test_cmp expected_default expected_without_stash
+Binary file a matches
+ok 10 - git grep -Fi iLE a
 
-ok 110 - no stash info with "--show-stash --no-show-stash"
+expecting success of 7815.11 'git grep ile a': 
+	git grep ile a
 
-expecting success of 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
-	git -c status.showStash=false status --show-stash >actual &&
-	test_cmp expected_with_stash actual
+Binary file a matches
+ok 11 - git grep ile a
 
-ok 111 - "status.showStash=false" weaker than "--show-stash"
+checking known breakage of 7815.12 'git grep .fi a': 
+	git grep .fi a
 
-expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
-	git -c status.showStash=true status --no-show-stash >actual &&
-	test_cmp expected_without_stash actual
+not ok 12 - git grep .fi a # TODO known breakage
 
-ok 112 - "status.showStash=true" weaker than "--no-show-stash"
+expecting success of 7815.13 'grep respects binary diff attribute': 
+	echo text >t &&
+	git add t &&
+	echo t:text >expect &&
+	git grep text t >actual &&
+	test_cmp expect actual &&
+	echo "t -diff" >.gitattributes &&
+	echo "Binary file t matches" >expect &&
+	git grep text t >actual &&
+	test_cmp expect actual
 
-expecting success of 7508.113 'no additional info if no stash entries': 
-	git stash clear &&
-	git -c status.showStash=true status >actual &&
-	test_cmp expected_without_stash actual
+ok 13 - grep respects binary diff attribute
 
-ok 113 - no additional info if no stash entries
+expecting success of 7815.14 'grep --cached respects binary diff attribute': 
+	git grep --cached text t >actual &&
+	test_cmp expect actual
 
-expecting success of 7508.114 '"No commits yet" should be noted in status output': 
-	git checkout --orphan empty-branch-1 &&
-	git status >output &&
-	test_grep "No commits yet" output
+ok 14 - grep --cached respects binary diff attribute
 
-Switched to a new branch 'empty-branch-1'
-No commits yet
-ok 114 - "No commits yet" should be noted in status output
+expecting success of 7815.15 'grep --cached respects binary diff attribute (2)': 
+	git add .gitattributes &&
+	rm .gitattributes &&
+	git grep --cached text t >actual &&
+	test_when_finished "git rm --cached .gitattributes" &&
+	test_when_finished "git checkout .gitattributes" &&
+	test_cmp expect actual
 
-expecting success of 7508.115 '"No commits yet" should not be noted in status output': 
-	git checkout --orphan empty-branch-2 &&
-	test_commit test-commit-1 &&
-	git status >output &&
-	test_grep ! "No commits yet" output
+Updated 1 path from the index
+rm '.gitattributes'
+ok 15 - grep --cached respects binary diff attribute (2)
 
-Switched to a new branch 'empty-branch-2'
-[empty-branch-2 (root-commit) f194efb] test-commit-1
+expecting success of 7815.16 'grep revision respects binary diff attribute': 
+	git commit -m new &&
+	echo "Binary file HEAD:t matches" >expect &&
+	git grep text HEAD -- t >actual &&
+	test_when_finished "git reset HEAD^" &&
+	test_cmp expect actual
+
+[master 7e398e6] new
  Author: A U Thor <author@example.com>
- 10 files changed, 7 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 115 - "No commits yet" should not be noted in status output
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 t
+ok 16 - grep revision respects binary diff attribute
 
-expecting success of 7508.116 '"Initial commit" should be noted in commit template': 
-	git checkout --orphan empty-branch-3 &&
-	touch to_be_committed_1 &&
-	git add to_be_committed_1 &&
-	git commit --dry-run >output &&
-	test_grep "Initial commit" output
+expecting success of 7815.17 'grep respects not-binary diff attribute': 
+	echo binQary | q_to_nul >b &&
+	git add b &&
+	echo "Binary file b matches" >expect &&
+	git grep bin b >actual &&
+	test_cmp expect actual &&
+	echo "b diff" >.gitattributes &&
+	echo "b:binQary" >expect &&
+	git grep bin b >actual.raw &&
+	nul_to_q <actual.raw >actual &&
+	test_cmp expect actual
 
-Switched to a new branch 'empty-branch-3'
-Initial commit
-ok 116 - "Initial commit" should be noted in commit template
+ok 17 - grep respects not-binary diff attribute
 
-expecting success of 7508.117 '"Initial commit" should not be noted in commit template': 
-	git checkout --orphan empty-branch-4 &&
-	test_commit test-commit-2 &&
-	touch to_be_committed_2 &&
-	git add to_be_committed_2 &&
-	git commit --dry-run >output &&
-	test_grep ! "Initial commit" output
+expecting success of 7815.18 'setup textconv filters': 
+	echo a diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
 
-Switched to a new branch 'empty-branch-4'
-[empty-branch-4 (root-commit) 92016e1] test-commit-2
- Author: A U Thor <author@example.com>
- 12 files changed, 8 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 test-commit-2.t
- create mode 100644 to_be_committed_1
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 117 - "Initial commit" should not be noted in commit template
+ok 18 - setup textconv filters
 
-expecting success of 7508.118 '--no-optional-locks prevents index update': 
-	test_set_magic_mtime .git/index &&
-	git --no-optional-locks status &&
-	test_is_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+expecting success of 7815.19 'grep does not honor textconv': 
+	test_must_fail git grep Qfile
 
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
+ok 19 - grep does not honor textconv
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7815.20 'grep --textconv honors textconv': 
+	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile >actual &&
+	test_cmp expect actual
 
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
+ok 20 - grep --textconv honors textconv
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7815.21 'grep --no-textconv does not honor textconv': 
+	test_must_fail git grep --no-textconv Qfile
 
---- .git/test-mtime-expect	2026-04-19 19:24:48.047659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:24:48.055659440 +0000
-@@ -1 +1 @@
--1234567890
-+1776626687
-ok 118 - --no-optional-locks prevents index update
+ok 21 - grep --no-textconv does not honor textconv
 
-expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
-	echo content >racy-dirty &&
-	echo content >racy-racy &&
-	git add racy* &&
-	git commit -m "racy test files" &&
-	# let status rewrite the index, if necessary; after that we expect
-	# no more index writes unless caused by racy timestamps; note that
-	# timestamps may already be racy now (depending on previous tests)
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+expecting success of 7815.22 'grep --textconv blob honors textconv': 
+	echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
+	git grep --textconv Qfile HEAD:a >actual &&
+	test_cmp expect actual
 
-[empty-branch-4 1041e20] racy test files
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 racy-dirty
- create mode 100644 racy-racy
- create mode 100644 to_be_committed_2
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+ok 22 - grep --textconv blob honors textconv
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+# still have 1 known breakage(s)
+# passed all remaining 21 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7817-grep-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/.git/
+expecting success of 7817.1 'setup': 
+	echo "text" >a &&
+	echo "text" >b &&
+	mkdir dir &&
+	echo "text" >dir/c &&
 
-nothing added to commit but untracked files present (use "git add" to track)
---- .git/test-mtime-expect	2026-04-19 19:24:49.435659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:24:49.443659440 +0000
-@@ -1 +1 @@
--1234567890
-+1776626688
-ok 119 - racy timestamps will be fixed for clean worktree
+	git init sub &&
+	(
+		cd sub &&
+		mkdir A B &&
+		echo "text" >A/a &&
+		echo "text" >B/b &&
+		git add A B &&
+		git commit -m sub &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set B
+	) &&
 
-expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
-	echo content2 >racy-dirty &&
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+	git init sub2 &&
+	(
+		cd sub2 &&
+		echo "text" >a &&
+		git add a &&
+		git commit -m sub2
+	) &&
 
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
+	git submodule add ./sub &&
+	git submodule add ./sub2 &&
+	git add a b dir &&
+	git commit -m super &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	git tag -am tag-to-commit tag-to-commit HEAD &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	git tag -am tag-to-tree tag-to-tree $tree &&
 
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
+	test_path_is_missing b &&
+	test_path_is_missing dir &&
+	test_path_is_missing sub/A &&
+	test_path_is_file a &&
+	test_path_is_file sub/B/b &&
+	test_path_is_file sub2/a &&
+	git branch -m main
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/sub/.git/
+[master (root-commit) e98dfe7] sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 A/a
+ create mode 100644 B/b
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7817-grep-sparse-checkout/sub2/.git/
+[master (root-commit) 4767315] sub2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'sub' to the index
+Adding existing repo at 'sub2' to the index
+[master (root-commit) 26900e7] super
+ Author: A U Thor <author@example.com>
+ 6 files changed, 11 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 a
+ create mode 100644 b
+ create mode 100644 dir/c
+ create mode 160000 sub
+ create mode 160000 sub2
+warning: unable to rmdir 'sub': Directory not empty
+warning: unable to rmdir 'sub2': Directory not empty
+warning: pass a leading slash before paths such as 'sub' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+warning: unable to rmdir 'sub2': Directory not empty
+ok 1 - setup
 
-no changes added to commit (use "git add" and/or "git commit -a")
---- .git/test-mtime-expect	2026-04-19 19:24:50.839659440 +0000
-+++ .git/test-mtime-actual	2026-04-19 19:24:50.859659440 +0000
-@@ -1 +1 @@
--1234567890
-+1776626690
-ok 120 - racy timestamps will be fixed for dirty worktree
+expecting success of 7817.2 'working tree grep honors sparse checkout': 
+	cat >expect <<-EOF &&
+	a:text
+	b:new-text
+	EOF
+	test_when_finished "rm -f b" &&
+	echo "new-text" >b &&
+	git grep "text" >actual &&
+	test_cmp expect actual
 
-expecting success of 7508.121 'setup slow status advice': 
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
-	(
-		cd slowstatus &&
-		cat >.gitignore <<-\EOF &&
-		/actual
-		/expected
-		/out
-		EOF
-		git add .gitignore &&
-		git commit -m "Add .gitignore" &&
-		git config set advice.statusuoption true
-	)
+ok 2 - working tree grep honors sparse checkout
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/slowstatus/.git/
-[main (root-commit) 557fde8] Add .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 .gitignore
-ok 121 - setup slow status advice
+expecting success of 7817.3 'grep searches unmerged file despite not matching sparsity patterns': 
+	cat >expect <<-EOF &&
+	b:modified-b-in-branchX
+	b:modified-b-in-branchY
+	EOF
+	test_when_finished "test_might_fail git merge --abort && \
+			    git checkout main && git sparse-checkout init" &&
 
-expecting success of 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache false &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+	git sparse-checkout disable &&
+	git checkout -b branchY main &&
+	test_commit modified-b-in-branchY b &&
+	git checkout -b branchX main &&
+	test_commit modified-b-in-branchX b &&
 
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
+	git sparse-checkout init &&
+	test_path_is_missing b &&
+	test_must_fail git merge branchY &&
+	git grep "modified-b" >actual &&
+	test_cmp expect actual
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+Switched to a new branch 'branchY'
+[branchY 69623d1] modified-b-in-branchY
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'branchX'
+[branchX 2555150] modified-b-in-branchX
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+Auto-merging b
+CONFLICT (content): Merge conflict in b
+Automatic merge failed; fix conflicts and then commit the result.
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+Switched to branch 'main'
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unable to rmdir 'sub2': Directory not empty
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 3 - grep searches unmerged file despite not matching sparsity patterns
 
-ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
+expecting success of 7817.4 'grep --cached searches entries with the SKIP_WORKTREE bit': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	git grep --cached "text" >actual &&
+	test_cmp expect actual
 
-expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 4 - grep --cached searches entries with the SKIP_WORKTREE bit
 
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
+expecting success of 7817.5 'grep --recurse-submodules honors sparse checkout in submodule': 
+	cat >expect <<-EOF &&
+	a:text
+	sub/B/b:text
+	sub2/a:text
+	EOF
+	git update-index --skip-worktree sub2 &&
+	git grep --recurse-submodules "text" >actual &&
+	test_cmp expect actual
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 5 - grep --recurse-submodules honors sparse checkout in submodule
 
-ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
+expecting success of 7817.6 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	sub/A/a:text
+	sub/B/b:text
+	sub2/a:text
+	EOF
+	git grep --recurse-submodules --cached "text" >actual &&
+	test_cmp expect actual
 
-expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor true &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 6 - grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit
 
-		It took 3.25 seconds to enumerate untracked files,
-		but the results were cached, and subsequent runs may be faster.
-		See 'git help status' for information on how to improve this.
+expecting success of 7817.7 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE': 
+	cat >expect <<-EOF &&
+	a:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep text >actual &&
+	test_cmp expect actual
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 7 - working tree grep does not search the index with CE_VALID and SKIP_WORKTREE
 
-ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
+expecting success of 7817.8 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE': 
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep --cached text >actual &&
+	test_cmp expect actual
 
-checking prerequisite: EXPENSIVE
+warning: unrecognized pattern: 'b'
+warning: disabling cone pattern matching
+ok 8 - grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7609-mergetool--lib.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7609-mergetool--lib/.git/
+expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
+	. "$GIT_SOURCE_DIR"/mergetools/vimdiff &&
+	run_unit_tests
 
-)
-prerequisite EXPENSIVE not satisfied
-ok 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
+Test Case #01: OK
+Test Case #02: OK
+Test Case #03: OK
+Test Case #04: OK
+Test Case #05: OK
+Test Case #06: OK
+Test Case #07: OK
+Test Case #08: OK
+Test Case #09: OK
+Test Case #10: OK
+Test Case #11: OK
+Test Case #12: OK
+Test Case #13: OK
+Test Case #14: OK
+Test Case #15: OK
+Test Case #16: OK
+ok 1 - mergetool --tool=vimdiff creates the expected layout
 
-# passed all 125 test(s)
-1..125
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t8001-annotate.sh ***
@@ -503805,8 +499632,8 @@
 	check_count A 1 "Not Committed Yet" 1
 
 git annotate  file 
-Author Not Committed Yet (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author Not Committed Yet (expected 1, attributed 1) good
 ok 3 - blame working copy
 
 expecting success of 8001.4 'blame with --contents': 
@@ -503893,8 +499720,8 @@
 	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
 
 git annotate  --contents=file file testTag
-Author External file (--contents) (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author External file (--contents) (expected 2, attributed 2) good
 ok 11 - blame with --contents and revision
 
 expecting success of 8001.12 'setup B1 lines (branch1)': 
@@ -503914,9 +499741,9 @@
 	check_count A 2 B 2 B1 2
 
 git annotate  file 
+Author B (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8001.14 'setup B2 lines (branch2)': 
@@ -503936,9 +499763,9 @@
 	check_count A 2 B 1 B2 1
 
 git annotate  file 
+Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
 expecting success of 8001.16 'merge branch1 & branch2': 
@@ -503954,9 +499781,9 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git annotate  file 
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
@@ -503964,10 +499791,10 @@
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git annotate  --first-parent file 
-Author B (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
 Author A U Thor (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8001.19 'blame ancestor': 
@@ -503998,11 +499825,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git annotate  file 
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 Author A U Thor (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
 ok 22 - blame evil merge
 
 expecting success of 8001.23 'blame huge graft': 
@@ -504185,8 +500012,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config set advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
 Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -504205,11 +500032,11 @@
 
 git annotate  file 
 Author A (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
 expecting success of 8001.26 'setup edits': 
@@ -504231,12 +500058,12 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git annotate  file 
-Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 ok 27 - blame edits
 
@@ -504256,14 +500083,14 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  file 
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
 expecting success of 8001.30 'blame -L 1 (all)': 
@@ -504272,12 +500099,12 @@
 git annotate  -L1 file 
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 30 - blame -L 1 (all)
 
 expecting success of 8001.31 'blame -L , (all)': 
@@ -504285,23 +500112,23 @@
 
 git annotate  -L, file 
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8001.32 'blame -L X (X to end)': 
 	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L5 file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
 
 expecting success of 8001.33 'blame -L X, (X to end)': 
@@ -504309,18 +500136,18 @@
 
 git annotate  -L5, file 
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
 expecting success of 8001.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git annotate  -L,3 file 
-Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8001.35 'blame -L X,X': 
@@ -504334,20 +500161,20 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,6 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
 expecting success of 8001.37 'blame -L Y,X (undocumented)': 
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git annotate  -L6,3 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
 
 expecting success of 8001.38 'blame -L -X': 
@@ -504391,10 +500218,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,+4 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8001.45 'blame -L ,-0': 
@@ -504421,9 +500248,9 @@
 
 git annotate  -L6,-4 file 
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
@@ -504467,9 +500294,9 @@
 	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
 git annotate  -L/99/,+3 file 
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 53 - blame -L /RE/,+N
 
 expecting success of 8001.54 'blame -L /RE/,-N': 
@@ -504477,8 +500304,8 @@
 
 git annotate  -L/99/,-3 file 
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8001.55 'blame -L X (X == nlines)': 
@@ -504507,14 +500334,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L,8 file 
+Author E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8001.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -504522,37 +500349,37 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L,9 file 
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 59 - blame -L ,Y (Y == nlines + 1)
 
 expecting success of 8001.60 'blame -L ,Y (Y > nlines)': 
 	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L,12345 file 
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8001.61 'blame -L multiple (disjoint)': 
 	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
 
 git annotate  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
@@ -504560,30 +500387,30 @@
 	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
 
 git annotate  -L6,7 -L2,3 file 
-Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (disjoint: unordered)
 
 expecting success of 8001.63 'blame -L multiple (adjacent)': 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git annotate  -L2,3 -L4,5 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8001.64 'blame -L multiple (adjacent: unordered)': 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git annotate  -L4,5 -L2,3 file 
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 8001.65 'blame -L multiple (overlapping)': 
@@ -504591,77 +500418,77 @@
 
 git annotate  -L2,4 -L3,5 file 
 Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8001.66 'blame -L multiple (overlapping: unordered)': 
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git annotate  -L3,5 -L2,4 file 
-Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
 expecting success of 8001.67 'blame -L multiple (superset/subset)': 
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L2,8 -L3,5 file 
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 67 - blame -L multiple (superset/subset)
 
 expecting success of 8001.68 'blame -L multiple (superset/subset: unordered)': 
 	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L3,5 -L2,8 file 
+Author A U Thor (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 ok 68 - blame -L multiple (superset/subset: unordered)
 
 expecting success of 8001.69 'blame -L /RE/ (relative)': 
 	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L3,3 -L/fox/ file 
-Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 expecting success of 8001.70 'blame -L /RE/ (relative: no preceding range)': 
 	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L/dog/ file 
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8001.71 'blame -L /RE/ (relative: adjacent)': 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git annotate  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 71 - blame -L /RE/ (relative: adjacent)
 
 expecting success of 8001.72 'blame -L /RE/ (relative: not found)': 
@@ -504688,8 +500515,8 @@
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git annotate  -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success of 8001.76 'blame -L ^/RE/ (absolute: not found)': 
@@ -504753,8 +500580,8 @@
 	check_count -f hello.c -L:main F 4 G 1
 
 git annotate  -L:main hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 79 - blame -L :literal
 
 expecting success of 8001.80 'blame -L :regex': 
@@ -504774,8 +500601,8 @@
 	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
 
 git annotate  -L3,3 -L:ma.. hello.c 
-Author H (expected 4, attributed 4) good
 Author F (expected 1, attributed 1) good
+Author H (expected 4, attributed 4) good
 ok 82 - blame -L :RE (relative)
 
 expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
@@ -504810,8 +500637,8 @@
 	check_count -f hello.c -L^:ma.. F 4 G 1
 
 git annotate  -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 87 - blame -L ^:RE (absolute: no preceding range)
 
 expecting success of 8001.88 'blame -L ^:RE (absolute: not found)': 
@@ -504859,8 +500686,8 @@
  Author: B <B@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 git annotate  -L:RIGHT file.f03 
-Author A (expected 3, attributed 3) good
 Author B (expected 1, attributed 1) good
+Author A (expected 3, attributed 3) good
 ok 90 - blame -L :funcname with userdiff driver
 
 expecting success of 8001.91 'setup incremental': 
@@ -505133,34 +500960,6 @@
 1..117
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7609-mergetool--lib.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7609-mergetool--lib/.git/
-expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
-	. "$GIT_SOURCE_DIR"/mergetools/vimdiff &&
-	run_unit_tests
-
-Test Case #01: OK
-Test Case #02: OK
-Test Case #03: OK
-Test Case #04: OK
-Test Case #05: OK
-Test Case #06: OK
-Test Case #07: OK
-Test Case #08: OK
-Test Case #09: OK
-Test Case #10: OK
-Test Case #11: OK
-Test Case #12: OK
-Test Case #13: OK
-Test Case #14: OK
-Test Case #15: OK
-Test Case #16: OK
-ok 1 - mergetool --tool=vimdiff creates the expected layout
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t8004-blame-with-conflicts.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8004-blame-with-conflicts/.git/
 expecting success of 8004.1 'setup first case': 
@@ -505273,1652 +501072,1977 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8005-blame-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8005-blame-i18n/.git/
-expecting success of 8005.1 'setup the repository': 
-	# Create the file
-	echo "UTF-8 LINE" > file &&
-	git add file &&
-	git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
+*** t7508-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/.git/
+expecting success of 7508.1 'status -h in broken repository': 
+	git config --global advice.statusuoption false &&
+	mkdir broken &&
+	test_when_finished "rm -fr broken" &&
+	(
+		cd broken &&
+		git init &&
+		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
+		test_expect_code 129 git status -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
 
-	echo "EUC-JAPAN LINE" >> file &&
-	git add file &&
-	git config i18n.commitencoding eucJP &&
-	git commit --author "$EUC_JAPAN_NAME <euc-japan@localhost>" -m "$EUC_JAPAN_MSG" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/broken/.git/
+usage: git status [<options>] [--] [<pathspec>...]
+ok 1 - status -h in broken repository
 
-	echo "SJIS LINE" >> file &&
-	git add file &&
-	git config i18n.commitencoding SJIS &&
-	git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
+expecting success of 7508.2 'commit -h in broken repository': 
+	mkdir broken &&
+	test_when_finished "rm -fr broken" &&
+	(
+		cd broken &&
+		git init &&
+		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
+		test_expect_code 129 git commit -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
 
-[master (root-commit) 732dccd] ブレーム�テスト��。
- Author: 山田 太郎 <utf8@localhost>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master fd45e78] ブレーム�テスト��。
- Author: »³ÅÄ ÂÀϺ <euc-japan@localhost>
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/broken/.git/
+usage: git commit [-a | --interactive | --patch] [-s] [-v] [-u[<mode>]] [--amend]
+ok 2 - commit -h in broken repository
+
+expecting success of 7508.3 'create upstream branch': 
+	git checkout -b upstream &&
+	test_commit upstream1 &&
+	test_commit upstream2 &&
+	# leave the first commit on main as root because several
+	# tests depend on this case; for our upstream we only
+	# care about commit counts anyway, so a totally divergent
+	# history is OK
+	git checkout --orphan main
+
+Switched to a new branch 'upstream'
+[upstream (root-commit) 8d383b3] upstream1
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 6624d04] ブレーム�テスト��。
- Author: ŽR“c ‘¾˜Y <sjis@localhost>
+ create mode 100644 upstream1.t
+[upstream 726fd3a] upstream2
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 1 - setup the repository
+ create mode 100644 upstream2.t
+Switched to a new branch 'main'
+ok 3 - create upstream branch
 
-expecting success of 8005.2 'blame respects i18n.commitencoding': 
-	git blame --incremental file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
+expecting success of 7508.4 'setup': 
+	: >tracked &&
+	: >modified &&
+	mkdir dir1 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	mkdir dir2 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	git add . &&
 
-ok 2 - blame respects i18n.commitencoding
+	git status >output &&
 
-expecting success of 8005.3 'blame respects i18n.logoutputencoding': 
-	git config i18n.logoutputencoding eucJP &&
-	git blame --incremental file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
+	test_tick &&
+	git commit -m initial &&
+	: >untracked &&
+	: >dir1/untracked &&
+	: >dir2/untracked &&
+	echo 1 >dir1/modified &&
+	echo 2 >dir2/modified &&
+	echo 3 >dir2/added &&
+	git add dir2/added &&
 
-ok 3 - blame respects i18n.logoutputencoding
+	git branch --set-upstream-to=upstream
 
-expecting success of 8005.4 'blame respects --encoding=UTF-8': 
-	git blame --incremental --encoding=UTF-8 file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
+[main (root-commit) 5b37b0a] initial
+ Author: A U Thor <author@example.com>
+ 7 files changed, 4 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 modified
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+branch 'main' set up to track 'upstream'.
+ok 4 - setup
 
-ok 4 - blame respects --encoding=UTF-8
+expecting success of 7508.5 'status (1)': 
+	test_grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
 
-expecting success of 8005.5 'blame respects --encoding=none': 
-	git blame --incremental --encoding=none file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
+  (use "git rm --cached <file>..." to unstage)
+ok 5 - status (1)
 
-ok 5 - blame respects --encoding=none
+expecting success of 7508.6 'status --column': 
+	cat >expect <<\EOF &&
+# On branch main
+# Your branch and 'upstream' have diverged,
+# and have 1 and 2 different commits each, respectively.
+#   (use "git pull" if you want to integrate the remote branch with yours)
+#
+# Changes to be committed:
+#   (use "git restore --staged <file>..." to unstage)
+#	new file:   dir2/added
+#
+# Changes not staged for commit:
+#   (use "git add <file>..." to update what will be committed)
+#   (use "git restore <file>..." to discard changes in working directory)
+#	modified:   dir1/modified
+#
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#	dir1/untracked dir2/untracked
+#	dir2/modified  untracked
+#
+EOF
+	COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
+	test_cmp expect output
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8002-blame.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8002-blame/.git/
-expecting success of 8002.1 'setup A lines': 
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "lazy dog" >>file &&
-	git add file &&
-	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
-	git commit -a -m "Initial."
+ok 6 - status --column
 
-[main (root-commit) 129283d] Initial.
- Author: A <A@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-ok 1 - setup A lines
+expecting success of 7508.7 'status --column status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
+	test_cmp expect output
 
-expecting success of 8002.2 'blame 1 author': 
-	check_count A 2
+ok 7 - status --column status.displayCommentPrefix=false
 
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-ok 2 - blame 1 author
+expecting success of 7508.8 'status with status.displayCommentPrefix=true': 
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect output
 
-expecting success of 8002.3 'blame working copy': 
-	test_when_finished "git restore file" &&
-	echo "1A quick brown fox jumps over the" >file &&
-	echo "another lazy dog" >>file &&
-	check_count A 1 "Not Committed Yet" 1
+ok 8 - status with status.displayCommentPrefix=true
 
-git blame -c  file 
-Author Not Committed Yet (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 3 - blame working copy
+expecting success of 7508.9 'status with status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	git -c status.displayCommentPrefix=false status >output &&
+	test_cmp expect output
 
-expecting success of 8002.4 'blame with --contents': 
-	check_count --contents=file A 2
+ok 9 - status with status.displayCommentPrefix=false
 
-git blame -c  --contents=file file 
-Author A (expected 2, attributed 2) good
-ok 4 - blame with --contents
+expecting success of 7508.10 'status -v': 
+	(cat expect && git diff --cached) >expect-with-v &&
+	git status -v >output &&
+	test_cmp expect-with-v output
 
-expecting success of 8002.5 'blame with --contents in a bare repo': 
-	git clone --bare . bare-contents.git &&
-	(
-		cd bare-contents.git &&
-		echo "1A quick brown fox jumps over the" >contents &&
-		check_count --contents=contents A 1
-	)
+ok 10 - status -v
 
-Cloning into bare repository 'bare-contents.git'...
-done.
-git blame -c  --contents=contents file 
-Author A (expected 1, attributed 1) good
-ok 5 - blame with --contents in a bare repo
+expecting success of 7508.11 'status -v -v': 
+	(cat expect &&
+	 echo "Changes to be committed:" &&
+	 git -c diff.mnemonicprefix=true diff --cached &&
+	 echo "--------------------------------------------------" &&
+	 echo "Changes not staged for commit:" &&
+	 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
+	git status -v -v >output &&
+	test_cmp expect-with-v output
 
-expecting success of 8002.6 'blame with --contents changed': 
-	echo "1A quick brown fox jumps over the" >contents &&
-	echo "another lazy dog" >>contents &&
-	check_count --contents=contents A 1 "External file (--contents)" 1
+ok 11 - status -v -v
 
-git blame -c  --contents=contents file 
-Author A (expected 1, attributed 1) good
-Author External file (--contents) (expected 1, attributed 1) good
-ok 6 - blame with --contents changed
+expecting success of 7508.12 'setup fake editor': 
+	cat >.git/editor <<-\EOF &&
+	#! /bin/sh
+	cp "$1" output
+EOF
+	chmod 755 .git/editor
 
-expecting success of 8002.7 'blame in a bare repo without starting commit': 
-	git clone --bare . bare.git &&
-	(
-		cd bare.git &&
-		check_count A 2
-	)
+ok 12 - setup fake editor
 
-Cloning into bare repository 'bare.git'...
-done.
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-ok 7 - blame in a bare repo without starting commit
+expecting success of 7508.13 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG': 
+	commit_template_commented
 
-expecting success of 8002.8 'blame by tag objects': 
-	git tag -m "test tag" testTag &&
-	git tag -m "test tag #2" testTag2 testTag &&
-	check_count -h testTag A 2 &&
-	check_count -h testTag2 A 2
+Aborting commit due to empty commit message.
+ok 13 - commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG
 
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f testTag2 testTag^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-git blame -c  file testTag
-Author A (expected 2, attributed 2) good
-git blame -c  file testTag2
-Author A (expected 2, attributed 2) good
-ok 8 - blame by tag objects
+expecting success of 7508.14 'status (advice.statusHints false)': 
+	test_config advice.statusHints false &&
+	git status >output &&
+	test_cmp expect output
 
-expecting success of 8002.9 'setup B lines': 
-	echo "2A quick brown fox jumps over the" >>file &&
-	echo "lazy dog" >>file &&
-	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
-	git commit -a -m "Second."
 
-[main 7e31098] Second.
- Author: B <B@test.git>
- 1 file changed, 2 insertions(+)
-ok 9 - setup B lines
+ok 14 - status (advice.statusHints false)
 
-expecting success of 8002.10 'blame 2 authors': 
-	check_count A 2 B 2
+expecting success of 7508.15 'status -s': 
 
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
-ok 10 - blame 2 authors
+	git status -s >output &&
+	test_cmp expect output
 
-expecting success of 8002.11 'blame with --contents and revision': 
-	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
 
-git blame -c  --contents=file file testTag
-Author External file (--contents) (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 11 - blame with --contents and revision
+ok 15 - status -s
 
-expecting success of 8002.12 'setup B1 lines (branch1)': 
-	git checkout -b branch1 main &&
-	echo "3A slow green fox jumps into the" >>file &&
-	echo "well." >>file &&
-	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
-	git commit -a -m "Branch1-1"
+expecting success of 7508.16 'status with gitignore': 
+	{
+		echo ".gitignore" &&
+		echo "expect*" &&
+		echo "output" &&
+		echo "untracked"
+	} >.gitignore &&
 
-Switched to a new branch 'branch1'
-[branch1 1b9b47a] Branch1-1
- Author: B1 <B1@test.git>
- 1 file changed, 2 insertions(+)
-ok 12 - setup B1 lines (branch1)
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	?? dir2/modified
+	EOF
+	git status -s >output &&
+	test_cmp expect output &&
 
-expecting success of 8002.13 'blame 2 authors + 1 branch1 author': 
-	check_count A 2 B 2 B1 2
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	?? dir2/modified
+	!! .gitignore
+	!! dir1/untracked
+	!! dir2/untracked
+	!! expect
+	!! expect-with-v
+	!! output
+	!! untracked
+	EOF
+	git status -s --ignored >output &&
+	test_cmp expect output &&
 
-git blame -c  file 
-Author B (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 13 - blame 2 authors + 1 branch1 author
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.14 'setup B2 lines (branch2)': 
-	git checkout -b branch2 main &&
-	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
-	git commit -a -m "Branch2-1"
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
 
-Switched to a new branch 'branch2'
-[branch2 7d77deb] Branch2-1
- Author: B2 <B2@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - setup B2 lines (branch2)
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.15 'blame 2 authors + 1 branch2 author': 
-	check_count A 2 B 1 B2 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir2/modified
 
-git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 15 - blame 2 authors + 1 branch2 author
+Ignored files:
+  (use "git add -f <file>..." to include in what will be committed)
+	.gitignore
+	dir1/untracked
+	dir2/untracked
+	expect
+	expect-with-v
+	output
+	untracked
 
-expecting success of 8002.16 'merge branch1 & branch2': 
-	git merge branch1
+EOF
+	git status --ignored >output &&
+	test_cmp expect output
 
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 16 - merge branch1 & branch2
+ok 16 - status with gitignore
 
-expecting success of 8002.17 'blame 2 authors + 2 merged-in authors': 
-	check_count A 2 B 1 B1 2 B2 1
+expecting success of 7508.17 'status with gitignore (nothing untracked)': 
+	{
+		echo ".gitignore" &&
+		echo "expect*" &&
+		echo "dir2/modified" &&
+		echo "output" &&
+		echo "untracked"
+	} >.gitignore &&
 
-git blame -c  file 
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-ok 17 - blame 2 authors + 2 merged-in authors
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	EOF
+	git status -s >output &&
+	test_cmp expect output &&
 
-expecting success of 8002.18 'blame --first-parent blames merge for branch1': 
-	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	!! .gitignore
+	!! dir1/untracked
+	!! dir2/modified
+	!! dir2/untracked
+	!! expect
+	!! expect-with-v
+	!! output
+	!! untracked
+	EOF
+	git status -s --ignored >output &&
+	test_cmp expect output &&
 
-git blame -c  --first-parent file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author A U Thor (expected 2, attributed 2) good
-ok 18 - blame --first-parent blames merge for branch1
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.19 'blame ancestor': 
-	check_count -h main A 2 B 2
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
 
-git blame -c  file main
-Author B (expected 2, attributed 2) good
-Author A (expected 2, attributed 2) good
-ok 19 - blame ancestor
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.20 'blame great-ancestor': 
-	check_count -h main^ A 2
+Ignored files:
+  (use "git add -f <file>..." to include in what will be committed)
+	.gitignore
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	expect
+	expect-with-v
+	output
+	untracked
 
-git blame -c  file main^
-Author A (expected 2, attributed 2) good
-ok 20 - blame great-ancestor
+EOF
+	git status --ignored >output &&
+	test_cmp expect output
 
-expecting success of 8002.21 'setup evil merge': 
-	echo "evil merge." >>file &&
-	git commit -a --amend
+ok 17 - status with gitignore (nothing untracked)
 
-[branch2 c413b3e] Merge branch 'branch1' into branch2
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 21 - setup evil merge
+expecting success of 7508.18 'status -s -b': 
 
-expecting success of 8002.22 'blame evil merge': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+	git status -s -b >output &&
+	test_cmp expect output
 
-git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author B1 (expected 2, attributed 2) good
-ok 22 - blame evil merge
 
-expecting success of 8002.23 'blame huge graft': 
-	test_when_finished "git checkout branch2" &&
-	test_when_finished "rm -rf .git/info" &&
-	graft= &&
-	for i in 0 1 2
-	do
-		for j in 0 1 2 3 4 5 6 7 8 9
-		do
-			git checkout --orphan "$i$j" &&
-			printf "%s\n" "$i" "$j" >file &&
-			test_tick &&
-			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
-			git commit -a -m "$i$j" &&
-			commit=$(git rev-parse --verify HEAD) &&
-			graft="$graft$commit " || return 1
-		done
-	done &&
-	mkdir .git/info &&
-	printf "%s " $graft >.git/info/grafts &&
-	check_count -h 00 01 1 10 1
+ok 18 - status -s -b
 
-Switched to a new branch '00'
-[00 (root-commit) e2c6177] 00
- Author: 00 <00@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '01'
-[01 (root-commit) 0dbe04b] 01
- Author: 01 <01@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '02'
-[02 (root-commit) 97fbca6] 02
- Author: 02 <02@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '03'
-[03 (root-commit) 5cdbcd8] 03
- Author: 03 <03@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '04'
-[04 (root-commit) 5a154cf] 04
- Author: 04 <04@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '05'
-[05 (root-commit) a84e1de] 05
- Author: 05 <05@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '06'
-[06 (root-commit) d4bea54] 06
- Author: 06 <06@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '07'
-[07 (root-commit) 24ba6e8] 07
- Author: 07 <07@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '08'
-[08 (root-commit) fe90088] 08
- Author: 08 <08@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '09'
-[09 (root-commit) 773a2fb] 09
- Author: 09 <09@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '10'
-[10 (root-commit) 80536e5] 10
- Author: 10 <10@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '11'
-[11 (root-commit) 33c07c1] 11
- Author: 11 <11@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '12'
-[12 (root-commit) ae7094b] 12
- Author: 12 <12@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '13'
-[13 (root-commit) 19e767d] 13
- Author: 13 <13@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '14'
-[14 (root-commit) f7159ac] 14
- Author: 14 <14@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '15'
-[15 (root-commit) d95fecf] 15
- Author: 15 <15@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '16'
-[16 (root-commit) d8bfdb9] 16
- Author: 16 <16@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '17'
-[17 (root-commit) aa3f31e] 17
- Author: 17 <17@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '18'
-[18 (root-commit) d76cb1d] 18
- Author: 18 <18@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '19'
-[19 (root-commit) 95e03c5] 19
- Author: 19 <19@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '20'
-[20 (root-commit) d40a964] 20
- Author: 20 <20@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '21'
-[21 (root-commit) 6c3def2] 21
- Author: 21 <21@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '22'
-[22 (root-commit) 78d2294] 22
- Author: 22 <22@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '23'
-[23 (root-commit) 76a64d0] 23
- Author: 23 <23@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '24'
-[24 (root-commit) 59f234a] 24
- Author: 24 <24@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '25'
-[25 (root-commit) 26ac47a] 25
- Author: 25 <25@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '26'
-[26 (root-commit) db7e855] 26
- Author: 26 <26@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '27'
-[27 (root-commit) 279f565] 27
- Author: 27 <27@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '28'
-[28 (root-commit) f691d9c] 28
- Author: 28 <28@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-Switched to a new branch '29'
-[29 (root-commit) c72134e] 29
- Author: 29 <29@test.git>
- 1 file changed, 2 insertions(+)
- create mode 100644 file
-git blame -c  file 00
-hint: Support for <GIT_DIR>/info/grafts is deprecated
-hint: and will be removed in a future Git version.
-hint:
-hint: Please use "git replace --convert-graft-file"
-hint: to convert the grafts into replace refs.
-hint:
-hint: Turn this message off by running
-hint: "git config set advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
-Author 01 (expected 1, attributed 1) good
-Switched to branch 'branch2'
-ok 23 - blame huge graft
+expecting success of 7508.19 'status -s -z -b': 
+	tr "\\n" Q <expect >expect.q &&
+	mv expect.q expect &&
+	git status -s -z -b >output &&
+	nul_to_q <output >output.q &&
+	mv output.q output &&
+	test_cmp expect output
 
-expecting success of 8002.24 'setup incomplete line': 
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
-	git commit -a -m "Incomplete"
+ok 19 - status -s -z -b
 
-[branch2 565fef5] Incomplete
- Author: C <C@test.git>
- 1 file changed, 1 insertion(+)
-ok 24 - setup incomplete line
+expecting success of 7508.20 'setup dir3': 
+	mkdir dir3 &&
+	: >dir3/untracked1 &&
+	: >dir3/untracked2
 
-expecting success of 8002.25 'blame incomplete line': 
-	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+ok 20 - setup dir3
 
-git blame -c  file 
-Author B1 (expected 2, attributed 2) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
-ok 25 - blame incomplete line
+expecting success of 7508.21 'status -uno': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.26 'setup edits': 
-	mv file file.orig &&
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git status -uno >output &&
+	test_cmp expect output &&
+	git status -ufalse >output &&
+	test_cmp expect output
+
+ok 21 - status -uno
+
+expecting success of 7508.22 'status (status.showUntrackedFiles no)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 22 - status (status.showUntrackedFiles no)
+
+expecting success of 7508.23 'status (status.showUntrackedFiles false)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 23 - status (status.showUntrackedFiles false)
+
+expecting success of 7508.24 'status (status.showUntrackedFiles 0)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 24 - status (status.showUntrackedFiles 0)
+
+expecting success of 7508.25 'status -uno (advice.statusHints false)': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+
+Changes to be committed:
+	new file:   dir2/added
+
+Changes not staged for commit:
+	modified:   dir1/modified
+
+Untracked files not listed
+EOF
+	test_config advice.statusHints false &&
+	git status -uno >output &&
+	test_cmp expect output
+
+ok 25 - status -uno (advice.statusHints false)
+
+expecting success of 7508.26 'status -s -uno': 
+	git status -s -uno >output &&
+	test_cmp expect output
+
+ok 26 - status -s -uno
+
+expecting success of 7508.27 'status -s (status.showUntrackedFiles no)': 
+	git config status.showuntrackedfiles no &&
+	git status -s >output &&
+	test_cmp expect output
+
+ok 27 - status -s (status.showUntrackedFiles no)
+
+expecting success of 7508.28 'status -unormal': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	dir3/
+	untracked
+
+EOF
+	git status -unormal >output &&
+	test_cmp expect output &&
+	git status -utrue >output &&
+	test_cmp expect output &&
+	git status -uyes >output &&
+	test_cmp expect output
+
+ok 28 - status -unormal
+
+expecting success of 7508.29 'status (status.showUntrackedFiles normal)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 29 - status (status.showUntrackedFiles normal)
+
+expecting success of 7508.30 'status (status.showUntrackedFiles true)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 30 - status (status.showUntrackedFiles true)
+
+expecting success of 7508.31 'status (status.showUntrackedFiles 1)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 31 - status (status.showUntrackedFiles 1)
+
+expecting success of 7508.32 'status -s -unormal': 
+	git status -s -unormal >output &&
+	test_cmp expect output
+
+ok 32 - status -s -unormal
+
+expecting success of 7508.33 'status -s (status.showUntrackedFiles normal)': 
+	git config status.showuntrackedfiles normal &&
+	git status -s >output &&
+	test_cmp expect output
+
+ok 33 - status -s (status.showUntrackedFiles normal)
+
+expecting success of 7508.34 'status -uall': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	dir3/untracked1
+	dir3/untracked2
+	untracked
+
+EOF
+	git status -uall >output &&
+	test_cmp expect output
+
+ok 34 - status -uall
+
+expecting success of 7508.35 'status (status.showUntrackedFiles all)': 
+	test_config status.showuntrackedfiles all &&
+	git status >output &&
+	test_cmp expect output
+
+ok 35 - status (status.showUntrackedFiles all)
+
+expecting success of 7508.36 'teardown dir3': 
+	rm -rf dir3
+
+ok 36 - teardown dir3
+
+expecting success of 7508.37 'status -s -uall': 
+	test_unconfig status.showuntrackedfiles &&
+	git status -s -uall >output &&
+	test_cmp expect output
+
+ok 37 - status -s -uall
+
+expecting success of 7508.38 'status -s (status.showUntrackedFiles all)': 
+	test_config status.showuntrackedfiles all &&
+	git status -s >output &&
+	rm -rf dir3 &&
+	test_cmp expect output
+
+ok 38 - status -s (status.showUntrackedFiles all)
+
+expecting success of 7508.39 'status with relative paths': 
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   ../dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	untracked
+	../dir2/modified
+	../dir2/untracked
+	../untracked
+
+EOF
+	(cd dir1 && git status) >output &&
+	test_cmp expect output
+
+ok 39 - status with relative paths
+
+expecting success of 7508.40 'status -s with relative paths': 
+
+	(cd dir1 && git status -s) >output &&
+	test_cmp expect output
+
+
+ok 40 - status -s with relative paths
+
+expecting success of 7508.41 'status --porcelain ignores relative paths setting': 
+
+	(cd dir1 && git status --porcelain) >output &&
+	test_cmp expect output
+
+
+ok 41 - status --porcelain ignores relative paths setting
+
+expecting success of 7508.42 'setup unique colors': 
+
+	git config status.color.untracked blue &&
+	git config status.color.branch green &&
+	git config status.color.localBranch yellow &&
+	git config status.color.remoteBranch cyan
+
+
+ok 42 - setup unique colors
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 7508.43 'status with color.ui': 
+	cat >expect <<\EOF &&
+On branch <GREEN>main<RESET>
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	<GREEN>new file:   dir2/added<RESET>
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	<RED>modified:   dir1/modified<RESET>
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	<BLUE>dir1/untracked<RESET>
+	<BLUE>dir2/modified<RESET>
+	<BLUE>dir2/untracked<RESET>
+	<BLUE>untracked<RESET>
+
+EOF
+	test_config color.ui auto &&
+	test_terminal git status | test_decode_color >output &&
+	test_cmp expect output
+
+ok 43 - status with color.ui
+
+expecting success of 7508.44 'status with color.status': 
+	test_config color.status auto &&
+	test_terminal git status | test_decode_color >output &&
+	test_cmp expect output
+
+ok 44 - status with color.status
+
+expecting success of 7508.45 'status -s with color.ui': 
+
+	git config color.ui auto &&
+	test_terminal git status -s | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 45 - status -s with color.ui
+
+expecting success of 7508.46 'status -s with color.status': 
+
+	git config --unset color.ui &&
+	git config color.status auto &&
+	test_terminal git status -s | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 46 - status -s with color.status
+
+expecting success of 7508.47 'status -s -b with color.status': 
+
+	test_terminal git status -s -b | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 47 - status -s -b with color.status
+
+expecting success of 7508.48 'status --porcelain ignores color.ui': 
+
+	git config --unset color.status &&
+	git config color.ui auto &&
+	test_terminal git status --porcelain | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 48 - status --porcelain ignores color.ui
+
+expecting success of 7508.49 'status --porcelain ignores color.status': 
+
+	git config --unset color.ui &&
+	git config color.status auto &&
+	test_terminal git status --porcelain | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 49 - status --porcelain ignores color.status
+
+expecting success of 7508.50 'status --porcelain respects -b': 
+
+	git status --porcelain -b >output &&
 	{
-		cat file.orig &&
-		echo
-	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
-	echo "incomplete" | tr -d "\\012" >>file &&
-	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
-	git commit -a -m "edit"
+		echo "## main...upstream [ahead 1, behind 2]" &&
+		cat expect
+	} >tmp &&
+	mv tmp expect &&
+	test_cmp expect output
 
-[branch2 96588b8] edit
- Author: D <D@test.git>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 26 - setup edits
 
-expecting success of 8002.27 'blame edits': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+ok 50 - status --porcelain respects -b
 
-git blame -c  file 
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 27 - blame edits
+expecting success of 7508.51 'status without relative paths': 
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.28 'setup obfuscated email': 
-	echo "No robots allowed" >file.new &&
-	cat file >>file.new &&
-	mv file.new file &&
-	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
-	git commit -a -m "norobots"
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
 
-[branch2 04f7693] norobots
- Author: E <E at test dot git>
- 1 file changed, 1 insertion(+)
-ok 28 - setup obfuscated email
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.29 'blame obfuscated email': 
-	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-git blame -c  file 
-Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 29 - blame obfuscated email
+EOF
+	test_config status.relativePaths false &&
+	(cd dir1 && git status) >output &&
+	test_cmp expect output
 
-expecting success of 8002.30 'blame -L 1 (all)': 
-	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
-git blame -c  -L1 file 
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 30 - blame -L 1 (all)
+ok 51 - status without relative paths
 
-expecting success of 8002.31 'blame -L , (all)': 
-	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7508.52 'status -s without relative paths': 
 
-git blame -c  -L, file 
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 31 - blame -L , (all)
+	test_config status.relativePaths false &&
+	(cd dir1 && git status -s) >output &&
+	test_cmp expect output
 
-expecting success of 8002.32 'blame -L X (X to end)': 
-	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
 
-git blame -c  -L5 file 
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 32 - blame -L X (X to end)
+ok 52 - status -s without relative paths
 
-expecting success of 8002.33 'blame -L X, (X to end)': 
-	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+expecting success of 7508.53 'status -s without relative paths': 
+	test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
+	>"file with spaces" &&
+	>"file with spaces 2" &&
+	>"expect with spaces" &&
+	git add "file with spaces" &&
 
-git blame -c  -L5, file 
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 33 - blame -L X, (X to end)
+	git status -s >output &&
+	test_cmp expect output &&
 
-expecting success of 8002.34 'blame -L ,Y (up to Y)': 
-	check_count -L,3 A 1 B2 1 E 1
+	git status -s --ignored >output &&
+	grep "^!! \"expect with spaces\"$" output &&
+	grep -v "^!! " output >output-wo-ignored &&
+	test_cmp expect output-wo-ignored
 
-git blame -c  -L,3 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 34 - blame -L ,Y (up to Y)
+!! "expect with spaces"
+rm 'file with spaces'
+ok 53 - status -s without relative paths
 
-expecting success of 8002.35 'blame -L X,X': 
-	check_count -L3,3 B2 1
+expecting success of 7508.54 'dry-run of partial commit excluding new file in index': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
 
-git blame -c  -L3,3 file 
-Author B2 (expected 1, attributed 1) good
-ok 35 - blame -L X,X
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   dir1/modified
 
-expecting success of 8002.36 'blame -L X,Y': 
-	check_count -L3,6 B 1 B1 1 B2 1 D 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/
+	untracked
 
-git blame -c  -L3,6 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 36 - blame -L X,Y
+EOF
+	git commit --dry-run dir1/modified >output &&
+	test_cmp expect output
 
-expecting success of 8002.37 'blame -L Y,X (undocumented)': 
-	check_count -L6,3 B 1 B1 1 B2 1 D 1
+ok 54 - dry-run of partial commit excluding new file in index
 
-git blame -c  -L6,3 file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 37 - blame -L Y,X (undocumented)
+expecting success of 7508.55 'status refreshes the index': 
+	touch dir2/added &&
+	git status &&
+	git diff-files >output &&
+	test_cmp expect output
 
-expecting success of 8002.38 'blame -L -X': 
-	test_must_fail $PROG -L-1 file
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-fatal: -L invalid line number: -1
-ok 38 - blame -L -X
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
 
-expecting success of 8002.39 'blame -L 0': 
-	test_must_fail $PROG -L0 file
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-fatal: -L invalid line number: 0
-ok 39 - blame -L 0
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.40 'blame -L ,0': 
-	test_must_fail $PROG -L,0 file
+ok 55 - status refreshes the index
 
-fatal: -L invalid line number: 0
-ok 40 - blame -L ,0
+expecting success of 7508.56 'status shows detached HEAD properly after checking out non-local upstream branch': 
+	test_when_finished rm -rf upstream downstream actual &&
 
-expecting success of 8002.41 'blame -L ,+0': 
-	test_must_fail $PROG -L,+0 file
+	test_create_repo upstream &&
+	test_commit -C upstream foo &&
 
-fatal: -L invalid empty range
-ok 41 - blame -L ,+0
+	git clone upstream downstream &&
+	git -C downstream checkout @{u} &&
+	git -C downstream status >actual &&
+	grep -E "HEAD detached at [0-9a-f]+" actual
 
-expecting success of 8002.42 'blame -L X,+0': 
-	test_must_fail $PROG -L1,+0 file
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/upstream/.git/
+[master (root-commit) f80cabb] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'downstream'...
+done.
+Note: switching to '@{u}'.
 
-fatal: -L invalid empty range
-ok 42 - blame -L X,+0
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 8002.43 'blame -L X,+1': 
-	check_count -L3,+1 B2 1
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-git blame -c  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 43 - blame -L X,+1
+  git switch -c <new-branch-name>
 
-expecting success of 8002.44 'blame -L X,+N': 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+Or undo this operation with:
 
-git blame -c  -L3,+4 file 
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 44 - blame -L X,+N
+  git switch -
 
-expecting success of 8002.45 'blame -L ,-0': 
-	test_must_fail $PROG -L,-0 file
+Turn off this advice by setting config variable advice.detachedHead to false
 
-fatal: -L invalid empty range
-ok 45 - blame -L ,-0
+HEAD is now at f80cabb foo
+HEAD detached at f80cabb
+ok 56 - status shows detached HEAD properly after checking out non-local upstream branch
 
-expecting success of 8002.46 'blame -L X,-0': 
-	test_must_fail $PROG -L1,-0 file
+expecting success of 7508.57 'setup status submodule summary': 
+	test_create_repo sm && (
+		cd sm &&
+		>foo &&
+		git add foo &&
+		git commit -m "Add foo"
+	) &&
+	git add sm
 
-fatal: -L invalid empty range
-ok 46 - blame -L X,-0
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/sm/.git/
+[master (root-commit) a2af2f1] Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+warning: adding embedded git repository: sm
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config set advice.addEmbeddedRepo false"
+ok 57 - setup status submodule summary
 
-expecting success of 8002.47 'blame -L X,-1': 
-	check_count -L3,-1 B2 1
+expecting success of 7508.58 'status submodule summary is disabled by default': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-git blame -c  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 47 - blame -L X,-1
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
 
-expecting success of 8002.48 'blame -L X,-N': 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-git blame -c  -L6,-4 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 48 - blame -L X,-N
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.49 'blame -L /RE/ (RE to end)': 
-	check_count -L/evil/ C 1 "A U Thor" 1
+EOF
+	git status >output &&
+	test_cmp expect output
 
-git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 49 - blame -L /RE/ (RE to end)
+ok 58 - status submodule summary is disabled by default
 
-expecting success of 8002.50 'blame -L /RE/,/RE2/': 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+expecting success of 7508.59 'status --untracked-files=all does not show submodule': 
+	git status --untracked-files=all >output &&
+	test_cmp expect output
 
-git blame -c  -L/robot/,/green/ file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 50 - blame -L /RE/,/RE2/
+ok 59 - status --untracked-files=all does not show submodule
 
-expecting success of 8002.51 'blame -L X,/RE/': 
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+expecting success of 7508.60 'status -s submodule summary is disabled by default': 
+	git status -s >output &&
+	test_cmp expect output
 
-git blame -c  -L5,/evil/ file 
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 51 - blame -L X,/RE/
+ok 60 - status -s submodule summary is disabled by default
 
-expecting success of 8002.52 'blame -L /RE/,Y': 
-	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+expecting success of 7508.61 'status -s --untracked-files=all does not show submodule': 
+	git status -s --untracked-files=all >output &&
+	test_cmp expect output
 
-git blame -c  -L/99/,7 file 
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 52 - blame -L /RE/,Y
+ok 61 - status -s --untracked-files=all does not show submodule
 
-expecting success of 8002.53 'blame -L /RE/,+N': 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+expecting success of 7508.62 'status submodule summary': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-git blame -c  -L/99/,+3 file 
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 53 - blame -L /RE/,+N
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
 
-expecting success of 8002.54 'blame -L /RE/,-N': 
-	check_count -L/99/,-3 B 1 B2 1 D 1
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-git blame -c  -L/99/,-3 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 54 - blame -L /RE/,-N
+Submodule changes to be committed:
 
-expecting success of 8002.55 'blame -L X (X == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
+* sm 0000000...$head (1):
+  > Add foo
 
-git blame -c  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 55 - blame -L X (X == nlines)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.56 'blame -L X (X == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	test_must_fail $PROG -L$n file
+EOF
+	git config status.submodulesummary 10 &&
+	git status >output &&
+	test_cmp expect output
 
-fatal: file file has only 8 lines
-ok 56 - blame -L X (X == nlines + 1)
+ok 62 - status submodule summary
 
-expecting success of 8002.57 'blame -L X (X > nlines)': 
-	test_must_fail $PROG -L12345 file
+expecting success of 7508.63 'status submodule summary with status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	git -c status.displayCommentPrefix=false status >output &&
+	test_cmp expect output
 
-fatal: file file has only 8 lines
-ok 57 - blame -L X (X > nlines)
+ok 63 - status submodule summary with status.displayCommentPrefix=false
 
-expecting success of 8002.58 'blame -L ,Y (Y == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7508.64 'commit with submodule summary ignores status.displayCommentPrefix': 
+	commit_template_commented
 
-git blame -c  -L,8 file 
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 58 - blame -L ,Y (Y == nlines)
+Aborting commit due to empty commit message.
+ok 64 - commit with submodule summary ignores status.displayCommentPrefix
 
-expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7508.65 'status -s submodule summary': 
+	git status -s >output &&
+	test_cmp expect output
 
-git blame -c  -L,9 file 
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 59 - blame -L ,Y (Y == nlines + 1)
+ok 65 - status -s submodule summary
 
-expecting success of 8002.60 'blame -L ,Y (Y > nlines)': 
-	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+expecting success of 7508.66 'status submodule summary (clean submodule): commit': 
+	cat >expect-status <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-git blame -c  -L,12345 file 
-Author B (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 60 - blame -L ,Y (Y > nlines)
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.61 'blame -L multiple (disjoint)': 
-	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-git blame -c  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 61 - blame -L multiple (disjoint)
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	sed "/git pull/d" expect-status > expect-commit &&
+	git commit -m "commit submodule" &&
+	git config status.submodulesummary 10 &&
+	test_must_fail git commit --dry-run >output &&
+	test_cmp expect-commit output &&
+	git status >output &&
+	test_cmp expect-status output
 
-expecting success of 8002.62 'blame -L multiple (disjoint: unordered)': 
-	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
+[main 49f874e] commit submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir2/added
+ create mode 160000 sm
+ok 66 - status submodule summary (clean submodule): commit
 
-git blame -c  -L6,7 -L2,3 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 62 - blame -L multiple (disjoint: unordered)
+expecting success of 7508.67 'status -s submodule summary (clean submodule)': 
+	git status -s >output &&
+	test_cmp expect output
 
-expecting success of 8002.63 'blame -L multiple (adjacent)': 
-	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+ok 67 - status -s submodule summary (clean submodule)
 
-git blame -c  -L2,3 -L4,5 file 
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 63 - blame -L multiple (adjacent)
+expecting success of 7508.68 'status -z implies porcelain': 
+	git status --porcelain |
+	perl -pe "s/\012/\000/g" >expect &&
+	git status -z >output &&
+	test_cmp expect output
 
-expecting success of 8002.64 'blame -L multiple (adjacent: unordered)': 
-	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+ok 68 - status -z implies porcelain
 
-git blame -c  -L4,5 -L2,3 file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 64 - blame -L multiple (adjacent: unordered)
+expecting success of 7508.69 'commit --dry-run submodule summary (--amend)': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
 
-expecting success of 8002.65 'blame -L multiple (overlapping)': 
-	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
+Changes to be committed:
+  (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
 
-git blame -c  -L2,4 -L3,5 file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 65 - blame -L multiple (overlapping)
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.66 'blame -L multiple (overlapping: unordered)': 
-	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+Submodule changes to be committed:
 
-git blame -c  -L3,5 -L2,4 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 66 - blame -L multiple (overlapping: unordered)
+* sm 0000000...$head (1):
+  > Add foo
 
-expecting success of 8002.67 'blame -L multiple (superset/subset)': 
-	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-git blame -c  -L2,8 -L3,5 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 67 - blame -L multiple (superset/subset)
+EOF
+	git config status.submodulesummary 10 &&
+	git commit --dry-run --amend >output &&
+	test_cmp expect output
 
-expecting success of 8002.68 'blame -L multiple (superset/subset: unordered)': 
-	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+ok 69 - commit --dry-run submodule summary (--amend)
 
-git blame -c  -L3,5 -L2,8 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-ok 68 - blame -L multiple (superset/subset: unordered)
+checking prerequisite: SANITY
 
-expecting success of 8002.69 'blame -L /RE/ (relative)': 
-	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-git blame -c  -L3,3 -L/fox/ file 
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 69 - blame -L /RE/ (relative)
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
+
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
+
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
+
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 7508.70 'status succeeds in a read-only repository': 
+	test_when_finished "chmod 775 .git" &&
+	(
+		chmod a-w .git &&
+		# make dir1/tracked stat-dirty
+		>dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
+		git status -s >output &&
+		! grep dir1/tracked output &&
+		# make sure "status" succeeded without writing index out
+		git diff-files | grep dir1/tracked
+	)
+
+:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M	dir1/tracked
+ok 70 - status succeeds in a read-only repository
+
+expecting success of 7508.71 '--ignore-submodules=untracked suppresses submodules with untracked content': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Submodule changes to be committed:
+
+* sm $head...$new_head (1):
+  > Add bar
 
-expecting success of 8002.70 'blame -L /RE/ (relative: no preceding range)': 
-	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-git blame -c  -L/dog/ file 
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 70 - blame -L /RE/ (relative: no preceding range)
+EOF
+	echo modified  sm/untracked &&
+	git status --ignore-submodules=untracked >output &&
+	test_cmp expect output
 
-expecting success of 8002.71 'blame -L /RE/ (relative: adjacent)': 
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
+modified sm/untracked
+ok 71 - --ignore-submodules=untracked suppresses submodules with untracked content
 
-git blame -c  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-ok 71 - blame -L /RE/ (relative: adjacent)
+expecting success of 7508.72 '.gitmodules ignore=untracked suppresses submodules with untracked content': 
+	test_config diff.ignoreSubmodules dirty &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.72 'blame -L /RE/ (relative: not found)': 
-	test_must_fail $PROG -L4,4 -L/dog/ file
+ok 72 - .gitmodules ignore=untracked suppresses submodules with untracked content
 
-fatal: -L parameter 'dog' starting at line 5: No match
-ok 72 - blame -L /RE/ (relative: not found)
+expecting success of 7508.73 '.git/config ignore=untracked suppresses submodules with untracked content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname
 
-expecting success of 8002.73 'blame -L /RE/ (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L/$/ file
+ok 73 - .git/config ignore=untracked suppresses submodules with untracked content
 
-fatal: file file has only 8 lines
-ok 73 - blame -L /RE/ (relative: end-of-file)
+expecting success of 7508.74 '--ignore-submodules=dirty suppresses submodules with untracked content': 
+	git status --ignore-submodules=dirty >output &&
+	test_cmp expect output
 
-expecting success of 8002.74 'blame -L ^/RE/ (absolute)': 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+ok 74 - --ignore-submodules=dirty suppresses submodules with untracked content
 
-git blame -c  -L3,3 -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 74 - blame -L ^/RE/ (absolute)
+expecting success of 7508.75 '.gitmodules ignore=dirty suppresses submodules with untracked content': 
+	test_config diff.ignoreSubmodules dirty &&
+	git status >output &&
+	! test -s actual &&
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.75 'blame -L ^/RE/ (absolute: no preceding range)': 
-	check_count -L^/dog/,+2 A 1 B2 1
+ok 75 - .gitmodules ignore=dirty suppresses submodules with untracked content
 
-git blame -c  -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+expecting success of 7508.76 '.git/config ignore=dirty suppresses submodules with untracked content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.76 'blame -L ^/RE/ (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+ok 76 - .git/config ignore=dirty suppresses submodules with untracked content
 
-fatal: -L parameter 'tambourine' starting at line 1: No match
-ok 76 - blame -L ^/RE/ (absolute: not found)
+expecting success of 7508.77 '--ignore-submodules=dirty suppresses submodules with modified content': 
+	echo modified >sm/foo &&
+	git status --ignore-submodules=dirty >output &&
+	test_cmp expect output
 
-expecting success of 8002.77 'blame -L ^/RE/ (absolute: end-of-file)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+ok 77 - --ignore-submodules=dirty suppresses submodules with modified content
 
-git blame -c  -L8 -L^/$/,+2 file 
-Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+expecting success of 7508.78 '.gitmodules ignore=dirty suppresses submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.78 'setup -L :regex': 
-	tr Q "\\t" >hello.c <<-\EOF &&
-	int main(int argc, const char *argv[])
-	{
-	Qputs("hello");
-	}
-	EOF
-	git add hello.c &&
-	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
-	git commit -m "hello" &&
+ok 78 - .gitmodules ignore=dirty suppresses submodules with modified content
 
-	mv hello.c hello.orig &&
-	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
-	tr Q "\\t" >hello.c &&
-	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
-	git commit -a -m "goodbye" &&
+expecting success of 7508.79 '.git/config ignore=dirty suppresses submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-	mv hello.c hello.orig &&
-	echo "#include <stdio.h>" >hello.c &&
-	cat hello.orig >>hello.c &&
-	tr Q "\\t" >>hello.c <<-\EOF &&
-	void mail()
-	{
-	Qputs("mail");
-	}
-	EOF
-	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
-	git commit -a -m "mail"
+ok 79 - .git/config ignore=dirty suppresses submodules with modified content
 
-[branch2 f82005e] hello
- Author: F <F@test.git>
- 1 file changed, 4 insertions(+)
- create mode 100644 hello.c
-[branch2 edbab84] goodbye
- Author: G <G@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 846166b] mail
- Author: H <H@test.git>
- 1 file changed, 5 insertions(+)
-ok 78 - setup -L :regex
+expecting success of 7508.80 '--ignore-submodules=untracked doesn't suppress submodules with modified content': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.79 'blame -L :literal': 
-	check_count -f hello.c -L:main F 4 G 1
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-git blame -c  -L:main hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 79 - blame -L :literal
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+  (commit or discard the untracked or modified content in submodules)
+	modified:   dir1/modified
+	modified:   sm (modified content)
 
-expecting success of 8002.80 'blame -L :regex': 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+Submodule changes to be committed:
 
-git blame -c  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 80 - blame -L :regex
+* sm $head...$new_head (1):
+  > Add bar
 
-expecting success of 8002.81 'blame -L :nomatch': 
-	test_must_fail $PROG -L:nomatch hello.c
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-fatal: -L parameter 'nomatch' starting at line 1: no match
-ok 81 - blame -L :nomatch
+EOF
+	git status --ignore-submodules=untracked > output &&
+	test_cmp expect output
 
-expecting success of 8002.82 'blame -L :RE (relative)': 
-	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+ok 80 - --ignore-submodules=untracked doesn't suppress submodules with modified content
 
-git blame -c  -L3,3 -L:ma.. hello.c 
-Author F (expected 1, attributed 1) good
-Author H (expected 4, attributed 4) good
-ok 82 - blame -L :RE (relative)
+expecting success of 7508.81 '.gitmodules ignore=untracked doesn't suppress submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.83 'blame -L :RE (relative: no preceding range)': 
-	check_count -f hello.c -L:ma.. F 4 G 1
+ok 81 - .gitmodules ignore=untracked doesn't suppress submodules with modified content
 
-git blame -c  -L:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 83 - blame -L :RE (relative: no preceding range)
+expecting success of 7508.82 '.git/config ignore=untracked doesn't suppress submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.84 'blame -L :RE (relative: not found)': 
-	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+ok 82 - .git/config ignore=untracked doesn't suppress submodules with modified content
 
-fatal: -L parameter 'tambourine' starting at line 4: no match
-ok 84 - blame -L :RE (relative: not found)
+expecting success of 7508.83 '--ignore-submodules=untracked doesn't suppress submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.85 'blame -L :RE (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L:main hello.c
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-fatal: -L parameter 'main' starting at line 11: no match
-ok 85 - blame -L :RE (relative: end-of-file)
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+	modified:   sm (new commits)
 
-expecting success of 8002.86 'blame -L ^:RE (absolute)': 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+Submodule changes to be committed:
 
-git blame -c  -L3,3 -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 86 - blame -L ^:RE (absolute)
+* sm $head...$new_head (1):
+  > Add bar
 
-expecting success of 8002.87 'blame -L ^:RE (absolute: no preceding range)': 
-	check_count -f hello.c -L^:ma.. F 4 G 1
+Submodules changed but not updated:
 
-git blame -c  -L^:ma.. hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 87 - blame -L ^:RE (absolute: no preceding range)
+* sm $new_head...$head2 (1):
+  > 2nd commit
 
-expecting success of 8002.88 'blame -L ^:RE (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-fatal: -L parameter 'tambourine' starting at line 1: no match
-ok 88 - blame -L ^:RE (absolute: not found)
+EOF
+	git status --ignore-submodules=untracked > output &&
+	test_cmp expect output
 
-expecting success of 8002.89 'blame -L ^:RE (absolute: end-of-file)': 
-	n=$(printf "%d" $(wc -l <hello.c)) &&
-	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+ok 83 - --ignore-submodules=untracked doesn't suppress submodule summary
 
-git blame -c  -L10 -L^:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-Author H (expected 1, attributed 1) good
-ok 89 - blame -L ^:RE (absolute: end-of-file)
+expecting success of 7508.84 '.gitmodules ignore=untracked doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.90 'blame -L :funcname with userdiff driver': 
-	cat >file.template <<-\EOF &&
-	DO NOT MATCH THIS LINE
-	function RIGHT(a, b) result(c)
-	AS THE DEFAULT DRIVER WOULD
+ok 84 - .gitmodules ignore=untracked doesn't suppress submodule summary
 
-	integer, intent(in) :: ChangeMe
-	EOF
+expecting success of 7508.85 '.git/config ignore=untracked doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-	fortran_file=file.f03 &&
-	test_when_finished "rm .gitattributes" &&
-	echo "$fortran_file diff=fortran" >.gitattributes &&
+ok 85 - .git/config ignore=untracked doesn't suppress submodule summary
 
-	test_commit --author "A <A@test.git>" \
-		"add" "$fortran_file" \
-		"$(cat file.template)" &&
-	test_commit --author "B <B@test.git>" \
-		"change" "$fortran_file" \
-		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
-	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
+expecting success of 7508.86 '--ignore-submodules=dirty doesn't suppress submodule summary': 
+	git status --ignore-submodules=dirty > output &&
+	test_cmp expect output
 
-[branch2 6b1b7a1] add
- Author: A <A@test.git>
- 1 file changed, 5 insertions(+)
- create mode 100644 file.f03
-[branch2 7caa17d] change
- Author: B <B@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-git blame -c  -L:RIGHT file.f03 
-Author A (expected 3, attributed 3) good
-Author B (expected 1, attributed 1) good
-ok 90 - blame -L :funcname with userdiff driver
+ok 86 - --ignore-submodules=dirty doesn't suppress submodule summary
 
-expecting success of 8002.91 'setup incremental': 
-	(
-	GIT_AUTHOR_NAME=I &&
-	export GIT_AUTHOR_NAME &&
-	GIT_AUTHOR_EMAIL=I@test.git &&
-	export GIT_AUTHOR_EMAIL &&
-	>incremental &&
-	git add incremental &&
-	git commit -m "step 0" &&
-	printf "partial" >>incremental &&
-	git commit -a -m "step 0.5" &&
-	echo >>incremental &&
-	git commit -a -m "step 1"
-	)
+expecting success of 7508.87 '.gitmodules ignore=dirty doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-[branch2 6c56eef] step 0
- Author: I <I@test.git>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 incremental
-[branch2 c79b19e] step 0.5
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+)
-[branch2 f65a7a7] step 1
- Author: I <I@test.git>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 91 - setup incremental
+ok 87 - .gitmodules ignore=dirty doesn't suppress submodule summary
 
-expecting success of 8002.92 'blame empty': 
-	check_count -h HEAD^^ -f incremental
+expecting success of 7508.88 '.git/config ignore=dirty doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-git blame -c  incremental HEAD^^
-ok 92 - blame empty
+ok 88 - .git/config ignore=dirty doesn't suppress submodule summary
 
-expecting success of 8002.93 'blame -L 0 empty': 
-	test_must_fail $PROG -L0 incremental HEAD^^
+expecting success of 7508.89 'status (core.commentchar with submodule summary)': 
+	test_config core.commentchar ";" &&
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect output
 
-fatal: -L invalid line number: 0
-ok 93 - blame -L 0 empty
+ok 89 - status (core.commentchar with submodule summary)
 
-expecting success of 8002.94 'blame -L 1 empty': 
-	test_must_fail $PROG -L1 incremental HEAD^^
+expecting success of 7508.90 'status (core.commentchar with two chars with submodule summary)': 
+	test_config core.commentchar ";;" &&
+	sed "s/^/;/" <expect >expect.double &&
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect.double output
 
-fatal: file incremental has only 0 lines
-ok 94 - blame -L 1 empty
+ok 90 - status (core.commentchar with two chars with submodule summary)
 
-expecting success of 8002.95 'blame -L 2 empty': 
-	test_must_fail $PROG -L2 incremental HEAD^^
+expecting success of 7508.91 '--ignore-submodules=all suppresses submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-fatal: file incremental has only 0 lines
-ok 95 - blame -L 2 empty
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.96 'blame half': 
-	check_count -h HEAD^ -f incremental I 1
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-git blame -c  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 96 - blame half
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --ignore-submodules=all > output &&
+	test_cmp expect output
 
-expecting success of 8002.97 'blame -L 0 half': 
-	test_must_fail $PROG -L0 incremental HEAD^
+ok 91 - --ignore-submodules=all suppresses submodule summary
 
-fatal: -L invalid line number: 0
-ok 97 - blame -L 0 half
+expecting success of 7508.92 '.gitmodules ignore=all suppresses unstaged submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-expecting success of 8002.98 'blame -L 1 half': 
-	check_count -h HEAD^ -f incremental -L1 I 1
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-git blame -c  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 98 - blame -L 1 half
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-expecting success of 8002.99 'blame -L 2 half': 
-	test_must_fail $PROG -L2 incremental HEAD^
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-fatal: file incremental has only 1 line
-ok 99 - blame -L 2 half
+EOF
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status > output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.100 'blame -L 3 half': 
-	test_must_fail $PROG -L3 incremental HEAD^
+ok 92 - .gitmodules ignore=all suppresses unstaged submodule summary
 
-fatal: file incremental has only 1 line
-ok 100 - blame -L 3 half
+expecting success of 7508.93 '.git/config ignore=all suppresses unstaged submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore all &&
+	git config --add submodule.subname.path sm &&
+	git status > output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.101 'blame full': 
-	check_count -f incremental I 1
+ok 93 - .git/config ignore=all suppresses unstaged submodule summary
 
-git blame -c  incremental 
-Author I (expected 1, attributed 1) good
-ok 101 - blame full
+expecting success of 7508.94 'setup of test environment': 
+	git config status.showUntrackedFiles no &&
+	git status -s >expected_short &&
+	git status --no-short >expected_noshort
 
-expecting success of 8002.102 'blame -L 0 full': 
-	test_must_fail $PROG -L0 incremental
+ok 94 - setup of test environment
 
-fatal: -L invalid line number: 0
-ok 102 - blame -L 0 full
+expecting success of 7508.95 '"status.short=true" same as "-s"': 
+	git -c status.short=true status >actual &&
+	test_cmp expected_short actual
 
-expecting success of 8002.103 'blame -L 1 full': 
-	check_count -f incremental -L1 I 1
+ok 95 - "status.short=true" same as "-s"
 
-git blame -c  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 103 - blame -L 1 full
+expecting success of 7508.96 '"status.short=true" weaker than "--no-short"': 
+	git -c status.short=true status --no-short >actual &&
+	test_cmp expected_noshort actual
 
-expecting success of 8002.104 'blame -L 2 full': 
-	test_must_fail $PROG -L2 incremental
+ok 96 - "status.short=true" weaker than "--no-short"
 
-fatal: file incremental has only 1 line
-ok 104 - blame -L 2 full
+expecting success of 7508.97 '"status.short=false" same as "--no-short"': 
+	git -c status.short=false status >actual &&
+	test_cmp expected_noshort actual
 
-expecting success of 8002.105 'blame -L 3 full': 
-	test_must_fail $PROG -L3 incremental
+ok 97 - "status.short=false" same as "--no-short"
 
-fatal: file incremental has only 1 line
-ok 105 - blame -L 3 full
+expecting success of 7508.98 '"status.short=false" weaker than "-s"': 
+	git -c status.short=false status -s >actual &&
+	test_cmp expected_short actual
 
-expecting success of 8002.106 'blame -L': 
-	test_must_fail $PROG -L file
+ok 98 - "status.short=false" weaker than "-s"
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+expecting success of 7508.99 '"status.branch=true" same as "-b"': 
+	git status -sb >expected_branch &&
+	git -c status.branch=true status -s >actual &&
+	test_cmp expected_branch actual
 
-    <rev-opts> are documented in git-rev-list(1)
+ok 99 - "status.branch=true" same as "-b"
 
-    --[no-]incremental    show blame entries as we find them, incrementally
-    -b                    do not show object names of boundary commits (Default: off)
-    --[no-]root           do not treat root commits as boundaries (Default: off)
-    --[no-]show-stats     show work cost statistics
-    --[no-]progress       force progress reporting
-    --[no-]score-debug    show output score for blame entries
-    -f, --[no-]show-name  show original filename (Default: auto)
-    -n, --[no-]show-number
-                          show original linenumber (Default: off)
-    -p, --[no-]porcelain  show in a format designed for machine consumption
-    --[no-]line-porcelain show porcelain format with per-line commit information
-    -c                    use the same output mode as git-annotate (Default: off)
-    -t                    show raw timestamp (Default: off)
-    -l                    show long commit SHA1 (Default: off)
-    -s                    suppress author name and timestamp (Default: off)
-    -e, --[no-]show-email show author email instead of name (Default: off)
-    -w                    ignore whitespace differences
-    --[no-]ignore-rev <rev>
-                          ignore <rev> when blaming
-    --[no-]ignore-revs-file <file>
-                          ignore revisions from <file>
-    --[no-]color-lines    color redundant metadata from previous line differently
-    --[no-]color-by-age   color lines by age
-    --[no-]minimal        spend extra cycles to find better match
-    -S <file>             use revisions from <file> instead of calling git-rev-list
-    --[no-]contents <file>
-                          use <file>'s contents as the final image
-    -C[<score>]           find line copies within and across files
-    -M[<score>]           find line movements within and across files
-    -L <range>            process only line range <start>,<end> or function :<funcname>
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+expecting success of 7508.100 '"status.branch=true" different from "--no-branch"': 
+	git status -s --no-branch  >expected_nobranch &&
+	git -c status.branch=true status -s >actual &&
+	! test_cmp expected_nobranch actual
 
-ok 106 - blame -L
+--- expected_nobranch	2025-03-17 13:28:59.347605765 +0000
++++ actual	2025-03-17 13:28:59.387606018 +0000
+@@ -1,2 +1,3 @@
++## main...upstream [ahead 2, behind 2]
+  M dir1/modified
+ MM sm
+ok 100 - "status.branch=true" different from "--no-branch"
 
-expecting success of 8002.107 'blame -L X,+': 
-	test_must_fail $PROG -L1,+ file
+expecting success of 7508.101 '"status.branch=true" weaker than "--no-branch"': 
+	git -c status.branch=true status -s --no-branch >actual &&
+	test_cmp expected_nobranch actual
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 107 - blame -L X,+
+ok 101 - "status.branch=true" weaker than "--no-branch"
 
-expecting success of 8002.108 'blame -L X,-': 
-	test_must_fail $PROG -L1,- file
+expecting success of 7508.102 '"status.branch=true" weaker than "--porcelain"': 
+	git -c status.branch=true status --porcelain >actual &&
+	test_cmp expected_nobranch actual
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 108 - blame -L X,-
+ok 102 - "status.branch=true" weaker than "--porcelain"
 
-expecting success of 8002.109 'blame -L X (non-numeric X)': 
-	test_must_fail $PROG -LX file
+expecting success of 7508.103 '"status.branch=false" same as "--no-branch"': 
+	git -c status.branch=false status -s >actual &&
+	test_cmp expected_nobranch actual
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 109 - blame -L X (non-numeric X)
+ok 103 - "status.branch=false" same as "--no-branch"
 
-expecting success of 8002.110 'blame -L X,Y (non-numeric Y)': 
-	test_must_fail $PROG -L1,Y file
+expecting success of 7508.104 '"status.branch=false" weaker than "-b"': 
+	git -c status.branch=false status -sb >actual &&
+	test_cmp expected_branch actual
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 110 - blame -L X,Y (non-numeric Y)
+ok 104 - "status.branch=false" weaker than "-b"
 
-expecting success of 8002.111 'blame -L X,+N (non-numeric N)': 
-	test_must_fail $PROG -L1,+N file
+expecting success of 7508.105 'Restore default test environment': 
+	git config --unset status.showUntrackedFiles
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 111 - blame -L X,+N (non-numeric N)
+ok 105 - Restore default test environment
 
-expecting success of 8002.112 'blame -L X,-N (non-numeric N)': 
-	test_must_fail $PROG -L1,-N file
+expecting success of 7508.106 'git commit will commit a staged but ignored submodule': 
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore all &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep "^M. sm" output &&
+	GIT_EDITOR="echo hello >>\"\$1\"" &&
+	export GIT_EDITOR &&
+	git commit -uno &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep ! "^M. sm" output
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 112 - blame -L X,-N (non-numeric N)
+MM sm
+[main 51a9b42] hello /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/.git/COMMIT_EDITMSG
+ Author: A U Thor <author@example.com>
+ok 106 - git commit will commit a staged but ignored submodule
 
-expecting success of 8002.113 'blame -L ,^/RE/': 
-	test_must_fail $PROG -L1,^/99/ file
+expecting success of 7508.107 'git commit --dry-run will show a staged but ignored submodule': 
+	git reset HEAD^ &&
+	git add sm &&
+	cat >expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
 
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 113 - blame -L ,^/RE/
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-expecting success of 8002.114 'blame progress on a full file': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (10/10), done.
-	EOF
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress hello.c 2>stderr &&
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git commit -uno --dry-run >output &&
+	test_cmp expect output &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep "^M. sm" output
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+Unstaged changes after reset:
+M	dir1/modified
+M	sm
+M  sm
+ok 107 - git commit --dry-run will show a staged but ignored submodule
 
-846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
-f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 114 - blame progress on a full file
+expecting success of 7508.108 'git commit -m will commit a staged but ignored submodule': 
+	git commit -uno -m message &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep ! "^M. sm" output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 8002.115 'blame progress on a single range': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (4/4), done.
-	EOF
+[main 45c17dd] message
+ Author: A U Thor <author@example.com>
+ok 108 - git commit -m will commit a staged but ignored submodule
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 hello.c 2>stderr &&
+expecting success of 7508.109 'show stash info with "--show-stash"': 
+	git reset --hard &&
+	git stash clear &&
+	echo 1 >file &&
+	git add file &&
+	git stash &&
+	git status >expected_default &&
+	git status --show-stash >expected_with_stash &&
+	test_grep "^Your stash currently has 1 entry$" expected_with_stash
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+HEAD is now at 45c17dd message
+Saved working directory and index state WIP on main: 45c17dd message
+Your stash currently has 1 entry
+ok 109 - show stash info with "--show-stash"
 
-f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
-ok 115 - blame progress on a single range
+expecting success of 7508.110 'no stash info with "--show-stash --no-show-stash"': 
+	git status --show-stash --no-show-stash >expected_without_stash &&
+	test_cmp expected_default expected_without_stash
 
-expecting success of 8002.116 'blame progress on multiple ranges': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (7/7), done.
-	EOF
+ok 110 - no stash info with "--show-stash --no-show-stash"
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+expecting success of 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
+	git -c status.showStash=false status --show-stash >actual &&
+	test_cmp expected_with_stash actual
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+ok 111 - "status.showStash=false" weaker than "--show-stash"
 
-f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
-f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
-edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
-f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
-846166ba (H 2005-04-07 15:42:13 -0700  8) {
-846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
-846166ba (H 2005-04-07 15:42:13 -0700 10) }
-ok 116 - blame progress on multiple ranges
+expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
+	git -c status.showStash=true status --no-show-stash >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 8002.117 'setup': 
-	hexsz=$(test_oid hexsz)
+ok 112 - "status.showStash=true" weaker than "--no-show-stash"
 
-ok 117 - setup
+expecting success of 7508.113 'no additional info if no stash entries': 
+	git stash clear &&
+	git -c status.showStash=true status >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 8002.118 'blame untracked file in empty repo': 
-	>untracked &&
-	test_must_fail git blame untracked
+ok 113 - no additional info if no stash entries
 
-fatal: no such path 'untracked' in HEAD
-ok 118 - blame untracked file in empty repo
+expecting success of 7508.114 '"No commits yet" should be noted in status output': 
+	git checkout --orphan empty-branch-1 &&
+	git status >output &&
+	test_grep "No commits yet" output
 
-expecting success of 8002.119 'blame --show-email': 
-	check_count \
-		"<A@test.git>" 1 \
-		"<B@test.git>" 1 \
-		"<B1@test.git>" 1 \
-		"<B2@test.git>" 1 \
-		"<author@example.com>" 1 \
-		"<C@test.git>" 1 \
-		"<D@test.git>" 1 \
-		"<E at test dot git>" 1
+Switched to a new branch 'empty-branch-1'
+No commits yet
+ok 114 - "No commits yet" should be noted in status output
 
-git blame -c -e  file 
-Author <A@test.git> (expected 1, attributed 1) good
-Author <B2@test.git> (expected 1, attributed 1) good
-Author <author@example.com> (expected 1, attributed 1) good
-Author <C@test.git> (expected 1, attributed 1) good
-Author <B@test.git> (expected 1, attributed 1) good
-Author <E at test dot git> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
-Author <D@test.git> (expected 1, attributed 1) good
-ok 119 - blame --show-email
+expecting success of 7508.115 '"No commits yet" should not be noted in status output': 
+	git checkout --orphan empty-branch-2 &&
+	test_commit test-commit-1 &&
+	git status >output &&
+	test_grep ! "No commits yet" output
 
-expecting success of 8002.120 'setup showEmail tests': 
-	echo "bin: test number 1" >one &&
-	git add one &&
-	GIT_AUTHOR_NAME=name1 \
-	GIT_AUTHOR_EMAIL=email1@test.git \
-	git commit -m First --date="2010-01-01 01:00:00" &&
-	cat >expected_n <<-\EOF &&
-	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
-	cat >expected_e <<-\EOF
-	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
-	EOF
+Switched to a new branch 'empty-branch-2'
+[empty-branch-2 (root-commit) f194efb] test-commit-1
+ Author: A U Thor <author@example.com>
+ 10 files changed, 7 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 115 - "No commits yet" should not be noted in status output
 
-[branch2 c39471f] First
- Author: name1 <email1@test.git>
- Date: Fri Jan 1 01:00:00 2010 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-ok 120 - setup showEmail tests
+expecting success of 7508.116 '"Initial commit" should be noted in commit template': 
+	git checkout --orphan empty-branch-3 &&
+	touch to_be_committed_1 &&
+	git add to_be_committed_1 &&
+	git commit --dry-run >output &&
+	test_grep "Initial commit" output
 
-expecting success of 8002.121 'blame with no options and no config': 
-	git blame one >blame &&
-	find_blame <blame >result &&
-	test_cmp expected_n result
+Switched to a new branch 'empty-branch-3'
+Initial commit
+ok 116 - "Initial commit" should be noted in commit template
 
-ok 121 - blame with no options and no config
+expecting success of 7508.117 '"Initial commit" should not be noted in commit template': 
+	git checkout --orphan empty-branch-4 &&
+	test_commit test-commit-2 &&
+	touch to_be_committed_2 &&
+	git add to_be_committed_2 &&
+	git commit --dry-run >output &&
+	test_grep ! "Initial commit" output
 
-expecting success of 8002.122 'blame with showemail options': 
-	git blame --show-email one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_n result
+Switched to a new branch 'empty-branch-4'
+[empty-branch-4 (root-commit) 92016e1] test-commit-2
+ Author: A U Thor <author@example.com>
+ 12 files changed, 8 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 test-commit-2.t
+ create mode 100644 to_be_committed_1
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 117 - "Initial commit" should not be noted in commit template
 
-ok 122 - blame with showemail options
+expecting success of 7508.118 '--no-optional-locks prevents index update': 
+	test_set_magic_mtime .git/index &&
+	git --no-optional-locks status &&
+	test_is_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 8002.123 'blame with showEmail config false': 
-	git config blame.showEmail false &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_n result &&
-	git blame --show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_e result &&
-	git blame -e one >blame3 &&
-	find_blame <blame3 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame4 &&
-	find_blame <blame4 >result &&
-	test_cmp expected_n result
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-ok 123 - blame with showEmail config false
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.124 'blame with showEmail config true': 
-	git config blame.showEmail true &&
-	git blame one >blame1 &&
-	find_blame <blame1 >result &&
-	test_cmp expected_e result &&
-	git blame --no-show-email one >blame2 &&
-	find_blame <blame2 >result &&
-	test_cmp expected_n result
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-ok 124 - blame with showEmail config true
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.125 'set up abbrev tests': 
-	test_commit abbrev &&
-	sha1=$(git rev-parse --verify HEAD) &&
-	check_abbrev () {
-		expect=$1 && shift &&
-		echo $sha1 | cut -c 1-$expect >expect &&
-		git blame "$@" abbrev.t >actual &&
-		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
-		test_cmp expect actual.sha
-	}
+--- .git/test-mtime-expect	2025-03-17 13:29:12.551689191 +0000
++++ .git/test-mtime-actual	2025-03-17 13:29:12.563689267 +0000
+@@ -1 +1 @@
+-1234567890
++1742218151
+ok 118 - --no-optional-locks prevents index update
 
-[branch2 32e5f6f] abbrev
+expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
+	echo content >racy-dirty &&
+	echo content >racy-racy &&
+	git add racy* &&
+	git commit -m "racy test files" &&
+	# let status rewrite the index, if necessary; after that we expect
+	# no more index writes unless caused by racy timestamps; note that
+	# timestamps may already be racy now (depending on previous tests)
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
+
+[empty-branch-4 1041e20] racy test files
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 abbrev.t
-ok 125 - set up abbrev tests
+ 3 files changed, 2 insertions(+)
+ create mode 100644 racy-dirty
+ create mode 100644 racy-racy
+ create mode 100644 to_be_committed_2
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 8002.126 'blame --abbrev=<n> works': 
-	# non-boundary commits get +1 for alignment
-	check_abbrev 31 --abbrev=30 HEAD &&
-	check_abbrev 30 --abbrev=30 ^HEAD
+nothing added to commit but untracked files present (use "git add" to track)
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-ok 126 - blame --abbrev=<n> works
+nothing added to commit but untracked files present (use "git add" to track)
+--- .git/test-mtime-expect	2025-03-17 13:29:14.427701044 +0000
++++ .git/test-mtime-actual	2025-03-17 13:29:14.443701145 +0000
+@@ -1 +1 @@
+-1234567890
++1742218153
+ok 119 - racy timestamps will be fixed for clean worktree
 
-expecting success of 8002.127 'blame -l aligns regular and boundary commits': 
-	check_abbrev $hexsz         -l HEAD &&
-	check_abbrev $((hexsz - 1)) -l ^HEAD
+expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
+	echo content2 >racy-dirty &&
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-ok 127 - blame -l aligns regular and boundary commits
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-expecting success of 8002.128 'blame --abbrev with full length behaves like -l': 
-	check_abbrev $hexsz         --abbrev=$hexsz HEAD &&
-	check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-ok 128 - blame --abbrev with full length behaves like -l
+no changes added to commit (use "git add" and/or "git commit -a")
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-expecting success of 8002.129 '--no-abbrev works like --abbrev with full length': 
-	check_abbrev $hexsz --no-abbrev
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-ok 129 - --no-abbrev works like --abbrev with full length
+no changes added to commit (use "git add" and/or "git commit -a")
+--- .git/test-mtime-expect	2025-03-17 13:29:16.343713150 +0000
++++ .git/test-mtime-actual	2025-03-17 13:29:16.359713251 +0000
+@@ -1 +1 @@
+-1234567890
++1742218155
+ok 120 - racy timestamps will be fixed for dirty worktree
 
-expecting success of 8002.130 'blame --abbrev gets truncated': 
-	check_abbrev $hexsz --abbrev=9000 HEAD
+expecting success of 7508.121 'setup slow status advice': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
+	(
+		cd slowstatus &&
+		cat >.gitignore <<-\EOF &&
+		/actual
+		/expected
+		/out
+		EOF
+		git add .gitignore &&
+		git commit -m "Add .gitignore" &&
+		git config set advice.statusuoption true
+	)
 
-ok 130 - blame --abbrev gets truncated
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7508-status/slowstatus/.git/
+[main (root-commit) 557fde8] Add .gitignore
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ok 121 - setup slow status advice
 
-expecting success of 8002.131 'blame --abbrev gets truncated with boundary commit': 
-	check_abbrev $hexsz --abbrev=9000 ^HEAD
+expecting success of 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache false &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-ok 131 - blame --abbrev gets truncated with boundary commit
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-expecting success of 8002.132 'blame --abbrev -b truncates the blank boundary': 
-	# Note that `--abbrev=` always gets incremented by 1, which is why we
-	# expect 11 leading spaces and not 10.
-	cat >expect <<-EOF &&
-	$(printf "%11s" "") (<author@example.com> 2005-04-07 15:45:13 -0700 1) abbrev
-	EOF
-	git blame -b --abbrev=10 ^HEAD -- abbrev.t >actual &&
-	test_cmp expect actual
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-ok 132 - blame --abbrev -b truncates the blank boundary
+ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
 
-expecting success of 8002.133 'blame with excessive --abbrev and -b culls to hash length': 
-	cat >expect <<-EOF &&
-	$(printf "%${hexsz}s" "") (<author@example.com> 2005-04-07 15:45:13 -0700 1) abbrev
-	EOF
-	git blame -b --abbrev=9000 ^HEAD -- abbrev.t >actual &&
-	test_cmp expect actual
+expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-ok 133 - blame with excessive --abbrev and -b culls to hash length
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-expecting success of 8002.134 '--exclude-promisor-objects does not BUG-crash': 
-	test_must_fail git blame --exclude-promisor-objects one
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-error: unknown option `--exclude-promisor-objects'
-usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
 
-    <rev-opts> are documented in git-rev-list(1)
+expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor true &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-    --[no-]incremental    show blame entries as we find them, incrementally
-    -b                    do not show object names of boundary commits (Default: off)
-    --[no-]root           do not treat root commits as boundaries (Default: off)
-    --[no-]show-stats     show work cost statistics
-    --[no-]progress       force progress reporting
-    --[no-]score-debug    show output score for blame entries
-    -f, --[no-]show-name  show original filename (Default: auto)
-    -n, --[no-]show-number
-                          show original linenumber (Default: off)
-    -p, --[no-]porcelain  show in a format designed for machine consumption
-    --[no-]line-porcelain show porcelain format with per-line commit information
-    -c                    use the same output mode as git-annotate (Default: off)
-    -t                    show raw timestamp (Default: off)
-    -l                    show long commit SHA1 (Default: off)
-    -s                    suppress author name and timestamp (Default: off)
-    -e, --[no-]show-email show author email instead of name (Default: off)
-    -w                    ignore whitespace differences
-    --[no-]ignore-rev <rev>
-                          ignore <rev> when blaming
-    --[no-]ignore-revs-file <file>
-                          ignore revisions from <file>
-    --[no-]color-lines    color redundant metadata from previous line differently
-    --[no-]color-by-age   color lines by age
-    --[no-]minimal        spend extra cycles to find better match
-    -S <file>             use revisions from <file> instead of calling git-rev-list
-    --[no-]contents <file>
-                          use <file>'s contents as the final image
-    -C[<score>]           find line copies within and across files
-    -M[<score>]           find line movements within and across files
-    -L <range>            process only line range <start>,<end> or function :<funcname>
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
+		It took 3.25 seconds to enumerate untracked files,
+		but the results were cached, and subsequent runs may be faster.
+		See 'git help status' for information on how to improve this.
 
-ok 134 - --exclude-promisor-objects does not BUG-crash
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-expecting success of 8002.135 'blame with uncommitted edits in partial clone does not crash': 
-	git init server &&
-	echo foo >server/file.txt &&
-	git -C server add file.txt &&
-	git -C server commit -m file &&
+ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
 
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	echo bar >>client/file.txt &&
-	git -C client blame file.txt
+checking prerequisite: EXPENSIVE
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8002-blame/server/.git/
-[main (root-commit) a09dc96] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-Cloning into 'client'...
-warning: filtering not recognized by server, ignoring
-^a09dc96 (A U Thor          2005-04-07 15:45:13 -0700 1) foo
-00000000 (Not Committed Yet 2026-04-19 19:24:53 +0000 2) bar
-ok 135 - blame with uncommitted edits in partial clone does not crash
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-# passed all 135 test(s)
-1..135
+)
+prerequisite EXPENSIVE not satisfied
+ok 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
+
+# passed all 125 test(s)
+1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t8003-blame-corner-cases.sh ***
@@ -507382,272 +503506,6 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8008-blame-formats.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8008-blame-formats/.git/
-expecting success of 8008.1 'setup': 
-	echo a >file &&
-	git add file &&
-	test_tick &&
-	git commit -m one &&
-	echo b >>file &&
-	echo c >>file &&
-	echo d >>file &&
-	test_tick &&
-	git commit -a -m two &&
-	ID1=$(git rev-parse HEAD^) &&
-	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
-	ID2=$(git rev-parse HEAD) &&
-	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
-
-[master (root-commit) baf5e0b] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 8825379] two
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
-ok 1 - setup
-
-expecting success of 8008.2 'normal blame output': 
-	git blame --abbrev=17 file >actual &&
-	test_cmp expect actual
-
-ok 2 - normal blame output
-
-expecting success of 8008.3 'blame --porcelain output': 
-	git blame --porcelain file >actual &&
-	test_cmp expect actual
-
-ok 3 - blame --porcelain output
-
-expecting success of 8008.4 'blame --line-porcelain output': 
-	git blame --line-porcelain file >actual &&
-	test_cmp expect actual
-
-ok 4 - blame --line-porcelain output
-
-expecting success of 8008.5 '--porcelain detects first non-blank line as subject': 
-	(
-		GIT_INDEX_FILE=.git/tmp-index &&
-		export GIT_INDEX_FILE &&
-		echo "This is it" >single-file &&
-		git add single-file &&
-		tree=$(git write-tree) &&
-		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
-			"tree $tree" \
-			"author A <a@b.c> 123456789 +0000" \
-			"committer C <c@d.e> 123456789 +0000" |
-		git hash-object -w -t commit --stdin) &&
-		git blame --porcelain $commit -- single-file >output &&
-		grep "^summary oneline$" output
-	)
-
-summary oneline
-ok 5 - --porcelain detects first non-blank line as subject
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8007-cat-file-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8007-cat-file-textconv/.git/
-expecting success of 8007.1 'setup ': 
-	echo "bin: test" >one.bin &&
-	test_ln_s_add one.bin symlink.bin &&
-	git add . &&
-	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
-	echo "bin: test version 2" >one.bin &&
-	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 6a4de31] First
- Author: Number1 <author@example.com>
- Date: Fri Jan 1 18:00:00 2010 +0000
- 3 files changed, 5 insertions(+)
- create mode 100755 helper
- create mode 100644 one.bin
- create mode 120000 symlink.bin
-[master aa3beaa] Second
- Author: Number2 <author@example.com>
- Date: Fri Jan 1 20:00:00 2010 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup 
-
-expecting success of 8007.2 'usage: <bad rev>': 
-	cat >expect <<-\EOF &&
-	fatal: Not a valid object name HEAD2
-	EOF
-	test_must_fail git cat-file --textconv HEAD2 2>actual &&
-	test_cmp expect actual
-
-ok 2 - usage: <bad rev>
-
-expecting success of 8007.3 'usage: <bad rev>:<bad path>': 
-	cat >expect <<-\EOF &&
-	fatal: invalid object name 'HEAD2'.
-	EOF
-	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
-	test_cmp expect actual
-
-ok 3 - usage: <bad rev>:<bad path>
-
-expecting success of 8007.4 'usage: <rev>:<bad path>': 
-	cat >expect <<-\EOF &&
-	fatal: path 'two.bin' does not exist in 'HEAD'
-	EOF
-	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
-	test_cmp expect actual
-
-ok 4 - usage: <rev>:<bad path>
-
-expecting success of 8007.5 'usage: <rev> with no <path>': 
-	cat >expect <<-\EOF &&
-	fatal: <object>:<path> required, only <object> 'HEAD' given
-	EOF
-	test_must_fail git cat-file --textconv HEAD 2>actual &&
-	test_cmp expect actual
-
-ok 5 - usage: <rev> with no <path>
-
-expecting success of 8007.6 'usage: <bad rev>:<good (in HEAD) path>': 
-	cat >expect <<-\EOF &&
-	fatal: invalid object name 'HEAD2'.
-	EOF
-	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
-	test_cmp expect actual
-
-ok 6 - usage: <bad rev>:<good (in HEAD) path>
-
-expecting success of 8007.7 'no filter specified': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
-
-ok 7 - no filter specified
-
-expecting success of 8007.8 'setup textconv filters': 
-	echo "*.bin diff=test" >.gitattributes &&
-	git config diff.test.textconv ./helper &&
-	git config diff.test.cachetextconv false
-
-ok 8 - setup textconv filters
-
-expecting success of 8007.9 'cat-file without --textconv': 
-	git cat-file blob :one.bin >result &&
-	test_cmp expected result
-
-ok 9 - cat-file without --textconv
-
-expecting success of 8007.10 'cat-file without --textconv on previous commit': 
-	git cat-file -p HEAD^:one.bin >result &&
-	test_cmp expected result
-
-ok 10 - cat-file without --textconv on previous commit
-
-expecting success of 8007.11 'cat-file --textconv on last commit': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
-
-ok 11 - cat-file --textconv on last commit
-
-expecting success of 8007.12 'cat-file --textconv on previous commit': 
-	git cat-file --textconv HEAD^:one.bin >result &&
-	test_cmp expected result
-
-ok 12 - cat-file --textconv on previous commit
-
-expecting success of 8007.13 'cat-file without --textconv (symlink)': 
-	printf "%s" "one.bin" >expected &&
-	git cat-file blob :symlink.bin >result &&
-	test_cmp expected result
-
-ok 13 - cat-file without --textconv (symlink)
-
-expecting success of 8007.14 'cat-file --textconv on index (symlink)': 
-	git cat-file --textconv :symlink.bin >result &&
-	test_cmp expected result
-
-ok 14 - cat-file --textconv on index (symlink)
-
-expecting success of 8007.15 'cat-file --textconv on HEAD (symlink)': 
-	git cat-file --textconv HEAD:symlink.bin >result &&
-	test_cmp expected result
-
-ok 15 - cat-file --textconv on HEAD (symlink)
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8009-blame-vs-topicbranches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8009-blame-vs-topicbranches/.git/
-expecting success of 8009.1 'setup': 
-	test_commit A0 file.t line0 &&
-	test_commit A1 &&
-	git reset --hard A0 &&
-	test_commit B1 &&
-	test_commit B2 file.t line0changed &&
-	git reset --hard A1 &&
-	test_merge A2 B2 &&
-	git reset --hard A1 &&
-	test_commit C1 &&
-	git reset --hard A2 &&
-	test_merge A3 C1
-	
-[master (root-commit) 2152206] A0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-[master 5392e14] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-HEAD is now at 2152206 A0
-[master 15a8c72] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-[master e1433f5] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392e14 A1
-Merge made by the 'ort' strategy.
- B1.t   | 1 +
- file.t | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B1.t
-HEAD is now at 5392e14 A1
-[master fa266ba] C1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-HEAD is now at 6e3b304 A2
-Merge made by the 'ort' strategy.
- C1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-ok 1 - setup
-
-expecting success of 8009.2 'blame --reverse --first-parent finds A1': 
-	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
-	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
-	git rev-parse A1 >expect &&
-	test_cmp expect actual
-	
-ok 2 - blame --reverse --first-parent finds A1
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7810-grep.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7810-grep/.git/
 expecting success of 7810.1 'setup': 
@@ -509958,347 +505816,4426 @@
 expecting success of 7810.231 'grep -P invalidpattern properly dies ': 
 	test_must_fail git grep -P "a["
 
-fatal: command line, 'a[': missing terminating ] for character class
-ok 231 - grep -P invalidpattern properly dies 
+fatal: command line, 'a[': missing terminating ] for character class
+ok 231 - grep -P invalidpattern properly dies 
+
+expecting success of 7810.232 'grep invalidpattern properly dies with grep.patternType=perl': 
+	test_must_fail git -c grep.patterntype=perl grep "a["
+
+fatal: command line, 'a[': missing terminating ] for character class
+ok 232 - grep invalidpattern properly dies with grep.patternType=perl
+
+expecting success of 7810.233 'grep -G -E -F pattern': 
+	echo "ab:a+b*c" >expected &&
+	git grep -G -E -F "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 233 - grep -G -E -F pattern
+
+expecting success of 7810.234 'grep pattern with grep.patternType=basic, =extended, =fixed': 
+	echo "ab:a+b*c" >expected &&
+	git \
+		-c grep.patterntype=basic \
+		-c grep.patterntype=extended \
+		-c grep.patterntype=fixed \
+		grep "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 234 - grep pattern with grep.patternType=basic, =extended, =fixed
+
+expecting success of 7810.235 'grep -E -F -G pattern': 
+	echo "ab:a+bc" >expected &&
+	git grep -E -F -G "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 235 - grep -E -F -G pattern
+
+expecting success of 7810.236 'grep pattern with grep.patternType=extended, =fixed, =basic': 
+	echo "ab:a+bc" >expected &&
+	git \
+		-c grep.patterntype=extended \
+		-c grep.patterntype=fixed \
+		-c grep.patterntype=basic \
+		grep "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 236 - grep pattern with grep.patternType=extended, =fixed, =basic
+
+expecting success of 7810.237 'grep -F -G -E pattern': 
+	echo "ab:abc" >expected &&
+	git grep -F -G -E "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 237 - grep -F -G -E pattern
+
+expecting success of 7810.238 'grep pattern with grep.patternType=fixed, =basic, =extended': 
+	echo "ab:abc" >expected &&
+	git \
+		-c grep.patterntype=fixed \
+		-c grep.patterntype=basic \
+		-c grep.patterntype=extended \
+		grep "a+b*c" ab >actual &&
+	test_cmp expected actual
+
+ok 238 - grep pattern with grep.patternType=fixed, =basic, =extended
+
+expecting success of 7810.239 'grep -G -F -P -E pattern': 
+	echo "d0:d" >expected &&
+	git grep -G -F -P -E "[\d]" d0 >actual &&
+	test_cmp expected actual
+
+ok 239 - grep -G -F -P -E pattern
+
+expecting success of 7810.240 'grep pattern with grep.patternType=fixed, =basic, =perl, =extended': 
+	echo "d0:d" >expected &&
+	git \
+		-c grep.patterntype=fixed \
+		-c grep.patterntype=basic \
+		-c grep.patterntype=perl \
+		-c grep.patterntype=extended \
+		grep "[\d]" d0 >actual &&
+	test_cmp expected actual
+
+ok 240 - grep pattern with grep.patternType=fixed, =basic, =perl, =extended
+
+expecting success of 7810.241 'grep -G -F -E -P pattern': 
+	echo "d0:0" >expected &&
+	git grep -G -F -E -P "[\d]" d0 >actual &&
+	test_cmp expected actual
+
+ok 241 - grep -G -F -E -P pattern
+
+expecting success of 7810.242 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl': 
+	echo "d0:0" >expected &&
+	git \
+		-c grep.patterntype=fixed \
+		-c grep.patterntype=basic \
+		-c grep.patterntype=extended \
+		-c grep.patterntype=perl \
+		grep "[\d]" d0 >actual &&
+	test_cmp expected actual
+
+ok 242 - grep pattern with grep.patternType=fixed, =basic, =extended, =perl
+
+expecting success of 7810.243 'grep -P pattern with grep.patternType=fixed': 
+	echo "ab:a+b*c" >expected &&
+	git \
+		-c grep.patterntype=fixed \
+		grep -P "a\x{2b}b\x{2a}c" ab >actual &&
+	test_cmp expected actual
+
+ok 243 - grep -P pattern with grep.patternType=fixed
+
+expecting success of 7810.244 'grep -F pattern with grep.patternType=basic': 
+	echo "ab:a+b*c" >expected &&
+	git \
+		-c grep.patterntype=basic \
+		grep -F "*c" ab >actual &&
+	test_cmp expected actual
+
+ok 244 - grep -F pattern with grep.patternType=basic
+
+expecting success of 7810.245 'grep -G pattern with grep.patternType=fixed': 
+	cat >expected <<-\EOF &&
+	ab:a+b*c
+	ab:a+bc
+	EOF
+	git \
+		-c grep.patterntype=fixed \
+		grep -G "a+b" ab >actual &&
+	test_cmp expected actual
+
+ok 245 - grep -G pattern with grep.patternType=fixed
+
+expecting success of 7810.246 'grep -E pattern with grep.patternType=fixed': 
+	cat >expected <<-\EOF &&
+	ab:a+b*c
+	ab:a+bc
+	ab:abc
+	EOF
+	git \
+		-c grep.patterntype=fixed \
+		grep -E "a+" ab >actual &&
+	test_cmp expected actual
+
+ok 246 - grep -E pattern with grep.patternType=fixed
+
+expecting success of 7810.247 'grep --color, separator': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		normal &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.match		normal &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	red &&
+
+	git grep --color=always -A1 -e char -e lo_w hello.c hello_world |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 247 - grep --color, separator
+
+expecting success of 7810.248 'grep --break': 
+	git grep --break -e char -e lo_w hello.c hello_world >actual &&
+	test_cmp expected actual
+
+ok 248 - grep --break
+
+expecting success of 7810.249 'grep --break with context': 
+	git grep --break -A1 -e char -e lo_w hello.c hello_world >actual &&
+	test_cmp expected actual
+
+ok 249 - grep --break with context
+
+expecting success of 7810.250 'grep --heading': 
+	git grep --heading -e char -e lo_w hello.c hello_world >actual &&
+	test_cmp expected actual
+
+ok 250 - grep --heading
+
+expecting success of 7810.251 'mimic ack-grep --group': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		"bold green" &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.match		"black yellow" &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	normal &&
+
+	git grep --break --heading -n --color \
+		-e char -e lo_w hello.c hello_world |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 251 - mimic ack-grep --group
+
+expecting success of 7810.252 'grep -E "^ "': 
+	git grep -E "^ " space >actual &&
+	test_cmp expected actual
+
+ok 252 - grep -E "^ "
+
+expecting success of 7810.253 'grep -P "^ "': 
+	git grep -P "^ " space >actual &&
+	test_cmp expected actual
+
+ok 253 - grep -P "^ "
+
+expecting success of 7810.254 'grep --color -e A -e B with context': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		normal &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.matchContext	normal &&
+	test_config color.grep.matchSelected	red &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	normal &&
+
+	git grep --color=always -C2 -e "with " -e space2  space |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 254 - grep --color -e A -e B with context
+
+expecting success of 7810.255 'grep --color -e A --and -e B with context': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		normal &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.matchContext	normal &&
+	test_config color.grep.matchSelected	red &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	normal &&
+
+	git grep --color=always -C2 -e "with " --and -e space2  space |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 255 - grep --color -e A --and -e B with context
+
+expecting success of 7810.256 'grep --color -e A --and --not -e B with context': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		normal &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.matchContext	normal &&
+	test_config color.grep.matchSelected	red &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	normal &&
+
+	git grep --color=always -C2 -e "with " --and --not -e space2  space |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 256 - grep --color -e A --and --not -e B with context
+
+expecting success of 7810.257 'grep --color -e A --and -e B -p with context': 
+	test_config color.grep.context		normal &&
+	test_config color.grep.filename		normal &&
+	test_config color.grep.function		normal &&
+	test_config color.grep.linenumber	normal &&
+	test_config color.grep.matchContext	normal &&
+	test_config color.grep.matchSelected	red &&
+	test_config color.grep.selected		normal &&
+	test_config color.grep.separator	normal &&
+
+	git grep --color=always -p -C3 -e int --and -e Hello --no-index hello.c |
+	test_decode_color >actual &&
+	test_cmp expected actual
+
+ok 257 - grep --color -e A --and -e B -p with context
+
+expecting success of 7810.258 'grep can find things only in the work tree': 
+	: >work-tree-only &&
+	git add work-tree-only &&
+	test_when_finished "git rm -f work-tree-only" &&
+	echo "find in work tree" >work-tree-only &&
+	git grep --quiet "find in work tree" &&
+	test_must_fail git grep --quiet --cached "find in work tree" &&
+	test_must_fail git grep --quiet "find in work tree" HEAD
+
+rm 'work-tree-only'
+ok 258 - grep can find things only in the work tree
+
+expecting success of 7810.259 'grep can find things only in the work tree (i-t-a)': 
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	git grep --quiet "intend to add this" &&
+	test_must_fail git grep --quiet --cached "intend to add this" &&
+	test_must_fail git grep --quiet "intend to add this" HEAD
+
+rm 'intend-to-add'
+ok 259 - grep can find things only in the work tree (i-t-a)
+
+expecting success of 7810.260 'grep does not search work tree with assume unchanged': 
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	git update-index --assume-unchanged intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	test_must_fail git grep --quiet "intend to add this" &&
+	test_must_fail git grep --quiet --cached "intend to add this" &&
+	test_must_fail git grep --quiet "intend to add this" HEAD
+
+rm 'intend-to-add'
+ok 260 - grep does not search work tree with assume unchanged
+
+expecting success of 7810.261 'grep can find things only in the index': 
+	echo "only in the index" >cache-this &&
+	git add cache-this &&
+	rm cache-this &&
+	test_when_finished "git rm --cached cache-this" &&
+	test_must_fail git grep --quiet "only in the index" &&
+	git grep --quiet --cached "only in the index" &&
+	test_must_fail git grep --quiet "only in the index" HEAD
+
+rm 'cache-this'
+ok 261 - grep can find things only in the index
+
+expecting success of 7810.262 'grep does not report i-t-a with -L --cached': 
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	git ls-files | grep -v "^intend-to-add\$" >expected &&
+	git grep -L --cached "nonexistent_string" >actual &&
+	test_cmp expected actual
+
+rm 'intend-to-add'
+ok 262 - grep does not report i-t-a with -L --cached
+
+expecting success of 7810.263 'grep does not report i-t-a and assume unchanged with -L': 
+	echo "intend to add this" >intend-to-add-assume-unchanged &&
+	git add -N intend-to-add-assume-unchanged &&
+	test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
+	git update-index --assume-unchanged intend-to-add-assume-unchanged &&
+	git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
+	git grep -L "nonexistent_string" >actual &&
+	test_cmp expected actual
+
+rm 'intend-to-add-assume-unchanged'
+ok 263 - grep does not report i-t-a and assume unchanged with -L
+
+# passed all 263 test(s)
+1..263
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8005-blame-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8005-blame-i18n/.git/
+expecting success of 8005.1 'setup the repository': 
+	# Create the file
+	echo "UTF-8 LINE" > file &&
+	git add file &&
+	git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
+
+	echo "EUC-JAPAN LINE" >> file &&
+	git add file &&
+	git config i18n.commitencoding eucJP &&
+	git commit --author "$EUC_JAPAN_NAME <euc-japan@localhost>" -m "$EUC_JAPAN_MSG" &&
+
+	echo "SJIS LINE" >> file &&
+	git add file &&
+	git config i18n.commitencoding SJIS &&
+	git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
+
+[master (root-commit) 732dccd] ブレーム�テスト��。
+ Author: 山田 太郎 <utf8@localhost>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master fd45e78] ブレーム�テスト��。
+ Author: »³ÅÄ ÂÀϺ <euc-japan@localhost>
+ 1 file changed, 1 insertion(+)
+[master 6624d04] ブレーム�テスト��。
+ Author: ŽR“c ‘¾˜Y <sjis@localhost>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup the repository
+
+expecting success of 8005.2 'blame respects i18n.commitencoding': 
+	git blame --incremental file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 2 - blame respects i18n.commitencoding
+
+expecting success of 8005.3 'blame respects i18n.logoutputencoding': 
+	git config i18n.logoutputencoding eucJP &&
+	git blame --incremental file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 3 - blame respects i18n.logoutputencoding
+
+expecting success of 8005.4 'blame respects --encoding=UTF-8': 
+	git blame --incremental --encoding=UTF-8 file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 4 - blame respects --encoding=UTF-8
+
+expecting success of 8005.5 'blame respects --encoding=none': 
+	git blame --incremental --encoding=none file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 5 - blame respects --encoding=none
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8002-blame.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8002-blame/.git/
+expecting success of 8002.1 'setup A lines': 
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "lazy dog" >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
+	git commit -a -m "Initial."
+
+[main (root-commit) 129283d] Initial.
+ Author: A <A@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+ok 1 - setup A lines
+
+expecting success of 8002.2 'blame 1 author': 
+	check_count A 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+ok 2 - blame 1 author
+
+expecting success of 8002.3 'blame working copy': 
+	test_when_finished "git restore file" &&
+	echo "1A quick brown fox jumps over the" >file &&
+	echo "another lazy dog" >>file &&
+	check_count A 1 "Not Committed Yet" 1
+
+git blame -c  file 
+Author Not Committed Yet (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 3 - blame working copy
+
+expecting success of 8002.4 'blame with --contents': 
+	check_count --contents=file A 2
+
+git blame -c  --contents=file file 
+Author A (expected 2, attributed 2) good
+ok 4 - blame with --contents
+
+expecting success of 8002.5 'blame with --contents in a bare repo': 
+	git clone --bare . bare-contents.git &&
+	(
+		cd bare-contents.git &&
+		echo "1A quick brown fox jumps over the" >contents &&
+		check_count --contents=contents A 1
+	)
+
+Cloning into bare repository 'bare-contents.git'...
+done.
+git blame -c  --contents=contents file 
+Author A (expected 1, attributed 1) good
+ok 5 - blame with --contents in a bare repo
+
+expecting success of 8002.6 'blame with --contents changed': 
+	echo "1A quick brown fox jumps over the" >contents &&
+	echo "another lazy dog" >>contents &&
+	check_count --contents=contents A 1 "External file (--contents)" 1
+
+git blame -c  --contents=contents file 
+Author A (expected 1, attributed 1) good
+Author External file (--contents) (expected 1, attributed 1) good
+ok 6 - blame with --contents changed
+
+expecting success of 8002.7 'blame in a bare repo without starting commit': 
+	git clone --bare . bare.git &&
+	(
+		cd bare.git &&
+		check_count A 2
+	)
+
+Cloning into bare repository 'bare.git'...
+done.
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+ok 7 - blame in a bare repo without starting commit
+
+expecting success of 8002.8 'blame by tag objects': 
+	git tag -m "test tag" testTag &&
+	git tag -m "test tag #2" testTag2 testTag &&
+	check_count -h testTag A 2 &&
+	check_count -h testTag2 A 2
+
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f testTag2 testTag^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+git blame -c  file testTag
+Author A (expected 2, attributed 2) good
+git blame -c  file testTag2
+Author A (expected 2, attributed 2) good
+ok 8 - blame by tag objects
+
+expecting success of 8002.9 'setup B lines': 
+	echo "2A quick brown fox jumps over the" >>file &&
+	echo "lazy dog" >>file &&
+	GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
+	git commit -a -m "Second."
+
+[main 7e31098] Second.
+ Author: B <B@test.git>
+ 1 file changed, 2 insertions(+)
+ok 9 - setup B lines
+
+expecting success of 8002.10 'blame 2 authors': 
+	check_count A 2 B 2
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 10 - blame 2 authors
+
+expecting success of 8002.11 'blame with --contents and revision': 
+	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
+
+git blame -c  --contents=file file testTag
+Author A (expected 2, attributed 2) good
+Author External file (--contents) (expected 2, attributed 2) good
+ok 11 - blame with --contents and revision
+
+expecting success of 8002.12 'setup B1 lines (branch1)': 
+	git checkout -b branch1 main &&
+	echo "3A slow green fox jumps into the" >>file &&
+	echo "well." >>file &&
+	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
+	git commit -a -m "Branch1-1"
+
+Switched to a new branch 'branch1'
+[branch1 1b9b47a] Branch1-1
+ Author: B1 <B1@test.git>
+ 1 file changed, 2 insertions(+)
+ok 12 - setup B1 lines (branch1)
+
+expecting success of 8002.13 'blame 2 authors + 1 branch1 author': 
+	check_count A 2 B 2 B1 2
+
+git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 13 - blame 2 authors + 1 branch1 author
+
+expecting success of 8002.14 'setup B2 lines (branch2)': 
+	git checkout -b branch2 main &&
+	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
+	git commit -a -m "Branch2-1"
+
+Switched to a new branch 'branch2'
+[branch2 7d77deb] Branch2-1
+ Author: B2 <B2@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - setup B2 lines (branch2)
+
+expecting success of 8002.15 'blame 2 authors + 1 branch2 author': 
+	check_count A 2 B 1 B2 1
+
+git blame -c  file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+ok 15 - blame 2 authors + 1 branch2 author
+
+expecting success of 8002.16 'merge branch1 & branch2': 
+	git merge branch1
+
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 16 - merge branch1 & branch2
+
+expecting success of 8002.17 'blame 2 authors + 2 merged-in authors': 
+	check_count A 2 B 1 B1 2 B2 1
+
+git blame -c  file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+ok 17 - blame 2 authors + 2 merged-in authors
+
+expecting success of 8002.18 'blame --first-parent blames merge for branch1': 
+	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
+
+git blame -c  --first-parent file 
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
+ok 18 - blame --first-parent blames merge for branch1
+
+expecting success of 8002.19 'blame ancestor': 
+	check_count -h main A 2 B 2
+
+git blame -c  file main
+Author A (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+ok 19 - blame ancestor
+
+expecting success of 8002.20 'blame great-ancestor': 
+	check_count -h main^ A 2
+
+git blame -c  file main^
+Author A (expected 2, attributed 2) good
+ok 20 - blame great-ancestor
+
+expecting success of 8002.21 'setup evil merge': 
+	echo "evil merge." >>file &&
+	git commit -a --amend
+
+[branch2 c413b3e] Merge branch 'branch1' into branch2
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 21 - setup evil merge
+
+expecting success of 8002.22 'blame evil merge': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
+
+git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+ok 22 - blame evil merge
+
+expecting success of 8002.23 'blame huge graft': 
+	test_when_finished "git checkout branch2" &&
+	test_when_finished "rm -rf .git/info" &&
+	graft= &&
+	for i in 0 1 2
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9
+		do
+			git checkout --orphan "$i$j" &&
+			printf "%s\n" "$i" "$j" >file &&
+			test_tick &&
+			GIT_AUTHOR_NAME=$i$j GIT_AUTHOR_EMAIL=$i$j@test.git \
+			git commit -a -m "$i$j" &&
+			commit=$(git rev-parse --verify HEAD) &&
+			graft="$graft$commit " || return 1
+		done
+	done &&
+	mkdir .git/info &&
+	printf "%s " $graft >.git/info/grafts &&
+	check_count -h 00 01 1 10 1
+
+Switched to a new branch '00'
+[00 (root-commit) e2c6177] 00
+ Author: 00 <00@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '01'
+[01 (root-commit) 0dbe04b] 01
+ Author: 01 <01@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '02'
+[02 (root-commit) 97fbca6] 02
+ Author: 02 <02@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '03'
+[03 (root-commit) 5cdbcd8] 03
+ Author: 03 <03@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '04'
+[04 (root-commit) 5a154cf] 04
+ Author: 04 <04@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '05'
+[05 (root-commit) a84e1de] 05
+ Author: 05 <05@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '06'
+[06 (root-commit) d4bea54] 06
+ Author: 06 <06@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '07'
+[07 (root-commit) 24ba6e8] 07
+ Author: 07 <07@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '08'
+[08 (root-commit) fe90088] 08
+ Author: 08 <08@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '09'
+[09 (root-commit) 773a2fb] 09
+ Author: 09 <09@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '10'
+[10 (root-commit) 80536e5] 10
+ Author: 10 <10@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '11'
+[11 (root-commit) 33c07c1] 11
+ Author: 11 <11@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '12'
+[12 (root-commit) ae7094b] 12
+ Author: 12 <12@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '13'
+[13 (root-commit) 19e767d] 13
+ Author: 13 <13@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '14'
+[14 (root-commit) f7159ac] 14
+ Author: 14 <14@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '15'
+[15 (root-commit) d95fecf] 15
+ Author: 15 <15@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '16'
+[16 (root-commit) d8bfdb9] 16
+ Author: 16 <16@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '17'
+[17 (root-commit) aa3f31e] 17
+ Author: 17 <17@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '18'
+[18 (root-commit) d76cb1d] 18
+ Author: 18 <18@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '19'
+[19 (root-commit) 95e03c5] 19
+ Author: 19 <19@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '20'
+[20 (root-commit) d40a964] 20
+ Author: 20 <20@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '21'
+[21 (root-commit) 6c3def2] 21
+ Author: 21 <21@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '22'
+[22 (root-commit) 78d2294] 22
+ Author: 22 <22@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '23'
+[23 (root-commit) 76a64d0] 23
+ Author: 23 <23@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '24'
+[24 (root-commit) 59f234a] 24
+ Author: 24 <24@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '25'
+[25 (root-commit) 26ac47a] 25
+ Author: 25 <25@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '26'
+[26 (root-commit) db7e855] 26
+ Author: 26 <26@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '27'
+[27 (root-commit) 279f565] 27
+ Author: 27 <27@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '28'
+[28 (root-commit) f691d9c] 28
+ Author: 28 <28@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+Switched to a new branch '29'
+[29 (root-commit) c72134e] 29
+ Author: 29 <29@test.git>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 file
+git blame -c  file 00
+hint: Support for <GIT_DIR>/info/grafts is deprecated
+hint: and will be removed in a future Git version.
+hint:
+hint: Please use "git replace --convert-graft-file"
+hint: to convert the grafts into replace refs.
+hint:
+hint: Turn this message off by running
+hint: "git config set advice.graftFileDeprecated false"
+Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
+Switched to branch 'branch2'
+ok 23 - blame huge graft
+
+expecting success of 8002.24 'setup incomplete line': 
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="C" GIT_AUTHOR_EMAIL="C@test.git" \
+	git commit -a -m "Incomplete"
+
+[branch2 565fef5] Incomplete
+ Author: C <C@test.git>
+ 1 file changed, 1 insertion(+)
+ok 24 - setup incomplete line
+
+expecting success of 8002.25 'blame incomplete line': 
+	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
+
+git blame -c  file 
+Author A (expected 2, attributed 2) good
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
+ok 25 - blame incomplete line
+
+expecting success of 8002.26 'setup edits': 
+	mv file file.orig &&
+	{
+		cat file.orig &&
+		echo
+	} | sed -e "s/^3A/99/" -e "/^1A/d" -e "/^incomplete/d" >file &&
+	echo "incomplete" | tr -d "\\012" >>file &&
+	GIT_AUTHOR_NAME="D" GIT_AUTHOR_EMAIL="D@test.git" \
+	git commit -a -m "edit"
+
+[branch2 96588b8] edit
+ Author: D <D@test.git>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 26 - setup edits
+
+expecting success of 8002.27 'blame edits': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
+
+git blame -c  file 
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 27 - blame edits
+
+expecting success of 8002.28 'setup obfuscated email': 
+	echo "No robots allowed" >file.new &&
+	cat file >>file.new &&
+	mv file.new file &&
+	GIT_AUTHOR_NAME="E" GIT_AUTHOR_EMAIL="E at test dot git" \
+	git commit -a -m "norobots"
+
+[branch2 04f7693] norobots
+ Author: E <E at test dot git>
+ 1 file changed, 1 insertion(+)
+ok 28 - setup obfuscated email
+
+expecting success of 8002.29 'blame obfuscated email': 
+	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  file 
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 29 - blame obfuscated email
+
+expecting success of 8002.30 'blame -L 1 (all)': 
+	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L1 file 
+Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 30 - blame -L 1 (all)
+
+expecting success of 8002.31 'blame -L , (all)': 
+	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L, file 
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 31 - blame -L , (all)
+
+expecting success of 8002.32 'blame -L X (X to end)': 
+	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L5 file 
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 32 - blame -L X (X to end)
+
+expecting success of 8002.33 'blame -L X, (X to end)': 
+	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L5, file 
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 33 - blame -L X, (X to end)
+
+expecting success of 8002.34 'blame -L ,Y (up to Y)': 
+	check_count -L,3 A 1 B2 1 E 1
+
+git blame -c  -L,3 file 
+Author B2 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 34 - blame -L ,Y (up to Y)
+
+expecting success of 8002.35 'blame -L X,X': 
+	check_count -L3,3 B2 1
+
+git blame -c  -L3,3 file 
+Author B2 (expected 1, attributed 1) good
+ok 35 - blame -L X,X
+
+expecting success of 8002.36 'blame -L X,Y': 
+	check_count -L3,6 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L3,6 file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 36 - blame -L X,Y
+
+expecting success of 8002.37 'blame -L Y,X (undocumented)': 
+	check_count -L6,3 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L6,3 file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 37 - blame -L Y,X (undocumented)
+
+expecting success of 8002.38 'blame -L -X': 
+	test_must_fail $PROG -L-1 file
+
+fatal: -L invalid line number: -1
+ok 38 - blame -L -X
+
+expecting success of 8002.39 'blame -L 0': 
+	test_must_fail $PROG -L0 file
+
+fatal: -L invalid line number: 0
+ok 39 - blame -L 0
+
+expecting success of 8002.40 'blame -L ,0': 
+	test_must_fail $PROG -L,0 file
+
+fatal: -L invalid line number: 0
+ok 40 - blame -L ,0
+
+expecting success of 8002.41 'blame -L ,+0': 
+	test_must_fail $PROG -L,+0 file
+
+fatal: -L invalid empty range
+ok 41 - blame -L ,+0
+
+expecting success of 8002.42 'blame -L X,+0': 
+	test_must_fail $PROG -L1,+0 file
+
+fatal: -L invalid empty range
+ok 42 - blame -L X,+0
+
+expecting success of 8002.43 'blame -L X,+1': 
+	check_count -L3,+1 B2 1
+
+git blame -c  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 43 - blame -L X,+1
+
+expecting success of 8002.44 'blame -L X,+N': 
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L3,+4 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 44 - blame -L X,+N
+
+expecting success of 8002.45 'blame -L ,-0': 
+	test_must_fail $PROG -L,-0 file
+
+fatal: -L invalid empty range
+ok 45 - blame -L ,-0
+
+expecting success of 8002.46 'blame -L X,-0': 
+	test_must_fail $PROG -L1,-0 file
+
+fatal: -L invalid empty range
+ok 46 - blame -L X,-0
+
+expecting success of 8002.47 'blame -L X,-1': 
+	check_count -L3,-1 B2 1
+
+git blame -c  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 47 - blame -L X,-1
+
+expecting success of 8002.48 'blame -L X,-N': 
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+
+git blame -c  -L6,-4 file 
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 48 - blame -L X,-N
+
+expecting success of 8002.49 'blame -L /RE/ (RE to end)': 
+	check_count -L/evil/ C 1 "A U Thor" 1
+
+git blame -c  -L/evil/ file 
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 49 - blame -L /RE/ (RE to end)
+
+expecting success of 8002.50 'blame -L /RE/,/RE2/': 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+
+git blame -c  -L/robot/,/green/ file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 50 - blame -L /RE/,/RE2/
+
+expecting success of 8002.51 'blame -L X,/RE/': 
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L5,/evil/ file 
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 51 - blame -L X,/RE/
+
+expecting success of 8002.52 'blame -L /RE/,Y': 
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L/99/,7 file 
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 52 - blame -L /RE/,Y
+
+expecting success of 8002.53 'blame -L /RE/,+N': 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+
+git blame -c  -L/99/,+3 file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 53 - blame -L /RE/,+N
+
+expecting success of 8002.54 'blame -L /RE/,-N': 
+	check_count -L/99/,-3 B 1 B2 1 D 1
+
+git blame -c  -L/99/,-3 file 
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 54 - blame -L /RE/,-N
+
+expecting success of 8002.55 'blame -L X (X == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+
+git blame -c  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 55 - blame -L X (X == nlines)
+
+expecting success of 8002.56 'blame -L X (X == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
+
+fatal: file file has only 8 lines
+ok 56 - blame -L X (X == nlines + 1)
+
+expecting success of 8002.57 'blame -L X (X > nlines)': 
+	test_must_fail $PROG -L12345 file
+
+fatal: file file has only 8 lines
+ok 57 - blame -L X (X > nlines)
+
+expecting success of 8002.58 'blame -L ,Y (Y == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,8 file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 58 - blame -L ,Y (Y == nlines)
+
+expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,9 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 59 - blame -L ,Y (Y == nlines + 1)
+
+expecting success of 8002.60 'blame -L ,Y (Y > nlines)': 
+	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git blame -c  -L,12345 file 
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 60 - blame -L ,Y (Y > nlines)
+
+expecting success of 8002.61 'blame -L multiple (disjoint)': 
+	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
+
+git blame -c  -L2,3 -L6,7 file 
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 61 - blame -L multiple (disjoint)
+
+expecting success of 8002.62 'blame -L multiple (disjoint: unordered)': 
+	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
+
+git blame -c  -L6,7 -L2,3 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 62 - blame -L multiple (disjoint: unordered)
+
+expecting success of 8002.63 'blame -L multiple (adjacent)': 
+	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+
+git blame -c  -L2,3 -L4,5 file 
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 63 - blame -L multiple (adjacent)
+
+expecting success of 8002.64 'blame -L multiple (adjacent: unordered)': 
+	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+
+git blame -c  -L4,5 -L2,3 file 
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 64 - blame -L multiple (adjacent: unordered)
+
+expecting success of 8002.65 'blame -L multiple (overlapping)': 
+	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
+
+git blame -c  -L2,4 -L3,5 file 
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 65 - blame -L multiple (overlapping)
+
+expecting success of 8002.66 'blame -L multiple (overlapping: unordered)': 
+	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+
+git blame -c  -L3,5 -L2,4 file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 66 - blame -L multiple (overlapping: unordered)
+
+expecting success of 8002.67 'blame -L multiple (superset/subset)': 
+	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L2,8 -L3,5 file 
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 67 - blame -L multiple (superset/subset)
+
+expecting success of 8002.68 'blame -L multiple (superset/subset: unordered)': 
+	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,5 -L2,8 file 
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 68 - blame -L multiple (superset/subset: unordered)
+
+expecting success of 8002.69 'blame -L /RE/ (relative)': 
+	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L3,3 -L/fox/ file 
+Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 69 - blame -L /RE/ (relative)
+
+expecting success of 8002.70 'blame -L /RE/ (relative: no preceding range)': 
+	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git blame -c  -L/dog/ file 
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 70 - blame -L /RE/ (relative: no preceding range)
+
+expecting success of 8002.71 'blame -L /RE/ (relative: adjacent)': 
+	check_count -L1,1 -L/dog/,+1 A 1 E 1
+
+git blame -c  -L1,1 -L/dog/,+1 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 71 - blame -L /RE/ (relative: adjacent)
+
+expecting success of 8002.72 'blame -L /RE/ (relative: not found)': 
+	test_must_fail $PROG -L4,4 -L/dog/ file
+
+fatal: -L parameter 'dog' starting at line 5: No match
+ok 72 - blame -L /RE/ (relative: not found)
+
+expecting success of 8002.73 'blame -L /RE/ (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L/$/ file
+
+fatal: file file has only 8 lines
+ok 73 - blame -L /RE/ (relative: end-of-file)
+
+expecting success of 8002.74 'blame -L ^/RE/ (absolute)': 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L3,3 -L^/dog/,+2 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 74 - blame -L ^/RE/ (absolute)
+
+expecting success of 8002.75 'blame -L ^/RE/ (absolute: no preceding range)': 
+	check_count -L^/dog/,+2 A 1 B2 1
+
+git blame -c  -L^/dog/,+2 file 
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+
+expecting success of 8002.76 'blame -L ^/RE/ (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+
+fatal: -L parameter 'tambourine' starting at line 1: No match
+ok 76 - blame -L ^/RE/ (absolute: not found)
+
+expecting success of 8002.77 'blame -L ^/RE/ (absolute: end-of-file)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+
+git blame -c  -L8 -L^/$/,+2 file 
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+
+expecting success of 8002.78 'setup -L :regex': 
+	tr Q "\\t" >hello.c <<-\EOF &&
+	int main(int argc, const char *argv[])
+	{
+	Qputs("hello");
+	}
+	EOF
+	git add hello.c &&
+	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+	git commit -m "hello" &&
+
+	mv hello.c hello.orig &&
+	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+	tr Q "\\t" >hello.c &&
+	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+	git commit -a -m "goodbye" &&
+
+	mv hello.c hello.orig &&
+	echo "#include <stdio.h>" >hello.c &&
+	cat hello.orig >>hello.c &&
+	tr Q "\\t" >>hello.c <<-\EOF &&
+	void mail()
+	{
+	Qputs("mail");
+	}
+	EOF
+	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+	git commit -a -m "mail"
+
+[branch2 f82005e] hello
+ Author: F <F@test.git>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 hello.c
+[branch2 edbab84] goodbye
+ Author: G <G@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 846166b] mail
+ Author: H <H@test.git>
+ 1 file changed, 5 insertions(+)
+ok 78 - setup -L :regex
+
+expecting success of 8002.79 'blame -L :literal': 
+	check_count -f hello.c -L:main F 4 G 1
+
+git blame -c  -L:main hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 79 - blame -L :literal
+
+expecting success of 8002.80 'blame -L :regex': 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+
+git blame -c  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 80 - blame -L :regex
+
+expecting success of 8002.81 'blame -L :nomatch': 
+	test_must_fail $PROG -L:nomatch hello.c
+
+fatal: -L parameter 'nomatch' starting at line 1: no match
+ok 81 - blame -L :nomatch
+
+expecting success of 8002.82 'blame -L :RE (relative)': 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+
+git blame -c  -L3,3 -L:ma.. hello.c 
+Author F (expected 1, attributed 1) good
+Author H (expected 4, attributed 4) good
+ok 82 - blame -L :RE (relative)
+
+expecting success of 8002.83 'blame -L :RE (relative: no preceding range)': 
+	check_count -f hello.c -L:ma.. F 4 G 1
+
+git blame -c  -L:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 83 - blame -L :RE (relative: no preceding range)
+
+expecting success of 8002.84 'blame -L :RE (relative: not found)': 
+	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 4: no match
+ok 84 - blame -L :RE (relative: not found)
+
+expecting success of 8002.85 'blame -L :RE (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L:main hello.c
+
+fatal: -L parameter 'main' starting at line 11: no match
+ok 85 - blame -L :RE (relative: end-of-file)
+
+expecting success of 8002.86 'blame -L ^:RE (absolute)': 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+
+git blame -c  -L3,3 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 86 - blame -L ^:RE (absolute)
+
+expecting success of 8002.87 'blame -L ^:RE (absolute: no preceding range)': 
+	check_count -f hello.c -L^:ma.. F 4 G 1
+
+git blame -c  -L^:ma.. hello.c 
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 87 - blame -L ^:RE (absolute: no preceding range)
+
+expecting success of 8002.88 'blame -L ^:RE (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 1: no match
+ok 88 - blame -L ^:RE (absolute: not found)
+
+expecting success of 8002.89 'blame -L ^:RE (absolute: end-of-file)': 
+	n=$(printf "%d" $(wc -l <hello.c)) &&
+	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+
+git blame -c  -L10 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author H (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 89 - blame -L ^:RE (absolute: end-of-file)
+
+expecting success of 8002.90 'blame -L :funcname with userdiff driver': 
+	cat >file.template <<-\EOF &&
+	DO NOT MATCH THIS LINE
+	function RIGHT(a, b) result(c)
+	AS THE DEFAULT DRIVER WOULD
+
+	integer, intent(in) :: ChangeMe
+	EOF
+
+	fortran_file=file.f03 &&
+	test_when_finished "rm .gitattributes" &&
+	echo "$fortran_file diff=fortran" >.gitattributes &&
+
+	test_commit --author "A <A@test.git>" \
+		"add" "$fortran_file" \
+		"$(cat file.template)" &&
+	test_commit --author "B <B@test.git>" \
+		"change" "$fortran_file" \
+		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
+	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
+
+[branch2 6b1b7a1] add
+ Author: A <A@test.git>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file.f03
+[branch2 7caa17d] change
+ Author: B <B@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+git blame -c  -L:RIGHT file.f03 
+Author B (expected 1, attributed 1) good
+Author A (expected 3, attributed 3) good
+ok 90 - blame -L :funcname with userdiff driver
+
+expecting success of 8002.91 'setup incremental': 
+	(
+	GIT_AUTHOR_NAME=I &&
+	export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=I@test.git &&
+	export GIT_AUTHOR_EMAIL &&
+	>incremental &&
+	git add incremental &&
+	git commit -m "step 0" &&
+	printf "partial" >>incremental &&
+	git commit -a -m "step 0.5" &&
+	echo >>incremental &&
+	git commit -a -m "step 1"
+	)
+
+[branch2 6c56eef] step 0
+ Author: I <I@test.git>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 incremental
+[branch2 c79b19e] step 0.5
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 f65a7a7] step 1
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 91 - setup incremental
+
+expecting success of 8002.92 'blame empty': 
+	check_count -h HEAD^^ -f incremental
+
+git blame -c  incremental HEAD^^
+ok 92 - blame empty
+
+expecting success of 8002.93 'blame -L 0 empty': 
+	test_must_fail $PROG -L0 incremental HEAD^^
+
+fatal: -L invalid line number: 0
+ok 93 - blame -L 0 empty
+
+expecting success of 8002.94 'blame -L 1 empty': 
+	test_must_fail $PROG -L1 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 94 - blame -L 1 empty
+
+expecting success of 8002.95 'blame -L 2 empty': 
+	test_must_fail $PROG -L2 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 95 - blame -L 2 empty
+
+expecting success of 8002.96 'blame half': 
+	check_count -h HEAD^ -f incremental I 1
+
+git blame -c  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 96 - blame half
+
+expecting success of 8002.97 'blame -L 0 half': 
+	test_must_fail $PROG -L0 incremental HEAD^
+
+fatal: -L invalid line number: 0
+ok 97 - blame -L 0 half
+
+expecting success of 8002.98 'blame -L 1 half': 
+	check_count -h HEAD^ -f incremental -L1 I 1
+
+git blame -c  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 98 - blame -L 1 half
+
+expecting success of 8002.99 'blame -L 2 half': 
+	test_must_fail $PROG -L2 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 99 - blame -L 2 half
+
+expecting success of 8002.100 'blame -L 3 half': 
+	test_must_fail $PROG -L3 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 100 - blame -L 3 half
+
+expecting success of 8002.101 'blame full': 
+	check_count -f incremental I 1
+
+git blame -c  incremental 
+Author I (expected 1, attributed 1) good
+ok 101 - blame full
+
+expecting success of 8002.102 'blame -L 0 full': 
+	test_must_fail $PROG -L0 incremental
+
+fatal: -L invalid line number: 0
+ok 102 - blame -L 0 full
+
+expecting success of 8002.103 'blame -L 1 full': 
+	check_count -f incremental -L1 I 1
+
+git blame -c  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 103 - blame -L 1 full
+
+expecting success of 8002.104 'blame -L 2 full': 
+	test_must_fail $PROG -L2 incremental
+
+fatal: file incremental has only 1 line
+ok 104 - blame -L 2 full
+
+expecting success of 8002.105 'blame -L 3 full': 
+	test_must_fail $PROG -L3 incremental
+
+fatal: file incremental has only 1 line
+ok 105 - blame -L 3 full
+
+expecting success of 8002.106 'blame -L': 
+	test_must_fail $PROG -L file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 106 - blame -L
+
+expecting success of 8002.107 'blame -L X,+': 
+	test_must_fail $PROG -L1,+ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 107 - blame -L X,+
+
+expecting success of 8002.108 'blame -L X,-': 
+	test_must_fail $PROG -L1,- file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 108 - blame -L X,-
+
+expecting success of 8002.109 'blame -L X (non-numeric X)': 
+	test_must_fail $PROG -LX file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 109 - blame -L X (non-numeric X)
+
+expecting success of 8002.110 'blame -L X,Y (non-numeric Y)': 
+	test_must_fail $PROG -L1,Y file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 110 - blame -L X,Y (non-numeric Y)
+
+expecting success of 8002.111 'blame -L X,+N (non-numeric N)': 
+	test_must_fail $PROG -L1,+N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 111 - blame -L X,+N (non-numeric N)
+
+expecting success of 8002.112 'blame -L X,-N (non-numeric N)': 
+	test_must_fail $PROG -L1,-N file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 112 - blame -L X,-N (non-numeric N)
+
+expecting success of 8002.113 'blame -L ,^/RE/': 
+	test_must_fail $PROG -L1,^/99/ file
+
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 113 - blame -L ,^/RE/
+
+expecting success of 8002.114 'blame progress on a full file': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
+f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 114 - blame progress on a full file
+
+expecting success of 8002.115 'blame progress on a single range': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
+ok 115 - blame progress on a single range
+
+expecting success of 8002.116 'blame progress on multiple ranges': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 116 - blame progress on multiple ranges
+
+expecting success of 8002.117 'setup': 
+	hexsz=$(test_oid hexsz)
+
+ok 117 - setup
+
+expecting success of 8002.118 'blame untracked file in empty repo': 
+	>untracked &&
+	test_must_fail git blame untracked
+
+fatal: no such path 'untracked' in HEAD
+ok 118 - blame untracked file in empty repo
+
+expecting success of 8002.119 'blame --show-email': 
+	check_count \
+		"<A@test.git>" 1 \
+		"<B@test.git>" 1 \
+		"<B1@test.git>" 1 \
+		"<B2@test.git>" 1 \
+		"<author@example.com>" 1 \
+		"<C@test.git>" 1 \
+		"<D@test.git>" 1 \
+		"<E at test dot git>" 1
+
+git blame -c -e  file 
+Author <E at test dot git> (expected 1, attributed 1) good
+Author <C@test.git> (expected 1, attributed 1) good
+Author <D@test.git> (expected 1, attributed 1) good
+Author <B2@test.git> (expected 1, attributed 1) good
+Author <A@test.git> (expected 1, attributed 1) good
+Author <B1@test.git> (expected 1, attributed 1) good
+Author <B@test.git> (expected 1, attributed 1) good
+Author <author@example.com> (expected 1, attributed 1) good
+ok 119 - blame --show-email
+
+expecting success of 8002.120 'setup showEmail tests': 
+	echo "bin: test number 1" >one &&
+	git add one &&
+	GIT_AUTHOR_NAME=name1 \
+	GIT_AUTHOR_EMAIL=email1@test.git \
+	git commit -m First --date="2010-01-01 01:00:00" &&
+	cat >expected_n <<-\EOF &&
+	(name1 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+	cat >expected_e <<-\EOF
+	(<email1@test.git> 2010-01-01 01:00:00 +0000 1) bin: test number 1
+	EOF
+
+[branch2 c39471f] First
+ Author: name1 <email1@test.git>
+ Date: Fri Jan 1 01:00:00 2010 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+ok 120 - setup showEmail tests
+
+expecting success of 8002.121 'blame with no options and no config': 
+	git blame one >blame &&
+	find_blame <blame >result &&
+	test_cmp expected_n result
+
+ok 121 - blame with no options and no config
+
+expecting success of 8002.122 'blame with showemail options': 
+	git blame --show-email one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_n result
+
+ok 122 - blame with showemail options
+
+expecting success of 8002.123 'blame with showEmail config false': 
+	git config blame.showEmail false &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_n result &&
+	git blame --show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_e result &&
+	git blame -e one >blame3 &&
+	find_blame <blame3 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame4 &&
+	find_blame <blame4 >result &&
+	test_cmp expected_n result
+
+ok 123 - blame with showEmail config false
+
+expecting success of 8002.124 'blame with showEmail config true': 
+	git config blame.showEmail true &&
+	git blame one >blame1 &&
+	find_blame <blame1 >result &&
+	test_cmp expected_e result &&
+	git blame --no-show-email one >blame2 &&
+	find_blame <blame2 >result &&
+	test_cmp expected_n result
+
+ok 124 - blame with showEmail config true
+
+expecting success of 8002.125 'set up abbrev tests': 
+	test_commit abbrev &&
+	sha1=$(git rev-parse --verify HEAD) &&
+	check_abbrev () {
+		expect=$1 && shift &&
+		echo $sha1 | cut -c 1-$expect >expect &&
+		git blame "$@" abbrev.t >actual &&
+		perl -lne "/[0-9a-f]+/ and print \$&" <actual >actual.sha &&
+		test_cmp expect actual.sha
+	}
+
+[branch2 32e5f6f] abbrev
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 abbrev.t
+ok 125 - set up abbrev tests
+
+expecting success of 8002.126 'blame --abbrev=<n> works': 
+	# non-boundary commits get +1 for alignment
+	check_abbrev 31 --abbrev=30 HEAD &&
+	check_abbrev 30 --abbrev=30 ^HEAD
+
+ok 126 - blame --abbrev=<n> works
+
+expecting success of 8002.127 'blame -l aligns regular and boundary commits': 
+	check_abbrev $hexsz         -l HEAD &&
+	check_abbrev $((hexsz - 1)) -l ^HEAD
+
+ok 127 - blame -l aligns regular and boundary commits
+
+expecting success of 8002.128 'blame --abbrev with full length behaves like -l': 
+	check_abbrev $hexsz         --abbrev=$hexsz HEAD &&
+	check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
+
+ok 128 - blame --abbrev with full length behaves like -l
+
+expecting success of 8002.129 '--no-abbrev works like --abbrev with full length': 
+	check_abbrev $hexsz --no-abbrev
+
+ok 129 - --no-abbrev works like --abbrev with full length
+
+expecting success of 8002.130 'blame --abbrev gets truncated': 
+	check_abbrev $hexsz --abbrev=9000 HEAD
+
+ok 130 - blame --abbrev gets truncated
+
+expecting success of 8002.131 'blame --abbrev gets truncated with boundary commit': 
+	check_abbrev $hexsz --abbrev=9000 ^HEAD
+
+ok 131 - blame --abbrev gets truncated with boundary commit
+
+expecting success of 8002.132 'blame --abbrev -b truncates the blank boundary': 
+	# Note that `--abbrev=` always gets incremented by 1, which is why we
+	# expect 11 leading spaces and not 10.
+	cat >expect <<-EOF &&
+	$(printf "%11s" "") (<author@example.com> 2005-04-07 15:45:13 -0700 1) abbrev
+	EOF
+	git blame -b --abbrev=10 ^HEAD -- abbrev.t >actual &&
+	test_cmp expect actual
+
+ok 132 - blame --abbrev -b truncates the blank boundary
+
+expecting success of 8002.133 'blame with excessive --abbrev and -b culls to hash length': 
+	cat >expect <<-EOF &&
+	$(printf "%${hexsz}s" "") (<author@example.com> 2005-04-07 15:45:13 -0700 1) abbrev
+	EOF
+	git blame -b --abbrev=9000 ^HEAD -- abbrev.t >actual &&
+	test_cmp expect actual
+
+ok 133 - blame with excessive --abbrev and -b culls to hash length
+
+expecting success of 8002.134 '--exclude-promisor-objects does not BUG-crash': 
+	test_must_fail git blame --exclude-promisor-objects one
+
+error: unknown option `--exclude-promisor-objects'
+usage: git blame [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 134 - --exclude-promisor-objects does not BUG-crash
+
+expecting success of 8002.135 'blame with uncommitted edits in partial clone does not crash': 
+	git init server &&
+	echo foo >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m file &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	echo bar >>client/file.txt &&
+	git -C client blame file.txt
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8002-blame/server/.git/
+[main (root-commit) a09dc96] file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+Cloning into 'client'...
+warning: filtering not recognized by server, ignoring
+^a09dc96 (A U Thor          2005-04-07 15:45:13 -0700 1) foo
+00000000 (Not Committed Yet 2025-03-17 13:29:19 +0000 2) bar
+ok 135 - blame with uncommitted edits in partial clone does not crash
+
+# passed all 135 test(s)
+1..135
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8008-blame-formats.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8008-blame-formats/.git/
+expecting success of 8008.1 'setup': 
+	echo a >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one &&
+	echo b >>file &&
+	echo c >>file &&
+	echo d >>file &&
+	test_tick &&
+	git commit -a -m two &&
+	ID1=$(git rev-parse HEAD^) &&
+	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
+	ID2=$(git rev-parse HEAD) &&
+	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
+
+[master (root-commit) baf5e0b] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 8825379] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ok 1 - setup
+
+expecting success of 8008.2 'normal blame output': 
+	git blame --abbrev=17 file >actual &&
+	test_cmp expect actual
+
+ok 2 - normal blame output
+
+expecting success of 8008.3 'blame --porcelain output': 
+	git blame --porcelain file >actual &&
+	test_cmp expect actual
+
+ok 3 - blame --porcelain output
+
+expecting success of 8008.4 'blame --line-porcelain output': 
+	git blame --line-porcelain file >actual &&
+	test_cmp expect actual
+
+ok 4 - blame --line-porcelain output
+
+expecting success of 8008.5 '--porcelain detects first non-blank line as subject': 
+	(
+		GIT_INDEX_FILE=.git/tmp-index &&
+		export GIT_INDEX_FILE &&
+		echo "This is it" >single-file &&
+		git add single-file &&
+		tree=$(git write-tree) &&
+		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
+			"tree $tree" \
+			"author A <a@b.c> 123456789 +0000" \
+			"committer C <c@d.e> 123456789 +0000" |
+		git hash-object -w -t commit --stdin) &&
+		git blame --porcelain $commit -- single-file >output &&
+		grep "^summary oneline$" output
+	)
+
+summary oneline
+ok 5 - --porcelain detects first non-blank line as subject
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8007-cat-file-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8007-cat-file-textconv/.git/
+expecting success of 8007.1 'setup ': 
+	echo "bin: test" >one.bin &&
+	test_ln_s_add one.bin symlink.bin &&
+	git add . &&
+	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
+	echo "bin: test version 2" >one.bin &&
+	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 6a4de31] First
+ Author: Number1 <author@example.com>
+ Date: Fri Jan 1 18:00:00 2010 +0000
+ 3 files changed, 5 insertions(+)
+ create mode 100755 helper
+ create mode 100644 one.bin
+ create mode 120000 symlink.bin
+[master aa3beaa] Second
+ Author: Number2 <author@example.com>
+ Date: Fri Jan 1 20:00:00 2010 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup 
+
+expecting success of 8007.2 'usage: <bad rev>': 
+	cat >expect <<-\EOF &&
+	fatal: Not a valid object name HEAD2
+	EOF
+	test_must_fail git cat-file --textconv HEAD2 2>actual &&
+	test_cmp expect actual
+
+ok 2 - usage: <bad rev>
+
+expecting success of 8007.3 'usage: <bad rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 3 - usage: <bad rev>:<bad path>
+
+expecting success of 8007.4 'usage: <rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: path 'two.bin' does not exist in 'HEAD'
+	EOF
+	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 4 - usage: <rev>:<bad path>
+
+expecting success of 8007.5 'usage: <rev> with no <path>': 
+	cat >expect <<-\EOF &&
+	fatal: <object>:<path> required, only <object> 'HEAD' given
+	EOF
+	test_must_fail git cat-file --textconv HEAD 2>actual &&
+	test_cmp expect actual
+
+ok 5 - usage: <rev> with no <path>
+
+expecting success of 8007.6 'usage: <bad rev>:<good (in HEAD) path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+	test_cmp expect actual
+
+ok 6 - usage: <bad rev>:<good (in HEAD) path>
+
+expecting success of 8007.7 'no filter specified': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 7 - no filter specified
+
+expecting success of 8007.8 'setup textconv filters': 
+	echo "*.bin diff=test" >.gitattributes &&
+	git config diff.test.textconv ./helper &&
+	git config diff.test.cachetextconv false
+
+ok 8 - setup textconv filters
+
+expecting success of 8007.9 'cat-file without --textconv': 
+	git cat-file blob :one.bin >result &&
+	test_cmp expected result
+
+ok 9 - cat-file without --textconv
+
+expecting success of 8007.10 'cat-file without --textconv on previous commit': 
+	git cat-file -p HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 10 - cat-file without --textconv on previous commit
+
+expecting success of 8007.11 'cat-file --textconv on last commit': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 11 - cat-file --textconv on last commit
+
+expecting success of 8007.12 'cat-file --textconv on previous commit': 
+	git cat-file --textconv HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 12 - cat-file --textconv on previous commit
+
+expecting success of 8007.13 'cat-file without --textconv (symlink)': 
+	printf "%s" "one.bin" >expected &&
+	git cat-file blob :symlink.bin >result &&
+	test_cmp expected result
+
+ok 13 - cat-file without --textconv (symlink)
+
+expecting success of 8007.14 'cat-file --textconv on index (symlink)': 
+	git cat-file --textconv :symlink.bin >result &&
+	test_cmp expected result
+
+ok 14 - cat-file --textconv on index (symlink)
+
+expecting success of 8007.15 'cat-file --textconv on HEAD (symlink)': 
+	git cat-file --textconv HEAD:symlink.bin >result &&
+	test_cmp expected result
+
+ok 15 - cat-file --textconv on HEAD (symlink)
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8009-blame-vs-topicbranches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8009-blame-vs-topicbranches/.git/
+expecting success of 8009.1 'setup': 
+	test_commit A0 file.t line0 &&
+	test_commit A1 &&
+	git reset --hard A0 &&
+	test_commit B1 &&
+	test_commit B2 file.t line0changed &&
+	git reset --hard A1 &&
+	test_merge A2 B2 &&
+	git reset --hard A1 &&
+	test_commit C1 &&
+	git reset --hard A2 &&
+	test_merge A3 C1
+	
+[master (root-commit) 2152206] A0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+[master 5392e14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+HEAD is now at 2152206 A0
+[master 15a8c72] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B1.t
+[master e1433f5] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392e14 A1
+Merge made by the 'ort' strategy.
+ B1.t   | 1 +
+ file.t | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B1.t
+HEAD is now at 5392e14 A1
+[master fa266ba] C1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+HEAD is now at 6e3b304 A2
+Merge made by the 'ort' strategy.
+ C1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+ok 1 - setup
+
+expecting success of 8009.2 'blame --reverse --first-parent finds A1': 
+	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
+	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
+	git rev-parse A1 >expect &&
+	test_cmp expect actual
+	
+ok 2 - blame --reverse --first-parent finds A1
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7112-reset-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/.git/
+expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
+
+expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
+
+expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
+
+expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
+
+checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
+not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
 
-expecting success of 7810.232 'grep invalidpattern properly dies with grep.patternType=perl': 
-	test_must_fail git -c grep.patterntype=perl grep "a["
+expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-fatal: command line, 'a[': missing terminating ] for character class
-ok 232 - grep invalidpattern properly dies with grep.patternType=perl
+expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			test_must_fail $command add_sub1 &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
 
-expecting success of 7810.233 'grep -G -E -F pattern': 
-	echo "ab:a+b*c" >expected &&
-	git grep -G -E -F "a+b*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
+		test_when_finished "rm -rf submodule_update/.git/info" &&
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			mkdir .git/info &&
+			echo sub1 >.git/info/exclude &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
 
-ok 233 - grep -G -E -F pattern
+checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_submodule_content sub1 origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
 
-expecting success of 7810.234 'grep pattern with grep.patternType=basic, =extended, =fixed': 
-	echo "ab:a+b*c" >expected &&
-	git \
-		-c grep.patterntype=basic \
-		-c grep.patterntype=extended \
-		-c grep.patterntype=fixed \
-		grep "a+b*c" ab >actual &&
-	test_cmp expected actual
+checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
 
-ok 234 - grep pattern with grep.patternType=basic, =extended, =fixed
+expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
+		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm -rf .git/modules/sub1/info &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			mkdir .git/modules/sub1/info &&
+			echo ignored >.git/modules/sub1/info/exclude &&
+			: >sub1/ignored &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
 
-expecting success of 7810.235 'grep -E -F -G pattern': 
-	echo "ab:a+bc" >expected &&
-	git grep -E -F -G "a+b*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			git -c submodule.recurse=true $cmd_args modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
 
-ok 235 - grep -E -F -G pattern
+expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
 
-expecting success of 7810.236 'grep pattern with grep.patternType=extended, =fixed, =basic': 
-	echo "ab:a+bc" >expected &&
-	git \
-		-c grep.patterntype=extended \
-		-c grep.patterntype=fixed \
-		-c grep.patterntype=basic \
-		grep "a+b*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
 
-ok 236 - grep pattern with grep.patternType=extended, =fixed, =basic
+expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
 
-expecting success of 7810.237 'grep -F -G -E pattern': 
-	echo "ab:abc" >expected &&
-	git grep -F -G -E "a+b*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
 
-ok 237 - grep -F -G -E pattern
+expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
 
-expecting success of 7810.238 'grep pattern with grep.patternType=fixed, =basic, =extended': 
-	echo "ab:abc" >expected &&
-	git \
-		-c grep.patterntype=fixed \
-		-c grep.patterntype=basic \
-		-c grep.patterntype=extended \
-		grep "a+b*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+HEAD is now at 953e869 update sub1, that updates nested sub
+ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
 
-ok 238 - grep pattern with grep.patternType=fixed, =basic, =extended
+expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
 
-expecting success of 7810.239 'grep -G -F -P -E pattern': 
-	echo "d0:d" >expected &&
-	git grep -G -F -P -E "[\d]" d0 >actual &&
-	test_cmp expected actual
+expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
 
-ok 239 - grep -G -F -P -E pattern
+expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
 
-expecting success of 7810.240 'grep pattern with grep.patternType=fixed, =basic, =perl, =extended': 
-	echo "d0:d" >expected &&
-	git \
-		-c grep.patterntype=fixed \
-		-c grep.patterntype=basic \
-		-c grep.patterntype=perl \
-		-c grep.patterntype=extended \
-		grep "[\d]" d0 >actual &&
-	test_cmp expected actual
+checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
+not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-ok 240 - grep pattern with grep.patternType=fixed, =basic, =perl, =extended
+expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+HEAD is now at 27611a5 Base
+ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
 
-expecting success of 7810.241 'grep -G -F -E -P pattern': 
-	echo "d0:0" >expected &&
-	git grep -G -F -E -P "[\d]" d0 >actual &&
-	test_cmp expected actual
+expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
 
-ok 241 - grep -G -F -E -P pattern
+expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
 
-expecting success of 7810.242 'grep pattern with grep.patternType=fixed, =basic, =extended, =perl': 
-	echo "d0:0" >expected &&
-	git \
-		-c grep.patterntype=fixed \
-		-c grep.patterntype=basic \
-		-c grep.patterntype=extended \
-		-c grep.patterntype=perl \
-		grep "[\d]" d0 >actual &&
-	test_cmp expected actual
+expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+fatal: ref HEAD is not a symbolic ref
+ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-ok 242 - grep pattern with grep.patternType=fixed, =basic, =extended, =perl
+expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
 
-expecting success of 7810.243 'grep -P pattern with grep.patternType=fixed': 
-	echo "ab:a+b*c" >expected &&
-	git \
-		-c grep.patterntype=fixed \
-		grep -P "a\x{2b}b\x{2a}c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+HEAD is now at cb28587 Replace sub1 with directory
+ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
 
-ok 243 - grep -P pattern with grep.patternType=fixed
+expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules/sub1 &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at cb28587 Replace sub1 with directory
+ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
 
-expecting success of 7810.244 'grep -F pattern with grep.patternType=basic': 
-	echo "ab:a+b*c" >expected &&
-	git \
-		-c grep.patterntype=basic \
-		grep -F "*c" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/expect &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
 
-ok 244 - grep -F pattern with grep.patternType=basic
+expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to_interested invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+HEAD is now at 3036e4e Revert "Invalid sub1 commit"
+ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
 
-expecting success of 7810.245 'grep -G pattern with grep.patternType=fixed': 
-	cat >expected <<-\EOF &&
-	ab:a+b*c
-	ab:a+bc
-	EOF
-	git \
-		-c grep.patterntype=fixed \
-		grep -G "a+b" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			echo "gitdir: bogus/path" >sub1/.git &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
 
-ok 245 - grep -G pattern with grep.patternType=fixed
+expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm sub1/file1 &&
+			: >sub1/new_file &&
+			git -C sub1 add new_file &&
+			$command HEAD &&
+			test_path_is_file sub1/file1 &&
+			test_path_is_missing sub1/new_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+HEAD is now at 09bcf53 Add sub1
+ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
 
-expecting success of 7810.246 'grep -E pattern with grep.patternType=fixed': 
-	cat >expected <<-\EOF &&
-	ab:a+b*c
-	ab:a+bc
-	ab:abc
-	EOF
-	git \
-		-c grep.patterntype=fixed \
-		grep -E "a+" ab >actual &&
-	test_cmp expected actual
+expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_test_func: added submodule creates empty directory
 
-ok 246 - grep -E pattern with grep.patternType=fixed
+expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 42 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 7810.247 'grep --color, separator': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		normal &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.match		normal &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	red &&
+expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_test_func: replace tracked file with submodule creates empty directory
 
-	git grep --color=always -A1 -e char -e lo_w hello.c hello_world |
-	test_decode_color >actual &&
-	test_cmp expected actual
+expecting success of 7112.44 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_test_func: replace directory with submodule
 
-ok 247 - grep --color, separator
+expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 7810.248 'grep --break': 
-	git grep --break -e char -e lo_w hello.c hello_world >actual &&
-	test_cmp expected actual
+expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-ok 248 - grep --break
+expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 47 - git_test_func: replace submodule with a directory must fail
 
-expecting success of 7810.249 'grep --break with context': 
-	git grep --break -A1 -e char -e lo_w hello.c hello_world >actual &&
-	test_cmp expected actual
+expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-ok 249 - grep --break with context
+checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-expecting success of 7810.250 'grep --heading': 
-	git grep --heading -e char -e lo_w hello.c hello_world >actual &&
-	test_cmp expected actual
+checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-ok 250 - grep --heading
+expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 51 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 7810.251 'mimic ack-grep --group': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		"bold green" &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.match		"black yellow" &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	normal &&
+expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-	git grep --break --heading -n --color \
-		-e char -e lo_w hello.c hello_world |
-	test_decode_color >actual &&
-	test_cmp expected actual
+expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-ok 251 - mimic ack-grep --group
+expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 7810.252 'grep -E "^ "': 
-	git grep -E "^ " space >actual &&
-	test_cmp expected actual
+expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_test_func: added submodule creates empty directory
 
-ok 252 - grep -E "^ "
+expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 56 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 7810.253 'grep -P "^ "': 
-	git grep -P "^ " space >actual &&
-	test_cmp expected actual
+expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 57 - git_test_func: replace tracked file with submodule creates empty directory
 
-ok 253 - grep -P "^ "
+expecting success of 7112.58 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 58 - git_test_func: replace directory with submodule
 
-expecting success of 7810.254 'grep --color -e A -e B with context': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		normal &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.matchContext	normal &&
-	test_config color.grep.matchSelected	red &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	normal &&
+expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-	git grep --color=always -C2 -e "with " -e space2  space |
-	test_decode_color >actual &&
-	test_cmp expected actual
+expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-ok 254 - grep --color -e A -e B with context
+expecting success of 7112.61 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 61 - git_test_func: replace submodule with a directory must fail
 
-expecting success of 7810.255 'grep --color -e A --and -e B with context': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		normal &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.matchContext	normal &&
-	test_config color.grep.matchSelected	red &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	normal &&
+expecting success of 7112.62 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-	git grep --color=always -C2 -e "with " --and -e space2  space |
-	test_decode_color >actual &&
-	test_cmp expected actual
+checking known breakage of 7112.63 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-ok 255 - grep --color -e A --and -e B with context
+checking known breakage of 7112.64 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 7810.256 'grep --color -e A --and --not -e B with context': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		normal &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.matchContext	normal &&
-	test_config color.grep.matchSelected	red &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	normal &&
+expecting success of 7112.65 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 65 - git_test_func: modified submodule does not update submodule work tree
 
-	git grep --color=always -C2 -e "with " --and --not -e space2  space |
-	test_decode_color >actual &&
-	test_cmp expected actual
+expecting success of 7112.66 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-ok 256 - grep --color -e A --and --not -e B with context
+expecting success of 7112.67 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 7810.257 'grep --color -e A --and -e B -p with context': 
-	test_config color.grep.context		normal &&
-	test_config color.grep.filename		normal &&
-	test_config color.grep.function		normal &&
-	test_config color.grep.linenumber	normal &&
-	test_config color.grep.matchContext	normal &&
-	test_config color.grep.matchSelected	red &&
-	test_config color.grep.selected		normal &&
-	test_config color.grep.separator	normal &&
+expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-	git grep --color=always -p -C3 -e int --and -e Hello --no-index hello.c |
-	test_decode_color >actual &&
-	test_cmp expected actual
+expecting success of 7112.69 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 69 - git_test_func: added submodule creates empty directory
 
-ok 257 - grep --color -e A --and -e B -p with context
+expecting success of 7112.70 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 70 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 7810.258 'grep can find things only in the work tree': 
-	: >work-tree-only &&
-	git add work-tree-only &&
-	test_when_finished "git rm -f work-tree-only" &&
-	echo "find in work tree" >work-tree-only &&
-	git grep --quiet "find in work tree" &&
-	test_must_fail git grep --quiet --cached "find in work tree" &&
-	test_must_fail git grep --quiet "find in work tree" HEAD
+expecting success of 7112.71 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 71 - git_test_func: replace tracked file with submodule creates empty directory
 
-rm 'work-tree-only'
-ok 258 - grep can find things only in the work tree
+expecting success of 7112.72 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 72 - git_test_func: replace directory with submodule
 
-expecting success of 7810.259 'grep can find things only in the work tree (i-t-a)': 
-	echo "intend to add this" >intend-to-add &&
-	git add -N intend-to-add &&
-	test_when_finished "git rm -f intend-to-add" &&
-	git grep --quiet "intend to add this" &&
-	test_must_fail git grep --quiet --cached "intend to add this" &&
-	test_must_fail git grep --quiet "intend to add this" HEAD
+expecting success of 7112.73 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-rm 'intend-to-add'
-ok 259 - grep can find things only in the work tree (i-t-a)
+expecting success of 7112.74 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 7810.260 'grep does not search work tree with assume unchanged': 
-	echo "intend to add this" >intend-to-add &&
-	git add -N intend-to-add &&
-	git update-index --assume-unchanged intend-to-add &&
-	test_when_finished "git rm -f intend-to-add" &&
-	test_must_fail git grep --quiet "intend to add this" &&
-	test_must_fail git grep --quiet --cached "intend to add this" &&
-	test_must_fail git grep --quiet "intend to add this" HEAD
+checking known breakage of 7112.75 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
 
-rm 'intend-to-add'
-ok 260 - grep does not search work tree with assume unchanged
+checking known breakage of 7112.76 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
-expecting success of 7810.261 'grep can find things only in the index': 
-	echo "only in the index" >cache-this &&
-	git add cache-this &&
-	rm cache-this &&
-	test_when_finished "git rm --cached cache-this" &&
-	test_must_fail git grep --quiet "only in the index" &&
-	git grep --quiet --cached "only in the index" &&
-	test_must_fail git grep --quiet "only in the index" HEAD
+checking known breakage of 7112.77 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-rm 'cache-this'
-ok 261 - grep can find things only in the index
+checking known breakage of 7112.78 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 7810.262 'grep does not report i-t-a with -L --cached': 
-	echo "intend to add this" >intend-to-add &&
-	git add -N intend-to-add &&
-	test_when_finished "git rm -f intend-to-add" &&
-	git ls-files | grep -v "^intend-to-add\$" >expected &&
-	git grep -L --cached "nonexistent_string" >actual &&
-	test_cmp expected actual
+expecting success of 7112.79 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 79 - git_test_func: modified submodule does not update submodule work tree
 
-rm 'intend-to-add'
-ok 262 - grep does not report i-t-a with -L --cached
+expecting success of 7112.80 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+HEAD is now at e6169bf Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 7810.263 'grep does not report i-t-a and assume unchanged with -L': 
-	echo "intend to add this" >intend-to-add-assume-unchanged &&
-	git add -N intend-to-add-assume-unchanged &&
-	test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
-	git update-index --assume-unchanged intend-to-add-assume-unchanged &&
-	git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
-	git grep -L "nonexistent_string" >actual &&
-	test_cmp expected actual
+expecting success of 7112.81 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+HEAD is now at 3036e4e Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-rm 'intend-to-add-assume-unchanged'
-ok 263 - grep does not report i-t-a and assume unchanged with -L
+expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
 
-# passed all 263 test(s)
-1..263
+# still have 12 known breakage(s)
+# passed all remaining 70 test(s)
+1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7814-grep-recurse-submodules.sh ***
@@ -510891,8 +510828,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-04-19 19:24:46.911659440 +0000
-+++ actual	2026-04-19 19:24:47.023659440 +0000
+--- expect	2025-03-17 13:29:10.739677743 +0000
++++ actual	2025-03-17 13:29:10.775677970 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -510923,8 +510860,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-04-19 19:24:47.987659440 +0000
-+++ actual	2026-04-19 19:24:48.107659440 +0000
+--- expect	2025-03-17 13:29:11.851684769 +0000
++++ actual	2025-03-17 13:29:11.939685325 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -510956,8 +510893,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-04-19 19:24:48.963659440 +0000
-+++ actual	2026-04-19 19:24:49.059659440 +0000
+--- expect	2025-03-17 13:29:13.035692249 +0000
++++ actual	2025-03-17 13:29:13.123692805 +0000
 @@ -1 +1,3 @@
  a:(1|2)x(3|4)
 +submodule/a:(1|2)x(3|4)
@@ -510985,8 +510922,8 @@
 HEAD is now at 0fb48cf add a
 Entering 'submodule'
 Entering 'submodule/sub'
---- expect	2026-04-19 19:24:49.923659440 +0000
-+++ actual	2026-04-19 19:24:49.995659440 +0000
+--- expect	2025-03-17 13:29:14.207699654 +0000
++++ actual	2025-03-17 13:29:14.307700286 +0000
 @@ -1 +1,2 @@
  submodule/a:(1|2)x(3|4)
 +submodule/sub/a:(1|2)x(3|4)
@@ -511074,7 +511011,7 @@
 submodule/a:(1|2)x(3|4)
 submodule/sub/a:(1|2)x(3|4)
 Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 41 Apr 19 19:24 .git/refs/notes/textconv/d2x_cached
+-rw-r--r-- 1 pbuilder2 pbuilder2 41 Mar 17 13:29 .git/refs/notes/textconv/d2x_cached
 not ok 32 - grep saves textconv cache in the appropriate repository # TODO known breakage
 
 expecting success of 7814.33 'grep partially-cloned submodule': 
@@ -511144,7 +511081,7 @@
 Submodule 'sub' (file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
 Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
 Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
-{"event":"data","sid":"20260419T192454.700370Z-H8d819085-P00222f73","thread":"th01:unknown","time":"2026-04-19T19:24:54.734669Z","file":"promisor-remote.c","line":55,"repo":2,"t_abs":0.034509,"t_rel":0.019787,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
+{"event":"data","sid":"20250317T132919.724180Z-H5c947e1c-P0034d2fc","thread":"th01:unknown","time":"2025-03-17T13:29:19.748264Z","file":"promisor-remote.c","line":55,"repo":2,"t_abs":0.024292,"t_rel":0.010891,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
 ok 33 - grep partially-cloned submodule
 
 expecting success of 7814.34 'check scope of core.useReplaceRefs': 
@@ -512671,217 +512608,2293 @@
 		
 ok 121 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NOMATCH' a
 
-expecting success of 7816.122 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 122 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
+expecting success of 7816.122 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 122 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
+
+expecting success of 7816.123 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 123 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
+
+expecting success of 7816.124 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 124 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a
+
+expecting success of 7816.125 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 125 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
+
+expecting success of 7816.126 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 126 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
+
+expecting success of 7816.127 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a': 
+			>stderr &&
+			printf 'æQ[ð]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -F a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 127 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
+
+expecting success of 7816.128 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 128 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
+
+expecting success of 7816.129 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 129 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
+
+expecting success of 7816.130 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 130 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
+
+expecting success of 7816.131 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 131 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
+
+expecting success of 7816.132 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 132 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
+
+expecting success of 7816.133 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a': 
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f -i a
+		
+Binary file a matches
+ok 133 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
+
+expecting success of 7816.134 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 134 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
+
+expecting success of 7816.135 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 135 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
+
+expecting success of 7816.136 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'yQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 136 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a
+
+expecting success of 7816.137 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 137 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
+
+expecting success of 7816.138 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 138 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
+
+expecting success of 7816.139 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 139 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a
+
+expecting success of 7816.140 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 140 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
+
+expecting success of 7816.141 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 141 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
+
+expecting success of 7816.142 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'YQNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 142 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a
+
+expecting success of 7816.143 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 143 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
+
+expecting success of 7816.144 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 144 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
+
+expecting success of 7816.145 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a': 
+			>stderr &&
+			printf 'QNÓMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 145 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a
+
+# passed all 145 test(s)
+1..145
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9002-column.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9002-column/.git/
+expecting success of 9002.1 'setup': 
+	cat >lista <<\EOF
+one
+two
+three
+four
+five
+six
+seven
+eight
+nine
+ten
+eleven
+EOF
+
+ok 1 - setup
+
+expecting success of 9002.2 'never': 
+	git column --indent=Z --mode=never <lista >actual &&
+	test_cmp lista actual
+
+ok 2 - never
+
+expecting success of 9002.3 'always': 
+	cat >expected <<\EOF &&
+Zone
+Ztwo
+Zthree
+Zfour
+Zfive
+Zsix
+Zseven
+Zeight
+Znine
+Zten
+Zeleven
+EOF
+	git column --indent=Z --mode=plain <lista >actual &&
+	test_cmp expected actual
+
+ok 3 - always
+
+expecting success of 9002.4 '--nl': 
+	cat >expected <<\EOF &&
+oneZ
+twoZ
+threeZ
+fourZ
+fiveZ
+sixZ
+sevenZ
+eightZ
+nineZ
+tenZ
+elevenZ
+EOF
+	git column --nl="Z$LF" --mode=plain <lista >actual &&
+	test_cmp expected actual
+
+ok 4 - --nl
+
+expecting success of 9002.5 '80 columns': 
+	cat >expected <<\EOF &&
+one    two    three  four   five   six    seven  eight  nine   ten    eleven
+EOF
+	COLUMNS=80 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 5 - 80 columns
+
+expecting success of 9002.6 'COLUMNS = 1': 
+	COLUMNS=1 git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 6 - COLUMNS = 1
+
+expecting success of 9002.7 'width = 1': 
+	git column --mode=column --width=1 <lista >actual &&
+	test_cmp expected actual
+
+ok 7 - width = 1
+
+expecting success of 9002.8 '20 columns': 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column <lista >actual &&
+	test_cmp expected actual
+
+ok 8 - 20 columns
+
+expecting success of 9002.9 '20 columns, nodense': 
+	cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+	git column --mode=column,nodense < lista > actual &&
+	test_cmp expected actual
+
+ok 9 - 20 columns, nodense
+
+expecting success of 9002.10 '20 columns, dense': 
+	cat >expected <<\EOF &&
+one   five  nine
+two   six   ten
+three seven eleven
+four  eight
+EOF
+	git column --mode=column,dense < lista > actual &&
+	test_cmp expected actual
+
+ok 10 - 20 columns, dense
+
+expecting success of 9002.11 '20 columns, padding 2': 
+	cat >expected <<\EOF &&
+one     seven
+two     eight
+three   nine
+four    ten
+five    eleven
+six
+EOF
+	git column --mode=column --padding 2 <lista >actual &&
+	test_cmp expected actual
+
+ok 11 - 20 columns, padding 2
+
+expecting success of 9002.12 '20 columns, indented': 
+	cat >expected <<\EOF &&
+  one    seven
+  two    eight
+  three  nine
+  four   ten
+  five   eleven
+  six
+EOF
+	git column --mode=column --indent="  " <lista >actual &&
+	test_cmp expected actual
+
+ok 12 - 20 columns, indented
+
+expecting success of 9002.13 '20 columns, row first': 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row <lista >actual &&
+	test_cmp expected actual
+
+ok 13 - 20 columns, row first
+
+expecting success of 9002.14 '20 columns, row first, nodense': 
+	cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+	git column --mode=row,nodense <lista >actual &&
+	test_cmp expected actual
+
+ok 14 - 20 columns, row first, nodense
+
+expecting success of 9002.15 '20 columns, row first, dense': 
+	cat >expected <<\EOF &&
+one   two    three
+four  five   six
+seven eight  nine
+ten   eleven
+EOF
+	git column --mode=row,dense <lista >actual &&
+	test_cmp expected actual
+
+ok 15 - 20 columns, row first, dense
+
+expecting success of 9002.16 'padding must be non-negative': 
+	cat >input <<\EOF &&
+1 2 3 4 5 6
+EOF
+	cat >expected <<\EOF &&
+fatal: --padding must be non-negative
+EOF
+	test_must_fail git column --mode=column --padding=-1 <input >actual 2>&1 &&
+	test_cmp expected actual
+
+ok 16 - padding must be non-negative
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t7900-maintenance.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/
+expecting success of 7900.1 'help text': 
+	test_expect_code 129 git maintenance -h >actual &&
+	test_grep "usage: git maintenance <subcommand>" actual &&
+	test_expect_code 129 git maintenance barf 2>err &&
+	test_grep "unknown subcommand: \`barf'" err &&
+	test_grep "usage: git maintenance" err &&
+	test_expect_code 129 git maintenance 2>err &&
+	test_grep "error: need a subcommand" err &&
+	test_grep "usage: git maintenance" err
+
+usage: git maintenance <subcommand> [<options>]
+error: unknown subcommand: `barf'
+usage: git maintenance <subcommand> [<options>]
+error: need a subcommand
+usage: git maintenance <subcommand> [<options>]
+ok 1 - help text
+
+expecting success of 7900.2 'run [--auto|--quiet]': 
+	GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
+		git maintenance run 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
+		git maintenance run --auto 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \
+		git maintenance run --no-quiet 2>/dev/null &&
+	test_subcommand git gc --quiet --no-detach <run-no-auto.txt &&
+	test_subcommand ! git gc --auto --quiet --no-detach <run-auto.txt &&
+	test_subcommand git gc --no-quiet --no-detach <run-no-quiet.txt
+
+Nothing new to pack.
+{"event":"child_start","sid":"20250317T132903.174550Z-H5c947e1c-P00349acd","thread":"main","time":"2025-03-17T13:29:03.175111Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250317T132903.431795Z-H5c947e1c-P00349bb3","thread":"main","time":"2025-03-17T13:29:03.432308Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
+ok 2 - run [--auto|--quiet]
+
+expecting success of 7900.3 'maintenance.auto config option': 
+	GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
+	test_subcommand git maintenance run --auto --quiet --detach <default &&
+	GIT_TRACE2_EVENT="$(pwd)/true" \
+		git -c maintenance.auto=true \
+		commit --quiet --allow-empty -m 2 &&
+	test_subcommand git maintenance run --auto --quiet --detach <true &&
+	GIT_TRACE2_EVENT="$(pwd)/false" \
+		git -c maintenance.auto=false \
+		commit --quiet --allow-empty -m 3 &&
+	test_subcommand ! git maintenance run --auto --quiet --detach <false
+
+{"event":"child_start","sid":"20250317T132903.707603Z-H5c947e1c-P00349cd2","thread":"main","time":"2025-03-17T13:29:03.717528Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+{"event":"child_start","sid":"20250317T132903.787671Z-H5c947e1c-P00349d26","thread":"main","time":"2025-03-17T13:29:03.792418Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+ok 3 - maintenance.auto config option
+
+expecting success of 7900.4 'maintenance.autoDetach=true config option': 
+		test_when_finished "rm -f trace" &&
+		test_config $cfg true &&
+		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
+		test_subcommand git maintenance run --auto --quiet --detach <trace
+	
+{"event":"child_start","sid":"20250317T132903.979580Z-H5c947e1c-P00349de5","thread":"main","time":"2025-03-17T13:29:03.993822Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+ok 4 - maintenance.autoDetach=true config option
+
+expecting success of 7900.5 'maintenance.autoDetach=false config option': 
+		test_when_finished "rm -f trace" &&
+		test_config $cfg false &&
+		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
+		test_subcommand git maintenance run --auto --quiet --no-detach <trace
+	
+{"event":"child_start","sid":"20250317T132904.175776Z-H5c947e1c-P00349ea7","thread":"main","time":"2025-03-17T13:29:04.186577Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+ok 5 - maintenance.autoDetach=false config option
+
+expecting success of 7900.6 'gc.autoDetach=true config option': 
+		test_when_finished "rm -f trace" &&
+		test_config $cfg true &&
+		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
+		test_subcommand git maintenance run --auto --quiet --detach <trace
+	
+{"event":"child_start","sid":"20250317T132904.355603Z-H5c947e1c-P00349f2b","thread":"main","time":"2025-03-17T13:29:04.369824Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
+ok 6 - gc.autoDetach=true config option
+
+expecting success of 7900.7 'gc.autoDetach=false config option': 
+		test_when_finished "rm -f trace" &&
+		test_config $cfg false &&
+		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
+		test_subcommand git maintenance run --auto --quiet --no-detach <trace
+	
+{"event":"child_start","sid":"20250317T132904.575765Z-H5c947e1c-P00349fd1","thread":"main","time":"2025-03-17T13:29:04.586029Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+ok 7 - gc.autoDetach=false config option
+
+expecting success of 7900.8 'maintenance.autoDetach overrides gc.autoDetach': 
+	test_when_finished "rm -f trace" &&
+	test_config maintenance.autoDetach false &&
+	test_config gc.autoDetach true &&
+	GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
+	test_subcommand git maintenance run --auto --quiet --no-detach <trace
+
+{"event":"child_start","sid":"20250317T132904.772284Z-H5c947e1c-P0034a078","thread":"main","time":"2025-03-17T13:29:04.785338Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
+ok 8 - maintenance.autoDetach overrides gc.autoDetach
+
+expecting success of 7900.9 'register uses XDG_CONFIG_HOME config if it exists': 
+	test_when_finished rm -r .config/git/config &&
+	(
+		XDG_CONFIG_HOME=.config &&
+		export XDG_CONFIG_HOME &&
+		mkdir -p $XDG_CONFIG_HOME/git &&
+		>$XDG_CONFIG_HOME/git/config &&
+		git maintenance register &&
+		git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
+		pwd >expect &&
+		test_cmp expect actual
+	)
+
+ok 9 - register uses XDG_CONFIG_HOME config if it exists
+
+expecting success of 7900.10 'register does not need XDG_CONFIG_HOME config to exist': 
+	test_when_finished git maintenance unregister &&
+	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
+	git maintenance register &&
+	git config --global --get maintenance.repo >actual &&
+	pwd >expect &&
+	test_cmp expect actual
+
+ok 10 - register does not need XDG_CONFIG_HOME config to exist
+
+expecting success of 7900.11 'unregister uses XDG_CONFIG_HOME config if it exists': 
+	test_when_finished rm -r .config/git/config &&
+	(
+		XDG_CONFIG_HOME=.config &&
+		export XDG_CONFIG_HOME &&
+		mkdir -p $XDG_CONFIG_HOME/git &&
+		>$XDG_CONFIG_HOME/git/config &&
+		git maintenance register &&
+		git maintenance unregister &&
+		test_must_fail git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
+		test_must_be_empty actual
+	)
+
+ok 11 - unregister uses XDG_CONFIG_HOME config if it exists
+
+expecting success of 7900.12 'unregister does not need XDG_CONFIG_HOME config to exist': 
+	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
+	git maintenance register &&
+	git maintenance unregister &&
+	test_must_fail git config --global --get maintenance.repo >actual &&
+	test_must_be_empty actual
+
+ok 12 - unregister does not need XDG_CONFIG_HOME config to exist
+
+expecting success of 7900.13 'maintenance.<task>.enabled': 
+	git config maintenance.gc.enabled false &&
+	git config maintenance.commit-graph.enabled true &&
+	GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err &&
+	test_subcommand ! git gc --quiet <run-config.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt
+
+{"event":"child_start","sid":"20250317T132905.519768Z-H5c947e1c-P0034a2b1","thread":"main","time":"2025-03-17T13:29:05.520295Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 13 - maintenance.<task>.enabled
+
+expecting success of 7900.14 'run --task=<task>': 
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \
+		git maintenance run --task=gc 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \
+		git maintenance run --task=commit-graph --task=gc 2>/dev/null &&
+	test_subcommand ! git gc --quiet --no-detach <run-commit-graph.txt &&
+	test_subcommand git gc --quiet --no-detach <run-gc.txt &&
+	test_subcommand git gc --quiet --no-detach <run-both.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
+
+{"event":"child_start","sid":"20250317T132905.709525Z-H5c947e1c-P0034a344","thread":"main","time":"2025-03-17T13:29:05.710077Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250317T132905.990032Z-H5c947e1c-P0034a442","thread":"main","time":"2025-03-17T13:29:05.990589Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
+{"event":"child_start","sid":"20250317T132905.651787Z-H5c947e1c-P0034a320","thread":"main","time":"2025-03-17T13:29:05.652339Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132905.935750Z-H5c947e1c-P0034a409","thread":"main","time":"2025-03-17T13:29:05.936302Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132905.990032Z-H5c947e1c-P0034a442","thread":"main","time":"2025-03-17T13:29:06.173317Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 14 - run --task=<task>
+
+expecting success of 7900.15 'core.commitGraph=false prevents write process': 
+	GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
+		git -c core.commitGraph=false maintenance run \
+		--task=commit-graph 2>/dev/null &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress \
+		<no-commit-graph.txt
+
+ok 15 - core.commitGraph=false prevents write process
+
+expecting success of 7900.16 'commit-graph auto condition': 
+	COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
+		git -c maintenance.commit-graph.auto="-1" $COMMAND &&
+
+	test_commit first &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
+		git -c maintenance.commit-graph.auto=0 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+
+	git commit --allow-empty -m "second" &&
+	git commit --allow-empty -m "third" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=2 $COMMAND &&
+
+	COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.txt
+
+[master f1c53f6] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[master 2ff0394] second
+ Author: A U Thor <author@example.com>
+[master 826111a] third
+ Author: A U Thor <author@example.com>
+{"event":"child_start","sid":"20250317T132906.527773Z-H5c947e1c-P0034a614","thread":"main","time":"2025-03-17T13:29:06.528305Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132906.705717Z-H5c947e1c-P0034a6b3","thread":"main","time":"2025-03-17T13:29:06.706780Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132906.807845Z-H5c947e1c-P0034a700","thread":"main","time":"2025-03-17T13:29:06.808984Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 16 - commit-graph auto condition
+
+expecting success of 7900.17 'run --task=bogus': 
+	test_must_fail git maintenance run --task=bogus 2>err &&
+	test_grep "is not a valid task" err
+
+error: 'bogus' is not a valid task
+ok 17 - run --task=bogus
+
+expecting success of 7900.18 'run --task duplicate': 
+	test_must_fail git maintenance run --task=gc --task=gc 2>err &&
+	test_grep "cannot be selected multiple times" err
+
+error: task 'gc' cannot be selected multiple times
+ok 18 - run --task duplicate
+
+expecting success of 7900.19 'run --task=prefetch with no remotes': 
+	git maintenance run --task=prefetch 2>err &&
+	test_must_be_empty err
+
+ok 19 - run --task=prefetch with no remotes
+
+expecting success of 7900.20 'prefetch multiple remotes': 
+	git clone . clone1 &&
+	git clone . clone2 &&
+	git remote add remote1 "file://$(pwd)/clone1" &&
+	git remote add remote2 "file://$(pwd)/clone2" &&
+	git -C clone1 switch -c one &&
+	git -C clone2 switch -c two &&
+	test_commit -C clone1 one &&
+	test_commit -C clone2 two &&
+	GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
+	test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
+	test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
+	git for-each-ref refs/remotes >actual &&
+	test_must_be_empty actual &&
+	git log prefetch/remotes/remote1/one &&
+	git log prefetch/remotes/remote2/two &&
+	git fetch --all &&
+	test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
+	test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
+
+	git log --oneline --decorate --all >log &&
+	! grep "prefetch" log &&
+
+	test_when_finished git config --unset remote.remote1.skipFetchAll &&
+	git config remote.remote1.skipFetchAll true &&
+	GIT_TRACE2_EVENT="$(pwd)/skip-remote1.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	test_subcommand ! git fetch remote1 $fetchargs <skip-remote1.txt &&
+	test_subcommand git fetch remote2 $fetchargs <skip-remote1.txt
+
+Cloning into 'clone1'...
+done.
+Cloning into 'clone2'...
+done.
+Switched to a new branch 'one'
+Switched to a new branch 'two'
+[one 3381d63] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[two 98acc48] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+{"event":"child_start","sid":"20250317T132907.611944Z-H5c947e1c-P0034aa13","thread":"main","time":"2025-03-17T13:29:07.612516Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote1","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+{"event":"child_start","sid":"20250317T132907.611944Z-H5c947e1c-P0034aa13","thread":"main","time":"2025-03-17T13:29:07.727706Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+commit 3381d63412cf2a4c8ab1a7ad5eaba88b720e200c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    one
+
+commit 826111ad491fb7a820c5c9b557cf1f688f5bca8e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    third
+
+commit 2ff0394a350f5ea1c7e4b1cc8abb51b9f47528bb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    second
+
+commit f1c53f698bad02519d2c04b5223a43f227be69e5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit 35258a332d25de55db6263fe6a65d931f0b5b49a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit ddb9b14cb4ee58fa70922a2ae052c23586ca2afa
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 63747f81e7e217a3b7da140dd91aabc412a32230
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 326ca1ce27e572c89fdb164b2908a5fefd029fc5
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 3f82c72771006fd41624869dc0fd0e2da48bb0f9
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 54c6b2cd4fb50066683a197cc6d677689618505a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    3
+
+commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    2
+
+commit a3a8cd3c82028671bf51502d77277baf14a2f528
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+commit 98acc48ea4754bf90cb8ea094e9b3a3e4140090f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    two
+
+commit 826111ad491fb7a820c5c9b557cf1f688f5bca8e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    third
+
+commit 2ff0394a350f5ea1c7e4b1cc8abb51b9f47528bb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    second
+
+commit f1c53f698bad02519d2c04b5223a43f227be69e5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit 35258a332d25de55db6263fe6a65d931f0b5b49a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit ddb9b14cb4ee58fa70922a2ae052c23586ca2afa
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 63747f81e7e217a3b7da140dd91aabc412a32230
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 326ca1ce27e572c89fdb164b2908a5fefd029fc5
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 3f82c72771006fd41624869dc0fd0e2da48bb0f9
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+
+commit 54c6b2cd4fb50066683a197cc6d677689618505a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    3
+
+commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    2
+
+commit a3a8cd3c82028671bf51502d77277baf14a2f528
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+Fetching remote1
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/clone1
+ * [new branch]      master     -> remote1/master
+ * [new branch]      one        -> remote1/one
+ * [new tag]         one        -> one
+Fetching remote2
+From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/clone2
+ * [new branch]      master     -> remote2/master
+ * [new branch]      two        -> remote2/two
+ * [new tag]         two        -> two
+{"event":"child_start","sid":"20250317T132908.277529Z-H5c947e1c-P0034ac35","thread":"main","time":"2025-03-17T13:29:08.278130Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
+ok 20 - prefetch multiple remotes
+
+expecting success of 7900.21 'loose-objects task': 
+	# Repack everything so we know the state of the object dir
+	git repack -adk &&
+
+	# Hack to stop maintenance from running during "git commit"
+	echo in use >.git/objects/maintenance.lock &&
+
+	# Assuming that "git commit" creates at least one loose object
+	test_commit create-loose-object &&
+	rm .git/objects/maintenance.lock &&
+
+	ls .git/objects >obj-dir-before &&
+	test_file_not_empty obj-dir-before &&
+	ls .git/objects/pack/*.pack >packs-before &&
+	test_line_count = 1 packs-before &&
+
+	# The first run creates a pack-file
+	# but does not delete loose objects.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-between &&
+	test_cmp obj-dir-before obj-dir-between &&
+	ls .git/objects/pack/*.pack >packs-between &&
+	test_line_count = 2 packs-between &&
+	ls .git/objects/pack/loose-*.pack >loose-packs &&
+	test_line_count = 1 loose-packs &&
+
+	# The second run deletes loose objects
+	# but does not create a pack-file.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-after &&
+	cat >expect <<-\EOF &&
+	info
+	pack
+	EOF
+	test_cmp expect obj-dir-after &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_cmp packs-between packs-after
+
+[master edd7a6f] create-loose-object
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 create-loose-object.t
+ok 21 - loose-objects task
+
+expecting success of 7900.22 'maintenance.loose-objects.auto': 
+	git repack -adk &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
+		git -c maintenance.loose-objects.auto=1 maintenance \
+		run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
+	printf data-A | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-loA &&
+	printf data-B | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loB &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loC
+
+07163daad06a0119b0a241cf1882adae4f88fd56
+4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
+{"event":"child_start","sid":"20250317T132909.299692Z-H5c947e1c-P0034afe7","thread":"main","time":"2025-03-17T13:29:09.300413Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132909.407781Z-H5c947e1c-P0034b05a","thread":"main","time":"2025-03-17T13:29:09.408547Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+ok 22 - maintenance.loose-objects.auto
+
+expecting success of 7900.23 'incremental-repack task': 
+	packDir=.git/objects/pack &&
+	for i in $(test_seq 1 5)
+	do
+		test_commit $i || return 1
+	done &&
+
+	# Create three disjoint pack-files with size BIG, small, small.
+	echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
+	test_tick &&
+	git pack-objects --revs $packDir/test-2 <<-\EOF &&
+	HEAD~1
+	^HEAD~2
+	EOF
+	test_tick &&
+	git pack-objects --revs $packDir/test-3 <<-\EOF &&
+	HEAD
+	^HEAD~1
+	EOF
+
+	# Delete refs that have not been repacked in these packs.
+	git for-each-ref --format="delete %(refname)" \
+		refs/prefetch refs/tags refs/remotes \
+		--exclude=refs/remotes/*/HEAD >refs &&
+	git update-ref --stdin <refs &&
+
+	# Replace the object directory with this pack layout.
+	rm -f $packDir/pack-* &&
+	rm -f $packDir/loose-* &&
+	ls $packDir/*.pack >packs-before &&
+	test_line_count = 3 packs-before &&
+
+	# make sure we do not have any broken refs that were
+	# missed in the deletion above
+	git for-each-ref &&
+
+	# the job repacks the two into a new pack, but does not
+	# delete the old ones.
+	git maintenance run --task=incremental-repack &&
+	ls $packDir/*.pack >packs-between &&
+	test_line_count = 4 packs-between &&
+
+	# the job deletes the two old packs, and does not write
+	# a new one because the batch size is not high enough to
+	# pack the largest pack-file.
+	git maintenance run --task=incremental-repack &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_line_count = 2 packs-after
+
+[master cfd6ede] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master bddbac0] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master 00c7c54] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master 7248485] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 3230911] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+cd00d8ed6e39c631d7021be2351af90c5e6ca5cc
+7656191c100ac2502a98ec7b811467f8725c358f
+d375d935f21fd959bcf75a2ab518c0c2f3b2d056
+32309114fe8a185eb08d9ff7b33337992b11edac commit	refs/heads/master
+ok 23 - incremental-repack task
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 24 # skip incremental-repack 2g limit (missing EXPENSIVE)
+
+expecting success of 7900.25 'maintenance.incremental-repack.auto': 
+	rm -rf incremental-repack-true &&
+	git init incremental-repack-true &&
+	(
+		cd incremental-repack-true &&
+		git config core.multiPackIndex true &&
+		run_incremental_repack_and_verify
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/incremental-repack-true/.git/
+[master (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master ab54baa] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ba2455fe8b258f9311bea5fa32bd29103f57ba7e
+[master 3983a09] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+2f10694fe702316bcde937d57f956fe5ae42f7fe
+{"event":"child_start","sid":"20250317T132911.023093Z-H5c947e1c-P0034b672","thread":"main","time":"2025-03-17T13:29:11.023760Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 25 - maintenance.incremental-repack.auto
+
+expecting success of 7900.26 'maintenance.incremental-repack.auto (when config is unset)': 
+	rm -rf incremental-repack-unset &&
+	git init incremental-repack-unset &&
+	(
+		cd incremental-repack-unset &&
+		test_unconfig core.multiPackIndex &&
+		run_incremental_repack_and_verify
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/incremental-repack-unset/.git/
+[master (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master ab54baa] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ba2455fe8b258f9311bea5fa32bd29103f57ba7e
+[master 3983a09] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+2f10694fe702316bcde937d57f956fe5ae42f7fe
+{"event":"child_start","sid":"20250317T132911.807020Z-H5c947e1c-P0034b932","thread":"main","time":"2025-03-17T13:29:11.807678Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 26 - maintenance.incremental-repack.auto (when config is unset)
+
+expecting success of 7900.27 'pack-refs task': 
+	for n in $(test_seq 1 5)
+	do
+		git branch -f to-pack/$n HEAD || return 1
+	done &&
+	GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
+		git maintenance run --task=pack-refs &&
+	test_subcommand git pack-refs --all --prune <pack-refs.txt
+
+{"event":"child_start","sid":"20250317T132912.069001Z-H5c947e1c-P0034ba27","thread":"main","time":"2025-03-17T13:29:12.069562Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+ok 27 - pack-refs task
+
+expecting success of 7900.28 '--auto and --schedule incompatible': 
+	test_must_fail git maintenance run --auto --schedule=daily 2>err &&
+	test_grep "at most one" err
+
+fatal: use at most one of --auto and --schedule=<frequency>
+ok 28 - --auto and --schedule incompatible
+
+expecting success of 7900.29 'invalid --schedule value': 
+	test_must_fail git maintenance run --schedule=annually 2>err &&
+	test_grep "unrecognized --schedule" err
+
+fatal: unrecognized --schedule argument 'annually'
+ok 29 - invalid --schedule value
+
+expecting success of 7900.30 '--schedule inheritance weekly -> daily -> hourly': 
+	git config maintenance.loose-objects.enabled true &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.commit-graph.enabled true &&
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.incremental-repack.enabled true &&
+	git config maintenance.incremental-repack.schedule weekly &&
+
+	GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
+		git maintenance run --schedule=hourly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <hourly.txt &&
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
+
+	GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
+		git maintenance run --schedule=daily 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <daily.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
+
+	GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
+		git maintenance run --schedule=weekly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <weekly.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress <weekly.txt
+
+{"event":"child_start","sid":"20250317T132912.352445Z-H5c947e1c-P0034bb16","thread":"main","time":"2025-03-17T13:29:12.617221Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132912.795743Z-H5c947e1c-P0034bcb3","thread":"main","time":"2025-03-17T13:29:12.939646Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132912.795743Z-H5c947e1c-P0034bcb3","thread":"main","time":"2025-03-17T13:29:12.952800Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132913.092052Z-H5c947e1c-P0034bdcf","thread":"main","time":"2025-03-17T13:29:13.230875Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132913.092052Z-H5c947e1c-P0034bdcf","thread":"main","time":"2025-03-17T13:29:13.351083Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132913.092052Z-H5c947e1c-P0034bdcf","thread":"main","time":"2025-03-17T13:29:13.248137Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 30 - --schedule inheritance weekly -> daily -> hourly
+
+expecting success of 7900.31 'maintenance.strategy inheritance': 
+	for task in commit-graph loose-objects incremental-repack
+	do
+		git config --unset maintenance.$task.schedule || return 1
+	done &&
+
+	test_when_finished git config --unset maintenance.strategy &&
+	git config maintenance.strategy incremental &&
+
+	GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
+		git maintenance run --schedule=weekly --quiet &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-hourly.txt &&
+	test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<incremental-hourly.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-hourly.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-daily.txt &&
+	test_subcommand git prune-packed --quiet <incremental-daily.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-daily.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-daily.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-weekly.txt &&
+	test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-weekly.txt &&
+	test_subcommand git pack-refs --all --prune \
+		<incremental-weekly.txt &&
+
+	# Modify defaults
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.incremental-repack.enabled false &&
+
+	GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
+
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <modified-hourly.txt &&
+	test_subcommand git prune-packed --quiet <modified-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-hourly.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <modified-daily.txt &&
+	test_subcommand git prune-packed --quiet <modified-daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-daily.txt
+
+{"event":"child_start","sid":"20250317T132913.593564Z-H5c947e1c-P0034bf6b","thread":"main","time":"2025-03-17T13:29:13.714905Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132913.754430Z-H5c947e1c-P0034bff5","thread":"main","time":"2025-03-17T13:29:13.963239Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132913.754430Z-H5c947e1c-P0034bff5","thread":"main","time":"2025-03-17T13:29:13.905673Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132913.754430Z-H5c947e1c-P0034bff5","thread":"main","time":"2025-03-17T13:29:13.916763Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250317T132914.028044Z-H5c947e1c-P0034c0c4","thread":"main","time":"2025-03-17T13:29:14.220838Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132914.028044Z-H5c947e1c-P0034c0c4","thread":"main","time":"2025-03-17T13:29:14.169218Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132914.028044Z-H5c947e1c-P0034c0c4","thread":"main","time":"2025-03-17T13:29:14.189794Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20250317T132914.028044Z-H5c947e1c-P0034c0c4","thread":"main","time":"2025-03-17T13:29:14.233964Z","file":"run-command.c","line":734,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20250317T132914.677069Z-H5c947e1c-P0034c2fb","thread":"main","time":"2025-03-17T13:29:14.812378Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20250317T132914.861885Z-H5c947e1c-P0034c39f","thread":"main","time":"2025-03-17T13:29:15.007128Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20250317T132914.861885Z-H5c947e1c-P0034c39f","thread":"main","time":"2025-03-17T13:29:14.986860Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+ok 31 - maintenance.strategy inheritance
+
+expecting success of 7900.32 'register and unregister': 
+	test_when_finished git config --global --unset-all maintenance.repo &&
+
+	test_must_fail git maintenance unregister 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --force &&
+
+	git config --global --add maintenance.repo /existing1 &&
+	git config --global --add maintenance.repo /existing2 &&
+	git config --global --get-all maintenance.repo >before &&
+
+	git maintenance register &&
+	test_cmp_config false maintenance.auto &&
+	git config --global --get-all maintenance.repo >between &&
+	cp before expect &&
+	pwd >>expect &&
+	test_cmp expect between &&
+
+	git maintenance unregister &&
+	git config --global --get-all maintenance.repo >actual &&
+	test_cmp before actual &&
+
+	git config --file ./other --add maintenance.repo /existing1 &&
+	git config --file ./other --add maintenance.repo /existing2 &&
+	git config --file ./other --get-all maintenance.repo >before &&
+
+	git maintenance register --config-file ./other &&
+	test_cmp_config false maintenance.auto &&
+	git config --file ./other --get-all maintenance.repo >between &&
+	cp before expect &&
+	pwd >>expect &&
+	test_cmp expect between &&
+
+	git maintenance unregister --config-file ./other &&
+	git config --file ./other --get-all maintenance.repo >actual &&
+	test_cmp before actual &&
+
+	test_must_fail git maintenance unregister 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --force &&
+
+	test_must_fail git maintenance unregister --config-file ./other 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --config-file ./other --force
+
+fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
+fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
+fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
+ok 32 - register and unregister
+
+expecting success of 7900.33 'register with no value for maintenance.repo': 
+	cp .git/config .git/config.orig &&
+	test_when_finished mv .git/config.orig .git/config &&
+
+	cat >>.git/config <<-\EOF &&
+	[maintenance]
+		repo
+	EOF
+	cat >expect <<-\EOF &&
+	error: missing value for 'maintenance.repo'
+	EOF
+	git maintenance register 2>actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo
+
+
+ok 33 - register with no value for maintenance.repo
+
+expecting success of 7900.34 'unregister with no value for maintenance.repo': 
+	cp .git/config .git/config.orig &&
+	test_when_finished mv .git/config.orig .git/config &&
+
+	cat >>.git/config <<-\EOF &&
+	[maintenance]
+		repo
+	EOF
+	cat >expect <<-\EOF &&
+	error: missing value for 'maintenance.repo'
+	EOF
+	test_expect_code 128 git maintenance unregister 2>actual.raw &&
+	grep ^error actual.raw >actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo &&
+
+	git maintenance unregister --force 2>actual.raw &&
+	grep ^error actual.raw >actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo
+
+
+
+ok 34 - unregister with no value for maintenance.repo
+
+expecting success of 7900.35 'register and unregister with regex metacharacters': 
+	META="a+b*c" &&
+	git init "$META" &&
+	git -C "$META" maintenance register &&
+	git config --get-all --show-origin maintenance.repo &&
+	git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META" &&
+	git -C "$META" maintenance unregister &&
+	test_must_fail git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c/.git/
+file:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+file:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c
+ok 35 - register and unregister with regex metacharacters
+
+expecting success of 7900.36 'start without GIT_TEST_MAINT_SCHEDULER': 
+	test_when_finished "rm -rf systemctl.log script repo" &&
+	mkdir script &&
+	write_script script/systemctl <<-\EOF &&
+	echo "$*" >>../systemctl.log
+	EOF
+	git init repo &&
+	(
+		cd repo &&
+		sane_unset GIT_TEST_MAINT_SCHEDULER &&
+		PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd
+	) &&
+	test_grep -- "--user list-timers" systemctl.log &&
+	test_grep -- "enable --now git-maintenance@" systemctl.log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
+--user list-timers
+--user enable --now git-maintenance@hourly.timer
+--user enable --now git-maintenance@daily.timer
+--user enable --now git-maintenance@weekly.timer
+ok 36 - start without GIT_TEST_MAINT_SCHEDULER
+
+expecting success of 7900.37 'start --scheduler=<scheduler>': 
+	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
+	test_grep "unrecognized --scheduler argument" err &&
+
+	test_expect_code 129 git maintenance start --no-scheduler 2>err &&
+	test_grep "unknown option" err &&
+
+	test_expect_code 128 \
+		env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
+		git maintenance start --scheduler=crontab 2>err &&
+	test_grep "fatal: crontab scheduler is not available" err
+
+error: unrecognized --scheduler argument 'foo'
+error: unknown option `no-scheduler'
+fatal: crontab scheduler is not available
+ok 37 - start --scheduler=<scheduler>
+
+expecting success of 7900.38 'start from empty cron table': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
+	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
+	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+13 0 * * 1-6 "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=daily
+13 1-23 * * * "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=hourly
+13 0 * * 0 "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=weekly
+ok 38 - start from empty cron table
+
+expecting success of 7900.39 'stop from existing schedule': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	# Operation is idempotent
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	test_must_be_empty cron.txt
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+ok 39 - stop from existing schedule
+
+expecting success of 7900.40 'start preserves existing schedule': 
+	echo "Important information!" >cron.txt &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
+	grep "Important information!" cron.txt
+
+Important information!
+ok 40 - start preserves existing schedule
+
+expecting success of 7900.41 'magic markers are correct': 
+	grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
+	cat >expect <<-\EOF &&
+	# BEGIN GIT MAINTENANCE SCHEDULE
+	# END GIT MAINTENANCE SCHEDULE
+	EOF
+	test_cmp actual expect
+
+ok 41 - magic markers are correct
+
+expecting success of 7900.42 'stop preserves surrounding schedule': 
+	echo "Crucial information!" >>cron.txt &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	grep "Important information!" cron.txt &&
+	grep "Crucial information!" cron.txt
+
+Important information!
+Crucial information!
+ok 42 - stop preserves surrounding schedule
+
+expecting success of 7900.43 'start and stop macOS maintenance': 
+	# ensure $HOME can be compared against hook arguments on all platforms
+	pfx=$(cd "$HOME" && pwd) &&
+
+	write_script print-args <<-\EOF &&
+	echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	org.git-scm.git.daily.plist
+	org.git-scm.git.hourly.plist
+	org.git-scm.git.weekly.plist
+	EOF
+	test_cmp expect actual &&
+
+	rm -f expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		test_xmllint "$PLIST" &&
+		grep schedule=$frequency "$PLIST" &&
+		echo "bootout gui/[UID] $PLIST" >>expect &&
+		echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	test_cmp expect args &&
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	test_line_count = 0 actual
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+checking prerequisite: XMLLINT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
+	xmllint --version
+
+)
+xmllint: using libxml version 20914
+   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML Legacy C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma 
+prerequisite XMLLINT ok
+<string>--schedule=hourly</string>
+<string>--schedule=daily</string>
+<string>--schedule=weekly</string>
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+ok 43 - start and stop macOS maintenance
+
+expecting success of 7900.44 'use launchctl list to prevent extra work': 
+	# ensure we are registered
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
+
+	# do it again on a fresh args file
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
+
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	list org.git-scm.git.hourly
+	list org.git-scm.git.daily
+	list org.git-scm.git.weekly
+	EOF
+	test_cmp expect args
+
+ok 44 - use launchctl list to prevent extra work
+
+expecting success of 7900.45 'start and stop Windows maintenance': 
+	write_script print-args <<-\EOF &&
+	echo $* >>args
+	while test $# -gt 0
+	do
+		case "$1" in
+		/xml) shift; xmlfile=$1; break ;;
+		*) shift ;;
+		esac
+	done
+	test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	for frequency in hourly daily weekly
+	do
+		grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
+		file=$(ls .git/schedule_${frequency}*.xml) &&
+		test_xmllint "$file" || return 1
+	done &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	printf "/delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >expect &&
+	test_cmp expect args
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_hourly_myiANC
+/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_daily_e3Ll96
+/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_weekly_yS70rJ
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+ok 45 - start and stop Windows maintenance
+
+expecting success of 7900.46 'start and stop Linux/systemd maintenance': 
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" >>args
+	EOF
+
+	XDG_CONFIG_HOME="$PWD" &&
+	export XDG_CONFIG_HOME &&
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	for schedule in hourly daily weekly
+	do
+		test_path_is_file "systemd/user/git-maintenance@$schedule.timer" || return 1
+	done &&
+	test_path_is_file "systemd/user/git-maintenance@.service" &&
+
+	test_systemd_analyze_verify "systemd/user/git-maintenance@hourly.service" &&
+	test_systemd_analyze_verify "systemd/user/git-maintenance@daily.service" &&
+	test_systemd_analyze_verify "systemd/user/git-maintenance@weekly.service" &&
+
+	grep "core.askPass=true" "systemd/user/git-maintenance@.service" &&
+	grep "credential.interactive=false" "systemd/user/git-maintenance@.service" &&
+
+	printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	for schedule in hourly daily weekly
+	do
+		test_path_is_missing "systemd/user/git-maintenance@$schedule.timer" || return 1
+	done &&
+	test_path_is_missing "systemd/user/git-maintenance@.service" &&
+
+	printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+checking prerequisite: SYSTEMD_ANALYZE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
+	systemd-analyze verify /lib/systemd/system/basic.target
+
+)
+./test-lib.sh: line 1010: systemd-analyze: command not found
+prerequisite SYSTEMD_ANALYZE not satisfied
+ExecStart="/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
+ExecStart="/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
+ok 46 - start and stop Linux/systemd maintenance
+
+expecting success of 7900.47 'start and stop when several schedulers are available': 
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
+		echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args
+
+ok 47 - start and stop when several schedulers are available
+
+expecting success of 7900.48 'register preserves existing strategy': 
+	git config maintenance.strategy none &&
+	git maintenance register &&
+	test_config maintenance.strategy none &&
+	git config --unset maintenance.strategy &&
+	git maintenance register &&
+	test_config maintenance.strategy incremental
+
+ok 48 - register preserves existing strategy
+
+expecting success of 7900.49 'fails when running outside of a repository': 
+	nongit test_must_fail git maintenance run &&
+	nongit test_must_fail git maintenance stop &&
+	nongit test_must_fail git maintenance start &&
+	nongit test_must_fail git maintenance register &&
+	nongit test_must_fail git maintenance unregister
+
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+ok 49 - fails when running outside of a repository
+
+expecting success of 7900.50 'register and unregister bare repo': 
+	test_when_finished "git config --global --unset-all maintenance.repo || :" &&
+	test_might_fail git config --global --unset-all maintenance.repo &&
+	git init --bare barerepo &&
+	(
+		cd barerepo &&
+		git maintenance register &&
+		git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+		git maintenance unregister &&
+		test_must_fail git config --global --get-all maintenance.repo
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/barerepo/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/barerepo
+ok 50 - register and unregister bare repo
+
+expecting success of 7900.51 'failed schedule prevents config change': 
+	git init --bare failcase &&
+
+	for scheduler in crontab launchctl schtasks systemctl
+	do
+		GIT_TEST_MAINT_SCHEDULER="$scheduler:false" &&
+		export GIT_TEST_MAINT_SCHEDULER &&
+		test_must_fail \
+			git -C failcase maintenance start &&
+		test_must_fail git -C failcase config maintenance.auto || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/failcase/
+error: 'crontab' died
+fatal: failed to set up maintenance schedule
+fatal: neither systemd timers nor crontab are available
+fatal: neither systemd timers nor crontab are available
+error: failed to run systemctl
+fatal: failed to set up maintenance schedule
+ok 51 - failed schedule prevents config change
+
+expecting success of 7900.52 '--no-detach causes maintenance to not run in background': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		# Prepare the repository such that git-maintenance(1) ends up
+		# outputting something.
+		test_commit something &&
+		git config set maintenance.gc.enabled false &&
+		git config set maintenance.loose-objects.enabled true &&
+		git config set maintenance.loose-objects.auto 1 &&
+		git config set maintenance.incremental-repack.enabled true &&
+
+		GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+			git maintenance run --no-detach >out 2>&1 &&
+		! test_region maintenance detach trace.txt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
+[master (root-commit) 59647d1] something
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something.t
+ok 52 - --no-detach causes maintenance to not run in background
+
+expecting success of 7900.53 '--detach causes maintenance to run in background': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit something &&
+		git config set maintenance.gc.enabled false &&
+		git config set maintenance.loose-objects.enabled true &&
+		git config set maintenance.loose-objects.auto 1 &&
+		git config set maintenance.incremental-repack.enabled true &&
+
+		# The extra file descriptor gets inherited to the child
+		# process, and by reading stdout we thus essentially wait for
+		# that descriptor to get closed, which indicates that the child
+		# is done, too.
+		does_not_matter=$(GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+			git maintenance run --detach 9>&1) &&
+		test_region maintenance detach trace.txt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
+[master (root-commit) 59647d1] something
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something.t
+{"event":"region_enter","sid":"20250317T132923.029899Z-H5c947e1c-P0034dd96","thread":"main","time":"2025-03-17T13:29:23.030437Z","file":"builtin/gc.c","line":1468,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
+{"event":"region_leave","sid":"20250317T132923.029899Z-H5c947e1c-P0034dd96","thread":"main","time":"2025-03-17T13:29:23.045209Z","file":"builtin/gc.c","line":1470,"repo":1,"t_rel":0.014737,"nesting":1,"category":"maintenance","label":"detach"}
+ok 53 - --detach causes maintenance to run in background
+
+expecting success of 7900.54 'repacking loose objects is quiet': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
+
+		test_commit something &&
+		git config set maintenance.gc.enabled false &&
+		git config set maintenance.loose-objects.enabled true &&
+		git config set maintenance.loose-objects.auto 1 &&
+
+		git maintenance run --quiet >out 2>&1 &&
+		test_must_be_empty out
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
+[master (root-commit) 59647d1] something
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something.t
+ok 54 - repacking loose objects is quiet
+
+expecting success of 7900.55 'maintenance aborts with existing lock file': 
+	test_when_finished "rm -rf repo script" &&
+	mkdir script &&
+	write_script script/systemctl <<-\EOF &&
+	true
+	EOF
+
+	git init repo &&
+	: >repo/.git/objects/schedule.lock &&
+	test_must_fail env PATH="$PWD/script:$PATH" git -C repo maintenance start --scheduler=systemd 2>err &&
+	test_grep "Another scheduled git-maintenance(1) process seems to be running" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
+Another scheduled git-maintenance(1) process seems to be running in this
+ok 55 - maintenance aborts with existing lock file
+
+# passed all 55 test(s)
+1..55
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9003-help-autocorrect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9003-help-autocorrect/.git/
+expecting success of 9003.1 'setup': 
+	# An alias
+	git config alias.lgf "log --format=%s --first-parent" &&
+
+	# A random user-defined command
+	write_script git-distimdistim <<-EOF &&
+		echo distimdistim was called
+	EOF
+
+	PATH="$PATH:." &&
+	export PATH &&
+
+	git commit --allow-empty -m "a single log entry" &&
+
+	# Sanity check
+	git lgf >actual &&
+	echo "a single log entry" >expect &&
+	test_cmp expect actual &&
+
+	git distimdistim >actual &&
+	echo "distimdistim was called" >expect &&
+	test_cmp expect actual
+
+[master (root-commit) b57823c] a single log entry
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 9003.2 'autocorrect showing candidates': 
+		git config help.autocorrect $show &&
+
+		test_must_fail git lfg 2>actual &&
+		grep "^	lgf" actual &&
+
+		test_must_fail git distimdist 2>actual &&
+		grep "^	distimdistim" actual
+	
+	lgf
+	distimdistim
+ok 2 - autocorrect showing candidates
+
+expecting success of 9003.3 'autocorrect showing candidates': 
+		git config help.autocorrect $show &&
+
+		test_must_fail git lfg 2>actual &&
+		grep "^	lgf" actual &&
+
+		test_must_fail git distimdist 2>actual &&
+		grep "^	distimdistim" actual
+	
+	lgf
+	distimdistim
+ok 3 - autocorrect showing candidates
+
+expecting success of 9003.4 'autocorrect showing candidates': 
+		git config help.autocorrect $show &&
+
+		test_must_fail git lfg 2>actual &&
+		grep "^	lgf" actual &&
+
+		test_must_fail git distimdist 2>actual &&
+		grep "^	distimdistim" actual
+	
+	lgf
+	distimdistim
+ok 4 - autocorrect showing candidates
+
+expecting success of 9003.5 'autocorrect showing candidates': 
+		git config help.autocorrect $show &&
+
+		test_must_fail git lfg 2>actual &&
+		grep "^	lgf" actual &&
+
+		test_must_fail git distimdist 2>actual &&
+		grep "^	distimdistim" actual
+	
+	lgf
+	distimdistim
+ok 5 - autocorrect showing candidates
+
+expecting success of 9003.6 'autocorrect showing candidates': 
+		git config help.autocorrect $show &&
+
+		test_must_fail git lfg 2>actual &&
+		grep "^	lgf" actual &&
+
+		test_must_fail git distimdist 2>actual &&
+		grep "^	distimdistim" actual
+	
+	lgf
+	distimdistim
+ok 6 - autocorrect showing candidates
+
+expecting success of 9003.7 'autocorrect running commands': 
+		git config help.autocorrect $immediate &&
+
+		git lfg >actual &&
+		echo "a single log entry" >expect &&
+		test_cmp expect actual &&
+
+		git distimdist >actual &&
+		echo "distimdistim was called" >expect &&
+		test_cmp expect actual
+	
+WARNING: You called a Git command named 'lfg', which does not exist.
+Continuing under the assumption that you meant 'lgf'.
+WARNING: You called a Git command named 'distimdist', which does not exist.
+Continuing under the assumption that you meant 'distimdistim'.
+ok 7 - autocorrect running commands
+
+expecting success of 9003.8 'autocorrect running commands': 
+		git config help.autocorrect $immediate &&
+
+		git lfg >actual &&
+		echo "a single log entry" >expect &&
+		test_cmp expect actual &&
+
+		git distimdist >actual &&
+		echo "distimdistim was called" >expect &&
+		test_cmp expect actual
+	
+WARNING: You called a Git command named 'lfg', which does not exist.
+Continuing under the assumption that you meant 'lgf'.
+WARNING: You called a Git command named 'distimdist', which does not exist.
+Continuing under the assumption that you meant 'distimdistim'.
+ok 8 - autocorrect running commands
+
+expecting success of 9003.9 'autocorrect can be declined altogether': 
+	git config help.autocorrect never &&
+
+	test_must_fail git lfg 2>actual &&
+	grep "is not a git command" actual &&
+	test_line_count = 1 actual
+
+git: 'lfg' is not a git command. See 'git --help'.
+ok 9 - autocorrect can be declined altogether
+
+expecting success of 9003.10 'autocorrect works in work tree created from bare repo': 
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add ../worktree &&
+	git -C worktree -c help.autocorrect=immediate status
+
+Cloning into bare repository 'bare.git'...
+done.
+Preparing worktree (new branch 'worktree')
+HEAD is now at b57823c a single log entry
+On branch worktree
+nothing to commit, working tree clean
+ok 10 - autocorrect works in work tree created from bare repo
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t8013-blame-ignore-revs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
+expecting success of 8013.1 'setup': 
+	test_commit A file line1 &&
+
+	echo line2 >>file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
+
+	test_write_lines line-one line-two >file &&
+	git add file &&
+	test_tick &&
+	git commit -m X &&
+	git tag X &&
+	git tag -a -m "X (annotated)" XT &&
+
+	git blame --line-porcelain file >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse X >expect &&
+	test_cmp expect actual
+
+[master (root-commit) 6d1c9f2] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 5552443] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master abb9c4e] X
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 8013.2 'validate --ignore-rev': 
+	test_must_fail git blame --ignore-rev X^{tree} file
+
+fatal: cannot find revision X^{tree} to ignore
+ok 2 - validate --ignore-rev
+
+expecting success of 8013.3 'validate --ignore-revs-file': 
+	git rev-parse X^{tree} >ignore_x &&
+	git blame --ignore-revs-file ignore_x file
+
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 1) line-one
+abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 2) line-two
+ok 3 - validate --ignore-revs-file
+
+expecting success of 8013.4 'ignore_rev_changing_lines (X)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 4 - ignore_rev_changing_lines (X)
+
+expecting success of 8013.5 'ignore_rev_changing_lines (XT)': 
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
+	
+ok 5 - ignore_rev_changing_lines (XT)
+
+expecting success of 8013.6 'ignore_rev_adding_unblamable_lines': 
+	test_write_lines line-one-change line-two-changed y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Y &&
+	git tag Y &&
+
+	git rev-parse Y >expect &&
+	git blame --line-porcelain file --ignore-rev Y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+
+[master e0d35d6] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+ok 6 - ignore_rev_adding_unblamable_lines
+
+expecting success of 8013.7 'ignore_revs_from_files': 
+	git rev-parse X >ignore_x &&
+	git rev-parse Y >ignore_y &&
+	git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 7 - ignore_revs_from_files
+
+expecting success of 8013.8 'ignore_revs_from_configs_and_files': 
+	git config --add blame.ignoreRevsFile ignore_x &&
+	git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse A >expect &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual
+
+ok 8 - ignore_revs_from_configs_and_files
+
+expecting success of 8013.9 'override_ignore_revs_file': 
+	git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
+	git rev-parse X >expect &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual &&
+
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
+	test_cmp expect actual
+	
+ok 9 - override_ignore_revs_file
+
+expecting success of 8013.10 'bad_files_and_revs': 
+	test_must_fail git blame file --ignore-rev NOREV 2>err &&
+	test_grep "cannot find revision NOREV to ignore" err &&
+
+	test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
+	test_grep "could not open.*: NOFILE" err &&
+
+	echo NOREV >ignore_norev &&
+	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
+	test_grep "invalid object name: NOREV" err
+
+fatal: cannot find revision NOREV to ignore
+fatal: could not open object name list: NOFILE
+fatal: invalid object name: NOREV
+ok 10 - bad_files_and_revs
+
+expecting success of 8013.11 'mark_unblamable_lines': 
+	git config --add blame.markUnblamableLines true &&
+
+	git blame --ignore-rev Y file >blame_raw &&
+	echo "*" >expect &&
+
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
+
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual
+
+ok 11 - mark_unblamable_lines
+
+expecting success of 8013.12 'mark_ignored_lines': 
+	git config --add blame.markIgnoredLines true &&
+
+	test_write_lines line-one-Z line-two-Z y3 y4 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m Z &&
+	git tag Z &&
+
+	git blame --ignore-rev Z file >blame_raw &&
+	echo "?" >expect &&
 
-expecting success of 7816.123 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 123 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NOMATCH' a
+	sed -n "1p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
 
-expecting success of 7816.124 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a': 
-			>stderr &&
-			printf 'QNOMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 124 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NOMATCH' a
+	sed -n "2p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
 
-expecting success of 7816.125 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 125 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual &&
 
-expecting success of 7816.126 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 126 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	! test_cmp expect actual
 
-expecting success of 7816.127 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a': 
-			>stderr &&
-			printf 'æQ[ð]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -F a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 127 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
+[master d1e4550] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+--- expect	2025-03-17 13:29:23.619759121 +0000
++++ actual	2025-03-17 13:29:23.715759728 +0000
+@@ -1 +1 @@
+-?
++e
+--- expect	2025-03-17 13:29:23.619759121 +0000
++++ actual	2025-03-17 13:29:23.763760031 +0000
+@@ -1 +1 @@
+-?
++e
+ok 12 - mark_ignored_lines
 
-expecting success of 7816.128 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 128 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
+expecting success of 8013.13 'mark_unblamable_lines_intermediate': 
+	git config --add blame.markUnblamableLines true &&
 
-expecting success of 7816.129 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 129 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
+	git blame --ignore-rev Y file >blame_raw 2>stderr &&
+	echo "*" >expect &&
 
-expecting success of 7816.130 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -f f -Fi a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 130 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
+	sed -n "3p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual &&
 
-expecting success of 7816.131 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 131 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
+	sed -n "4p" blame_raw | cut -c1 >actual &&
+	test_cmp expect actual
 
-expecting success of 7816.132 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 132 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
+ok 13 - mark_unblamable_lines_intermediate
 
-expecting success of 7816.133 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a': 
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f -i a
-		
-Binary file a matches
-ok 133 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
+expecting success of 8013.14 'ignored_chunk_negative_parent_size': 
+	rm -rf .git/ &&
+	git init &&
 
-expecting success of 7816.134 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 134 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
+	test_write_lines L1 L2 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m A &&
+	git tag A &&
 
-expecting success of 7816.135 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 135 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>NÓMATCH' a
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
 
-expecting success of 7816.136 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'yQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 136 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>NÓMATCH' a
+	test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m C &&
+	git tag C &&
 
-expecting success of 7816.137 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 137 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
+	git blame file --ignore-rev B >blame_raw
 
-expecting success of 7816.138 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 138 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NÓMATCH' a
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
+[master (root-commit) 0157998] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+[master a8e635b] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+[master 3b3594b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - ignored_chunk_negative_parent_size
 
-expecting success of 7816.139 'LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f  a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 139 - LC_ALL='is_IS.utf8' git grep -P -f f  '<NUL>NÓMATCH' a
+expecting success of 8013.15 'ignore_merge': 
+	rm -rf .git/ &&
+	git init &&
 
-expecting success of 7816.140 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 140 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m A &&
+	git tag A &&
 
-expecting success of 7816.141 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 141 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>NÓMATCH' a
+	test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m B &&
+	git tag B &&
 
-expecting success of 7816.142 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'YQNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 142 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>NÓMATCH' a
+	git reset --hard A &&
+	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
+	git add file &&
+	test_tick &&
+	git commit -m C &&
+	git tag C &&
 
-expecting success of 7816.143 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 143 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
+	test_merge M B &&
+	git blame --line-porcelain file --ignore-rev M >blame_raw &&
 
-expecting success of 7816.144 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
-			test_grep 'This is only supported with -P under PCRE v2' stderr
-		
-fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
-ok 144 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '<NUL>NÓMATCH' a
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
+	git rev-parse B >expect &&
+	test_cmp expect actual &&
 
-expecting success of 7816.145 'LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a': 
-			>stderr &&
-			printf 'QNÓMATCH' | q_to_nul >f &&
-			test_must_fail env LC_ALL="is_IS.utf8" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 145 - LC_ALL='is_IS.utf8' git grep -P -f f -i '<NUL>NÓMATCH' a
+	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 9/s/ .*//p" blame_raw >actual &&
+	git rev-parse C >expect &&
+	test_cmp expect actual
 
-# passed all 145 test(s)
-1..145
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
+[master (root-commit) aebca2b] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+[master 38a4cbf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at aebca2b A
+[master 1f9babe] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - ignore_merge
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7400-submodule-basic.sh ***
@@ -513483,8 +515496,8 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 8f98e77 initial commit
---- actual	2026-04-19 19:23:48.383659440 +0000
-+++ actual2	2026-04-19 19:23:49.207659440 +0000
+--- actual	2025-03-17 13:28:03.003249760 +0000
++++ actual2	2025-03-17 13:28:04.251257645 +0000
 @@ -4,7 +4,7 @@
  23ad8e191a506339bc2aa0ae92a950f35303f38b
  23ad8e191a506339bc2aa0ae92a950f35303f38b
@@ -515038,2082 +517051,6 @@
 1..121
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9002-column.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9002-column/.git/
-expecting success of 9002.1 'setup': 
-	cat >lista <<\EOF
-one
-two
-three
-four
-five
-six
-seven
-eight
-nine
-ten
-eleven
-EOF
-
-ok 1 - setup
-
-expecting success of 9002.2 'never': 
-	git column --indent=Z --mode=never <lista >actual &&
-	test_cmp lista actual
-
-ok 2 - never
-
-expecting success of 9002.3 'always': 
-	cat >expected <<\EOF &&
-Zone
-Ztwo
-Zthree
-Zfour
-Zfive
-Zsix
-Zseven
-Zeight
-Znine
-Zten
-Zeleven
-EOF
-	git column --indent=Z --mode=plain <lista >actual &&
-	test_cmp expected actual
-
-ok 3 - always
-
-expecting success of 9002.4 '--nl': 
-	cat >expected <<\EOF &&
-oneZ
-twoZ
-threeZ
-fourZ
-fiveZ
-sixZ
-sevenZ
-eightZ
-nineZ
-tenZ
-elevenZ
-EOF
-	git column --nl="Z$LF" --mode=plain <lista >actual &&
-	test_cmp expected actual
-
-ok 4 - --nl
-
-expecting success of 9002.5 '80 columns': 
-	cat >expected <<\EOF &&
-one    two    three  four   five   six    seven  eight  nine   ten    eleven
-EOF
-	COLUMNS=80 git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 5 - 80 columns
-
-expecting success of 9002.6 'COLUMNS = 1': 
-	COLUMNS=1 git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 6 - COLUMNS = 1
-
-expecting success of 9002.7 'width = 1': 
-	git column --mode=column --width=1 <lista >actual &&
-	test_cmp expected actual
-
-ok 7 - width = 1
-
-expecting success of 9002.8 '20 columns': 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column <lista >actual &&
-	test_cmp expected actual
-
-ok 8 - 20 columns
-
-expecting success of 9002.9 '20 columns, nodense': 
-	cat >expected <<\EOF &&
-one    seven
-two    eight
-three  nine
-four   ten
-five   eleven
-six
-EOF
-	git column --mode=column,nodense < lista > actual &&
-	test_cmp expected actual
-
-ok 9 - 20 columns, nodense
-
-expecting success of 9002.10 '20 columns, dense': 
-	cat >expected <<\EOF &&
-one   five  nine
-two   six   ten
-three seven eleven
-four  eight
-EOF
-	git column --mode=column,dense < lista > actual &&
-	test_cmp expected actual
-
-ok 10 - 20 columns, dense
-
-expecting success of 9002.11 '20 columns, padding 2': 
-	cat >expected <<\EOF &&
-one     seven
-two     eight
-three   nine
-four    ten
-five    eleven
-six
-EOF
-	git column --mode=column --padding 2 <lista >actual &&
-	test_cmp expected actual
-
-ok 11 - 20 columns, padding 2
-
-expecting success of 9002.12 '20 columns, indented': 
-	cat >expected <<\EOF &&
-  one    seven
-  two    eight
-  three  nine
-  four   ten
-  five   eleven
-  six
-EOF
-	git column --mode=column --indent="  " <lista >actual &&
-	test_cmp expected actual
-
-ok 12 - 20 columns, indented
-
-expecting success of 9002.13 '20 columns, row first': 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row <lista >actual &&
-	test_cmp expected actual
-
-ok 13 - 20 columns, row first
-
-expecting success of 9002.14 '20 columns, row first, nodense': 
-	cat >expected <<\EOF &&
-one    two
-three  four
-five   six
-seven  eight
-nine   ten
-eleven
-EOF
-	git column --mode=row,nodense <lista >actual &&
-	test_cmp expected actual
-
-ok 14 - 20 columns, row first, nodense
-
-expecting success of 9002.15 '20 columns, row first, dense': 
-	cat >expected <<\EOF &&
-one   two    three
-four  five   six
-seven eight  nine
-ten   eleven
-EOF
-	git column --mode=row,dense <lista >actual &&
-	test_cmp expected actual
-
-ok 15 - 20 columns, row first, dense
-
-expecting success of 9002.16 'padding must be non-negative': 
-	cat >input <<\EOF &&
-1 2 3 4 5 6
-EOF
-	cat >expected <<\EOF &&
-fatal: --padding must be non-negative
-EOF
-	test_must_fail git column --mode=column --padding=-1 <input >actual 2>&1 &&
-	test_cmp expected actual
-
-ok 16 - padding must be non-negative
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9003-help-autocorrect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9003-help-autocorrect/.git/
-expecting success of 9003.1 'setup': 
-	# An alias
-	git config alias.lgf "log --format=%s --first-parent" &&
-
-	# A random user-defined command
-	write_script git-distimdistim <<-EOF &&
-		echo distimdistim was called
-	EOF
-
-	PATH="$PATH:." &&
-	export PATH &&
-
-	git commit --allow-empty -m "a single log entry" &&
-
-	# Sanity check
-	git lgf >actual &&
-	echo "a single log entry" >expect &&
-	test_cmp expect actual &&
-
-	git distimdistim >actual &&
-	echo "distimdistim was called" >expect &&
-	test_cmp expect actual
-
-[master (root-commit) b57823c] a single log entry
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 9003.2 'autocorrect showing candidates': 
-		git config help.autocorrect $show &&
-
-		test_must_fail git lfg 2>actual &&
-		grep "^	lgf" actual &&
-
-		test_must_fail git distimdist 2>actual &&
-		grep "^	distimdistim" actual
-	
-	lgf
-	distimdistim
-ok 2 - autocorrect showing candidates
-
-expecting success of 9003.3 'autocorrect showing candidates': 
-		git config help.autocorrect $show &&
-
-		test_must_fail git lfg 2>actual &&
-		grep "^	lgf" actual &&
-
-		test_must_fail git distimdist 2>actual &&
-		grep "^	distimdistim" actual
-	
-	lgf
-	distimdistim
-ok 3 - autocorrect showing candidates
-
-expecting success of 9003.4 'autocorrect showing candidates': 
-		git config help.autocorrect $show &&
-
-		test_must_fail git lfg 2>actual &&
-		grep "^	lgf" actual &&
-
-		test_must_fail git distimdist 2>actual &&
-		grep "^	distimdistim" actual
-	
-	lgf
-	distimdistim
-ok 4 - autocorrect showing candidates
-
-expecting success of 9003.5 'autocorrect showing candidates': 
-		git config help.autocorrect $show &&
-
-		test_must_fail git lfg 2>actual &&
-		grep "^	lgf" actual &&
-
-		test_must_fail git distimdist 2>actual &&
-		grep "^	distimdistim" actual
-	
-	lgf
-	distimdistim
-ok 5 - autocorrect showing candidates
-
-expecting success of 9003.6 'autocorrect showing candidates': 
-		git config help.autocorrect $show &&
-
-		test_must_fail git lfg 2>actual &&
-		grep "^	lgf" actual &&
-
-		test_must_fail git distimdist 2>actual &&
-		grep "^	distimdistim" actual
-	
-	lgf
-	distimdistim
-ok 6 - autocorrect showing candidates
-
-expecting success of 9003.7 'autocorrect running commands': 
-		git config help.autocorrect $immediate &&
-
-		git lfg >actual &&
-		echo "a single log entry" >expect &&
-		test_cmp expect actual &&
-
-		git distimdist >actual &&
-		echo "distimdistim was called" >expect &&
-		test_cmp expect actual
-	
-WARNING: You called a Git command named 'lfg', which does not exist.
-Continuing under the assumption that you meant 'lgf'.
-WARNING: You called a Git command named 'distimdist', which does not exist.
-Continuing under the assumption that you meant 'distimdistim'.
-ok 7 - autocorrect running commands
-
-expecting success of 9003.8 'autocorrect running commands': 
-		git config help.autocorrect $immediate &&
-
-		git lfg >actual &&
-		echo "a single log entry" >expect &&
-		test_cmp expect actual &&
-
-		git distimdist >actual &&
-		echo "distimdistim was called" >expect &&
-		test_cmp expect actual
-	
-WARNING: You called a Git command named 'lfg', which does not exist.
-Continuing under the assumption that you meant 'lgf'.
-WARNING: You called a Git command named 'distimdist', which does not exist.
-Continuing under the assumption that you meant 'distimdistim'.
-ok 8 - autocorrect running commands
-
-expecting success of 9003.9 'autocorrect can be declined altogether': 
-	git config help.autocorrect never &&
-
-	test_must_fail git lfg 2>actual &&
-	grep "is not a git command" actual &&
-	test_line_count = 1 actual
-
-git: 'lfg' is not a git command. See 'git --help'.
-ok 9 - autocorrect can be declined altogether
-
-expecting success of 9003.10 'autocorrect works in work tree created from bare repo': 
-	git clone --bare . bare.git &&
-	git -C bare.git worktree add ../worktree &&
-	git -C worktree -c help.autocorrect=immediate status
-
-Cloning into bare repository 'bare.git'...
-done.
-Preparing worktree (new branch 'worktree')
-HEAD is now at b57823c a single log entry
-On branch worktree
-nothing to commit, working tree clean
-ok 10 - autocorrect works in work tree created from bare repo
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t7900-maintenance.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/
-expecting success of 7900.1 'help text': 
-	test_expect_code 129 git maintenance -h >actual &&
-	test_grep "usage: git maintenance <subcommand>" actual &&
-	test_expect_code 129 git maintenance barf 2>err &&
-	test_grep "unknown subcommand: \`barf'" err &&
-	test_grep "usage: git maintenance" err &&
-	test_expect_code 129 git maintenance 2>err &&
-	test_grep "error: need a subcommand" err &&
-	test_grep "usage: git maintenance" err
-
-usage: git maintenance <subcommand> [<options>]
-error: unknown subcommand: `barf'
-usage: git maintenance <subcommand> [<options>]
-error: need a subcommand
-usage: git maintenance <subcommand> [<options>]
-ok 1 - help text
-
-expecting success of 7900.2 'run [--auto|--quiet]': 
-	GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
-		git maintenance run 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
-		git maintenance run --auto 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \
-		git maintenance run --no-quiet 2>/dev/null &&
-	test_subcommand git gc --quiet --no-detach <run-no-auto.txt &&
-	test_subcommand ! git gc --auto --quiet --no-detach <run-auto.txt &&
-	test_subcommand git gc --no-quiet --no-detach <run-no-quiet.txt
-
-Nothing new to pack.
-{"event":"child_start","sid":"20260419T192441.032342Z-H8d819085-P0021f5ee","thread":"main","time":"2026-04-19T19:24:41.032918Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260419T192441.244192Z-H8d819085-P0021f6ec","thread":"main","time":"2026-04-19T19:24:41.244736Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet","--no-detach"]}
-ok 2 - run [--auto|--quiet]
-
-expecting success of 7900.3 'maintenance.auto config option': 
-	GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
-	test_subcommand git maintenance run --auto --quiet --detach <default &&
-	GIT_TRACE2_EVENT="$(pwd)/true" \
-		git -c maintenance.auto=true \
-		commit --quiet --allow-empty -m 2 &&
-	test_subcommand git maintenance run --auto --quiet --detach <true &&
-	GIT_TRACE2_EVENT="$(pwd)/false" \
-		git -c maintenance.auto=false \
-		commit --quiet --allow-empty -m 3 &&
-	test_subcommand ! git maintenance run --auto --quiet --detach <false
-
-{"event":"child_start","sid":"20260419T192441.520292Z-H8d819085-P0021f848","thread":"main","time":"2026-04-19T19:24:41.522127Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-{"event":"child_start","sid":"20260419T192441.568279Z-H8d819085-P0021f87a","thread":"main","time":"2026-04-19T19:24:41.570420Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-ok 3 - maintenance.auto config option
-
-expecting success of 7900.4 'maintenance.autoDetach=true config option': 
-		test_when_finished "rm -f trace" &&
-		test_config $cfg true &&
-		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
-		test_subcommand git maintenance run --auto --quiet --detach <trace
-	
-{"event":"child_start","sid":"20260419T192441.725711Z-H8d819085-P0021f940","thread":"main","time":"2026-04-19T19:24:41.727940Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-ok 4 - maintenance.autoDetach=true config option
-
-expecting success of 7900.5 'maintenance.autoDetach=false config option': 
-		test_when_finished "rm -f trace" &&
-		test_config $cfg false &&
-		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
-		test_subcommand git maintenance run --auto --quiet --no-detach <trace
-	
-{"event":"child_start","sid":"20260419T192441.897137Z-H8d819085-P0021fa06","thread":"main","time":"2026-04-19T19:24:41.908088Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
-ok 5 - maintenance.autoDetach=false config option
-
-expecting success of 7900.6 'gc.autoDetach=true config option': 
-		test_when_finished "rm -f trace" &&
-		test_config $cfg true &&
-		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
-		test_subcommand git maintenance run --auto --quiet --detach <trace
-	
-{"event":"child_start","sid":"20260419T192442.045889Z-H8d819085-P0021faa8","thread":"main","time":"2026-04-19T19:24:42.048008Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--detach"]}
-ok 6 - gc.autoDetach=true config option
-
-expecting success of 7900.7 'gc.autoDetach=false config option': 
-		test_when_finished "rm -f trace" &&
-		test_config $cfg false &&
-		GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
-		test_subcommand git maintenance run --auto --quiet --no-detach <trace
-	
-{"event":"child_start","sid":"20260419T192442.187354Z-H8d819085-P0021fb76","thread":"main","time":"2026-04-19T19:24:42.189536Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
-ok 7 - gc.autoDetach=false config option
-
-expecting success of 7900.8 'maintenance.autoDetach overrides gc.autoDetach': 
-	test_when_finished "rm -f trace" &&
-	test_config maintenance.autoDetach false &&
-	test_config gc.autoDetach true &&
-	GIT_TRACE2_EVENT="$(pwd)/trace" git commit --quiet --allow-empty -m 1 &&
-	test_subcommand git maintenance run --auto --quiet --no-detach <trace
-
-{"event":"child_start","sid":"20260419T192442.359651Z-H8d819085-P0021fc3d","thread":"main","time":"2026-04-19T19:24:42.361849Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet","--no-detach"]}
-ok 8 - maintenance.autoDetach overrides gc.autoDetach
-
-expecting success of 7900.9 'register uses XDG_CONFIG_HOME config if it exists': 
-	test_when_finished rm -r .config/git/config &&
-	(
-		XDG_CONFIG_HOME=.config &&
-		export XDG_CONFIG_HOME &&
-		mkdir -p $XDG_CONFIG_HOME/git &&
-		>$XDG_CONFIG_HOME/git/config &&
-		git maintenance register &&
-		git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
-		pwd >expect &&
-		test_cmp expect actual
-	)
-
-ok 9 - register uses XDG_CONFIG_HOME config if it exists
-
-expecting success of 7900.10 'register does not need XDG_CONFIG_HOME config to exist': 
-	test_when_finished git maintenance unregister &&
-	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
-	git maintenance register &&
-	git config --global --get maintenance.repo >actual &&
-	pwd >expect &&
-	test_cmp expect actual
-
-ok 10 - register does not need XDG_CONFIG_HOME config to exist
-
-expecting success of 7900.11 'unregister uses XDG_CONFIG_HOME config if it exists': 
-	test_when_finished rm -r .config/git/config &&
-	(
-		XDG_CONFIG_HOME=.config &&
-		export XDG_CONFIG_HOME &&
-		mkdir -p $XDG_CONFIG_HOME/git &&
-		>$XDG_CONFIG_HOME/git/config &&
-		git maintenance register &&
-		git maintenance unregister &&
-		test_must_fail git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
-		test_must_be_empty actual
-	)
-
-ok 11 - unregister uses XDG_CONFIG_HOME config if it exists
-
-expecting success of 7900.12 'unregister does not need XDG_CONFIG_HOME config to exist': 
-	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
-	git maintenance register &&
-	git maintenance unregister &&
-	test_must_fail git config --global --get maintenance.repo >actual &&
-	test_must_be_empty actual
-
-ok 12 - unregister does not need XDG_CONFIG_HOME config to exist
-
-expecting success of 7900.13 'maintenance.<task>.enabled': 
-	git config maintenance.gc.enabled false &&
-	git config maintenance.commit-graph.enabled true &&
-	GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err &&
-	test_subcommand ! git gc --quiet <run-config.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt
-
-{"event":"child_start","sid":"20260419T192442.958967Z-H8d819085-P0021fec6","thread":"main","time":"2026-04-19T19:24:42.959539Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 13 - maintenance.<task>.enabled
-
-expecting success of 7900.14 'run --task=<task>': 
-	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
-		git maintenance run --task=commit-graph 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \
-		git maintenance run --task=gc 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
-		git maintenance run --task=commit-graph 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \
-		git maintenance run --task=commit-graph --task=gc 2>/dev/null &&
-	test_subcommand ! git gc --quiet --no-detach <run-commit-graph.txt &&
-	test_subcommand git gc --quiet --no-detach <run-gc.txt &&
-	test_subcommand git gc --quiet --no-detach <run-both.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt &&
-	test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
-
-{"event":"child_start","sid":"20260419T192443.128609Z-H8d819085-P0021ff62","thread":"main","time":"2026-04-19T19:24:43.129179Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260419T192443.385605Z-H8d819085-P00220072","thread":"main","time":"2026-04-19T19:24:43.386164Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet","--no-detach"]}
-{"event":"child_start","sid":"20260419T192443.075769Z-H8d819085-P0021ff40","thread":"main","time":"2026-04-19T19:24:43.076390Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192443.335651Z-H8d819085-P00220033","thread":"main","time":"2026-04-19T19:24:43.336253Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192443.385605Z-H8d819085-P00220072","thread":"main","time":"2026-04-19T19:24:43.534829Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 14 - run --task=<task>
-
-expecting success of 7900.15 'core.commitGraph=false prevents write process': 
-	GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
-		git -c core.commitGraph=false maintenance run \
-		--task=commit-graph 2>/dev/null &&
-	test_subcommand ! git commit-graph write --split --reachable --no-progress \
-		<no-commit-graph.txt
-
-ok 15 - core.commitGraph=false prevents write process
-
-expecting success of 7900.16 'commit-graph auto condition': 
-	COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
-		git -c maintenance.commit-graph.auto=1 $COMMAND &&
-	GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
-		git -c maintenance.commit-graph.auto="-1" $COMMAND &&
-
-	test_commit first &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
-		git -c maintenance.commit-graph.auto=0 $COMMAND &&
-	GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
-		git -c maintenance.commit-graph.auto=1 $COMMAND &&
-
-	git commit --allow-empty -m "second" &&
-	git commit --allow-empty -m "third" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
-		git -c maintenance.commit-graph.auto=2 $COMMAND &&
-
-	COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
-	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
-	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.txt
-
-[master f1c53f6] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[master 2ff0394] second
- Author: A U Thor <author@example.com>
-[master 826111a] third
- Author: A U Thor <author@example.com>
-{"event":"child_start","sid":"20260419T192443.800384Z-H8d819085-P0022025e","thread":"main","time":"2026-04-19T19:24:43.800968Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192443.933466Z-H8d819085-P002202f0","thread":"main","time":"2026-04-19T19:24:43.934628Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192444.016365Z-H8d819085-P0022038e","thread":"main","time":"2026-04-19T19:24:44.017603Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 16 - commit-graph auto condition
-
-expecting success of 7900.17 'run --task=bogus': 
-	test_must_fail git maintenance run --task=bogus 2>err &&
-	test_grep "is not a valid task" err
-
-error: 'bogus' is not a valid task
-ok 17 - run --task=bogus
-
-expecting success of 7900.18 'run --task duplicate': 
-	test_must_fail git maintenance run --task=gc --task=gc 2>err &&
-	test_grep "cannot be selected multiple times" err
-
-error: task 'gc' cannot be selected multiple times
-ok 18 - run --task duplicate
-
-expecting success of 7900.19 'run --task=prefetch with no remotes': 
-	git maintenance run --task=prefetch 2>err &&
-	test_must_be_empty err
-
-ok 19 - run --task=prefetch with no remotes
-
-expecting success of 7900.20 'prefetch multiple remotes': 
-	git clone . clone1 &&
-	git clone . clone2 &&
-	git remote add remote1 "file://$(pwd)/clone1" &&
-	git remote add remote2 "file://$(pwd)/clone2" &&
-	git -C clone1 switch -c one &&
-	git -C clone2 switch -c two &&
-	test_commit -C clone1 one &&
-	test_commit -C clone2 two &&
-	GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
-	fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
-	test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
-	test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
-	git for-each-ref refs/remotes >actual &&
-	test_must_be_empty actual &&
-	git log prefetch/remotes/remote1/one &&
-	git log prefetch/remotes/remote2/two &&
-	git fetch --all &&
-	test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
-	test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
-
-	git log --oneline --decorate --all >log &&
-	! grep "prefetch" log &&
-
-	test_when_finished git config --unset remote.remote1.skipFetchAll &&
-	git config remote.remote1.skipFetchAll true &&
-	GIT_TRACE2_EVENT="$(pwd)/skip-remote1.txt" git maintenance run --task=prefetch 2>/dev/null &&
-	test_subcommand ! git fetch remote1 $fetchargs <skip-remote1.txt &&
-	test_subcommand git fetch remote2 $fetchargs <skip-remote1.txt
-
-Cloning into 'clone1'...
-done.
-Cloning into 'clone2'...
-done.
-Switched to a new branch 'one'
-Switched to a new branch 'two'
-[one 3381d63] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[two 98acc48] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-{"event":"child_start","sid":"20260419T192444.602678Z-H8d819085-P002205f7","thread":"main","time":"2026-04-19T19:24:44.603301Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote1","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
-{"event":"child_start","sid":"20260419T192444.602678Z-H8d819085-P002205f7","thread":"main","time":"2026-04-19T19:24:44.706689Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
-commit 3381d63412cf2a4c8ab1a7ad5eaba88b720e200c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    one
-
-commit 826111ad491fb7a820c5c9b557cf1f688f5bca8e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    third
-
-commit 2ff0394a350f5ea1c7e4b1cc8abb51b9f47528bb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    second
-
-commit f1c53f698bad02519d2c04b5223a43f227be69e5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit 35258a332d25de55db6263fe6a65d931f0b5b49a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit ddb9b14cb4ee58fa70922a2ae052c23586ca2afa
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 63747f81e7e217a3b7da140dd91aabc412a32230
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 326ca1ce27e572c89fdb164b2908a5fefd029fc5
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 3f82c72771006fd41624869dc0fd0e2da48bb0f9
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 54c6b2cd4fb50066683a197cc6d677689618505a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    3
-
-commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    2
-
-commit a3a8cd3c82028671bf51502d77277baf14a2f528
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-commit 98acc48ea4754bf90cb8ea094e9b3a3e4140090f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    two
-
-commit 826111ad491fb7a820c5c9b557cf1f688f5bca8e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    third
-
-commit 2ff0394a350f5ea1c7e4b1cc8abb51b9f47528bb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    second
-
-commit f1c53f698bad02519d2c04b5223a43f227be69e5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit 35258a332d25de55db6263fe6a65d931f0b5b49a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit ddb9b14cb4ee58fa70922a2ae052c23586ca2afa
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 63747f81e7e217a3b7da140dd91aabc412a32230
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 326ca1ce27e572c89fdb164b2908a5fefd029fc5
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 3f82c72771006fd41624869dc0fd0e2da48bb0f9
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-
-commit 54c6b2cd4fb50066683a197cc6d677689618505a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    3
-
-commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    2
-
-commit a3a8cd3c82028671bf51502d77277baf14a2f528
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-Fetching remote1
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/clone1
- * [new branch]      master     -> remote1/master
- * [new branch]      one        -> remote1/one
- * [new tag]         one        -> one
-Fetching remote2
-From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/clone2
- * [new branch]      master     -> remote2/master
- * [new branch]      two        -> remote2/two
- * [new tag]         two        -> two
-{"event":"child_start","sid":"20260419T192445.187613Z-H8d819085-P00220844","thread":"main","time":"2026-04-19T19:24:45.188272Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","fetch","remote2","--prefetch","--prune","--no-tags","--no-write-fetch-head","--recurse-submodules=no","--quiet"]}
-ok 20 - prefetch multiple remotes
-
-expecting success of 7900.21 'loose-objects task': 
-	# Repack everything so we know the state of the object dir
-	git repack -adk &&
-
-	# Hack to stop maintenance from running during "git commit"
-	echo in use >.git/objects/maintenance.lock &&
-
-	# Assuming that "git commit" creates at least one loose object
-	test_commit create-loose-object &&
-	rm .git/objects/maintenance.lock &&
-
-	ls .git/objects >obj-dir-before &&
-	test_file_not_empty obj-dir-before &&
-	ls .git/objects/pack/*.pack >packs-before &&
-	test_line_count = 1 packs-before &&
-
-	# The first run creates a pack-file
-	# but does not delete loose objects.
-	git maintenance run --task=loose-objects &&
-	ls .git/objects >obj-dir-between &&
-	test_cmp obj-dir-before obj-dir-between &&
-	ls .git/objects/pack/*.pack >packs-between &&
-	test_line_count = 2 packs-between &&
-	ls .git/objects/pack/loose-*.pack >loose-packs &&
-	test_line_count = 1 loose-packs &&
-
-	# The second run deletes loose objects
-	# but does not create a pack-file.
-	git maintenance run --task=loose-objects &&
-	ls .git/objects >obj-dir-after &&
-	cat >expect <<-\EOF &&
-	info
-	pack
-	EOF
-	test_cmp expect obj-dir-after &&
-	ls .git/objects/pack/*.pack >packs-after &&
-	test_cmp packs-between packs-after
-
-[master edd7a6f] create-loose-object
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 create-loose-object.t
-ok 21 - loose-objects task
-
-expecting success of 7900.22 'maintenance.loose-objects.auto': 
-	git repack -adk &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
-		git -c maintenance.loose-objects.auto=1 maintenance \
-		run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
-	printf data-A | git hash-object -t blob --stdin -w &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand ! git prune-packed --quiet <trace-loA &&
-	printf data-B | git hash-object -t blob --stdin -w &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <trace-loB &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <trace-loC
-
-07163daad06a0119b0a241cf1882adae4f88fd56
-4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
-{"event":"child_start","sid":"20260419T192445.979658Z-H8d819085-P00220bc1","thread":"main","time":"2026-04-19T19:24:45.980454Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192446.064522Z-H8d819085-P00220c22","thread":"main","time":"2026-04-19T19:24:46.065280Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-ok 22 - maintenance.loose-objects.auto
-
-expecting success of 7900.23 'incremental-repack task': 
-	packDir=.git/objects/pack &&
-	for i in $(test_seq 1 5)
-	do
-		test_commit $i || return 1
-	done &&
-
-	# Create three disjoint pack-files with size BIG, small, small.
-	echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
-	test_tick &&
-	git pack-objects --revs $packDir/test-2 <<-\EOF &&
-	HEAD~1
-	^HEAD~2
-	EOF
-	test_tick &&
-	git pack-objects --revs $packDir/test-3 <<-\EOF &&
-	HEAD
-	^HEAD~1
-	EOF
-
-	# Delete refs that have not been repacked in these packs.
-	git for-each-ref --format="delete %(refname)" \
-		refs/prefetch refs/tags refs/remotes \
-		--exclude=refs/remotes/*/HEAD >refs &&
-	git update-ref --stdin <refs &&
-
-	# Replace the object directory with this pack layout.
-	rm -f $packDir/pack-* &&
-	rm -f $packDir/loose-* &&
-	ls $packDir/*.pack >packs-before &&
-	test_line_count = 3 packs-before &&
-
-	# make sure we do not have any broken refs that were
-	# missed in the deletion above
-	git for-each-ref &&
-
-	# the job repacks the two into a new pack, but does not
-	# delete the old ones.
-	git maintenance run --task=incremental-repack &&
-	ls $packDir/*.pack >packs-between &&
-	test_line_count = 4 packs-between &&
-
-	# the job deletes the two old packs, and does not write
-	# a new one because the batch size is not high enough to
-	# pack the largest pack-file.
-	git maintenance run --task=incremental-repack &&
-	ls .git/objects/pack/*.pack >packs-after &&
-	test_line_count = 2 packs-after
-
-[master cfd6ede] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master bddbac0] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master 00c7c54] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master 7248485] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 3230911] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-cd00d8ed6e39c631d7021be2351af90c5e6ca5cc
-7656191c100ac2502a98ec7b811467f8725c358f
-d375d935f21fd959bcf75a2ab518c0c2f3b2d056
-32309114fe8a185eb08d9ff7b33337992b11edac commit	refs/heads/master
-ok 23 - incremental-repack task
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 24 # skip incremental-repack 2g limit (missing EXPENSIVE)
-
-expecting success of 7900.25 'maintenance.incremental-repack.auto': 
-	rm -rf incremental-repack-true &&
-	git init incremental-repack-true &&
-	(
-		cd incremental-repack-true &&
-		git config core.multiPackIndex true &&
-		run_incremental_repack_and_verify
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/incremental-repack-true/.git/
-[master (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master ab54baa] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ba2455fe8b258f9311bea5fa32bd29103f57ba7e
-[master 3983a09] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20260419T192447.331255Z-H8d819085-P00221153","thread":"main","time":"2026-04-19T19:24:47.331963Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 25 - maintenance.incremental-repack.auto
-
-expecting success of 7900.26 'maintenance.incremental-repack.auto (when config is unset)': 
-	rm -rf incremental-repack-unset &&
-	git init incremental-repack-unset &&
-	(
-		cd incremental-repack-unset &&
-		test_unconfig core.multiPackIndex &&
-		run_incremental_repack_and_verify
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/incremental-repack-unset/.git/
-[master (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master ab54baa] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ba2455fe8b258f9311bea5fa32bd29103f57ba7e
-[master 3983a09] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20260419T192447.964329Z-H8d819085-P0022142d","thread":"main","time":"2026-04-19T19:24:47.965010Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 26 - maintenance.incremental-repack.auto (when config is unset)
-
-expecting success of 7900.27 'pack-refs task': 
-	for n in $(test_seq 1 5)
-	do
-		git branch -f to-pack/$n HEAD || return 1
-	done &&
-	GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
-		git maintenance run --task=pack-refs &&
-	test_subcommand git pack-refs --all --prune <pack-refs.txt
-
-{"event":"child_start","sid":"20260419T192448.199713Z-H8d819085-P0022151c","thread":"main","time":"2026-04-19T19:24:48.200324Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-ok 27 - pack-refs task
-
-expecting success of 7900.28 '--auto and --schedule incompatible': 
-	test_must_fail git maintenance run --auto --schedule=daily 2>err &&
-	test_grep "at most one" err
-
-fatal: use at most one of --auto and --schedule=<frequency>
-ok 28 - --auto and --schedule incompatible
-
-expecting success of 7900.29 'invalid --schedule value': 
-	test_must_fail git maintenance run --schedule=annually 2>err &&
-	test_grep "unrecognized --schedule" err
-
-fatal: unrecognized --schedule argument 'annually'
-ok 29 - invalid --schedule value
-
-expecting success of 7900.30 '--schedule inheritance weekly -> daily -> hourly': 
-	git config maintenance.loose-objects.enabled true &&
-	git config maintenance.loose-objects.schedule hourly &&
-	git config maintenance.commit-graph.enabled true &&
-	git config maintenance.commit-graph.schedule daily &&
-	git config maintenance.incremental-repack.enabled true &&
-	git config maintenance.incremental-repack.schedule weekly &&
-
-	GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
-		git maintenance run --schedule=hourly 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <hourly.txt &&
-	test_subcommand ! git commit-graph write --split --reachable \
-		--no-progress <hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
-
-	GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
-		git maintenance run --schedule=daily 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <daily.txt &&
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <daily.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
-
-	GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
-		git maintenance run --schedule=weekly 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <weekly.txt &&
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <weekly.txt &&
-	test_subcommand git multi-pack-index write --no-progress <weekly.txt
-
-{"event":"child_start","sid":"20260419T192448.448459Z-H8d819085-P0022166a","thread":"main","time":"2026-04-19T19:24:48.714901Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192448.892321Z-H8d819085-P00221887","thread":"main","time":"2026-04-19T19:24:49.027917Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192448.892321Z-H8d819085-P00221887","thread":"main","time":"2026-04-19T19:24:49.053821Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.156487Z-H8d819085-P002219c5","thread":"main","time":"2026-04-19T19:24:49.295133Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192449.156487Z-H8d819085-P002219c5","thread":"main","time":"2026-04-19T19:24:49.409058Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.156487Z-H8d819085-P002219c5","thread":"main","time":"2026-04-19T19:24:49.315245Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 30 - --schedule inheritance weekly -> daily -> hourly
-
-expecting success of 7900.31 'maintenance.strategy inheritance': 
-	for task in commit-graph loose-objects incremental-repack
-	do
-		git config --unset maintenance.$task.schedule || return 1
-	done &&
-
-	test_when_finished git config --unset maintenance.strategy &&
-	git config maintenance.strategy incremental &&
-
-	GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
-		git maintenance run --schedule=hourly --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
-		git maintenance run --schedule=daily --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
-		git maintenance run --schedule=weekly --quiet &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-hourly.txt &&
-	test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<incremental-hourly.txt &&
-	test_subcommand ! git pack-refs --all --prune \
-		<incremental-hourly.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-daily.txt &&
-	test_subcommand git prune-packed --quiet <incremental-daily.txt &&
-	test_subcommand git multi-pack-index write --no-progress \
-		<incremental-daily.txt &&
-	test_subcommand ! git pack-refs --all --prune \
-		<incremental-daily.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-weekly.txt &&
-	test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
-	test_subcommand git multi-pack-index write --no-progress \
-		<incremental-weekly.txt &&
-	test_subcommand git pack-refs --all --prune \
-		<incremental-weekly.txt &&
-
-	# Modify defaults
-	git config maintenance.commit-graph.schedule daily &&
-	git config maintenance.loose-objects.schedule hourly &&
-	git config maintenance.incremental-repack.enabled false &&
-
-	GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
-		git maintenance run --schedule=hourly --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
-		git maintenance run --schedule=daily --quiet &&
-
-	test_subcommand ! git commit-graph write --split --reachable \
-		--no-progress <modified-hourly.txt &&
-	test_subcommand git prune-packed --quiet <modified-hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<modified-hourly.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <modified-daily.txt &&
-	test_subcommand git prune-packed --quiet <modified-daily.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<modified-daily.txt
-
-{"event":"child_start","sid":"20260419T192449.564665Z-H8d819085-P00221bb1","thread":"main","time":"2026-04-19T19:24:49.682714Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.716328Z-H8d819085-P00221c78","thread":"main","time":"2026-04-19T19:24:49.967062Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.716328Z-H8d819085-P00221c78","thread":"main","time":"2026-04-19T19:24:49.902706Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192449.716328Z-H8d819085-P00221c78","thread":"main","time":"2026-04-19T19:24:49.919206Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.996857Z-H8d819085-P00221dbe","thread":"main","time":"2026-04-19T19:24:50.204157Z","file":"run-command.c","line":734,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.996857Z-H8d819085-P00221dbe","thread":"main","time":"2026-04-19T19:24:50.142697Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192449.996857Z-H8d819085-P00221dbe","thread":"main","time":"2026-04-19T19:24:50.149525Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20260419T192449.996857Z-H8d819085-P00221dbe","thread":"main","time":"2026-04-19T19:24:50.221751Z","file":"run-command.c","line":734,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-{"event":"child_start","sid":"20260419T192450.556316Z-H8d819085-P00222024","thread":"main","time":"2026-04-19T19:24:50.687730Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20260419T192450.727916Z-H8d819085-P002220e6","thread":"main","time":"2026-04-19T19:24:50.913743Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20260419T192450.727916Z-H8d819085-P002220e6","thread":"main","time":"2026-04-19T19:24:50.902905Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-ok 31 - maintenance.strategy inheritance
-
-expecting success of 7900.32 'register and unregister': 
-	test_when_finished git config --global --unset-all maintenance.repo &&
-
-	test_must_fail git maintenance unregister 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --force &&
-
-	git config --global --add maintenance.repo /existing1 &&
-	git config --global --add maintenance.repo /existing2 &&
-	git config --global --get-all maintenance.repo >before &&
-
-	git maintenance register &&
-	test_cmp_config false maintenance.auto &&
-	git config --global --get-all maintenance.repo >between &&
-	cp before expect &&
-	pwd >>expect &&
-	test_cmp expect between &&
-
-	git maintenance unregister &&
-	git config --global --get-all maintenance.repo >actual &&
-	test_cmp before actual &&
-
-	git config --file ./other --add maintenance.repo /existing1 &&
-	git config --file ./other --add maintenance.repo /existing2 &&
-	git config --file ./other --get-all maintenance.repo >before &&
-
-	git maintenance register --config-file ./other &&
-	test_cmp_config false maintenance.auto &&
-	git config --file ./other --get-all maintenance.repo >between &&
-	cp before expect &&
-	pwd >>expect &&
-	test_cmp expect between &&
-
-	git maintenance unregister --config-file ./other &&
-	git config --file ./other --get-all maintenance.repo >actual &&
-	test_cmp before actual &&
-
-	test_must_fail git maintenance unregister 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --force &&
-
-	test_must_fail git maintenance unregister --config-file ./other 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --config-file ./other --force
-
-fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
-fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
-fatal: repository '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance' is not registered
-ok 32 - register and unregister
-
-expecting success of 7900.33 'register with no value for maintenance.repo': 
-	cp .git/config .git/config.orig &&
-	test_when_finished mv .git/config.orig .git/config &&
-
-	cat >>.git/config <<-\EOF &&
-	[maintenance]
-		repo
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'maintenance.repo'
-	EOF
-	git maintenance register 2>actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo
-
-
-ok 33 - register with no value for maintenance.repo
-
-expecting success of 7900.34 'unregister with no value for maintenance.repo': 
-	cp .git/config .git/config.orig &&
-	test_when_finished mv .git/config.orig .git/config &&
-
-	cat >>.git/config <<-\EOF &&
-	[maintenance]
-		repo
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'maintenance.repo'
-	EOF
-	test_expect_code 128 git maintenance unregister 2>actual.raw &&
-	grep ^error actual.raw >actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo &&
-
-	git maintenance unregister --force 2>actual.raw &&
-	grep ^error actual.raw >actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo
-
-
-
-ok 34 - unregister with no value for maintenance.repo
-
-expecting success of 7900.35 'register and unregister with regex metacharacters': 
-	META="a+b*c" &&
-	git init "$META" &&
-	git -C "$META" maintenance register &&
-	git config --get-all --show-origin maintenance.repo &&
-	git config --get-all --global --fixed-value \
-		maintenance.repo "$(pwd)/$META" &&
-	git -C "$META" maintenance unregister &&
-	test_must_fail git config --get-all --global --fixed-value \
-		maintenance.repo "$(pwd)/$META"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c/.git/
-file:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-file:/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/a+b*c
-ok 35 - register and unregister with regex metacharacters
-
-expecting success of 7900.36 'start without GIT_TEST_MAINT_SCHEDULER': 
-	test_when_finished "rm -rf systemctl.log script repo" &&
-	mkdir script &&
-	write_script script/systemctl <<-\EOF &&
-	echo "$*" >>../systemctl.log
-	EOF
-	git init repo &&
-	(
-		cd repo &&
-		sane_unset GIT_TEST_MAINT_SCHEDULER &&
-		PATH="$PWD/../script:$PATH" git maintenance start --scheduler=systemd
-	) &&
-	test_grep -- "--user list-timers" systemctl.log &&
-	test_grep -- "enable --now git-maintenance@" systemctl.log
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
---user list-timers
---user enable --now git-maintenance@hourly.timer
---user enable --now git-maintenance@daily.timer
---user enable --now git-maintenance@weekly.timer
-ok 36 - start without GIT_TEST_MAINT_SCHEDULER
-
-expecting success of 7900.37 'start --scheduler=<scheduler>': 
-	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
-	test_grep "unrecognized --scheduler argument" err &&
-
-	test_expect_code 129 git maintenance start --no-scheduler 2>err &&
-	test_grep "unknown option" err &&
-
-	test_expect_code 128 \
-		env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
-		git maintenance start --scheduler=crontab 2>err &&
-	test_grep "fatal: crontab scheduler is not available" err
-
-error: unrecognized --scheduler argument 'foo'
-error: unknown option `no-scheduler'
-fatal: crontab scheduler is not available
-ok 37 - start --scheduler=<scheduler>
-
-expecting success of 7900.38 'start from empty cron table': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
-	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
-	grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-13 0 * * 1-6 "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=daily
-13 1-23 * * * "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=hourly
-13 0 * * 0 "/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=weekly
-ok 38 - start from empty cron table
-
-expecting success of 7900.39 'stop from existing schedule': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	# Operation is idempotent
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-	test_must_be_empty cron.txt
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-ok 39 - stop from existing schedule
-
-expecting success of 7900.40 'start preserves existing schedule': 
-	echo "Important information!" >cron.txt &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
-	grep "Important information!" cron.txt
-
-Important information!
-ok 40 - start preserves existing schedule
-
-expecting success of 7900.41 'magic markers are correct': 
-	grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
-	cat >expect <<-\EOF &&
-	# BEGIN GIT MAINTENANCE SCHEDULE
-	# END GIT MAINTENANCE SCHEDULE
-	EOF
-	test_cmp actual expect
-
-ok 41 - magic markers are correct
-
-expecting success of 7900.42 'stop preserves surrounding schedule': 
-	echo "Crucial information!" >>cron.txt &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-	grep "Important information!" cron.txt &&
-	grep "Crucial information!" cron.txt
-
-Important information!
-Crucial information!
-ok 42 - stop preserves surrounding schedule
-
-expecting success of 7900.43 'start and stop macOS maintenance': 
-	# ensure $HOME can be compared against hook arguments on all platforms
-	pfx=$(cd "$HOME" && pwd) &&
-
-	write_script print-args <<-\EOF &&
-	echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	cat >expect <<-\EOF &&
-	org.git-scm.git.daily.plist
-	org.git-scm.git.hourly.plist
-	org.git-scm.git.weekly.plist
-	EOF
-	test_cmp expect actual &&
-
-	rm -f expect &&
-	for frequency in hourly daily weekly
-	do
-		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
-		test_xmllint "$PLIST" &&
-		grep schedule=$frequency "$PLIST" &&
-		echo "bootout gui/[UID] $PLIST" >>expect &&
-		echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
-	done &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >expect &&
-	test_cmp expect args &&
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	test_line_count = 0 actual
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-checking prerequisite: XMLLINT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
-	xmllint --version
-
-)
-xmllint: using libxml version 20914
-   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML Legacy C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma 
-prerequisite XMLLINT ok
-<string>--schedule=hourly</string>
-<string>--schedule=daily</string>
-<string>--schedule=weekly</string>
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-ok 43 - start and stop macOS maintenance
-
-expecting success of 7900.44 'use launchctl list to prevent extra work': 
-	# ensure we are registered
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	# do it again on a fresh args file
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	cat >expect <<-\EOF &&
-	list org.git-scm.git.hourly
-	list org.git-scm.git.daily
-	list org.git-scm.git.weekly
-	EOF
-	test_cmp expect args
-
-ok 44 - use launchctl list to prevent extra work
-
-expecting success of 7900.45 'start and stop Windows maintenance': 
-	write_script print-args <<-\EOF &&
-	echo $* >>args
-	while test $# -gt 0
-	do
-		case "$1" in
-		/xml) shift; xmlfile=$1; break ;;
-		*) shift ;;
-		esac
-	done
-	test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for frequency in hourly daily weekly
-	do
-		grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
-		file=$(ls .git/schedule_${frequency}*.xml) &&
-		test_xmllint "$file" || return 1
-	done &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	printf "/delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >expect &&
-	test_cmp expect args
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_hourly_attboy
-/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_daily_YZLwQj
-/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/.git/schedule_weekly_Gt9erd
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-ok 45 - start and stop Windows maintenance
-
-expecting success of 7900.46 'start and stop Linux/systemd maintenance': 
-	write_script print-args <<-\EOF &&
-	printf "%s\n" "$*" >>args
-	EOF
-
-	XDG_CONFIG_HOME="$PWD" &&
-	export XDG_CONFIG_HOME &&
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for schedule in hourly daily weekly
-	do
-		test_path_is_file "systemd/user/git-maintenance@$schedule.timer" || return 1
-	done &&
-	test_path_is_file "systemd/user/git-maintenance@.service" &&
-
-	test_systemd_analyze_verify "systemd/user/git-maintenance@hourly.service" &&
-	test_systemd_analyze_verify "systemd/user/git-maintenance@daily.service" &&
-	test_systemd_analyze_verify "systemd/user/git-maintenance@weekly.service" &&
-
-	grep "core.askPass=true" "systemd/user/git-maintenance@.service" &&
-	grep "credential.interactive=false" "systemd/user/git-maintenance@.service" &&
-
-	printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for schedule in hourly daily weekly
-	do
-		test_path_is_missing "systemd/user/git-maintenance@$schedule.timer" || return 1
-	done &&
-	test_path_is_missing "systemd/user/git-maintenance@.service" &&
-
-	printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	test_cmp expect args
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-checking prerequisite: SYSTEMD_ANALYZE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
-	systemd-analyze verify /lib/systemd/system/basic.target
-
-)
-t7900-maintenance.sh: 7: eval: systemd-analyze: not found
-prerequisite SYSTEMD_ANALYZE not satisfied
-ExecStart="/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
-ExecStart="/build/reproducible-path/git-2.49.0+next.20250314/git" --exec-path="/build/reproducible-path/git-2.49.0+next.20250314" -c credential.interactive=false -c core.askPass=true  for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%i
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance
-ok 46 - start and stop Linux/systemd maintenance
-
-expecting success of 7900.47 'start and stop when several schedulers are available': 
-	write_script print-args <<-\EOF &&
-	printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	for frequency in hourly daily weekly
-	do
-		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
-		echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
-		echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
-	done &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >>expect &&
-	printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
-		hourly daily weekly >>expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >>expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	test_cmp expect args
-
-ok 47 - start and stop when several schedulers are available
-
-expecting success of 7900.48 'register preserves existing strategy': 
-	git config maintenance.strategy none &&
-	git maintenance register &&
-	test_config maintenance.strategy none &&
-	git config --unset maintenance.strategy &&
-	git maintenance register &&
-	test_config maintenance.strategy incremental
-
-ok 48 - register preserves existing strategy
-
-expecting success of 7900.49 'fails when running outside of a repository': 
-	nongit test_must_fail git maintenance run &&
-	nongit test_must_fail git maintenance stop &&
-	nongit test_must_fail git maintenance start &&
-	nongit test_must_fail git maintenance register &&
-	nongit test_must_fail git maintenance unregister
-
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-ok 49 - fails when running outside of a repository
-
-expecting success of 7900.50 'register and unregister bare repo': 
-	test_when_finished "git config --global --unset-all maintenance.repo || :" &&
-	test_might_fail git config --global --unset-all maintenance.repo &&
-	git init --bare barerepo &&
-	(
-		cd barerepo &&
-		git maintenance register &&
-		git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-		git maintenance unregister &&
-		test_must_fail git config --global --get-all maintenance.repo
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/barerepo/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/barerepo
-ok 50 - register and unregister bare repo
-
-expecting success of 7900.51 'failed schedule prevents config change': 
-	git init --bare failcase &&
-
-	for scheduler in crontab launchctl schtasks systemctl
-	do
-		GIT_TEST_MAINT_SCHEDULER="$scheduler:false" &&
-		export GIT_TEST_MAINT_SCHEDULER &&
-		test_must_fail \
-			git -C failcase maintenance start &&
-		test_must_fail git -C failcase config maintenance.auto || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/failcase/
-error: 'crontab' died
-fatal: failed to set up maintenance schedule
-fatal: neither systemd timers nor crontab are available
-fatal: neither systemd timers nor crontab are available
-error: failed to run systemctl
-fatal: failed to set up maintenance schedule
-ok 51 - failed schedule prevents config change
-
-expecting success of 7900.52 '--no-detach causes maintenance to not run in background': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		# Prepare the repository such that git-maintenance(1) ends up
-		# outputting something.
-		test_commit something &&
-		git config set maintenance.gc.enabled false &&
-		git config set maintenance.loose-objects.enabled true &&
-		git config set maintenance.loose-objects.auto 1 &&
-		git config set maintenance.incremental-repack.enabled true &&
-
-		GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
-			git maintenance run --no-detach >out 2>&1 &&
-		! test_region maintenance detach trace.txt
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
-[master (root-commit) 59647d1] something
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something.t
-ok 52 - --no-detach causes maintenance to not run in background
-
-expecting success of 7900.53 '--detach causes maintenance to run in background': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit something &&
-		git config set maintenance.gc.enabled false &&
-		git config set maintenance.loose-objects.enabled true &&
-		git config set maintenance.loose-objects.auto 1 &&
-		git config set maintenance.incremental-repack.enabled true &&
-
-		# The extra file descriptor gets inherited to the child
-		# process, and by reading stdout we thus essentially wait for
-		# that descriptor to get closed, which indicates that the child
-		# is done, too.
-		does_not_matter=$(GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
-			git maintenance run --detach 9>&1) &&
-		test_region maintenance detach trace.txt
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
-[master (root-commit) 59647d1] something
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something.t
-{"event":"region_enter","sid":"20260419T192457.956500Z-H8d819085-P00223be3","thread":"main","time":"2026-04-19T19:24:57.957070Z","file":"builtin/gc.c","line":1468,"repo":1,"nesting":1,"category":"maintenance","label":"detach"}
-{"event":"region_leave","sid":"20260419T192457.956500Z-H8d819085-P00223be3","thread":"main","time":"2026-04-19T19:24:57.970704Z","file":"builtin/gc.c","line":1470,"repo":1,"t_rel":0.013598,"nesting":1,"category":"maintenance","label":"detach"}
-ok 53 - --detach causes maintenance to run in background
-
-expecting success of 7900.54 'repacking loose objects is quiet': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
-
-		test_commit something &&
-		git config set maintenance.gc.enabled false &&
-		git config set maintenance.loose-objects.enabled true &&
-		git config set maintenance.loose-objects.auto 1 &&
-
-		git maintenance run --quiet >out 2>&1 &&
-		test_must_be_empty out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
-[master (root-commit) 59647d1] something
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something.t
-ok 54 - repacking loose objects is quiet
-
-expecting success of 7900.55 'maintenance aborts with existing lock file': 
-	test_when_finished "rm -rf repo script" &&
-	mkdir script &&
-	write_script script/systemctl <<-\EOF &&
-	true
-	EOF
-
-	git init repo &&
-	: >repo/.git/objects/schedule.lock &&
-	test_must_fail env PATH="$PWD/script:$PATH" git -C repo maintenance start --scheduler=systemd 2>err &&
-	test_grep "Another scheduled git-maintenance(1) process seems to be running" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7900-maintenance/repo/.git/
-Another scheduled git-maintenance(1) process seems to be running in this
-ok 55 - maintenance aborts with existing lock file
-
-# passed all 55 test(s)
-1..55
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t8013-blame-ignore-revs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
-expecting success of 8013.1 'setup': 
-	test_commit A file line1 &&
-
-	echo line2 >>file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-	git tag B &&
-
-	test_write_lines line-one line-two >file &&
-	git add file &&
-	test_tick &&
-	git commit -m X &&
-	git tag X &&
-	git tag -a -m "X (annotated)" XT &&
-
-	git blame --line-porcelain file >blame_raw &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	git rev-parse X >expect &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-	git rev-parse X >expect &&
-	test_cmp expect actual
-
-[master (root-commit) 6d1c9f2] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 5552443] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master abb9c4e] X
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
-
-expecting success of 8013.2 'validate --ignore-rev': 
-	test_must_fail git blame --ignore-rev X^{tree} file
-
-fatal: cannot find revision X^{tree} to ignore
-ok 2 - validate --ignore-rev
-
-expecting success of 8013.3 'validate --ignore-revs-file': 
-	git rev-parse X^{tree} >ignore_x &&
-	git blame --ignore-revs-file ignore_x file
-
-abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 1) line-one
-abb9c4e3 (A U Thor 2005-04-07 15:15:13 -0700 2) line-two
-ok 3 - validate --ignore-revs-file
-
-expecting success of 8013.4 'ignore_rev_changing_lines (X)': 
-		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
-
-		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-		git rev-parse A >expect &&
-		test_cmp expect actual &&
-
-		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-		git rev-parse B >expect &&
-		test_cmp expect actual
-	
-ok 4 - ignore_rev_changing_lines (X)
-
-expecting success of 8013.5 'ignore_rev_changing_lines (XT)': 
-		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
-
-		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-		git rev-parse A >expect &&
-		test_cmp expect actual &&
-
-		sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-		git rev-parse B >expect &&
-		test_cmp expect actual
-	
-ok 5 - ignore_rev_changing_lines (XT)
-
-expecting success of 8013.6 'ignore_rev_adding_unblamable_lines': 
-	test_write_lines line-one-change line-two-changed y3 y4 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m Y &&
-	git tag Y &&
-
-	git rev-parse Y >expect &&
-	git blame --line-porcelain file --ignore-rev Y >blame_raw &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 3/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 4/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual
-
-[master e0d35d6] Y
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 2 deletions(-)
-ok 6 - ignore_rev_adding_unblamable_lines
-
-expecting success of 8013.7 'ignore_revs_from_files': 
-	git rev-parse X >ignore_x &&
-	git rev-parse Y >ignore_y &&
-	git blame --line-porcelain file --ignore-revs-file ignore_x --ignore-revs-file ignore_y >blame_raw &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	git rev-parse A >expect &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-	git rev-parse B >expect &&
-	test_cmp expect actual
-
-ok 7 - ignore_revs_from_files
-
-expecting success of 8013.8 'ignore_revs_from_configs_and_files': 
-	git config --add blame.ignoreRevsFile ignore_x &&
-	git blame --line-porcelain file --ignore-revs-file ignore_y >blame_raw &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	git rev-parse A >expect &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-	git rev-parse B >expect &&
-	test_cmp expect actual
-
-ok 8 - ignore_revs_from_configs_and_files
-
-expecting success of 8013.9 'override_ignore_revs_file': 
-	git blame --line-porcelain file --ignore-revs-file "" --ignore-revs-file ignore_y >blame_raw &&
-	git rev-parse X >expect &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 2/s/ .*//p" blame_raw >actual &&
-	test_cmp expect actual
-	
-ok 9 - override_ignore_revs_file
-
-expecting success of 8013.10 'bad_files_and_revs': 
-	test_must_fail git blame file --ignore-rev NOREV 2>err &&
-	test_grep "cannot find revision NOREV to ignore" err &&
-
-	test_must_fail git blame file --ignore-revs-file NOFILE 2>err &&
-	test_grep "could not open.*: NOFILE" err &&
-
-	echo NOREV >ignore_norev &&
-	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
-	test_grep "invalid object name: NOREV" err
-
-fatal: cannot find revision NOREV to ignore
-fatal: could not open object name list: NOFILE
-fatal: invalid object name: NOREV
-ok 10 - bad_files_and_revs
-
-expecting success of 8013.11 'mark_unblamable_lines': 
-	git config --add blame.markUnblamableLines true &&
-
-	git blame --ignore-rev Y file >blame_raw &&
-	echo "*" >expect &&
-
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
-
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual
-
-ok 11 - mark_unblamable_lines
-
-expecting success of 8013.12 'mark_ignored_lines': 
-	git config --add blame.markIgnoredLines true &&
-
-	test_write_lines line-one-Z line-two-Z y3 y4 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m Z &&
-	git tag Z &&
-
-	git blame --ignore-rev Z file >blame_raw &&
-	echo "?" >expect &&
-
-	sed -n "1p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
-
-	sed -n "2p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
-
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual &&
-
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	! test_cmp expect actual
-
-[master d1e4550] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- expect	2026-04-19 19:24:58.175659440 +0000
-+++ actual	2026-04-19 19:24:58.271659440 +0000
-@@ -1 +1 @@
--?
-+e
---- expect	2026-04-19 19:24:58.175659440 +0000
-+++ actual	2026-04-19 19:24:58.303659440 +0000
-@@ -1 +1 @@
--?
-+e
-ok 12 - mark_ignored_lines
-
-expecting success of 8013.13 'mark_unblamable_lines_intermediate': 
-	git config --add blame.markUnblamableLines true &&
-
-	git blame --ignore-rev Y file >blame_raw 2>stderr &&
-	echo "*" >expect &&
-
-	sed -n "3p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual &&
-
-	sed -n "4p" blame_raw | cut -c1 >actual &&
-	test_cmp expect actual
-
-ok 13 - mark_unblamable_lines_intermediate
-
-expecting success of 8013.14 'ignored_chunk_negative_parent_size': 
-	rm -rf .git/ &&
-	git init &&
-
-	test_write_lines L1 L2 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m A &&
-	git tag A &&
-
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-	git tag B &&
-
-	test_write_lines L1 L2 L3 L4 xxx L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m C &&
-	git tag C &&
-
-	git blame file --ignore-rev B >blame_raw
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
-[master (root-commit) 0157998] A
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 file
-[master a8e635b] B
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
-[master 3b3594b] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - ignored_chunk_negative_parent_size
-
-expecting success of 8013.15 'ignore_merge': 
-	rm -rf .git/ &&
-	git init &&
-
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m A &&
-	git tag A &&
-
-	test_write_lines BB L2 L3 L4 L5 L6 L7 L8 L9 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m B &&
-	git tag B &&
-
-	git reset --hard A &&
-	test_write_lines L1 L2 L3 L4 L5 L6 L7 L8 CC >file &&
-	git add file &&
-	test_tick &&
-	git commit -m C &&
-	git tag C &&
-
-	test_merge M B &&
-	git blame --line-porcelain file --ignore-rev M >blame_raw &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 1/s/ .*//p" blame_raw >actual &&
-	git rev-parse B >expect &&
-	test_cmp expect actual &&
-
-	sed -ne "/^[0-9a-f][0-9a-f]* [0-9][0-9]* 9/s/ .*//p" blame_raw >actual &&
-	git rev-parse C >expect &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8013-blame-ignore-revs/.git/
-[master (root-commit) aebca2b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-[master 38a4cbf] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at aebca2b A
-[master 1f9babe] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - ignore_merge
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t8014-blame-ignore-fuzzy.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t8014-blame-ignore-fuzzy/.git/
 expecting success of 8014.1 'setup': 
@@ -517605,7 +517542,7 @@
 	
 	A	deeply/nested/directory/number/1/file
 	A	deeply/nested/directory/number/2/another
-r1 = 2a8486342994e85e1d8e38ccde651a77152cb00e (refs/remotes/git-svn)
+r1 = ed7963f182d03de0c6fdb3365b060bda780c3ae8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
 Switched to a new branch 'test-rmdir'
@@ -517618,7 +517555,7 @@
 	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
 	
 rm 'deeply/nested/directory/number/2/another'
-[test-rmdir cbe6867] remove another
+[test-rmdir 1702dca] remove another
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 deeply/nested/directory/number/2/another
@@ -517627,7 +517564,7 @@
 	D	deeply/nested/directory/number/2/another
 	D	deeply/nested/directory/number/2/
 W: -empty_dir: deeply/nested/directory/number/2
-r2 = 95f4ef2d4b131ff493802ab14eb8a2156b62f811 (refs/remotes/git-svn)
+r2 = d8bf7b3f384552cb580c63057d852983fe13949d (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 deeply/nested/directory/number/1/
 deeply/nested/directory/number/1/file
@@ -517689,7 +517626,7 @@
 Committed revision 3.
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
 	A	readme
-r3 = 162f41234da5df6c7ba1d61f44b044cdd83a05c6 (refs/remotes/git-svn)
+r3 = 72b53f7bf51a76b92e6d95a8b5248de17df45f89 (refs/remotes/git-svn)
 	M	readme
 Committed r4
 ok 3 - commit-diff to a sub-directory (with git svn config)
@@ -517734,10 +517671,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
 	A	README
-r1 = f45d4b6bb1df1225e5e51612eda1cfaac9fa7a0c (refs/remotes/origin/trunk)
+r1 = fd1c6127d32f36a47356bdd8e82db55ef62e0f51 (refs/remotes/origin/trunk)
 	D	README
 	A	FOLLOWME
-r3 = ab962aaf97fee95f429dd404d4fcec1429d6f367 (refs/remotes/origin/trunk)
+r3 = 324b318369bf507920c62fc26c386841f128bca2 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
 ok 2 - clone repo with git
@@ -517752,7 +517689,7 @@
 		test -z "$(git svn find-rev r2)"
 	)
 
-HEAD is now at f45d4b6 initial
+HEAD is now at fd1c612 initial
 ok 3 - make sure r2 still has old file
 
 # passed all 3 test(s)
@@ -517938,19 +517875,19 @@
 
 git blame -c  file 
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author B1 (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
 expecting success of 8012.18 'blame --first-parent blames merge for branch1': 
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git blame -c  --first-parent file 
-Author B2 (expected 1, attributed 1) good
-Author A (expected 2, attributed 2) good
 Author A U Thor (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8012.19 'blame ancestor': 
@@ -517981,11 +517918,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
-Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8012.23 'blame huge graft': 
@@ -518168,8 +518105,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config set advice.graftFileDeprecated false"
-Author 10 (expected 1, attributed 1) good
 Author 01 (expected 1, attributed 1) good
+Author 10 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -518187,12 +518124,12 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
 git blame -c  file 
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 Author C (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
 expecting success of 8012.26 'setup edits': 
@@ -518214,13 +518151,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1
 
 git blame -c  file 
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8012.28 'setup obfuscated email': 
@@ -518239,52 +518176,52 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  file 
-Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
 expecting success of 8012.30 'blame -L 1 (all)': 
 	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L1 file 
-Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 ok 30 - blame -L 1 (all)
 
 expecting success of 8012.31 'blame -L , (all)': 
 	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L, file 
-Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8012.32 'blame -L X (X to end)': 
 	check_count -L5 B1 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L5 file 
-Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
 
 expecting success of 8012.33 'blame -L X, (X to end)': 
@@ -518293,17 +518230,17 @@
 git blame -c  -L5, file 
 Author C (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
 expecting success of 8012.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git blame -c  -L,3 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8012.35 'blame -L X,X': 
@@ -518317,10 +518254,10 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
 expecting success of 8012.37 'blame -L Y,X (undocumented)': 
@@ -518374,10 +518311,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8012.45 'blame -L ,-0': 
@@ -518403,28 +518340,28 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
+Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 8012.49 'blame -L /RE/ (RE to end)': 
 	check_count -L/evil/ C 1 "A U Thor" 1
 
 git blame -c  -L/evil/ file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 49 - blame -L /RE/ (RE to end)
 
 expecting success of 8012.50 'blame -L /RE/,/RE2/': 
 	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
 
 git blame -c  -L/robot/,/green/ file 
+Author D (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 50 - blame -L /RE/,/RE2/
 
@@ -518433,26 +518370,26 @@
 
 git blame -c  -L5,/evil/ file 
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 51 - blame -L X,/RE/
 
 expecting success of 8012.52 'blame -L /RE/,Y': 
 	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,7 file 
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 52 - blame -L /RE/,Y
 
 expecting success of 8012.53 'blame -L /RE/,+N': 
 	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,+3 file 
+Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 53 - blame -L /RE/,+N
 
 expecting success of 8012.54 'blame -L /RE/,-N': 
@@ -518490,14 +518427,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,8 file 
-Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8012.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -518505,37 +518442,37 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,9 file 
-Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 59 - blame -L ,Y (Y == nlines + 1)
 
 expecting success of 8012.60 'blame -L ,Y (Y > nlines)': 
 	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,12345 file 
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8012.61 'blame -L multiple (disjoint)': 
 	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
@@ -518543,48 +518480,48 @@
 	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L6,7 -L2,3 file 
-Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (disjoint: unordered)
 
 expecting success of 8012.63 'blame -L multiple (adjacent)': 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,3 -L4,5 file 
-Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8012.64 'blame -L multiple (adjacent: unordered)': 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 file 
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
 expecting success of 8012.65 'blame -L multiple (overlapping)': 
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,4 -L3,5 file 
+Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8012.66 'blame -L multiple (overlapping: unordered)': 
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git blame -c  -L3,5 -L2,4 file 
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
@@ -518593,58 +518530,58 @@
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
-Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 67 - blame -L multiple (superset/subset)
 
 expecting success of 8012.68 'blame -L multiple (superset/subset: unordered)': 
 	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L3,5 -L2,8 file 
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 68 - blame -L multiple (superset/subset: unordered)
 
 expecting success of 8012.69 'blame -L /RE/ (relative)': 
 	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L3,3 -L/fox/ file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 expecting success of 8012.70 'blame -L /RE/ (relative: no preceding range)': 
 	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L/dog/ file 
-Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8012.71 'blame -L /RE/ (relative: adjacent)': 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git blame -c  -L1,1 -L/dog/,+1 file 
-Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 71 - blame -L /RE/ (relative: adjacent)
 
 expecting success of 8012.72 'blame -L /RE/ (relative: not found)': 
@@ -518671,8 +518608,8 @@
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success of 8012.76 'blame -L ^/RE/ (absolute: not found)': 
@@ -518686,9 +518623,9 @@
 	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
 git blame -c  -L8 -L^/$/,+2 file 
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 77 - blame -L ^/RE/ (absolute: end-of-file)
 
 expecting success of 8012.78 'setup -L :regex': 
@@ -518736,8 +518673,8 @@
 	check_count -f hello.c -L:main F 4 G 1
 
 git blame -c  -L:main hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 79 - blame -L :literal
 
 expecting success of 8012.80 'blame -L :regex': 
@@ -519144,347 +519081,16 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 18a92e3] new commit
+[branch2 363ab5d] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>18a92e35 (A U Thor 2026-04-19 19:25:06 +0000 11) <RESET>void qfunc();
+<CYAN>363ab5d5 (A U Thor 2025-03-17 13:29:33 +0000 11) <RESET>void qfunc();
 ok 119 - blame color by age: new code is different
 
 # passed all 119 test(s)
 1..119
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9111-git-svn-use-svnsync-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
-expecting success of 9111.1 'load svnsync repo': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
-	git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
-	git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
-	git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
-	git config svn.useSvnsyncProps true &&
-	git svn fetch --all
-	
-Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-	A	file
-r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
-	A	a/b/c/d/e/file
-r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: dir/a
-r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
-ok 1 - load svnsync repo
-
-expecting success of 9111.2 'verify metadata for /bar': 
-	git cat-file commit refs/remotes/bar >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~2 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~3 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~4 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~5 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 2 - verify metadata for /bar
-
-expecting success of 9111.3 'verify metadata for /dir/a/b/c/d/e': 
-	git cat-file commit refs/remotes/e >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 3 - verify metadata for /dir/a/b/c/d/e
-
-expecting success of 9111.4 'verify metadata for /dir': 
-	git cat-file commit refs/remotes/dir >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/dir~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 4 - verify metadata for /dir
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9106-git-svn-commit-diff-clobber.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
-expecting success of 9106.1 'initialize repo': 
-	mkdir import &&
-	(
-		cd import &&
-		echo initial >file &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	echo initial > file &&
-	git update-index --add file &&
-	git commit -a -m "initial"
-	
-Adding         file
-Committing transaction...
-Committed revision 1.
-[master (root-commit) 8d59b1f] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - initialize repo
-
-expecting success of 9106.2 'commit change from svn side': 
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo second line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "second line from svn"
-	) &&
-	rm -rf t.svn
-	
-A    t.svn/file
-Checked out revision 1.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-ok 2 - commit change from svn side
-
-expecting success of 9106.3 'commit conflicting change from git': 
-	echo second line from git >> file &&
-	git commit -a -m "second line from git" &&
-	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
-
-[master 62e39e5] second line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Transaction is out of date: File '/file' is out of date at /build/reproducible-path/git-2.49.0+next.20250314/git-svn line 1546.
-
-ok 3 - commit conflicting change from git
-
-expecting success of 9106.4 'commit complementing change from git': 
-	git reset --hard HEAD~1 &&
-	echo second line from svn >> file &&
-	git commit -a -m "second line from svn" &&
-	echo third line from git >> file &&
-	git commit -a -m "third line from git" &&
-	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
-	
-HEAD is now at 8d59b1f initial
-[master 3494a8f] second line from svn
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 57507a0] third line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-	M	file
-Committed r3
-ok 4 - commit complementing change from git
-
-expecting success of 9106.5 'dcommit fails to commit because of conflict': 
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	git reset --hard refs/remotes/git-svn &&
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo fourth line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "fourth line from svn"
-	) &&
-	rm -rf t.svn &&
-	echo "fourth line from git" >> file &&
-	git commit -a -m "fourth line from git" &&
-	test_must_fail git svn dcommit
-	
-	A	file
-r1 = 0bea4a1499f52482e03f28f366601e4038a33c19 (refs/remotes/git-svn)
-	M	file
-r2 = e0cfe9184477dfdb8edbd16177a51803c90396f3 (refs/remotes/git-svn)
-	M	file
-r3 = 8033974be939c6e02e6436c79b2479ec3e3899aa (refs/remotes/git-svn)
-HEAD is now at 8033974 third line from git
-A    t.svn/file
-Checked out revision 3.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-[master e4bf38d] fourth line from git
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-
-ERROR from SVN:
-Transaction is out of date: File '/file' is out of date
-W: e4bf38d3a288a72704d285cdae8aa997ac667289 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 faa34c792e6a485955b65cc9f20e8ab0dd63e45c d270188940c824ce4f1e8aa864ca5d2f8c75f939 M	file
-Current branch master is up to date.
-ERROR: Not all changes have been committed into SVN, however the committed
-ones (if any) seem to be successfully integrated into the working tree.
-Please see the above messages for details.
-
-ok 5 - dcommit fails to commit because of conflict
-
-expecting success of 9106.6 'dcommit does the svn equivalent of an index merge': 
-	git reset --hard refs/remotes/git-svn &&
-	echo 'index merge' > file2 &&
-	git update-index --add file2 &&
-	git commit -a -m 'index merge' &&
-	echo 'more changes' >> file2 &&
-	git update-index file2 &&
-	git commit -a -m 'more changes' &&
-	git svn dcommit
-	
-HEAD is now at 8033974 third line from git
-[master ece7530] index merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 9dd5b30] more changes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	file2
-Committed r5
-	M	file
-r4 = 86183be93c59b7f990da3ba7d3aaeb413ac45e17 (refs/remotes/git-svn)
-	A	file2
-r5 = 69c85b747a57c02eaa140e763f93a27a6ccad394 (refs/remotes/git-svn)
-W: ece7530bc3d80ee051d7a50d0698494eabe64abb and refs/remotes/git-svn differ, using rebase:
-:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
-warning: skipped previously applied commit ece7530
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
-	M	file2
-Committed r6
-	M	file2
-r6 = 77aa70c2282623c52f3ea1007942d2dbbc3d369d (refs/remotes/git-svn)
-No changes between aa96b702d90c25a66a7c78df8875e47eaceef661 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 6 - dcommit does the svn equivalent of an index merge
-
-expecting success of 9106.7 'commit another change from svn side': 
-	svn_cmd co "$svnrepo" t.svn &&
-	(
-		cd t.svn &&
-		echo third line from svn >>file &&
-		poke file &&
-		svn_cmd commit -m "third line from svn"
-	) &&
-	rm -rf t.svn
-	
-A    t.svn/file
-A    t.svn/file2
-Checked out revision 6.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-ok 7 - commit another change from svn side
-
-expecting success of 9106.8 'multiple dcommit from git svn will not clobber svn': 
-	git reset --hard refs/remotes/git-svn &&
-	echo new file >> new-file &&
-	git update-index --add new-file &&
-	git commit -a -m 'new file' &&
-	echo clobber > file &&
-	git commit -a -m 'clobber' &&
-	test_must_fail git svn dcommit
-	
-HEAD is now at 77aa70c more changes
-[master 8d5efb8] new file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-file
-[master df55756] clobber
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	A	new-file
-Committed r8
-	M	file
-r7 = abca73a7e5fb09a4bab66685ddc3b580a758578e (refs/remotes/git-svn)
-	A	new-file
-r8 = 1729ba0b88271957910ed58449739dcc62f386b4 (refs/remotes/git-svn)
-W: 8d5efb8aafae1681432f4f33cb21f0c230742d55 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
-warning: skipped previously applied commit 8d5efb8
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config set advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply df55756... clobber
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply df55756... clobber
-rebase refs/remotes/git-svn: command returned error: 1
-
-ok 8 - multiple dcommit from git svn will not clobber svn
-
-expecting success of 9106.9 'check that rebase really failed': 
-	git status >output &&
-	grep currently.rebasing output
-
-You are currently rebasing branch 'master' on '1729ba0'.
-ok 9 - check that rebase really failed
-
-expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
-	echo clobber and I really mean it > file &&
-	git update-index file &&
-	git rebase --continue &&
-	git svn dcommit
-	
-[detached HEAD 443d529] clobber
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 5 deletions(-)
-Successfully rebased and updated refs/heads/master.
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
-	M	file
-Committed r9
-	M	file
-r9 = 3f83b2c8e510953d1ca2652ff2c0855dc55d8273 (refs/remotes/git-svn)
-No changes between 443d5298ab4bea05f6c1e61e2d7f0f1fe0a54b38 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 10 - resolve, continue the rebase and dcommit
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7800-difftool.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/.git/
 expecting success of 7800.1 'basic usage requires no repo': 
@@ -519638,7 +519244,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.49.0+next.20250314/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.49.0+next.20250314/git-mergetool--lib: line 172: i-dont-exist: command not found
 fatal: external diff died, stopping at file
 ok 14 - difftool without options honors exit status if command not found
 
@@ -519711,7 +519317,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.49.0+next.20250314/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.49.0+next.20250314/git-mergetool--lib: line 172: i-dont-exist: command not found
 warning: failed: 127
 ok 22 - difftool --dir-diff honors exit status if command not found
 
@@ -520603,10 +520209,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/git-difftool.pbxSMv/right/file'.
+warning: both files modified: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/git-difftool.mpm3LS/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/git-difftool.pbxSMv'.
+warning: temporary files exist in '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t7800-difftool/git-difftool.mpm3LS'.
 warning: you may want to cleanup or recover these.
 ok 84 - difftool --no-symlinks detects conflict 
 
@@ -520818,9 +520424,9 @@
 	git add -N intent-to-add &&
 	git difftool --dir-diff --extcmd ls
 
-/tmp/git-difftool.p7Rdsq/left/:
+/tmp/git-difftool.xBo46U/left/:
 
-/tmp/git-difftool.p7Rdsq/right/:
+/tmp/git-difftool.xBo46U/right/:
 intent-to-add
 HEAD is now at 8845cd2 initial
 ok 89 - add -N and difftool -d
@@ -520938,6 +520544,92 @@
 1..95
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9111-git-svn-use-svnsync-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9111-git-svn-use-svnsync-props/.git/
+expecting success of 9111.1 'load svnsync repo': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
+	git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
+	git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
+	git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
+	git config svn.useSvnsyncProps true &&
+	git svn fetch --all
+	
+Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+	A	file
+r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
+	D	a/b/c/d/e/file
+	D	a/
+	A	file
+W: -empty_dir: dir/a
+r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
+	A	zzz
+r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
+	M	zzz
+r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
+	A	d
+r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
+	A	newdir/dir
+r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
+	M	newdir/dir
+r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
+	M	d
+r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
+ok 1 - load svnsync repo
+
+expecting success of 9111.2 'verify metadata for /bar': 
+	git cat-file commit refs/remotes/bar >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~2 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~3 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~4 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~5 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 2 - verify metadata for /bar
+
+expecting success of 9111.3 'verify metadata for /dir/a/b/c/d/e': 
+	git cat-file commit refs/remotes/e >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 3 - verify metadata for /dir/a/b/c/d/e
+
+expecting success of 9111.4 'verify metadata for /dir': 
+	git cat-file commit refs/remotes/dir >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/dir~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
+	
+git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
+git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 4 - verify metadata for /dir
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9113-git-svn-dcommit-new-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9108-git-svn-glob.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9108-git-svn-glob/.git/
 expecting success of 9108.1 'test refspec globbing': 
@@ -521036,22 +520728,22 @@
 	(required for this version (2.49.0.395.g12beb8f557c) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = 4b57413675d0a1f1a563c4d901bc0716fa3bc610 (refs/remotes/trunk)
+r1 = bd82a25eec24ce0198ff181d345e4e0a4e3526ea (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) 4b57413675d0a1f1a563c4d901bc0716fa3bc610
+Found branch parent: (refs/remotes/branches/start) bd82a25eec24ce0198ff181d345e4e0a4e3526ea
 Following parent with do_switch
 Successfully followed parent
-r2 = c9de60efd5d70b0dd5e3c05f1cf090e1e7d81806 (refs/remotes/branches/start)
+r2 = 29542c9cef187cebb341d78612002d343ada7cec (refs/remotes/branches/start)
 	M	readme
-r3 = b94e2c5ab17013af137f30fbe59282e0aa725e83 (refs/remotes/branches/start)
+r3 = faf45c69681bea4190a9ace72706dd63cdc6d6c9 (refs/remotes/branches/start)
 branch_from: /branches/start => /branches/start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) b94e2c5ab17013af137f30fbe59282e0aa725e83
+Found branch parent: (refs/remotes/tags/end) faf45c69681bea4190a9ace72706dd63cdc6d6c9
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 4fdfb6d1e828c2c722a9fd58fc2bc4c86b9d2181 (refs/remotes/tags/end)
+r4 = 270412e1637e8fe8a08e5cc3c40947ad2707f9a6 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a r1
 fatal: ambiguous argument 'refs/remotes/tags/end@3': unknown revision or path not in the working tree.
@@ -521093,26 +520785,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 94c88a3961bd869456eeb566384f853d78706cb5 (refs/remotes/two/trunk)
+r1 = 5d97b1e72107ee15e49f9ed89f268bcc47a787b3 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) 94c88a3961bd869456eeb566384f853d78706cb5
+Found branch parent: (refs/remotes/two/branches/start) 5d97b1e72107ee15e49f9ed89f268bcc47a787b3
 Following parent with do_switch
 Successfully followed parent
-r2 = 2c85b5a42844163d70156e1976195de090bbd2dd (refs/remotes/two/branches/start)
+r2 = 898a8b7e047fc5374643a90942274a40de3a24bb (refs/remotes/two/branches/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 9c18a0b612a06e7fc11d4fe834478ad2d091463f (refs/remotes/two/branches/start)
+r3 = 1d95a07f87016f64df813f0360471166a8c304ae (refs/remotes/two/branches/start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 9c18a0b612a06e7fc11d4fe834478ad2d091463f
+Found branch parent: (refs/remotes/two/tags/end) 1d95a07f87016f64df813f0360471166a8c304ae
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 2ccd2e8e0512b1832ef76ef80a98257cdf023b68 (refs/remotes/two/tags/end)
+r4 = 6f1d6e4f78202c5c0235c0eb95ee93932eee99f2 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = 7c9fd03191e9f9e1d39f3544660da9a87bdea36d (refs/remotes/two/tags/end)
+r5 = 486b0511d9be9659974d246a05bcf1ae9f58c9e0 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 9149655e23786397f2cda96523411d83f049f318 (refs/remotes/two/tags/end)
+r6 = bb790062609dc15502c165d27cee0a5a65c729a5 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9108.3 'prepare test disallow multi-globs': 
@@ -521150,9 +520842,28 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9113-git-svn-dcommit-new-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+*** t9112-git-svn-md5less-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9112-git-svn-md5less-file/.git/
+expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
+<<< Started new transaction, based on original revision 1
+     * editing path : md5less-file ... done.
+
+------- Committed revision 1 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
+ok 2 - initialize git svn
+
+expecting success of 9112.3 'fetch revisions from svn': git svn fetch
+	A	md5less-file
+r1 = 4fa6fcc143f4da72e150a1fb194ce190c1386463 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
+ok 3 - fetch revisions from svn
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9110-git-svn-use-svm-props.sh ***
@@ -521250,28 +520961,254 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9112-git-svn-md5less-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9112-git-svn-md5less-file/.git/
-expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
-<<< Started new transaction, based on original revision 1
-     * editing path : md5less-file ... done.
+*** t9106-git-svn-commit-diff-clobber.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
+expecting success of 9106.1 'initialize repo': 
+	mkdir import &&
+	(
+		cd import &&
+		echo initial >file &&
+		svn_cmd import -m "initial" . "$svnrepo"
+	) &&
+	echo initial > file &&
+	git update-index --add file &&
+	git commit -a -m "initial"
+	
+Adding         file
+Committing transaction...
+Committed revision 1.
+[master (root-commit) 8d59b1f] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - initialize repo
 
-------- Committed revision 1 >>>
+expecting success of 9106.2 'commit change from svn side': 
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo second line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "second line from svn"
+	) &&
+	rm -rf t.svn
+	
+A    t.svn/file
+Checked out revision 1.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+ok 2 - commit change from svn side
 
-ok 1 - load svn dumpfile
+expecting success of 9106.3 'commit conflicting change from git': 
+	echo second line from git >> file &&
+	git commit -a -m "second line from git" &&
+	test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
 
-expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
-ok 2 - initialize git svn
+[master 62e39e5] second line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Transaction is out of date: File '/file' is out of date at /build/reproducible-path/git-2.49.0+next.20250314/git-svn line 1546.
 
-expecting success of 9112.3 'fetch revisions from svn': git svn fetch
-	A	md5less-file
-r1 = 1859b69c3c4a3c4a23273bdb8271bfe82a81aa2d (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
-ok 3 - fetch revisions from svn
+ok 3 - commit conflicting change from git
 
-# passed all 3 test(s)
-1..3
+expecting success of 9106.4 'commit complementing change from git': 
+	git reset --hard HEAD~1 &&
+	echo second line from svn >> file &&
+	git commit -a -m "second line from svn" &&
+	echo third line from git >> file &&
+	git commit -a -m "third line from git" &&
+	git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
+	
+HEAD is now at 8d59b1f initial
+[master 3494a8f] second line from svn
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 57507a0] third line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+	M	file
+Committed r3
+ok 4 - commit complementing change from git
+
+expecting success of 9106.5 'dcommit fails to commit because of conflict': 
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git reset --hard refs/remotes/git-svn &&
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo fourth line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "fourth line from svn"
+	) &&
+	rm -rf t.svn &&
+	echo "fourth line from git" >> file &&
+	git commit -a -m "fourth line from git" &&
+	test_must_fail git svn dcommit
+	
+	A	file
+r1 = 93addf26e232885157ac904a150016af7b0e957f (refs/remotes/git-svn)
+	M	file
+r2 = 7a3db02e2602322f38d84dacb6fc2fc5bed81c11 (refs/remotes/git-svn)
+	M	file
+r3 = 2edd6c1b253b1201d6c0360da1daac8accd71932 (refs/remotes/git-svn)
+HEAD is now at 2edd6c1 third line from git
+A    t.svn/file
+Checked out revision 3.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+[master 9fc4beb] fourth line from git
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+
+ERROR from SVN:
+Transaction is out of date: File '/file' is out of date
+W: 9fc4beb75e59f284444f27d5d6ba82295a1c4e4a and refs/remotes/git-svn differ, using rebase:
+:100644 100644 faa34c792e6a485955b65cc9f20e8ab0dd63e45c d270188940c824ce4f1e8aa864ca5d2f8c75f939 M	file
+Current branch master is up to date.
+ERROR: Not all changes have been committed into SVN, however the committed
+ones (if any) seem to be successfully integrated into the working tree.
+Please see the above messages for details.
+
+ok 5 - dcommit fails to commit because of conflict
+
+expecting success of 9106.6 'dcommit does the svn equivalent of an index merge': 
+	git reset --hard refs/remotes/git-svn &&
+	echo 'index merge' > file2 &&
+	git update-index --add file2 &&
+	git commit -a -m 'index merge' &&
+	echo 'more changes' >> file2 &&
+	git update-index file2 &&
+	git commit -a -m 'more changes' &&
+	git svn dcommit
+	
+HEAD is now at 2edd6c1 third line from git
+[master 52dbf6c] index merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master 4370de3] more changes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	file2
+Committed r5
+	M	file
+r4 = d8c0e5c39a800f4851554b05a054ffb8b787fd6c (refs/remotes/git-svn)
+	A	file2
+r5 = faca71a0bf29d96b1ca508d049fcb7e87800b17e (refs/remotes/git-svn)
+W: 52dbf6ce50e42fb8d2617c68864d40306fc3fe2e and refs/remotes/git-svn differ, using rebase:
+:100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
+warning: skipped previously applied commit 52dbf6c
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
+	M	file2
+Committed r6
+	M	file2
+r6 = ac547da566ed43a4062d31132cea53925821c342 (refs/remotes/git-svn)
+No changes between a844dbe9e320350faf5795cdd75dcbc5a2001719 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 6 - dcommit does the svn equivalent of an index merge
+
+expecting success of 9106.7 'commit another change from svn side': 
+	svn_cmd co "$svnrepo" t.svn &&
+	(
+		cd t.svn &&
+		echo third line from svn >>file &&
+		poke file &&
+		svn_cmd commit -m "third line from svn"
+	) &&
+	rm -rf t.svn
+	
+A    t.svn/file
+A    t.svn/file2
+Checked out revision 6.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+ok 7 - commit another change from svn side
+
+expecting success of 9106.8 'multiple dcommit from git svn will not clobber svn': 
+	git reset --hard refs/remotes/git-svn &&
+	echo new file >> new-file &&
+	git update-index --add new-file &&
+	git commit -a -m 'new file' &&
+	echo clobber > file &&
+	git commit -a -m 'clobber' &&
+	test_must_fail git svn dcommit
+	
+HEAD is now at ac547da more changes
+[master 20243cb] new file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-file
+[master 9bf60a6] clobber
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	A	new-file
+Committed r8
+	M	file
+r7 = b7deffb8310e7fd4689d5d19c2ed22b43c5e8666 (refs/remotes/git-svn)
+	A	new-file
+r8 = 71a6e173229c5f88d7b54106475172f2ede22dc0 (refs/remotes/git-svn)
+W: 20243cbbb2cdc49bd1bd815c8696101eca174c02 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
+warning: skipped previously applied commit 20243cb
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config set advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 9bf60a6... clobber
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 9bf60a6... clobber
+rebase refs/remotes/git-svn: command returned error: 1
+
+ok 8 - multiple dcommit from git svn will not clobber svn
+
+expecting success of 9106.9 'check that rebase really failed': 
+	git status >output &&
+	grep currently.rebasing output
+
+You are currently rebasing branch 'master' on '71a6e17'.
+ok 9 - check that rebase really failed
+
+expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
+	echo clobber and I really mean it > file &&
+	git update-index file &&
+	git rebase --continue &&
+	git svn dcommit
+	
+[detached HEAD fcbb701] clobber
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+Successfully rebased and updated refs/heads/master.
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9106-git-svn-commit-diff-clobber/svnrepo ...
+	M	file
+Committed r9
+	M	file
+r9 = 9c4243af44e0dbb0a5607233f9ce4ea3202e1fdf (refs/remotes/git-svn)
+No changes between fcbb7012d9168e8f8887b3c9a0c97d3034dd7118 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 10 - resolve, continue the rebase and dcommit
+
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9107-git-svn-migrate.sh ***
@@ -521318,7 +521255,7 @@
 	A	tags/0.2/README
 	A	tags/0.3/README
 	A	trunk/README
-r1 = a45a4d3daf04d6ce926c6e46cfab184eea7c4de1 (refs/remotes/git-svn)
+r1 = e82eef2ae001a0da27d40e04997e415bfe50be12 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
 ok 1 - setup old-looking metadata
@@ -521326,7 +521263,7 @@
 expecting success of 9107.2 'git-svn-HEAD is a real HEAD': 
 	git rev-parse --verify refs/heads/git-svn-HEAD^0
 
-a45a4d3daf04d6ce926c6e46cfab184eea7c4de1
+e82eef2ae001a0da27d40e04997e415bfe50be12
 ok 2 - git-svn-HEAD is a real HEAD
 
 expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
@@ -521352,8 +521289,8 @@
  - .git/git-svn => .git/svn/git-svn
  - .git/svn/info => .git/svn/svn/info
 Done migrating from a git-svn v1 layout
-a45a4d3daf04d6ce926c6e46cfab184eea7c4de1
-a45a4d3daf04d6ce926c6e46cfab184eea7c4de1
+e82eef2ae001a0da27d40e04997e415bfe50be12
+e82eef2ae001a0da27d40e04997e415bfe50be12
 ok 3 - initialize old-style (v0) git svn layout
 
 expecting success of 9107.4 'initialize a multi-repository repo': 
@@ -521413,21 +521350,21 @@
 		done
 	done
 
-Rebuilding .git/svn/git-svn/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = a45a4d3daf04d6ce926c6e46cfab184eea7c4de1
-Done rebuilding .git/svn/git-svn/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
+Rebuilding .git/svn/git-svn/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = e82eef2ae001a0da27d40e04997e415bfe50be12
+Done rebuilding .git/svn/git-svn/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
 	A	README
-r1 = ba91e4ea3d0a414ba50490cca2409d4f58009253 (refs/remotes/origin/tags/0.3)
+r1 = c1e663a5ceab91b5a4416d08a31d334bcd83f75d (refs/remotes/origin/tags/0.2)
 	A	README
-r1 = ec91e792d1f69846ff0f1cb94053f6bb3431f798 (refs/remotes/origin/trunk)
+r1 = 181360997377b3036e1437a9d1eca19c4c3d2379 (refs/remotes/origin/a)
 	A	README
-r1 = 7820343fdb8d7ebe9ba29a3dbaf155ec1e3909ea (refs/remotes/origin/tags/0.2)
+r1 = f512958aeeb9dceec256ffbd31cfe22607b09cad (refs/remotes/origin/trunk)
 	A	README
-r1 = 441d9c0977db7c37a53aa0ebecf3e25df822ca5f (refs/remotes/origin/tags/0.1)
+r1 = 9c9dfa946f7b53955b539806fdf2411930abef06 (refs/remotes/origin/b)
 	A	README
-r1 = 05cc9791a91e7b46d90c23cc92ea1ef0dc400682 (refs/remotes/origin/a)
+r1 = e2c1acdee3b609bad3c2beb7dfabd72f423b3f77 (refs/remotes/origin/tags/0.3)
 	A	README
-r1 = c07d4f470b20ecf082738abb8c50eb0aa317b34a (refs/remotes/origin/b)
+r1 = fe8aa0584fde6b8e9dc663c6241c583007d21d81 (refs/remotes/origin/tags/0.1)
 ok 5 - multi-fetch works on partial urls + paths
 
 expecting success of 9107.6 'migrate --minimize on old inited layout': 
@@ -521490,30 +521427,30 @@
 	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
 	test -f "$expect"
 	
-Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = a45a4d3daf04d6ce926c6e46cfab184eea7c4de1
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = 05cc9791a91e7b46d90c23cc92ea1ef0dc400682
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = c07d4f470b20ecf082738abb8c50eb0aa317b34a
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = 441d9c0977db7c37a53aa0ebecf3e25df822ca5f
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = 7820343fdb8d7ebe9ba29a3dbaf155ec1e3909ea
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = ba91e4ea3d0a414ba50490cca2409d4f58009253
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = ec91e792d1f69846ff0f1cb94053f6bb3431f798
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb ...
-r1 = ec91e792d1f69846ff0f1cb94053f6bb3431f798
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.49b03acd-2411-4647-8bca-e5c6a9023aeb
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = e82eef2ae001a0da27d40e04997e415bfe50be12
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = 181360997377b3036e1437a9d1eca19c4c3d2379
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = 9c9dfa946f7b53955b539806fdf2411930abef06
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = fe8aa0584fde6b8e9dc663c6241c583007d21d81
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = c1e663a5ceab91b5a4416d08a31d334bcd83f75d
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = e2c1acdee3b609bad3c2beb7dfabd72f423b3f77
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = f512958aeeb9dceec256ffbd31cfe22607b09cad
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf ...
+r1 = f512958aeeb9dceec256ffbd31cfe22607b09cad
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.afc605c7-c86e-461e-9d75-9d7525ac62bf
 ok 7 - .rev_db auto-converted to .rev_map.UUID
 
 # passed all 7 test(s)
@@ -521580,13 +521517,13 @@
 	A	ne_cr
 	A	ne_crlf
 	A	ne_lf
-r1 = f2c9c7bfeb1ecf33227048e145e20ed0f94ca848 (refs/remotes/git-svn)
+r1 = 8c48c177d4e4a41a24dd57c9896d5c585bd69c5d (refs/remotes/git-svn)
 	M	kw.c
-r2 = 82db0d21f9e59a81f59449ef0ee08526834003af (refs/remotes/git-svn)
+r2 = 955033e83000640a0bf6f601e598ecdcba119863 (refs/remotes/git-svn)
 	M	kw.c
-r3 = 421871ef1ab28de1df7a78f0b2763c39c685d0e5 (refs/remotes/git-svn)
+r3 = e18f4cb5763888aae213e55eee939143f2bd36af (refs/remotes/git-svn)
 	M	kw.c
-r4 = 6ea7acd4636f2768ba7fd39a29ba424f23132a44 (refs/remotes/git-svn)
+r4 = 59a45eeda4896a3c01d3326d91ea073afe30276c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9101-git-svn-props/svnrepo r4
 ok 4 - fetch revisions from svn
@@ -521597,16 +521534,16 @@
 	git svn set-tree remotes/git-svn..mybranch &&
 	git pull . remotes/git-svn
 Switched to a new branch 'mybranch'
-[mybranch 91bc8c9] test keywords ignoring
+[mybranch 3bd04dd] test keywords ignoring
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	kw.c
 	M	kw.c
-r5 = 00c30e6857846daa268a57a5048c8cae3bd0fa71 (refs/remotes/git-svn)
+r5 = 9d992c0341c5319ff441462f8fe9e6ca05215670 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 91bc8c9..00c30e6
+Updating 3bd04dd..9d992c0
 Fast-forward
 ok 5 - test svn:keywords ignoring
 
@@ -521639,10 +521576,10 @@
 	M	crlf
 	M	empty
 	M	ne_crlf
-r6 = 1ef1e12534b1fcf5a7c93fb340b02abc90544b3d (refs/remotes/git-svn)
+r6 = 39221a195caa290ffa4ad10e6fd8b7a1b3e922b8 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 00c30e6..1ef1e12
+Updating 9d992c0..39221a1
 Fast-forward
  crlf    | 3 +--
  ne_crlf | 3 +--
@@ -521710,10 +521647,10 @@
 expecting success of 9101.20 'fetch and pull latest from svn': git svn fetch && git pull . remotes/git-svn
 	M	cr
 	M	ne_cr
-r7 = d1c5a02005f5c3bb0badca19d208521661a8338e (refs/remotes/git-svn)
+r7 = c95a14d2e53d2883a80bb36fa3651387f4ab2448 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 1ef1e12..d1c5a02
+Updating 39221a1..c95a14d
 Fast-forward
  cr    | 4 +++-
  ne_cr | 4 +++-
@@ -521773,10 +521710,10 @@
 	grep gitignore ls_files_result | cmp - create-ignore-index.expect
 	
 	A	deeply/nested/directory/.keep
-r8 = 3d202bd9999be2635e53f562c42591253dc54f6e (refs/remotes/git-svn)
+r8 = 9d090582d243b122f9869ed432262c6f2360e134 (refs/remotes/git-svn)
 From .
  * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating d1c5a02..3d202bd
+Updating c95a14d..9d09058
 Fast-forward
  deeply/nested/directory/.keep | 0
  1 file changed, 0 insertions(+), 0 deletions(-)
@@ -521860,23 +521797,23 @@
 	git merge merge
 	
 	A	README
-r1 = d70d2baebe24729eea0d2e8fd2c0f034c6ff98ba (refs/remotes/origin/trunk)
+r1 = 59ddbcaf7f2000a31bc5bfeef220c6e52a576458 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
 Switched to a new branch 'svn'
 Switched to a new branch 'merge'
-[merge 4a949c4] New file
+[merge fcb7f8e] New file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 new_file
-[merge efa86fa] hello
+[merge 619b897] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[merge c2f2bb6] add some stuff
+[merge 428704e] add some stuff
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'svn'
-[svn 872976c] friend
+[svn e832852] friend
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Auto-merging README
@@ -521903,14 +521840,14 @@
 	M	README
 Committed r2
 	M	README
-r2 = ed5dc844b21956a7ba7e28eebe9758771ecc859d (refs/remotes/origin/trunk)
+r2 = c7d9683adecb82626d80d4e979cc92909e536313 (refs/remotes/origin/trunk)
 	A	new_file
 	M	README
 Committed r3
 	M	README
 	A	new_file
-r3 = aa9c3955ad2f4c55671b11da0d438e75022126d5 (refs/remotes/origin/trunk)
-No changes between d42184ab303cc8900bf3e3ec687a70ff2d3da2fa and refs/remotes/origin/trunk
+r3 = 2598edf54b23e765d6cd406f928700d8737cfbba (refs/remotes/origin/trunk)
+No changes between 37cab8cac06b714fec1feed18538593e868f8a52 and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
 ok 4 - git svn dcommit merges
 
@@ -522034,22 +521971,22 @@
 	(required for this version (2.49.0.395.g12beb8f557c) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = c844e5f05395cb5c002e2170ce97663579720f38 (refs/remotes/trunk)
+r1 = 5d8ed151b00d9926ff195e078a848cf09c0e5baf (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) c844e5f05395cb5c002e2170ce97663579720f38
+Found branch parent: (refs/remotes/branches/v1/start) 5d8ed151b00d9926ff195e078a848cf09c0e5baf
 Following parent with do_switch
 Successfully followed parent
-r2 = 89413d1a76987c09390321faf9da605ccb99cf82 (refs/remotes/branches/v1/start)
+r2 = f10ca9740063906531bd59d10540ac0e5e1207f4 (refs/remotes/branches/v1/start)
 	M	readme
-r3 = 7edbcc2a5cec819542ae4a34e2fd07de9790ff10 (refs/remotes/branches/v1/start)
+r3 = 9f0d408f6463521c4bf0ca1634d3c3cfe852bea4 (refs/remotes/branches/v1/start)
 branch_from: /branches/v1/start => /branches/v1/start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 7edbcc2a5cec819542ae4a34e2fd07de9790ff10
+Found branch parent: (refs/remotes/tags/end) 9f0d408f6463521c4bf0ca1634d3c3cfe852bea4
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 4ccfe7f0c1922d207d4c22693552d807261952d4 (refs/remotes/tags/end)
+r4 = 6cd5ae41bfdb5cc507a1d4e1cec69126da05a8a9 (refs/remotes/tags/end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a r1
 fatal: ambiguous argument 'refs/remotes/tags/end@3': unknown revision or path not in the working tree.
@@ -522091,26 +522028,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 66e1c3fbb0e6f3e392e1c4ab9e67d5755fd08e21 (refs/remotes/two/trunk)
+r1 = 6a51151b31ebc0a254e8abe6c80b24b9145caafa (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) 66e1c3fbb0e6f3e392e1c4ab9e67d5755fd08e21
+Found branch parent: (refs/remotes/two/branches/v1/start) 6a51151b31ebc0a254e8abe6c80b24b9145caafa
 Following parent with do_switch
 Successfully followed parent
-r2 = 8fcf508913661be729804e220fa685bb9a1b2cb8 (refs/remotes/two/branches/v1/start)
+r2 = c36866a167aee7024152ab9abb47baeb9a554c9f (refs/remotes/two/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 8f6ca854f45794d721a0cfad1245b18d9eba254b (refs/remotes/two/branches/v1/start)
+r3 = 31eb9170d6e5b9576c2c2aec7ed0a28d21190eed (refs/remotes/two/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 8f6ca854f45794d721a0cfad1245b18d9eba254b
+Found branch parent: (refs/remotes/two/tags/end) 31eb9170d6e5b9576c2c2aec7ed0a28d21190eed
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 8b458bdbac5ddf343b83f58472b473a11333fc18 (refs/remotes/two/tags/end)
+r4 = b943ade6766f595d37e8f54a778b8cda42be1358 (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = fd76d786dae8fcf1e93bd751493ce3911c99cc58 (refs/remotes/two/tags/end)
+r5 = cb5003fe2ea2bf4ad532ea1453ac630df216574e (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 5d0d32b644ebfdc9f5f48dc7424b42a9dc7bcfa5 (refs/remotes/two/tags/end)
+r6 = fa888c7015a6b387c71dad8f62b889ae5a4c37c8 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
 expecting success of 9109.3 'test another branch': 
@@ -522185,43 +522122,43 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 66e1c3fbb0e6f3e392e1c4ab9e67d5755fd08e21 (refs/remotes/four/trunk)
+r1 = 6a51151b31ebc0a254e8abe6c80b24b9145caafa (refs/remotes/four/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) 66e1c3fbb0e6f3e392e1c4ab9e67d5755fd08e21
+Found branch parent: (refs/remotes/four/branches/v1/start) 6a51151b31ebc0a254e8abe6c80b24b9145caafa
 Following parent with do_switch
 Successfully followed parent
-r2 = 8fcf508913661be729804e220fa685bb9a1b2cb8 (refs/remotes/four/branches/v1/start)
+r2 = c36866a167aee7024152ab9abb47baeb9a554c9f (refs/remotes/four/branches/v1/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = 8f6ca854f45794d721a0cfad1245b18d9eba254b (refs/remotes/four/branches/v1/start)
+r3 = 31eb9170d6e5b9576c2c2aec7ed0a28d21190eed (refs/remotes/four/branches/v1/start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) 8f6ca854f45794d721a0cfad1245b18d9eba254b
+Found branch parent: (refs/remotes/four/tags/end) 31eb9170d6e5b9576c2c2aec7ed0a28d21190eed
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 8b458bdbac5ddf343b83f58472b473a11333fc18 (refs/remotes/four/tags/end)
+r4 = b943ade6766f595d37e8f54a778b8cda42be1358 (refs/remotes/four/tags/end)
 	M	src/b/readme
-r5 = fd76d786dae8fcf1e93bd751493ce3911c99cc58 (refs/remotes/four/tags/end)
+r5 = cb5003fe2ea2bf4ad532ea1453ac630df216574e (refs/remotes/four/tags/end)
 	M	src/b/readme
-r6 = 5d0d32b644ebfdc9f5f48dc7424b42a9dc7bcfa5 (refs/remotes/four/tags/end)
+r6 = fa888c7015a6b387c71dad8f62b889ae5a4c37c8 (refs/remotes/four/tags/end)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) 66e1c3fbb0e6f3e392e1c4ab9e67d5755fd08e21
+Found branch parent: (refs/remotes/four/branches/v2/start) 6a51151b31ebc0a254e8abe6c80b24b9145caafa
 Following parent with do_switch
 Successfully followed parent
-r7 = 04ecd45cc927a1a512b3f65a684174418eb5ccbf (refs/remotes/four/branches/v2/start)
+r7 = 4bc20000a770eae31368f2df664ff712576fdd07 (refs/remotes/four/branches/v2/start)
 	M	src/a/readme
 	M	src/b/readme
-r8 = dbf1883e05254cdb14dcd2dba3e2d5f54e771822 (refs/remotes/four/branches/v2/start)
+r8 = c128a02a7a0eacf8e32955b1110e6bfc992794d9 (refs/remotes/four/branches/v2/start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) dbf1883e05254cdb14dcd2dba3e2d5f54e771822
+Found branch parent: (refs/remotes/four/tags/next) c128a02a7a0eacf8e32955b1110e6bfc992794d9
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r9 = 13c8efe909a4fc826532963121ed7c88f703b095 (refs/remotes/four/tags/next)
+r9 = 5e7121a125221200c52d347855dd6da328e9e928 (refs/remotes/four/tags/next)
 	M	src/b/readme
-r10 = 89f32b1a66be477415ac3d9322a3ad009646f38e (refs/remotes/four/tags/next)
+r10 = 4b8ad1aecbaff63d60e2c3b7940ff7a98c77a9c3 (refs/remotes/four/tags/next)
 ok 3 - test another branch
 
 expecting success of 9109.4 'prepare test disallow multiple globs': 
@@ -522288,7 +522225,7 @@
 	git checkout -b mybranch remotes/git-svn
 	
 	A	foo
-r1 = 1e462a91567721a0908d18c4e1286e97ce82db8a (refs/remotes/git-svn)
+r1 = 57dacf52ea960745c3a532ab37536f6e1708b021 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
 Switched to a new branch 'mybranch'
@@ -522396,10 +522333,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9122-git-svn-author/work.git/.git/
 	A	file
-r1 = 7e1e5c93ae61d7d878092908196f448acec615ee (refs/remotes/git-svn)
+r1 = 1609bbe6780bd23264cdd37f8103ae5ded30d37d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master 19c65fb] second
+[master c1db5fb] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -522407,10 +522344,10 @@
 	M	file
 Committed r2
 	M	file
-r2 = 72d6836d4cf4af4c9655c08acc87afb5a4c8554a (refs/remotes/git-svn)
-No changes between 19c65fb4c2983b5e6f815e770799c340b2a762a7 and refs/remotes/git-svn
+r2 = 2be12e4904e5907f09ac2a19ce11c8ba6bafe99d (refs/remotes/git-svn)
+No changes between c1db5fb37cdf39a75fd8a91b6a0508a8142023b4 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master cdf8085] third
+[master 11503ee] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -522418,10 +522355,10 @@
 	M	file
 Committed r3
 	M	file
-r3 = 4f3fdb936a91c96dba1bbbe5651de7b3095d7c7c (refs/remotes/git-svn)
-No changes between cdf8085ff8f50529d5c1f30e4ebdfbd4a07aec11 and refs/remotes/git-svn
+r3 = 005a1bf7f39160b5121a7d4abafefadde50ec9be (refs/remotes/git-svn)
+No changes between 11503ee6f0a6f6178bfa19b4c562ca551e484e80 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master f94de9e] fourth
+[master caaae99] fourth
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -522429,44 +522366,44 @@
 	M	file
 Committed r4
 	M	file
-r4 = 15687c55b42a08d462ee6faa6a8251e257ce312d (refs/remotes/git-svn)
-No changes between f94de9e418bccc6cd852c6ab6f245b60b1c7d54c and refs/remotes/git-svn
+r4 = 488cb462c0d9a682481a6d2b6aac1fefd67ec470 (refs/remotes/git-svn)
+No changes between caaae996d7797e17b1a85e31af1004d32991ae60 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-commit 15687c55b42a08d462ee6faa6a8251e257ce312d
+commit 488cb462c0d9a682481a6d2b6aac1fefd67ec470
 Author: A U Thor <author@example.com>
-Date:   Sun Apr 19 19:25:36 2026 +0000
+Date:   Mon Mar 17 13:30:10 2025 +0000
 
     fourth
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@4 973a3dad-5eaf-40ff-a6bb-0bff0efee2aa
+    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@4 ac6c07b4-0f73-4d8d-88b9-5106ce1607a3
 
-commit 4f3fdb936a91c96dba1bbbe5651de7b3095d7c7c
-Author: pbuilder1 <pbuilder1@973a3dad-5eaf-40ff-a6bb-0bff0efee2aa>
-Date:   Sun Apr 19 19:25:34 2026 +0000
+commit 005a1bf7f39160b5121a7d4abafefadde50ec9be
+Author: pbuilder2 <pbuilder2@ac6c07b4-0f73-4d8d-88b9-5106ce1607a3>
+Date:   Mon Mar 17 13:30:07 2025 +0000
 
     third
     
     From: A U Thor <author@example.com>
     
-    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@3 973a3dad-5eaf-40ff-a6bb-0bff0efee2aa
+    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@3 ac6c07b4-0f73-4d8d-88b9-5106ce1607a3
 
-commit 72d6836d4cf4af4c9655c08acc87afb5a4c8554a
-Author: pbuilder1 <pbuilder1@973a3dad-5eaf-40ff-a6bb-0bff0efee2aa>
-Date:   Sun Apr 19 19:25:31 2026 +0000
+commit 2be12e4904e5907f09ac2a19ce11c8ba6bafe99d
+Author: pbuilder2 <pbuilder2@ac6c07b4-0f73-4d8d-88b9-5106ce1607a3>
+Date:   Mon Mar 17 13:30:04 2025 +0000
 
     second
     
-    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@2 973a3dad-5eaf-40ff-a6bb-0bff0efee2aa
+    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@2 ac6c07b4-0f73-4d8d-88b9-5106ce1607a3
 
-commit 7e1e5c93ae61d7d878092908196f448acec615ee
-Author: pbuilder1 <pbuilder1@973a3dad-5eaf-40ff-a6bb-0bff0efee2aa>
-Date:   Sun Apr 19 19:25:27 2026 +0000
+commit 1609bbe6780bd23264cdd37f8103ae5ded30d37d
+Author: pbuilder2 <pbuilder2@ac6c07b4-0f73-4d8d-88b9-5106ce1607a3>
+Date:   Mon Mar 17 13:29:59 2025 +0000
 
     first commit
     
-    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@1 973a3dad-5eaf-40ff-a6bb-0bff0efee2aa
+    git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9122-git-svn-author/svnrepo@1 ac6c07b4-0f73-4d8d-88b9-5106ce1607a3
     From: A U Thor <author@example.com>
     From: A U Thor <author@example.com>
 Author: A U Thor <author@example.com>
@@ -522479,6 +522416,11 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9126-git-svn-follow-deleted-readded-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9118-git-svn-funky-branch-names.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9118-git-svn-funky-branch-names/.git/
 expecting success of 9118.1 'setup svnrepo': 
@@ -522546,51 +522488,51 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = e23fac7b8633ff238c03d5122e8e91d495d937ba (refs/remotes/origin/trunk)
+r1 = 6852cf9692ba408d421dd29b14c4331036a83efa (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) e23fac7b8633ff238c03d5122e8e91d495d937ba
+Found branch parent: (refs/remotes/origin/fun plugin) 6852cf9692ba408d421dd29b14c4331036a83efa
 Following parent with do_switch
 Successfully followed parent
-r2 = ef202f7fbc744862ed5ea8d67bf6d3c39a83ea8d (refs/remotes/origin/fun plugin)
+r2 = 068dc02a367fc70d4d02b46f786b3dc6f1a10d1c (refs/remotes/origin/fun plugin)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin!, 2
-Found branch parent: (refs/remotes/origin/more fun plugin!) ef202f7fbc744862ed5ea8d67bf6d3c39a83ea8d
+Found branch parent: (refs/remotes/origin/more fun plugin!) 068dc02a367fc70d4d02b46f786b3dc6f1a10d1c
 Following parent with do_switch
 Successfully followed parent
-r3 = 1c890fcfadb31561bd588aa4f51a33547219cf54 (refs/remotes/origin/more fun plugin!)
+r3 = ac43cc189964907d4abae7b74d0cb81d0264c06a (refs/remotes/origin/more fun plugin!)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/Abo-Uebernahme%20(Bug%20%23994), 3
-Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) ef202f7fbc744862ed5ea8d67bf6d3c39a83ea8d
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 068dc02a367fc70d4d02b46f786b3dc6f1a10d1c
 Following parent with do_switch
 Successfully followed parent
-r4 = 447ef1eba912d23544aafb77e4307abfde104155 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+r4 = 22d876d01303297541f110a6d1fafac237cdfd78 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) e23fac7b8633ff238c03d5122e8e91d495d937ba
+Found branch parent: (refs/remotes/origin/.leading_dot) 6852cf9692ba408d421dd29b14c4331036a83efa
 Following parent with do_switch
 Successfully followed parent
-r5 = 6fb4b5c0e4d2c2c61b2f18a2fa48ef5651a748b3 (refs/remotes/origin/.leading_dot)
+r5 = 32b72f0b83fcb2601a355159fb82c785307bcbf4 (refs/remotes/origin/.leading_dot)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) e23fac7b8633ff238c03d5122e8e91d495d937ba
+Found branch parent: (refs/remotes/origin/trailing_dot.) 6852cf9692ba408d421dd29b14c4331036a83efa
 Following parent with do_switch
 Successfully followed parent
-r6 = 83454578b41bbcc7a1a8584f1d9dc987757f2dd3 (refs/remotes/origin/trailing_dot.)
+r6 = 0b4917252dd0a95f0d971d82851d98408638f288 (refs/remotes/origin/trailing_dot.)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock, 6
-Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) e23fac7b8633ff238c03d5122e8e91d495d937ba
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) 6852cf9692ba408d421dd29b14c4331036a83efa
 Following parent with do_switch
 Successfully followed parent
-r7 = 14953010817b3fa097d65bc1a496a2d2c0fdb3b7 (refs/remotes/origin/trailing_dotlock.lock)
+r7 = 559c80ee3466d8f02d23b66d803cd29d21589233 (refs/remotes/origin/trailing_dotlock.lock)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/not-a@%7B0%7Dreflog, 7
-Found branch parent: (refs/remotes/origin/not-a@{0}reflog) e23fac7b8633ff238c03d5122e8e91d495d937ba
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) 6852cf9692ba408d421dd29b14c4331036a83efa
 Following parent with do_switch
 Successfully followed parent
-r8 = 64890792821e12b37e59250ec6248e41b9822551 (refs/remotes/origin/not-a@{0}reflog)
+r8 = 57a8a5bfd6f900088395d10d49b6c3ff704449de (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-ef202f7fbc744862ed5ea8d67bf6d3c39a83ea8d
-1c890fcfadb31561bd588aa4f51a33547219cf54
-447ef1eba912d23544aafb77e4307abfde104155
-6fb4b5c0e4d2c2c61b2f18a2fa48ef5651a748b3
-83454578b41bbcc7a1a8584f1d9dc987757f2dd3
-14953010817b3fa097d65bc1a496a2d2c0fdb3b7
-64890792821e12b37e59250ec6248e41b9822551
+068dc02a367fc70d4d02b46f786b3dc6f1a10d1c
+ac43cc189964907d4abae7b74d0cb81d0264c06a
+22d876d01303297541f110a6d1fafac237cdfd78
+32b72f0b83fcb2601a355159fb82c785307bcbf4
+0b4917252dd0a95f0d971d82851d98408638f288
+559c80ee3466d8f02d23b66d803cd29d21589233
+57a8a5bfd6f900088395d10d49b6c3ff704449de
 ok 2 - test clone with funky branch names
 
 expecting success of 9118.3 'test dcommit to funky branch': 
@@ -522602,8 +522544,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 1c890fc more fun!
-[master 1a2b944] hello
+HEAD is now at ac43cc1 more fun!
+[master 0d0b5ba] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -522611,8 +522553,8 @@
 	M	foo
 Committed r9
 	M	foo
-r9 = 736333998a8f16277bb96e0e96e31c865f2bda8a (refs/remotes/origin/more fun plugin!)
-No changes between 1a2b9444d649f402fe7deb4418dce36d7cd888e7 and refs/remotes/origin/more%20fun%20plugin!
+r9 = 096fe38b2a61c494a6cc625e0d031782eacfc473 (refs/remotes/origin/more fun plugin!)
+No changes between 0d0b5bad88e7d818946ad23181a6437f309eed47 and refs/remotes/origin/more%20fun%20plugin!
 Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
 ok 3 - test dcommit to funky branch
 
@@ -522625,8 +522567,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 447ef1e scary
-[master 9f57766] eep
+HEAD is now at 22d876d scary
+[master ff98653] eep
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -522634,8 +522576,8 @@
 	M	foo
 Committed r10
 	M	foo
-r10 = 15946d2795b6aa2962be9175a66a225bcee6ba9f (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between 9f577664f34b513039fc5c48e63b8b1cd190b735 and refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
+r10 = 6311cc481d30904c61c82f77117281a0598e6e49 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between ff986531f9388b476b9900aa7af37d2904a59db3 and refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
 Resetting to the latest refs/remotes/origin/Abo-Uebernahme%20(Bug%20#994)
 ok 4 - test dcommit to scary branch
 
@@ -522648,8 +522590,8 @@
 		git svn dcommit
 	)
 	
-HEAD is now at 1495301 trailing .lock
-[master 7e7b827] bar
+HEAD is now at 559c80e trailing .lock
+[master b86f2fd] bar
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -522657,8 +522599,8 @@
 	M	foo
 Committed r11
 	M	foo
-r11 = 50c7c8c946808ca2c4a629aaee21fb50abbda524 (refs/remotes/origin/trailing_dotlock.lock)
-No changes between 7e7b827f2d4e8dd5e6f74acbe368c734a66d7963 and refs/remotes/origin/trailing_dotlock%2Elock
+r11 = c8e7aef878f949b24c50c2104e1f35858133b165 (refs/remotes/origin/trailing_dotlock.lock)
+No changes between b86f2fdfcac6472f55b4af6e14d54beaf567e93a and refs/remotes/origin/trailing_dotlock%2Elock
 Resetting to the latest refs/remotes/origin/trailing_dotlock%2Elock
 ok 5 - test dcommit to trailing_dotlock branch
 
@@ -522666,6 +522608,11 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9128-git-svn-cmd-branch.sh ***
+skipping test t9128 altogether
+1..0 # SKIP skip all tests in t9128
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9124-git-svn-dcommit-auto-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9124-git-svn-dcommit-auto-props/.git/
 expecting success of 9124.1 'initialize git svn': 
@@ -522683,7 +522630,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = da5e0f92a256c78591f179a76eac176f05457c04 (refs/remotes/git-svn)
+r1 = 1c0e9662efbc3787c6b3743f9c430ee2fc0367ba (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -522702,7 +522649,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 3aa0f48] files for enabled auto-props
+[master 3a209c2] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -522717,8 +522664,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = 235cd81e608569156321c8307e4470f80b899200 (refs/remotes/git-svn)
-No changes between 3aa0f487331eaa7755688f3fffe3a17d65ce7409 and refs/remotes/git-svn
+r2 = fbd02471d4886af1db6e9e77ba6a39129cf36c42 (refs/remotes/git-svn)
+No changes between 3a209c21c282bc80a864b5cf6e9b9684dd2e77b1 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -522735,7 +522682,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 6adf71e] files for disabled auto-props
+[master f744eac] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -522750,8 +522697,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = 8cf6c7194457a6750e65a21fbfb60a387ca21e47 (refs/remotes/git-svn)
-No changes between 6adf71e44d78a454581b835334c3de89ac670048 and refs/remotes/git-svn
+r3 = c3142cadd1ba369f91e0216ac84d5bd90ac50688 (refs/remotes/git-svn)
+No changes between f744eaccda0c64fe0d6465920a901b301244b41a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -522820,7 +522767,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master d02b55f] foo => foo.sh
+[master 204e3a4] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -522831,8 +522778,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = a246d498583af1b4265d4bd95210e0f785a9dba0 (refs/remotes/git-svn)
-No changes between d02b55f13bb87bf75a7ab6758ec46a466694a5ac and refs/remotes/git-svn
+r4 = c99cc51631636319a37e929bb83c6e8e868550b1 (refs/remotes/git-svn)
+No changes between 204e3a44a6aeece71ef3ee3c208ec340fe7db2c9 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -522844,16 +522791,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9126-git-svn-follow-deleted-readded-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9128-git-svn-cmd-branch.sh ***
-skipping test t9128 altogether
-1..0 # SKIP skip all tests in t9128
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9120-git-svn-clone-with-percent-escapes.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
 expecting success of 9120.1 'setup svnrepo': 
@@ -522890,14 +522827,14 @@
 	A	trunk/foo
 W: +empty_dir: branches
 W: +empty_dir: tags
-r1 = 11ec26ccea127da3f6f6817e1f44c7b5601fdfe7 (refs/remotes/git-svn)
+r1 = 9a594dd891ea610bb18484cf5fce8fb73a4f02ee (refs/remotes/git-svn)
 	A	branches/b/foo
-r2 = 0eb86fec77c5e31d549912f8137dd38948478965 (refs/remotes/git-svn)
+r2 = 65b461b0214fe0ab0b9accde97b6417716cf6b52 (refs/remotes/git-svn)
 	A	tags/v1/foo
-r3 = 5995c08e9a567614a0d57cd0e461f16252f4cc7c (refs/remotes/git-svn)
+r3 = f28a2cfa9fdc8a5d0c1d0752f80a1c74a39ee36c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-5995c08e9a567614a0d57cd0e461f16252f4cc7c
+f28a2cfa9fdc8a5d0c1d0752f80a1c74a39ee36c
 ok 2 - test clone with percent escapes
 
 expecting success of 9120.3 'svn checkout with percent escapes': 
@@ -522944,10 +522881,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = 675cfdecdecfa752de84cf576d66342f392c8366 (refs/remotes/git-svn)
+r1 = c3942a8fdf7339654596466a477ecc427070de25 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-675cfdecdecfa752de84cf576d66342f392c8366
+c3942a8fdf7339654596466a477ecc427070de25
 ok 5 - test clone trunk with percent escapes and minimize-url
 
 expecting success of 9120.6 'test clone trunk with percent escapes': 
@@ -522959,10 +522896,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
 	A	foo
-r1 = 675cfdecdecfa752de84cf576d66342f392c8366 (refs/remotes/git-svn)
+r1 = c3942a8fdf7339654596466a477ecc427070de25 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-675cfdecdecfa752de84cf576d66342f392c8366
+c3942a8fdf7339654596466a477ecc427070de25
 ok 6 - test clone trunk with percent escapes
 
 expecting success of 9120.7 'test clone --stdlayout with percent escapes': 
@@ -522977,22 +522914,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = 675cfdecdecfa752de84cf576d66342f392c8366 (refs/remotes/origin/trunk)
+r1 = c3942a8fdf7339654596466a477ecc427070de25 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) 675cfdecdecfa752de84cf576d66342f392c8366
+Found branch parent: (refs/remotes/origin/b) c3942a8fdf7339654596466a477ecc427070de25
 Following parent with do_switch
 Successfully followed parent
-r2 = 7ab3f7bb74bbc449d45e741edb69451c3811c1ef (refs/remotes/origin/b)
+r2 = dd8264bebe491ad5dc1cdbc7e3ae268795a83285 (refs/remotes/origin/b)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) 675cfdecdecfa752de84cf576d66342f392c8366
+Found branch parent: (refs/remotes/origin/tags/v1) c3942a8fdf7339654596466a477ecc427070de25
 Following parent with do_switch
 Successfully followed parent
-r3 = 25f8b9edb291f095a75dcf9afdaf5a215f444685 (refs/remotes/origin/tags/v1)
+r3 = 40a3910a30d1bf02ad2267c79e07478f3aa02d6f (refs/remotes/origin/tags/v1)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-675cfdecdecfa752de84cf576d66342f392c8366
-7ab3f7bb74bbc449d45e741edb69451c3811c1ef
-25f8b9edb291f095a75dcf9afdaf5a215f444685
+c3942a8fdf7339654596466a477ecc427070de25
+dd8264bebe491ad5dc1cdbc7e3ae268795a83285
+40a3910a30d1bf02ad2267c79e07478f3aa02d6f
 ok 7 - test clone --stdlayout with percent escapes
 
 expecting success of 9120.8 'test clone -s with unescaped space': 
@@ -523007,22 +522944,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
 	A	foo
-r1 = 675cfdecdecfa752de84cf576d66342f392c8366 (refs/remotes/origin/trunk)
+r1 = c3942a8fdf7339654596466a477ecc427070de25 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) 675cfdecdecfa752de84cf576d66342f392c8366
+Found branch parent: (refs/remotes/origin/b) c3942a8fdf7339654596466a477ecc427070de25
 Following parent with do_switch
 Successfully followed parent
-r2 = 7ab3f7bb74bbc449d45e741edb69451c3811c1ef (refs/remotes/origin/b)
+r2 = dd8264bebe491ad5dc1cdbc7e3ae268795a83285 (refs/remotes/origin/b)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) 675cfdecdecfa752de84cf576d66342f392c8366
+Found branch parent: (refs/remotes/origin/tags/v1) c3942a8fdf7339654596466a477ecc427070de25
 Following parent with do_switch
 Successfully followed parent
-r3 = 25f8b9edb291f095a75dcf9afdaf5a215f444685 (refs/remotes/origin/tags/v1)
+r3 = 40a3910a30d1bf02ad2267c79e07478f3aa02d6f (refs/remotes/origin/tags/v1)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-675cfdecdecfa752de84cf576d66342f392c8366
-7ab3f7bb74bbc449d45e741edb69451c3811c1ef
-25f8b9edb291f095a75dcf9afdaf5a215f444685
+c3942a8fdf7339654596466a477ecc427070de25
+dd8264bebe491ad5dc1cdbc7e3ae268795a83285
+40a3910a30d1bf02ad2267c79e07478f3aa02d6f
 ok 8 - test clone -s with unescaped space
 
 # passed all 8 test(s)
@@ -523066,21 +523003,21 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
 	A	foo
-r1 = 4a05f57d45fa1cb2193f25a5e51e64a86cc0c43d (refs/remotes/origin/trunk)
+r1 = d54427a9336708380581eb9cd47690b783a94e79 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta, 1
-Found branch parent: (refs/remotes/origin/v14.1/beta) 4a05f57d45fa1cb2193f25a5e51e64a86cc0c43d
+Found branch parent: (refs/remotes/origin/v14.1/beta) d54427a9336708380581eb9cd47690b783a94e79
 Following parent with do_switch
 Successfully followed parent
-r2 = 7105d63609dda7c7a165b020ae7853704a302fd9 (refs/remotes/origin/v14.1/beta)
+r2 = 1ea7123d5bf44fa4558cac9c5a683fc66295eb7e (refs/remotes/origin/v14.1/beta)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold, 2
-Found branch parent: (refs/remotes/origin/v14.1/gold) 7105d63609dda7c7a165b020ae7853704a302fd9
+Found branch parent: (refs/remotes/origin/v14.1/gold) 1ea7123d5bf44fa4558cac9c5a683fc66295eb7e
 Following parent with do_switch
 Successfully followed parent
-r3 = e91b0ae976d265d72f857f65470a8904fdff4393 (refs/remotes/origin/v14.1/gold)
+r3 = c29cd2a1beadc1de6e08f1bbfd0081f3df908dd3 (refs/remotes/origin/v14.1/gold)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-7105d63609dda7c7a165b020ae7853704a302fd9
-e91b0ae976d265d72f857f65470a8904fdff4393
+1ea7123d5bf44fa4558cac9c5a683fc66295eb7e
+c29cd2a1beadc1de6e08f1bbfd0081f3df908dd3
 ok 2 - test clone with multi-glob in branch names
 
 expecting success of 9125.3 'test dcommit to multi-globbed branch': 
@@ -523091,8 +523028,8 @@
 	git svn dcommit
 	)
 	
-HEAD is now at e91b0ae more fun!
-[master 675be42] hello
+HEAD is now at c29cd2a more fun!
+[master a1a6e8a] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -523100,8 +523037,8 @@
 	M	foo
 Committed r4
 	M	foo
-r4 = c0c2df823d60ad758ba2a9823ca4a8a5b63d8b6e (refs/remotes/origin/v14.1/gold)
-No changes between 675be42109a028be514a5c6693e64d09915be26d and refs/remotes/origin/v14.1/gold
+r4 = 5549abc483d9937f98bd0bfdd3c17a6c2ec8464e (refs/remotes/origin/v14.1/gold)
+No changes between a1a6e8ac753491c10d24170a5ffc8639ea6f41db and refs/remotes/origin/v14.1/gold
 Resetting to the latest refs/remotes/origin/v14.1/gold
 ok 3 - test dcommit to multi-globbed branch
 
@@ -523134,7 +523071,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/git-svn)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 2 - basic clone
@@ -523148,7 +523085,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/target/.git/
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/git-svn)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 3 - clone to target directory
@@ -523163,7 +523100,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/origin/trunk)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 4 - clone with --stdlayout
@@ -523178,7 +523115,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/target/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/origin/trunk)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
 ok 5 - clone to target directory with --stdlayout
@@ -523202,7 +523139,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/git-svn)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/git-svn)
 ok 7 - clone without -s/-T/-b/-t does not warn
 
 expecting success of 9117.8 'init with -s/-T/-b/-t assumes --prefix=origin/': 
@@ -523226,7 +523163,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/origin/trunk)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/origin/trunk)
 ok 9 - clone with -s/-T/-b/-t assumes --prefix=origin/
 
 expecting success of 9117.10 'init with -s/-T/-b/-t and --prefix "" still works': 
@@ -523250,7 +523187,7 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9117-git-svn-init-clone/project/.git/
 	A	foo
-r1 = a26c7a8236356a967806cd417938713028e8a2a0 (refs/remotes/trunk)
+r1 = e531c16b761e79ac7ccebc0b74f08992b4162ee3 (refs/remotes/trunk)
 ok 11 - clone with -s/-T/-b/-t and --prefix "" still works
 
 expecting success of 9117.12 'init with -T as a full url works': 
@@ -523455,12 +523392,12 @@
 	git svn fetch -r1:2
 
 	A	foo
-r1 = cc41760e08e424e8e5a24da019cd071aedf36b1b (refs/remotes/origin/trunk)
+r1 = c2712f3bc11b0a6f78a881e5708cd6fb295e483d (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) cc41760e08e424e8e5a24da019cd071aedf36b1b
+Found branch parent: (refs/remotes/origin/a) c2712f3bc11b0a6f78a881e5708cd6fb295e483d
 Following parent with do_switch
 Successfully followed parent
-r2 = 8e5b09c63151897ec424a7f0015c6e5e08210264 (refs/remotes/origin/a)
+r2 = a6c9dd07ce88ea40522d2a8e1947409fbf66b6cf (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
 ok 2 - import an early SVN revision into git
@@ -523477,16 +523414,16 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
 	A	foo
-r1 = cc41760e08e424e8e5a24da019cd071aedf36b1b (refs/remotes/origin/trunk)
+r1 = c2712f3bc11b0a6f78a881e5708cd6fb295e483d (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) cc41760e08e424e8e5a24da019cd071aedf36b1b
+Found branch parent: (refs/remotes/origin/a) c2712f3bc11b0a6f78a881e5708cd6fb295e483d
 Following parent with do_switch
 Successfully followed parent
-r2 = 8e5b09c63151897ec424a7f0015c6e5e08210264 (refs/remotes/origin/a)
+r2 = a6c9dd07ce88ea40522d2a8e1947409fbf66b6cf (refs/remotes/origin/a)
 	M	foo
-r3 = f4d651a6de0e497da95f905acfd03735ff6fb5be (refs/remotes/origin/trunk)
+r3 = a00d88936b907633bbd23fbe606ed2074d38fb8f (refs/remotes/origin/trunk)
 	A	a
-r4 = 4f575dceddc52888f43d3ab78260592a814aa9b8 (refs/remotes/origin/a)
+r4 = c4c9dc2049330d483d101bb28e7f7f3c0d19379f (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
 ok 3 - make full git mirror of SVN
@@ -523498,278 +523435,22 @@
 	git svn fetch
 
 From file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   8e5b09c..4f575dc  origin/a     -> origin/a
-   cc41760..f4d651a  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.7c2a3156-d39a-4c10-bc82-02f3d7c3b8a8 ...
-Currently at 1 = cc41760e08e424e8e5a24da019cd071aedf36b1b
-r3 = f4d651a6de0e497da95f905acfd03735ff6fb5be
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.7c2a3156-d39a-4c10-bc82-02f3d7c3b8a8
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.7c2a3156-d39a-4c10-bc82-02f3d7c3b8a8 ...
-Currently at 2 = 8e5b09c63151897ec424a7f0015c6e5e08210264
-r4 = 4f575dceddc52888f43d3ab78260592a814aa9b8
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.7c2a3156-d39a-4c10-bc82-02f3d7c3b8a8
+   a6c9dd0..c4c9dc2  origin/a     -> origin/a
+   c2712f3..a00d889  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a68bcf8c-78b8-409f-9fa9-780a324c176e ...
+Currently at 1 = c2712f3bc11b0a6f78a881e5708cd6fb295e483d
+r3 = a00d88936b907633bbd23fbe606ed2074d38fb8f
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a68bcf8c-78b8-409f-9fa9-780a324c176e
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.a68bcf8c-78b8-409f-9fa9-780a324c176e ...
+Currently at 2 = a6c9dd07ce88ea40522d2a8e1947409fbf66b6cf
+r4 = c4c9dc2049330d483d101bb28e7f7f3c0d19379f
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.a68bcf8c-78b8-409f-9fa9-780a324c176e
 ok 4 - fetch from git mirror and partial-rebuild
 
 # passed all 4 test(s)
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9133-git-svn-nested-git-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/.git/
-expecting success of 9133.1 'setup repo with a git repo inside it': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		git init &&
-		git symbolic-ref HEAD &&
-		> .git/a &&
-		echo a > a &&
-		svn_cmd add .git a &&
-		svn_cmd commit -m "create a nested git repo" &&
-		svn_cmd up &&
-		echo hi >> .git/a &&
-		svn_cmd commit -m "modify .git/a" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
-refs/heads/master
-A         .git
-A         .git/refs
-A         .git/refs/tags
-A         .git/refs/heads
-A         .git/a
-A         .git/HEAD
-A         .git/description
-A         .git/hooks
-A         .git/hooks/prepare-commit-msg.sample
-A         .git/hooks/sendemail-validate.sample
-A         .git/hooks/applypatch-msg.sample
-A         .git/hooks/pre-applypatch.sample
-A         .git/hooks/pre-merge-commit.sample
-A         .git/hooks/commit-msg.sample
-A         .git/hooks/pre-commit.sample
-A         .git/hooks/fsmonitor-watchman.sample
-A         .git/hooks/push-to-checkout.sample
-A         .git/hooks/update.sample
-A         .git/hooks/pre-push.sample
-A         .git/hooks/post-update.sample
-A         .git/hooks/pre-rebase.sample
-A         .git/hooks/pre-receive.sample
-A         .git/config
-A         .git/objects
-A         .git/objects/info
-A         .git/objects/pack
-A         .git/info
-A         .git/info/exclude
-A         a
-Adding         .git
-Adding         .git/HEAD
-Adding         .git/a
-Adding         .git/config
-Adding         .git/description
-Adding         .git/hooks
-Adding         .git/hooks/applypatch-msg.sample
-Adding         .git/hooks/commit-msg.sample
-Adding         .git/hooks/fsmonitor-watchman.sample
-Adding         .git/hooks/post-update.sample
-Adding         .git/hooks/pre-applypatch.sample
-Adding         .git/hooks/pre-commit.sample
-Adding         .git/hooks/pre-merge-commit.sample
-Adding         .git/hooks/pre-push.sample
-Adding         .git/hooks/pre-rebase.sample
-Adding         .git/hooks/pre-receive.sample
-Adding         .git/hooks/prepare-commit-msg.sample
-Adding         .git/hooks/push-to-checkout.sample
-Adding         .git/hooks/sendemail-validate.sample
-Adding         .git/hooks/update.sample
-Adding         .git/info
-Adding         .git/info/exclude
-Adding         .git/objects
-Adding         .git/objects/info
-Adding         .git/objects/pack
-Adding         .git/refs
-Adding         .git/refs/heads
-Adding         .git/refs/tags
-Adding         a
-Transmitting file data ....................done
-Committing transaction...
-Committed revision 1.
-Updating '.':
-At revision 1.
-Sending        .git/a
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-ok 1 - setup repo with a git repo inside it
-
-expecting success of 9133.2 'clone an SVN repo containing a git repo': 
-	git svn clone "$svnrepo" g &&
-	echo a > expect &&
-	test_cmp expect g/a
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
-	A	a
-r1 = 33acb5f5fa1a0291459eee9d643be65e55417252 (refs/remotes/git-svn)
-r2 = 05ec8113b6b1b572b4a52ee02ba6bf1fbc21bc22 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
-ok 2 - clone an SVN repo containing a git repo
-
-expecting success of 9133.3 'SVN-side change outside of .git': 
-	(
-		cd s &&
-		echo b >> a &&
-		svn_cmd commit -m "SVN-side change outside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change outside of .git"
-	)
-
-Sending        a
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-SVN-side change outside of .git
-ok 3 - SVN-side change outside of .git
-
-expecting success of 9133.4 'update git svn-cloned repo': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r3 = a9307d5d4e95c2d0d3417790decdaedbfd06c282 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 4 - update git svn-cloned repo
-
-expecting success of 9133.5 'SVN-side change inside of .git': 
-	(
-		cd s &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		git log &&
-		svn_cmd add --force .git &&
-		svn_cmd commit -m "SVN-side change inside of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change inside of .git"
-	)
-
-[master (root-commit) 2c8aa43] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 a
-commit 2c8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    add a inside an SVN repo
-A         .git/refs/heads/master
-A         .git/logs
-A         .git/logs/refs
-A         .git/logs/refs/heads
-A         .git/logs/refs/heads/master
-A         .git/logs/HEAD
-A         .git/COMMIT_EDITMSG
-A  (bin)  .git/index
-A         .git/objects/42
-A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-A         .git/objects/a3
-A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-A         .git/objects/2c
-A  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-Adding         .git/COMMIT_EDITMSG
-Adding  (bin)  .git/index
-Adding         .git/logs
-Adding         .git/logs/HEAD
-Adding         .git/logs/refs
-Adding         .git/logs/refs/heads
-Adding         .git/logs/refs/heads/master
-Adding         .git/objects/2c
-Adding  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
-Adding         .git/objects/42
-Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
-Adding         .git/objects/a3
-Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
-Adding         .git/refs/heads/master
-Transmitting file data ........done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-SVN-side change inside of .git
-ok 5 - SVN-side change inside of .git
-
-expecting success of 9133.6 'update git svn-cloned repo': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-r4 = 5dec008503160f84ec54c98c255620626d803018 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 6 - update git svn-cloned repo
-
-expecting success of 9133.7 'SVN-side change in and out of .git': 
-	(
-		cd s &&
-		echo c >> a &&
-		git add a &&
-		git commit -m "add a inside an SVN repo" &&
-		svn_cmd commit -m "SVN-side change in and out of .git" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change in and out of .git"
-	)
-
-[master 1e2f668] add a inside an SVN repo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Sending        .git/index
-Sending        .git/logs/HEAD
-Sending        .git/logs/refs/heads/master
-Sending        .git/refs/heads/master
-Sending        a
-Transmitting file data .....done
-Committing transaction...
-Committed revision 5.
-Updating '.':
-At revision 5.
-SVN-side change in and out of .git
-ok 7 - SVN-side change in and out of .git
-
-expecting success of 9133.8 'update git svn-cloned repo again': 
-	(
-		cd g &&
-		git svn rebase &&
-		echo a > expect &&
-		echo b >> expect &&
-		echo c >> expect &&
-		test_cmp expect a &&
-		rm expect
-	)
-
-	M	a
-r5 = e410fd73a2b86472ee4dab23b08912ca9f442ef5 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 8 - update git svn-cloned repo again
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9115-git-svn-dcommit-funky-renames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
 expecting success of 9115.1 'load repository with strange names': 
@@ -523815,7 +523496,7 @@
 	A	#{bad_directory_name}/ foo
 Committed r2
 	A	#{bad_directory_name}/ foo
-r2 = 01fa26e8854dd8d027aa73c3e73636529fe062f0 (refs/remotes/git-svn)
+r2 = e7564458d64bf0cd4cedfd995dc8168a30e4a052 (refs/remotes/git-svn)
 No changes between 650dc1a9919fabaf6048f6cb9d461784488b455a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - create file in existing ugly and empty dir
@@ -523825,7 +523506,7 @@
 	git commit -m "rename ugly file" &&
 	git svn dcommit
 	
-[master fe693b9] rename ugly file
+[master 5499b9e] rename ugly file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename #{bad_directory_name}/ foo => file name with feces (100%)
@@ -523836,8 +523517,8 @@
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = ed8e8a0a54b91d66dbf4b7ae2b5df681d4537918 (refs/remotes/git-svn)
-No changes between fe693b908a2a36d1e1087c47b3e681b566ca57a3 and refs/remotes/git-svn
+r3 = ddacfc709d70ef3a18eb56f8038254556b822cec (refs/remotes/git-svn)
+No changes between 5499b9e386c936b74be3b907ce661a51d91bc730 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 4 - rename ugly file
 
@@ -523851,7 +523532,7 @@
 	git commit -m "moved pretty file" &&
 	git svn dcommit
 	
-[master 3117970] pretty :x
+[master ea9c2cb] pretty :x
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 pretty
@@ -523860,10 +523541,10 @@
 	A	pretty
 Committed r4
 	A	pretty
-r4 = 1c7caa3e701e8525e484a7ac34e6aa2dc2e4433f (refs/remotes/git-svn)
-No changes between 311797005275fa5546bd0e7b07df55fed1766b61 and refs/remotes/git-svn
+r4 = cd3a46874b0efdbc426f507ecdaa318f05e8657c (refs/remotes/git-svn)
+No changes between ea9c2cb485c3ecf11ddfd4d02b14749a4e9f2582 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master c933d21] moved pretty file
+[master b644e82] moved pretty file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename pretty => regular_dir_name/pretty (100%)
@@ -523874,8 +523555,8 @@
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = f282ac95921f3702bffe0c6dafaefe26c35d4105 (refs/remotes/git-svn)
-No changes between c933d21b40d879bd175860a797342a5af044030a and refs/remotes/git-svn
+r5 = 579b0ee5c7ca39fba37fe25298b665179ecb6bb9 (refs/remotes/git-svn)
+No changes between b644e82cb0bc2e125801ff46a4c1faa507c37210 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - rename pretty file
 
@@ -523884,7 +523565,7 @@
 	git commit -m booboo &&
 	git svn dcommit
 	
-[master 620c1ce] booboo
+[master 8b194b8] booboo
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename regular_dir_name/pretty => #{bad_directory_name}/ booboo (100%)
@@ -523895,8 +523576,8 @@
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 34f49a33020a9cad97245ece0bc9db728fd74b04 (refs/remotes/git-svn)
-No changes between 620c1cecffe1c291e353a15b8a43d5d232ded5a5 and refs/remotes/git-svn
+r6 = 68918117eb8cf7b31ff7f33ea5abf87db6fcbede (refs/remotes/git-svn)
+No changes between 8b194b891913d0b296913899296fea5e9915ce2a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - rename pretty file into ugly one
 
@@ -523909,11 +523590,11 @@
 	git commit -m plus_dir &&
 	git svn dcommit
 	
-[master bdec227] plus
+[master a58fcea] plus
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 +_+
-[master d65e228] plus_dir
+[master cf9ec17] plus_dir
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename +_+ => gtk+/_+_ (100%)
@@ -523922,14 +523603,14 @@
 	A	+_+
 Committed r7
 	A	+_+
-r7 = dee75d05714c6041cad54d36867e1ad2ffb65f2c (refs/remotes/git-svn)
+r7 = e79e95c60669165a440fabee3cf20d453b802ddd (refs/remotes/git-svn)
 	R	+_+ => gtk+/_+_
 Committed r8
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 0428abd691a18babc912d5d38ce4035141dde4e7 (refs/remotes/git-svn)
-No changes between d65e228c7fb9eccdd53765fef04e0c5cb48fa967 and refs/remotes/git-svn
+r8 = 6741fd53717549e257f4db078b804ba498214fbf (refs/remotes/git-svn)
+No changes between cf9ec178503091d15800b6987673d50562f8aed7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 7 - add a file with plus signs
 
@@ -523952,33 +523633,33 @@
 W: +empty_dir: regular_dir_name
 r1 = 2f52500b81c926ac95e20a273a44a612bfe06578 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ foo
-r2 = 01fa26e8854dd8d027aa73c3e73636529fe062f0 (refs/remotes/git-svn)
+r2 = e7564458d64bf0cd4cedfd995dc8168a30e4a052 (refs/remotes/git-svn)
 	D	#{bad_directory_name}/ foo
 	A	file name with feces
 W: -empty_dir: #{bad_directory_name}/ foo
-r3 = ed8e8a0a54b91d66dbf4b7ae2b5df681d4537918 (refs/remotes/git-svn)
+r3 = ddacfc709d70ef3a18eb56f8038254556b822cec (refs/remotes/git-svn)
 	A	pretty
-r4 = 1c7caa3e701e8525e484a7ac34e6aa2dc2e4433f (refs/remotes/git-svn)
+r4 = cd3a46874b0efdbc426f507ecdaa318f05e8657c (refs/remotes/git-svn)
 	D	pretty
 	A	regular_dir_name/pretty
 W: -empty_dir: pretty
-r5 = f282ac95921f3702bffe0c6dafaefe26c35d4105 (refs/remotes/git-svn)
+r5 = 579b0ee5c7ca39fba37fe25298b665179ecb6bb9 (refs/remotes/git-svn)
 	A	#{bad_directory_name}/ booboo
 	D	regular_dir_name/pretty
 W: -empty_dir: regular_dir_name/pretty
-r6 = 34f49a33020a9cad97245ece0bc9db728fd74b04 (refs/remotes/git-svn)
+r6 = 68918117eb8cf7b31ff7f33ea5abf87db6fcbede (refs/remotes/git-svn)
 	A	+_+
-r7 = dee75d05714c6041cad54d36867e1ad2ffb65f2c (refs/remotes/git-svn)
+r7 = e79e95c60669165a440fabee3cf20d453b802ddd (refs/remotes/git-svn)
 	D	+_+
 	A	gtk+/_+_
 W: -empty_dir: +_+
-r8 = 0428abd691a18babc912d5d38ce4035141dde4e7 (refs/remotes/git-svn)
+r8 = 6741fd53717549e257f4db078b804ba498214fbf (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo r8
 creating empty directory:  leading space
 creating empty directory: dir name with spaces
 creating empty directory: regular_dir_name
-[master 733e83a] test-rebase
+[master 332e03c] test-rebase
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase
@@ -523990,7 +523671,7 @@
 		git commit -m test-rebase-main &&
 		git svn dcommit
 	
-[master 6a0dfeb] test-rebase-main
+[master 610df4c] test-rebase-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 test-rebase-main
@@ -523999,8 +523680,8 @@
 	A	test-rebase-main
 Committed r9
 	A	test-rebase-main
-r9 = 6d3f93719e5aaf2ae33c71bd53e43886fad77de4 (refs/remotes/git-svn)
-No changes between 6a0dfeb4252efb7ffe56e01b3b1b22210ad5ab97 and refs/remotes/git-svn
+r9 = c0fb2826e9f3d3c1c678223ddb4df0444abf3e73 (refs/remotes/git-svn)
+No changes between 610df4c74ffce9a45e20dd6e06bf513d83ab23c1 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 9 - make a commit to test rebase
 
@@ -524012,7 +523693,7 @@
 		test -e test-rebase
 	)
 	A	test-rebase-main
-r9 = 6d3f93719e5aaf2ae33c71bd53e43886fad77de4 (refs/remotes/git-svn)
+r9 = c0fb2826e9f3d3c1c678223ddb4df0444abf3e73 (refs/remotes/git-svn)
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
 ok 10 - git svn rebase works inside a fresh-cloned repository
 
@@ -524039,7 +523720,7 @@
 	git commit -m "neq" &&
 	git svn dcommit
 
-[master 4c094c3] neq
+[master 13c8f14] neq
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\202"
@@ -524048,8 +523729,8 @@
 	A	�‚
 Committed r10
 	A	�‚
-r10 = 607da3d736afd7f58e90240eaeb725fc0f1875b1 (refs/remotes/git-svn)
-No changes between 4c094c38fe78071cc4ac02099433112ebcb6687e and refs/remotes/git-svn
+r10 = 31a04ccee12fc208e51a10c7d42eb7d750620773 (refs/remotes/git-svn)
+No changes between 13c8f14927caac7062570d68bed6923ac2cc9c42 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 11 - svn.pathnameencoding=cp932 new file on dcommit
 
@@ -524066,7 +523747,7 @@
 	git commit -m "inf rename" &&
 	git svn dcommit
 
-[master 0a4cd0e] inf
+[master 9a278f4] inf
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 "\201\207"
@@ -524075,10 +523756,10 @@
 	A	�‡
 Committed r11
 	A	�‡
-r11 = bd575a1f2cd0b1efcc634a437f93edf5b62e28c2 (refs/remotes/git-svn)
-No changes between 0a4cd0ee2b2215bebb0afa4655417c1f41f4b832 and refs/remotes/git-svn
+r11 = 6d010aed5a386d4bc115bf19563c48086a90f2a4 (refs/remotes/git-svn)
+No changes between 9a278f43ebacb9307af1659d57b32deca54a4857 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-[master 38ed921] inf rename
+[master 8292f43] inf rename
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename "\201\207" => inf (100%)
@@ -524089,8 +523770,8 @@
 	D	�‡
 	A	inf
 W: -empty_dir: ∞
-r12 = 24e1c95296cd58c753fbd2f3d41fdc824867bce7 (refs/remotes/git-svn)
-No changes between 38ed921af0166baf3c4b0a5b3ed2a32ee3b4e2fa and refs/remotes/git-svn
+r12 = 668de1d88ab3567ef3d7ea0c8bb63dd3fe71c0ac (refs/remotes/git-svn)
+No changes between 8292f430f8d2ea5caebb1ae10629068450dfb4c1 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 12 - svn.pathnameencoding=cp932 rename on dcommit
 
@@ -524098,6 +523779,262 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9133-git-svn-nested-git-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/.git/
+expecting success of 9133.1 'setup repo with a git repo inside it': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		git init &&
+		git symbolic-ref HEAD &&
+		> .git/a &&
+		echo a > a &&
+		svn_cmd add .git a &&
+		svn_cmd commit -m "create a nested git repo" &&
+		svn_cmd up &&
+		echo hi >> .git/a &&
+		svn_cmd commit -m "modify .git/a" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
+refs/heads/master
+A         .git
+A         .git/objects
+A         .git/objects/info
+A         .git/objects/pack
+A         .git/info
+A         .git/info/exclude
+A         .git/refs
+A         .git/refs/tags
+A         .git/refs/heads
+A         .git/a
+A         .git/HEAD
+A         .git/description
+A         .git/hooks
+A         .git/hooks/push-to-checkout.sample
+A         .git/hooks/update.sample
+A         .git/hooks/pre-push.sample
+A         .git/hooks/post-update.sample
+A         .git/hooks/pre-rebase.sample
+A         .git/hooks/pre-receive.sample
+A         .git/hooks/prepare-commit-msg.sample
+A         .git/hooks/sendemail-validate.sample
+A         .git/hooks/applypatch-msg.sample
+A         .git/hooks/pre-applypatch.sample
+A         .git/hooks/pre-merge-commit.sample
+A         .git/hooks/commit-msg.sample
+A         .git/hooks/pre-commit.sample
+A         .git/hooks/fsmonitor-watchman.sample
+A         .git/config
+A         a
+Adding         .git
+Adding         .git/HEAD
+Adding         .git/a
+Adding         .git/config
+Adding         .git/description
+Adding         .git/hooks
+Adding         .git/hooks/applypatch-msg.sample
+Adding         .git/hooks/commit-msg.sample
+Adding         .git/hooks/fsmonitor-watchman.sample
+Adding         .git/hooks/post-update.sample
+Adding         .git/hooks/pre-applypatch.sample
+Adding         .git/hooks/pre-commit.sample
+Adding         .git/hooks/pre-merge-commit.sample
+Adding         .git/hooks/pre-push.sample
+Adding         .git/hooks/pre-rebase.sample
+Adding         .git/hooks/pre-receive.sample
+Adding         .git/hooks/prepare-commit-msg.sample
+Adding         .git/hooks/push-to-checkout.sample
+Adding         .git/hooks/sendemail-validate.sample
+Adding         .git/hooks/update.sample
+Adding         .git/info
+Adding         .git/info/exclude
+Adding         .git/objects
+Adding         .git/objects/info
+Adding         .git/objects/pack
+Adding         .git/refs
+Adding         .git/refs/heads
+Adding         .git/refs/tags
+Adding         a
+Transmitting file data ....................done
+Committing transaction...
+Committed revision 1.
+Updating '.':
+At revision 1.
+Sending        .git/a
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+ok 1 - setup repo with a git repo inside it
+
+expecting success of 9133.2 'clone an SVN repo containing a git repo': 
+	git svn clone "$svnrepo" g &&
+	echo a > expect &&
+	test_cmp expect g/a
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
+	A	a
+r1 = 90107d204f27ea39f77cdcd19ff569a2c5aff3f4 (refs/remotes/git-svn)
+r2 = 162623cebef1beb19d6e613acf483e25b26c5717 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
+ok 2 - clone an SVN repo containing a git repo
+
+expecting success of 9133.3 'SVN-side change outside of .git': 
+	(
+		cd s &&
+		echo b >> a &&
+		svn_cmd commit -m "SVN-side change outside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change outside of .git"
+	)
+
+Sending        a
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+SVN-side change outside of .git
+ok 3 - SVN-side change outside of .git
+
+expecting success of 9133.4 'update git svn-cloned repo': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r3 = 5d95bbb7124c44d5e231024e7f8173731e67db19 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 4 - update git svn-cloned repo
+
+expecting success of 9133.5 'SVN-side change inside of .git': 
+	(
+		cd s &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		git log &&
+		svn_cmd add --force .git &&
+		svn_cmd commit -m "SVN-side change inside of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change inside of .git"
+	)
+
+[master (root-commit) 2c8aa43] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 a
+commit 2c8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    add a inside an SVN repo
+A         .git/logs
+A         .git/logs/refs
+A         .git/logs/refs/heads
+A         .git/logs/refs/heads/master
+A         .git/logs/HEAD
+A         .git/COMMIT_EDITMSG
+A  (bin)  .git/index
+A         .git/objects/a3
+A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+A         .git/objects/2c
+A  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+A         .git/objects/42
+A  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+A         .git/refs/heads/master
+Adding         .git/COMMIT_EDITMSG
+Adding  (bin)  .git/index
+Adding         .git/logs
+Adding         .git/logs/HEAD
+Adding         .git/logs/refs
+Adding         .git/logs/refs/heads
+Adding         .git/logs/refs/heads/master
+Adding         .git/objects/2c
+Adding  (bin)  .git/objects/2c/8aa43a22d2c918b77cfe09cfecdfbb4dce2117
+Adding         .git/objects/42
+Adding  (bin)  .git/objects/42/2c2b7ab3b3c668038da977e4e93a5fc623169c
+Adding         .git/objects/a3
+Adding  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
+Adding         .git/refs/heads/master
+Transmitting file data ........done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+SVN-side change inside of .git
+ok 5 - SVN-side change inside of .git
+
+expecting success of 9133.6 'update git svn-cloned repo': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+r4 = 30bd2c8ae7ebbdb946d2cd0668922351fd9d46c4 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 6 - update git svn-cloned repo
+
+expecting success of 9133.7 'SVN-side change in and out of .git': 
+	(
+		cd s &&
+		echo c >> a &&
+		git add a &&
+		git commit -m "add a inside an SVN repo" &&
+		svn_cmd commit -m "SVN-side change in and out of .git" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change in and out of .git"
+	)
+
+[master 1e2f668] add a inside an SVN repo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Sending        .git/index
+Sending        .git/logs/HEAD
+Sending        .git/logs/refs/heads/master
+Sending        .git/refs/heads/master
+Sending        a
+Transmitting file data .....done
+Committing transaction...
+Committed revision 5.
+Updating '.':
+At revision 5.
+SVN-side change in and out of .git
+ok 7 - SVN-side change in and out of .git
+
+expecting success of 9133.8 'update git svn-cloned repo again': 
+	(
+		cd g &&
+		git svn rebase &&
+		echo a > expect &&
+		echo b >> expect &&
+		echo c >> expect &&
+		test_cmp expect a &&
+		rm expect
+	)
+
+	M	a
+r5 = 98487d986edd67e824553ab7ce551001d1a89c3d (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 8 - update git svn-cloned repo again
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9131-git-svn-empty-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9131-git-svn-empty-symlink/.git/
 expecting success of 9131.1 'load svn dumpfile': 
@@ -524279,261 +524216,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9116-git-svn-log.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9116-git-svn-log/.git/
-expecting success of 9116.1 'setup repository and import': 
-	mkdir import &&
-	(
-		cd import &&
-		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
-		do
-			mkdir -p $i &&
-			echo hello >>$i/README ||
-			exit 1
-		done &&
-		svn_cmd import -m test . "$svnrepo"
-	) &&
-	git svn init "$svnrepo" -T trunk -b branches -t tags &&
-	git svn fetch &&
-	git reset --hard origin/trunk &&
-	echo bye >> README &&
-	git commit -a -m bye &&
-	git svn dcommit &&
-	git reset --hard origin/a &&
-	echo why >> FEEDME &&
-	git update-index --add FEEDME &&
-	git commit -m feedme &&
-	git svn dcommit &&
-	git reset --hard origin/trunk &&
-	echo aye >> README &&
-	git commit -a -m aye &&
-	git svn dcommit &&
-	git reset --hard origin/b &&
-	echo spy >> README &&
-	git commit -a -m spy &&
-	echo try >> README &&
-	git commit -a -m try &&
-	git svn dcommit
-	
-Adding         branches
-Adding         branches/a
-Adding         branches/a/README
-Adding         branches/b
-Adding         branches/b/README
-Adding         tags
-Adding         tags/0.1
-Adding         tags/0.1/README
-Adding         tags/0.2
-Adding         tags/0.2/README
-Adding         tags/0.3
-Adding         tags/0.3/README
-Adding         trunk
-Adding         trunk/README
-Committing transaction...
-Committed revision 1.
-	A	README
-r1 = 59aef7624c73b8bd133bc33b37d4e13924152db9 (refs/remotes/origin/tags/0.1)
-	A	README
-r1 = 9f5acaf8ab2b510c43e1f758489c9b3e978d1fd9 (refs/remotes/origin/tags/0.3)
-	A	README
-r1 = 9aa9153767fe7f13e5c9ba3f32557b6d3b83a476 (refs/remotes/origin/b)
-	A	README
-r1 = c066b5390dceaa8f57a868ec2656a3f9611afc05 (refs/remotes/origin/a)
-	A	README
-r1 = cd8c619cb88cbe93423101b747042da32df2b34a (refs/remotes/origin/tags/0.2)
-	A	README
-r1 = 9da3a3ed890dddf5656697589d72a46c997fb4ba (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at 9da3a3e test
-[master f45ae09] bye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = 257a18d1e2f03625a0b66a0c2496ac005e287007 (refs/remotes/origin/trunk)
-No changes between f45ae09787ddfb208ef96be4328c7ceda744f9bd and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at c066b53 test
-[master db76705] feedme
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FEEDME
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
-	A	FEEDME
-Committed r3
-	A	FEEDME
-r3 = d2fa85051b473594b80af5e669e6926cff391227 (refs/remotes/origin/a)
-No changes between db76705688154e040bed02bf70d562a984067a0a and refs/remotes/origin/a
-Resetting to the latest refs/remotes/origin/a
-HEAD is now at 257a18d bye
-[master b81051f] aye
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
-	M	README
-Committed r4
-	M	README
-r4 = e86f3af43434206c38b14c2eeeb4f236cb28cf0a (refs/remotes/origin/trunk)
-No changes between b81051f8a86a17986f8f19fe762e5dd7bacd092a and refs/remotes/origin/trunk
-Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 9aa9153 test
-[master bc14337] spy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master d09aadf] try
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
-	M	README
-Committed r5
-	M	README
-r5 = 7a216b8bf26c9a4dc6c904d77b8fefc132a0043c (refs/remotes/origin/b)
-	M	README
-Committed r6
-	M	README
-r6 = c31e73c09f8e8ba53b9f72f4d4a94734aea99650 (refs/remotes/origin/b)
-No changes between d09aadf9f04aaf92083f885803a69dc153d07c35 and refs/remotes/origin/b
-Resetting to the latest refs/remotes/origin/b
-ok 1 - setup repository and import
-
-expecting success of 9116.2 'run log': 
-	git reset --hard origin/a &&
-	git svn log -r2 origin/trunk >out &&
-	grep ^r2 out &&
-	git svn log -r4 origin/trunk >out &&
-	grep ^r4 out &&
-	git svn log -r3 >out &&
-	grep ^r3 out
-	
-HEAD is now at d2fa850 feedme
-r2 | pbuilder1 | 2026-04-19 19:25:27 +0000 (Sun, 19 Apr 2026) | 2 lines
-r4 | pbuilder1 | 2026-04-19 19:25:32 +0000 (Sun, 19 Apr 2026) | 2 lines
-r3 | pbuilder1 | 2026-04-19 19:25:29 +0000 (Sun, 19 Apr 2026) | 2 lines
-ok 2 - run log
-
-expecting success of 9116.3 'run log against a from trunk': 
-	git reset --hard origin/trunk &&
-	git svn log -r3 origin/a >out &&
-	grep ^r3 out
-	
-HEAD is now at e86f3af aye
-r3 | pbuilder1 | 2026-04-19 19:25:29 +0000 (Sun, 19 Apr 2026) | 2 lines
-ok 3 - run log against a from trunk
-
-expecting success of 9116.4 'test ascending revision range': 
-	git reset --hard origin/trunk &&
-	git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
-	
-HEAD is now at e86f3af aye
-ok 4 - test ascending revision range
-
-expecting success of 9116.5 'test ascending revision range with --show-commit': 
-	git reset --hard origin/trunk &&
-	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
-	
-HEAD is now at e86f3af aye
-ok 5 - test ascending revision range with --show-commit
-
-expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
-	git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
-	git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
-	git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
-	git reset --hard origin/trunk &&
-	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
-	git rev-parse $(cat out) >actual &&
-	test_cmp expected-range-r1-r2-r4-sha1 actual
-	
-HEAD is now at e86f3af aye
-ok 6 - test ascending revision range with --show-commit (sha1)
-
-expecting success of 9116.7 'test descending revision range': 
-	git reset --hard origin/trunk &&
-	git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 -
-	
-HEAD is now at e86f3af aye
-ok 7 - test descending revision range
-
-expecting success of 9116.8 'test ascending revision range with unreachable revision': 
-	git reset --hard origin/trunk &&
-	git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 -
-	
-HEAD is now at e86f3af aye
-ok 8 - test ascending revision range with unreachable revision
-
-expecting success of 9116.9 'test descending revision range with unreachable revision': 
-	git reset --hard origin/trunk &&
-	git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
-	
-HEAD is now at e86f3af aye
-ok 9 - test descending revision range with unreachable revision
-
-expecting success of 9116.10 'test ascending revision range with unreachable upper boundary revision and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
-	
-HEAD is now at e86f3af aye
-ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
-
-expecting success of 9116.11 'test descending revision range with unreachable upper boundary revision and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
-	
-HEAD is now at e86f3af aye
-ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
-
-expecting success of 9116.12 'test ascending revision range with unreachable lower boundary revision and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
-	
-HEAD is now at e86f3af aye
-ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
-
-expecting success of 9116.13 'test descending revision range with unreachable lower boundary revision and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
-	
-HEAD is now at e86f3af aye
-ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
-
-expecting success of 9116.14 'test ascending revision range with unreachable boundary revisions and no commits': 
-	git reset --hard origin/trunk &&
-	git svn log -r 5:6 | test_cmp expected-separator -
-	
-HEAD is now at e86f3af aye
-ok 14 - test ascending revision range with unreachable boundary revisions and no commits
-
-expecting success of 9116.15 'test descending revision range with unreachable boundary revisions and no commits': 
-	git reset --hard origin/trunk &&
-	git svn log -r 6:5 | test_cmp expected-separator -
-	
-HEAD is now at e86f3af aye
-ok 15 - test descending revision range with unreachable boundary revisions and no commits
-
-expecting success of 9116.16 'test ascending revision range with unreachable boundary revisions and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
-	
-HEAD is now at e86f3af aye
-ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit
-
-expecting success of 9116.17 'test descending revision range with unreachable boundary revisions and 1 commit': 
-	git reset --hard origin/trunk &&
-	git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
-	
-HEAD is now at e86f3af aye
-ok 17 - test descending revision range with unreachable boundary revisions and 1 commit
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9129-git-svn-i18n-commitencoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9129-git-svn-i18n-commitencoding/.git/
 expecting success of 9129.1 'ISO8859-1 setup': 
@@ -524544,7 +524226,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 6ae294047f8e6f2744dd398b972df7da3e24eff3 (refs/remotes/git-svn)
+r1 = 18c4c5dcde37d79d2277cc53232a02750c15d9bc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -524557,7 +524239,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = a47e9acbdc37d46b759102ed38408c22aa72c641 (refs/remotes/git-svn)
+r2 = e929c0baf939168a566c85a03fb1aaaec5107da0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -524570,7 +524252,7 @@
 Committing transaction...
 Committed revision 3.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = 770a92586c98734ff61a37e625b3a532b64f9013 (refs/remotes/git-svn)
+r3 = 58d431d572c74e02e46ffc4d075567ba351b86f4 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
 ok 3 - ISO-2022-JP setup
@@ -524589,7 +524271,7 @@
 	)
 	
 Switched to a new branch 't'
-[t b801f4a] ÄËÑÏÖ
+[t 43f64de] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -524609,7 +524291,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 03f9d6b] ¤Ï¤ì¤Ò¤Û¤Õ
+[t 4897d97] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -524629,7 +524311,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 9e3bf61] $B$O$l$R$[$U(B
+[t a4fc3c3] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -524650,10 +524332,10 @@
 	A	F
 Committed r4
 	A	F
-r4 = 5dca930199fe4b9698f350c4ea82459ada160739 (refs/remotes/git-svn)
-No changes between b801f4a254c6d56f42874571de252b286326074b and refs/remotes/git-svn
+r4 = 1c6892df8a4e106ad4bd8468561adac79f339a66 (refs/remotes/git-svn)
+No changes between 43f64de5195b9838b5346fa411632edcd8cd36e3 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 3689ba6c-9384-4bfc-90ed-eb6a4e109353
+git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 6805098b-c6be-4d3a-8054-e0ed0542bdc3
 ok 7 - ISO8859-1 dcommit to svn
 
 expecting success of 9129.8 'eucJP dcommit to svn': 
@@ -524671,10 +524353,10 @@
 	A	F
 Committed r5
 	A	F
-r5 = 423d5a553da71def9a2c4999feae697bd201253b (refs/remotes/git-svn)
-No changes between 03f9d6b2a2d6215033091ccd549be9e034b64a38 and refs/remotes/git-svn
+r5 = a3fd2717f69a19d91edec73aa90c717bbdf9e8fc (refs/remotes/git-svn)
+No changes between 4897d97c43bcc1a5328465fa8ce71cc4c548b58a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 3689ba6c-9384-4bfc-90ed-eb6a4e109353
+git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 6805098b-c6be-4d3a-8054-e0ed0542bdc3
 ok 8 - eucJP dcommit to svn
 
 expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
@@ -524692,10 +524374,10 @@
 	A	F
 Committed r6
 	A	F
-r6 = 6f99c30d602ee634ece9276bf2f80952b6283118 (refs/remotes/git-svn)
-No changes between 9e3bf615667fc6a802bc412db1852a0078aab1fa and refs/remotes/git-svn
+r6 = 1acfd72e49fa9a33bd4cef1ae071214c25757020 (refs/remotes/git-svn)
+No changes between a4fc3c310a528fac243e0260fd88b7af86243a72 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 3689ba6c-9384-4bfc-90ed-eb6a4e109353
+git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 6805098b-c6be-4d3a-8054-e0ed0542bdc3
 ok 9 - ISO-2022-JP dcommit to svn
 
 expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
@@ -524762,46 +524444,301 @@
 
 ------- Committed revision 6 >>>
 
-ok 1 - load svn dumpfile
+ok 1 - load svn dumpfile
+
+expecting success of 9135.2 'clone using git svn': git svn clone -s "$svnrepo" x
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
+r1 = 95fd3e2836f1e85e561fac0a2e36e69d5791ab79 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
+Found branch parent: (refs/remotes/origin/branch-b) 95fd3e2836f1e85e561fac0a2e36e69d5791ab79
+Following parent with do_switch
+Successfully followed parent
+r2 = a8dd33edcb1c8e191fbd957b5a2329db05bbf481 (refs/remotes/origin/branch-b)
+	A	b1
+r3 = ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8 (refs/remotes/origin/branch-b)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
+Found branch parent: (refs/remotes/origin/branch-c) 95fd3e2836f1e85e561fac0a2e36e69d5791ab79
+Following parent with do_switch
+Successfully followed parent
+r4 = 6c2c7a26dbe84bea6f0312cbdb1695092fdf78eb (refs/remotes/origin/branch-c)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
+Found branch parent: (refs/remotes/origin/branch-c) ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8
+Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+rereading ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8
+Following parent with do_switch
+Successfully followed parent
+r6 = 5560e4a7c722d2d76abd53e8385dafca8096bf38 (refs/remotes/origin/branch-c)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
+
+expecting success of 9135.3 'test that b1 exists and is empty': 
+	(
+		cd x &&
+		git reset --hard origin/branch-c &&
+		test_must_be_empty b1
+	)
+	
+HEAD is now at 5560e4a branch-c off of branch-b
+ok 3 - test that b1 exists and is empty
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9116-git-svn-log.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9116-git-svn-log/.git/
+expecting success of 9116.1 'setup repository and import': 
+	mkdir import &&
+	(
+		cd import &&
+		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
+		do
+			mkdir -p $i &&
+			echo hello >>$i/README ||
+			exit 1
+		done &&
+		svn_cmd import -m test . "$svnrepo"
+	) &&
+	git svn init "$svnrepo" -T trunk -b branches -t tags &&
+	git svn fetch &&
+	git reset --hard origin/trunk &&
+	echo bye >> README &&
+	git commit -a -m bye &&
+	git svn dcommit &&
+	git reset --hard origin/a &&
+	echo why >> FEEDME &&
+	git update-index --add FEEDME &&
+	git commit -m feedme &&
+	git svn dcommit &&
+	git reset --hard origin/trunk &&
+	echo aye >> README &&
+	git commit -a -m aye &&
+	git svn dcommit &&
+	git reset --hard origin/b &&
+	echo spy >> README &&
+	git commit -a -m spy &&
+	echo try >> README &&
+	git commit -a -m try &&
+	git svn dcommit
+	
+Adding         branches
+Adding         branches/a
+Adding         branches/a/README
+Adding         branches/b
+Adding         branches/b/README
+Adding         tags
+Adding         tags/0.1
+Adding         tags/0.1/README
+Adding         tags/0.2
+Adding         tags/0.2/README
+Adding         tags/0.3
+Adding         tags/0.3/README
+Adding         trunk
+Adding         trunk/README
+Committing transaction...
+Committed revision 1.
+	A	README
+r1 = d5effc29f13a53ca8928fbe2a79bbcb42df00086 (refs/remotes/origin/a)
+	A	README
+r1 = 086cd60463f0d24b8aadeb1ab08cbf052d4474f3 (refs/remotes/origin/tags/0.3)
+	A	README
+r1 = 8ecb4e4a2f0b2d5523f92ffd3e8b9cad9ca51033 (refs/remotes/origin/b)
+	A	README
+r1 = 927be26b646d9795cb2ca063bfb975e9d4cf15c6 (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = f160ae4d3d729eb8856fbd4cdaafc88f65de99df (refs/remotes/origin/tags/0.1)
+	A	README
+r1 = d09af8fb6801f942c6c1cf024fa860a04b5575ed (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
+HEAD is now at d09af8f test
+[master 6fac438] bye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = 73eb5c4d5f72bf567f8a3171338afd56ea8585df (refs/remotes/origin/trunk)
+No changes between 6fac4385d5309b44bcf9a91864430485ad0bb6df and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at d5effc2 test
+[master d2080ba] feedme
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FEEDME
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/a ...
+	A	FEEDME
+Committed r3
+	A	FEEDME
+r3 = b63170a8e2f7ab5b25dc8ad0e5361502d7b5791e (refs/remotes/origin/a)
+No changes between d2080baceba876638caade18f753ae32f79d5189 and refs/remotes/origin/a
+Resetting to the latest refs/remotes/origin/a
+HEAD is now at 73eb5c4 bye
+[master f6f45c6] aye
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk ...
+	M	README
+Committed r4
+	M	README
+r4 = a75683e5603e26e51a7183d8e044c9b2c13fe2b0 (refs/remotes/origin/trunk)
+No changes between f6f45c6fdb806173b3e42d4945b04fef99d47176 and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+HEAD is now at 8ecb4e4 test
+[master ad1843c] spy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master c2e038f] try
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9116-git-svn-log/svnrepo/branches/b ...
+	M	README
+Committed r5
+	M	README
+r5 = 7acd51d7528b158daa1718e6103857e1df920233 (refs/remotes/origin/b)
+	M	README
+Committed r6
+	M	README
+r6 = 98200182d5073a0efba4263df4f08b9a8f35e27e (refs/remotes/origin/b)
+No changes between c2e038f21862d312985b08415b0c3503e24c306c and refs/remotes/origin/b
+Resetting to the latest refs/remotes/origin/b
+ok 1 - setup repository and import
+
+expecting success of 9116.2 'run log': 
+	git reset --hard origin/a &&
+	git svn log -r2 origin/trunk >out &&
+	grep ^r2 out &&
+	git svn log -r4 origin/trunk >out &&
+	grep ^r4 out &&
+	git svn log -r3 >out &&
+	grep ^r3 out
+	
+HEAD is now at b63170a feedme
+r2 | pbuilder2 | 2025-03-17 13:30:01 +0000 (Mon, 17 Mar 2025) | 2 lines
+r4 | pbuilder2 | 2025-03-17 13:30:07 +0000 (Mon, 17 Mar 2025) | 2 lines
+r3 | pbuilder2 | 2025-03-17 13:30:04 +0000 (Mon, 17 Mar 2025) | 2 lines
+ok 2 - run log
+
+expecting success of 9116.3 'run log against a from trunk': 
+	git reset --hard origin/trunk &&
+	git svn log -r3 origin/a >out &&
+	grep ^r3 out
+	
+HEAD is now at a75683e aye
+r3 | pbuilder2 | 2025-03-17 13:30:04 +0000 (Mon, 17 Mar 2025) | 2 lines
+ok 3 - run log against a from trunk
+
+expecting success of 9116.4 'test ascending revision range': 
+	git reset --hard origin/trunk &&
+	git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
+	
+HEAD is now at a75683e aye
+ok 4 - test ascending revision range
+
+expecting success of 9116.5 'test ascending revision range with --show-commit': 
+	git reset --hard origin/trunk &&
+	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
+	
+HEAD is now at a75683e aye
+ok 5 - test ascending revision range with --show-commit
+
+expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
+	git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
+	git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
+	git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
+	git reset --hard origin/trunk &&
+	git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
+	git rev-parse $(cat out) >actual &&
+	test_cmp expected-range-r1-r2-r4-sha1 actual
+	
+HEAD is now at a75683e aye
+ok 6 - test ascending revision range with --show-commit (sha1)
+
+expecting success of 9116.7 'test descending revision range': 
+	git reset --hard origin/trunk &&
+	git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 -
+	
+HEAD is now at a75683e aye
+ok 7 - test descending revision range
+
+expecting success of 9116.8 'test ascending revision range with unreachable revision': 
+	git reset --hard origin/trunk &&
+	git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 -
+	
+HEAD is now at a75683e aye
+ok 8 - test ascending revision range with unreachable revision
+
+expecting success of 9116.9 'test descending revision range with unreachable revision': 
+	git reset --hard origin/trunk &&
+	git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
+	
+HEAD is now at a75683e aye
+ok 9 - test descending revision range with unreachable revision
+
+expecting success of 9116.10 'test ascending revision range with unreachable upper boundary revision and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
+	
+HEAD is now at a75683e aye
+ok 10 - test ascending revision range with unreachable upper boundary revision and 1 commit
+
+expecting success of 9116.11 'test descending revision range with unreachable upper boundary revision and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
+	
+HEAD is now at a75683e aye
+ok 11 - test descending revision range with unreachable upper boundary revision and 1 commit
+
+expecting success of 9116.12 'test ascending revision range with unreachable lower boundary revision and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
+	
+HEAD is now at a75683e aye
+ok 12 - test ascending revision range with unreachable lower boundary revision and 1 commit
+
+expecting success of 9116.13 'test descending revision range with unreachable lower boundary revision and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
+	
+HEAD is now at a75683e aye
+ok 13 - test descending revision range with unreachable lower boundary revision and 1 commit
+
+expecting success of 9116.14 'test ascending revision range with unreachable boundary revisions and no commits': 
+	git reset --hard origin/trunk &&
+	git svn log -r 5:6 | test_cmp expected-separator -
+	
+HEAD is now at a75683e aye
+ok 14 - test ascending revision range with unreachable boundary revisions and no commits
+
+expecting success of 9116.15 'test descending revision range with unreachable boundary revisions and no commits': 
+	git reset --hard origin/trunk &&
+	git svn log -r 6:5 | test_cmp expected-separator -
+	
+HEAD is now at a75683e aye
+ok 15 - test descending revision range with unreachable boundary revisions and no commits
 
-expecting success of 9135.2 'clone using git svn': git svn clone -s "$svnrepo" x
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
-r1 = 95fd3e2836f1e85e561fac0a2e36e69d5791ab79 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
-Found branch parent: (refs/remotes/origin/branch-b) 95fd3e2836f1e85e561fac0a2e36e69d5791ab79
-Following parent with do_switch
-Successfully followed parent
-r2 = a8dd33edcb1c8e191fbd957b5a2329db05bbf481 (refs/remotes/origin/branch-b)
-	A	b1
-r3 = ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8 (refs/remotes/origin/branch-b)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
-Found branch parent: (refs/remotes/origin/branch-c) 95fd3e2836f1e85e561fac0a2e36e69d5791ab79
-Following parent with do_switch
-Successfully followed parent
-r4 = 6c2c7a26dbe84bea6f0312cbdb1695092fdf78eb (refs/remotes/origin/branch-c)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
-Found branch parent: (refs/remotes/origin/branch-c) ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8
-Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-rereading ea3c1dbb699f173f8ec8bbde489d6e657db0f0d8
-Following parent with do_switch
-Successfully followed parent
-r6 = 5560e4a7c722d2d76abd53e8385dafca8096bf38 (refs/remotes/origin/branch-c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
-ok 2 - clone using git svn
+expecting success of 9116.16 'test ascending revision range with unreachable boundary revisions and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
+	
+HEAD is now at a75683e aye
+ok 16 - test ascending revision range with unreachable boundary revisions and 1 commit
 
-expecting success of 9135.3 'test that b1 exists and is empty': 
-	(
-		cd x &&
-		git reset --hard origin/branch-c &&
-		test_must_be_empty b1
-	)
+expecting success of 9116.17 'test descending revision range with unreachable boundary revisions and 1 commit': 
+	git reset --hard origin/trunk &&
+	git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
 	
-HEAD is now at 5560e4a branch-c off of branch-b
-ok 3 - test that b1 exists and is empty
+HEAD is now at a75683e aye
+ok 17 - test descending revision range with unreachable boundary revisions and 1 commit
 
-# passed all 3 test(s)
-1..3
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9136-git-svn-recreated-branch-empty-file.sh ***
@@ -524899,9 +524836,9 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = f3449e4af709c4d1c28ca13f29e7815e3caf2e7f (refs/remotes/git-svn)
+r1 = c0d1f7aa56bcd61cb16ca1756f3e2ca736188c78 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 156b22dd3a4a562ea77a478c355597257004f977 (refs/remotes/git-svn)
+r2 = cb320f13e4818182bdd428748cb78a207b21ff80 (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -524918,8 +524855,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1776626740 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1776626740 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1742218220 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1742218220 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success of 9130.4 'continues to import once authors have been added': 
@@ -524935,17 +524872,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = ed3febdda9f6a76df8ed2016e366d9815db3489c (refs/remotes/git-svn)
+r3 = 691d6e6b25b147a629434a18c58a9a05e22d7880 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 517cc637fa0475a3665c2e9ec8bff2d3c4749f5e (refs/remotes/git-svn)
+r4 = 74fcc8da2640be9d303e00e1e0597dde486a0a9e (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r4
 creating empty directory: aa
 creating empty directory: bb
 creating empty directory: cc
 creating empty directory: dd
-author DDDDDDD DDDDDDD <dd@example.com> 1776626740 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1776626740 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1742218220 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1742218220 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success of 9130.5 'authors-file against globs': 
@@ -524962,7 +524899,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = 3a790237aa230a9aaaad62f821ca21ce45fcbe90 (refs/remotes/origin/trunk)
+r5 = f47a4f7ded9510c636ab6c4c6227dfb5aa442608 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -524976,7 +524913,7 @@
 expecting success of 9130.6 'fetch fails on ee': 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = edefe26ffc16a61febe94276c19bf9e69d92d9b3 (refs/remotes/origin/bb)
+r6 = 80698647796f67acbf4450358ca9ee7c2ecd466b (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -524998,8 +524935,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = 42614386acf4ed0b26b122b62e53c2a4262ae5f6 (refs/remotes/origin/ee)
-r8 = 7a2d4e09a5015e0c57f9b4eed16204d88c4aa31e (refs/remotes/origin/cc)
+r7 = 6c3f5ee03685313518f49677dd8410c4450d0f8f (refs/remotes/origin/ee)
+r8 = be18de29d5a622f591b4c79f6a804304c2fea63a (refs/remotes/origin/cc)
 ok 8 - fetch continues after authors-file is fixed
 
 expecting success of 9130.9 'fresh clone with svn.authors-file in config': 
@@ -525022,23 +524959,23 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = f3449e4af709c4d1c28ca13f29e7815e3caf2e7f (refs/remotes/git-svn)
+r1 = c0d1f7aa56bcd61cb16ca1756f3e2ca736188c78 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 156b22dd3a4a562ea77a478c355597257004f977 (refs/remotes/git-svn)
+r2 = cb320f13e4818182bdd428748cb78a207b21ff80 (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = ed3febdda9f6a76df8ed2016e366d9815db3489c (refs/remotes/git-svn)
+r3 = 691d6e6b25b147a629434a18c58a9a05e22d7880 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 517cc637fa0475a3665c2e9ec8bff2d3c4749f5e (refs/remotes/git-svn)
+r4 = 74fcc8da2640be9d303e00e1e0597dde486a0a9e (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = 5333df7fb74084dff7eaaaf1983fca761db4153a (refs/remotes/git-svn)
+r5 = 3d729986434d545979c7f551a3431d3aa0a5d2c1 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = 5060bfc30dd69847b5df68f9c0b39a4b8ab3ec57 (refs/remotes/git-svn)
+r6 = 6a842469dbe715d4086e52dee617350093ceacce (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = 7ccb1fed268004f060d781b7874f9364afff6924 (refs/remotes/git-svn)
+r7 = 780a5e121afde521ecc44ab88dd3c72e0f964162 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 47b45af78a28433a155c8baaa03fb033c254e96e (refs/remotes/git-svn)
+r8 = a7f48a7e248d874922a4617e42736a34b2797389 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -525064,14 +525001,57 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = 8b0526e9ec834b884c15086d45205ea934f432f9 (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1776626757 +0000
+r9 = b67fa8ccba94b04c6618f567a31a2461cf37a298 (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1742218244 +0000
 ok 10 - authors-file imported user without email
 
 # passed all 10 test(s)
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9142-git-svn-shallow-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9142-git-svn-shallow-clone/.git/
+expecting success of 9142.1 'setup test repository': 
+	svn_cmd mkdir -m "create standard layout" \
+	  "$svnrepo"/trunk "$svnrepo"/branches "$svnrepo"/tags &&
+	svn_cmd cp -m "branch off trunk" \
+	  "$svnrepo"/trunk "$svnrepo"/branches/a &&
+	svn_cmd co "$svnrepo"/branches/a &&
+	(
+		cd a &&
+		> foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "add foo"
+	) &&
+	maybe_start_httpd
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+ok 1 - setup test repository
+
+expecting success of 9142.2 'clone trunk with "-r HEAD"': 
+	git svn clone -r HEAD "$svnrepo/trunk" g &&
+	( cd g && git rev-parse --symbolic --verify HEAD )
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
+r1 = 3e718c975f768f16f5d1f7e482140028f276144f (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
+HEAD
+ok 2 - clone trunk with "-r HEAD"
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9137-git-svn-dcommit-clobber-series.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
 expecting success of 9137.1 'initialize repo': 
@@ -525088,7 +525068,7 @@
 Committing transaction...
 Committed revision 1.
 	A	file
-r1 = ab1afd38b51e9f1925d98d73bca54ef31a916d0d (refs/remotes/git-svn)
+r1 = 02d3070a7846677b313a897bc66504b0613b4f0e (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
 ok 1 - initialize repo
@@ -525121,11 +525101,11 @@
 	echo bye >> life &&
 	git commit -m bye-life life
 	
-[master 00c85c5] hi-life
+[master 60595cd] hi-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 life
-[master 7c07d8f] bye-life
+[master 63d78da] bye-life
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 3 - some unrelated changes to git
@@ -525146,7 +525126,7 @@
 		test x"$(sed -n -e 58p < file)" = x5588 &&
 		test x"$(sed -n -e 61p < file)" = x6611
 	
-[master ac50b3c] 4 => 4444, 7 => 7777
+[master 5bd0451] 4 => 4444, 7 => 7777
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 Duplicate specification "id|i=s" for option "i"
@@ -525154,24 +525134,24 @@
 	A	life
 Committed r3
 	M	file
-r2 = b7d4586c2a557bce38f0bc7e9b8eafccfed5956f (refs/remotes/git-svn)
+r2 = 96ee72d2d41396a8f014166238e5c6f62b9890e6 (refs/remotes/git-svn)
 	A	life
-r3 = fb79618d14c83a50f086448ebd8e9dff2417959f (refs/remotes/git-svn)
-W: 00c85c59b414552659813682ff197813478cb54d and refs/remotes/git-svn differ, using rebase:
+r3 = c71b7dee6c3cb5b1872e0cc6214c3f800f597e9a (refs/remotes/git-svn)
+W: 60595cde4c66afdc8c296bd3f4a4179c2dee2ae4 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-warning: skipped previously applied commit 00c85c5
+warning: skipped previously applied commit 60595cd
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
 	M	life
 Committed r4
 	M	life
-r4 = 53003ab0a5db8f685c84682175974e0397c61add (refs/remotes/git-svn)
+r4 = b4faf09bd2dac8bda807fc013b0be440057201d9 (refs/remotes/git-svn)
 	M	file
 Committed r5
 	M	file
-r5 = e373d9100fa8e62e9b9f91797931ac2906e0fe12 (refs/remotes/git-svn)
-No changes between 9ffa276a88d64146d8a12177e2f7c3a4520075ba and refs/remotes/git-svn
+r5 = 515bcd3634ee0304f07b09638792c826cd5cc8a8 (refs/remotes/git-svn)
+No changes between fa9b7c5a1b14b43be856a2ca9f7c8e4f0f01e3fa and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating 'tmp':
 U    tmp/file
@@ -525194,49 +525174,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9142-git-svn-shallow-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9142-git-svn-shallow-clone/.git/
-expecting success of 9142.1 'setup test repository': 
-	svn_cmd mkdir -m "create standard layout" \
-	  "$svnrepo"/trunk "$svnrepo"/branches "$svnrepo"/tags &&
-	svn_cmd cp -m "branch off trunk" \
-	  "$svnrepo"/trunk "$svnrepo"/branches/a &&
-	svn_cmd co "$svnrepo"/branches/a &&
-	(
-		cd a &&
-		> foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "add foo"
-	) &&
-	maybe_start_httpd
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-ok 1 - setup test repository
-
-expecting success of 9142.2 'clone trunk with "-r HEAD"': 
-	git svn clone -r HEAD "$svnrepo/trunk" g &&
-	( cd g && git rev-parse --symbolic --verify HEAD )
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = 1660bb26e2952419538262f64d20251eea8d67d9 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
-HEAD
-ok 2 - clone trunk with "-r HEAD"
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9138-git-svn-authors-prog.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9138-git-svn-authors-prog/.git/
 expecting success of 9138.1 'svn-authors setup': 
@@ -525272,17 +525209,17 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9138-git-svn-authors-prog/x/.git/
 W: +empty_dir: aa
-r1 = 421a8021cc7724ae3b641d8a163b9e7b757f2729 (refs/remotes/git-svn)
+r1 = 412fe7b933575bbdf521a0a47ab726ff6fc6829b (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = 8a4fdc84d63ec485fec72d515110e706177ff57a (refs/remotes/git-svn)
+r2 = cfac1146dd3732fe6b900744287c47acb4a80c06 (refs/remotes/git-svn)
 W: +empty_dir: cc-sub
-r3 = b456283e2726f63b6577a44e71a866a7f8a6a3e9 (refs/remotes/git-svn)
+r3 = 804daaf6b7b13e4e2bfd2a8b931664f7f8212986 (refs/remotes/git-svn)
 W: +empty_dir: dd-sub
-r4 = 209f0a4397c97456c0a095503be940e5248a1629 (refs/remotes/git-svn)
+r4 = f4e6434891b928e4911db378107709a3adcf2c70 (refs/remotes/git-svn)
 W: +empty_dir: ee-foo
-r5 = ea40f9bec42a23146d3cba3970b33c83a9facf5f (refs/remotes/git-svn)
+r5 = 0fedeeee2932a1a1d3d04b94b2d2f96b786815ca (refs/remotes/git-svn)
 W: +empty_dir: ff
-r6 = e6f4028effeaae2f2565accb68c0997ab6d9a789 (refs/remotes/git-svn)
+r6 = 147a1a8d7f7166694bf6f0e732325c7e1c89e310 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
 creating empty directory: aa
@@ -525317,11 +525254,11 @@
 		grep "^author aa <aa@example\.com> " actual
 	)
 
-author ee-foo <ee-foo@example.com> 1776626754 +0000
-author dd <dd@sub.example.com> 1776626753 +0000
-author cc <cc@sub.example.com> 1776626753 +0000
-author bb <bb@example.com> 1776626753 +0000
-author aa <aa@example.com> 1776626753 +0000
+author ee-foo <ee-foo@example.com> 1742218240 +0000
+author dd <dd@sub.example.com> 1742218240 +0000
+author cc <cc@sub.example.com> 1742218240 +0000
+author bb <bb@example.com> 1742218240 +0000
+author aa <aa@example.com> 1742218240 +0000
 ok 5 - authors-prog ran correctly
 
 expecting success of 9138.6 'authors-file overrode authors-prog': 
@@ -525331,7 +525268,7 @@
 		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
 	)
 
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1776626754 +0000
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1742218240 +0000
 ok 6 - authors-file overrode authors-prog
 
 expecting success of 9138.7 'authors-prog imported user without email': 
@@ -525346,8 +525283,8 @@
 Committing transaction...
 Committed revision 7.
 W: +empty_dir: gg
-r7 = c99b8962494f2d5264973d73883bfd95fe105120 (refs/remotes/git-svn)
-author gg <> 1776626757 +0000
+r7 = cc26774a51bd2cbce0384d6804f05b8022d68aac (refs/remotes/git-svn)
+author gg <> 1742218245 +0000
 ok 7 - authors-prog imported user without email
 
 expecting success of 9138.8 'imported without authors-prog and authors-file': 
@@ -525364,8 +525301,8 @@
 Committing transaction...
 Committed revision 8.
 W: +empty_dir: hh
-r8 = f5d9d614e1abd8465108745156f9be1c2bd432b9 (refs/remotes/git-svn)
-author hh <hh@97752a86-cd82-4e2e-956f-c6a3985d639d> 1776626759 +0000
+r8 = 9a3880f031dc32ebf622d24bd102c28ccdcab59f (refs/remotes/git-svn)
+author hh <hh@703a933f-fe80-4085-8cb9-ea8fd13161fc> 1742218248 +0000
 ok 8 - imported without authors-prog and authors-file
 
 expecting success of 9138.9 'authors-prog handled special characters in username': 
@@ -525381,14 +525318,241 @@
 Committing transaction...
 Committed revision 9.
 W: +empty_dir: bad
-r9 = e6929c0cd662c2ca9effc36fcf40b906e4934ae9 (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1776626761 +0000
+r9 = d12578166debfa627ae92a650b1faba2deac5c57 (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1742218250 +0000
 ok 9 - authors-prog handled special characters in username
 
 # passed all 9 test(s)
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9134-git-svn-ignore-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/.git/
+expecting success of 9134.1 'setup test repository': 
+	svn_cmd co "$svnrepo" s &&
+	(
+		cd s &&
+		mkdir qqq www &&
+		echo test_qqq > qqq/test_qqq.txt &&
+		echo test_www > www/test_www.txt &&
+		svn_cmd add qqq &&
+		svn_cmd add www &&
+		svn_cmd commit -m "create some files" &&
+		svn_cmd up &&
+		echo hi >> www/test_www.txt &&
+		svn_cmd commit -m "modify www/test_www.txt" &&
+		svn_cmd up
+	)
+
+Checked out revision 0.
+A         qqq
+A         qqq/test_qqq.txt
+A         www
+A         www/test_www.txt
+Adding         qqq
+Adding         qqq/test_qqq.txt
+Adding         www
+Adding         www/test_www.txt
+Transmitting file data ..done
+Committing transaction...
+Committed revision 1.
+Updating '.':
+At revision 1.
+Sending        www/test_www.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Updating '.':
+At revision 2.
+ok 1 - setup test repository
+
+expecting success of 9134.2 'clone an SVN repository with ignored www directory': 
+	git svn clone --ignore-paths="^www" "$svnrepo" g &&
+	echo test_qqq > expect &&
+	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
+	test_cmp expect expect2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
+	A	qqq/test_qqq.txt
+r1 = 88bc8a7f45c030bbccfbbbcdb51e065665155789 (refs/remotes/git-svn)
+r2 = df13a46854b5ee2929a09c833f8b52e7e4ff0054 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
+ok 2 - clone an SVN repository with ignored www directory
+
+expecting success of 9134.3 'init+fetch an SVN repository with ignored www directory': 
+	git svn init "$svnrepo" c &&
+	( cd c && git svn fetch --ignore-paths="^www" ) &&
+	rm expect2 &&
+	echo test_qqq > expect &&
+	for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
+	test_cmp expect expect2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
+	A	qqq/test_qqq.txt
+r1 = 88bc8a7f45c030bbccfbbbcdb51e065665155789 (refs/remotes/git-svn)
+r2 = df13a46854b5ee2929a09c833f8b52e7e4ff0054 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
+ok 3 - init+fetch an SVN repository with ignored www directory
+
+expecting success of 9134.4 'verify ignore-paths config saved by clone': 
+	(
+	    cd g &&
+	    git config --get svn-remote.svn.ignore-paths | grep www
+	)
+
+^www
+ok 4 - verify ignore-paths config saved by clone
+
+expecting success of 9134.5 'SVN-side change outside of www': 
+	(
+		cd s &&
+		echo b >> qqq/test_qqq.txt &&
+		svn_cmd commit -m "SVN-side change outside of www" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep "SVN-side change outside of www"
+	)
+
+Sending        qqq/test_qqq.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Updating '.':
+At revision 3.
+SVN-side change outside of www
+ok 5 - SVN-side change outside of www
+
+expecting success of 9134.6 'update git svn-cloned repo (config ignore)': 
+	(
+		cd g &&
+		git svn rebase &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+	M	qqq/test_qqq.txt
+r3 = 2395249afffba6d0eba366e3bccd24ad952a082d (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 6 - update git svn-cloned repo (config ignore)
+
+expecting success of 9134.7 'update git svn-cloned repo (option ignore)': 
+	(
+		cd c &&
+		git svn rebase --ignore-paths="^www" &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+	M	qqq/test_qqq.txt
+r3 = 2395249afffba6d0eba366e3bccd24ad952a082d (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 7 - update git svn-cloned repo (option ignore)
+
+expecting success of 9134.8 'SVN-side change inside of ignored www': 
+	(
+		cd s &&
+		echo zaq >> www/test_www.txt &&
+		svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep -F "SVN-side change inside of www/test_www.txt"
+	)
+
+Sending        www/test_www.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 4.
+Updating '.':
+At revision 4.
+SVN-side change inside of www/test_www.txt
+ok 8 - SVN-side change inside of ignored www
+
+expecting success of 9134.9 'update git svn-cloned repo (config ignore)': 
+	(
+		cd g &&
+		git svn rebase &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+r4 = 4238a1e6bb14d1f2684961a151276b9793ff47e7 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 9 - update git svn-cloned repo (config ignore)
+
+expecting success of 9134.10 'update git svn-cloned repo (option ignore)': 
+	(
+		cd c &&
+		git svn rebase --ignore-paths="^www" &&
+		printf "test_qqq\nb\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+r4 = 4238a1e6bb14d1f2684961a151276b9793ff47e7 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 10 - update git svn-cloned repo (option ignore)
+
+expecting success of 9134.11 'SVN-side change in and out of ignored www': 
+	(
+		cd s &&
+		echo cvf >> www/test_www.txt &&
+		echo ygg >> qqq/test_qqq.txt &&
+		svn_cmd commit -m "SVN-side change in and out of ignored www" &&
+		svn_cmd up &&
+		svn_cmd log -v | grep "SVN-side change in and out of ignored www"
+	)
+
+Sending        qqq/test_qqq.txt
+Sending        www/test_www.txt
+Transmitting file data ..done
+Committing transaction...
+Committed revision 5.
+Updating '.':
+At revision 5.
+SVN-side change in and out of ignored www
+ok 11 - SVN-side change in and out of ignored www
+
+expecting success of 9134.12 'update git svn-cloned repo again (config ignore)': 
+	(
+		cd g &&
+		git svn rebase &&
+		printf "test_qqq\nb\nygg\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+	M	qqq/test_qqq.txt
+r5 = aae31b56493949d86cb79062717e74475a0f5735 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 12 - update git svn-cloned repo again (config ignore)
+
+expecting success of 9134.13 'update git svn-cloned repo again (option ignore)': 
+	(
+		cd c &&
+		git svn rebase --ignore-paths="^www" &&
+		printf "test_qqq\nb\nygg\n" > expect &&
+		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
+		test_cmp expect2 expect &&
+		rm expect expect2
+	)
+
+	M	qqq/test_qqq.txt
+r5 = aae31b56493949d86cb79062717e74475a0f5735 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+ok 13 - update git svn-cloned repo again (option ignore)
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9100-git-svn-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9100-git-svn-basic/.git/
 expecting success of 9100.1 'git svn --version works anywhere': 
@@ -525664,7 +525828,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 7aef8851cabe2893d0530546cdccc76e0280245a (refs/remotes/git-svn)
+r1 = 99cd491db33fd95fc6fc130c47ed509b7101dc71 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -525696,7 +525860,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch f80bd14] try a deep --rmdir with a commit
+[mybranch a791f98] try a deep --rmdir with a commit
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  rename dir/{a/b/c/d/e => }/file (100%)
@@ -525713,7 +525877,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = 8e7293fcbc4c51689a9f4032379c1cc400b3562a (refs/remotes/git-svn)
+r2 = 8c0fc14d6616088be4650508cc62b802bdad0df0 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
 D    .git/svn/refs/remotes/git-svn/svn-tree/dir/a
@@ -525732,7 +525896,7 @@
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
 
-[mybranch 7b1a8b7] detect node change from file to directory #1
+[mybranch 01c56f7] detect node change from file to directory #1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename dir/{ => file}/file (100%)
@@ -525752,7 +525916,7 @@
 		remotes/git-svn..mybranch2
 
 Switched to a new branch 'mybranch2'
-[mybranch2 1579c55] detect node change from directory to file #1
+[mybranch2 c646ca4] detect node change from directory to file #1
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename bar/zzz => bar (100%)
@@ -525776,7 +525940,7 @@
 	test -e "$SVN_TREE"/bar/zzz/yyy
 
 Switched to a new branch 'mybranch3'
-[mybranch3 ad14add] detect node change from file to directory #2
+[mybranch3 56bec9a] detect node change from file to directory #2
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 bar/zzz
@@ -525785,7 +525949,7 @@
 	A	bar/zzz/yyy
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 63f13457bb0a4bc084c5027f03d100d76c248ca8 (refs/remotes/git-svn)
+r3 = c35e01ccd9eae8ad2a7f89764eff5931f2760697 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
 D    .git/svn/refs/remotes/git-svn/svn-tree/bar/zzz
@@ -525807,13 +525971,13 @@
 		remotes/git-svn..mybranch4
 
 Switched to a new branch 'mybranch4'
-[mybranch4 68dd3d6] detect node change from directory to file #2
+[mybranch4 69c0ac7] detect node change from directory to file #2
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+), 1 deletion(-)
  create mode 100644 dir
  delete mode 100644 dir/file
 	D	dir/file
-Item already exists in filesystem: File already exists: filesystem '88666646-cd79-4ad9-b500-f9a20464ac23', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.49.0+next.20250314/perl/build/lib/Git/SVN.pm line 2079.
+Item already exists in filesystem: File already exists: filesystem '3b4ad273-2804-4548-96a8-c5fb2b8a00dd', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.49.0+next.20250314/perl/build/lib/Git/SVN.pm line 2079.
 
 ok 10 - detect node change from directory to file #2
 
@@ -525828,13 +525992,13 @@
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh
 Switched to a new branch 'mybranch5'
-[mybranch5 0672018] remove executable bit from a file
+[mybranch5 ed40026] remove executable bit from a file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  mode change 100755 => 100644 exec.sh
 	M	exec.sh
 	M	exec.sh
-r4 = 6ce1259def53558766b700a4ef1f7cdd2ec75f49 (refs/remotes/git-svn)
+r4 = caddd94f06a67f138b7f90f757d2a9965113ea4d (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
  U   .git/svn/refs/remotes/git-svn/svn-tree/exec.sh
@@ -525849,13 +526013,13 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh
-[mybranch5 f0ecfa5] add executable bit back file
+[mybranch5 4a935aa] add executable bit back file
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  mode change 100644 => 100755 exec.sh
 	M	exec.sh
 	M	exec.sh
-r5 = f4a42b358f3ba02c38677542624a45249c04b719 (refs/remotes/git-svn)
+r5 = a828a954bf0d90b8579f43157bb4fcf0917a425a (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
  U   .git/svn/refs/remotes/git-svn/svn-tree/exec.sh
@@ -525881,7 +526045,7 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh
-[mybranch5 af0aba7] executable file becomes a symlink to file
+[mybranch5 46bf447] executable file becomes a symlink to file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  mode change 100755 => 120000 exec.sh
@@ -525890,7 +526054,7 @@
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 0552506bac3cdd1df4919d8801cdb0b3fc8f5740 (refs/remotes/git-svn)
+r6 = 79b756b3f728fadef8cc996cc2e4275b359e7113 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
 D    .git/svn/refs/remotes/git-svn/svn-tree/exec.sh
@@ -525908,7 +526072,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 f12c237] new symlink is added to a file that was also just made executable
+[mybranch5 e1b7fc7] new symlink is added to a file that was also just made executable
  Author: A U Thor <author@example.com>
  2 files changed, 1 insertion(+)
  create mode 120000 exec-2.sh
@@ -525917,7 +526081,7 @@
 	M	file
 	A	exec-2.sh
 	M	file
-r7 = 36f75fd8fe4f8610b066d53dc549452d174adb0b (refs/remotes/git-svn)
+r7 = b0aedccc46a5d333098b1c5142a36eaa82cfdc2f (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
 A    .git/svn/refs/remotes/git-svn/svn-tree/exec-2.sh
@@ -525937,7 +526101,7 @@
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 166161e] modify a symlink to become a file
+[mybranch5 dc9bbb9] modify a symlink to become a file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
  mode change 120000 => 100644 exec-2.sh
@@ -525946,7 +526110,7 @@
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 6010298e2f8f617f49e4791634f82f27c789da59 (refs/remotes/git-svn)
+r8 = 60bf29fc552d42aee47cf53cc73ac2705d46dab6 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 Updating '.git/svn/refs/remotes/git-svn/svn-tree':
 D    .git/svn/refs/remotes/git-svn/svn-tree/exec-2.sh
@@ -525959,12 +526123,12 @@
 	git update-index exec-2.sh &&
 	git commit -m 'éï�' &&
 	git svn set-tree HEAD
-[mybranch5 2cb5290] éï�
+[mybranch5 1264067] éï�
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	exec-2.sh
 	M	exec-2.sh
-r9 = d98e1c8a4ec0341703c0976bb79dab84ae4812ea (refs/remotes/git-svn)
+r9 = 6e4a41b6937c5cd9f8b0aa14de7335292122cfe8 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 ok 16 - commit with UTF-8 message: locale: C.utf8
 
@@ -525979,33 +526143,33 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 7aef8851cabe2893d0530546cdccc76e0280245a (refs/remotes/alt)
+r1 = 99cd491db33fd95fc6fc130c47ed509b7101dc71 (refs/remotes/alt)
 	D	dir/a/b/c/d/e/file
 	D	dir/a/
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = b38af4381cd315c2325d8a013a4e6b438da96059 (refs/remotes/alt)
+r2 = 5b68891e85d3447a70becf6e34291c8eba71c105 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 09c2e5a092f9e0b8633b4566a868f7c01010ecf5 (refs/remotes/alt)
+r3 = b1e2540a1b1f98d4815022426981651e3786eb0f (refs/remotes/alt)
 	M	exec.sh
-r4 = 8a13dcbc9bb3da2a2ac44946877e322d1c0a0319 (refs/remotes/alt)
+r4 = e33726ff0a1883b49e450c55965a8641700eb8f6 (refs/remotes/alt)
 	M	exec.sh
-r5 = 2e4e164b677f88a2373e6990aa1d47e34434420d (refs/remotes/alt)
+r5 = de4040da0d77fc7a9e1748924d242d8d97117aaf (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 365339aec49a29a21463f65cf3aa247e22702105 (refs/remotes/alt)
+r6 = 9670cf54b7c3bd38f6aadc34cc68c1563b4bfb61 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = e69e5215063d6523917bb09f288ae188ff594334 (refs/remotes/alt)
+r7 = a4c42b904a0e180f2dacc6e22643b0b81401bad9 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 90aa706833c53d53169ef68045699f8d23c0e756 (refs/remotes/alt)
+r8 = e6163ce4226c17afd632aebc1cf5c9c95aa2dd6b (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 07ff3ce1ce083e1314ae6373ed2534c313875f35 (refs/remotes/alt)
+r9 = e6ab5cca19f9954be8bf50095935e3827b510842 (refs/remotes/alt)
 ok 17 - test fetch functionality (svn => git) with alternate GIT_SVN_ID
 
 expecting success of 9100.18 'check imported tree checksums expected tree checksums': 
@@ -526072,16 +526236,16 @@
 	git branch -D my-bar
 	
 	A	zzz
-r1 = 4de02caaecce94e38079c591dcb6de3c20eb19a3 (refs/remotes/bar)
+r1 = 0b5e017caa98464889ba849822c8068c480f3cdb (refs/remotes/bar)
 	D	zzz
 	A	zzz/yyy
-r3 = dcd37a160b298b416d182d49e2247d37fd64a94d (refs/remotes/bar)
+r3 = f9ae1a92b7e0fc573a8d0ff663171c604b180a03 (refs/remotes/bar)
 Switched to a new branch 'my-bar'
-[my-bar 978b6f8] change 1
+[my-bar d6e91bd] change 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[my-bar d002139] change 2
+[my-bar 2461f4e] change 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -526089,14 +526253,14 @@
 	A	foo
 Committed r10
 	A	foo
-r10 = a9135ac909c456712899c0ef4a52897ded1bb9b8 (refs/remotes/bar)
-No changes between 978b6f8e9b7c5a2f275ec59b183a2d93daff10c4 and refs/remotes/bar
+r10 = e3b53675c30f5a10748a925eb61a25056bcc1817 (refs/remotes/bar)
+No changes between d6e91bdf6ef2a96b10a9d2b229b2e60c530f206b and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 dcommitted on a detached HEAD because you gave a revision argument.
-The rewritten commit is: a9135ac909c456712899c0ef4a52897ded1bb9b8
+The rewritten commit is: e3b53675c30f5a10748a925eb61a25056bcc1817
     change 1
 Switched to branch 'main'
-Deleted branch my-bar (was d002139).
+Deleted branch my-bar (was 2461f4e).
 ok 22 - dcommit $rev does not clobber current branch
 
 expecting success of 9100.23 'able to dcommit to a subdirectory': 
@@ -526120,9 +526284,9 @@
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
 	A	bar/foo
-r10 = 73c34c388a915afb5bf0412c29214f2062280386 (refs/remotes/alt)
+r10 = b08bcc1a53daa6c10f84944e974674e9239e1d66 (refs/remotes/alt)
 Switched to a new branch 'my-bar'
-[my-bar 07b5803] /bar/d should be in the log
+[my-bar 36c6d33] /bar/d should be in the log
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 d
@@ -526131,10 +526295,10 @@
 	A	d
 Committed r11
 	A	d
-r11 = 1ee3c7b75dbf730205e8ec2babd8e3206a2a9646 (refs/remotes/bar)
-No changes between 07b5803aba04c45643f7ac052d3c77628df2d169 and refs/remotes/bar
+r11 = 3c48635dede9f575d0632eb2661eb336cd2cc2c5 (refs/remotes/bar)
+No changes between 36c6d33617dffb17b88dcf6af4912efe0d1c60d5 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 3e4c920] add a new directory
+[my-bar b91282e] add a new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 newdir/dir
@@ -526143,10 +526307,10 @@
 	A	newdir/dir
 Committed r12
 	A	newdir/dir
-r12 = 42ccec225c0041f122b77abb0793fda196e80226 (refs/remotes/bar)
-No changes between 3e4c9207ee97027978dfa81ea9a2b2d4b66fb1ce and refs/remotes/bar
+r12 = 64d9fba62d62acd83131fd1b0040a710626ad884 (refs/remotes/bar)
+No changes between b91282ea919261ce8cc88b559ec449738e9454a0 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar f6546c9] modify a file in new directory
+[my-bar a521176] modify a file in new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -526154,8 +526318,8 @@
 	M	newdir/dir
 Committed r13
 	M	newdir/dir
-r13 = e877c32c20f211c1c47bb4e6a2c95b53686ecb15 (refs/remotes/bar)
-No changes between f6546c9cbdfa9e673a08d548b2d56cd14909bdc0 and refs/remotes/bar
+r13 = 0513f2dc788aef914e880261524df76986416760 (refs/remotes/bar)
+No changes between a521176ddfa628d3a1f2e03f99eca1371616f251 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 23 - able to dcommit to a subdirectory
 
@@ -526164,7 +526328,7 @@
 	test-tool chmtime =-60 foo &&
 	git svn dcommit
 
-[my-bar 46fe57d] commit-new-file-foo2
+[my-bar d83d388] commit-new-file-foo2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo2
@@ -526173,8 +526337,8 @@
 	A	foo2
 Committed r14
 	A	foo2
-r14 = 9c46543230ea649d5eeca1cc816bc3729e5b5aa9 (refs/remotes/bar)
-No changes between 46fe57db0c7dab5aee18fb2c93250c766c2f9fb7 and refs/remotes/bar
+r14 = 37393ea45568a8c0dee821edc0f29808dcf663a5 (refs/remotes/bar)
+No changes between d83d3880c786ce9c2492aa8ade157fe6c8780bc3 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 24 - dcommit should not fail with a touched file
 
@@ -526192,12 +526356,12 @@
 	git svn set-tree -i bar HEAD &&
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-[my-bar 22eb961] update /bar/d
+[my-bar 7ffed3c] update /bar/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 	M	d
 	M	d
-r15 = aa32bba1dfc8c322abc40a4283e0007d01687fed (refs/remotes/bar)
+r15 = c69c627837a5e1c18311f752b474c09627fdc6e3 (refs/remotes/bar)
 Done committing 1 revisions to SVN
 ok 26 - able to set-tree to a subdirectory
 
@@ -526215,45 +526379,45 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 7aef8851cabe2893d0530546cdccc76e0280245a (refs/remotes/alt)
+r1 = 99cd491db33fd95fc6fc130c47ed509b7101dc71 (refs/remotes/alt)
 	D	dir/a/b/c/d/e/file
 	D	dir/a/
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = b38af4381cd315c2325d8a013a4e6b438da96059 (refs/remotes/alt)
+r2 = 5b68891e85d3447a70becf6e34291c8eba71c105 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 09c2e5a092f9e0b8633b4566a868f7c01010ecf5 (refs/remotes/alt)
+r3 = b1e2540a1b1f98d4815022426981651e3786eb0f (refs/remotes/alt)
 	M	exec.sh
-r4 = 8a13dcbc9bb3da2a2ac44946877e322d1c0a0319 (refs/remotes/alt)
+r4 = e33726ff0a1883b49e450c55965a8641700eb8f6 (refs/remotes/alt)
 	M	exec.sh
-r5 = 2e4e164b677f88a2373e6990aa1d47e34434420d (refs/remotes/alt)
+r5 = de4040da0d77fc7a9e1748924d242d8d97117aaf (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 365339aec49a29a21463f65cf3aa247e22702105 (refs/remotes/alt)
+r6 = 9670cf54b7c3bd38f6aadc34cc68c1563b4bfb61 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = e69e5215063d6523917bb09f288ae188ff594334 (refs/remotes/alt)
+r7 = a4c42b904a0e180f2dacc6e22643b0b81401bad9 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 90aa706833c53d53169ef68045699f8d23c0e756 (refs/remotes/alt)
+r8 = e6163ce4226c17afd632aebc1cf5c9c95aa2dd6b (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 07ff3ce1ce083e1314ae6373ed2534c313875f35 (refs/remotes/alt)
+r9 = e6ab5cca19f9954be8bf50095935e3827b510842 (refs/remotes/alt)
 	A	bar/foo
-r10 = 73c34c388a915afb5bf0412c29214f2062280386 (refs/remotes/alt)
+r10 = b08bcc1a53daa6c10f84944e974674e9239e1d66 (refs/remotes/alt)
 	A	bar/d
-r11 = 7a661a3ec5253da78b785154ca642c342c01b062 (refs/remotes/alt)
+r11 = c7ca5b859d7740c2a5b0954e5c45ee15e2d06daa (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = 22355af68a5eb9558f256fd8248f1cab966dc00b (refs/remotes/alt)
+r12 = 92984a45a886457fb61732426f786dff8a74ca29 (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = e1a6f00953f866d04318660a8ceea079c9b4912c (refs/remotes/alt)
+r13 = 514be481324a419543f0eb67acd0a4f22dfcd26e (refs/remotes/alt)
 	A	bar/foo2
-r14 = 57a4f5c77261ebd8db718c0709eda0450b542657 (refs/remotes/alt)
+r14 = 6a01efc0b32203cad731a64ae969fce4f3811744 (refs/remotes/alt)
 	M	bar/d
-r15 = 844e85a415355a071aa590be1386f72de56adc70 (refs/remotes/alt)
+r15 = 7718c40d3818b826a34359e3b227fa1dfe36322e (refs/remotes/alt)
 ok 27 - git-svn works in a bare repository
 
 expecting success of 9100.28 'git-svn works in a repository with a gitdir: link': 
@@ -526271,278 +526435,51 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 7aef8851cabe2893d0530546cdccc76e0280245a (refs/remotes/alt)
+r1 = 99cd491db33fd95fc6fc130c47ed509b7101dc71 (refs/remotes/alt)
 	D	dir/a/b/c/d/e/file
 	D	dir/a/
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = b38af4381cd315c2325d8a013a4e6b438da96059 (refs/remotes/alt)
+r2 = 5b68891e85d3447a70becf6e34291c8eba71c105 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 09c2e5a092f9e0b8633b4566a868f7c01010ecf5 (refs/remotes/alt)
+r3 = b1e2540a1b1f98d4815022426981651e3786eb0f (refs/remotes/alt)
 	M	exec.sh
-r4 = 8a13dcbc9bb3da2a2ac44946877e322d1c0a0319 (refs/remotes/alt)
+r4 = e33726ff0a1883b49e450c55965a8641700eb8f6 (refs/remotes/alt)
 	M	exec.sh
-r5 = 2e4e164b677f88a2373e6990aa1d47e34434420d (refs/remotes/alt)
+r5 = de4040da0d77fc7a9e1748924d242d8d97117aaf (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 365339aec49a29a21463f65cf3aa247e22702105 (refs/remotes/alt)
+r6 = 9670cf54b7c3bd38f6aadc34cc68c1563b4bfb61 (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = e69e5215063d6523917bb09f288ae188ff594334 (refs/remotes/alt)
+r7 = a4c42b904a0e180f2dacc6e22643b0b81401bad9 (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 90aa706833c53d53169ef68045699f8d23c0e756 (refs/remotes/alt)
+r8 = e6163ce4226c17afd632aebc1cf5c9c95aa2dd6b (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 07ff3ce1ce083e1314ae6373ed2534c313875f35 (refs/remotes/alt)
+r9 = e6ab5cca19f9954be8bf50095935e3827b510842 (refs/remotes/alt)
 	A	bar/foo
-r10 = 73c34c388a915afb5bf0412c29214f2062280386 (refs/remotes/alt)
+r10 = b08bcc1a53daa6c10f84944e974674e9239e1d66 (refs/remotes/alt)
 	A	bar/d
-r11 = 7a661a3ec5253da78b785154ca642c342c01b062 (refs/remotes/alt)
+r11 = c7ca5b859d7740c2a5b0954e5c45ee15e2d06daa (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = 22355af68a5eb9558f256fd8248f1cab966dc00b (refs/remotes/alt)
+r12 = 92984a45a886457fb61732426f786dff8a74ca29 (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = e1a6f00953f866d04318660a8ceea079c9b4912c (refs/remotes/alt)
+r13 = 514be481324a419543f0eb67acd0a4f22dfcd26e (refs/remotes/alt)
 	A	bar/foo2
-r14 = 57a4f5c77261ebd8db718c0709eda0450b542657 (refs/remotes/alt)
+r14 = 6a01efc0b32203cad731a64ae969fce4f3811744 (refs/remotes/alt)
 	M	bar/d
-r15 = 844e85a415355a071aa590be1386f72de56adc70 (refs/remotes/alt)
+r15 = 7718c40d3818b826a34359e3b227fa1dfe36322e (refs/remotes/alt)
 ok 28 - git-svn works in a repository with a gitdir: link
 
 # passed all 28 test(s)
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9134-git-svn-ignore-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/.git/
-expecting success of 9134.1 'setup test repository': 
-	svn_cmd co "$svnrepo" s &&
-	(
-		cd s &&
-		mkdir qqq www &&
-		echo test_qqq > qqq/test_qqq.txt &&
-		echo test_www > www/test_www.txt &&
-		svn_cmd add qqq &&
-		svn_cmd add www &&
-		svn_cmd commit -m "create some files" &&
-		svn_cmd up &&
-		echo hi >> www/test_www.txt &&
-		svn_cmd commit -m "modify www/test_www.txt" &&
-		svn_cmd up
-	)
-
-Checked out revision 0.
-A         qqq
-A         qqq/test_qqq.txt
-A         www
-A         www/test_www.txt
-Adding         qqq
-Adding         qqq/test_qqq.txt
-Adding         www
-Adding         www/test_www.txt
-Transmitting file data ..done
-Committing transaction...
-Committed revision 1.
-Updating '.':
-At revision 1.
-Sending        www/test_www.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-ok 1 - setup test repository
-
-expecting success of 9134.2 'clone an SVN repository with ignored www directory': 
-	git svn clone --ignore-paths="^www" "$svnrepo" g &&
-	echo test_qqq > expect &&
-	for i in g/*/*.txt; do cat $i >> expect2 || return 1; done &&
-	test_cmp expect expect2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
-	A	qqq/test_qqq.txt
-r1 = 9fb9dab26f0e149096108d0ed9ac1a4391665092 (refs/remotes/git-svn)
-r2 = 9ec0442abfc551349602446fbebc350a679f1779 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
-ok 2 - clone an SVN repository with ignored www directory
-
-expecting success of 9134.3 'init+fetch an SVN repository with ignored www directory': 
-	git svn init "$svnrepo" c &&
-	( cd c && git svn fetch --ignore-paths="^www" ) &&
-	rm expect2 &&
-	echo test_qqq > expect &&
-	for i in c/*/*.txt; do cat $i >> expect2 || return 1; done &&
-	test_cmp expect expect2
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
-	A	qqq/test_qqq.txt
-r1 = 9fb9dab26f0e149096108d0ed9ac1a4391665092 (refs/remotes/git-svn)
-r2 = 9ec0442abfc551349602446fbebc350a679f1779 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
-ok 3 - init+fetch an SVN repository with ignored www directory
-
-expecting success of 9134.4 'verify ignore-paths config saved by clone': 
-	(
-	    cd g &&
-	    git config --get svn-remote.svn.ignore-paths | grep www
-	)
-
-^www
-ok 4 - verify ignore-paths config saved by clone
-
-expecting success of 9134.5 'SVN-side change outside of www': 
-	(
-		cd s &&
-		echo b >> qqq/test_qqq.txt &&
-		svn_cmd commit -m "SVN-side change outside of www" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep "SVN-side change outside of www"
-	)
-
-Sending        qqq/test_qqq.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-SVN-side change outside of www
-ok 5 - SVN-side change outside of www
-
-expecting success of 9134.6 'update git svn-cloned repo (config ignore)': 
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-	M	qqq/test_qqq.txt
-r3 = 3927b2ebb6ae2f2c734de339f4ba4eb39ae0d8df (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 6 - update git svn-cloned repo (config ignore)
-
-expecting success of 9134.7 'update git svn-cloned repo (option ignore)': 
-	(
-		cd c &&
-		git svn rebase --ignore-paths="^www" &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-	M	qqq/test_qqq.txt
-r3 = 3927b2ebb6ae2f2c734de339f4ba4eb39ae0d8df (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 7 - update git svn-cloned repo (option ignore)
-
-expecting success of 9134.8 'SVN-side change inside of ignored www': 
-	(
-		cd s &&
-		echo zaq >> www/test_www.txt &&
-		svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep -F "SVN-side change inside of www/test_www.txt"
-	)
-
-Sending        www/test_www.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 4.
-Updating '.':
-At revision 4.
-SVN-side change inside of www/test_www.txt
-ok 8 - SVN-side change inside of ignored www
-
-expecting success of 9134.9 'update git svn-cloned repo (config ignore)': 
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-r4 = 0fffb8d28cf87db7823bd5b331d6fc07336784b9 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 9 - update git svn-cloned repo (config ignore)
-
-expecting success of 9134.10 'update git svn-cloned repo (option ignore)': 
-	(
-		cd c &&
-		git svn rebase --ignore-paths="^www" &&
-		printf "test_qqq\nb\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-r4 = 0fffb8d28cf87db7823bd5b331d6fc07336784b9 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 10 - update git svn-cloned repo (option ignore)
-
-expecting success of 9134.11 'SVN-side change in and out of ignored www': 
-	(
-		cd s &&
-		echo cvf >> www/test_www.txt &&
-		echo ygg >> qqq/test_qqq.txt &&
-		svn_cmd commit -m "SVN-side change in and out of ignored www" &&
-		svn_cmd up &&
-		svn_cmd log -v | grep "SVN-side change in and out of ignored www"
-	)
-
-Sending        qqq/test_qqq.txt
-Sending        www/test_www.txt
-Transmitting file data ..done
-Committing transaction...
-Committed revision 5.
-Updating '.':
-At revision 5.
-SVN-side change in and out of ignored www
-ok 11 - SVN-side change in and out of ignored www
-
-expecting success of 9134.12 'update git svn-cloned repo again (config ignore)': 
-	(
-		cd g &&
-		git svn rebase &&
-		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-	M	qqq/test_qqq.txt
-r5 = 0273f5c03ed24c378b98ee6fa6e52ee3d85fd528 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 12 - update git svn-cloned repo again (config ignore)
-
-expecting success of 9134.13 'update git svn-cloned repo again (option ignore)': 
-	(
-		cd c &&
-		git svn rebase --ignore-paths="^www" &&
-		printf "test_qqq\nb\nygg\n" > expect &&
-		for i in */*.txt; do cat $i >> expect2 || exit 1; done &&
-		test_cmp expect2 expect &&
-		rm expect expect2
-	)
-
-	M	qqq/test_qqq.txt
-r5 = 0273f5c03ed24c378b98ee6fa6e52ee3d85fd528 (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-ok 13 - update git svn-cloned repo again (option ignore)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9139-git-svn-non-utf8-commitencoding.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9139-git-svn-non-utf8-commitencoding/.git/
 expecting success of 9139.1 'ISO8859-1 setup': 
@@ -526553,7 +526490,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = 2c3b09f4f50308f345bdc759b5e37cf88809ebd6 (refs/remotes/git-svn)
+r1 = f9011983ec27814c6a347190e4eabdfeee606a84 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -526566,7 +526503,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = d836268f547c5d996d100cc026705efd84be6c15 (refs/remotes/git-svn)
+r2 = 22ebd32f3f5de1794ef376dcaa56d4ebf369d1cc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -526584,7 +526521,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 20034b1] ÄËÑÏÖ
+[t ad0f96d] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -526603,7 +526540,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 99a8707] ¤Ï¤ì¤Ò¤Û¤Õ
+[t 3215f49] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -526680,9 +526617,9 @@
 
 expecting success of 9143.5 'Fetch repo': git svn fetch
 	A	test.txt
-r1 = be5e0cf7508c9e07f481285b23717f90bda4891d (refs/remotes/git-svn)
+r1 = d1a9aa427a0a65d69f8ac1a1862b62dc43105b3c (refs/remotes/git-svn)
 	M	test.txt
-r2 = ccecc0a835496ba095f3c6dbc131354c9827d7bb (refs/remotes/git-svn)
+r2 = c62ddd974a5817720b438b4fad421f47d91429df (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9143-git-svn-gc/svnrepo r2
 ok 5 - Fetch repo
@@ -526745,11 +526682,11 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9145-git-svn-master-branch/g/.git/
 	A	a
-r1 = f231f5017b806e86f390d015d6b3e44f7df386db (refs/remotes/origin/trunk)
+r1 = 71af9451f01f27747955817aa9e1ea2eb1f02db3 (refs/remotes/origin/trunk)
 	A	a
-r2 = e70e920966fdaffe8db235fb52ff1adceb933426 (refs/remotes/origin/a)
+r2 = 8f1478785062d58079d95ba94be1df512c785eb2 (refs/remotes/origin/a)
 	A	a
-r3 = 2ead7a324e22a34ff19b44ef803bee808d249068 (refs/remotes/origin/b)
+r3 = a9bf18c5502fcd8146d5a0ca90ba11a10230f4eb (refs/remotes/origin/b)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9145-git-svn-master-branch/svnrepo/trunk r1
 ok 2 - git svn clone --stdlayout sets up trunk as main
@@ -526809,10 +526746,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9140-git-svn-reset/g/.git/
 	A	vis/vis.txt
-r1 = d566979ec018e8e4ad2f56e85964e15c06792004 (refs/remotes/git-svn)
-r2 = d9307c4f229a13d7f1415a36b87a107d9eb08bfe (refs/remotes/git-svn)
+r1 = b8cfd7c38ee001d6e384e74b3d13f7ecbe28ce8e (refs/remotes/git-svn)
+r2 = 0fbe4666f4ae7b1b8b004c10123bd5cb509ede78 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = b2dd78d2326db7f35b7098a9b754b732711ea7f6 (refs/remotes/git-svn)
+r3 = 9fb2ed8e9e3a0d40f78ca0a82592a05d9ee17fd5 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
 ok 2 - clone SVN repository with hidden directory
@@ -526840,7 +526777,7 @@
 	grep "not found in commit" errors &&
 	test_cmp expect expect2
 
-hid/hid.txt was not found in commit b2dd78d2326db7f35b7098a9b754b732711ea7f6 (r3)
+hid/hid.txt was not found in commit 9fb2ed8e9e3a0d40f78ca0a82592a05d9ee17fd5 (r3)
 ok 4 - fetch fails on modified hidden file
 
 expecting success of 9140.5 'reset unwinds back to r1': 
@@ -526850,7 +526787,7 @@
 	echo 1 >expect &&
 	test_cmp expect expect2
 
-r1 = d566979ec018e8e4ad2f56e85964e15c06792004 (refs/remotes/git-svn)
+r1 = b8cfd7c38ee001d6e384e74b3d13f7ecbe28ce8e (refs/remotes/git-svn)
 ok 5 - reset unwinds back to r1
 
 expecting success of 9140.6 'refetch succeeds not ignoring any files': 
@@ -526861,14 +526798,14 @@
 	)
 
 Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading d566979ec018e8e4ad2f56e85964e15c06792004
+rereading b8cfd7c38ee001d6e384e74b3d13f7ecbe28ce8e
 	A	hid/hid.txt
-r2 = 0cd5319835af0fdce57e5e6e6a62402f32db5351 (refs/remotes/git-svn)
+r2 = 34d6c6274d8b8dba218b035dab7087df5afcc9ed (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 99715d3404719e0027b128d37ddfc47e3f5ac4f1 (refs/remotes/git-svn)
+r3 = d9d27c1d462e3e4c2c3957e5f57ba73e264e91ba (refs/remotes/git-svn)
 	M	hid/hid.txt
-r4 = dc3af1c0df6b87c0bf2f87143d08d7cdffb427af (refs/remotes/git-svn)
-warning: skipped previously applied commit b2dd78d
+r4 = b323a8b636d991ee3acf9c876ab4244e79610762 (refs/remotes/git-svn)
+warning: skipped previously applied commit 9fb2ed8
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
@@ -526879,6 +526816,98 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9144-git-svn-old-rev_map.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9144-git-svn-old-rev_map/.git/
+expecting success of 9144.1 'setup test repository with old layout': 
+	mkdir i &&
+	(cd i && > a) &&
+	svn_cmd import -m- i "$svnrepo" &&
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	test -d .git/svn/refs/remotes/git-svn/ &&
+	! test -e .git/svn/git-svn/ &&
+	mv .git/svn/refs/remotes/git-svn .git/svn/ &&
+	rm -r .git/svn/refs
+
+Adding         i/a
+Committing transaction...
+Committed revision 1.
+	A	a
+r1 = cab5e34e660cd960997ea770b0d9fa432b588178 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
+ok 1 - setup test repository with old layout
+
+expecting success of 9144.2 'old layout continues to work': 
+	svn_cmd import -m- i "$svnrepo/b" &&
+	git svn rebase &&
+	echo a >> b/a &&
+	git add b/a &&
+	git commit -m- -a &&
+	git svn dcommit &&
+	! test -d .git/svn/refs/ &&
+	test -e .git/svn/git-svn/
+
+Adding         i/a
+Committing transaction...
+Committed revision 2.
+	A	b/a
+r2 = 16e2d82ba126695ddfbb3083a15729fe8c6b7c48 (refs/remotes/git-svn)
+Successfully rebased and updated refs/heads/master.
+[master 4845ab2] -
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = 4ab2154bf58cdfc2421ab601c59d9f225316a0bb (refs/remotes/git-svn)
+No changes between 4845ab25ff8ecdaf762f9b6ebe21b4ece7ba4206 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 2 - old layout continues to work
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9150-svk-mergetickets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/.git/
+expecting success of 9150.1 'load svk depot': 
+	svnadmin load -q '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.49.0+next.20250314/t/t9150/svk-merge.dump' &&
+	git svn init --minimize-url -R svkmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/svnrepo' &&
+	git svn fetch --all
+	
+r1 = b53c4e1a175ef8929e6e4aab56280e58a0de64a8 (refs/remotes/origin/trunk)
+	A	Makefile
+r2 = 90f5e8071f5b77e35b17e90dec357e5c88edec7f (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/branches/left, 2
+Found branch parent: (refs/remotes/origin/left) 90f5e8071f5b77e35b17e90dec357e5c88edec7f
+Following parent with do_switch
+Successfully followed parent
+r3 = 79d9656e5bf2f11fc8ec4e9a20e1cea4615a760a (refs/remotes/origin/left)
+	M	Makefile
+r4 = 86c978a5a9e208309128c39af65ada54e20c81ab (refs/remotes/origin/left)
+	M	Makefile
+r5 = 242969651859ed31ccc35c99fab280c17353acd2 (refs/remotes/origin/trunk)
+	M	Makefile
+r6 = 9682859fd9aa34c6573af588d38b75aaaeaa1918 (refs/remotes/origin/left)
+	M	Makefile
+Found merge parent (svk:merge ticket): 9682859fd9aa34c6573af588d38b75aaaeaa1918
+r7 = 8f305e8c49bb2f343a16bd4f0bd3386700698bf5 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk r7
+ok 1 - load svk depot
+
+expecting success of 9150.2 'svk merges were represented coming in': 
+	[ 2 -eq 2 ]
+	
+ok 2 - svk merges were represented coming in
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9001-send-email.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/.git/
 expecting success of 9001.1 'prepare reference tree': 
@@ -526956,8 +526985,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:24:58 +0000
-Message-ID: <20260419192458.2243793-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:24 +0000
+Message-ID: <20250317132924.3465409-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -526996,8 +527025,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:24:58 +0000
-Message-ID: <20260419192458.2244097-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:24 +0000
+Message-ID: <20250317132924.3465644-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527038,8 +527067,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:24:59 +0000
-Message-ID: <20260419192459.2244467-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:25 +0000
+Message-ID: <20250317132925.3465937-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527105,7 +527134,7 @@
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/BXUY4LAJu0/0001-Test-Cc-trailers.patch
+/tmp/FKqA7SSXwW/0001-Test-Cc-trailers.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 (body) Adding cc: one@example.com from line 'Cc: one@example.com'
 (body) Adding cc: <two@example.com> from line 'Cc: <two@example.com> # trailing comments are ignored'
@@ -527125,8 +527154,8 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Sun, 19 Apr 2026 19:25:00 +0000
-Message-ID: <20260419192500.2244879-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:25 +0000
+Message-ID: <20250317132925.3466338-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527154,7 +527183,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/kscwVc78FW/0001-Second.patch
+/tmp/Ay8XUNsdSJ/0001-Second.patch
 (mbox) Adding cc: A <author@example.com> from line 'From: A <author@example.com>'
 (cc-cmd) Adding cc: One Person <one@example.com> from: './expected-cc-script.sh'
 (cc-cmd) Adding cc: Two Person <two@example.com> from: './expected-cc-script.sh'
@@ -527174,8 +527203,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Sun, 19 Apr 2026 19:25:00 +0000
-Message-ID: <20260419192500.2245198-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:26 +0000
+Message-ID: <20250317132926.3466621-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527237,8 +527266,8 @@
 From: A U Thor <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self unquoted-self_name_suppressed with name A U Thor email author@example.com
-Date: Sun, 19 Apr 2026 19:25:01 +0000
-Message-ID: <20260419192501.2245653-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:27 +0000
+Message-ID: <20250317132927.3467057-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527265,8 +527294,8 @@
 From: "A U. Thor" <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self quoted-self_name_dot_suppressed with name A U. Thor email author@example.com
-Date: Sun, 19 Apr 2026 19:25:01 +0000
-Message-ID: <20260419192502.2246118-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:28 +0000
+Message-ID: <20250317132928.3467580-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527293,8 +527322,8 @@
 From: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 To: nobody@example.com
 Subject: [PATCH] =?UTF-8?q?test=20suppress-cc.self=20quoted-non=5Fascii=5F?= =?UTF-8?q?self=5Fsuppressed=20with=20name=20F=C3=BC=C3=B1n=C3=BD=20N?= =?UTF-8?q?=C3=A2m=C3=A9=20email=20odd=5F=3F=3Dmail@example.com?=
-Date: Sun, 19 Apr 2026 19:25:02 +0000
-Message-ID: <20260419192502.2246553-1-odd_?=mail@example.com>
+Date: Mon, 17 Mar 2025 13:29:28 +0000
+Message-ID: <20250317132928.3468039-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -527322,8 +527351,8 @@
 From: =?UTF-8?q?=C6=91=C3=BC=C3=B1n=C3=AD=C4=99=C5=99=20=E2=82=AC=2E=20N=C3=A2=E1=B9=81=C3=A9?= <odd_?=mail@example.com>
 To: nobody@example.com
 Subject: [PATCH] =?UTF-8?q?test=20suppress-cc.self=20quoted-long=5Fnon=5Fa?= =?UTF-8?q?scii=5Fself=5Fsuppressed=20with=20name=20=C6=91=C3=BC=C3=B1n?= =?UTF-8?q?=C3=AD=C4=99=C5=99=20=E2=82=AC.=20N=C3=A2=E1=B9=81=C3=A9=20emai?= =?UTF-8?q?l=20odd=5F=3F=3Dmail@example.com?=
-Date: Sun, 19 Apr 2026 19:25:03 +0000
-Message-ID: <20260419192503.2246983-1-odd_?=mail@example.com>
+Date: Mon, 17 Mar 2025 13:29:29 +0000
+Message-ID: <20250317132929.3468459-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -527351,8 +527380,8 @@
 From: "A U. Thor" <author@example.com>
 To: nobody@example.com
 Subject: [PATCH] test suppress-cc.self unquoted-self_name_sanitized_suppressed with name "A U. Thor" email author@example.com
-Date: Sun, 19 Apr 2026 19:25:04 +0000
-Message-ID: <20260419192504.2247435-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:30 +0000
+Message-ID: <20250317132930.3468891-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527404,8 +527433,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:04 +0000
-Message-ID: <20260419192504.2247978-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:31 +0000
+Message-ID: <20250317132931.3469415-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <my-message-id@example.com>
 References: <my-message-id@example.com>
@@ -527428,38 +527457,44 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@codethink03-arm64.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 28 # skip implicit ident is allowed (missing AUTOIDENT of PERL,AUTOIDENT)
-
-expecting success of 9001.29 'broken implicit ident aborts send-email': 
+second user <pbuilder2@codethink04-arm64.debian.net> 1112912293 -0700
+prerequisite AUTOIDENT ok
+expecting success of 9001.28 'implicit ident is allowed': 
 	clean_fake_sendmail &&
 	(sane_unset GIT_AUTHOR_NAME &&
 	sane_unset GIT_AUTHOR_EMAIL &&
 	sane_unset GIT_COMMITTER_NAME &&
 	sane_unset GIT_COMMITTER_EMAIL &&
-	GIT_SEND_EMAIL_NOTTY=1 && export GIT_SEND_EMAIL_NOTTY &&
-	test_must_fail git send-email \
+	GIT_SEND_EMAIL_NOTTY=1 git send-email \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		--to=to@example.com \
-		$patches </dev/null 2>errors &&
-	test_grep "tell me who you are" errors
+		$patches </dev/null 2>errors
 	)
 
-*** Please tell me who you are.
-ok 29 - broken implicit ident aborts send-email
+0001-Second.patch
+(mbox) Adding cc: A <author@example.com> from line 'From: A <author@example.com>'
+(mbox) Adding cc: One <one@example.com> from line 'Cc: One <one@example.com>, two@example.com'
+(mbox) Adding cc: two@example.com from line 'Cc: One <one@example.com>, two@example.com'
+(body) Adding cc: C O Mitter <committer@example.com> from line 'Signed-off-by: C O Mitter <committer@example.com>'
+OK. Log says:
+Sendmail: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/fake.sendmail -i to@example.com author@example.com one@example.com two@example.com committer@example.com
+From: second user <pbuilder2@codethink04-arm64.debian.net>
+To: to@example.com
+Cc: A <author@example.com>,
+	One <one@example.com>,
+	two@example.com,
+	C O Mitter <committer@example.com>
+Subject: [PATCH 1/1] Second.
+Date: Mon, 17 Mar 2025 13:29:31 +0000
+Message-ID: <20250317132931.3469718-1-pbuilder2@codethink04-arm64.debian.net>
+X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Result: OK
+ok 28 - implicit ident is allowed
+
+ok 29 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT)
 
 expecting success of 9001.30 'setup cmd scripts': 
 	write_script tocmd-sed <<-\EOF &&
@@ -527501,8 +527536,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:05 +0000
-Message-ID: <20260419192505.2248587-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:32 +0000
+Message-ID: <20250317132932.3470054-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527540,8 +527575,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:06 +0000
-Message-ID: <20260419192506.2248879-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:32 +0000
+Message-ID: <20250317132933.3470322-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527577,8 +527612,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:06 +0000
-Message-ID: <20260419192506.2249161-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:33 +0000
+Message-ID: <20250317132933.3470635-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 X-Debbugs-CC: dummy@example.com
@@ -527616,8 +527651,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:07 +0000
-Message-ID: <20260419192507.2249428-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:34 +0000
+Message-ID: <20250317132934.3470924-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527656,8 +527691,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:07 +0000
-Message-ID: <20260419192507.2249630-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:34 +0000
+Message-ID: <20250317132934.3471192-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 X-Debbugs-CC: someone@example.com
@@ -527744,8 +527779,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:08 +0000
-Message-ID: <20260419192508.2250303-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:35 +0000
+Message-ID: <20250317132935.3471876-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527778,8 +527813,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:09 +0000
-Message-ID: <20260419192509.2250519-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:36 +0000
+Message-ID: <20250317132936.3472083-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527811,8 +527846,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:08 +0000
-Message-ID: <20260419192509.2250717-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:35 +0000
+Message-ID: <20250317132936.3472272-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527831,11 +527866,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:09 +0000
-Message-ID: <20260419192509.2250717-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:36 +0000
+Message-ID: <20250317132936.3472272-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192509.2250717-1-nobody@example.com>
-References: <20260419192509.2250717-1-nobody@example.com>
+In-Reply-To: <20250317132936.3472272-1-nobody@example.com>
+References: <20250317132936.3472272-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -527866,8 +527901,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:09 +0000
-Message-ID: <20260419192509.2250943-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:37 +0000
+Message-ID: <20250317132937.3472477-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527901,8 +527936,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:10 +0000
-Message-ID: <20260419192510.2251183-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:37 +0000
+Message-ID: <20250317132937.3472664-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527938,8 +527973,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:10 +0000
-Message-ID: <20260419192510.2251396-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:38 +0000
+Message-ID: <20250317132938.3472933-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -527972,8 +528007,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:10 +0000
-Message-ID: <20260419192511.2251549-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:37 +0000
+Message-ID: <20250317132938.3473181-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -527992,11 +528027,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:11 +0000
-Message-ID: <20260419192511.2251549-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:38 +0000
+Message-ID: <20250317132938.3473181-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192511.2251549-1-nobody@example.com>
-References: <20260419192511.2251549-1-nobody@example.com>
+In-Reply-To: <20250317132938.3473181-1-nobody@example.com>
+References: <20250317132938.3473181-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -528027,8 +528062,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:10 +0000
-Message-ID: <20260419192511.2251786-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:38 +0000
+Message-ID: <20250317132939.3473412-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -528047,11 +528082,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:11 +0000
-Message-ID: <20260419192511.2251786-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:39 +0000
+Message-ID: <20250317132939.3473412-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192511.2251786-1-nobody@example.com>
-References: <20260419192511.2251786-1-nobody@example.com>
+In-Reply-To: <20250317132939.3473412-1-nobody@example.com>
+References: <20250317132939.3473412-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -528082,8 +528117,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:10 +0000
-Message-ID: <20260419192511.2252027-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:38 +0000
+Message-ID: <20250317132939.3473641-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -528102,11 +528137,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:11 +0000
-Message-ID: <20260419192511.2252027-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:39 +0000
+Message-ID: <20250317132939.3473641-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192511.2252027-1-nobody@example.com>
-References: <20260419192511.2252027-1-nobody@example.com>
+In-Reply-To: <20250317132939.3473641-1-nobody@example.com>
+References: <20250317132939.3473641-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -528213,8 +528248,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:14 +0000
-Message-ID: <20260419192513.2253262-2-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:43 +0000
+Message-ID: <20250317132942.3474998-2-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 X-test-header: v1.0
@@ -528251,8 +528286,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192514.2253580-2-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:43 +0000
+Message-ID: <20250317132942.3475270-2-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528267,8 +528302,8 @@
 Cc: A <author@example.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH] Second.
-Date: Sun, 19 Apr 2026 19:25:16 +0000
-Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1776626697.git.committer@example.com>
+Date: Mon, 17 Mar 2025 13:29:44 +0000
+Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1742218162.git.committer@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <format>
 References: <format>
@@ -528302,8 +528337,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:14 +0000
-Message-ID: <20260419192514.2253976-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:43 +0000
+Message-ID: <20250317132943.3475673-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -528336,8 +528371,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192515.2254198-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:43 +0000
+Message-ID: <20250317132943.3475903-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528370,8 +528405,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192515.2254408-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:44 +0000
+Message-ID: <20250317132944.3476098-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -528404,8 +528439,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192515.2254599-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:44 +0000
+Message-ID: <20250317132944.3476292-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -528439,8 +528474,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:16 +0000
-Message-ID: <20260419192516.2254830-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:45 +0000
+Message-ID: <20250317132945.3476567-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528472,8 +528507,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:16 +0000
-Message-ID: <20260419192516.2255050-1-author@example.com>
+Date: Mon, 17 Mar 2025 13:29:45 +0000
+Message-ID: <20250317132945.3476798-1-author@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -528520,8 +528555,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:14 +0000
-Message-ID: <20260419192517.2255265-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:44 +0000
+Message-ID: <20250317132946.3477100-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -528542,12 +528577,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192517.2255265-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:45 +0000
+Message-ID: <20250317132946.3477100-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192517.2255265-1-nobody@example.com>
+In-Reply-To: <20250317132946.3477100-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260419192517.2255265-1-nobody@example.com>
+ <20250317132946.3477100-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528565,12 +528600,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:16 +0000
-Message-ID: <20260419192517.2255265-3-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:46 +0000
+Message-ID: <20250317132946.3477100-3-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192517.2255265-1-nobody@example.com>
+In-Reply-To: <20250317132946.3477100-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260419192517.2255265-1-nobody@example.com>
+ <20250317132946.3477100-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528613,8 +528648,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:15 +0000
-Message-ID: <20260419192517.2255753-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:44 +0000
+Message-ID: <20250317132947.3477466-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -528635,12 +528670,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:16 +0000
-Message-ID: <20260419192517.2255753-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:45 +0000
+Message-ID: <20250317132947.3477466-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192517.2255753-1-nobody@example.com>
+In-Reply-To: <20250317132947.3477466-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260419192517.2255753-1-nobody@example.com>
+ <20250317132947.3477466-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528658,13 +528693,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:17 +0000
-Message-ID: <20260419192517.2255753-3-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:46 +0000
+Message-ID: <20250317132947.3477466-3-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192517.2255753-2-nobody@example.com>
+In-Reply-To: <20250317132947.3477466-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20260419192517.2255753-1-nobody@example.com>
- <20260419192517.2255753-2-nobody@example.com>
+ <20250317132947.3477466-1-nobody@example.com>
+ <20250317132947.3477466-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -528718,8 +528753,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:18 +0000
-Message-ID: <20260419192518.2256447-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:48 +0000
+Message-ID: <20250317132948.3478048-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -528738,11 +528773,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:19 +0000
-Message-ID: <20260419192518.2256447-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:49 +0000
+Message-ID: <20250317132948.3478048-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192518.2256447-1-nobody@example.com>
-References: <20260419192518.2256447-1-nobody@example.com>
+In-Reply-To: <20250317132948.3478048-1-nobody@example.com>
+References: <20250317132948.3478048-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529144,8 +529179,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Sun, 19 Apr 2026 19:25:23 +0000
-Message-ID: <20260419192524.2260488-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:55 +0000
+Message-ID: <20250317132956.3482245-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529167,8 +529202,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Sun, 19 Apr 2026 19:25:23 +0000
-Message-ID: <20260419192524.2260488-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:55 +0000
+Message-ID: <20250317132956.3482245-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529180,11 +529215,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Sun, 19 Apr 2026 19:25:24 +0000
-Message-ID: <20260419192524.2260488-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:56 +0000
+Message-ID: <20250317132956.3482245-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192524.2260488-1-nobody@example.com>
-References: <20260419192524.2260488-1-nobody@example.com>
+In-Reply-To: <20250317132956.3482245-1-nobody@example.com>
+References: <20250317132956.3482245-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529195,11 +529230,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Sun, 19 Apr 2026 19:25:24 +0000
-Message-ID: <20260419192524.2260488-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:56 +0000
+Message-ID: <20250317132956.3482245-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192524.2260488-1-nobody@example.com>
-References: <20260419192524.2260488-1-nobody@example.com>
+In-Reply-To: <20250317132956.3482245-1-nobody@example.com>
+References: <20250317132956.3482245-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529230,8 +529265,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:24 +0000
-Message-ID: <20260419192524.2260803-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:57 +0000
+Message-ID: <20250317132957.3482546-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529264,8 +529299,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:24 +0000
-Message-ID: <20260419192524.2261087-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:57 +0000
+Message-ID: <20250317132957.3482772-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529296,8 +529331,8 @@
 Cc: A <author@example.com>,
 	=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@example.com>
 Subject: [PATCH] Second.
-Date: Sun, 19 Apr 2026 19:25:25 +0000
-Message-ID: <20260419192525.2261384-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:58 +0000
+Message-ID: <20250317132958.3482990-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529327,8 +529362,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:25 +0000
-Message-ID: <20260419192525.2261699-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:58 +0000
+Message-ID: <20250317132958.3483275-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -529348,11 +529383,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:26 +0000
-Message-ID: <20260419192525.2261699-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:59 +0000
+Message-ID: <20250317132958.3483275-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192525.2261699-1-nobody@example.com>
-References: <20260419192525.2261699-1-nobody@example.com>
+In-Reply-To: <20250317132958.3483275-1-nobody@example.com>
+References: <20250317132958.3483275-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529390,8 +529425,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:26 +0000
-Message-ID: <20260419192526.2262027-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:29:59 +0000
+Message-ID: <20250317132959.3483628-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -529411,11 +529446,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:27 +0000
-Message-ID: <20260419192526.2262027-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:00 +0000
+Message-ID: <20250317132959.3483628-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192526.2262027-1-nobody@example.com>
-References: <20260419192526.2262027-1-nobody@example.com>
+In-Reply-To: <20250317132959.3483628-1-nobody@example.com>
+References: <20250317132959.3483628-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529442,8 +529477,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Sun, 19 Apr 2026 19:25:26 +0000
-Message-ID: <20260419192526.2262493-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:00 +0000
+Message-ID: <20250317133000.3483969-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -529463,11 +529498,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:27 +0000
-Message-ID: <20260419192526.2262493-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:01 +0000
+Message-ID: <20250317133000.3483969-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192526.2262493-1-nobody@example.com>
-References: <20260419192526.2262493-1-nobody@example.com>
+In-Reply-To: <20250317133000.3483969-1-nobody@example.com>
+References: <20250317133000.3483969-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529505,8 +529540,8 @@
 To: nobody@example.com
 Cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 Subject: [PATCH] weird_author
-Date: Sun, 19 Apr 2026 19:25:27 +0000
-Message-ID: <20260419192527.2263099-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:00 +0000
+Message-ID: <20250317133000.3484381-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -529547,8 +529582,8 @@
 To: nobody@example.com
 Cc: =?UTF-8?q?F=C3=BC=C3=B1n=C3=BD=20N=C3=A2m=C3=A9?= <odd_?=mail@example.com>
 Subject: [PATCH] weird_sender
-Date: Sun, 19 Apr 2026 19:25:27 +0000
-Message-ID: <20260419192527.2263599-1-odd_?=mail@example.com>
+Date: Mon, 17 Mar 2025 13:30:01 +0000
+Message-ID: <20250317133001.3484711-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -529641,8 +529676,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:28 +0000
-Message-ID: <20260419192529.2264465-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:03 +0000
+Message-ID: <20250317133003.3485517-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -529662,11 +529697,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:29 +0000
-Message-ID: <20260419192529.2264465-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:04 +0000
+Message-ID: <20250317133003.3485517-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192529.2264465-1-nobody@example.com>
-References: <20260419192529.2264465-1-nobody@example.com>
+In-Reply-To: <20250317133003.3485517-1-nobody@example.com>
+References: <20250317133003.3485517-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529697,8 +529732,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:29 +0000
-Message-ID: <20260419192529.2264802-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:03 +0000
+Message-ID: <20250317133003.3485774-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -529718,11 +529753,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:30 +0000
-Message-ID: <20260419192529.2264802-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:04 +0000
+Message-ID: <20250317133003.3485774-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192529.2264802-1-nobody@example.com>
-References: <20260419192529.2264802-1-nobody@example.com>
+In-Reply-To: <20250317133003.3485774-1-nobody@example.com>
+References: <20250317133003.3485774-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529754,8 +529789,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Sun, 19 Apr 2026 19:25:29 +0000
-Message-ID: <20260419192530.2265115-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:04 +0000
+Message-ID: <20250317133004.3486235-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -529775,11 +529810,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:30 +0000
-Message-ID: <20260419192530.2265115-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:05 +0000
+Message-ID: <20250317133004.3486235-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192530.2265115-1-nobody@example.com>
-References: <20260419192530.2265115-1-nobody@example.com>
+In-Reply-To: <20250317133004.3486235-1-nobody@example.com>
+References: <20250317133004.3486235-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529807,8 +529842,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Sun, 19 Apr 2026 19:25:30 +0000
-Message-ID: <20260419192530.2265446-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:05 +0000
+Message-ID: <20250317133005.3486528-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -529828,11 +529863,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Sun, 19 Apr 2026 19:25:31 +0000
-Message-ID: <20260419192530.2265446-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:06 +0000
+Message-ID: <20250317133005.3486528-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192530.2265446-1-nobody@example.com>
-References: <20260419192530.2265446-1-nobody@example.com>
+In-Reply-To: <20250317133005.3486528-1-nobody@example.com>
+References: <20250317133005.3486528-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -529905,7 +529940,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20260419192532.2266449-1-nobody@example.com>
+In-Reply-To: <20250317133007.3487686-1-nobody@example.com>
 ok 110 - threading but no chain-reply-to
 
 expecting success of 9001.111 'override in-reply-to if no threading': 
@@ -530993,6 +531028,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 1014: warning: command substitution: ignored null byte in input
 ok 193 - leading and trailing whitespaces are removed
 
 expecting success of 9001.194 'mailmap support with --to': 
@@ -531141,7 +531177,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/rujfxoZKFb/0001-add-main.patch
+/tmp/7Nq6q9v3E_/0001-add-main.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
 Sendmail: fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531150,8 +531186,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:03 +0000
-Message-ID: <20260419192603.2289187-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:56 +0000
+Message-ID: <20250317133056.3511017-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531168,7 +531204,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/LdNnFtfYAQ/0001-add-main.patch
+/tmp/xvqlPGOw8m/0001-add-main.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
 Sendmail: "$(pwd)/fake.sendmail" -f nobody@example.com -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531177,8 +531213,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:03 +0000
-Message-ID: <20260419192603.2289463-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:56 +0000
+Message-ID: <20250317133056.3511229-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531195,7 +531231,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/eQ_GdTuDZJ/0001-add-main.patch
+/tmp/sDV9NWdoR1/0001-add-main.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
 Sendmail: f() { "$(pwd)/fake.sendmail" "$@"; };f -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531204,8 +531240,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:04 +0000
-Message-ID: <20260419192604.2289763-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:57 +0000
+Message-ID: <20250317133057.3511485-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531254,7 +531290,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Sun, 19 Apr 2026 19:26:03 +0000
+Date: Mon, 17 Mar 2025 13:30:56 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <replied.to@example.com>
@@ -531271,7 +531307,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Sun, 19 Apr 2026 19:26:04 +0000
+Date: Mon, 17 Mar 2025 13:30:57 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
@@ -531305,7 +531341,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Sun, 19 Apr 2026 19:26:04 +0000
+Date: Mon, 17 Mar 2025 13:30:57 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <cmdline.reply@example.com>
@@ -531322,7 +531358,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Sun, 19 Apr 2026 19:26:05 +0000
+Date: Mon, 17 Mar 2025 13:30:58 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 In-Reply-To: <cmdline.reply@example.com>
@@ -531384,8 +531420,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:06 +0000
-Message-ID: <20260419192605.2290675-2-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:30:59 +0000
+Message-ID: <20250317133058.3512408-2-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531415,10 +531451,10 @@
 		--validate -3 --cover-letter --force &&
 	test_cmp expect my-hooks.log
 
-/tmp/s8A8yBjZ9t/0000-cover-letter.patch
-/tmp/s8A8yBjZ9t/0001-Initial.patch
-/tmp/s8A8yBjZ9t/0002-Second.patch
-/tmp/s8A8yBjZ9t/0003-add-main.patch
+/tmp/encSLr06tG/0000-cover-letter.patch
+/tmp/encSLr06tG/0001-Initial.patch
+/tmp/encSLr06tG/0002-Second.patch
+/tmp/encSLr06tG/0003-add-main.patch
 (mbox) Adding cc: C O Mitter <committer@example.com> from line 'From: C O Mitter <committer@example.com>'
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com committer@example.com other@ex.com
@@ -531427,8 +531463,8 @@
 Cc: Somebody <somebody@ex.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 0/3] *** SUBJECT HERE ***
-Date: Sun, 19 Apr 2026 19:26:07 +0000
-Message-ID: <20260419192606.2291193-5-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:01 +0000
+Message-ID: <20250317133100.3512966-5-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531442,11 +531478,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 1/3] Initial.
-Date: Sun, 19 Apr 2026 19:26:08 +0000
-Message-ID: <20260419192606.2291193-6-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:02 +0000
+Message-ID: <20250317133100.3512966-6-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192606.2291193-5-from@example.com>
-References: <20260419192606.2291193-5-from@example.com>
+In-Reply-To: <20250317133100.3512966-5-from@example.com>
+References: <20250317133100.3512966-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -531459,11 +531495,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 2/3] Second.
-Date: Sun, 19 Apr 2026 19:26:09 +0000
-Message-ID: <20260419192606.2291193-7-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:03 +0000
+Message-ID: <20250317133100.3512966-7-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192606.2291193-5-from@example.com>
-References: <20260419192606.2291193-5-from@example.com>
+In-Reply-To: <20250317133100.3512966-5-from@example.com>
+References: <20250317133100.3512966-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -531476,11 +531512,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH 3/3] add main
-Date: Sun, 19 Apr 2026 19:26:10 +0000
-Message-ID: <20260419192606.2291193-8-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:04 +0000
+Message-ID: <20250317133100.3512966-8-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192606.2291193-5-from@example.com>
-References: <20260419192606.2291193-5-from@example.com>
+In-Reply-To: <20250317133100.3512966-5-from@example.com>
+References: <20250317133100.3512966-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -531501,8 +531537,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:06 +0000
-Message-ID: <20260419192606.2291730-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:31:00 +0000
+Message-ID: <20250317133100.3513453-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531524,8 +531560,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:06 +0000
-Message-ID: <20260419192606.2291730-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:31:00 +0000
+Message-ID: <20250317133100.3513453-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531561,7 +531597,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/P2Hrj7gmJb/0001-add-main.patch
+/tmp/Gk7eTL7gas/0001-add-main.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531570,8 +531606,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:07 +0000
-Message-ID: <20260419192608.2292432-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:31:02 +0000
+Message-ID: <20250317133102.3514153-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531588,7 +531624,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/uhxCqFbpLX/0001-add-main.patch
+/tmp/daANpve0gp/0001-add-main.patch
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -531597,8 +531633,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:08 +0000
-Message-ID: <20260419192608.2292662-1-nobody@example.com>
+Date: Mon, 17 Mar 2025 13:31:02 +0000
+Message-ID: <20250317133102.3514466-1-nobody@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531620,7 +531656,7 @@
 		HEAD^ &&
 	grep "From: edited-from@example.com" msgtxt1
 
-/tmp/q7lHORoF_K/0001-add-main.patch
+/tmp/8g4UaSG13L/0001-add-main.patch
 Summary email is empty, skipping it
 (mbox) Adding cc: A U Thor <author@example.com> from line 'From: A U Thor <author@example.com>'
 OK. Log says:
@@ -531630,8 +531666,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:08 +0000
-Message-ID: <20260419192608.2292998-1-edited-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:03 +0000
+Message-ID: <20250317133103.3514752-1-edited-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531665,7 +531701,7 @@
 	grep -A1 "^To:" msgtxt2 >msgtxt2.to &&
 	test_cmp expect msgtxt2.to
 
-/tmp/NkrOfwmpUm/0001-add-main.patch
+/tmp/xxI6X8gWj1/0001-add-main.patch
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com edited-to@example.com somebody@ex.com
 From: Example <from@example.com>
@@ -531673,8 +531709,8 @@
 	edited-to@example.com
 Cc: Somebody <somebody@ex.com>
 Subject: 
-Date: Sun, 19 Apr 2026 19:26:09 +0000
-Message-ID: <20260419192609.2293300-1-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:04 +0000
+Message-ID: <20250317133104.3515058-1-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -531689,11 +531725,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Sun, 19 Apr 2026 19:26:10 +0000
-Message-ID: <20260419192609.2293300-2-from@example.com>
+Date: Mon, 17 Mar 2025 13:31:05 +0000
+Message-ID: <20250317133104.3515058-2-from@example.com>
 X-Mailer: git-send-email 2.49.0.395.g12beb8f557c
-In-Reply-To: <20260419192609.2293300-1-from@example.com>
-References: <20260419192609.2293300-1-from@example.com>
+In-Reply-To: <20250317133104.3515058-1-from@example.com>
+References: <20250317133104.3515058-1-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -531704,127 +531740,6 @@
 1..215
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9144-git-svn-old-rev_map.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9144-git-svn-old-rev_map/.git/
-expecting success of 9144.1 'setup test repository with old layout': 
-	mkdir i &&
-	(cd i && > a) &&
-	svn_cmd import -m- i "$svnrepo" &&
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	test -d .git/svn/refs/remotes/git-svn/ &&
-	! test -e .git/svn/git-svn/ &&
-	mv .git/svn/refs/remotes/git-svn .git/svn/ &&
-	rm -r .git/svn/refs
-
-Adding         i/a
-Committing transaction...
-Committed revision 1.
-	A	a
-r1 = b42fb2b3a56d76ecd022054d181ab2acbf4b2a28 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
-ok 1 - setup test repository with old layout
-
-expecting success of 9144.2 'old layout continues to work': 
-	svn_cmd import -m- i "$svnrepo/b" &&
-	git svn rebase &&
-	echo a >> b/a &&
-	git add b/a &&
-	git commit -m- -a &&
-	git svn dcommit &&
-	! test -d .git/svn/refs/ &&
-	test -e .git/svn/git-svn/
-
-Adding         i/a
-Committing transaction...
-Committed revision 2.
-	A	b/a
-r2 = 675b87bc8bd4b47ab01f3e72c621348da913b21b (refs/remotes/git-svn)
-Successfully rebased and updated refs/heads/master.
-[master c62ab79] -
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = bcaacee1c10980f10f1f3f0d4db049aa7cfb9279 (refs/remotes/git-svn)
-No changes between c62ab7938e4c59350b9764ee988595f73b63a078 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 2 - old layout continues to work
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9150-svk-mergetickets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/.git/
-expecting success of 9150.1 'load svk depot': 
-	svnadmin load -q '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/svnrepo' 	  < '/build/reproducible-path/git-2.49.0+next.20250314/t/t9150/svk-merge.dump' &&
-	git svn init --minimize-url -R svkmerge 	  --rewrite-root=http://svn.example.org 	  -T trunk -b branches 'file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9150-svk-mergetickets/svnrepo' &&
-	git svn fetch --all
-	
-r1 = b53c4e1a175ef8929e6e4aab56280e58a0de64a8 (refs/remotes/origin/trunk)
-	A	Makefile
-r2 = 90f5e8071f5b77e35b17e90dec357e5c88edec7f (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/branches/left, 2
-Found branch parent: (refs/remotes/origin/left) 90f5e8071f5b77e35b17e90dec357e5c88edec7f
-Following parent with do_switch
-Successfully followed parent
-r3 = 79d9656e5bf2f11fc8ec4e9a20e1cea4615a760a (refs/remotes/origin/left)
-	M	Makefile
-r4 = 86c978a5a9e208309128c39af65ada54e20c81ab (refs/remotes/origin/left)
-	M	Makefile
-r5 = 242969651859ed31ccc35c99fab280c17353acd2 (refs/remotes/origin/trunk)
-	M	Makefile
-r6 = 9682859fd9aa34c6573af588d38b75aaaeaa1918 (refs/remotes/origin/left)
-	M	Makefile
-Found merge parent (svk:merge ticket): 9682859fd9aa34c6573af588d38b75aaaeaa1918
-r7 = 8f305e8c49bb2f343a16bd4f0bd3386700698bf5 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9150-svk-mergetickets/svnrepo/trunk r7
-ok 1 - load svk depot
-
-expecting success of 9150.2 'svk merges were represented coming in': 
-	[ 2 -eq 2 ]
-	
-ok 2 - svk merges were represented coming in
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9153-git-svn-rewrite-uuid.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
-expecting success of 9153.1 'load svn repo': 
-	svnadmin load -q '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.49.0+next.20250314/t/t9153/svn.dump' &&
-	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = 37800443a5eefd02ad93331b5c611ae8f000a689 (refs/remotes/git-svn)
-	M	foo
-r2 = 8602fdeb7d9f64441b358575727ecdd94436e652 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
-ok 1 - load svn repo
-
-expecting success of 9153.2 'verify uuid': 
-	git cat-file commit refs/remotes/git-svn~0 >actual &&
-	grep '^git-svn-id: .*@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual &&
-	git cat-file commit refs/remotes/git-svn~1 >actual &&
-	grep '^git-svn-id: .*@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual
-	
-git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-ok 2 - verify uuid
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9152-svn-empty-dirs-after-gc.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9152-svn-empty-dirs-after-gc/.git/
 expecting success of 9152.1 'initialize repo': 
@@ -531852,19 +531767,19 @@
 expecting success of 9152.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
 W: +empty_dir: a
-r1 = 86fbb913e246e0a6792dff8497f59504e158be2e (refs/remotes/git-svn)
+r1 = 6ed49bc651e691ace9a2afe6260c35afc4ac2848 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = cb272e6a57add8ac4e050a91b52cdcb2b2f9444d (refs/remotes/git-svn)
+r2 = 5cc25e6eb9c85c8e519f4a0b1eca6fdf81237567 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = f0ceab5c4f6f4ebac3e5fc7168995fcee2aa5bb3 (refs/remotes/git-svn)
+r3 = 8f47e24419de4ecaba41c03c35a6b91b844e3ef7 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = 7db658f753302036e5dce14b9c64f47be26028bf (refs/remotes/git-svn)
+r4 = d7bb56bc90ed5a9b28dc062b867d78b5c9e951f0 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = 4ef2ef1f5da78217b1cfc5510ca56b98605828a2 (refs/remotes/git-svn)
+r5 = 4ddc7d16463761c85d035e2a8a0fa255894046b7 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 11ddf5a6da471b2cd5f212da57d00d50d4323339 (refs/remotes/git-svn)
+r6 = 3c420a936bffa17782fc53ae0dc898dc2b017b4a (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = d89321a10b658d755da2968e43f654f921a1e576 (refs/remotes/git-svn)
+r7 = 845b459e63a8f122f3f7ca51bde0ac356d4fbcdc (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9152-svn-empty-dirs-after-gc/svnrepo r7
 creating empty directory: a
@@ -531912,159 +531827,33 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9148-git-svn-propset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9148-git-svn-propset/.git/
-expecting success of 9148.1 'setup propset via import': 
-	test_when_finished "rm -rf import" &&
-
-	foo_subdir2="subdir/subdir2/foo_subdir2" &&
-	mkdir -p import/subdir/subdir2 &&
-	(
-		cd import &&
-		# for "add props top level"
-		>foo &&
-		# for "add props relative"
-		>subdir/foo_subdir &&
-		# for "add props subdir"
-		>"$foo_subdir2" &&
-		svn_cmd import -m "import for git svn" . "$svnrepo"
-	)
-
-Adding         foo
-Adding         subdir
-Adding         subdir/foo_subdir
-Adding         subdir/subdir2
-Adding         subdir/subdir2/foo_subdir2
-Committing transaction...
-Committed revision 1.
-ok 1 - setup propset via import
-
-expecting success of 9148.2 'initialize git svn': 
-	git svn init "$svnrepo"
-	
-ok 2 - initialize git svn
-
-expecting success of 9148.3 'fetch revisions from svn': 
+*** t9153-git-svn-rewrite-uuid.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/.git/
+expecting success of 9153.1 'load svn repo': 
+	svnadmin load -q '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.49.0+next.20250314/t/t9153/svn.dump' &&
+	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
 	git svn fetch
 	
 	A	foo
-	A	subdir/foo_subdir
-	A	subdir/subdir2/foo_subdir2
-r1 = 4add624287ff5d0bfd6d1e1b85fb0e3f990ab977 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
-ok 3 - fetch revisions from svn
-
-expecting success of 9148.4 'add props top level': 
-	set_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
-	rm -rf svn_project
-	
-[master 3d19b26] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r2
-	M	foo
-r2 = 6635f1c8403279729a53b5797e0c30fac664b9ec (refs/remotes/git-svn)
-No changes between 3d19b26a5f1cb52efbd513ca12c2aaf463ea0999 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 2.
-ok 4 - add props top level
-
-expecting success of 9148.5 'add multiple props': 
-	set_props "." "foo" \
-		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "foo" \
-		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
-	rm -rf svn_project
-	
-[master 8fe3192] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r3
+r1 = 37800443a5eefd02ad93331b5c611ae8f000a689 (refs/remotes/git-svn)
 	M	foo
-r3 = 185ff8c2cbb6975235a69b72ab3678b57e651d09 (refs/remotes/git-svn)
-No changes between 8fe3192d6b5359a489bdc57322ff66f167fa54c1 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 3.
-ok 5 - add multiple props
-
-expecting success of 9148.6 'add props subdir': 
-	set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
-	rm -rf svn_project
-	
-[master 5255807] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/subdir2/foo_subdir2
-Committed r4
-	M	subdir/subdir2/foo_subdir2
-r4 = 2efec69bd6a6ab7016523c69dd1ca498e6ab673e (refs/remotes/git-svn)
-No changes between 5255807a68bcdf9512e53e30d5ca993c2fc85fdd and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 4.
-ok 6 - add props subdir
+r2 = 8602fdeb7d9f64441b358575727ecdd94436e652 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo r2
+ok 1 - load svn repo
 
-expecting success of 9148.7 'add props relative': 
-	set_props "subdir/subdir2" "../foo_subdir" \
-		svn:keywords "FreeBSD=%H" &&
-	git svn dcommit &&
-	svn_cmd co "$svnrepo" svn_project &&
-	confirm_props "subdir/subdir2" "../foo_subdir" \
-		svn:keywords "FreeBSD=%H" &&
-	rm -rf svn_project
+expecting success of 9153.2 'verify uuid': 
+	git cat-file commit refs/remotes/git-svn~0 >actual &&
+	grep '^git-svn-id: .*@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual &&
+	git cat-file commit refs/remotes/git-svn~1 >actual &&
+	grep '^git-svn-id: .*@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232$' actual
 	
-[master ead552e] testing propset
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/foo_subdir
-Committed r5
-	M	subdir/foo_subdir
-r5 = 4f59d5515f84db790efa3cf93e0bb4b7de85f40a (refs/remotes/git-svn)
-No changes between ead552e6d3de46daa419a2c8d200bc970752b75b and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-A    svn_project/foo
-A    svn_project/subdir
-A    svn_project/subdir/foo_subdir
-A    svn_project/subdir/subdir2
-A    svn_project/subdir/subdir2/foo_subdir2
-Checked out revision 5.
-ok 7 - add props relative
+git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+git-svn-id: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@1 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+ok 2 - verify uuid
 
-# passed all 7 test(s)
-1..7
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9104-git-svn-follow-parent.sh ***
@@ -532128,14 +531917,14 @@
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
 Initializing parent: refs/remotes/thunk@2
 	A	readme
-r1 = e42da90b2e8b9c9c8b233b7dcab4d18c61f4f020 (refs/remotes/thunk@2)
+r1 = c4c12e284cf911d3bdd9d7b2600a230b7e9c550e (refs/remotes/thunk@2)
 	M	readme
-r2 = 467590e9defe78cdbd2182efb78b3177414d622a (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) 467590e9defe78cdbd2182efb78b3177414d622a
+r2 = df2e27d427c4ae2e5654e11dfa7604f22783eba3 (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) df2e27d427c4ae2e5654e11dfa7604f22783eba3
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 29cb0a74f40da7b63dd5958f2ba44fb7d1894e78 (refs/remotes/thunk)
+r3 = 47f7a9033aafb0cd29fbf8cebc5712f6dfe482a3 (refs/remotes/thunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
 ok 2 - init and fetch a moved directory
@@ -532153,15 +531942,15 @@
 	test "$(sed -n -e "3p" actual)" = goodbye
 
 	A	readme
-r1 = e42da90b2e8b9c9c8b233b7dcab4d18c61f4f020 (refs/remotes/svn/trunk)
+r1 = c4c12e284cf911d3bdd9d7b2600a230b7e9c550e (refs/remotes/svn/trunk)
 	M	readme
-r2 = 467590e9defe78cdbd2182efb78b3177414d622a (refs/remotes/svn/trunk)
+r2 = df2e27d427c4ae2e5654e11dfa7604f22783eba3 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 467590e9defe78cdbd2182efb78b3177414d622a
+Found branch parent: (refs/remotes/svn/thunk) df2e27d427c4ae2e5654e11dfa7604f22783eba3
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 29cb0a74f40da7b63dd5958f2ba44fb7d1894e78 (refs/remotes/svn/thunk)
+r3 = 47f7a9033aafb0cd29fbf8cebc5712f6dfe482a3 (refs/remotes/svn/thunk)
 ok 3 - init and fetch from one svn-remote
 
 expecting success of 9104.4 'follow deleted parent': 
@@ -532180,10 +531969,10 @@
 Committing transaction...
 Committed revision 4.
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 467590e9defe78cdbd2182efb78b3177414d622a
+Found branch parent: (refs/remotes/svn/junk) df2e27d427c4ae2e5654e11dfa7604f22783eba3
 Following parent with do_switch
 Successfully followed parent
-r4 = 69889a818d7eb9be7807a1cdf61558106e41bbbd (refs/remotes/svn/junk)
+r4 = f888b86b2c9b046ddedcb840c5f2ee4a8d9726e6 (refs/remotes/svn/junk)
 ok 4 - follow deleted parent
 
 expecting success of 9104.5 'follow larger parent': 
@@ -532218,17 +532007,17 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	file
-r5 = 543756b54fcece95d70e091746a8737b14044e62 (refs/remotes/larger)
+r5 = 364810d7866ed1223a13ef44c045e2b22cc99c64 (refs/remotes/larger)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 543756b54fcece95d70e091746a8737b14044e62
+Found branch parent: (refs/remotes/larger-parent) 364810d7866ed1223a13ef44c045e2b22cc99c64
 Following parent with do_switch
 Successfully followed parent
-r6 = b2afc8678e99f5e073dd0afe904904359e0aac87 (refs/remotes/larger-parent)
-543756b54fcece95d70e091746a8737b14044e62
-b2afc8678e99f5e073dd0afe904904359e0aac87
+r6 = 8ae1b187e0cc36a48e671dcdf09af69afd58af27 (refs/remotes/larger-parent)
+364810d7866ed1223a13ef44c045e2b22cc99c64
+8ae1b187e0cc36a48e671dcdf09af69afd58af27
 ok 5 - follow larger parent
 
 expecting success of 9104.6 'follow higher-level parent': 
@@ -532261,13 +532050,13 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 10b4d88395b3697981bc77abc4d80ca293bdd881 (refs/remotes/blob@9)
+r7 = aa3120a439c8817bde0a656dcc896ef2ce9f4770 (refs/remotes/blob@9)
 	A	hi
-r8 = eb7ea7e3a0f7c2d2f548d2e8d24f025ece8726e1 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) eb7ea7e3a0f7c2d2f548d2e8d24f025ece8726e1
+r8 = d1f9546294f3a1055e56a6df98a933faf62f4b4c (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) d1f9546294f3a1055e56a6df98a933faf62f4b4c
 Following parent with do_switch
 Successfully followed parent
-r10 = 5233b7f3bf4a61f32851474f346448982d7c3e22 (refs/remotes/blob)
+r10 = 0b779e215156f1a09cd12e42a79acbfc07ea26d7 (refs/remotes/blob)
 ok 6 - follow higher-level parent
 
 expecting success of 9104.7 'follow deleted directory': 
@@ -532285,17 +532074,17 @@
 Committed revision 12.
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = 570af1423f385c3c186cb7880805b4eb9a831f8c (refs/remotes/glob)
+r9 = 794f7d51e98b63d6ffa3da8bfb40bd958dfdc19c (refs/remotes/glob)
 	A	blob/hi
-r10 = af3a084a32b704e56b0f9e444a02b06bdafabbc1 (refs/remotes/glob)
+r10 = 6b59604fc1337e1c1eb87b04279f77deb0c7847f (refs/remotes/glob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = f35d50107ad8fbf39c9a1b7d0d5684b7b07d16cb (refs/remotes/glob)
+r11 = 5d417be82481bb7591eeed7c4af7b812b650af85 (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = bfd73a8973b9c6f982112857284c7c5b55e99f08 (refs/remotes/blob)
+r11 = e3e9fed2c7f9918b8fdc53a4b1d624b9f18dde95 (refs/remotes/blob)
 ok 7 - follow deleted directory
 
 expecting success of 9104.8 'follow-parent avoids deleting relevant info': 
@@ -532397,12 +532186,12 @@
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 998d1d1ed8d4cdb37d8239a555a082950919ac7d (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 998d1d1ed8d4cdb37d8239a555a082950919ac7d
+r13 = 83a0a212a57ef95c224720f0a8fce5b04bcca4ab (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 83a0a212a57ef95c224720f0a8fce5b04bcca4ab
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = cb4a427a5fe99bccf8406ed068805f3fd7737ed1 (refs/remotes/r9270-t)
+r14 = 4237288cec04734de7bd5823510d8d31cbb77762 (refs/remotes/r9270-t)
 ok 8 - follow-parent avoids deleting relevant info
 
 expecting success of 9104.9 'track initial change if it was only made to parent': 
@@ -532422,10 +532211,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 branch_from: /r9270/trunk => /r9270/trunk/subversion/bindings/swig/perl/native/t
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t, 14
-Found branch parent: (refs/remotes/r9270-d) cb4a427a5fe99bccf8406ed068805f3fd7737ed1
+Found branch parent: (refs/remotes/r9270-d) 4237288cec04734de7bd5823510d8d31cbb77762
 Following parent with do_switch
 Successfully followed parent
-r15 = b31fa244ce4a2374cc83b19ec95ac4018b64b104 (refs/remotes/r9270-d)
+r15 = 2b24eeb547111362da0057c411c5c0fbbf458742 (refs/remotes/r9270-d)
 ok 9 - track initial change if it was only made to parent
 
 expecting success of 9104.10 'follow-parent is atomic': 
@@ -532551,41 +532340,41 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = 796f8a00a489ae66114929e28edb13eaf66af852 (refs/remotes/stunk)
+r16 = c20bd39ecbfab21a9910f16ed7a0aacb06f18c06 (refs/remotes/stunk)
 	M	readme
-r17 = 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c (refs/remotes/stunk)
+r17 = f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b (refs/remotes/stunk)
 	M	readme
-r18 = 4c981706d574a804e6911fe5ee0e74aedce40bf9 (refs/remotes/stunk)
+r18 = 658e976a809a1b832d2bc0e7780c2b95dc963e2b (refs/remotes/stunk)
 1+0 records in
 1+0 records out
-24 bytes copied, 3.084e-05 s, 778 kB/s
+24 bytes copied, 3.1e-05 s, 774 kB/s
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
 Initializing parent: refs/remotes/flunk@18
 	M	readme
-r17 = 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c (refs/remotes/flunk@18)
+r17 = f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b (refs/remotes/flunk@18)
 	M	readme
-r18 = 4c981706d574a804e6911fe5ee0e74aedce40bf9 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) 4c981706d574a804e6911fe5ee0e74aedce40bf9
+r18 = 658e976a809a1b832d2bc0e7780c2b95dc963e2b (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) 658e976a809a1b832d2bc0e7780c2b95dc963e2b
 Following parent with do_switch
 Successfully followed parent
-r19 = 338cb40dda846eeedadde90515280840df50a561 (refs/remotes/flunk)
+r19 = e7b6c13ae70af498cffef1296819b34a68dc5200 (refs/remotes/flunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = 796f8a00a489ae66114929e28edb13eaf66af852 (refs/remotes/stunk)
+r16 = c20bd39ecbfab21a9910f16ed7a0aacb06f18c06 (refs/remotes/stunk)
 	M	readme
-r17 = 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c (refs/remotes/stunk)
+r17 = f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b (refs/remotes/stunk)
 	M	readme
-r18 = 4c981706d574a804e6911fe5ee0e74aedce40bf9 (refs/remotes/stunk)
+r18 = 658e976a809a1b832d2bc0e7780c2b95dc963e2b (refs/remotes/stunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c
+Found branch parent: (refs/remotes/flunked) f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b
 Following parent with do_switch
 Successfully followed parent
-r20 = 0b7d94a32f5b39f879e4829af6ef063f027fce24 (refs/remotes/flunked)
+r20 = eabfafe34fee79e0467f51058082c69c74de9930 (refs/remotes/flunked)
 ok 10 - follow-parent is atomic
 
 expecting success of 9104.11 'track multi-parent paths': 
@@ -532609,7 +532398,7 @@
 	A	trunk/subversion/bindings/swig/perl/t/c.t
 	A	trunk/subversion/bindings/swig/perl/t/larger-parent
 	A	trunk/thunk/bump/thud/file
-r13 = b9e4c42ef9e988d235183099bfd070a44c6a6842 (refs/remotes/glob@20)
+r13 = 4c8648504afacc1b079154ee5ebded03511def51 (refs/remotes/glob@20)
 	D	trunk/subversion/bindings/swig/perl/t/a.t
 	D	trunk/subversion/bindings/swig/perl/t/b.t
 	D	trunk/subversion/bindings/swig/perl/t/c.t
@@ -532629,7 +532418,7 @@
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/b.pm
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/c.pm
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/t
-r14 = 854c3d9adebbef687cd8809827bfd8fe3e8507e4 (refs/remotes/glob@20)
+r14 = a3b3dad9a80445365d0278dd6dc96e83a863f62e (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -532640,13 +532429,13 @@
 	A	drunk/subversion/bindings/swig/perl/native/t/c.t
 	A	drunk/subversion/bindings/swig/perl/native/t/larger-parent
 	A	drunk/thunk/bump/thud/file
-r15 = 9e497af7da38b681b179e6331e800d2b0c063e67 (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 9e497af7da38b681b179e6331e800d2b0c063e67
+r15 = 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 9e497af7da38b681b179e6331e800d2b0c063e67
+rereading 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54
 Following parent with do_switch
 Successfully followed parent
-r21 = ac2c1854f9193ea9eeb493406f47c442a6cbcb17 (refs/remotes/glob)
+r21 = 8341ad271222b47f3effe658f6cb7bd1b95ad166 (refs/remotes/glob)
 ok 11 - track multi-parent paths
 
 expecting success of 9104.12 'multi-fetch continues to work': 
@@ -532663,82 +532452,82 @@
 	git svn multi-fetch
 	
 	A	readme
-r1 = e42da90b2e8b9c9c8b233b7dcab4d18c61f4f020 (refs/remotes/svn/trunk)
+r1 = c4c12e284cf911d3bdd9d7b2600a230b7e9c550e (refs/remotes/svn/trunk)
 	M	readme
-r2 = 467590e9defe78cdbd2182efb78b3177414d622a (refs/remotes/svn/trunk)
+r2 = df2e27d427c4ae2e5654e11dfa7604f22783eba3 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) 467590e9defe78cdbd2182efb78b3177414d622a
+Found branch parent: (refs/remotes/svn/thunk) df2e27d427c4ae2e5654e11dfa7604f22783eba3
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 29cb0a74f40da7b63dd5958f2ba44fb7d1894e78 (refs/remotes/svn/thunk)
+r3 = 47f7a9033aafb0cd29fbf8cebc5712f6dfe482a3 (refs/remotes/svn/thunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) 467590e9defe78cdbd2182efb78b3177414d622a
+Found branch parent: (refs/remotes/svn/junk) df2e27d427c4ae2e5654e11dfa7604f22783eba3
 Following parent with do_switch
 Successfully followed parent
-r4 = 69889a818d7eb9be7807a1cdf61558106e41bbbd (refs/remotes/svn/junk)
+r4 = f888b86b2c9b046ddedcb840c5f2ee4a8d9726e6 (refs/remotes/svn/junk)
 	A	file
-r5 = 543756b54fcece95d70e091746a8737b14044e62 (refs/remotes/larger)
+r5 = 364810d7866ed1223a13ef44c045e2b22cc99c64 (refs/remotes/larger)
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) 543756b54fcece95d70e091746a8737b14044e62
+Found branch parent: (refs/remotes/larger-parent) 364810d7866ed1223a13ef44c045e2b22cc99c64
 Following parent with do_switch
 Successfully followed parent
-r6 = b2afc8678e99f5e073dd0afe904904359e0aac87 (refs/remotes/larger-parent)
-r9 = 570af1423f385c3c186cb7880805b4eb9a831f8c (refs/remotes/glob)
+r6 = 8ae1b187e0cc36a48e671dcdf09af69afd58af27 (refs/remotes/larger-parent)
+r9 = 794f7d51e98b63d6ffa3da8bfb40bd958dfdc19c (refs/remotes/glob)
 	A	blob/hi
-r10 = af3a084a32b704e56b0f9e444a02b06bdafabbc1 (refs/remotes/glob)
+r10 = 6b59604fc1337e1c1eb87b04279f77deb0c7847f (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 10b4d88395b3697981bc77abc4d80ca293bdd881 (refs/remotes/blob@9)
+r7 = aa3120a439c8817bde0a656dcc896ef2ce9f4770 (refs/remotes/blob@9)
 	A	hi
-r8 = eb7ea7e3a0f7c2d2f548d2e8d24f025ece8726e1 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) eb7ea7e3a0f7c2d2f548d2e8d24f025ece8726e1
+r8 = d1f9546294f3a1055e56a6df98a933faf62f4b4c (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) d1f9546294f3a1055e56a6df98a933faf62f4b4c
 Following parent with do_switch
 Successfully followed parent
-r10 = 5233b7f3bf4a61f32851474f346448982d7c3e22 (refs/remotes/blob)
+r10 = 0b779e215156f1a09cd12e42a79acbfc07ea26d7 (refs/remotes/blob)
 	D	blob/hi
 	A	blob/bye
 W: -empty_dir: glob/blob/hi
-r11 = f35d50107ad8fbf39c9a1b7d0d5684b7b07d16cb (refs/remotes/glob)
+r11 = 5d417be82481bb7591eeed7c4af7b812b650af85 (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = bfd73a8973b9c6f982112857284c7c5b55e99f08 (refs/remotes/blob)
+r11 = e3e9fed2c7f9918b8fdc53a4b1d624b9f18dde95 (refs/remotes/blob)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t, 13
 Initializing parent: refs/remotes/r9270-t@13
 	A	a.t
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 998d1d1ed8d4cdb37d8239a555a082950919ac7d (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 998d1d1ed8d4cdb37d8239a555a082950919ac7d
+r13 = 83a0a212a57ef95c224720f0a8fce5b04bcca4ab (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 83a0a212a57ef95c224720f0a8fce5b04bcca4ab
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = cb4a427a5fe99bccf8406ed068805f3fd7737ed1 (refs/remotes/r9270-t)
+r14 = 4237288cec04734de7bd5823510d8d31cbb77762 (refs/remotes/r9270-t)
 branch_from: /r9270/trunk => /r9270/trunk/subversion/bindings/swig/perl/native/t
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t, 14
-Found branch parent: (refs/remotes/r9270-d) cb4a427a5fe99bccf8406ed068805f3fd7737ed1
+Found branch parent: (refs/remotes/r9270-d) 4237288cec04734de7bd5823510d8d31cbb77762
 Following parent with do_switch
 Successfully followed parent
-r15 = b31fa244ce4a2374cc83b19ec95ac4018b64b104 (refs/remotes/r9270-d)
+r15 = 2b24eeb547111362da0057c411c5c0fbbf458742 (refs/remotes/r9270-d)
 	A	readme
-r16 = 796f8a00a489ae66114929e28edb13eaf66af852 (refs/remotes/stunk)
+r16 = c20bd39ecbfab21a9910f16ed7a0aacb06f18c06 (refs/remotes/stunk)
 	M	readme
-r17 = 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c (refs/remotes/stunk)
+r17 = f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b (refs/remotes/stunk)
 	M	readme
-r18 = 4c981706d574a804e6911fe5ee0e74aedce40bf9 (refs/remotes/stunk)
+r18 = 658e976a809a1b832d2bc0e7780c2b95dc963e2b (refs/remotes/stunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) 4c981706d574a804e6911fe5ee0e74aedce40bf9
+Found branch parent: (refs/remotes/flunk) 658e976a809a1b832d2bc0e7780c2b95dc963e2b
 Following parent with do_switch
 Successfully followed parent
-r19 = 338cb40dda846eeedadde90515280840df50a561 (refs/remotes/flunk)
+r19 = e7b6c13ae70af498cffef1296819b34a68dc5200 (refs/remotes/flunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 6c43b1f5f1a1910c4b58963876f0ac9137c0cd0c
+Found branch parent: (refs/remotes/flunked) f43e8a2b7c24fdf4bdfa5bde85cc1a63a7a3280b
 Following parent with do_switch
 Successfully followed parent
-r20 = 0b7d94a32f5b39f879e4829af6ef063f027fce24 (refs/remotes/flunked)
+r20 = eabfafe34fee79e0467f51058082c69c74de9930 (refs/remotes/flunked)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
 Initializing parent: refs/remotes/glob@20
 	A	trunk/readme
@@ -532751,7 +532540,7 @@
 	A	trunk/subversion/bindings/swig/perl/t/c.t
 	A	trunk/subversion/bindings/swig/perl/t/larger-parent
 	A	trunk/thunk/bump/thud/file
-r13 = b9e4c42ef9e988d235183099bfd070a44c6a6842 (refs/remotes/glob@20)
+r13 = 4c8648504afacc1b079154ee5ebded03511def51 (refs/remotes/glob@20)
 	D	trunk/subversion/bindings/swig/perl/t/a.t
 	D	trunk/subversion/bindings/swig/perl/t/b.t
 	D	trunk/subversion/bindings/swig/perl/t/c.t
@@ -532771,7 +532560,7 @@
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/b.pm
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/c.pm
 W: -empty_dir: r9270/trunk/subversion/bindings/swig/perl/t
-r14 = 854c3d9adebbef687cd8809827bfd8fe3e8507e4 (refs/remotes/glob@20)
+r14 = a3b3dad9a80445365d0278dd6dc96e83a863f62e (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -532782,19 +532571,174 @@
 	A	drunk/subversion/bindings/swig/perl/native/t/c.t
 	A	drunk/subversion/bindings/swig/perl/native/t/larger-parent
 	A	drunk/thunk/bump/thud/file
-r15 = 9e497af7da38b681b179e6331e800d2b0c063e67 (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 9e497af7da38b681b179e6331e800d2b0c063e67
+r15 = 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54 (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 9e497af7da38b681b179e6331e800d2b0c063e67
+rereading 6df5ce81ae18b3016e78d2791d9a8bfb67ac7b54
 Following parent with do_switch
 Successfully followed parent
-r21 = ac2c1854f9193ea9eeb493406f47c442a6cbcb17 (refs/remotes/glob)
+r21 = 8341ad271222b47f3effe658f6cb7bd1b95ad166 (refs/remotes/glob)
 ok 13 - multi-fetch works off a 'clean' repository
 
 # passed all 13 test(s)
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9148-git-svn-propset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9148-git-svn-propset/.git/
+expecting success of 9148.1 'setup propset via import': 
+	test_when_finished "rm -rf import" &&
+
+	foo_subdir2="subdir/subdir2/foo_subdir2" &&
+	mkdir -p import/subdir/subdir2 &&
+	(
+		cd import &&
+		# for "add props top level"
+		>foo &&
+		# for "add props relative"
+		>subdir/foo_subdir &&
+		# for "add props subdir"
+		>"$foo_subdir2" &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
+	)
+
+Adding         foo
+Adding         subdir
+Adding         subdir/foo_subdir
+Adding         subdir/subdir2
+Adding         subdir/subdir2/foo_subdir2
+Committing transaction...
+Committed revision 1.
+ok 1 - setup propset via import
+
+expecting success of 9148.2 'initialize git svn': 
+	git svn init "$svnrepo"
+	
+ok 2 - initialize git svn
+
+expecting success of 9148.3 'fetch revisions from svn': 
+	git svn fetch
+	
+	A	foo
+	A	subdir/foo_subdir
+	A	subdir/subdir2/foo_subdir2
+r1 = 47923260e2d9648f67198bbf077441c75b3ed9e1 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo r1
+ok 3 - fetch revisions from svn
+
+expecting success of 9148.4 'add props top level': 
+	set_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master f8d3e76] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r2
+	M	foo
+r2 = f29b9a6b42d1e4ade540b6a406ae1b676d4bcb5e (refs/remotes/git-svn)
+No changes between f8d3e76b27872e3053fddbbfb95e25cee01365b1 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 2.
+ok 4 - add props top level
+
+expecting success of 9148.5 'add multiple props': 
+	set_props "." "foo" \
+		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "foo" \
+		"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
+	rm -rf svn_project
+	
+[master d6a9a34] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r3
+	M	foo
+r3 = 8794d5c73f6f763ab810dba11f3d994dc1ce26ea (refs/remotes/git-svn)
+No changes between d6a9a347200ecbfa0b8406b5b7dd02a2a044d059 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 3.
+ok 5 - add multiple props
+
+expecting success of 9148.6 'add props subdir': 
+	set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master 79512a5] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/subdir2/foo_subdir2
+Committed r4
+	M	subdir/subdir2/foo_subdir2
+r4 = 28a182f7a3be3752fb2b5c0b1cde865e0b59f009 (refs/remotes/git-svn)
+No changes between 79512a5fe390559ed3e2339466d5253d75132132 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 4.
+ok 6 - add props subdir
+
+expecting success of 9148.7 'add props relative': 
+	set_props "subdir/subdir2" "../foo_subdir" \
+		svn:keywords "FreeBSD=%H" &&
+	git svn dcommit &&
+	svn_cmd co "$svnrepo" svn_project &&
+	confirm_props "subdir/subdir2" "../foo_subdir" \
+		svn:keywords "FreeBSD=%H" &&
+	rm -rf svn_project
+	
+[master 22a05d2] testing propset
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/foo_subdir
+Committed r5
+	M	subdir/foo_subdir
+r5 = 0b5143f747bf69fcf7fbd7b45e4c835d4ed3415e (refs/remotes/git-svn)
+No changes between 22a05d2f93de5a76744e1e5259e6aab016ec97aa and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+A    svn_project/foo
+A    svn_project/subdir
+A    svn_project/subdir/foo_subdir
+A    svn_project/subdir/subdir2
+A    svn_project/subdir/subdir2/foo_subdir2
+Checked out revision 5.
+ok 7 - add props relative
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9155-git-svn-fetch-deleted-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
 expecting success of 9155.1 'setup svn repo': 
@@ -532864,43 +532808,43 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
 	A	subdir/file
-r1 = ae56824e1eb7b089dbf7e45740390c57f17802e9 (refs/remotes/origin/trunk)
-r2 = 533e422998fcabbd1c78dc95e29c64dc97a43fcf (refs/remotes/origin/mybranch)
+r1 = c824f28d0fbcfa183d8b19fc13ecf8c09cc4f297 (refs/remotes/origin/trunk)
+r2 = 721bd6e02c90ca87fad674cd316e00b69e02ed14 (refs/remotes/origin/mybranch)
 	A	trunk/subdir/file
-r3 = b912f7d45b959c7ad28a5e5fc626cd5d8d9b71e7 (refs/remotes/origin/mybranch)
+r3 = d270275c7bdc5836bf94b76dacd18bc0e9633b6a (refs/remotes/origin/mybranch)
 	M	subdir/file
-r4 = ac91231e5d85335c678ea4de441436fba257a8a0 (refs/remotes/origin/trunk)
+r4 = 699620641e39fd96c3b818ab27dba366138355d3 (refs/remotes/origin/trunk)
 	M	trunk/subdir/file
-r5 = a2fbaed546c7a9b0d30c46e41e2f15dbd8e3df4f (refs/remotes/origin/mybranch)
+r5 = 69b7bf76baf03083e94d40d9245d33d5ccdce1eb (refs/remotes/origin/mybranch)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
 Initializing parent: refs/remotes/origin/tags/mytag@5
 	A	file
-r1 = 4017c4859c2d4681b942764530b3f4d4cb937551 (refs/remotes/origin/tags/mytag@5)
+r1 = 8126943d744d1c8f66f7ee9d4ab906ed3b2a1d03 (refs/remotes/origin/tags/mytag@5)
 	M	file
-r4 = 56918a3d0c0c5bdc5aff459aae9c9d46672bbebc (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) 56918a3d0c0c5bdc5aff459aae9c9d46672bbebc
+r4 = 84a4283e4fcc769b40988840a35e94642fecf3fb (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) 84a4283e4fcc769b40988840a35e94642fecf3fb
 Following parent with do_switch
 Successfully followed parent
-r6 = 4f1307c0449a77be1e363edc656671172eb64232 (refs/remotes/origin/tags/mytag)
+r6 = 80106e9b7a9e4fe641b9d7199abf4a6d22bb470f (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
 Initializing parent: refs/remotes/origin/tags/mytag@5-
 branch_from: /trunk => /trunk/subdir
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2
 	A	file
-r1 = 4017c4859c2d4681b942764530b3f4d4cb937551 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 4017c4859c2d4681b942764530b3f4d4cb937551
+r1 = 8126943d744d1c8f66f7ee9d4ab906ed3b2a1d03 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) 8126943d744d1c8f66f7ee9d4ab906ed3b2a1d03
 Following parent with do_switch
 Successfully followed parent
-r3 = 5fb2d19fad1389fcf02b265bdf64bba2576ab352 (refs/remotes/origin/tags/mytag@5-)
+r3 = 8a866d26eecbfa245a7cbb2c37ec9c007a57fcc2 (refs/remotes/origin/tags/mytag@5-)
 	M	file
-r5 = 56da156288064238a61a1b0fdb73b084828fa734 (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 56da156288064238a61a1b0fdb73b084828fa734
+r5 = dfdc895ac5caa895c01c7f7908bc8f69764d6d10 (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) dfdc895ac5caa895c01c7f7908bc8f69764d6d10
 Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading 56da156288064238a61a1b0fdb73b084828fa734
+rereading dfdc895ac5caa895c01c7f7908bc8f69764d6d10
 Following parent with do_switch
 Successfully followed parent
-r8 = 995c61d59d807d0b9e6d2318c89f3c8fe41d585b (refs/remotes/origin/tags/mytag)
+r8 = 6b27407301c057e8653ef3a52adc2861b1213fb2 (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
 ok 2 - fetch deleted tags from same revision with checksum error
@@ -532986,45 +532930,45 @@
 	A	subdir1/file
 	A	subdir2/file
 	A	subdir3/file
-r1 = dcdaaabf6127f4351d51988d23034fc96ebf1e8d (refs/remotes/origin/trunk)
+r1 = 85a26fcd67701a80ef044397b2dfd9792b4d5b9a (refs/remotes/origin/trunk)
 	M	subdir1/file
 	M	subdir2/file
 	M	subdir3/file
-r2 = fa8f9b6821b25985c9683feddaa7c208e0bece42 (refs/remotes/origin/trunk)
+r2 = e711f93203b99df5236efc7b5c60b20ee244a1f1 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2
 	A	file
-r1 = 1af9bdb9882bd7209b9a8f143cabd4e4b9e77653 (refs/remotes/origin/tags/mytag@2)
+r1 = 1f7268866edf6c0b3c25c13617f1caa1930af546 (refs/remotes/origin/tags/mytag@2)
 	M	file
-r2 = d83eb5ece8cf7a4114ae875dbe55aeba35dca83d (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) d83eb5ece8cf7a4114ae875dbe55aeba35dca83d
+r2 = d0d951736600038163cb92726f175c1d94954e58 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) d0d951736600038163cb92726f175c1d94954e58
 Following parent with do_switch
 Successfully followed parent
-r3 = 514c643fb9ea34994c6f8fabac6cd0aaf8e0d1ae (refs/remotes/origin/tags/mytag)
+r3 = 09bf4024b5fea795dc10b6a47415ad0cb6325096 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2-
 	A	file
-r1 = bdc7353fbdc43813cd1d146603132a5a3ab3b425 (refs/remotes/origin/tags/mytag@2-)
+r1 = d889973a4ab4264dc8ed899df4d62513b6f04c63 (refs/remotes/origin/tags/mytag@2-)
 	M	file
-r2 = 4990e2d18a40a9828d78f4c49a3e16c5cef2516d (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 4990e2d18a40a9828d78f4c49a3e16c5cef2516d
+r2 = 56c05631341df6a9c90b6b593a4946f20db88e1e (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 56c05631341df6a9c90b6b593a4946f20db88e1e
 Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading 4990e2d18a40a9828d78f4c49a3e16c5cef2516d
+rereading 56c05631341df6a9c90b6b593a4946f20db88e1e
 Following parent with do_switch
 Successfully followed parent
-r5 = 02a42d23f23a378bb5908a3fef4dc73e3c31cfec (refs/remotes/origin/tags/mytag)
+r5 = f3e50a91d8cc0300470e0f1178d356b02848709c (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2--
 	A	file
-r1 = 8b72983ad64702c2b88139b31735a5d9d888f7a1 (refs/remotes/origin/tags/mytag@2--)
+r1 = 43d8a8606afb10cb854151a87c8352ebadea94c7 (refs/remotes/origin/tags/mytag@2--)
 	M	file
-r2 = 388072ae534573c854a5ced7c470c7ea1ca724d5 (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) 388072ae534573c854a5ced7c470c7ea1ca724d5
+r2 = df996718b158034a6cf973708dc45d043269aff4 (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) df996718b158034a6cf973708dc45d043269aff4
 Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading 388072ae534573c854a5ced7c470c7ea1ca724d5
+rereading df996718b158034a6cf973708dc45d043269aff4
 Following parent with do_switch
 Successfully followed parent
-r7 = 54985e3be13828cc309bb8be42da783c8a595d97 (refs/remotes/origin/tags/mytag)
+r7 = 6fa72edaefe0255a6e7b5dc211d3a7cf8d20079f (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk r2
 ok 2 - fetch deleted tags from same revision with no checksum error
@@ -533033,6 +532977,102 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9158-git-svn-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9158-git-svn-mergeinfo/.git/
+expecting success of 9158.1 'initialize source svn repo': 
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "initial commit"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Checked out revision 1.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+ok 1 - initialize source svn repo
+
+expecting success of 9158.2 'clone svn repo': 
+	git svn init "$svnrepo"/trunk &&
+	git svn fetch
+
+r1 = f6b6f8968e71b78ecc5eb5b448b0cbfd8a95f7f2 (refs/remotes/git-svn)
+	A	foo
+r2 = a27915e5f2d5610d4c9f174101af11dc94e81178 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk r2
+ok 2 - clone svn repo
+
+expecting success of 9158.3 'change svn:mergeinfo': 
+	touch bar &&
+	git add bar &&
+	git commit -m "bar" &&
+	git svn dcommit --mergeinfo="/branches/foo:1-10"
+
+[master 2e8016f] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 bar
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
+	A	bar
+Committed r3
+	A	bar
+Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
+Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
+r3 = 93a78ef10749356e10fd670358036599d47e66bb (refs/remotes/git-svn)
+No changes between 2e8016f50c118819b38adf0377714aabb8805c61 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 3 - change svn:mergeinfo
+
+expecting success of 9158.4 'verify svn:mergeinfo': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
+	test "$mergeinfo" = "/branches/foo:1-10"
+
+ok 4 - verify svn:mergeinfo
+
+expecting success of 9158.5 'change svn:mergeinfo multiline': 
+	touch baz &&
+	git add baz &&
+	git commit -m "baz" &&
+	git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
+
+[master 0b35d27] baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 baz
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
+	A	baz
+Committed r4
+	A	baz
+Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
+Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
+Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
+r4 = 3bbfc44066b5c8128e81200cf35a996995787b3b (refs/remotes/git-svn)
+No changes between 0b35d2769c59377cd6e8a9dbea0a07bd9d61716d and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 5 - change svn:mergeinfo multiline
+
+expecting success of 9158.6 'verify svn:mergeinfo multiline': 
+	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
+	test "$mergeinfo" = "/branches/bar:1-10
+/branches/other:3-5,8,10-11"
+
+ok 6 - verify svn:mergeinfo multiline
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9147-git-svn-include-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9147-git-svn-include-paths/.git/
 expecting success of 9147.1 'setup test repository': 
@@ -533087,8 +533127,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9147-git-svn-include-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = da7eaa2d7e4d5fedffee2c172207447ac14dd566 (refs/remotes/git-svn)
-r2 = d19d1133b9ec3acdc611a19c6b0fe682b0e4c79f (refs/remotes/git-svn)
+r1 = a2cab8f20fb70db18176357996b9ca6f28fb9ae6 (refs/remotes/git-svn)
+r2 = 1ba408f3c7fcd3b7ec7c76c9704da1559f657f0c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 2 - clone an SVN repository with filter to include qqq directory
@@ -533103,8 +533143,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9147-git-svn-include-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = da7eaa2d7e4d5fedffee2c172207447ac14dd566 (refs/remotes/git-svn)
-r2 = d19d1133b9ec3acdc611a19c6b0fe682b0e4c79f (refs/remotes/git-svn)
+r1 = a2cab8f20fb70db18176357996b9ca6f28fb9ae6 (refs/remotes/git-svn)
+r2 = 1ba408f3c7fcd3b7ec7c76c9704da1559f657f0c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with included qqq directory
@@ -533147,7 +533187,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 7896456dfa89185919cd061459d7b5fd611b8828 (refs/remotes/git-svn)
+r3 = 71fa141a13e024f88098a03e2eeb6f171e526101 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config include)
 
@@ -533162,7 +533202,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 7896456dfa89185919cd061459d7b5fd611b8828 (refs/remotes/git-svn)
+r3 = 71fa141a13e024f88098a03e2eeb6f171e526101 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option include)
 
@@ -533194,7 +533234,7 @@
 		rm expect expect2
 	)
 
-r4 = 2b8e694394efdc24b9edadbcf0af09b54adaffab (refs/remotes/git-svn)
+r4 = 593c857dc558c518e003cf5be9d0fae0e9a7e4bf (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config include)
 
@@ -533208,7 +533248,7 @@
 		rm expect expect2
 	)
 
-r4 = 2b8e694394efdc24b9edadbcf0af09b54adaffab (refs/remotes/git-svn)
+r4 = 593c857dc558c518e003cf5be9d0fae0e9a7e4bf (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option include)
 
@@ -533243,7 +533283,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 6a074f95dda2e910bf4c9d102896593eb236cc1c (refs/remotes/git-svn)
+r5 = 5878dd515a9a0bfca4b8dae16c6a9745aa961d7a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config include)
 
@@ -533258,7 +533298,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 6a074f95dda2e910bf4c9d102896593eb236cc1c (refs/remotes/git-svn)
+r5 = 5878dd515a9a0bfca4b8dae16c6a9745aa961d7a (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option include)
 
@@ -533266,100 +533306,151 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9158-git-svn-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9158-git-svn-mergeinfo/.git/
-expecting success of 9158.1 'initialize source svn repo': 
+*** t9157-git-svn-fetch-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9157-git-svn-fetch-merge/.git/
+expecting success of 9157.1 'initialize source svn repo': 
 	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd mkdir -m x "$svnrepo"/branches &&
 	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
 	(
 		cd "$SVN_TREE" &&
 		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "initial commit"
+		svn add foo &&
+		svn commit -m "initial commit" &&
+		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
+		touch bar &&
+		svn add bar &&
+		svn commit -m x &&
+		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
+		svn switch "$svnrepo"/branches/branch1 &&
+		touch baz &&
+		svn add baz &&
+		svn commit -m x &&
+		svn switch "$svnrepo"/trunk &&
+		svn merge "$svnrepo"/branches/branch1 &&
+		svn commit -m "merge" &&
+		svn switch "$svnrepo"/branches/branch1 &&
+		svn commit -m x &&
+		svn switch "$svnrepo"/branches/branch2 &&
+		svn merge "$svnrepo"/branches/branch1 &&
+		svn commit -m "merge branch1" &&
+		svn switch "$svnrepo"/trunk &&
+		svn merge "$svnrepo"/branches/branch2 &&
+		svn resolved baz &&
+		svn commit -m "merge branch2"
 	) &&
 	rm -rf "$SVN_TREE"
 
 Committing transaction...
 Committed revision 1.
-Checked out revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
 A         foo
 Adding         foo
 Transmitting file data .done
 Committing transaction...
-Committed revision 2.
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+A         bar
+Adding         bar
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+D    bar
+Updated to revision 6.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+D    baz
+A    bar
+Updated to revision 7.
+--- Merging r4 through r7 into '.':
+A    baz
+--- Recording mergeinfo for merge of r4 through r7 into '.':
+ U   .
+Sending        .
+Adding         baz
+Committing transaction...
+Committed revision 8.
+D    bar
+ U   .
+Updated to revision 8.
+D    baz
+A    bar
+Updated to revision 8.
+--- Merging r4 through r8 into '.':
+A    baz
+--- Recording mergeinfo for merge of r4 through r8 into '.':
+ U   .
+Sending        .
+Adding         baz
+Committing transaction...
+Committed revision 9.
+ U   .
+Updated to revision 9.
+--- Merging r6 through r9 into '.':
+   C baz
+ G   .
+--- Recording mergeinfo for merge of r6 through r9 into '.':
+ G   .
+Searching tree conflict details for 'baz' in repository:
+ done
+Summary of conflicts:
+  Tree conflicts: 1
+Resolved conflicted state of 'baz'
+Sending        .
+Committing transaction...
+Committed revision 10.
 ok 1 - initialize source svn repo
 
-expecting success of 9158.2 'clone svn repo': 
-	git svn init "$svnrepo"/trunk &&
+expecting success of 9157.2 'clone svn repo': 
+	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 8cd7bd2fdc673ebfa864b815c7ddd30f24a0c07e (refs/remotes/git-svn)
+r1 = 3c73fbcd8b47fd3a8bd960227c23abcabe4e8c7f (refs/remotes/origin/trunk)
 	A	foo
-r2 = 7f9c6a39041244b404c3b388f57b8492e3f27154 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk r2
-ok 2 - clone svn repo
-
-expecting success of 9158.3 'change svn:mergeinfo': 
-	touch bar &&
-	git add bar &&
-	git commit -m "bar" &&
-	git svn dcommit --mergeinfo="/branches/foo:1-10"
-
-[master e1bbcde] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 bar
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
-	A	bar
-Committed r3
+r3 = 9ffee4913ca5bf74c1da8f2ba488ec549a858d4e (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) 9ffee4913ca5bf74c1da8f2ba488ec549a858d4e
+Following parent with do_switch
+Successfully followed parent
+r4 = 6b7cce3155bd21f85c7244a6570faa7e33c006a7 (refs/remotes/origin/branch1)
 	A	bar
-Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
-Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = 4af02e9c0a43b56148aef05fa783eb6ef0ee6724 (refs/remotes/git-svn)
-No changes between e1bbcde92dbed878ed192ff594af8bf224763f2e and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 3 - change svn:mergeinfo
-
-expecting success of 9158.4 'verify svn:mergeinfo': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
-	test "$mergeinfo" = "/branches/foo:1-10"
-
-ok 4 - verify svn:mergeinfo
-
-expecting success of 9158.5 'change svn:mergeinfo multiline': 
-	touch baz &&
-	git add baz &&
-	git commit -m "baz" &&
-	git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
-
-[master c050ab3] baz
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 baz
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk ...
+r5 = 243585f1573306d7840f78220280e0db73dc0f21 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
+Found branch parent: (refs/remotes/origin/branch2) 243585f1573306d7840f78220280e0db73dc0f21
+Following parent with do_switch
+Successfully followed parent
+r6 = 3c90aea47480761871c64e98ed48a0b47b1d49a0 (refs/remotes/origin/branch2)
 	A	baz
-Committed r4
+r7 = cda110d5d81f0aefc01a7380df1f592500108dd5 (refs/remotes/origin/branch1)
 	A	baz
-Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
-Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
-Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = 6babb9b18ec6735665cdbb0ed664c81487daf1cb (refs/remotes/git-svn)
-No changes between c050ab30e87b879a90e035c4f344823deccb0257 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 5 - change svn:mergeinfo multiline
-
-expecting success of 9158.6 'verify svn:mergeinfo multiline': 
-	mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) &&
-	test "$mergeinfo" = "/branches/bar:1-10
-/branches/other:3-5,8,10-11"
+Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-7): cda110d5d81f0aefc01a7380df1f592500108dd5
+r8 = 473a76c7d24c0076656c9c8cc507c2fd9002c822 (refs/remotes/origin/trunk)
+	A	baz
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-8): cda110d5d81f0aefc01a7380df1f592500108dd5
+r9 = 1d05b7945520f6200fac35d21337ace8ead108ba (refs/remotes/origin/branch2)
+Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
+Found merge parent (/branches/branch2:6-9): 1d05b7945520f6200fac35d21337ace8ead108ba
+r10 = 748e19e545ee0731172cd5099d37bf5c4dc70c25 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk r10
+ok 2 - clone svn repo
 
-ok 6 - verify svn:mergeinfo multiline
+expecting success of 9157.3 'verify merge commit': git rev-parse HEAD^2
+1d05b7945520f6200fac35d21337ace8ead108ba
+ok 3 - verify merge commit
 
-# passed all 6 test(s)
-1..6
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9154-git-svn-fancy-glob.sh ***
@@ -533468,151 +533559,114 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9157-git-svn-fetch-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9157-git-svn-fetch-merge/.git/
-expecting success of 9157.1 'initialize source svn repo': 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd mkdir -m x "$svnrepo"/branches &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+*** t9159-git-svn-no-parent-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
+expecting success of 9159.1 'test handling of root commits in merge ranges': 
+	mkdir -p init/trunk init/branches init/tags &&
+	echo "r1" > init/trunk/file.txt &&
+	svn_cmd import -m "initial import" init "$svnrepo" &&
+	svn_cmd co "$svnrepo" tmp &&
 	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn add foo &&
-		svn commit -m "initial commit" &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn add bar &&
-		svn commit -m x &&
-		svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		touch baz &&
-		svn add baz &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge" &&
-		svn switch "$svnrepo"/branches/branch1 &&
-		svn commit -m x &&
-		svn switch "$svnrepo"/branches/branch2 &&
-		svn merge "$svnrepo"/branches/branch1 &&
-		svn commit -m "merge branch1" &&
-		svn switch "$svnrepo"/trunk &&
-		svn merge "$svnrepo"/branches/branch2 &&
-		svn resolved baz &&
-		svn commit -m "merge branch2"
+		cd tmp &&
+		echo "r2" > trunk/file.txt &&
+		svn_cmd commit -m "Modify file.txt on trunk" &&
+		svn_cmd cp trunk@1 branches/a &&
+		svn_cmd commit -m "Create branch a from trunk r1" &&
+		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
+		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
+		mkdir branches/b &&
+		echo "r5" > branches/b/file2.txt &&
+		svn_cmd add branches/b &&
+		svn_cmd commit -m "Create branch b from thin air" &&
+		echo "r6" > branches/b/file2.txt &&
+		svn_cmd commit -m "Modify file2.txt on branch b" &&
+		svn_cmd cp branches/b@5 branches/c &&
+		svn_cmd commit -m "Create branch c from branch b r5" &&
+		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
+		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
 	) &&
-	rm -rf "$SVN_TREE"
-
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+	
+Adding         init/branches
+Adding         init/tags
+Adding         init/trunk
+Adding         init/trunk/file.txt
 Committing transaction...
 Committed revision 1.
+A    tmp/branches
+A    tmp/tags
+A    tmp/trunk
+A    tmp/trunk/file.txt
+Checked out revision 1.
+Sending        trunk/file.txt
+Transmitting file data .done
 Committing transaction...
 Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
+A         branches/a
+A         branches/a/file.txt
+Adding         branches/a
 Committing transaction...
 Committed revision 3.
+property 'svn:mergeinfo' set on 'branches/a'
+Sending        branches/a
 Committing transaction...
 Committed revision 4.
-A         bar
-Adding         bar
+A         branches/b
+A         branches/b/file2.txt
+Adding         branches/b
+Adding         branches/b/file2.txt
 Transmitting file data .done
 Committing transaction...
 Committed revision 5.
+Sending        branches/b/file2.txt
+Transmitting file data .done
 Committing transaction...
 Committed revision 6.
-D    bar
-Updated to revision 6.
-A         baz
-Adding         baz
-Transmitting file data .done
+A         branches/c
+A         branches/c/file2.txt
+Adding         branches/c
 Committing transaction...
 Committed revision 7.
-D    baz
-A    bar
-Updated to revision 7.
---- Merging r4 through r7 into '.':
-A    baz
---- Recording mergeinfo for merge of r4 through r7 into '.':
- U   .
-Sending        .
-Adding         baz
+property 'svn:mergeinfo' set on 'branches/c'
+Sending        branches/c
 Committing transaction...
 Committed revision 8.
-D    bar
- U   .
-Updated to revision 8.
-D    baz
-A    bar
-Updated to revision 8.
---- Merging r4 through r8 into '.':
-A    baz
---- Recording mergeinfo for merge of r4 through r8 into '.':
- U   .
-Sending        .
-Adding         baz
-Committing transaction...
-Committed revision 9.
- U   .
-Updated to revision 9.
---- Merging r6 through r9 into '.':
-   C baz
- G   .
---- Recording mergeinfo for merge of r6 through r9 into '.':
- G   .
-Searching tree conflict details for 'baz' in repository:
- done
-Summary of conflicts:
-  Tree conflicts: 1
-Resolved conflicted state of 'baz'
-Sending        .
-Committing transaction...
-Committed revision 10.
-ok 1 - initialize source svn repo
-
-expecting success of 9157.2 'clone svn repo': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-
-r1 = 2edf4231d529cbba39dde99217818063c99ddd87 (refs/remotes/origin/trunk)
-	A	foo
-r3 = 87e6e4fbe7ba69ca1e5f3f1f8f5cadcf2cca8dc8 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 87e6e4fbe7ba69ca1e5f3f1f8f5cadcf2cca8dc8
+	A	file.txt
+r1 = 46e13da7b1fce08285097dcdc48546a9d47ae7a7 (refs/remotes/origin/trunk)
+	M	file.txt
+r2 = 4cef133b41d186c8d14a47e8e72ff0ca046d9996 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 46e13da7b1fce08285097dcdc48546a9d47ae7a7
 Following parent with do_switch
 Successfully followed parent
-r4 = 47d229659498d923ffca185a1b11b2a339e4d8e8 (refs/remotes/origin/branch1)
-	A	bar
-r5 = ea1c7304b6e7e8175e846064c5b7f9b995f6e5bf (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) ea1c7304b6e7e8175e846064c5b7f9b995f6e5bf
+r3 = 92ed3e46637c0a4cc872ed40b03fedf44578f306 (refs/remotes/origin/a)
+Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
+Found merge parent (/trunk:1-2): 4cef133b41d186c8d14a47e8e72ff0ca046d9996
+r4 = f5aeaf97abf5c75c820b79d945801883bf53669f (refs/remotes/origin/a)
+	A	file2.txt
+r5 = c106f993391f090a210782e6444a8e8dc1bb6c7d (refs/remotes/origin/b)
+	M	file2.txt
+r6 = 02666fc61a6659ef3c25ed7b3b054d8eda581fb4 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
+Found branch parent: (refs/remotes/origin/c) c106f993391f090a210782e6444a8e8dc1bb6c7d
 Following parent with do_switch
 Successfully followed parent
-r6 = 363ce9517f8461d13011379c563cbed713d9effe (refs/remotes/origin/branch2)
-	A	baz
-r7 = 873c430ef8d7b06c813c7dd6b3d65f0812404997 (refs/remotes/origin/branch1)
-	A	baz
-Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): 873c430ef8d7b06c813c7dd6b3d65f0812404997
-r8 = 96b6a9bbfd67909ba37f8873dd49eca3dbbfa48a (refs/remotes/origin/trunk)
-	A	baz
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): 873c430ef8d7b06c813c7dd6b3d65f0812404997
-r9 = 8a728401768da7c4d404ef72498b488f92bfe832 (refs/remotes/origin/branch2)
-Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): 8a728401768da7c4d404ef72498b488f92bfe832
-r10 = 5ff7e8c3499cbe104aa63e1b72556f01cee6ccdd (refs/remotes/origin/trunk)
+r7 = ce0db169c2b708d59979c0d9afb79e103b3d008d (refs/remotes/origin/c)
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/b:5-6): 02666fc61a6659ef3c25ed7b3b054d8eda581fb4
+r8 = 463286b3302e1853ca2d9ed0dec0440c6151a29d (refs/remotes/origin/c)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk r10
-ok 2 - clone svn repo
-
-expecting success of 9157.3 'verify merge commit': git rev-parse HEAD^2
-8a728401768da7c4d404ef72498b488f92bfe832
-ok 3 - verify merge commit
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
+ok 1 - test handling of root commits in merge ranges
 
-# passed all 3 test(s)
-1..3
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9167-git-svn-cmd-branch-subproject.sh ***
+skipping test t9167 altogether
+1..0 # SKIP skip all tests in t9167
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9146-git-svn-empty-dirs.sh ***
@@ -533642,19 +533696,19 @@
 expecting success of 9146.2 'clone': git svn clone "$svnrepo" cloned
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
 W: +empty_dir: a
-r1 = ec84c591f0c2911a200c247c6651f52bb90b6b5f (refs/remotes/git-svn)
+r1 = 1af634e5c5d461c79cd1c444779d58a7802f8263 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 526dcd7a1577f3701eadc12ce09567e4ff8b697f (refs/remotes/git-svn)
+r2 = e202e09fdbb29a7a0512aaa3b291eea1f8ad5893 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 228f8ebe78f4bfaaa6575adc600dae3c5e181327 (refs/remotes/git-svn)
+r3 = 39a476d4267110e6226eb9672812f221aa1ff790 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = d1ae7979225c19053a5d3b30c5b0fdd56313f15b (refs/remotes/git-svn)
+r4 = e8ce5f8b9d9dae80b51b745e8c081978ba75aab7 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = fc8ecf41ff1e0a0bfb9519dca97f6ca5c6db4b7c (refs/remotes/git-svn)
+r5 = 58f0889f49c3f88add57829bfdbbf20edc942174 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 3d6d5790c900acbbb606951f69ef06ef679976e7 (refs/remotes/git-svn)
+r6 = 058a220e96c1485ee147275a9f774f8be8baa090 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = f915374b69dab7c14373bad0773cd8b19ff086d1 (refs/remotes/git-svn)
+r7 = 5b2b15a94806576fcaaa8702898f6dde6a73880a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 creating empty directory: a
@@ -533691,19 +533745,19 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
 W: +empty_dir: a
-r1 = ec84c591f0c2911a200c247c6651f52bb90b6b5f (refs/remotes/git-svn)
+r1 = 1af634e5c5d461c79cd1c444779d58a7802f8263 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 526dcd7a1577f3701eadc12ce09567e4ff8b697f (refs/remotes/git-svn)
+r2 = e202e09fdbb29a7a0512aaa3b291eea1f8ad5893 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 228f8ebe78f4bfaaa6575adc600dae3c5e181327 (refs/remotes/git-svn)
+r3 = 39a476d4267110e6226eb9672812f221aa1ff790 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = d1ae7979225c19053a5d3b30c5b0fdd56313f15b (refs/remotes/git-svn)
+r4 = e8ce5f8b9d9dae80b51b745e8c081978ba75aab7 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = fc8ecf41ff1e0a0bfb9519dca97f6ca5c6db4b7c (refs/remotes/git-svn)
+r5 = 58f0889f49c3f88add57829bfdbbf20edc942174 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 3d6d5790c900acbbb606951f69ef06ef679976e7 (refs/remotes/git-svn)
+r6 = 058a220e96c1485ee147275a9f774f8be8baa090 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = f915374b69dab7c14373bad0773cd8b19ff086d1 (refs/remotes/git-svn)
+r7 = 5b2b15a94806576fcaaa8702898f6dde6a73880a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
 ok 4 - option automkdirs set to false
@@ -533720,7 +533774,7 @@
 	test_path_is_dir cloned/"! !"
 
 W: +empty_dir: ! !
-r8 = 4333f9b674ee69a06f2cccb4a68405aef6bf9838 (refs/remotes/git-svn)
+r8 = 67cf3b1aed8d2ce0f63b6d9b30d4a8794dac160f (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: ! !
 ok 6 - git svn rebase creates empty directory
@@ -533788,11 +533842,11 @@
 
 expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = 6323c2f78ff9c03b549490c3a9fd5ab8a07f43e4 (refs/remotes/origin/trunk)
+r9 = 793ada622e0c517851585bdbb3a8ed10cc4740ec (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/a
-r10 = d2d93fed540afd43bcdb3517f9f8c230c93d0444 (refs/remotes/origin/trunk)
+r10 = be13640adbb219ee2a9810ced9a913ef5df58d41 (refs/remotes/origin/trunk)
 W: +empty_dir: trunk/weird file name
-r11 = 5aad11fa48336db4a2ceafb6ac98b5b45692ae24 (refs/remotes/origin/trunk)
+r11 = 7608fd2afba5de01ce219d61384b847c866c8a8d (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
 creating empty directory: a
@@ -533824,30 +533878,30 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
 W: +empty_dir: a
-r1 = ec84c591f0c2911a200c247c6651f52bb90b6b5f (refs/remotes/git-svn)
+r1 = 1af634e5c5d461c79cd1c444779d58a7802f8263 (refs/remotes/git-svn)
 W: +empty_dir: b
-r2 = 526dcd7a1577f3701eadc12ce09567e4ff8b697f (refs/remotes/git-svn)
+r2 = e202e09fdbb29a7a0512aaa3b291eea1f8ad5893 (refs/remotes/git-svn)
 W: +empty_dir: c
-r3 = 228f8ebe78f4bfaaa6575adc600dae3c5e181327 (refs/remotes/git-svn)
+r3 = 39a476d4267110e6226eb9672812f221aa1ff790 (refs/remotes/git-svn)
 W: +empty_dir: d
-r4 = d1ae7979225c19053a5d3b30c5b0fdd56313f15b (refs/remotes/git-svn)
+r4 = e8ce5f8b9d9dae80b51b745e8c081978ba75aab7 (refs/remotes/git-svn)
 W: +empty_dir: d/e
-r5 = fc8ecf41ff1e0a0bfb9519dca97f6ca5c6db4b7c (refs/remotes/git-svn)
+r5 = 58f0889f49c3f88add57829bfdbbf20edc942174 (refs/remotes/git-svn)
 W: +empty_dir: d/e/f
-r6 = 3d6d5790c900acbbb606951f69ef06ef679976e7 (refs/remotes/git-svn)
+r6 = 058a220e96c1485ee147275a9f774f8be8baa090 (refs/remotes/git-svn)
 W: +empty_dir: weird file name
-r7 = f915374b69dab7c14373bad0773cd8b19ff086d1 (refs/remotes/git-svn)
+r7 = 5b2b15a94806576fcaaa8702898f6dde6a73880a (refs/remotes/git-svn)
 W: +empty_dir: ! !
-r8 = 4333f9b674ee69a06f2cccb4a68405aef6bf9838 (refs/remotes/git-svn)
+r8 = 67cf3b1aed8d2ce0f63b6d9b30d4a8794dac160f (refs/remotes/git-svn)
 W: +empty_dir: trunk
-r9 = a781b84d81a9da976d64979dd01b53e0bb6e348f (refs/remotes/git-svn)
+r9 = cd958dad195dd2bbd84056f3c28732ca1b8b6c6b (refs/remotes/git-svn)
 W: +empty_dir: trunk/a
-r10 = 03d8d179b65c91d7933fd7d48772edf0b0c12f55 (refs/remotes/git-svn)
+r10 = ab0b218b35fe1da8503c83ede4a1341db1f2fdd9 (refs/remotes/git-svn)
 W: +empty_dir: trunk/weird file name
-r11 = 37784064591e23dbb97e39baa59ef8a67fac6f52 (refs/remotes/git-svn)
+r11 = 728ef1737208d9c4b91a7aed41953b2c521d446c (refs/remotes/git-svn)
 	D	d
 W: -empty_dir: d
-r12 = 0e257e40c8a7149869fec903c1ab324618edb679 (refs/remotes/git-svn)
+r12 = 33d5625bcb5a93a9c1819c09d3494ade76b01066 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
 creating empty directory: ! !
@@ -533881,9 +533935,9 @@
 
 Committing transaction...
 Committed revision 13.
-HEAD is now at ec84c59 mkdir a
+HEAD is now at 1af634e mkdir a
 W: +empty_dir: gz
-r13 = 61149cd4d39bc11d695f4c9e07bb531481a6d8b8 (refs/remotes/git-svn)
+r13 = 5d34ccbbd6d55212262fb28514478406bf89a500 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 creating empty directory: gz
 ok 14 - git svn gc-ed files work
@@ -533892,116 +533946,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9167-git-svn-cmd-branch-subproject.sh ***
-skipping test t9167 altogether
-1..0 # SKIP skip all tests in t9167
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9159-git-svn-no-parent-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
-expecting success of 9159.1 'test handling of root commits in merge ranges': 
-	mkdir -p init/trunk init/branches init/tags &&
-	echo "r1" > init/trunk/file.txt &&
-	svn_cmd import -m "initial import" init "$svnrepo" &&
-	svn_cmd co "$svnrepo" tmp &&
-	(
-		cd tmp &&
-		echo "r2" > trunk/file.txt &&
-		svn_cmd commit -m "Modify file.txt on trunk" &&
-		svn_cmd cp trunk@1 branches/a &&
-		svn_cmd commit -m "Create branch a from trunk r1" &&
-		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
-		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
-		mkdir branches/b &&
-		echo "r5" > branches/b/file2.txt &&
-		svn_cmd add branches/b &&
-		svn_cmd commit -m "Create branch b from thin air" &&
-		echo "r6" > branches/b/file2.txt &&
-		svn_cmd commit -m "Modify file2.txt on branch b" &&
-		svn_cmd cp branches/b@5 branches/c &&
-		svn_cmd commit -m "Create branch c from branch b r5" &&
-		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
-		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
-	) &&
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-	
-Adding         init/branches
-Adding         init/tags
-Adding         init/trunk
-Adding         init/trunk/file.txt
-Committing transaction...
-Committed revision 1.
-A    tmp/branches
-A    tmp/tags
-A    tmp/trunk
-A    tmp/trunk/file.txt
-Checked out revision 1.
-Sending        trunk/file.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-A         branches/a
-A         branches/a/file.txt
-Adding         branches/a
-Committing transaction...
-Committed revision 3.
-property 'svn:mergeinfo' set on 'branches/a'
-Sending        branches/a
-Committing transaction...
-Committed revision 4.
-A         branches/b
-A         branches/b/file2.txt
-Adding         branches/b
-Adding         branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Sending        branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-A         branches/c
-A         branches/c/file2.txt
-Adding         branches/c
-Committing transaction...
-Committed revision 7.
-property 'svn:mergeinfo' set on 'branches/c'
-Sending        branches/c
-Committing transaction...
-Committed revision 8.
-	A	file.txt
-r1 = 88dd9b13949020bbb953adc5c42deb860f5734ad (refs/remotes/origin/trunk)
-	M	file.txt
-r2 = fa326ff16292ed65eb9072dc33ca35a98c1ccad9 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 88dd9b13949020bbb953adc5c42deb860f5734ad
-Following parent with do_switch
-Successfully followed parent
-r3 = d105f7417bbe7cf0cc99a0e8b5c9ba4601abf91e (refs/remotes/origin/a)
-Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): fa326ff16292ed65eb9072dc33ca35a98c1ccad9
-r4 = 6ff5b3fcb3d2762330cbaa0d038019db24a93a29 (refs/remotes/origin/a)
-	A	file2.txt
-r5 = 5a8914d607f2ee1de0f571c0dbcc3f223f66dd45 (refs/remotes/origin/b)
-	M	file2.txt
-r6 = 216c9f8bb04f404b1223bdfd385fb328a64e9564 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 5a8914d607f2ee1de0f571c0dbcc3f223f66dd45
-Following parent with do_switch
-Successfully followed parent
-r7 = c13f794d3f7afbe4946d9d545d96a44ffd3e229d (refs/remotes/origin/c)
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): 216c9f8bb04f404b1223bdfd385fb328a64e9564
-r8 = 2f9cf58b53cccb12d4fe1d7dfcade8b7103b2532 (refs/remotes/origin/c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
-ok 1 - test handling of root commits in merge ranges
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9141-git-svn-multiple-branches.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9141-git-svn-multiple-branches/.git/
 expecting success of 9141.1 'setup svnrepo': 
@@ -534167,95 +534111,95 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = 39c3d1d2f1b7019e2edb566288c105691765a0f0 (refs/remotes/origin/trunk)
+r1 = 04c19eeccfccb6ecae5f9b161bfeefcbac91c8fe (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) 39c3d1d2f1b7019e2edb566288c105691765a0f0
+Found branch parent: (refs/remotes/origin/first) 04c19eeccfccb6ecae5f9b161bfeefcbac91c8fe
 Following parent with do_switch
 Successfully followed parent
-r2 = 683f2583db55ab85028208436a858aa6b4f18c98 (refs/remotes/origin/first)
+r2 = 54a9ad31eb2661a9cd6cf85abeaf49d3aad6f7b1 (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) 39c3d1d2f1b7019e2edb566288c105691765a0f0
+Found branch parent: (refs/remotes/origin/tags/1.0) 04c19eeccfccb6ecae5f9b161bfeefcbac91c8fe
 Following parent with do_switch
 Successfully followed parent
-r3 = c920d7096f27e891d2900de39275e9bae8c7229f (refs/remotes/origin/tags/1.0)
+r3 = a7ff7e63bbd2d5a925518d96119dd69524b47f83 (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = 702436565b5e5ee8decc74be60ec9d04e09d17e6 (refs/remotes/origin/trunk)
+r4 = 127df335ec2d9619a22dcd302111b326eef7c151 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) 702436565b5e5ee8decc74be60ec9d04e09d17e6
+Found branch parent: (refs/remotes/origin/second) 127df335ec2d9619a22dcd302111b326eef7c151
 Following parent with do_switch
 Successfully followed parent
-r5 = 3521e096c6117c79409315ceb260b0cc102484be (refs/remotes/origin/second)
+r5 = 3cb8a15e1856c32643b94504420b5ca2956e5bee (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) 702436565b5e5ee8decc74be60ec9d04e09d17e6
+Found branch parent: (refs/remotes/origin/tags/2.0) 127df335ec2d9619a22dcd302111b326eef7c151
 Following parent with do_switch
 Successfully followed parent
-r6 = a6e6a5df6332874980172a1ccde652def02f911a (refs/remotes/origin/tags/2.0)
+r6 = 5561cc2f569a671fb7d5882c35377c59013764d0 (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = 66c5d305937c85f6e98fc7f1cba90120a9257a2d (refs/remotes/origin/trunk)
+r7 = 12a742a71da0a4da7e1cd3181174964b9ba9a35a (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) 66c5d305937c85f6e98fc7f1cba90120a9257a2d
+Found branch parent: (refs/remotes/origin/1) 12a742a71da0a4da7e1cd3181174964b9ba9a35a
 Following parent with do_switch
 Successfully followed parent
-r8 = 56addf4ebbf4d4f25c22f3729f4eb3c014a5d42f (refs/remotes/origin/1)
+r8 = d1e36af413be02f5a2742e703d210911df4b6703 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) 66c5d305937c85f6e98fc7f1cba90120a9257a2d
+Found branch parent: (refs/remotes/origin/tags/3.0) 12a742a71da0a4da7e1cd3181174964b9ba9a35a
 Following parent with do_switch
 Successfully followed parent
-r9 = 2721c818932fc6dd3da5afa2641f115d6339d918 (refs/remotes/origin/tags/3.0)
+r9 = 76552a714bcdd96ab8c584bf4c0381092917c5bb (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = 68be8934580d33bd34ab2abae293092f7c2294f8 (refs/remotes/origin/trunk)
+r10 = cc255f7961d8e6c817cae273e59fbf03fa8333ed (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/2) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r11 = 91ff46204c26f9df68091226bece89e159f1f6d5 (refs/remotes/origin/2)
+r11 = a957919dfecb552afe0b95c40e05c7f3df1e3cc5 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/tags/4.0) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r12 = 25f26c99d1b97bd002382b1e36f6b62da1ee744a (refs/remotes/origin/tags/4.0)
+r12 = 057fa0126b0be49ab93451717ee4a513f6c1744c (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = 4c29251792b41ff43fcef6da23b8ffaad02dc0e8 (refs/remotes/origin/first)
+r13 = 71f68ae9db8c02d4640287c89af9a7b7b116993a (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) 4c29251792b41ff43fcef6da23b8ffaad02dc0e8
+Found branch parent: (refs/remotes/origin/tags/v5) 71f68ae9db8c02d4640287c89af9a7b7b116993a
 Following parent with do_switch
 Successfully followed parent
-r14 = ce03485469521e4d7f1d6d3345b23d10518364cb (refs/remotes/origin/tags/v5)
+r14 = 99398538c6e889ca756d1c73615808b373c99489 (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = b34d83132bd94e462a3ced9921794dabd52e392e (refs/remotes/origin/second)
+r15 = f1681b0321cc652287a22d9e282f6f05e809ed6e (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) b34d83132bd94e462a3ced9921794dabd52e392e
+Found branch parent: (refs/remotes/origin/tags/v6) f1681b0321cc652287a22d9e282f6f05e809ed6e
 Following parent with do_switch
 Successfully followed parent
-r16 = 6a46ccf7a3f5e83dca2ca6c443e99d6557ad6ae6 (refs/remotes/origin/tags/v6)
+r16 = 5ec7a8f7b453e8d087303316c19480e0c28444cd (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 9ab9018939fd8d064f63eb3082b7350ab6dd2199 (refs/remotes/origin/1)
+r17 = 94e244c8605ab5ceb4fcb5044d580fc538a8fd6f (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 9ab9018939fd8d064f63eb3082b7350ab6dd2199
+Found branch parent: (refs/remotes/origin/tags/v7) 94e244c8605ab5ceb4fcb5044d580fc538a8fd6f
 Following parent with do_switch
 Successfully followed parent
-r18 = 9a4babfdce21b1bd9db35276600b877fbefa9839 (refs/remotes/origin/tags/v7)
+r18 = e69c8b9bf31922a430fdf492c45c092e9f03a152 (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = 47892a9c097e329532738a6ce7d41ae2f12977e5 (refs/remotes/origin/2)
+r19 = 5e32780a6288f35df564e026b3a036abc00e5eb2 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) 47892a9c097e329532738a6ce7d41ae2f12977e5
+Found branch parent: (refs/remotes/origin/tags/v8) 5e32780a6288f35df564e026b3a036abc00e5eb2
 Following parent with do_switch
 Successfully followed parent
-r20 = ee781ac2245c2d3876d91ecefeee25bb457cdb46 (refs/remotes/origin/tags/v8)
+r20 = a28aeec65eb45afa76295d35945ec380205cd738 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-4c29251792b41ff43fcef6da23b8ffaad02dc0e8
-b34d83132bd94e462a3ced9921794dabd52e392e
-9ab9018939fd8d064f63eb3082b7350ab6dd2199
-47892a9c097e329532738a6ce7d41ae2f12977e5
-c920d7096f27e891d2900de39275e9bae8c7229f
-a6e6a5df6332874980172a1ccde652def02f911a
-2721c818932fc6dd3da5afa2641f115d6339d918
-25f26c99d1b97bd002382b1e36f6b62da1ee744a
-ce03485469521e4d7f1d6d3345b23d10518364cb
-6a46ccf7a3f5e83dca2ca6c443e99d6557ad6ae6
-9a4babfdce21b1bd9db35276600b877fbefa9839
-ee781ac2245c2d3876d91ecefeee25bb457cdb46
+71f68ae9db8c02d4640287c89af9a7b7b116993a
+f1681b0321cc652287a22d9e282f6f05e809ed6e
+94e244c8605ab5ceb4fcb5044d580fc538a8fd6f
+5e32780a6288f35df564e026b3a036abc00e5eb2
+a7ff7e63bbd2d5a925518d96119dd69524b47f83
+5561cc2f569a671fb7d5882c35377c59013764d0
+76552a714bcdd96ab8c584bf4c0381092917c5bb
+057fa0126b0be49ab93451717ee4a513f6c1744c
+99398538c6e889ca756d1c73615808b373c99489
+5ec7a8f7b453e8d087303316c19480e0c28444cd
+e69c8b9bf31922a430fdf492c45c092e9f03a152
+a28aeec65eb45afa76295d35945ec380205cd738
 ok 2 - clone multiple branch and tag paths
 
 expecting success of 9141.3 'Multiple branch or tag paths require -d': 
@@ -534322,40 +534266,40 @@
 
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/New1) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r21 = 0c845bb3bc18e5dc9eaf8fd2393ee7cba925901f (refs/remotes/origin/New1)
+r21 = 419b58d59c6c4a4d34b7c5c7270805eced35a3f5 (refs/remotes/origin/New1)
 Updating '.':
 A    b_one/New1
 A    b_one/New1/a.file
 Updated to revision 21.
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/New2) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r22 = efb17822254ec2db50cc3dd98973cafbf8b7aa74 (refs/remotes/origin/New2)
+r22 = 330ac57bfaf73e2df3ecf649b6ab1b4a3e13ad2a (refs/remotes/origin/New2)
 Updating '.':
 A    b_two/New2
 A    b_two/New2/a.file
 Updated to revision 22.
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/tags/Tag1) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r23 = 2d3ab1ed11f9410656a8313228113e02f92d7ae9 (refs/remotes/origin/tags/Tag1)
+r23 = 9b7cc650f84b9ce8f48ba8ec83e161af6f660e87 (refs/remotes/origin/tags/Tag1)
 Updating '.':
 A    tags_A/Tag1
 A    tags_A/Tag1/a.file
 Updated to revision 23.
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) 68be8934580d33bd34ab2abae293092f7c2294f8
+Found branch parent: (refs/remotes/origin/tags/Tag2) cc255f7961d8e6c817cae273e59fbf03fa8333ed
 Following parent with do_switch
 Successfully followed parent
-r24 = a1dbda7727d5ff61e4855c02dc03621b11205ebd (refs/remotes/origin/tags/Tag2)
+r24 = a599fd1ef55a0e7448bf41c362ffee10504cb93c (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -534438,29 +534382,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 53d7b8c184701daf8072d1fb9bf02169057f5bdc (refs/remotes/origin/trunk)
+r1 = 3310d774213ffe3e7bd58ab2ee9c68a57f8e108f (refs/remotes/origin/trunk)
 	A	foo
-r3 = 316a77c6afc5a707d96fac144506a793d085c6fb (refs/remotes/origin/trunk)
+r3 = a4b1c1c5581f868299454494ee019d38785be1f3 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 316a77c6afc5a707d96fac144506a793d085c6fb
+Found branch parent: (refs/remotes/origin/branch1) a4b1c1c5581f868299454494ee019d38785be1f3
 Following parent with do_switch
 Successfully followed parent
-r4 = 1c32329839d7223973da69601004f011925a02aa (refs/remotes/origin/branch1)
+r4 = d587ec90f486c060f8f5d208031ce67649071a69 (refs/remotes/origin/branch1)
 	A	bar
-r5 = 1528b1fabae713b20154e2086b365e6a2a59211f (refs/remotes/origin/branch1)
+r5 = 635ca257eb31e09d298c75b587c6daa140328444 (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 1528b1fabae713b20154e2086b365e6a2a59211f
+Found branch parent: (refs/remotes/origin/branch2) 635ca257eb31e09d298c75b587c6daa140328444
 Following parent with do_switch
 Successfully followed parent
-r6 = e33fdc7d4bb57d118647e4f2ee7a3e79cfbad4d3 (refs/remotes/origin/branch2)
+r6 = 1202664eb1996c5b1ebb3e1d246c992a9d979d4f (refs/remotes/origin/branch2)
 	A	baz
-r7 = c9cf48240f2bde4564d251eb8a4e9aa0f0da3ea1 (refs/remotes/origin/branch2)
+r7 = 70d0ba61274c995edfdc04b2588d1ed1089593b3 (refs/remotes/origin/branch2)
 	A	bar
 	A	baz
 Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
-Found merge parent (/branches/branch1:4-5): 1528b1fabae713b20154e2086b365e6a2a59211f
-Found merge parent (/branches/branch2:6-7): c9cf48240f2bde4564d251eb8a4e9aa0f0da3ea1
-r8 = 0c4c02a4c2c8212424a359c245ae9f89e1c7005f (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): 635ca257eb31e09d298c75b587c6daa140328444
+Found merge parent (/branches/branch2:6-7): 70d0ba61274c995edfdc04b2588d1ed1089593b3
+r8 = c51f4ee028d1b33587bbf10fa4dd6be463d5cecc (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -534475,149 +534419,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
-expecting success of 9165.1 'initialize source svn repo': 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd mkdir -m x "$svnrepo"/branches &&
-	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
-	(
-		cd "$SVN_TREE" &&
-		touch foo &&
-		svn_cmd add foo &&
-		svn_cmd commit -m "initial commit" &&
-		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
-		svn_cmd switch "$svnrepo"/branches/branch1 &&
-		touch bar &&
-		svn_cmd add bar &&
-		svn_cmd commit -m branch1 &&
-		svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
-		svn_cmd switch "$svnrepo"/branches/branch2 &&
-		touch baz &&
-		svn_cmd add baz &&
-		svn_cmd commit -m branch2 &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		touch bar2 &&
-		svn_cmd add bar2 &&
-		svn_cmd commit -m trunk &&
-		svn_cmd switch "$svnrepo"/branches/branch2 &&
-		svn_cmd merge "$svnrepo"/trunk &&
-		svn_cmd commit -m "merge trunk" &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
-		svn_cmd commit -m "merge branch2"
-	) &&
-	rm -rf "$SVN_TREE"
-
-Committing transaction...
-Committed revision 1.
-Committing transaction...
-Committed revision 2.
-Checked out revision 2.
-A         foo
-Adding         foo
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-Committing transaction...
-Committed revision 4.
-At revision 4.
-A         bar
-Adding         bar
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-At revision 6.
-A         baz
-Adding         baz
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-D    baz
-D    bar
-Updated to revision 7.
-A         bar2
-Adding         bar2
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-D    bar2
-A    bar
-A    baz
-Updated to revision 8.
---- Merging r4 through r8 into '.':
-A    bar2
---- Recording mergeinfo for merge of r4 through r8 into '.':
- U   .
-Sending        .
-Adding         bar2
-Committing transaction...
-Committed revision 9.
-D    baz
-D    bar
- U   .
-Updated to revision 9.
---- Merging differences between repository URLs into '.':
-A    bar
-A    baz
---- Recording mergeinfo for merge between repository URLs into '.':
- U   .
-Sending        .
-Adding         bar
-Adding         baz
-Committing transaction...
-Committed revision 10.
-ok 1 - initialize source svn repo
-
-expecting success of 9165.2 'clone svn repo': 
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-
-r1 = aea88c7c0149c56f48e93f5abba716b782ca6a4c (refs/remotes/origin/trunk)
-	A	foo
-r3 = a829fda7e7838bcaebf69fff9074356d4361e899 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) a829fda7e7838bcaebf69fff9074356d4361e899
-Following parent with do_switch
-Successfully followed parent
-r4 = dd66f2161efd2baef975f274186db845682c49e8 (refs/remotes/origin/branch1)
-	A	bar
-r5 = 1e3dc30a4e97d8fde05f2907cfbc6a825bddfc94 (refs/remotes/origin/branch1)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 1e3dc30a4e97d8fde05f2907cfbc6a825bddfc94
-Following parent with do_switch
-Successfully followed parent
-r6 = 598e467aaa9b4d7443e36b4081caac8ce88a7cc7 (refs/remotes/origin/branch2)
-	A	baz
-r7 = 95159126e21e9f7ce5c05017f8f4ff78636fa898 (refs/remotes/origin/branch2)
-	A	bar2
-r8 = dd1ecd05b5ec84966f734b90aa0d391ebd26eb71 (refs/remotes/origin/trunk)
-	A	bar2
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): dd1ecd05b5ec84966f734b90aa0d391ebd26eb71
-r9 = 2cdd08cb05ea85db1970df333cbd06faf9aaea99 (refs/remotes/origin/branch2)
-	A	bar
-	A	baz
-Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch1:4-5): 1e3dc30a4e97d8fde05f2907cfbc6a825bddfc94
-Found merge parent (/branches/branch2:6-9): 2cdd08cb05ea85db1970df333cbd06faf9aaea99
-r10 = 47ec225257ee3e00113a0f65f96e822a76b10014 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
-ok 2 - clone svn repo
-
-expecting success of 9165.3 'verify merge commit': x=$(git rev-parse HEAD^2) &&
-	y=$(git rev-parse origin/branch2) &&
-	test "x$x" = "x$y"
-
-ok 3 - verify merge commit
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9151-svn-mergeinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9151-svn-mergeinfo/.git/
 expecting success of 9151.1 'load svn dump': 
@@ -534688,7 +534489,7 @@
 r20 = d3a5e11772cce14223736862eaae254c6361de52 (refs/remotes/origin/left)
 	A	wham_eth
 Checking svn:mergeinfo changes since r20: 1 sources, 1 changed
-W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg 577c6d95762177126ca3068518ff8b75fcf0c25e)
+W: svn cherry-pick ignored (/branches/left-sub:19) - missing 6 commit(s) (eg 0f51792c59119f80d15583143eecc11a609f7f4b)
 r21 = 26f066648b9fbb8d41953f51720855ea7b504643 (refs/remotes/origin/left)
 	M	Makefile
 	A	README
@@ -534853,6 +534654,149 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
+expecting success of 9165.1 'initialize source svn repo': 
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd mkdir -m x "$svnrepo"/branches &&
+	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
+	(
+		cd "$SVN_TREE" &&
+		touch foo &&
+		svn_cmd add foo &&
+		svn_cmd commit -m "initial commit" &&
+		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
+		svn_cmd switch "$svnrepo"/branches/branch1 &&
+		touch bar &&
+		svn_cmd add bar &&
+		svn_cmd commit -m branch1 &&
+		svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
+		svn_cmd switch "$svnrepo"/branches/branch2 &&
+		touch baz &&
+		svn_cmd add baz &&
+		svn_cmd commit -m branch2 &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		touch bar2 &&
+		svn_cmd add bar2 &&
+		svn_cmd commit -m trunk &&
+		svn_cmd switch "$svnrepo"/branches/branch2 &&
+		svn_cmd merge "$svnrepo"/trunk &&
+		svn_cmd commit -m "merge trunk" &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
+		svn_cmd commit -m "merge branch2"
+	) &&
+	rm -rf "$SVN_TREE"
+
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Checked out revision 2.
+A         foo
+Adding         foo
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+Committing transaction...
+Committed revision 4.
+At revision 4.
+A         bar
+Adding         bar
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Committing transaction...
+Committed revision 6.
+At revision 6.
+A         baz
+Adding         baz
+Transmitting file data .done
+Committing transaction...
+Committed revision 7.
+D    baz
+D    bar
+Updated to revision 7.
+A         bar2
+Adding         bar2
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+D    bar2
+A    bar
+A    baz
+Updated to revision 8.
+--- Merging r4 through r8 into '.':
+A    bar2
+--- Recording mergeinfo for merge of r4 through r8 into '.':
+ U   .
+Sending        .
+Adding         bar2
+Committing transaction...
+Committed revision 9.
+D    bar
+D    baz
+ U   .
+Updated to revision 9.
+--- Merging differences between repository URLs into '.':
+A    bar
+A    baz
+--- Recording mergeinfo for merge between repository URLs into '.':
+ U   .
+Sending        .
+Adding         bar
+Adding         baz
+Committing transaction...
+Committed revision 10.
+ok 1 - initialize source svn repo
+
+expecting success of 9165.2 'clone svn repo': 
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+
+r1 = 9817f6d38981eecff9362106ad8fb76c2ff7397f (refs/remotes/origin/trunk)
+	A	foo
+r3 = c9cc64ec06c70e92a2274f8b6a0282c9609d2d2d (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) c9cc64ec06c70e92a2274f8b6a0282c9609d2d2d
+Following parent with do_switch
+Successfully followed parent
+r4 = babe5c87c0f51e4ac643d108c264964b0a371f19 (refs/remotes/origin/branch1)
+	A	bar
+r5 = 63eab5ebb7c02a530007f43c87a28fa3a21ba97b (refs/remotes/origin/branch1)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
+Found branch parent: (refs/remotes/origin/branch2) 63eab5ebb7c02a530007f43c87a28fa3a21ba97b
+Following parent with do_switch
+Successfully followed parent
+r6 = 8df3fd8042c0c8e5370fd901bec3981264756aae (refs/remotes/origin/branch2)
+	A	baz
+r7 = 46130dcf35522497d636ca3adf0478517597c351 (refs/remotes/origin/branch2)
+	A	bar2
+r8 = 0ee766d280af20d466ebcd67913095c059879d9c (refs/remotes/origin/trunk)
+	A	bar2
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/trunk:4-8): 0ee766d280af20d466ebcd67913095c059879d9c
+r9 = 42d09fcba6340e1eb3af30287090e67e6d9da319 (refs/remotes/origin/branch2)
+	A	bar
+	A	baz
+Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
+Found merge parent (/branches/branch1:4-5): 63eab5ebb7c02a530007f43c87a28fa3a21ba97b
+Found merge parent (/branches/branch2:6-9): 42d09fcba6340e1eb3af30287090e67e6d9da319
+r10 = f02c332dc558869b035e1212968e66193426edbc (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
+ok 2 - clone svn repo
+
+expecting success of 9165.3 'verify merge commit': x=$(git rev-parse HEAD^2) &&
+	y=$(git rev-parse origin/branch2) &&
+	test "x$x" = "x$y"
+
+ok 3 - verify merge commit
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9169-git-svn-dcommit-crlf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
 expecting success of 9169.1 'setup commit repository': 
@@ -534879,7 +534823,7 @@
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
 W: +empty_dir: dir
-r1 = b8b39071c841ced44df476fa7a83162900b40af4 (refs/remotes/git-svn)
+r1 = b0c0f11e858a45f0c560daace9d2bd2dc1252627 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
 creating empty directory: dir
@@ -534888,8 +534832,8 @@
 	A	foo
 Committed r2
 	A	foo
-r2 = aa760b4300f29a115b645337bdca89b9e19a0c40 (refs/remotes/git-svn)
-No changes between 4824c489357f9292bade8bd702ac68d6330b21eb and refs/remotes/git-svn
+r2 = 3120c6b3986a0eeacb3db2d0470c45561ef69ad1 (refs/remotes/git-svn)
+No changes between 1789f5b765e7c139aeaf2f0515a18e01af3eef4d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 1 - setup commit repository
 
@@ -535014,43 +534958,43 @@
 	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 8881fd3dfd4729d4bee4296aedb6094a2cd3b015 (refs/remotes/git-svn)
+r1 = 4caebccf88c4f003c81d8a01c7b59b86b6f7b6c2 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 57543c5ff884b6288716c8d2957f27ce3660b843 (refs/remotes/git-svn)
+r2 = 223d3003128274b00ee815dc84ed4abf11aa1981 (refs/remotes/git-svn)
 	D	4/.gitignore
 W: -empty_dir: 4/.gitignore
-r3 = 86df8aa8a022a4cda6b821a2ad5fbed105a8fd08 (refs/remotes/git-svn)
+r3 = 5814f4d2d68485c417443548fd126f646e7673e4 (refs/remotes/git-svn)
 	D	4/a/.gitignore
 W: -empty_dir: 4/a/.gitignore
-r4 = b396d4b0662ed46d40825e83c13325605e8f5b0d (refs/remotes/git-svn)
+r4 = ea5f6c577e89fc3094394d7e6925a92bfe7c58d3 (refs/remotes/git-svn)
 	D	4/a/b/.gitignore
 W: -empty_dir: 4/a/b/.gitignore
-r5 = 68c4d9fda5934dc3b129722955bb0b732a7c7e6f (refs/remotes/git-svn)
+r5 = 831a28482e80cfc06833689167b00061a18d3999 (refs/remotes/git-svn)
 	D	4/a/b/c/.gitignore
 	A	4/a/b/c/foo
 W: -empty_dir: 4/a/b/c/.gitignore
-r6 = efd86117a5d4bf9d3e71d8b6500b1ef5db72741c (refs/remotes/git-svn)
+r6 = 481fe1e0cf8ef2f0bcc9b2e930a56a9d2104d2d5 (refs/remotes/git-svn)
 	D	2/file2.txt
 	D	3/b/file1.txt
 	D	3/b/
 W: -empty_dir: 2/file2.txt
 W: -empty_dir: 3/b
-r7 = f996addaadcd9ff875cacd89d911f798e924f491 (refs/remotes/git-svn)
+r7 = 555aa2c25d9cb698d003f80a04bda85d28997d70 (refs/remotes/git-svn)
 	D	2/file1.txt
 	D	3/a/file1.txt
 	D	3/a/
 W: -empty_dir: 2/file1.txt
 W: -empty_dir: 3/a
-r8 = 86c0bcca7c013611468ebfcad3836811294780a0 (refs/remotes/git-svn)
+r8 = 14ac3955c0aa98cb93d05d1571d774630532697c (refs/remotes/git-svn)
 	D	5/.gitignore
 	A	5/.placeholder
 	D	6/.gitignore
 W: -empty_dir: 5/.gitignore
 W: -empty_dir: 6/.gitignore
-r9 = d72824cda0328648815e8dc9add82ec8df50c48d (refs/remotes/git-svn)
+r9 = be7af7f1e45a7d802a56932687da44a0c7b8d79d (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 ok 2 - clone svn repo with --preserve-empty-dirs
@@ -535100,7 +535044,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at f996add delete non-last entry in directory
+HEAD is now at 555aa2c delete non-last entry in directory
 ok 6 - remove non-last entry from directory
 
 expecting success of 9160.7 'clone svn repo with --placeholder-file specified': 
@@ -535111,40 +535055,40 @@
 	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 8881fd3dfd4729d4bee4296aedb6094a2cd3b015 (refs/remotes/git-svn)
+r1 = 4caebccf88c4f003c81d8a01c7b59b86b6f7b6c2 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 6db7e9d352893290b97f1033291a044790f04c03 (refs/remotes/git-svn)
+r2 = b9abcade121a86b587b75c04a7240e8c9cf98f02 (refs/remotes/git-svn)
 	D	4/.placeholder
 W: -empty_dir: 4/.placeholder
-r3 = 40b696a962f9eb7d0f4cb5f50a28bde0a336673d (refs/remotes/git-svn)
+r3 = fb61d0b919552f62b12d60195eb8d5cd61d8ff50 (refs/remotes/git-svn)
 	D	4/a/.placeholder
 W: -empty_dir: 4/a/.placeholder
-r4 = 56ce377a153a822e4929b92d679b74d39702c94d (refs/remotes/git-svn)
+r4 = 3f376a2c00b2314cfec6029b0b39094338215959 (refs/remotes/git-svn)
 	D	4/a/b/.placeholder
 W: -empty_dir: 4/a/b/.placeholder
-r5 = de180bdea9c5ccdaf2e31bda88d62c9ec7e39d43 (refs/remotes/git-svn)
+r5 = 506fe3f3405c31df3a31723c028d1aa1ccaa2e5c (refs/remotes/git-svn)
 	D	4/a/b/c/.placeholder
 	A	4/a/b/c/foo
 W: -empty_dir: 4/a/b/c/.placeholder
-r6 = 0a9dfde004169c13b96cd025d4be2b9e5e288128 (refs/remotes/git-svn)
+r6 = d1471c92d2bce4231658839a6eb5248a98db6c7d (refs/remotes/git-svn)
 	D	2/file2.txt
 	D	3/b/file1.txt
 	D	3/b/
 W: -empty_dir: 2/file2.txt
 W: -empty_dir: 3/b
-r7 = 50189724f47210f8bbb722d3f8a2190b0b37e97b (refs/remotes/git-svn)
+r7 = 077d1aa2161854c06144efec767872be276df2c2 (refs/remotes/git-svn)
 	D	2/file1.txt
 	D	3/a/file1.txt
 	D	3/a/
 W: -empty_dir: 2/file1.txt
 W: -empty_dir: 3/a
-r8 = 7bfbe74a2ab4f55b2ce720fa0bf23ce8c41b6377 (refs/remotes/git-svn)
+r8 = 924769dea9b9d446f687e42c49edc59224956846 (refs/remotes/git-svn)
 	A	5/.placeholder
 	D	6/.placeholder
-r9 = 2b6bbe6900ad9d17bea5dcb7cc664bf71eb471e6 (refs/remotes/git-svn)
+r9 = beab64285da363387dceb514c5e6c9b1f4ae4104 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 git-svn-repo/6/.placeholder/.placeholder
@@ -535208,7 +535152,7 @@
 	A	1/file1.txt
 	A	5/file1.txt
 W: -empty_dir: 1/.placeholder
-r10 = 7058e3ec4dd0ad8875b9f7c383aeb96c4c4379a3 (refs/remotes/git-svn)
+r10 = 80e1a473328dd14e119b3cc67ad055f76efe90a8 (refs/remotes/git-svn)
 Successfully rebased and updated refs/heads/master.
 ok 10 - second set of svn commits and rebase
 
@@ -535299,9 +535243,9 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch --revision BASE:3
 
-r1 = 5da21d625a04fa6275e7bcb1eb9747f64ae2f166 (refs/remotes/origin/trunk)
+r1 = 76b266e48c31d6d888dbabdbca93e7b26bcfd0fc (refs/remotes/origin/trunk)
 	A	foo
-r3 = 8a2852d2c941cae8d58ca9629aaa54efcd1394f3 (refs/remotes/origin/trunk)
+r3 = fe446e0346eaed000e48cc91355355a1088a1ffa (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk r3
 ok 2 - fetch to merge-base (a)
@@ -535312,19 +535256,19 @@
 	test 1 = $(git cat-file -p main|grep parent|wc -l)
 
 	A	baz
-r6 = 0342165e8e75f036599c052c1ece3f582c96a6e9 (refs/remotes/origin/trunk)
+r6 = 4183e6990de9defb4582b2daec0236cc264f3145 (refs/remotes/origin/trunk)
 	A	bar
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
 Couldn't find revmap for file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = b2cfd5e9426c68e2d61305d6989ab910cc29ddb6 (refs/remotes/origin/trunk)
+r7 = 1820da768f5bbf4a55bde92db89f83f84503c629 (refs/remotes/origin/trunk)
 Successfully rebased and updated refs/heads/main.
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 8a2852d2c941cae8d58ca9629aaa54efcd1394f3
+Found branch parent: (refs/remotes/origin/branch1) fe446e0346eaed000e48cc91355355a1088a1ffa
 Following parent with do_switch
 Successfully followed parent
-r4 = e6ca084bab1a33da9afd1f416c819e83c261c53e (refs/remotes/origin/branch1)
+r4 = b04e854c14ec0ee92a8e88f37499c2c230510826 (refs/remotes/origin/branch1)
 	A	bar
-r5 = b964afb1782bb582edef20e9c2deb045a2f4d1f4 (refs/remotes/origin/branch1)
+r5 = 9da893ce9a7f16f1c1b942f753ae5141523b6aef (refs/remotes/origin/branch1)
 ok 3 - rebase looses SVN merge (m)
 
 expecting success of 9163.4 'reset and fetch gets the SVN merge (m) correctly': 
@@ -535333,16 +535277,16 @@
 	git svn fetch &&
 	test 2 = $(git cat-file -p origin/trunk|grep parent|wc -l)
 
-r3 = 8a2852d2c941cae8d58ca9629aaa54efcd1394f3 (refs/remotes/origin/trunk)
-HEAD is now at 8a2852d a
+r3 = fe446e0346eaed000e48cc91355355a1088a1ffa (refs/remotes/origin/trunk)
+HEAD is now at fe446e0 a
 Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading 8a2852d2c941cae8d58ca9629aaa54efcd1394f3
+rereading fe446e0346eaed000e48cc91355355a1088a1ffa
 	A	baz
-r6 = 0342165e8e75f036599c052c1ece3f582c96a6e9 (refs/remotes/origin/trunk)
+r6 = 4183e6990de9defb4582b2daec0236cc264f3145 (refs/remotes/origin/trunk)
 	A	bar
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): b964afb1782bb582edef20e9c2deb045a2f4d1f4
-r7 = 08bf512e5294d535c35d578b8c19b5c418e42d6c (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-6): 9da893ce9a7f16f1c1b942f753ae5141523b6aef
+r7 = 8d8ac8d03e1efb9971933bde40e2f4caf521149d (refs/remotes/origin/trunk)
 ok 4 - reset and fetch gets the SVN merge (m) correctly
 
 # passed all 4 test(s)
@@ -535361,10 +535305,10 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = 523b5642657c839e2e3961e969443e91be82d54c (refs/remotes/git-svn)
+r1 = 063dfabdb21143a0d4cfdd778177ce58d4ed4ed8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master fe807ee] foo: first commit
+[master 074a7c9] foo: first commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
@@ -535373,8 +535317,8 @@
 	A	foo
 Committed r2
 	A	foo
-r2 = 18e190e56226ebdb08326a5d2c637e5b5cddd881 (refs/remotes/git-svn)
-No changes between fe807ee0dbb2e4c9137a593e839e167382f51ac9 and refs/remotes/git-svn
+r2 = 18abef744e89e8b9e187c1cb858a6fac2ee02fd7 (refs/remotes/git-svn)
+No changes between 074a7c9ed9e708fae12731c4e6c30ed0418d2d6e and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 1 - initialize repo
 
@@ -535389,30 +535333,30 @@
 		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
 	)
 	
-[master b78a161] change #1
+[master e45d888] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 47720b6] change #2
+[master fcee58b] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2ead005] change #3
+[master 830ef20] change #3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
 Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit b78a16141d688f0e6ad8b150c4608f4c1fac4a01
+commit e45d888f482901d07bc43a1e2cdd1c537992981e
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #1
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 47720b69ef922d0ee2963b259f6862d6a7db7dbe
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit fcee58b5c57b5817d5fa479b463261d66a7c2f19
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #2
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 2ead0052565ff91a519732f2420ccb7bb21b1b74
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 830ef2020e84435d812c5dc9d89c09af35f5d39f
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
@@ -535421,16 +535365,16 @@
 Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
 Committed r3
 	M	foo
-r3 = d1756b68c6dea5d75e124806c65199bc9b1d2917 (refs/remotes/git-svn)
+r3 = 2f5c4e55edb1f05e460fd7e3184b01dd51ac674b (refs/remotes/git-svn)
 	M	foo
 Committed r4
 	M	foo
-r4 = ecea3e4bc901ffa0315ea8a33dc7997fffbe094a (refs/remotes/git-svn)
+r4 = 8c5a94f95971962835defb1dbe850b4f9a50f190 (refs/remotes/git-svn)
 	M	foo
 Committed r5
 	M	foo
-r5 = a3a51019eb42f0fe11bc4de7fa2adbc3ef0f5ca2 (refs/remotes/git-svn)
-No changes between 2ead0052565ff91a519732f2420ccb7bb21b1b74 and refs/remotes/git-svn
+r5 = e46ff2142610e1cc07178c26d03d341df9148dd2 (refs/remotes/git-svn)
+No changes between 830ef2020e84435d812c5dc9d89c09af35f5d39f and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 2 - answers: y [\n] yes
 
@@ -535446,36 +535390,36 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master c3df4e5] change #1
+[master b07db18] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8122f09] change #2
+[master 9bb9932] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master dddbe86] change #3
+[master c4f8da9] change #3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
 Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit c3df4e52b49b0916efd49840257852cb8c0a21a1
+commit b07db18c80196cfc2ec879dea67d56037b9019db
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #1
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 8122f09d71da4ffd513220934ae8e940ea3adbd1
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 9bb9932d780b670d172c27051d9abd284938e57a
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #2
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit dddbe86117877ebde8d43caf6127e0e6c0b2d536
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit c4f8da9ad9c4a267427f779469ecf7bd00d86270
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #3
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at a3a5101 change #3
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at e46ff21 change #3
 ok 3 - answers: yes yes no
 
 expecting success of 9162.4 'answers: yes quit': 
@@ -535489,30 +535433,30 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master c3df4e5] change #1
+[master b07db18] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8122f09] change #2
+[master 9bb9932] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master dddbe86] change #3
+[master c4f8da9] change #3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
 Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit c3df4e52b49b0916efd49840257852cb8c0a21a1
+commit b07db18c80196cfc2ec879dea67d56037b9019db
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #1
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 8122f09d71da4ffd513220934ae8e940ea3adbd1
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 9bb9932d780b670d172c27051d9abd284938e57a
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
     change #2
 
-Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at a3a5101 change #3
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at e46ff21 change #3
 ok 4 - answers: yes quit
 
 expecting success of 9162.5 'answers: all': 
@@ -535525,18 +535469,18 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master c3df4e5] change #1
+[master b07db18] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8122f09] change #2
+[master 9bb9932] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master dddbe86] change #3
+[master c4f8da9] change #3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
 Committing to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit c3df4e52b49b0916efd49840257852cb8c0a21a1
+commit b07db18c80196cfc2ec879dea67d56037b9019db
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
@@ -535545,18 +535489,18 @@
 Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
 Committed r6
 	M	foo
-r6 = b695dbcf4d39b1ce7c265309769a8411e2f51ed3 (refs/remotes/git-svn)
+r6 = 0b084a33ae800186022b30a63df798566312c971 (refs/remotes/git-svn)
 	M	foo
 Committed r7
 	M	foo
-r7 = 69056c6afc0e076c1cf3a34dca3f93fa2ff8ea7e (refs/remotes/git-svn)
+r7 = d098260a930e67057f4a51ec02e8c8c9acf945c3 (refs/remotes/git-svn)
 	M	foo
 Committed r8
 	M	foo
-r8 = 5b20ff813bfaf945454e758d321593bf1881ee51 (refs/remotes/git-svn)
-No changes between dddbe86117877ebde8d43caf6127e0e6c0b2d536 and refs/remotes/git-svn
+r8 = dbf91a9688cc262d523f3dfdeffa7347a1cd049f (refs/remotes/git-svn)
+No changes between c4f8da9ad9c4a267427f779469ecf7bd00d86270 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-HEAD is now at 5b20ff8 change #3
+HEAD is now at dbf91a9 change #3
 ok 5 - answers: all
 
 # passed all 5 test(s)
@@ -535957,6 +535901,374 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9211-scalar-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/.git/
+expecting success of 9211.1 'set up repository to clone': 
+	rm -rf .git &&
+	git init to-clone &&
+	(
+		cd to-clone &&
+		git branch -m base &&
+
+		test_commit first &&
+		test_commit second &&
+		test_commit third &&
+
+		git switch -c parallel first &&
+		mkdir -p 1/2 &&
+		test_commit 1/2/3 &&
+
+		git switch base &&
+
+		# By default, permit
+		git config uploadpack.allowfilter true &&
+		git config uploadpack.allowanysha1inwant true
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/to-clone/.git/
+[base (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[base d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[base cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Switched to a new branch 'parallel'
+[parallel afe5387] 1/2/3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1/2/3.t
+Switched to branch 'base'
+ok 1 - set up repository to clone
+
+expecting success of 9211.2 'creates content in enlistment root': 
+	enlistment=cloned &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+	ls -A $enlistment >enlistment-root &&
+	test_line_count = 1 enlistment-root &&
+	test_path_is_dir $enlistment/src &&
+	test_path_is_dir $enlistment/src/.git &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 2 - creates content in enlistment root
+
+expecting success of 9211.3 'with spaces': 
+	enlistment="cloned with space" &&
+
+	scalar clone "file://$(pwd)/to-clone" "$enlistment" &&
+	test_path_is_dir "$enlistment" &&
+	test_path_is_dir "$enlistment/src" &&
+	test_path_is_dir "$enlistment/src/.git" &&
+
+	cleanup_clone "$enlistment"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/cloned with space/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 3 - with spaces
+
+expecting success of 9211.4 'partial clone if supported by server': 
+	enlistment=partial-clone &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+
+	(
+		cd $enlistment/src &&
+
+		# Two promisor packs: one for refs, the other for blobs
+		ls .git/objects/pack/pack-*.promisor >promisorlist &&
+		test_line_count = 2 promisorlist
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/partial-clone/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 4 - partial clone if supported by server
+
+expecting success of 9211.5 'fall back on full clone if partial unsupported': 
+	enlistment=no-partial-support &&
+
+	test_config -C to-clone uploadpack.allowfilter false &&
+	test_config -C to-clone uploadpack.allowanysha1inwant false &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment 2>err &&
+	grep "filtering not recognized by server, ignoring" err &&
+
+	(
+		cd $enlistment/src &&
+
+		# Still get a refs promisor file, but none for blobs
+		ls .git/objects/pack/pack-*.promisor >promisorlist &&
+		test_line_count = 1 promisorlist
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/no-partial-support/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+warning: filtering not recognized by server, ignoring
+ok 5 - fall back on full clone if partial unsupported
+
+expecting success of 9211.6 'initializes sparse-checkout by default': 
+	enlistment=sparse &&
+
+	scalar clone "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		test_cmp_config true core.sparseCheckout &&
+		test_cmp_config true core.sparseCheckoutCone
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/sparse/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 6 - initializes sparse-checkout by default
+
+expecting success of 9211.7 '--full-clone does not create sparse-checkout': 
+	enlistment=full-clone &&
+
+	scalar clone --full-clone "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		test_cmp_config "" --default "" core.sparseCheckout &&
+		test_cmp_config "" --default "" core.sparseCheckoutCone
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/full-clone/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 7 - --full-clone does not create sparse-checkout
+
+expecting success of 9211.8 '--single-branch clones HEAD only': 
+	enlistment=single-branch &&
+
+	scalar clone --single-branch "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		git for-each-ref refs/remotes/origin >out &&
+		test_line_count = 2 out &&
+		grep "refs/remotes/origin/base" out
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/single-branch/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
+ok 8 - --single-branch clones HEAD only
+
+expecting success of 9211.9 '--no-single-branch clones all branches': 
+	enlistment=no-single-branch &&
+
+	scalar clone --no-single-branch "file://$(pwd)/to-clone" $enlistment &&
+	(
+		cd $enlistment/src &&
+		git for-each-ref refs/remotes/origin >out &&
+		test_line_count = 3 out &&
+		grep "refs/remotes/origin/base" out &&
+		grep "refs/remotes/origin/parallel" out
+	) &&
+
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/no-single-branch/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
+afe53871bea8a7b2e02fc5f14f4076b8cbd8e537 commit	refs/remotes/origin/parallel
+ok 9 - --no-single-branch clones all branches
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 9211.10 'progress with tty': 
+	enlistment=progress1 &&
+
+	test_config -C to-clone uploadpack.allowfilter true &&
+	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
+	grep "Enumerating objects" stderr >actual &&
+	test_line_count = 2 actual &&
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/progress1/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 10 - progress with tty
+
+expecting success of 9211.11 'progress without tty': 
+	enlistment=progress2 &&
+
+	test_config -C to-clone uploadpack.allowfilter true &&
+	test_config -C to-clone uploadpack.allowanysha1inwant true &&
+
+	GIT_PROGRESS_DELAY=0 scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
+	! grep "Enumerating objects" stderr &&
+	! grep "Updating files" stderr &&
+	cleanup_clone $enlistment
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/progress2/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 11 - progress without tty
+
+expecting success of 9211.12 'scalar clone warns when background maintenance fails': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
+		scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
+	grep "could not turn on maintenance" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/maint-fail/src/.git/
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+warning: could not turn on maintenance
+ok 12 - scalar clone warns when background maintenance fails
+
+expecting success of 9211.13 '`scalar clone --no-src`': 
+	scalar clone --src "file://$(pwd)/to-clone" with-src &&
+	scalar clone --no-src "file://$(pwd)/to-clone" without-src &&
+
+	test_path_is_dir with-src/src &&
+	test_path_is_missing without-src/src &&
+
+	(cd with-src/src && ls ?*) >with &&
+	(cd without-src && ls ?*) >without &&
+	test_cmp with without
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/with-src/src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/without-src/.git/
+warning: filtering not recognized by server, ignoring
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'base'
+branch 'base' set up to track 'origin/base'.
+Your branch is up to date with 'origin/base'.
+ok 13 - `scalar clone --no-src`
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9303-fast-import-compression.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9303-fast-import-compression/.git/
 expecting success of 9303.1 'fast-import (packed) with -c core.compression=0': 
@@ -536539,374 +536851,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9211-scalar-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/.git/
-expecting success of 9211.1 'set up repository to clone': 
-	rm -rf .git &&
-	git init to-clone &&
-	(
-		cd to-clone &&
-		git branch -m base &&
-
-		test_commit first &&
-		test_commit second &&
-		test_commit third &&
-
-		git switch -c parallel first &&
-		mkdir -p 1/2 &&
-		test_commit 1/2/3 &&
-
-		git switch base &&
-
-		# By default, permit
-		git config uploadpack.allowfilter true &&
-		git config uploadpack.allowanysha1inwant true
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/to-clone/.git/
-[base (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[base d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[base cd7036d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Switched to a new branch 'parallel'
-[parallel afe5387] 1/2/3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1/2/3.t
-Switched to branch 'base'
-ok 1 - set up repository to clone
-
-expecting success of 9211.2 'creates content in enlistment root': 
-	enlistment=cloned &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
-	ls -A $enlistment >enlistment-root &&
-	test_line_count = 1 enlistment-root &&
-	test_path_is_dir $enlistment/src &&
-	test_path_is_dir $enlistment/src/.git &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 2 - creates content in enlistment root
-
-expecting success of 9211.3 'with spaces': 
-	enlistment="cloned with space" &&
-
-	scalar clone "file://$(pwd)/to-clone" "$enlistment" &&
-	test_path_is_dir "$enlistment" &&
-	test_path_is_dir "$enlistment/src" &&
-	test_path_is_dir "$enlistment/src/.git" &&
-
-	cleanup_clone "$enlistment"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/cloned with space/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 3 - with spaces
-
-expecting success of 9211.4 'partial clone if supported by server': 
-	enlistment=partial-clone &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
-
-	(
-		cd $enlistment/src &&
-
-		# Two promisor packs: one for refs, the other for blobs
-		ls .git/objects/pack/pack-*.promisor >promisorlist &&
-		test_line_count = 2 promisorlist
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/partial-clone/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 4 - partial clone if supported by server
-
-expecting success of 9211.5 'fall back on full clone if partial unsupported': 
-	enlistment=no-partial-support &&
-
-	test_config -C to-clone uploadpack.allowfilter false &&
-	test_config -C to-clone uploadpack.allowanysha1inwant false &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment 2>err &&
-	grep "filtering not recognized by server, ignoring" err &&
-
-	(
-		cd $enlistment/src &&
-
-		# Still get a refs promisor file, but none for blobs
-		ls .git/objects/pack/pack-*.promisor >promisorlist &&
-		test_line_count = 1 promisorlist
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/no-partial-support/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-warning: filtering not recognized by server, ignoring
-ok 5 - fall back on full clone if partial unsupported
-
-expecting success of 9211.6 'initializes sparse-checkout by default': 
-	enlistment=sparse &&
-
-	scalar clone "file://$(pwd)/to-clone" $enlistment &&
-	(
-		cd $enlistment/src &&
-		test_cmp_config true core.sparseCheckout &&
-		test_cmp_config true core.sparseCheckoutCone
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/sparse/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 6 - initializes sparse-checkout by default
-
-expecting success of 9211.7 '--full-clone does not create sparse-checkout': 
-	enlistment=full-clone &&
-
-	scalar clone --full-clone "file://$(pwd)/to-clone" $enlistment &&
-	(
-		cd $enlistment/src &&
-		test_cmp_config "" --default "" core.sparseCheckout &&
-		test_cmp_config "" --default "" core.sparseCheckoutCone
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/full-clone/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 7 - --full-clone does not create sparse-checkout
-
-expecting success of 9211.8 '--single-branch clones HEAD only': 
-	enlistment=single-branch &&
-
-	scalar clone --single-branch "file://$(pwd)/to-clone" $enlistment &&
-	(
-		cd $enlistment/src &&
-		git for-each-ref refs/remotes/origin >out &&
-		test_line_count = 2 out &&
-		grep "refs/remotes/origin/base" out
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/single-branch/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
-ok 8 - --single-branch clones HEAD only
-
-expecting success of 9211.9 '--no-single-branch clones all branches': 
-	enlistment=no-single-branch &&
-
-	scalar clone --no-single-branch "file://$(pwd)/to-clone" $enlistment &&
-	(
-		cd $enlistment/src &&
-		git for-each-ref refs/remotes/origin >out &&
-		test_line_count = 3 out &&
-		grep "refs/remotes/origin/base" out &&
-		grep "refs/remotes/origin/parallel" out
-	) &&
-
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/no-single-branch/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-cd7036d3271be3d37ad73318fcc1838bd64f7f42 commit	refs/remotes/origin/base
-afe53871bea8a7b2e02fc5f14f4076b8cbd8e537 commit	refs/remotes/origin/parallel
-ok 9 - --no-single-branch clones all branches
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 9211.10 'progress with tty': 
-	enlistment=progress1 &&
-
-	test_config -C to-clone uploadpack.allowfilter true &&
-	test_config -C to-clone uploadpack.allowanysha1inwant true &&
-
-	test_terminal env GIT_PROGRESS_DELAY=0 \
-		scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
-	grep "Enumerating objects" stderr >actual &&
-	test_line_count = 2 actual &&
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/progress1/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 10 - progress with tty
-
-expecting success of 9211.11 'progress without tty': 
-	enlistment=progress2 &&
-
-	test_config -C to-clone uploadpack.allowfilter true &&
-	test_config -C to-clone uploadpack.allowanysha1inwant true &&
-
-	GIT_PROGRESS_DELAY=0 scalar clone "file://$(pwd)/to-clone" "$enlistment" 2>stderr &&
-	! grep "Enumerating objects" stderr &&
-	! grep "Updating files" stderr &&
-	cleanup_clone $enlistment
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/progress2/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 11 - progress without tty
-
-expecting success of 9211.12 'scalar clone warns when background maintenance fails': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
-		scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
-	grep "could not turn on maintenance" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/maint-fail/src/.git/
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-warning: could not turn on maintenance
-ok 12 - scalar clone warns when background maintenance fails
-
-expecting success of 9211.13 '`scalar clone --no-src`': 
-	scalar clone --src "file://$(pwd)/to-clone" with-src &&
-	scalar clone --no-src "file://$(pwd)/to-clone" without-src &&
-
-	test_path_is_dir with-src/src &&
-	test_path_is_missing without-src/src &&
-
-	(cd with-src/src && ls ?*) >with &&
-	(cd without-src && ls ?*) >without &&
-	test_cmp with without
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/with-src/src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9211-scalar-clone/without-src/.git/
-warning: filtering not recognized by server, ignoring
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'base'
-branch 'base' set up to track 'origin/base'.
-Your branch is up to date with 'origin/base'.
-ok 13 - `scalar clone --no-src`
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9351-fast-export-anonymize.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9351-fast-export-anonymize/.git/
 expecting success of 9351.1 'setup simple repo': 
@@ -537107,8 +537051,8 @@
 	test_line_count = 1 unique &&
 	! test_cmp authors committers
 
---- authors	2026-04-19 19:26:42.983659440 +0000
-+++ committers	2026-04-19 19:26:43.015659440 +0000
+--- authors	2025-03-17 13:31:46.876664192 +0000
++++ committers	2025-03-17 13:31:46.944664621 +0000
 @@ -1,6 +1,6 @@
 -User 1 <user1@example.com>
 -User 1 <user1@example.com>
@@ -537227,450 +537171,2000 @@
 		scalar list >out &&
 		! grep "^$(pwd)/${enlistment_root}\$" out &&
 
-		# Make sure we did not accidentally delete the trash dir
-		test_path_is_dir "$TRASH_DIRECTORY" || return 1
-	done
+		# Make sure we did not accidentally delete the trash dir
+		test_path_is_dir "$TRASH_DIRECTORY" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test
+ok 4 - scalar invoked when enlistment root and repo are the same
+
+expecting success of 9210.5 'scalar repo search respects GIT_CEILING_DIRECTORIES': 
+	test_when_finished rm -rf test &&
+
+	git init test/src &&
+	mkdir -p test/src/deep &&
+	GIT_CEILING_DIRECTORIES="$(pwd)/test/src" &&
+	! scalar register test/src/deep 2>err &&
+	grep "not a git repository" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/src/.git/
+fatal: not a git repository (or any of the parent directories): .git
+ok 5 - scalar repo search respects GIT_CEILING_DIRECTORIES
+
+expecting success of 9210.6 'scalar enlistments need a worktree': 
+	test_when_finished rm -rf bare test &&
+
+	git init --bare bare/src &&
+	! scalar register bare/src 2>err &&
+	grep "Scalar enlistments require a worktree" err &&
+
+	git init test/src &&
+	! scalar register test/src/.git 2>err &&
+	grep "Scalar enlistments require a worktree" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/bare/src/
+fatal: Scalar enlistments require a worktree
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/src/.git/
+fatal: Scalar enlistments require a worktree
+ok 6 - scalar enlistments need a worktree
+
+checking prerequisite: FSMONITOR_DAEMON
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+	git version --build-options >output &&
+	grep "feature: fsmonitor--daemon" output
+
+)
+prerequisite FSMONITOR_DAEMON not satisfied
+ok 7 # skip scalar register starts fsmon daemon (missing FSMONITOR_DAEMON)
+
+expecting success of 9210.8 'scalar register warns when background maintenance fails': 
+	git init register-repo &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
+		scalar register register-repo 2>err &&
+	grep "could not turn on maintenance" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/register-repo/.git/
+warning: could not turn on maintenance
+ok 8 - scalar register warns when background maintenance fails
+
+expecting success of 9210.9 'scalar unregister': 
+	git init vanish/src &&
+	scalar register vanish/src &&
+	git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	grep -F "$(pwd)/vanish/src" scalar.repos &&
+	rm -rf vanish/src/.git &&
+	scalar unregister vanish &&
+	test_must_fail git config --get --global --fixed-value \
+		maintenance.repo "$(pwd)/vanish/src" &&
+	scalar list >scalar.repos &&
+	! grep -F "$(pwd)/vanish/src" scalar.repos &&
+
+	# scalar unregister should be idempotent
+	scalar unregister vanish
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src
+ok 9 - scalar unregister
+
+expecting success of 9210.10 'set up repository to clone': 
+	test_commit first &&
+	test_commit second &&
+	test_commit third &&
+	git switch -c parallel first &&
+	mkdir -p 1/2 &&
+	test_commit 1/2/3 &&
+	git config uploadPack.allowFilter true &&
+	git config uploadPack.allowAnySHA1InWant true
+
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[master d662100] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master cd7036d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 third.t
+Switched to a new branch 'parallel'
+[parallel afe5387] 1/2/3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1/2/3.t
+ok 10 - set up repository to clone
+
+expecting success of 9210.11 'scalar clone': 
+	second=$(git rev-parse --verify second:second.t) &&
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	(
+		cd cloned/src &&
+
+		git config --get --global --fixed-value maintenance.repo \
+			"$(pwd)" &&
+
+		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
+		echo "refs/remotes/origin/HEAD" >>expect &&
+		echo "refs/remotes/origin/parallel" >>expect &&
+		test_cmp expect actual &&
+
+		test_path_is_missing 1/2 &&
+
+		# This relies on the fact that the presence of "--missing"
+		# on the command line forces lazy fetching off before
+		# "$second^{blob}" gets parsed.  Without "^{blob}", a
+		# bare object name "$second" is taken into the queue and
+		# the command may not fail with a fixed "rev-list --missing".
+		test_must_fail git rev-list --missing=print "$second^{blob}" -- &&
+
+		git rev-list $second &&
+		git cat-file blob $second >actual &&
+		echo "second" >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'parallel'
+branch 'parallel' set up to track 'origin/parallel'.
+Your branch is up to date with 'origin/parallel'.
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src
+fatal: bad revision 'e019be006cf33489e2d0177a3837a2384eddebc5^{blob}'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+ok 11 - scalar clone
+
+expecting success of 9210.12 'scalar clone --no-... opts': 
+	# Note: redirect stderr always to avoid having a verbose test
+	# run result in a difference in the --[no-]progress option.
+	GIT_TRACE2_EVENT="$(pwd)/no-opt-trace" scalar clone \
+		--no-tags --no-src \
+		"file://$(pwd)" no-opts --single-branch 2>/dev/null &&
+
+	test_subcommand git fetch --quiet --no-progress \
+			origin --no-tags <no-opt-trace &&
+	(
+		cd no-opts &&
+
+		test_cmp_config --no-tags remote.origin.tagopt &&
+		git for-each-ref --format="%(refname)" refs/tags/ >tags &&
+		test_line_count = 0 tags
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/no-opts/.git/
+branch 'parallel' set up to track 'origin/parallel'.
+Your branch is up to date with 'origin/parallel'.
+{"event":"child_start","sid":"20250317T133141.886174Z-H5c947e1c-P0035efd8","thread":"main","time":"2025-03-17T13:31:41.976072Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
+ok 12 - scalar clone --no-... opts
+
+expecting success of 9210.13 'scalar reconfigure': 
+	git init one/src &&
+	scalar register one &&
+	git -C one/src config core.preloadIndex false &&
+	scalar reconfigure one &&
+	test true = "$(git -C one/src config core.preloadIndex)" &&
+	git -C one/src config core.preloadIndex false &&
+	rm one/src/cron.txt &&
+	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
+	test_path_is_file one/src/cron.txt &&
+	test true = "$(git -C one/src config core.preloadIndex)" &&
+	test_subcommand git maintenance start <reconfigure
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/one/src/.git/
+{"event":"child_start","sid":"20250317T133143.015241Z-H5c947e1c-P0035f29d","thread":"main","time":"2025-03-17T13:31:43.026828Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250317T133143.015241Z-H5c947e1c-P0035f29d","thread":"main","time":"2025-03-17T13:31:43.184081Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250317T133143.015241Z-H5c947e1c-P0035f29d","thread":"main","time":"2025-03-17T13:31:43.345745Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+{"event":"child_start","sid":"20250317T133143.015241Z-H5c947e1c-P0035f29d","thread":"main","time":"2025-03-17T13:31:43.539483Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
+ok 13 - scalar reconfigure
+
+expecting success of 9210.14 'scalar reconfigure --all with includeIf.onbranch': 
+	repos="two three four" &&
+	for num in $repos
+	do
+		git init $num/src &&
+		scalar register $num/src &&
+		git -C $num/src config includeif."onbranch:foo".path something &&
+		git -C $num/src config core.preloadIndex false || return 1
+	done &&
+
+	scalar reconfigure --all &&
+
+	for num in $repos
+	do
+		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src/.git/
+ok 14 - scalar reconfigure --all with includeIf.onbranch
+
+expecting success of 9210.15 'scalar reconfigure --all with detached HEADs': 
+	repos="two three four" &&
+	for num in $repos
+	do
+		rm -rf $num/src &&
+		git init $num/src &&
+		scalar register $num/src &&
+		git -C $num/src config core.preloadIndex false &&
+		test_commit -C $num/src initial &&
+		git -C $num/src switch --detach HEAD || return 1
+	done &&
+
+	scalar reconfigure --all &&
+
+	for num in $repos
+	do
+		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src
+[master (root-commit) 23fa7ba] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 23fa7ba initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src
+[master (root-commit) 31243c6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 31243c6 initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src
+[master (root-commit) 167ffd6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+HEAD is now at 167ffd6 initial
+ok 15 - scalar reconfigure --all with detached HEADs
+
+expecting success of 9210.16 '`reconfigure -a` removes stale config entries': 
+	git init stale/src &&
+	scalar register stale &&
+	scalar list >scalar.repos &&
+	grep stale scalar.repos &&
+
+	grep -v stale scalar.repos >expect &&
+
+	rm -rf stale &&
+	scalar reconfigure -a &&
+	scalar list >scalar.repos &&
+	test_cmp expect scalar.repos
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src
+warning: removed stale scalar.repo '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src'
+ok 16 - `reconfigure -a` removes stale config entries
+
+expecting success of 9210.17 'scalar delete without enlistment shows a usage': 
+	test_expect_code 129 scalar delete
+
+usage: scalar delete <enlistment>
+
+ok 17 - scalar delete without enlistment shows a usage
+
+expecting success of 9210.18 'scalar delete with enlistment': 
+	scalar delete cloned &&
+	test_path_is_missing cloned
+
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src
+ok 18 - scalar delete with enlistment
+
+expecting success of 9210.19 'scalar supports -c/-C': 
+	test_when_finished "scalar delete sub" &&
+	git init sub &&
+	scalar -C sub -c status.aheadBehind=bogus register &&
+	test -z "$(git -C sub config --local status.aheadBehind)" &&
+	test true = "$(git -C sub config core.preloadIndex)"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/sub/.git/
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/sub
+ok 19 - scalar supports -c/-C
+
+expecting success of 9210.20 '`scalar [...] <dir>` errors out when dir is missing': 
+	! scalar run config cloned 2>err &&
+	grep "cloned. does not exist" err
+
+fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned' does not exist
+ok 20 - `scalar [...] <dir>` errors out when dir is missing
+
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
+
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+
+Compiled with gcc 14.2.0 for Unix (Linux ELF).
+
+UnZip special compilation options:
+        ACORN_FTYPE_NFS
+        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
+        SET_DIR_ATTRIB
+        SYMLINKS (symbolic links supported, if RTL and file system permit)
+        TIMESTAMP
+        UNIXBACKUP
+        USE_EF_UT_TIME
+        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
+        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
+        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
+        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
+        VMS_TEXT_CONV
+        WILD_STOP_AT_DIR
+        [decryption, version 2.11 of 05 Jan 2007]
+
+UnZip and ZipInfo environment options:
+           UNZIP:  [none]
+        UNZIPOPT:  [none]
+         ZIPINFO:  [none]
+      ZIPINFOOPT:  [none]
+prerequisite UNZIP ok
+expecting success of 9210.21 'scalar diagnose': 
+	scalar clone "file://$(pwd)" cloned --single-branch &&
+	git repack &&
+	echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
+	test_commit -C cloned/src loose &&
+	scalar diagnose cloned >out 2>err &&
+	grep "Available space" out &&
+	sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
+	zip_path=$(cat zip_path) &&
+	test -n "$zip_path" &&
+	"$GIT_UNZIP" -v "$zip_path" &&
+	folder=${zip_path%.zip} &&
+	test_path_is_missing "$folder" &&
+	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
+	test_file_not_empty out &&
+	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
+	grep "$(pwd)/.git/objects" out &&
+	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
+	grep "^Total: [1-9]" out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src/.git/
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+warning: fetch normally indicates which branches had a forced update,
+but that check has been disabled; to re-enable, use '--show-forced-updates'
+flag or run 'git config fetch.showForcedUpdates true'
+Switched to a new branch 'parallel'
+branch 'parallel' set up to track 'origin/parallel'.
+Your branch is up to date with 'origin/parallel'.
+[parallel 5d34185] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src': 46.20 GiB (mount flags 0x1000)
+Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20250317_133150.zip
+ Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
+--------  ------  ------- ---- ---------- ----- --------  ----
+     448  Defl:N      269  40% 2025-03-17 13:31 232cc565  diagnostics.log
+    1101  Defl:N      271  75% 2025-03-17 13:31 44c82906  packs-local.txt
+     212  Defl:N      143  33% 2025-03-17 13:31 70730301  objects-local.txt
+       6  Stored        6   0% 2025-03-17 13:31 183bc9be  .git/COMMIT_EDITMSG
+     616  Defl:N      428  31% 2025-03-17 13:31 c3cd7845  .git/index
+    1137  Defl:N      592  48% 2025-03-17 13:31 40ba125a  .git/config
+      25  Stored       25   0% 2025-03-17 13:31 7ce4afd6  .git/HEAD
+     467  Defl:N      188  60% 2025-03-17 13:31 42aea511  .git/FETCH_HEAD
+      57  Defl:N       39  32% 2025-03-17 13:31 795d289e  .git/config.worktree
+      73  Defl:N       63  14% 2025-03-17 13:31 1f078b37  .git/description
+     478  Defl:N      279  42% 2025-03-17 13:31 09f84f85  .git/hooks/applypatch-msg.sample
+     896  Defl:N      503  44% 2025-03-17 13:31 10caf8e9  .git/hooks/commit-msg.sample
+    4726  Defl:N     1814  62% 2025-03-17 13:31 793c7cef  .git/hooks/fsmonitor-watchman.sample
+     189  Defl:N      138  27% 2025-03-17 13:31 c0f70c9a  .git/hooks/post-update.sample
+     424  Defl:N      265  38% 2025-03-17 13:31 024cc0cf  .git/hooks/pre-applypatch.sample
+    1649  Defl:N      907  45% 2025-03-17 13:31 1b0e50ae  .git/hooks/pre-commit.sample
+     416  Defl:N      255  39% 2025-03-17 13:31 5ef33f44  .git/hooks/pre-merge-commit.sample
+    1492  Defl:N      744  50% 2025-03-17 13:31 303613ed  .git/hooks/prepare-commit-msg.sample
+    1374  Defl:N      701  49% 2025-03-17 13:31 f90a0f0f  .git/hooks/pre-push.sample
+    4898  Defl:N     2015  59% 2025-03-17 13:31 5158ec84  .git/hooks/pre-rebase.sample
+     544  Defl:N      329  40% 2025-03-17 13:31 96f8c492  .git/hooks/pre-receive.sample
+    2783  Defl:N     1254  55% 2025-03-17 13:31 f00806d3  .git/hooks/push-to-checkout.sample
+    2308  Defl:N      975  58% 2025-03-17 13:31 4b9edd4e  .git/hooks/sendemail-validate.sample
+    3650  Defl:N     1173  68% 2025-03-17 13:31 06fcf0d9  .git/hooks/update.sample
+       8  Stored        8   0% 2025-03-17 13:31 4cc141be  .git/info/sparse-checkout
+     240  Defl:N      173  28% 2025-03-17 13:31 21cd3d77  .git/info/exclude
+     323  Defl:N      168  48% 2025-03-17 13:31 dc297921  .git/logs/HEAD
+     319  Defl:N      164  49% 2025-03-17 13:31 51851cc6  .git/logs/refs/heads/parallel
+     140  Defl:N      100  29% 2025-03-17 13:31 7e602633  .git/logs/refs/remotes/origin/HEAD
+     183  Defl:N      131  28% 2025-03-17 13:31 403541c6  .git/logs/refs/remotes/origin/parallel
+      95  Defl:N       87   8% 2025-03-17 13:31 615f31fc  .git/objects/info/alternates
+--------          -------  ---                            -------
+   31277            14207  55%                            31 files
+Contents of /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/.git/objects:
+Total: 3 loose objects
+ok 21 - scalar diagnose
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9350-fast-export.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/.git/
+expecting success of 9350.1 'setup': 
+
+	echo break it > file0 &&
+	git add file0 &&
+	test_tick &&
+	echo Wohlauf > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo die Luft > file &&
+	echo geht frisch > file2 &&
+	git add file file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo und > file2 &&
+	test_tick &&
+	git commit -m third file2 &&
+	test_tick &&
+	git tag rein &&
+	git checkout -b wer HEAD^ &&
+	echo lange > file2 &&
+	test_tick &&
+	git commit -m sitzt file2 &&
+	test_tick &&
+	git tag -a -m valentin muss &&
+	git merge -s ours main
+
+
+[main (root-commit) 283ea05] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 file0
+[main 300cb83] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+[main 80f15f4] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'wer'
+[wer 708f3c9] sitzt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+ok 1 - setup
+
+expecting success of 9350.2 'fast-export | fast-import': 
+
+	MAIN=$(git rev-parse --verify main) &&
+	REIN=$(git rev-parse --verify rein) &&
+	WER=$(git rev-parse --verify wer) &&
+	MUSS=$(git rev-parse --verify muss) &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
+	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
+	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (         0 duplicates                  )
+      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
+      commits:            5 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           4 (         3 loads     )
+      marks:           1024 (        11 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          5
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1158
+---------------------------------------------------------------------
+
+ok 2 - fast-export | fast-import
+
+expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
+	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 3 - fast-export ^muss^{commit} muss
+
+expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
+	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	mark :1
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 4 - fast-export --mark-tags ^muss^{commit} muss
+
+expecting success of 9350.5 'fast-export main~2..main': 
+
+	git fast-export main~2..main >actual &&
+	sed "s/main/partial/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
+		 git diff --exit-code main partial &&
+		 git diff --exit-code main^ partial^ &&
+		 test_must_fail git rev-parse partial~2)
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            8 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         6 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+partial~2
+ok 5 - fast-export main~2..main
+
+expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
+
+	git fast-export --reference-excluded-parents main~2..main >actual &&
+	grep commit.refs/heads/main actual >commit-count &&
+	test_line_count = 2 commit-count &&
+	sed "s/main/rewrite/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            7 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         5 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 6 - fast-export --reference-excluded-parents main~2..main
+
+expecting success of 9350.7 'fast-export --show-original-ids': 
+
+	git fast-export --show-original-ids main >output &&
+	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
+	git rev-list --objects main muss >objects-and-names &&
+	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
+	comm -23 actual commits-trees-blobs >unfound &&
+	test_must_be_empty unfound
+
+ok 7 - fast-export --show-original-ids
+
+expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
+
+	git fast-export --show-original-ids main muss | git fast-import --quiet &&
+	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	test $MUSS = $(git rev-parse --verify refs/tags/muss)
+
+ok 8 - fast-export --show-original-ids | git fast-import
+
+expecting success of 9350.9 'reencoding iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	test_tick &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
+		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
+		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
+		 # the expected size.
+		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
+		 # ...and for the expected translation of bytes.
+		 git cat-file commit i18n >actual &&
+		 grep $(printf "\317\200") actual &&
+		 # Also make sure the commit does not have the "encoding" header
+		 ! grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: π
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 9 - reencoding iso-8859-7
+
+expecting success of 9350.10 'aborting on iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 10 - aborting on iso-8859-7
+
+expecting success of 9350.11 'preserving iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, is 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header would drops 20
+		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
+		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
+		 # Check for the expected size...
+		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
+		 # ...as well as the expected byte.
+		 git cat-file commit i18n-no-recoding >actual &&
+		 grep $(printf "\360") actual &&
+		 # Also make sure the commit has the "encoding" header
+		 grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: ð
+encoding iso-8859-7
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 11 - preserving iso-8859-7
+
+expecting success of 9350.12 'encoding preserved if reencoding fails': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-invalid/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 git cat-file commit i18n-invalid >actual &&
+		 # Make sure the commit still has the encoding header
+		 grep ^encoding actual &&
+		 # Verify that the commit has the expected size; i.e.
+		 # that no bytes were re-encoded to a different encoding.
+		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
+		 # ...and check for the original special bytes
+		 grep $(printf "\360") actual &&
+		 grep $(printf "\377") actual)
+
+[wer 5cc588f] Pi: ð; Invalid: ÿ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+encoding iso-8859-7
+Pi: ð; Invalid: ÿ
+Pi: ð; Invalid: ÿ
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 12 - encoding preserved if reencoding fails
+
+expecting success of 9350.13 'import/export-marks': 
+
+	git checkout -b marks main &&
+	git fast-export --export-marks=tmp-marks HEAD &&
+	test -s tmp-marks &&
+	test_line_count = 3 tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit actual | wc -l) -eq 0 &&
+	echo change > file &&
+	git commit -m "last commit" file &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit\  actual | wc -l) -eq 1 &&
+	test_line_count = 4 tmp-marks
+
+
+Switched to a new branch 'marks'
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/heads/marks
+commit refs/heads/marks
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/heads/marks
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/heads/marks
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+[marks 00d551b] last commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - import/export-marks
+
+expecting success of 9350.14 'set up faked signed tag': 
+
+	git fast-import <signed-tag-import
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 14 - set up faked signed tag
+
+expecting success of 9350.15 'signed-tags=abort': 
+
+	test_must_fail git fast-export --signed-tags=abort sign-your-name
+
+
+fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/tags/sign-your-name
+commit refs/tags/sign-your-name
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/tags/sign-your-name
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/tags/sign-your-name
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+blob
+mark :9
+data 7
+change
+
+commit refs/tags/sign-your-name
+mark :10
+author A U Thor <author@example.com> 1112912413 -0700
+committer C O Mitter <committer@example.com> 1112912413 -0700
+data 12
+last commit
+from :8
+M 100644 :9 file
+
+ok 15 - signed-tags=abort
+
+expecting success of 9350.16 'signed-tags=verbatim': 
+
+	git fast-export --signed-tags=verbatim sign-your-name > output &&
+	grep PGP output
+
+
+-----BEGIN PGP SIGNATURE-----
+-----END PGP SIGNATURE-----
+ok 16 - signed-tags=verbatim
+
+expecting success of 9350.17 'signed-tags=strip': 
+
+	git fast-export --signed-tags=strip sign-your-name > output &&
+	! grep PGP output
+
+
+ok 17 - signed-tags=strip
+
+expecting success of 9350.18 'signed-tags=warn-strip': 
+	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
+	! grep PGP output &&
+	test -s err
+
+ok 18 - signed-tags=warn-strip
+
+expecting success of 9350.19 'setup submodule': 
+
+	test_config_global protocol.file.allow always &&
+	git checkout -f main &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init  &&
+		echo test file > file &&
+		git add file &&
+		git commit -m sub_initial
+	) &&
+	git submodule add "$(pwd)/sub" sub &&
+	git commit -m initial &&
+	test_tick &&
+	(
+		cd sub &&
+		echo more data >> file &&
+		git add file &&
+		git commit -m sub_second
+	) &&
+	git add sub &&
+	git commit -m second
+
+
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/sub/.git/
+[main (root-commit) 075e849] sub_initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[main f723f15] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main 53da5af] sub_second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 4598a6d] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - setup submodule
+
+expecting success of 9350.20 'submodule fast-export | fast-import': 
+
+	test_config_global protocol.file.allow always &&
+	SUBENT1=$(git ls-tree main^ sub) &&
+	SUBENT2=$(git ls-tree main sub) &&
+	rm -rf new &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --signed-tags=strip --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
+	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
+	 git checkout main &&
+	 git submodule init &&
+	 git submodule update &&
+	 cmp sub/file ../sub/file) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           25 (         0 duplicates                  )
+      blobs  :            8 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            7 (         0 duplicates          6 deltas of          6 attempts)
+      commits:            8 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1506
+---------------------------------------------------------------------
+
+Already on 'main'
+Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/sub'...
+done.
+Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
+ok 20 - submodule fast-export | fast-import
+
+expecting success of 9350.21 'setup copies': 
+
+	git checkout -b copy rein &&
+	git mv file file3 &&
+	git commit -m move1 &&
+	test_tick &&
+	cp file2 file4 &&
+	git add file4 &&
+	git mv file2 file5 &&
+	git commit -m copy1 &&
+	test_tick &&
+	cp file3 file6 &&
+	git add file6 &&
+	git commit -m copy2 &&
+	test_tick &&
+	echo more text >> file6 &&
+	echo even more text >> file6 &&
+	git add file6 &&
+	git commit -m modify &&
+	test_tick &&
+	cp file6 file7 &&
+	echo test >> file7 &&
+	git add file7 &&
+	git commit -m copy_modify
+
+
+warning: unable to rmdir 'sub': Directory not empty
+Switched to a new branch 'copy'
+[copy 16740da] move1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => file3 (100%)
+[copy 0d83758] copy1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename file2 => file4 (100%)
+ create mode 100644 file5
+[copy 44ca68a] copy2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file6
+[copy 22ab272] modify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[copy ed9d1ab] copy_modify
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 file7
+ok 21 - setup copies
+
+expecting success of 9350.22 'fast-export -C -C | fast-import': 
+
+	ENTRY=$(git rev-parse --verify copy) &&
+	rm -rf new &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	grep "^C file2 file4\$" output &&
+	cat output |
+	(cd new &&
+	 git fast-import &&
+	 test $ENTRY = $(git rev-parse --verify refs/heads/copy))
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
+C file2 file4
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           37 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          1 deltas of          3 attempts)
+      trees  :           12 (         0 duplicates         11 deltas of         11 attempts)
+      commits:           13 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           6 (         6 loads     )
+      marks:           1024 (        23 unique    )
+      atoms:             10
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =         10
+pack_report: pack_mmap_calls          =          5
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1953
+---------------------------------------------------------------------
+
+ok 22 - fast-export -C -C | fast-import
+
+expecting success of 9350.23 'fast-export | fast-import when main is tagged': 
+
+	git tag -m msg last &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	test $(grep -c "^tag " output) = 3
+
+
+ok 23 - fast-export | fast-import when main is tagged
+
+expecting success of 9350.24 'cope with tagger-less tags': 
+
+	TAG=$(git hash-object --literally -t tag -w tag-content) &&
+	git update-ref refs/tags/sonnenschein $TAG &&
+	git fast-export -C -C --signed-tags=strip --all > output &&
+	test $(grep -c "^tag " output) = 4 &&
+	! grep "Unspecified Tagger" output &&
+	git fast-export -C -C --signed-tags=strip --all \
+		--fake-missing-tagger > output &&
+	test $(grep -c "^tag " output) = 4 &&
+	grep "Unspecified Tagger" output
+
+
+tagger Unspecified Tagger <unspecified-tagger> 0 +0000
+ok 24 - cope with tagger-less tags
+
+expecting success of 9350.25 'setup for limiting exports by PATH': 
+	mkdir limit-by-paths &&
+	(
+		cd limit-by-paths &&
+		git init &&
+		echo hi > there &&
+		git add there &&
+		git commit -m "First file" &&
+		echo foo > bar &&
+		git add bar &&
+		git commit -m "Second file" &&
+		git tag -a -m msg mytag &&
+		echo morefoo >> bar &&
+		git add bar &&
+		git commit -m "Change to second file"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/limit-by-paths/.git/
+[main (root-commit) c4bb517] First file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 there
+[main 5b2b7c2] Second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 49ac088] Change to second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - setup for limiting exports by PATH
+
+expecting success of 9350.26 'dropping tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 26 - dropping tag of filtered out object
+
+expecting success of 9350.27 'rewriting tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 27 - rewriting tag of filtered out object
+
+expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
+	test_create_repo rewrite_tag_predating_pathspecs &&
+	(
+		cd rewrite_tag_predating_pathspecs &&
+
+		test_commit initial &&
+
+		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
+
+		test_commit bar &&
+
+		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
+		grep from.$ZERO_OID output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
+[main (root-commit) f175d86] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 3f8d6f0] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+from 0000000000000000000000000000000000000000
+from 0000000000000000000000000000000000000000
+ok 28 - rewrite tag predating pathspecs to nothing
+
+checking known breakage of 9350.29 'no exact-ref revisions included': 
+	(
+		cd limit-by-paths &&
+		git fast-export main~2..main~1 > output &&
+		test_cmp expected output
+	)
+
+--- expected	2025-03-17 13:31:49.660681780 +0000
++++ output	2025-03-17 13:31:49.728682209 +0000
+@@ -8,8 +8,7 @@
+ data 3
+ hi
+ 
+-reset refs/heads/main
+-commit refs/heads/main
++commit main~1
+ mark :3
+ author A U Thor <author@example.com> 1112912713 -0700
+ committer C O Mitter <committer@example.com> 1112912713 -0700
+not ok 29 - no exact-ref revisions included # TODO known breakage
+
+expecting success of 9350.30 'path limiting with import-marks does not lose unmodified files': 
+	git checkout -b simple marks~2 &&
+	git fast-export --export-marks=marks simple -- file > /dev/null &&
+	echo more content >> file &&
+	test_tick &&
+	git commit -mnext file &&
+	git fast-export --import-marks=marks simple -- file file0 >actual &&
+	grep file0 actual
+
+Switched to a new branch 'simple'
+[simple ed6c25d] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+M 100644 :6 file0
+ok 30 - path limiting with import-marks does not lose unmodified files
+
+expecting success of 9350.31 'path limiting works': 
+	git fast-export simple -- file >actual &&
+	sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
+	echo file >expect &&
+	test_cmp expect actual.files
+
+ok 31 - path limiting works
+
+expecting success of 9350.32 'avoid corrupt stream with non-existent mark': 
+	test_create_repo avoid_non_existent_mark &&
+	(
+		cd avoid_non_existent_mark &&
+
+		test_commit important-path &&
+
+		test_commit ignored &&
+
+		git branch A &&
+		git branch B &&
+
+		echo foo >>important-path.t &&
+		git add important-path.t &&
+		test_commit more changes &&
+
+		git fast-export --all -- important-path.t | git fast-import --force
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
+[main (root-commit) 8503f52] important-path
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important-path.t
+[main f2403bd] ignored
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ignored.t
+[main 0864148] more
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 changes
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           6 (         2 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /        486
+---------------------------------------------------------------------
+
+ok 32 - avoid corrupt stream with non-existent mark
+
+expecting success of 9350.33 'full-tree re-shows unmodified files': 
+	git checkout -f simple &&
+	git fast-export --full-tree simple >actual &&
+	test $(grep -c file0 actual) -eq 3
+
+Already on 'simple'
+ok 33 - full-tree re-shows unmodified files
+
+expecting success of 9350.34 'set-up a few more tags for tag export tests': 
+	git checkout -f main &&
+	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
+	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
+	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
+	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
+	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
+
+Switched to branch 'main'
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+ok 34 - set-up a few more tags for tag export tests
+
+expecting success of 9350.35 'tree_tag': 
+	mkdir result &&
+	(cd result && git init) &&
+	git fast-export tree_tag > fe-stream &&
+	(cd result && git fast-import < ../fe-stream)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/result/.git/
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag c09dd2ba99128e6c5174625e4bdc57259c257f8f,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            0 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2399 KiB
+       pools:          2048 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =          0
+pack_report: core.packedGitLimit      =          0
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 35 - tree_tag
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/src
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/deeper/test
-ok 4 - scalar invoked when enlistment root and repo are the same
+expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 36 - tree_tag-obj
 
-expecting success of 9210.5 'scalar repo search respects GIT_CEILING_DIRECTORIES': 
-	test_when_finished rm -rf test &&
+expecting success of 9350.37 'tag-obj_tag': git fast-export tag-obj_tag
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 5cff225d75c4ee2ded478b521f9c3964070fbd0f,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 37 - tag-obj_tag
 
-	git init test/src &&
-	mkdir -p test/src/deep &&
-	GIT_CEILING_DIRECTORIES="$(pwd)/test/src" &&
-	! scalar register test/src/deep 2>err &&
-	grep "not a git repository" err
+expecting success of 9350.38 'tag-obj_tag-obj': git fast-export tag-obj_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 4cbb7321bcbed07bbbd1edfdce7b61be318e21c0,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 38 - tag-obj_tag-obj
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/src/.git/
-fatal: not a git repository (or any of the parent directories): .git
-ok 5 - scalar repo search respects GIT_CEILING_DIRECTORIES
+expecting success of 9350.39 'handling tags of blobs': 
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
+	git fast-export blobtag >actual &&
+	cat >expect <<-EOF &&
+	blob
+	mark :1
+	data 9
+	die Luft
 
-expecting success of 9210.6 'scalar enlistments need a worktree': 
-	test_when_finished rm -rf bare test &&
+	tag blobtag
+	from :1
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 14
+	Tag of a blob
 
-	git init --bare bare/src &&
-	! scalar register bare/src 2>err &&
-	grep "Scalar enlistments require a worktree" err &&
+	EOF
+	test_cmp expect actual
 
-	git init test/src &&
-	! scalar register test/src/.git 2>err &&
-	grep "Scalar enlistments require a worktree" err
+ok 39 - handling tags of blobs
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/bare/src/
-fatal: Scalar enlistments require a worktree
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/test/src/.git/
-fatal: Scalar enlistments require a worktree
-ok 6 - scalar enlistments need a worktree
+expecting success of 9350.40 'handling nested tags': 
+	git tag -a -m "This is a nested tag" nested muss &&
+	git fast-export --mark-tags nested >output &&
+	grep "^from $ZERO_OID$" output &&
+	grep "^tag nested$" output >tag_lines &&
+	test_line_count = 2 tag_lines
 
-checking prerequisite: FSMONITOR_DAEMON
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f nested muss^{}
+hint: Disable this message with "git config set advice.nestedTag false"
+from 0000000000000000000000000000000000000000
+ok 40 - handling nested tags
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+expecting success of 9350.41 'directory becomes symlink': 
+	git init dirtosymlink &&
+	git init result &&
+	(
+		cd dirtosymlink &&
+		mkdir foo &&
+		mkdir bar &&
+		echo hello > foo/world &&
+		echo hello > bar/world &&
+		git add foo/world bar/world &&
+		git commit -q -mone &&
+		git rm -r foo &&
+		test_ln_s_add bar foo &&
+		git commit -q -mtwo
+	) &&
+	(
+		cd dirtosymlink &&
+		git fast-export main -- foo |
+		(cd ../result && git fast-import --quiet)
+	) &&
+	(cd result && git show main:foo)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/dirtosymlink/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/result/.git/
+rm 'foo/world'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
-	git version --build-options >output &&
-	grep "feature: fsmonitor--daemon" output
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
 )
-prerequisite FSMONITOR_DAEMON not satisfied
-ok 7 # skip scalar register starts fsmon daemon (missing FSMONITOR_DAEMON)
-
-expecting success of 9210.8 'scalar register warns when background maintenance fails': 
-	git init register-repo &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
-		scalar register register-repo 2>err &&
-	grep "could not turn on maintenance" err
+prerequisite SYMLINKS ok
+barok 41 - directory becomes symlink
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/register-repo/.git/
-warning: could not turn on maintenance
-ok 8 - scalar register warns when background maintenance fails
+expecting success of 9350.42 'fast-export quotes pathnames': 
+	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
+	(cd crazy-paths &&
+	 blob=$(echo foo | git hash-object -w --stdin) &&
+	 git -c core.protectNTFS=false update-index --add \
+		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
+		--cacheinfo 100644 $blob "path with \"quote\"" \
+		--cacheinfo 100644 $blob "path with \\backslash" \
+		--cacheinfo 100644 $blob "path with space" &&
+	 git commit -m addition &&
+	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
+	 git read-tree --empty &&
+	 git update-index -z --index-info <index &&
+	 git commit -m rename &&
+	 git read-tree --empty &&
+	 git commit -m deletion &&
+	 git fast-export -M HEAD >export.out &&
+	 git rev-list HEAD >expect &&
+	 git init result &&
+	 cd result &&
+	 git -c core.protectNTFS=false fast-import <../export.out &&
+	 git rev-list HEAD >actual &&
+	 test_cmp ../expect actual
+	)
 
-expecting success of 9210.9 'scalar unregister': 
-	git init vanish/src &&
-	scalar register vanish/src &&
-	git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/vanish/src" &&
-	scalar list >scalar.repos &&
-	grep -F "$(pwd)/vanish/src" scalar.repos &&
-	rm -rf vanish/src/.git &&
-	scalar unregister vanish &&
-	test_must_fail git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/vanish/src" &&
-	scalar list >scalar.repos &&
-	! grep -F "$(pwd)/vanish/src" scalar.repos &&
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/crazy-paths/.git/
+[main (root-commit) deac6af] addition
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 "path with\nnewline"
+ create mode 100644 "path with \"quote\""
+ create mode 100644 "path with \\backslash"
+ create mode 100644 path with space
+[main 89b4a6a] rename
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
+ rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
+ rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
+ rename path with space => subdir/path with space (100%)
+[main 39f052a] deletion
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 deletions(-)
+ delete mode 100644 "subdir/path with\nnewline"
+ delete mode 100644 "subdir/path with \"quote\""
+ delete mode 100644 "subdir/path with \\backslash"
+ delete mode 100644 subdir/path with space
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            7 (         1 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            3 (         1 duplicates          0 deltas of          1 attempts)
+      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-	# scalar unregister should be idempotent
-	scalar unregister vanish
+ok 42 - fast-export quotes pathnames
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/vanish/src
-ok 9 - scalar unregister
+expecting success of 9350.43 'test bidirectionality': 
+	git init marks-test &&
+	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
+	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
+	(cd marks-test &&
+	git reset --hard &&
+	echo Wohlauf > file &&
+	git commit -a -m "back in time") &&
+	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
+	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
 
-expecting success of 9210.10 'set up repository to clone': 
-	test_commit first &&
-	test_commit second &&
-	test_commit third &&
-	git switch -c parallel first &&
-	mkdir -p 1/2 &&
-	test_commit 1/2/3 &&
-	git config uploadPack.allowFilter true &&
-	git config uploadPack.allowAnySHA1InWant true
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/marks-test/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           38 (         0 duplicates                  )
+      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
+      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
+      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        25 unique    )
+      atoms:             10
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1506
+---------------------------------------------------------------------
 
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[master d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master cd7036d] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 third.t
-Switched to a new branch 'parallel'
-[parallel afe5387] 1/2/3
+HEAD is now at 4598a6d second
+[main eb7b3a5] back in time
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1/2/3.t
-ok 10 - set up repository to clone
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            3 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           5 (         1 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-expecting success of 9210.11 'scalar clone': 
-	second=$(git rev-parse --verify second:second.t) &&
-	scalar clone "file://$(pwd)" cloned --single-branch &&
-	(
-		cd cloned/src &&
+ok 43 - test bidirectionality
 
-		git config --get --global --fixed-value maintenance.repo \
-			"$(pwd)" &&
+expecting success of 9350.44 'avoid uninteresting refs': 
+	> tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > /dev/null &&
+	git tag v1.0 &&
+	git branch uninteresting &&
+	echo bump > file &&
+	git commit -a -m bump &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
+	test_cmp expected actual
 
-		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
-		echo "refs/remotes/origin/HEAD" >>expect &&
-		echo "refs/remotes/origin/parallel" >>expect &&
-		test_cmp expect actual &&
+[main dcd14ee] bump
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 44 - avoid uninteresting refs
 
-		test_path_is_missing 1/2 &&
+expecting success of 9350.45 'refs are updated even if no commits need to be exported': 
+	> tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > /dev/null &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks main > actual &&
+	test_cmp expected actual
 
-		# This relies on the fact that the presence of "--missing"
-		# on the command line forces lazy fetching off before
-		# "$second^{blob}" gets parsed.  Without "^{blob}", a
-		# bare object name "$second" is taken into the queue and
-		# the command may not fail with a fixed "rev-list --missing".
-		test_must_fail git rev-list --missing=print "$second^{blob}" -- &&
+ok 45 - refs are updated even if no commits need to be exported
 
-		git rev-list $second &&
-		git cat-file blob $second >actual &&
-		echo "second" >expect &&
-		test_cmp expect actual
-	)
+expecting success of 9350.46 'use refspec': 
+	git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
+	grep "^commit " actual2 | sort | uniq >actual &&
+	echo "commit refs/heads/foobar" > expected &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'parallel'
-branch 'parallel' set up to track 'origin/parallel'.
-Your branch is up to date with 'origin/parallel'.
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src
-fatal: bad revision 'e019be006cf33489e2d0177a3837a2384eddebc5^{blob}'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-ok 11 - scalar clone
+ok 46 - use refspec
 
-expecting success of 9210.12 'scalar clone --no-... opts': 
-	# Note: redirect stderr always to avoid having a verbose test
-	# run result in a difference in the --[no-]progress option.
-	GIT_TRACE2_EVENT="$(pwd)/no-opt-trace" scalar clone \
-		--no-tags --no-src \
-		"file://$(pwd)" no-opts --single-branch 2>/dev/null &&
+expecting success of 9350.47 'delete ref because entire history excluded': 
+	git branch to-delete &&
+	git fast-export to-delete ^to-delete >actual &&
+	cat >expected <<-EOF &&
+	reset refs/heads/to-delete
+	from $ZERO_OID
 
-	test_subcommand git fetch --quiet --no-progress \
-			origin --no-tags <no-opt-trace &&
-	(
-		cd no-opts &&
+	EOF
+	test_cmp expected actual
 
-		test_cmp_config --no-tags remote.origin.tagopt &&
-		git for-each-ref --format="%(refname)" refs/tags/ >tags &&
-		test_line_count = 0 tags
-	)
+ok 47 - delete ref because entire history excluded
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/no-opts/.git/
-branch 'parallel' set up to track 'origin/parallel'.
-Your branch is up to date with 'origin/parallel'.
-{"event":"child_start","sid":"20260419T192639.728455Z-H8d819085-P002357fd","thread":"main","time":"2026-04-19T19:26:39.849729Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","fetch","--quiet","--no-progress","origin","--no-tags"]}
-ok 12 - scalar clone --no-... opts
+expecting success of 9350.48 'delete refspec': 
+	git fast-export --refspec :refs/heads/to-delete >actual &&
+	cat >expected <<-EOF &&
+	reset refs/heads/to-delete
+	from $ZERO_OID
 
-expecting success of 9210.13 'scalar reconfigure': 
-	git init one/src &&
-	scalar register one &&
-	git -C one/src config core.preloadIndex false &&
-	scalar reconfigure one &&
-	test true = "$(git -C one/src config core.preloadIndex)" &&
-	git -C one/src config core.preloadIndex false &&
-	rm one/src/cron.txt &&
-	GIT_TRACE2_EVENT="$(pwd)/reconfigure" scalar reconfigure -a &&
-	test_path_is_file one/src/cron.txt &&
-	test true = "$(git -C one/src config core.preloadIndex)" &&
-	test_subcommand git maintenance start <reconfigure
+	EOF
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/one/src/.git/
-{"event":"child_start","sid":"20260419T192640.683534Z-H8d819085-P00235b16","thread":"main","time":"2026-04-19T19:26:40.695192Z","file":"run-command.c","line":734,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260419T192640.683534Z-H8d819085-P00235b16","thread":"main","time":"2026-04-19T19:26:40.854198Z","file":"run-command.c","line":734,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260419T192640.683534Z-H8d819085-P00235b16","thread":"main","time":"2026-04-19T19:26:40.973338Z","file":"run-command.c","line":734,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-{"event":"child_start","sid":"20260419T192640.683534Z-H8d819085-P00235b16","thread":"main","time":"2026-04-19T19:26:41.114526Z","file":"run-command.c","line":734,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","maintenance","start"]}
-ok 13 - scalar reconfigure
+ok 48 - delete refspec
 
-expecting success of 9210.14 'scalar reconfigure --all with includeIf.onbranch': 
-	repos="two three four" &&
-	for num in $repos
-	do
-		git init $num/src &&
-		scalar register $num/src &&
-		git -C $num/src config includeif."onbranch:foo".path something &&
-		git -C $num/src config core.preloadIndex false || return 1
-	done &&
+expecting success of 9350.49 'when using -C, do not declare copy when source of copy is also modified': 
+	test_create_repo src &&
+	echo a_line >src/file.txt &&
+	git -C src add file.txt &&
+	git -C src commit -m 1st_commit &&
 
-	scalar reconfigure --all &&
+	cp src/file.txt src/file2.txt &&
+	echo another_line >>src/file.txt &&
+	git -C src add file.txt file2.txt &&
+	git -C src commit -m 2nd_commit &&
 
-	for num in $repos
-	do
-		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
-	done
+	test_create_repo dst &&
+	git -C src fast-export --all -C >actual &&
+	git -C dst fast-import <actual &&
+	git -C src show >expected &&
+	git -C dst show >actual &&
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src/.git/
-ok 14 - scalar reconfigure --all with includeIf.onbranch
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/src/.git/
+[main (root-commit) b469450] 1st_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+[main 85ccff7] 2nd_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/dst/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              2
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-expecting success of 9210.15 'scalar reconfigure --all with detached HEADs': 
-	repos="two three four" &&
-	for num in $repos
-	do
-		rm -rf $num/src &&
-		git init $num/src &&
-		scalar register $num/src &&
-		git -C $num/src config core.preloadIndex false &&
-		test_commit -C $num/src initial &&
-		git -C $num/src switch --detach HEAD || return 1
-	done &&
+ok 49 - when using -C, do not declare copy when source of copy is also modified
 
-	scalar reconfigure --all &&
+expecting success of 9350.50 'merge commit gets exported with --import-marks': 
+	test_create_repo merging &&
+	(
+		cd merging &&
+		test_commit initial &&
+		git checkout -b topic &&
+		test_commit on-topic &&
+		git checkout main &&
+		test_commit on-main &&
+		test_tick &&
+		git merge --no-ff -m Yeah topic &&
 
-	for num in $repos
-	do
-		test true = "$(git -C $num/src config core.preloadIndex)" || return 1
-	done
+		echo ":1 $(git rev-parse HEAD^^)" >marks &&
+		git fast-export --import-marks=marks main >out &&
+		grep Yeah out
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/two/src
-[master (root-commit) 23fa7ba] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/merging/.git/
+[main (root-commit) 1aef781] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 initial.t
-HEAD is now at 23fa7ba initial
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/three/src
-[master (root-commit) 31243c6] initial
+Switched to a new branch 'topic'
+[topic bb9f331] on-topic
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 31243c6 initial
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/four/src
-[master (root-commit) 167ffd6] initial
+ create mode 100644 on-topic.t
+Switched to branch 'main'
+[main a2e3e6b] on-main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-HEAD is now at 167ffd6 initial
-ok 15 - scalar reconfigure --all with detached HEADs
-
-expecting success of 9210.16 '`reconfigure -a` removes stale config entries': 
-	git init stale/src &&
-	scalar register stale &&
-	scalar list >scalar.repos &&
-	grep stale scalar.repos &&
-
-	grep -v stale scalar.repos >expect &&
-
-	rm -rf stale &&
-	scalar reconfigure -a &&
-	scalar list >scalar.repos &&
-	test_cmp expect scalar.repos
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src
-warning: removed stale scalar.repo '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/stale/src'
-ok 16 - `reconfigure -a` removes stale config entries
-
-expecting success of 9210.17 'scalar delete without enlistment shows a usage': 
-	test_expect_code 129 scalar delete
-
-usage: scalar delete <enlistment>
-
-ok 17 - scalar delete without enlistment shows a usage
-
-expecting success of 9210.18 'scalar delete with enlistment': 
-	scalar delete cloned &&
-	test_path_is_missing cloned
-
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src
-ok 18 - scalar delete with enlistment
-
-expecting success of 9210.19 'scalar supports -c/-C': 
-	test_when_finished "scalar delete sub" &&
-	git init sub &&
-	scalar -C sub -c status.aheadBehind=bogus register &&
-	test -z "$(git -C sub config --local status.aheadBehind)" &&
-	test true = "$(git -C sub config core.preloadIndex)"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/sub/.git/
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/sub
-ok 19 - scalar supports -c/-C
+ create mode 100644 on-main.t
+Merge made by the 'ort' strategy.
+ on-topic.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-topic.t
+Yeah
+ok 50 - merge commit gets exported with --import-marks
 
-expecting success of 9210.20 '`scalar [...] <dir>` errors out when dir is missing': 
-	! scalar run config cloned 2>err &&
-	grep "cloned. does not exist" err
+expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
+	git init first-parent &&
+	(
+		cd first-parent &&
+		test_commit A &&
+		git checkout -b topic1 &&
+		test_commit B &&
+		git checkout main &&
+		git merge --no-ff topic1 &&
 
-fatal: '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned' does not exist
-ok 20 - `scalar [...] <dir>` errors out when dir is missing
+		git checkout -b topic2 &&
+		test_commit C &&
+		git checkout main &&
+		git merge --no-ff topic2 &&
 
-checking prerequisite: UNZIP
+		test_commit D &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
+		git fast-export main -- --first-parent >first-parent-export &&
+		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
+		test_cmp first-parent-export first-parent-reverse-export &&
 
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+		git init import &&
+		git -C import fast-import <first-parent-export &&
 
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+		git log --format="%ad %s" --first-parent main >expected &&
+		git -C import log --format="%ad %s" --all >actual &&
+		test_cmp expected actual &&
+		test_line_count = 4 actual
+	)
 
-Compiled with gcc 14.2.0 for Unix (Linux ELF).
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/first-parent/.git/
+[main (root-commit) 40531c9] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'topic1'
+[topic1 26bf445] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'topic2'
+[topic2 3d54688] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main 0270458] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/first-parent/import/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           12 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
+      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         8 unique    )
+      atoms:              4
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
+ok 51 - fast-export --first-parent outputs all revisions output by revision walk
 
-UnZip and ZipInfo environment options:
-           UNZIP:  [none]
-        UNZIPOPT:  [none]
-         ZIPINFO:  [none]
-      ZIPINFOOPT:  [none]
-prerequisite UNZIP ok
-expecting success of 9210.21 'scalar diagnose': 
-	scalar clone "file://$(pwd)" cloned --single-branch &&
-	git repack &&
-	echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
-	test_commit -C cloned/src loose &&
-	scalar diagnose cloned >out 2>err &&
-	grep "Available space" out &&
-	sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
-	zip_path=$(cat zip_path) &&
-	test -n "$zip_path" &&
-	"$GIT_UNZIP" -v "$zip_path" &&
-	folder=${zip_path%.zip} &&
-	test_path_is_missing "$folder" &&
-	"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
-	test_file_not_empty out &&
-	"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
-	grep "$(pwd)/.git/objects" out &&
-	"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
-	grep "^Total: [1-9]" out
+expecting success of 9350.52 'fast-export handles --end-of-options': 
+	git update-ref refs/heads/nodash HEAD &&
+	git update-ref refs/heads/--dashes HEAD &&
+	git fast-export --end-of-options nodash >expect &&
+	git fast-export --end-of-options --dashes >actual.raw &&
+	# fix up lines which mention the ref for comparison
+	sed s/--dashes/nodash/ <actual.raw >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src/.git/
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-warning: fetch normally indicates which branches had a forced update,
-but that check has been disabled; to re-enable, use '--show-forced-updates'
-flag or run 'git config fetch.showForcedUpdates true'
-Switched to a new branch 'parallel'
-branch 'parallel' set up to track 'origin/parallel'.
-Your branch is up to date with 'origin/parallel'.
-[parallel 5d34185] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-Available space on '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/src': 67.09 GiB (mount flags 0x1000)
-Archive:  /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20260419_192647.zip
- Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
---------  ------  ------- ---- ---------- ----- --------  ----
-     448  Defl:N      270  40% 2026-04-19 19:26 ade6c03e  diagnostics.log
-    1101  Defl:N      271  75% 2026-04-19 19:26 44c82906  packs-local.txt
-     212  Defl:N      143  33% 2026-04-19 19:26 70730301  objects-local.txt
-       6  Stored        6   0% 2026-04-19 19:26 183bc9be  .git/COMMIT_EDITMSG
-     616  Defl:N      429  30% 2026-04-19 19:26 f4a6d9c4  .git/index
-    1137  Defl:N      592  48% 2026-04-19 19:26 40ba125a  .git/config
-      25  Stored       25   0% 2026-04-19 19:26 7ce4afd6  .git/HEAD
-     467  Defl:N      188  60% 2026-04-19 19:26 42aea511  .git/FETCH_HEAD
-      57  Defl:N       39  32% 2026-04-19 19:26 795d289e  .git/config.worktree
-      73  Defl:N       63  14% 2026-04-19 19:26 1f078b37  .git/description
-     478  Defl:N      279  42% 2026-04-19 19:26 09f84f85  .git/hooks/applypatch-msg.sample
-     896  Defl:N      503  44% 2026-04-19 19:26 10caf8e9  .git/hooks/commit-msg.sample
-    4726  Defl:N     1814  62% 2026-04-19 19:26 793c7cef  .git/hooks/fsmonitor-watchman.sample
-     189  Defl:N      138  27% 2026-04-19 19:26 c0f70c9a  .git/hooks/post-update.sample
-     424  Defl:N      265  38% 2026-04-19 19:26 024cc0cf  .git/hooks/pre-applypatch.sample
-    1649  Defl:N      907  45% 2026-04-19 19:26 1b0e50ae  .git/hooks/pre-commit.sample
-     416  Defl:N      255  39% 2026-04-19 19:26 5ef33f44  .git/hooks/pre-merge-commit.sample
-    1492  Defl:N      744  50% 2026-04-19 19:26 303613ed  .git/hooks/prepare-commit-msg.sample
-    1374  Defl:N      701  49% 2026-04-19 19:26 f90a0f0f  .git/hooks/pre-push.sample
-    4898  Defl:N     2015  59% 2026-04-19 19:26 5158ec84  .git/hooks/pre-rebase.sample
-     544  Defl:N      329  40% 2026-04-19 19:26 96f8c492  .git/hooks/pre-receive.sample
-    2783  Defl:N     1254  55% 2026-04-19 19:26 f00806d3  .git/hooks/push-to-checkout.sample
-    2308  Defl:N      975  58% 2026-04-19 19:26 4b9edd4e  .git/hooks/sendemail-validate.sample
-    3650  Defl:N     1173  68% 2026-04-19 19:26 06fcf0d9  .git/hooks/update.sample
-       8  Stored        8   0% 2026-04-19 19:26 4cc141be  .git/info/sparse-checkout
-     240  Defl:N      173  28% 2026-04-19 19:26 21cd3d77  .git/info/exclude
-     323  Defl:N      168  48% 2026-04-19 19:26 dc297921  .git/logs/HEAD
-     319  Defl:N      164  49% 2026-04-19 19:26 51851cc6  .git/logs/refs/heads/parallel
-     140  Defl:N      100  29% 2026-04-19 19:26 7e602633  .git/logs/refs/remotes/origin/HEAD
-     183  Defl:N      131  28% 2026-04-19 19:26 403541c6  .git/logs/refs/remotes/origin/parallel
-      95  Defl:N       87   8% 2026-04-19 19:26 615f31fc  .git/objects/info/alternates
---------          -------  ---                            -------
-   31277            14209  55%                            31 files
-Contents of /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9210-scalar/.git/objects:
-Total: 3 loose objects
-ok 21 - scalar diagnose
+ok 52 - fast-export handles --end-of-options
 
-# passed all 21 test(s)
-1..21
+# still have 1 known breakage(s)
+# passed all remaining 51 test(s)
+1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t7610-mergetool.sh ***
@@ -539133,9 +540627,9 @@
 Deleted merge conflict for 'a/a/file.txt':
   {local}: deleted
   {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_2263493.txt
-Removing a/a/file_LOCAL_2263493.txt
-Removing a/a/file_REMOTE_2263493.txt
+Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_3484213.txt
+Removing a/a/file_LOCAL_3484213.txt
+Removing a/a/file_REMOTE_3484213.txt
 Removing actual
 Removing both.orig
 Removing expect
@@ -540369,7 +541863,7 @@
 Resolved 'spaced name' using previous resolution.
 Resolved 'subdir/file3' using previous resolution.
 Automatic merge failed; fix conflicts and then commit the result.
-./both_LOCAL_2305293
+./both_LOCAL_3526950
 HEAD is now at b56897f branch1 changes
 ok 24 - filenames seen by tools start with ./
 
@@ -540431,7 +541925,7 @@
 Resolved 'spaced name' using previous resolution.
 Resolved 'subdir/file3' using previous resolution.
 Automatic merge failed; fix conflicts and then commit the result.
-/tmp/git-mergetool-CyfhMy/both_LOCAL_2305962
+/tmp/git-mergetool-ZRTyBD/both_LOCAL_3527779
 HEAD is now at b56897f branch1 changes
 ok 25 - temporary filenames are used with mergetool.writeToTemp
 
@@ -540769,1556 +542263,6 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9350-fast-export.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/.git/
-expecting success of 9350.1 'setup': 
-
-	echo break it > file0 &&
-	git add file0 &&
-	test_tick &&
-	echo Wohlauf > file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo die Luft > file &&
-	echo geht frisch > file2 &&
-	git add file file2 &&
-	test_tick &&
-	git commit -m second &&
-	echo und > file2 &&
-	test_tick &&
-	git commit -m third file2 &&
-	test_tick &&
-	git tag rein &&
-	git checkout -b wer HEAD^ &&
-	echo lange > file2 &&
-	test_tick &&
-	git commit -m sitzt file2 &&
-	test_tick &&
-	git tag -a -m valentin muss &&
-	git merge -s ours main
-
-
-[main (root-commit) 283ea05] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 file0
-[main 300cb83] second
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file2
-[main 80f15f4] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'wer'
-[wer 708f3c9] sitzt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ours' strategy.
-ok 1 - setup
-
-expecting success of 9350.2 'fast-export | fast-import': 
-
-	MAIN=$(git rev-parse --verify main) &&
-	REIN=$(git rev-parse --verify rein) &&
-	WER=$(git rev-parse --verify wer) &&
-	MUSS=$(git rev-parse --verify muss) &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export --all >actual &&
-	(cd new &&
-	 git fast-import &&
-	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
-	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
-	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
-	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           16 (         0 duplicates                  )
-      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
-      commits:            5 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           4 (         3 loads     )
-      marks:           1024 (        11 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          5
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1158
----------------------------------------------------------------------
-
-ok 2 - fast-export | fast-import
-
-expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
-	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 3 - fast-export ^muss^{commit} muss
-
-expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
-	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	mark :1
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 4 - fast-export --mark-tags ^muss^{commit} muss
-
-expecting success of 9350.5 'fast-export main~2..main': 
-
-	git fast-export main~2..main >actual &&
-	sed "s/main/partial/" actual |
-		(cd new &&
-		 git fast-import &&
-		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
-		 git diff --exit-code main partial &&
-		 git diff --exit-code main^ partial^ &&
-		 test_must_fail git rev-parse partial~2)
-
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            8 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-partial~2
-ok 5 - fast-export main~2..main
-
-expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
-
-	git fast-export --reference-excluded-parents main~2..main >actual &&
-	grep commit.refs/heads/main actual >commit-count &&
-	test_line_count = 2 commit-count &&
-	sed "s/main/rewrite/" actual |
-		(cd new &&
-		 git fast-import &&
-		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            7 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         5 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 6 - fast-export --reference-excluded-parents main~2..main
-
-expecting success of 9350.7 'fast-export --show-original-ids': 
-
-	git fast-export --show-original-ids main >output &&
-	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
-	git rev-list --objects main muss >objects-and-names &&
-	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
-	comm -23 actual commits-trees-blobs >unfound &&
-	test_must_be_empty unfound
-
-ok 7 - fast-export --show-original-ids
-
-expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
-
-	git fast-export --show-original-ids main muss | git fast-import --quiet &&
-	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
-	test $MUSS = $(git rev-parse --verify refs/tags/muss)
-
-ok 8 - fast-export --show-original-ids | git fast-import
-
-expecting success of 9350.9 'reencoding iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	test_tick &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
-		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
-		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
-		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
-		 # the expected size.
-		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
-		 # ...and for the expected translation of bytes.
-		 git cat-file commit i18n >actual &&
-		 grep $(printf "\317\200") actual &&
-		 # Also make sure the commit does not have the "encoding" header
-		 ! grep ^encoding actual)
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-Pi: π
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 9 - reencoding iso-8859-7
-
-expecting success of 9350.10 'aborting on iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 10 - aborting on iso-8859-7
-
-expecting success of 9350.11 'preserving iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 # The commit object, if not re-encoded, is 200 bytes plus hash.
-		 # Removing the "encoding iso-8859-7\n" header would drops 20
-		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
-		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
-		 # Check for the expected size...
-		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
-		 # ...as well as the expected byte.
-		 git cat-file commit i18n-no-recoding >actual &&
-		 grep $(printf "\360") actual &&
-		 # Also make sure the commit has the "encoding" header
-		 grep ^encoding actual)
-
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-Pi: ð
-encoding iso-8859-7
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 11 - preserving iso-8859-7
-
-expecting success of 9350.12 'encoding preserved if reencoding fails': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
-	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
-	sed "s/wer/i18n-invalid/" iso-8859-7.fi |
-		(cd new &&
-		 git fast-import &&
-		 git cat-file commit i18n-invalid >actual &&
-		 # Make sure the commit still has the encoding header
-		 grep ^encoding actual &&
-		 # Verify that the commit has the expected size; i.e.
-		 # that no bytes were re-encoded to a different encoding.
-		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
-		 # ...and check for the original special bytes
-		 grep $(printf "\360") actual &&
-		 grep $(printf "\377") actual)
-
-[wer 5cc588f] Pi: ð; Invalid: ÿ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-encoding iso-8859-7
-Pi: ð; Invalid: ÿ
-Pi: ð; Invalid: ÿ
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 12 - encoding preserved if reencoding fails
-
-expecting success of 9350.13 'import/export-marks': 
-
-	git checkout -b marks main &&
-	git fast-export --export-marks=tmp-marks HEAD &&
-	test -s tmp-marks &&
-	test_line_count = 3 tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit actual | wc -l) -eq 0 &&
-	echo change > file &&
-	git commit -m "last commit" file &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit\  actual | wc -l) -eq 1 &&
-	test_line_count = 4 tmp-marks
-
-
-Switched to a new branch 'marks'
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/heads/marks
-commit refs/heads/marks
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
-
-commit refs/heads/marks
-mark :6
-author A U Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912113 -0700
-data 7
-second
-from :3
-M 100644 :5 file2
-M 100644 :4 file
-
-blob
-mark :7
-data 4
-und
-
-commit refs/heads/marks
-mark :8
-author A U Thor <author@example.com> 1112912173 -0700
-committer C O Mitter <committer@example.com> 1112912173 -0700
-data 6
-third
-from :6
-M 100644 :7 file2
-
-[marks 00d551b] last commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - import/export-marks
-
-expecting success of 9350.14 'set up faked signed tag': 
-
-	git fast-import <signed-tag-import
-
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 14 - set up faked signed tag
-
-expecting success of 9350.15 'signed-tags=abort': 
-
-	test_must_fail git fast-export --signed-tags=abort sign-your-name
-
-
-fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/tags/sign-your-name
-commit refs/tags/sign-your-name
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
-
-commit refs/tags/sign-your-name
-mark :6
-author A U Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912113 -0700
-data 7
-second
-from :3
-M 100644 :5 file2
-M 100644 :4 file
-
-blob
-mark :7
-data 4
-und
-
-commit refs/tags/sign-your-name
-mark :8
-author A U Thor <author@example.com> 1112912173 -0700
-committer C O Mitter <committer@example.com> 1112912173 -0700
-data 6
-third
-from :6
-M 100644 :7 file2
-
-blob
-mark :9
-data 7
-change
-
-commit refs/tags/sign-your-name
-mark :10
-author A U Thor <author@example.com> 1112912413 -0700
-committer C O Mitter <committer@example.com> 1112912413 -0700
-data 12
-last commit
-from :8
-M 100644 :9 file
-
-ok 15 - signed-tags=abort
-
-expecting success of 9350.16 'signed-tags=verbatim': 
-
-	git fast-export --signed-tags=verbatim sign-your-name > output &&
-	grep PGP output
-
-
------BEGIN PGP SIGNATURE-----
------END PGP SIGNATURE-----
-ok 16 - signed-tags=verbatim
-
-expecting success of 9350.17 'signed-tags=strip': 
-
-	git fast-export --signed-tags=strip sign-your-name > output &&
-	! grep PGP output
-
-
-ok 17 - signed-tags=strip
-
-expecting success of 9350.18 'signed-tags=warn-strip': 
-	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
-	! grep PGP output &&
-	test -s err
-
-ok 18 - signed-tags=warn-strip
-
-expecting success of 9350.19 'setup submodule': 
-
-	test_config_global protocol.file.allow always &&
-	git checkout -f main &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init  &&
-		echo test file > file &&
-		git add file &&
-		git commit -m sub_initial
-	) &&
-	git submodule add "$(pwd)/sub" sub &&
-	git commit -m initial &&
-	test_tick &&
-	(
-		cd sub &&
-		echo more data >> file &&
-		git add file &&
-		git commit -m sub_second
-	) &&
-	git add sub &&
-	git commit -m second
-
-
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/sub/.git/
-[main (root-commit) 075e849] sub_initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[main f723f15] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main 53da5af] sub_second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 4598a6d] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - setup submodule
-
-expecting success of 9350.20 'submodule fast-export | fast-import': 
-
-	test_config_global protocol.file.allow always &&
-	SUBENT1=$(git ls-tree main^ sub) &&
-	SUBENT2=$(git ls-tree main sub) &&
-	rm -rf new &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export --signed-tags=strip --all >actual &&
-	(cd new &&
-	 git fast-import &&
-	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
-	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
-	 git checkout main &&
-	 git submodule init &&
-	 git submodule update &&
-	 cmp sub/file ../sub/file) <actual
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           25 (         0 duplicates                  )
-      blobs  :            8 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            7 (         0 duplicates          6 deltas of          6 attempts)
-      commits:            8 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         5 loads     )
-      marks:           1024 (        16 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1506
----------------------------------------------------------------------
-
-Already on 'main'
-Submodule 'sub' (/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/sub'...
-done.
-Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
-ok 20 - submodule fast-export | fast-import
-
-expecting success of 9350.21 'setup copies': 
-
-	git checkout -b copy rein &&
-	git mv file file3 &&
-	git commit -m move1 &&
-	test_tick &&
-	cp file2 file4 &&
-	git add file4 &&
-	git mv file2 file5 &&
-	git commit -m copy1 &&
-	test_tick &&
-	cp file3 file6 &&
-	git add file6 &&
-	git commit -m copy2 &&
-	test_tick &&
-	echo more text >> file6 &&
-	echo even more text >> file6 &&
-	git add file6 &&
-	git commit -m modify &&
-	test_tick &&
-	cp file6 file7 &&
-	echo test >> file7 &&
-	git add file7 &&
-	git commit -m copy_modify
-
-
-warning: unable to rmdir 'sub': Directory not empty
-Switched to a new branch 'copy'
-[copy 16740da] move1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => file3 (100%)
-[copy 0d83758] copy1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename file2 => file4 (100%)
- create mode 100644 file5
-[copy 44ca68a] copy2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file6
-[copy 22ab272] modify
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[copy ed9d1ab] copy_modify
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 file7
-ok 21 - setup copies
-
-expecting success of 9350.22 'fast-export -C -C | fast-import': 
-
-	ENTRY=$(git rev-parse --verify copy) &&
-	rm -rf new &&
-	mkdir new &&
-	git --git-dir=new/.git init &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	grep "^C file2 file4\$" output &&
-	cat output |
-	(cd new &&
-	 git fast-import &&
-	 test $ENTRY = $(git rev-parse --verify refs/heads/copy))
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/new/.git/
-C file2 file4
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           37 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          1 deltas of          3 attempts)
-      trees  :           12 (         0 duplicates         11 deltas of         11 attempts)
-      commits:           13 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           6 (         6 loads     )
-      marks:           1024 (        23 unique    )
-      atoms:             10
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =         10
-pack_report: pack_mmap_calls          =          5
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1953
----------------------------------------------------------------------
-
-ok 22 - fast-export -C -C | fast-import
-
-expecting success of 9350.23 'fast-export | fast-import when main is tagged': 
-
-	git tag -m msg last &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	test $(grep -c "^tag " output) = 3
-
-
-ok 23 - fast-export | fast-import when main is tagged
-
-expecting success of 9350.24 'cope with tagger-less tags': 
-
-	TAG=$(git hash-object --literally -t tag -w tag-content) &&
-	git update-ref refs/tags/sonnenschein $TAG &&
-	git fast-export -C -C --signed-tags=strip --all > output &&
-	test $(grep -c "^tag " output) = 4 &&
-	! grep "Unspecified Tagger" output &&
-	git fast-export -C -C --signed-tags=strip --all \
-		--fake-missing-tagger > output &&
-	test $(grep -c "^tag " output) = 4 &&
-	grep "Unspecified Tagger" output
-
-
-tagger Unspecified Tagger <unspecified-tagger> 0 +0000
-ok 24 - cope with tagger-less tags
-
-expecting success of 9350.25 'setup for limiting exports by PATH': 
-	mkdir limit-by-paths &&
-	(
-		cd limit-by-paths &&
-		git init &&
-		echo hi > there &&
-		git add there &&
-		git commit -m "First file" &&
-		echo foo > bar &&
-		git add bar &&
-		git commit -m "Second file" &&
-		git tag -a -m msg mytag &&
-		echo morefoo >> bar &&
-		git add bar &&
-		git commit -m "Change to second file"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/limit-by-paths/.git/
-[main (root-commit) c4bb517] First file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 there
-[main 5b2b7c2] Second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 49ac088] Change to second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - setup for limiting exports by PATH
-
-expecting success of 9350.26 'dropping tag of filtered out object': 
-(
-	cd limit-by-paths &&
-	git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
-	test_cmp expected output
-)
-
-ok 26 - dropping tag of filtered out object
-
-expecting success of 9350.27 'rewriting tag of filtered out object': 
-(
-	cd limit-by-paths &&
-	git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
-	test_cmp expected output
-)
-
-ok 27 - rewriting tag of filtered out object
-
-expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
-	test_create_repo rewrite_tag_predating_pathspecs &&
-	(
-		cd rewrite_tag_predating_pathspecs &&
-
-		test_commit initial &&
-
-		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
-
-		test_commit bar &&
-
-		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
-		grep from.$ZERO_OID output
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
-[main (root-commit) f175d86] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 3f8d6f0] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-from 0000000000000000000000000000000000000000
-from 0000000000000000000000000000000000000000
-ok 28 - rewrite tag predating pathspecs to nothing
-
-checking known breakage of 9350.29 'no exact-ref revisions included': 
-	(
-		cd limit-by-paths &&
-		git fast-export main~2..main~1 > output &&
-		test_cmp expected output
-	)
-
---- expected	2026-04-19 19:26:45.595659440 +0000
-+++ output	2026-04-19 19:26:45.647659440 +0000
-@@ -8,8 +8,7 @@
- data 3
- hi
- 
--reset refs/heads/main
--commit refs/heads/main
-+commit main~1
- mark :3
- author A U Thor <author@example.com> 1112912713 -0700
- committer C O Mitter <committer@example.com> 1112912713 -0700
-not ok 29 - no exact-ref revisions included # TODO known breakage
-
-expecting success of 9350.30 'path limiting with import-marks does not lose unmodified files': 
-	git checkout -b simple marks~2 &&
-	git fast-export --export-marks=marks simple -- file > /dev/null &&
-	echo more content >> file &&
-	test_tick &&
-	git commit -mnext file &&
-	git fast-export --import-marks=marks simple -- file file0 >actual &&
-	grep file0 actual
-
-Switched to a new branch 'simple'
-[simple ed6c25d] next
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-M 100644 :6 file0
-ok 30 - path limiting with import-marks does not lose unmodified files
-
-expecting success of 9350.31 'path limiting works': 
-	git fast-export simple -- file >actual &&
-	sed -ne "s/^M .* //p" <actual | sort -u >actual.files &&
-	echo file >expect &&
-	test_cmp expect actual.files
-
-ok 31 - path limiting works
-
-expecting success of 9350.32 'avoid corrupt stream with non-existent mark': 
-	test_create_repo avoid_non_existent_mark &&
-	(
-		cd avoid_non_existent_mark &&
-
-		test_commit important-path &&
-
-		test_commit ignored &&
-
-		git branch A &&
-		git branch B &&
-
-		echo foo >>important-path.t &&
-		git add important-path.t &&
-		test_commit more changes &&
-
-		git fast-export --all -- important-path.t | git fast-import --force
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
-[main (root-commit) 8503f52] important-path
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 important-path.t
-[main f2403bd] ignored
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ignored.t
-[main 0864148] more
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 changes
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           6 (         2 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /        486
----------------------------------------------------------------------
-
-ok 32 - avoid corrupt stream with non-existent mark
-
-expecting success of 9350.33 'full-tree re-shows unmodified files': 
-	git checkout -f simple &&
-	git fast-export --full-tree simple >actual &&
-	test $(grep -c file0 actual) -eq 3
-
-Already on 'simple'
-ok 33 - full-tree re-shows unmodified files
-
-expecting success of 9350.34 'set-up a few more tags for tag export tests': 
-	git checkout -f main &&
-	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
-	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
-	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
-	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
-	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
-
-Switched to branch 'main'
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-ok 34 - set-up a few more tags for tag export tests
-
-expecting success of 9350.35 'tree_tag': 
-	mkdir result &&
-	(cd result && git init) &&
-	git fast-export tree_tag > fe-stream &&
-	(cd result && git fast-import < ../fe-stream)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/result/.git/
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag c09dd2ba99128e6c5174625e4bdc57259c257f8f,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2399 KiB
-       pools:          2048 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =          0
-pack_report: core.packedGitLimit      =          0
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 35 - tree_tag
-
-expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 36 - tree_tag-obj
-
-expecting success of 9350.37 'tag-obj_tag': git fast-export tag-obj_tag
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 5cff225d75c4ee2ded478b521f9c3964070fbd0f,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 37 - tag-obj_tag
-
-expecting success of 9350.38 'tag-obj_tag-obj': git fast-export tag-obj_tag-obj
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 8e9d4570caa964052d2a27116d2646d73de36ed6,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 4cbb7321bcbed07bbbd1edfdce7b61be318e21c0,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 38 - tag-obj_tag-obj
-
-expecting success of 9350.39 'handling tags of blobs': 
-	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
-	git fast-export blobtag >actual &&
-	cat >expect <<-EOF &&
-	blob
-	mark :1
-	data 9
-	die Luft
-
-	tag blobtag
-	from :1
-	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 14
-	Tag of a blob
-
-	EOF
-	test_cmp expect actual
-
-ok 39 - handling tags of blobs
-
-expecting success of 9350.40 'handling nested tags': 
-	git tag -a -m "This is a nested tag" nested muss &&
-	git fast-export --mark-tags nested >output &&
-	grep "^from $ZERO_OID$" output &&
-	grep "^tag nested$" output >tag_lines &&
-	test_line_count = 2 tag_lines
-
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f nested muss^{}
-hint: Disable this message with "git config set advice.nestedTag false"
-from 0000000000000000000000000000000000000000
-ok 40 - handling nested tags
-
-expecting success of 9350.41 'directory becomes symlink': 
-	git init dirtosymlink &&
-	git init result &&
-	(
-		cd dirtosymlink &&
-		mkdir foo &&
-		mkdir bar &&
-		echo hello > foo/world &&
-		echo hello > bar/world &&
-		git add foo/world bar/world &&
-		git commit -q -mone &&
-		git rm -r foo &&
-		test_ln_s_add bar foo &&
-		git commit -q -mtwo
-	) &&
-	(
-		cd dirtosymlink &&
-		git fast-export main -- foo |
-		(cd ../result && git fast-import --quiet)
-	) &&
-	(cd result && git show main:foo)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/dirtosymlink/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/result/.git/
-rm 'foo/world'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-barok 41 - directory becomes symlink
-
-expecting success of 9350.42 'fast-export quotes pathnames': 
-	git init crazy-paths &&
-	test_config -C crazy-paths core.protectNTFS false &&
-	(cd crazy-paths &&
-	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git -c core.protectNTFS=false update-index --add \
-		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
-		--cacheinfo 100644 $blob "path with \"quote\"" \
-		--cacheinfo 100644 $blob "path with \\backslash" \
-		--cacheinfo 100644 $blob "path with space" &&
-	 git commit -m addition &&
-	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
-	 git read-tree --empty &&
-	 git update-index -z --index-info <index &&
-	 git commit -m rename &&
-	 git read-tree --empty &&
-	 git commit -m deletion &&
-	 git fast-export -M HEAD >export.out &&
-	 git rev-list HEAD >expect &&
-	 git init result &&
-	 cd result &&
-	 git -c core.protectNTFS=false fast-import <../export.out &&
-	 git rev-list HEAD >actual &&
-	 test_cmp ../expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/crazy-paths/.git/
-[main (root-commit) deac6af] addition
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 "path with\nnewline"
- create mode 100644 "path with \"quote\""
- create mode 100644 "path with \\backslash"
- create mode 100644 path with space
-[main 89b4a6a] rename
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
- rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
- rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
- rename path with space => subdir/path with space (100%)
-[main 39f052a] deletion
- Author: A U Thor <author@example.com>
- 4 files changed, 4 deletions(-)
- delete mode 100644 "subdir/path with\nnewline"
- delete mode 100644 "subdir/path with \"quote\""
- delete mode 100644 "subdir/path with \\backslash"
- delete mode 100644 subdir/path with space
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            7 (         1 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            3 (         1 duplicates          0 deltas of          1 attempts)
-      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 42 - fast-export quotes pathnames
-
-expecting success of 9350.43 'test bidirectionality': 
-	git init marks-test &&
-	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
-	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
-	(cd marks-test &&
-	git reset --hard &&
-	echo Wohlauf > file &&
-	git commit -a -m "back in time") &&
-	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
-	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/marks-test/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           38 (         0 duplicates                  )
-      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
-      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
-      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         5 loads     )
-      marks:           1024 (        25 unique    )
-      atoms:             10
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1506
----------------------------------------------------------------------
-
-HEAD is now at 4598a6d second
-[main eb7b3a5] back in time
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         1 loads     )
-      marks:           1024 (        16 unique    )
-      atoms:              5
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 43 - test bidirectionality
-
-expecting success of 9350.44 'avoid uninteresting refs': 
-	> tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > /dev/null &&
-	git tag v1.0 &&
-	git branch uninteresting &&
-	echo bump > file &&
-	git commit -a -m bump &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
-	test_cmp expected actual
-
-[main dcd14ee] bump
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - avoid uninteresting refs
-
-expecting success of 9350.45 'refs are updated even if no commits need to be exported': 
-	> tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > /dev/null &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > actual &&
-	test_cmp expected actual
-
-ok 45 - refs are updated even if no commits need to be exported
-
-expecting success of 9350.46 'use refspec': 
-	git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
-	grep "^commit " actual2 | sort | uniq >actual &&
-	echo "commit refs/heads/foobar" > expected &&
-	test_cmp expected actual
-
-ok 46 - use refspec
-
-expecting success of 9350.47 'delete ref because entire history excluded': 
-	git branch to-delete &&
-	git fast-export to-delete ^to-delete >actual &&
-	cat >expected <<-EOF &&
-	reset refs/heads/to-delete
-	from $ZERO_OID
-
-	EOF
-	test_cmp expected actual
-
-ok 47 - delete ref because entire history excluded
-
-expecting success of 9350.48 'delete refspec': 
-	git fast-export --refspec :refs/heads/to-delete >actual &&
-	cat >expected <<-EOF &&
-	reset refs/heads/to-delete
-	from $ZERO_OID
-
-	EOF
-	test_cmp expected actual
-
-ok 48 - delete refspec
-
-expecting success of 9350.49 'when using -C, do not declare copy when source of copy is also modified': 
-	test_create_repo src &&
-	echo a_line >src/file.txt &&
-	git -C src add file.txt &&
-	git -C src commit -m 1st_commit &&
-
-	cp src/file.txt src/file2.txt &&
-	echo another_line >>src/file.txt &&
-	git -C src add file.txt file2.txt &&
-	git -C src commit -m 2nd_commit &&
-
-	test_create_repo dst &&
-	git -C src fast-export --all -C >actual &&
-	git -C dst fast-import <actual &&
-	git -C src show >expected &&
-	git -C dst show >actual &&
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/src/.git/
-[main (root-commit) b469450] 1st_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-[main 85ccff7] 2nd_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2.txt
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/dst/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              2
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 49 - when using -C, do not declare copy when source of copy is also modified
-
-expecting success of 9350.50 'merge commit gets exported with --import-marks': 
-	test_create_repo merging &&
-	(
-		cd merging &&
-		test_commit initial &&
-		git checkout -b topic &&
-		test_commit on-topic &&
-		git checkout main &&
-		test_commit on-main &&
-		test_tick &&
-		git merge --no-ff -m Yeah topic &&
-
-		echo ":1 $(git rev-parse HEAD^^)" >marks &&
-		git fast-export --import-marks=marks main >out &&
-		grep Yeah out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/merging/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'topic'
-[topic bb9f331] on-topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Switched to branch 'main'
-[main a2e3e6b] on-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-main.t
-Merge made by the 'ort' strategy.
- on-topic.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Yeah
-ok 50 - merge commit gets exported with --import-marks
-
-expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
-	git init first-parent &&
-	(
-		cd first-parent &&
-		test_commit A &&
-		git checkout -b topic1 &&
-		test_commit B &&
-		git checkout main &&
-		git merge --no-ff topic1 &&
-
-		git checkout -b topic2 &&
-		test_commit C &&
-		git checkout main &&
-		git merge --no-ff topic2 &&
-
-		test_commit D &&
-
-		git fast-export main -- --first-parent >first-parent-export &&
-		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
-		test_cmp first-parent-export first-parent-reverse-export &&
-
-		git init import &&
-		git -C import fast-import <first-parent-export &&
-
-		git log --format="%ad %s" --first-parent main >expected &&
-		git -C import log --format="%ad %s" --all >actual &&
-		test_cmp expected actual &&
-		test_line_count = 4 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/first-parent/.git/
-[main (root-commit) 40531c9] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'topic1'
-[topic1 26bf445] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'topic2'
-[topic2 3d54688] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 0270458] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9350-fast-export/first-parent/import/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           12 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
-      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         8 unique    )
-      atoms:              4
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 51 - fast-export --first-parent outputs all revisions output by revision walk
-
-expecting success of 9350.52 'fast-export handles --end-of-options': 
-	git update-ref refs/heads/nodash HEAD &&
-	git update-ref refs/heads/--dashes HEAD &&
-	git fast-export --end-of-options nodash >expect &&
-	git fast-export --end-of-options --dashes >actual.raw &&
-	# fix up lines which mention the ref for comparison
-	sed s/--dashes/nodash/ <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 52 - fast-export handles --end-of-options
-
-# still have 1 known breakage(s)
-# passed all remaining 51 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9161-git-svn-mergeinfo-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
 expecting success of 9161.1 'load svn dump': 
@@ -542405,7 +542349,7 @@
 	A	b2file
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
 Found merge parent (/branches/svnb2:3,8): 1c5e2425ccab7518049b49fa805a0f160bf0e8ad
-r13 = 69603ca88e7556682902ee1329480970c1a95aeb (refs/remotes/origin/svnb1)
+r13 = bf61e81d9b2cf7da2fb35e16e5401f3505573d88 (refs/remotes/origin/svnb1)
 No changes between f44a46d2e8530999b995f18b9c185b9e6a7f652a and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 2 - propagate merge information
@@ -542431,8 +542375,8 @@
 	A	b3file
 Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
 Found merge parent (/branches/svnb3:4,9): c15c720d39b707488597f718fbd23f5afe1d1106
-r14 = ea317206d5214692f024f74b10b9d8dc18daa7bd (refs/remotes/origin/svnb1)
-No changes between f6c45fb2c5a1099bcd773f201b0989428b4f19c8 and refs/remotes/origin/svnb1
+r14 = 82d078faea592b3218e7ac4904c04caac2abf902 (refs/remotes/origin/svnb1)
+No changes between 96b43fcbac5e54abf797de45238da23ea59c87d9 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 4 - merge another branch
 
@@ -542463,8 +542407,8 @@
 Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
 Found merge parent (/branches/svnb4:5-6,10-12): 3c2a67e8e00fb394cbcd9c6872404d5c64572557
 Found merge parent (/branches/svnb5:6,11): 1f1bad51e174f958f908378f28173dec6eeef240
-r15 = 923820704aacb7946846486133da3b0933a46ff9 (refs/remotes/origin/svnb1)
-No changes between ee4ebfedc8b7ff1f1e5513aec857cfe3c5efa39a and refs/remotes/origin/svnb1
+r15 = 718debafe827c2fcc372e97461a6372c0a0acf42 (refs/remotes/origin/svnb1)
+No changes between f886e1a8a194d3c2044ce16305379957dfebdad5 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 6 - merge existing merge
 
@@ -542487,7 +542431,7 @@
 	git commit -m "later b2 commit 2" &&
 	git svn dcommit
 	
-Previous HEAD position was 9238207 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was 718deba Merge remote-tracking branch 'origin/svnb4' into HEAD
 HEAD is now at 1c5e242 b2 commit
 [detached HEAD 18e28a9] later b2 commit
  Author: A U Thor <author@example.com>
@@ -542502,11 +542446,11 @@
 	A	newb2file
 Committed r16
 	A	newb2file
-r16 = 24e10be23d2a89545c5dccc2d5bebb3a2bee8be4 (refs/remotes/origin/svnb2)
+r16 = bf8708e664341d0b8fb7400f588eb172ee42c018 (refs/remotes/origin/svnb2)
 	A	newb2file-2
 Committed r17
 	A	newb2file-2
-r17 = 4dd07e7be85f55f836d811adda9a50e8eff51564 (refs/remotes/origin/svnb2)
+r17 = 713b0468f2a871917d58a1d92a81acb1248446b8 (refs/remotes/origin/svnb2)
 No changes between 0f960b3c87f2243e6282125ed03128095937760c and refs/remotes/origin/svnb2
 Resetting to the latest refs/remotes/origin/svnb2
 ok 8 - make further commits to branch
@@ -542516,8 +542460,8 @@
 	git merge --no-ff origin/svnb2 &&
 	git svn dcommit
 	
-Previous HEAD position was 4dd07e7 later b2 commit 2
-HEAD is now at 9238207 Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was 713b046 later b2 commit 2
+HEAD is now at 718deba Merge remote-tracking branch 'origin/svnb4' into HEAD
 Merge made by the 'ort' strategy.
  newb2file   | 0
  newb2file-2 | 0
@@ -542532,9 +542476,9 @@
 	A	newb2file
 	A	newb2file-2
 Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
-Found merge parent (/branches/svnb2:8,16-17): 4dd07e7be85f55f836d811adda9a50e8eff51564
-r18 = 0098663cd1bd9376abacb3a4adc324a0f466e652 (refs/remotes/origin/svnb1)
-No changes between 211ebb3ea8d1f8643eb81b8831af3ea0a8a6d814 and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb2:8,16-17): 713b0468f2a871917d58a1d92a81acb1248446b8
+r18 = 689ef350c1f3048a6d4f208af772711702a6cd2a (refs/remotes/origin/svnb1)
+No changes between 547cf03a7d793b8ca660d6cd14e9253d82724254 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 9 - second forward merge
 
@@ -542552,7 +542496,7 @@
 	git merge --no-ff origin/svnb1 &&
 	git svn dcommit
 	
-Previous HEAD position was 0098663 Merge remote-tracking branch 'origin/svnb2' into HEAD
+Previous HEAD position was 689ef35 Merge remote-tracking branch 'origin/svnb2' into HEAD
 HEAD is now at 3c2a67e Merge remote-tracking branch 'svnb5' into HEAD
 Merge made by the 'ort' strategy.
  b1file      | 0
@@ -542580,11 +542524,11 @@
 	A	newb2file
 	A	newb2file-2
 Checking svn:mergeinfo changes since r12: 4 sources, 3 changed
-Found merge parent (/branches/svnb1:2-4,7-9,13-18): 0098663cd1bd9376abacb3a4adc324a0f466e652
-Found merge parent (/branches/svnb2:3,8,16-17): 4dd07e7be85f55f836d811adda9a50e8eff51564
+Found merge parent (/branches/svnb1:2-4,7-9,13-18): 689ef350c1f3048a6d4f208af772711702a6cd2a
+Found merge parent (/branches/svnb2:3,8,16-17): 713b0468f2a871917d58a1d92a81acb1248446b8
 Found merge parent (/branches/svnb3:4,9): c15c720d39b707488597f718fbd23f5afe1d1106
-r19 = 9a1f8022ebac32b75ad588bf638d2e5e15eb8b72 (refs/remotes/origin/svnb4)
-No changes between 750e3295babfc5668fce54a31202d6221c07f9c5 and refs/remotes/origin/svnb4
+r19 = 17290288633da7a887c34184acd2ba357f4d00b9 (refs/remotes/origin/svnb4)
+No changes between 58000a7655a21070283b99f5fb7674b867a99f00 and refs/remotes/origin/svnb4
 Resetting to the latest refs/remotes/origin/svnb4
 ok 11 - reintegration merge
 
@@ -542605,9 +542549,9 @@
 	git merge origin/svnb4 &&
 	git svn dcommit
 	
-Previous HEAD position was 9a1f802 Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at 0098663 Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD 8a4de64] a commit
+Previous HEAD position was 1729028 Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at 689ef35 Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD 33e426e] a commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 anotherfile
@@ -542617,14 +542561,14 @@
 	A	anotherfile
 Committed r20
 	A	anotherfile
-r20 = 16e66fd41ea91558003139483626a8152c1e9231 (refs/remotes/origin/svnb1)
+r20 = 6766491719613b3802d099b72b095d68ca3332f3 (refs/remotes/origin/svnb1)
 Committed r21
 No changes
-62560a7f6b91c82ade1ac9400ad36f89cbb92e07~1 == 62560a7f6b91c82ade1ac9400ad36f89cbb92e07
+e3d08fb9c728969d585019362163cfb8ca290479~1 == e3d08fb9c728969d585019362163cfb8ca290479
 Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): 9a1f8022ebac32b75ad588bf638d2e5e15eb8b72
-r21 = 0f7b76b1d94ea36bcb4d1abc60f594bc1cfebe65 (refs/remotes/origin/svnb1)
-No changes between 62560a7f6b91c82ade1ac9400ad36f89cbb92e07 and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb4:10-12,19): 17290288633da7a887c34184acd2ba357f4d00b9
+r21 = cb913a850a30c1cf4cfeeb195e165aeb515e16c5 (refs/remotes/origin/svnb1)
+No changes between e3d08fb9c728969d585019362163cfb8ca290479 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 13 - dcommit a merge at the top of a stack
 
@@ -542740,22 +542684,22 @@
 	(required for this version (2.49.0.395.g12beb8f557c) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = be0b571061df327e9ef8efbda9a177be14cfc4e5 (refs/remotes/trunk)
+r1 = 09c9709a02c4cd8aab88e0cf14660c503bd81548 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) be0b571061df327e9ef8efbda9a177be14cfc4e5
+Found branch parent: (refs/remotes/branches/b_start) 09c9709a02c4cd8aab88e0cf14660c503bd81548
 Following parent with do_switch
 Successfully followed parent
-r2 = dbdb0193b23df78690195c21f9e683f20d50a30a (refs/remotes/branches/b_start)
+r2 = f6b3139eead3f4f3b14b5acf0fe60ef8721ee1f5 (refs/remotes/branches/b_start)
 	M	readme
-r3 = f5ce4b3fb7976f18333212f506a3b6909443f615 (refs/remotes/branches/b_start)
+r3 = 44cc50b5c215e28529380ebf4e0d15e74d4d4077 (refs/remotes/branches/b_start)
 branch_from: /branches/b_start => /branches/b_start/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) f5ce4b3fb7976f18333212f506a3b6909443f615
+Found branch parent: (refs/remotes/tags/t_end) 44cc50b5c215e28529380ebf4e0d15e74d4d4077
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = fdaf7d1ab0262b01884b972a3971325902412041 (refs/remotes/tags/t_end)
+r4 = 502b47623a02822923e0b2d176a2d2fedcf5039a (refs/remotes/tags/t_end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a r1
 fatal: ambiguous argument 'refs/remotes/tags/t_end@3': unknown revision or path not in the working tree.
@@ -542804,26 +542748,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872 (refs/remotes/two/trunk)
+r1 = d9941f531787aec6f109bdd10f7da0329ea7c3e6 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872
+Found branch parent: (refs/remotes/two/branches/b_start) d9941f531787aec6f109bdd10f7da0329ea7c3e6
 Following parent with do_switch
 Successfully followed parent
-r2 = e213eea38dbdfb3b2d9ddd56bb2e1aada57df86e (refs/remotes/two/branches/b_start)
+r2 = eb116240614dd00883c7e1445006e08d032e1219 (refs/remotes/two/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = ea9280798aeefaec703fdc791f6b09475a1fff94 (refs/remotes/two/branches/b_start)
+r3 = 6ab7227cafcd268db2fb3d515664d79b8ed0eec9 (refs/remotes/two/branches/b_start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) ea9280798aeefaec703fdc791f6b09475a1fff94
+Found branch parent: (refs/remotes/two/tags/t_end) 6ab7227cafcd268db2fb3d515664d79b8ed0eec9
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = b4ecb54cf79ae7c946a4382e222a7ab262a52283 (refs/remotes/two/tags/t_end)
+r4 = 4d65513b669363a1982c5e108e8d0ff2ba6219a5 (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r5 = 0dd4f74ab6686f255d1828e9e9b4893f9965518f (refs/remotes/two/tags/t_end)
+r5 = 6f90778fba5bdf9e997f556744d4efeecc949f1c (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r6 = ed0f5b32308f705781c66f582c52f1b0e8c1effe (refs/remotes/two/tags/t_end)
+r6 = fe54d2896d8e8489fd53b99934ba4da3e71b85d5 (refs/remotes/two/tags/t_end)
 ok 4 - test left-hand-side only prefixed globbing
 
 expecting success of 9168.5 'prepare test prefixed globs match just prefix': 
@@ -542887,38 +542831,38 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872 (refs/remotes/three/trunk)
+r1 = d9941f531787aec6f109bdd10f7da0329ea7c3e6 (refs/remotes/three/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872
+Found branch parent: (refs/remotes/three/branches/b_start) d9941f531787aec6f109bdd10f7da0329ea7c3e6
 Following parent with do_switch
 Successfully followed parent
-r2 = e213eea38dbdfb3b2d9ddd56bb2e1aada57df86e (refs/remotes/three/branches/b_start)
+r2 = eb116240614dd00883c7e1445006e08d032e1219 (refs/remotes/three/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = ea9280798aeefaec703fdc791f6b09475a1fff94 (refs/remotes/three/branches/b_start)
+r3 = 6ab7227cafcd268db2fb3d515664d79b8ed0eec9 (refs/remotes/three/branches/b_start)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) ea9280798aeefaec703fdc791f6b09475a1fff94
+Found branch parent: (refs/remotes/three/tags/t_end) 6ab7227cafcd268db2fb3d515664d79b8ed0eec9
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = b4ecb54cf79ae7c946a4382e222a7ab262a52283 (refs/remotes/three/tags/t_end)
+r4 = 4d65513b669363a1982c5e108e8d0ff2ba6219a5 (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r5 = 0dd4f74ab6686f255d1828e9e9b4893f9965518f (refs/remotes/three/tags/t_end)
+r5 = 6f90778fba5bdf9e997f556744d4efeecc949f1c (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r6 = ed0f5b32308f705781c66f582c52f1b0e8c1effe (refs/remotes/three/tags/t_end)
+r6 = fe54d2896d8e8489fd53b99934ba4da3e71b85d5 (refs/remotes/three/tags/t_end)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872
+Found branch parent: (refs/remotes/three/branches/b_) d9941f531787aec6f109bdd10f7da0329ea7c3e6
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r7 = 68f78259d074c0f85a41475b88518961c5eb0fdd (refs/remotes/three/branches/b_)
+r7 = 0461a4ad359800a2f6ea99992929124a57174e2d (refs/remotes/three/branches/b_)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) 68f78259d074c0f85a41475b88518961c5eb0fdd
+Found branch parent: (refs/remotes/three/tags/t_) 0461a4ad359800a2f6ea99992929124a57174e2d
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r8 = 458323f4fe757111901b0d82060a43ff213a80d1 (refs/remotes/three/tags/t_)
+r8 = d316b7a4284d6b144eaa90f28c45d4e076ba641d (refs/remotes/three/tags/t_)
 ok 6 - test prefixed globs match just prefix
 
 expecting success of 9168.7 'prepare test disallow prefixed multi-globs': 
@@ -543016,19 +542960,19 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872 (refs/remotes/five/trunk)
+r1 = d9941f531787aec6f109bdd10f7da0329ea7c3e6 (refs/remotes/five/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) 4ceae9a856dcb4c2ee8f18e9d1f1023ca146e872
+Found branch parent: (refs/remotes/five/branches/abcde) d9941f531787aec6f109bdd10f7da0329ea7c3e6
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r10 = d28e84a8ad5e970499cf1df7ddd21826d0e7465b (refs/remotes/five/branches/abcde)
+r10 = 31362c3c6e548196834b64db9758cd13c549804b (refs/remotes/five/branches/abcde)
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) d28e84a8ad5e970499cf1df7ddd21826d0e7465b
+Found branch parent: (refs/remotes/five/tags/fghij) 31362c3c6e548196834b64db9758cd13c549804b
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r11 = 121d1f7ec850a5cd962ee6d789e571be4f03c0b5 (refs/remotes/five/tags/fghij)
+r11 = ab8acbdd2256834ae30ce6cd52e1cef94785d897 (refs/remotes/five/tags/fghij)
 ok 10 - test globbing in the middle of the word
 
 expecting success of 9168.11 'prepare test disallow multiple asterisks in one word': 
@@ -543064,189 +543008,723 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9501-gitweb-standalone-http-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9501-gitweb-standalone-http-status/.git/
-expecting success of 9501.1 'setup': 
-	test_commit 'SnapshotTests' 'i can has snapshot'
+*** t9200-git-cvsexportcommit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/.git/
+checking prerequisite: NOT_ROOT
 
-[main (root-commit) cea0920] SnapshotTests
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+expecting success of 9200.1 'New file': 
+	mkdir A B C D E F &&
+	echo hello1 >A/newfile1.txt &&
+	echo hello2 >B/newfile2.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
+	git add A/newfile1.txt &&
+	git add B/newfile2.txt &&
+	git add C/newfile3.png &&
+	git add D/newfile4.png &&
+	git commit -a -m "Test: New file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.1/" &&
+	check_entries B "newfile2.txt/1.1/" &&
+	check_entries C "newfile3.png/1.1/-kb" &&
+	check_entries D "newfile4.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp B/newfile2.txt ../B/newfile2.txt &&
+	test_cmp C/newfile3.png ../C/newfile3.png &&
+	test_cmp D/newfile4.png ../D/newfile4.png
+	)
+
+[master 288d750] Test: New file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i can has snapshot
-ok 1 - setup
+ 4 files changed, 2 insertions(+)
+ create mode 100644 A/newfile1.txt
+ create mode 100644 B/newfile2.txt
+ create mode 100644 C/newfile3.png
+ create mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A put under version control
+cvs add: scheduling file `A/newfile1.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `B/newfile2.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `C/newfile3.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `D/newfile4.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Test: New file
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 1 - New file
 
-expecting success of 9501.2 'snapshots: tgz only default format enabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
-    grep "403 - Unsupported snapshot format" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
-    grep "403 - Snapshot format not allowed" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "403 - Unsupported snapshot format" gitweb.output
-grep: gitweb.output: binary file matches
-403 - Unsupported snapshot format
-403 - Snapshot format not allowed
-403 - Unsupported snapshot format
-ok 2 - snapshots: tgz only default format enabled
+expecting success of 9200.2 'Remove two files, add two and update two': 
+	echo Hello1 >>A/newfile1.txt &&
+	rm -f B/newfile2.txt &&
+	rm -f C/newfile3.png &&
+	echo Hello5  >E/newfile5.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
+	git add E/newfile5.txt &&
+	git add F/newfile6.png &&
+	git commit -a -m "Test: Remove, add and update" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "newfile4.png/1.2/-kb" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp D/newfile4.png ../D/newfile4.png &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
 
-expecting success of 9501.3 'snapshots: all enabled in default, use default disabled value': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
-    grep "Status: 200 OK" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
-    grep "403 - Snapshot format not allowed" gitweb.output &&
-    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "Status: 200 OK" gitweb.output
-grep: gitweb.output: binary file matches
-grep: gitweb.output: binary file matches
-403 - Snapshot format not allowed
-grep: gitweb.output: binary file matches
-ok 3 - snapshots: all enabled in default, use default disabled value
+[master 69b0239] Test: Remove, add and update
+ Author: A U Thor <author@example.com>
+ 5 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 B/newfile2.txt
+ create mode 100644 E/newfile5.txt
+ rename C/newfile3.png => F/newfile6.png (100%)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E put under version control
+cvs add: scheduling file `E/newfile5.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `F/newfile6.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs remove: scheduling `B/newfile2.txt' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+cvs remove: scheduling `C/newfile3.png' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): Test: Remove, add and update
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png' 'E/newfile5.txt' 'F/newfile6.png'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
+new revision: delete; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
+new revision: delete; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 2 - Remove two files, add two and update two
 
-expecting success of 9501.4 'snapshots: zip explicitly disabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
-    grep "403 - Snapshot format not allowed" gitweb.output
-403 - Snapshot format not allowed
-ok 4 - snapshots: zip explicitly disabled
+expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generatiion 1" &&
+     cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generation 2" &&
+     id=$(git rev-list --max-count=1 HEAD) &&
+     (cd "$CVSWORK" &&
+     test_must_fail git cvsexportcommit -c $id
+     )
+[master 70e0115] generatiion 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master d73a469] generation 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Checking if patch will apply
+Applying
+error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
+error: D/newfile4.png: patch does not apply
+cannot patch at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsexportcommit line 338.
+ok 3 - Fail to change binary more than one generation old
 
-expecting success of 9501.5 'snapshots: tgz explicitly enabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
-    grep "Status: 200 OK" gitweb.output
-grep: gitweb.output: binary file matches
-ok 5 - snapshots: tgz explicitly enabled
+expecting success of 9200.4 'Remove only binary files': 
+	git reset --hard HEAD^^ &&
+	rm -f D/newfile4.png &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
 
-expecting success of 9501.6 'snapshots: good tree-ish id': 
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.output
+HEAD is now at 69b0239 Test: Remove, add and update
+[master 2a45f53] test: remove only a binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `D/newfile4.png' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'D/newfile4.png'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 4 - Remove only binary files
 
-grep: gitweb.output: binary file matches
-ok 6 - snapshots: good tree-ish id
+expecting success of 9200.5 'Remove only a text file': 
+	rm -f A/newfile1.txt &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
 
-expecting success of 9501.7 'snapshots: bad tree-ish id': 
-	gitweb_run "p=.git;a=snapshot;h=frizzumFrazzum;sf=tgz" &&
-	grep "404 - Object does not exist" gitweb.output
+[master fa834fd] test: remove only a binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 A/newfile1.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `A/newfile1.txt' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 5 - Remove only a text file
 
-404 - Object does not exist
-ok 7 - snapshots: bad tree-ish id
+expecting success of 9200.6 'New file with spaces in file name': 
+	mkdir "G g" &&
+	echo ok then >"G g/with spaces.txt" &&
+	git add "G g/with spaces.txt" && \
+	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "With spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
+	)
 
-expecting success of 9501.8 'snapshots: bad tree-ish id (tagged object)': 
-	echo object > tag-object &&
-	git add tag-object &&
-	test_tick && git commit -m "Object to be tagged" &&
-	git tag tagged-object $(git hash-object tag-object) &&
-	gitweb_run "p=.git;a=snapshot;h=tagged-object;sf=tgz" &&
-	grep "400 - Object is not a tree-ish" gitweb.output
+[master 7dad360] With spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 G g/with spaces.png
+ create mode 100644 G g/with spaces.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g put under version control
+cvs add: scheduling file `G g/with spaces.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `G g/with spaces.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): With spaces
+Autocommit
+  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 6 - New file with spaces in file name
 
-[main 031b7cf] Object to be tagged
+expecting success of 9200.7 'Update file with spaces in file name': 
+	echo Ok then >>"G g/with spaces.txt" &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "Update with spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
+	)
+
+[master 200512b] Update with spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Update with spaces
+Autocommit
+  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
+new revision: 1.2; previous revision: 1.1
+Committed successfully to CVS
+ok 7 - Update file with spaces in file name
+
+expecting success of 9200.8 'File with non-ascii file name': 
+	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
+	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git commit -a -m "Går det så går det" && \
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -v -c $id &&
+	check_entries \
+	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
+	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
+	)
+
+[master 2dba919] Går det så går det
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png"
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt"
+Applying to CVS commit 2dba9190cda577aa84017fec4349519cd1aadafb from parent 200512bccb19b444ac4f1e098c7d7d3578864bb4
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥ put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä put under version control
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö put under version control
+cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Går det så går det
+Autocommit
+  cvs commit -F .msg 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 8 - File with non-ascii file name
+
+expecting success of 9200.9 'Mismatching patch should fail': 
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update one" &&
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update two" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	test_must_fail git cvsexportcommit -c $id
+	)
+
+[master f34d33c] Update one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 tag-object
-400 - Object is not a tree-ish
-ok 8 - snapshots: bad tree-ish id (tagged object)
+[master 602996d] Update two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+error: patch failed: E/newfile5.txt:1
+error: E/newfile5.txt: patch does not apply
+cannot patch at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsexportcommit line 338.
+ok 9 - Mismatching patch should fail
 
-expecting success of 9501.9 'snapshots: good object id': 
-	ID=$(git rev-parse --verify HEAD) &&
-	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.output
+checking prerequisite: FILEMODE
 
-grep: gitweb.output: binary file matches
-ok 9 - snapshots: good object id
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
 
-expecting success of 9501.10 'snapshots: bad object id': 
-	gitweb_run "p=.git;a=snapshot;h=abcdef01234;sf=tgz" &&
-	grep "404 - Object does not exist" gitweb.output
+)
+prerequisite FILEMODE ok
+expecting success of 9200.10 'Retain execute bit': 
+	mkdir G &&
+	echo executeon >G/on &&
+	chmod +x G/on &&
+	echo executeoff >G/off &&
+	git add G/on &&
+	git add G/off &&
+	git commit -a -m "Execute test" &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c HEAD &&
+	test -x G/on &&
+	! test -x G/off
+	)
 
-404 - Object does not exist
-ok 10 - snapshots: bad object id
+[master 48d92ca] Execute test
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 G/off
+ create mode 100755 G/on
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G put under version control
+cvs add: scheduling file `G/off' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `G/on' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Execute test
+Autocommit
+  cvs commit -F .msg 'G/off' 'G/on'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/on,v  <--  G/on
+initial revision: 1.1
+Committed successfully to CVS
+ok 10 - Retain execute bit
 
-expecting success of 9501.11 'modification: feed last-modified': 
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 200 OK" gitweb.headers &&
-	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
+expecting success of 9200.11 '-w option should work with relative GIT_DIR': 
+	mkdir W &&
+	echo foobar >W/file1.txt &&
+	echo bazzle >W/file2.txt &&
+	git add W/file1.txt &&
+	git add W/file2.txt &&
+	git commit -m "More updates" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$GIT_DIR" &&
+	GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" &&
+	test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt &&
+	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
+	)
 
-Status: 200 OK
-Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
-ok 11 - modification: feed last-modified
+[master 7f1ddf1] More updates
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 W/file1.txt
+ create mode 100644 W/file2.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W put under version control
+cvs add: scheduling file `W/file1.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `W/file2.txt' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): More updates
+Autocommit
+  cvs commit -F .msg 'W/file1.txt' 'W/file2.txt'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file2.txt,v  <--  W/file2.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 11 - -w option should work with relative GIT_DIR
 
-expecting success of 9501.12 'modification: feed if-modified-since (modified)': 
-	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 200 OK" gitweb.headers
+expecting success of 9200.12 'check files before directories': 
 
-Status: 200 OK
-ok 12 - modification: feed if-modified-since (modified)
+	echo Notes > release-notes &&
+	git add release-notes &&
+	git commit -m "Add release notes" release-notes &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
 
-expecting success of 9501.13 'modification: feed if-modified-since (unmodified)': 
-	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=main" &&
-	grep "Status: 304 Not Modified" gitweb.headers
+	echo new > DS &&
+	echo new > E/DS &&
+	echo modified > release-notes &&
+	git add DS E/DS release-notes &&
+	git commit -m "Add two files with the same basename" &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" &&
+	check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" &&
+	test_cmp "$CVSWORK/DS" DS &&
+	test_cmp "$CVSWORK/E/DS" E/DS &&
+	test_cmp "$CVSWORK/release-notes" release-notes
 
-Status: 304 Not Modified
-ok 13 - modification: feed if-modified-since (unmodified)
 
-expecting success of 9501.14 'modification: snapshot last-modified': 
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.headers &&
-	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
+[master 8c041f2] Add release notes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 release-notes
+Checking if patch will apply
+cvs status: nothing known about `release-notes'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file `release-notes' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add release notes
+Autocommit
+  cvs commit -F .msg 'release-notes'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
+initial revision: 1.1
+Committed successfully to CVS
+[master 34a628c] Add two files with the same basename
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 DS
+ create mode 100644 E/DS
+Checking if patch will apply
+cvs status: nothing known about `DS'
+cvs status: nothing known about `E/DS'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file `DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `E/DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add two files with the same basename
+Autocommit
+  cvs commit -F .msg 'DS' 'E/DS' 'release-notes'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
+initial revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
+new revision: 1.2; previous revision: 1.1
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/DS,v  <--  E/DS
+initial revision: 1.1
+Committed successfully to CVS
+ok 12 - check files before directories
 
-Status: 200 OK
-Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
-ok 14 - modification: snapshot last-modified
+expecting success of 9200.13 're-commit a removed filename which remains in CVS attic': 
+	(cd "$CVSWORK" &&
+	echo >attic_gremlin &&
+	cvs -Q add attic_gremlin &&
+	cvs -Q ci -m "added attic_gremlin" &&
+	rm attic_gremlin &&
+	cvs -Q rm attic_gremlin &&
+	cvs -Q ci -m "removed attic_gremlin") &&
 
-expecting success of 9501.15 'modification: snapshot if-modified-since (modified)': 
-	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.headers
+	echo > attic_gremlin &&
+	git add attic_gremlin &&
+	git commit -m "Added attic_gremlin" &&
+	git cvsexportcommit -w "$CVSWORK" -c HEAD &&
+	(cd "$CVSWORK" && cvs -Q update -d) &&
+	test -f "$CVSWORK/attic_gremlin"
 
-Status: 200 OK
-ok 15 - modification: snapshot if-modified-since (modified)
+[master c230a4a] Added attic_gremlin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 attic_gremlin
+Checking if patch will apply
+Applying
+<stdin>:7: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: Re-adding file `attic_gremlin' after dead revision 1.2.
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Added attic_gremlin
+Autocommit
+  cvs commit -F .msg 'attic_gremlin'
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/attic_gremlin,v  <--  attic_gremlin
+new revision: 1.3; previous revision: 1.2
+Committed successfully to CVS
+ok 13 - re-commit a removed filename which remains in CVS attic
 
-expecting success of 9501.16 'modification: snapshot if-modified-since (unmodified)': 
-	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
-	grep "Status: 304 Not Modified" gitweb.headers
+expecting success of 9200.14 'commit a file with leading spaces in the name': 
 
-Status: 304 Not Modified
-ok 16 - modification: snapshot if-modified-since (unmodified)
+	echo space > " space" &&
+	git add " space" &&
+	git commit -m "Add a file with a leading space" &&
+	id=$(git rev-parse HEAD) &&
+	git cvsexportcommit -w "$CVSWORK" -c $id &&
+	check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
+	test_cmp "$CVSWORK/ space" " space"
 
-expecting success of 9501.17 'modification: tree snapshot': 
-	ID=$(git rev-parse --verify HEAD^{tree}) &&
-	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
-	export HTTP_IF_MODIFIED_SINCE &&
-	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
-	grep "Status: 200 OK" gitweb.headers &&
-	! grep -i "last-modified" gitweb.headers
 
-Status: 200 OK
-ok 17 - modification: tree snapshot
+[master 45903b8] Add a file with a leading space
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644  space
+Checking if patch will apply
+cvs status: nothing known about ` space'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file ` space' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add a file with a leading space
+Autocommit
+  cvs commit -F .msg  space
+/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/ space,v  <--   space
+initial revision: 1.1
+Committed successfully to CVS
+ok 14 - commit a file with leading spaces in the name
 
-expecting success of 9501.18 'load checking: load too high (default action)': 
-	gitweb_run "p=.git" &&
-	grep "Status: 503 Service Unavailable" gitweb.headers &&
-	grep "503 - The load average on the server is too high" gitweb.body
+expecting success of 9200.15 'use the same checkout for Git and CVS': 
 
-Status: 503 Service Unavailable
-503 - The load average on the server is too high
-ok 18 - load checking: load too high (default action)
+	(mkdir shared &&
+	 cd shared &&
+	 sane_unset GIT_DIR &&
+	 cvs co . &&
+	 git init &&
+	 git add " space" &&
+	 git commit -m "fake initial commit" &&
+	 echo Hello >> " space" &&
+	 git commit -m "Another change" " space" &&
+	 git cvsexportcommit -W -p -u -c HEAD &&
+	 grep Hello " space" &&
+	 git diff-files)
 
-expecting success of 9501.19 'invalid arguments: invalid regexp (in project search)': 
-	gitweb_run "a=project_list;s=*\.git;sr=1" &&
-	grep "Status: 400" gitweb.headers &&
-	grep "400 - Invalid.*regexp" gitweb.body
 
-Status: 400 Bad Request
-400 - Invalid search regexp &#39;*\.git&#39;
-ok 19 - invalid arguments: invalid regexp (in project search)
+cvs checkout: Updating .
+U  space
+U DS
+U attic_gremlin
+U release-notes
+cvs checkout: Updating A
+cvs checkout: Updating B
+cvs checkout: Updating C
+cvs checkout: Updating CVSROOT
+U CVSROOT/checkoutlist
+U CVSROOT/commitinfo
+U CVSROOT/config
+U CVSROOT/cvswrappers
+U CVSROOT/loginfo
+U CVSROOT/modules
+U CVSROOT/notify
+U CVSROOT/postadmin
+U CVSROOT/postproxy
+U CVSROOT/posttag
+U CVSROOT/postwatch
+U CVSROOT/preproxy
+U CVSROOT/rcsinfo
+U CVSROOT/taginfo
+U CVSROOT/verifymsg
+cvs checkout: Updating D
+cvs checkout: Updating E
+U E/DS
+U E/newfile5.txt
+cvs checkout: Updating F
+U F/newfile6.png
+cvs checkout: Updating G
+U G/off
+U G/on
+cvs checkout: Updating G g
+U G g/with spaces.png
+U G g/with spaces.txt
+cvs checkout: Updating W
+U W/file1.txt
+U W/file2.txt
+cvs checkout: Updating Ã…
+cvs checkout: Updating Ã…/goo
+cvs checkout: Updating Ã…/goo/a
+cvs checkout: Updating Ã…/goo/a/b
+cvs checkout: Updating Ã…/goo/a/b/c
+cvs checkout: Updating Ã…/goo/a/b/c/d
+cvs checkout: Updating Ã…/goo/a/b/c/d/e
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
+cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥
+cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä
+cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö
+U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
+U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
+[master (root-commit) 93a1e74] fake initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644  space
+[master 6935f1b] Another change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Another change
+Autocommit
+  cvs commit -F .msg  space
+Committed successfully to CVS
+HEAD is now at 6935f1b Another change
+Hello
+ok 15 - use the same checkout for Git and CVS
 
-# passed all 19 test(s)
-1..19
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9601-cvsimport-vendor-branch.sh ***
@@ -543287,7 +543765,7 @@
 
 
 --- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
-+++ module-git/imported-twice.txt	2026-04-19 19:26:57.971659440 +0000
++++ module-git/imported-twice.txt	2025-03-17 13:32:06.616788899 +0000
 @@ -1 +1 @@
 -This is vtag-2 (on vbranchA) of imported-twice.txt.
 +This is vtag-1 (on vbranchA) of imported-twice.txt.
@@ -543326,6 +543804,42 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9603-cvsimport-patchsets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9603-cvsimport-patchsets/.git/
+checking known breakage of 9603.1 'import with criss cross times on revisions': 
+	git cvsimport -p"-x" -C module-git module &&
+	(
+		cd module-git &&
+		git log --pretty=format:%s > ../actual-main &&
+		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+		echo "" >> ../actual-main &&
+		echo "" >> ../actual-A
+	) &&
+	echo "Rev 4
+Rev 3
+Rev 2
+Rev 1" > expect-main &&
+	test_cmp expect-main actual-main &&
+
+	echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
+Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
+	test_cmp expect-A actual-A
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
+--- expect-main	2025-03-17 13:32:10.588813992 +0000
++++ actual-main	2025-03-17 13:32:10.588813992 +0000
+@@ -1,4 +1,4 @@
+ Rev 4
+ Rev 3
+-Rev 2
+ Rev 1
++Rev 2
+not ok 1 - import with criss cross times on revisions # TODO known breakage
+
+# still have 1 known breakage(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9300-fast-import.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9300-fast-import/.git/
 expecting success of 9300.1 'empty stream succeeds': 
@@ -543362,7 +543876,7 @@
 	echo "tag foo" | test_must_fail git fast-import
 
 fatal: Expected from command, got 
-fast-import: dumping crash report to .git/fast_import_crash_2312942
+fast-import: dumping crash report to .git/fast_import_crash_3531426
 ok 2 - truncated stream complains
 
 expecting success of 9300.3 'A: create pack from stdin': 
@@ -543856,7 +544370,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Blob not found: M 755 0000000000000000000000000000000000000001 zero1
-fast-import: dumping crash report to .git/fast_import_crash_2314473
+fast-import: dumping crash report to .git/fast_import_crash_3532805
 ok 20 - B: fail on invalid blob sha1
 
 expecting success of 9300.21 'B: accept branch name "TEMP_TAG"': 
@@ -543964,7 +544478,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Invalid raw date "1234567890 +051800" in ident: C O Mitter <committer@example.com> 1234567890 +051800
-fast-import: dumping crash report to .git/fast_import_crash_2314998
+fast-import: dumping crash report to .git/fast_import_crash_3533225
 ok 23 - B: reject invalid timezone
 
 expecting success of 9300.24 'B: accept invalid timezone with raw-permissive': 
@@ -544072,7 +544586,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Missing < in ident string: Name email> 1112912233 -0700
-fast-import: dumping crash report to .git/fast_import_crash_2315371
+fast-import: dumping crash report to .git/fast_import_crash_3533559
 ok 26 - B: fail on invalid committer (1)
 
 expecting success of 9300.27 'B: fail on invalid committer (2)': 
@@ -544088,7 +544602,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Missing > in ident string: Name <e<mail> 1112912233 -0700
-fast-import: dumping crash report to .git/fast_import_crash_2315449
+fast-import: dumping crash report to .git/fast_import_crash_3533636
 ok 27 - B: fail on invalid committer (2)
 
 expecting success of 9300.28 'B: fail on invalid committer (3)': 
@@ -544104,7 +544618,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Missing space after > in ident string: Name <email>> 1112912233 -0700
-fast-import: dumping crash report to .git/fast_import_crash_2315512
+fast-import: dumping crash report to .git/fast_import_crash_3533682
 ok 28 - B: fail on invalid committer (3)
 
 expecting success of 9300.29 'B: fail on invalid committer (4)': 
@@ -544120,7 +544634,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Missing > in ident string: Name <email 1112912233 -0700
-fast-import: dumping crash report to .git/fast_import_crash_2315562
+fast-import: dumping crash report to .git/fast_import_crash_3533747
 ok 29 - B: fail on invalid committer (4)
 
 expecting success of 9300.30 'B: fail on invalid committer (5)': 
@@ -544136,7 +544650,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Missing space before < in ident string: Name<email> 1112912233 -0700
-fast-import: dumping crash report to .git/fast_import_crash_2315627
+fast-import: dumping crash report to .git/fast_import_crash_3533811
 ok 30 - B: fail on invalid committer (5)
 
 expecting success of 9300.31 'B: fail on invalid file path of ..': 
@@ -544159,7 +544673,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '../invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2315693
+fast-import: dumping crash report to .git/fast_import_crash_3533876
 ok 31 - B: fail on invalid file path of ..
 
 expecting success of 9300.32 'B: fail on invalid file path of .': 
@@ -544189,7 +544703,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path './invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2315742
+fast-import: dumping crash report to .git/fast_import_crash_3533928
 ok 32 - B: fail on invalid file path of .
 
 ok 33 # skip B: fail on invalid file path of C: (missing WINDOWS)
@@ -544214,7 +544728,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.git/invalid-path'
-fast-import: dumping crash report to .git/fast_import_crash_2315818
+fast-import: dumping crash report to .git/fast_import_crash_3533988
 ok 34 - B: fail on invalid file path of .git
 
 expecting success of 9300.35 'B: fail on invalid file path of .gitmodules': 
@@ -544237,7 +544751,7 @@
 	test_must_fail git fast-import <input
 
 fatal: invalid path '.gitmodules'
-fast-import: dumping crash report to .git/fast_import_crash_2315856
+fast-import: dumping crash report to .git/fast_import_crash_3534028
 ok 35 - B: fail on invalid file path of .gitmodules
 
 expecting success of 9300.36 'C: incremental import create pack from stdin': 
@@ -544470,7 +544984,7 @@
 	test_must_fail git fast-import --date-format=raw <input
 
 fatal: Invalid raw date "Tue Feb 6 11:22:18 2007 -0500" in ident: A U Thor <author@example.com> Tue Feb 6 11:22:18 2007 -0500
-fast-import: dumping crash report to .git/fast_import_crash_2316740
+fast-import: dumping crash report to .git/fast_import_crash_3534865
 ok 46 - E: rfc2822 date, --date-format=raw
 
 expecting success of 9300.47 'E: rfc2822 date, --date-format=rfc2822': 
@@ -544869,7 +545383,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Can't tag an empty branch.
-fast-import: dumping crash report to .git/fast_import_crash_2318230
+fast-import: dumping crash report to .git/fast_import_crash_3536212
 ok 64 - J: tag must fail on empty branch
 
 expecting success of 9300.65 'K: reinit branch with from': 
@@ -545985,7 +546499,7 @@
 	INPUT_END
 
 fatal: invalid path 'file3/'
-fast-import: dumping crash report to .git/fast_import_crash_2320311
+fast-import: dumping crash report to .git/fast_import_crash_3538626
 ok 86 - N: reject foo/ syntax
 
 expecting success of 9300.87 'N: reject foo/ syntax in copy source': 
@@ -546001,7 +546515,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_2320348
+fast-import: dumping crash report to .git/fast_import_crash_3538641
 ok 87 - N: reject foo/ syntax in copy source
 
 expecting success of 9300.88 'N: reject foo/ syntax in rename source': 
@@ -546017,7 +546531,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_2320373
+fast-import: dumping crash report to .git/fast_import_crash_3538661
 ok 88 - N: reject foo/ syntax in rename source
 
 expecting success of 9300.89 'N: reject foo/ syntax in ls argument': 
@@ -546033,7 +546547,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_2320397
+fast-import: dumping crash report to .git/fast_import_crash_3538691
 ok 89 - N: reject foo/ syntax in ls argument
 
 expecting success of 9300.90 'N: copy to root ("") by id and modify': 
@@ -546896,7 +547410,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Git links cannot be specified 'inline': M 160000 inline sub
-fast-import: dumping crash report to .git/fast_import_crash_2322080
+fast-import: dumping crash report to .git/fast_import_crash_3540471
 ok 103 - P: fail on inline gitlink
 
 expecting success of 9300.104 'P: fail on blob mark in gitlink': 
@@ -546923,7 +547437,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Not a commit (actually a blob): M 160000 :1 sub
-fast-import: dumping crash report to .git/fast_import_crash_2322109
+fast-import: dumping crash report to .git/fast_import_crash_3540481
 ok 104 - P: fail on blob mark in gitlink
 
 expecting success of 9300.105 'Q: commit notes': 
@@ -547310,7 +547824,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Can't add a note on empty branch.
-fast-import: dumping crash report to .git/fast_import_crash_2322996
+fast-import: dumping crash report to .git/fast_import_crash_3541367
 ok 126 - Q: deny note on empty branch
 
 expecting success of 9300.127 'R: abort on unsupported feature': 
@@ -547321,7 +547835,7 @@
 	test_must_fail git fast-import <input
 
 fatal: This version of fast-import does not support feature no-such-feature-exists.
-fast-import: dumping crash report to .git/fast_import_crash_2323027
+fast-import: dumping crash report to .git/fast_import_crash_3541385
 ok 127 - R: abort on unsupported feature
 
 expecting success of 9300.128 'R: supported feature is accepted': 
@@ -547368,7 +547882,7 @@
 	test_must_fail git fast-import <input
 
 fatal: Got feature command 'date-format=now' after data command
-fast-import: dumping crash report to .git/fast_import_crash_2323080
+fast-import: dumping crash report to .git/fast_import_crash_3541470
 ok 129 - R: abort on receiving feature after data command
 
 expecting success of 9300.130 'R: import-marks features forbidden by default': 
@@ -547379,9 +547893,9 @@
 	test_must_fail git fast-import <input
 
 fatal: feature 'import-marks' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_2323094
+fast-import: dumping crash report to .git/fast_import_crash_3541498
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_2323102
+fast-import: dumping crash report to .git/fast_import_crash_3541512
 ok 130 - R: import-marks features forbidden by default
 
 expecting success of 9300.131 'R: only one import-marks feature allowed per stream': 
@@ -547395,7 +547909,7 @@
 	test_must_fail git fast-import --allow-unsafe-features <input
 
 fatal: Only one import-marks command allowed per stream
-fast-import: dumping crash report to .git/fast_import_crash_2323129
+fast-import: dumping crash report to .git/fast_import_crash_3541538
 ok 131 - R: only one import-marks feature allowed per stream
 
 expecting success of 9300.132 'R: export-marks feature forbidden by default': 
@@ -547403,7 +547917,7 @@
 	test_must_fail git fast-import <input
 
 fatal: feature 'export-marks=git.marks' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_2323147
+fast-import: dumping crash report to .git/fast_import_crash_3541557
 ok 132 - R: export-marks feature forbidden by default
 
 expecting success of 9300.133 'R: export-marks feature results in a marks file being created': 
@@ -547493,9 +548007,9 @@
 	test_must_fail git fast-import --allow-unsafe-features
 
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_2323229
+fast-import: dumping crash report to .git/fast_import_crash_3541656
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_2323248
+fast-import: dumping crash report to .git/fast_import_crash_3541686
 ok 135 - R: catch typo in marks file name
 
 expecting success of 9300.136 'R: import and output marks can be the same file': 
@@ -547582,7 +548096,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_2323341
+fast-import: dumping crash report to .git/fast_import_crash_3541801
 ok 137 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success of 9300.138 'R: --import-marks-if-exists': 
@@ -548016,7 +548530,7 @@
 	test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
 
 fatal: --cat-blob-fd: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2323689
+fast-import: dumping crash report to .git/fast_import_crash_3542297
 ok 147 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success of 9300.148 'R: print old blob': 
@@ -548528,9 +549042,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_2324519
+fast-import: dumping crash report to .git/fast_import_crash_3543326
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_2324536
+fast-import: dumping crash report to .git/fast_import_crash_3543342
 ok 159 - R: feature done means terminating "done" is mandatory
 
 expecting success of 9300.160 'R: terminating "done" with trailing gibberish is ok': 
@@ -548652,14 +549166,14 @@
 	test_must_fail git fast-import <input
 
 fatal: This version of fast-import does not support option: non-existing-option
-fast-import: dumping crash report to .git/fast_import_crash_2324670
+fast-import: dumping crash report to .git/fast_import_crash_3543502
 ok 162 - R: die on unknown option
 
 expecting success of 9300.163 'R: unknown commandline options are rejected': \
 	test_must_fail git fast-import --non-existing-option < /dev/null
 
 fatal: unknown option --non-existing-option
-fast-import: dumping crash report to .git/fast_import_crash_2324686
+fast-import: dumping crash report to .git/fast_import_crash_3543531
 ok 163 - R: unknown commandline options are rejected
 
 expecting success of 9300.164 'R: die on invalid option argument': 
@@ -548670,11 +549184,11 @@
 	test_must_fail git fast-import --depth="5 elephants" </dev/null
 
 fatal: --active-branches: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2324709
+fast-import: dumping crash report to .git/fast_import_crash_3543566
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2324728
+fast-import: dumping crash report to .git/fast_import_crash_3543579
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_2324737
+fast-import: dumping crash report to .git/fast_import_crash_3543596
 ok 164 - R: die on invalid option argument
 
 expecting success of 9300.165 'R: ignore non-git options': 
@@ -548725,7 +549239,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_2324821
+fast-import: dumping crash report to .git/fast_import_crash_3543691
 ok 166 - R: corrupt lines do not mess marks file
 
 expecting success of 9300.167 'R: blob bigger than threshold': 
@@ -551214,7 +551728,7 @@
 
 cruft: progress foo
 cruft: progress bar
-Terminated
+./test-lib.sh: line 1009: wait: pid 3548007 is not a child of this shell
 ok 244 - V: checkpoint helper does not get stuck with extra output
 
 expecting success of 9300.245 'V: checkpoint updates refs after reset': 
@@ -551228,7 +551742,7 @@
 	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1009: wait: pid 3548125 is not a child of this shell
 ok 245 - V: checkpoint updates refs after reset
 
 expecting success of 9300.246 'V: checkpoint updates refs and marks after commit': 
@@ -551249,7 +551763,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1009: wait: pid 3548253 is not a child of this shell
 ok 246 - V: checkpoint updates refs and marks after commit
 
 expecting success of 9300.247 'V: checkpoint updates refs and marks after commit (no new objects)': 
@@ -551270,7 +551784,7 @@
 	test_cmp marks.expected marks.actual &&
 	background_import_still_running
 
-Terminated
+./test-lib.sh: line 1009: wait: pid 3548399 is not a child of this shell
 ok 247 - V: checkpoint updates refs and marks after commit (no new objects)
 
 expecting success of 9300.248 'V: checkpoint updates tags after tag': 
@@ -551288,7 +551802,7 @@
 
 257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
 114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
-Terminated
+./test-lib.sh: line 1009: wait: pid 3548516 is not a child of this shell
 ok 248 - V: checkpoint updates tags after tag
 
 expecting success of 9300.249 'W: get-mark & empty orphan commit with no newlines': 
@@ -551392,7 +551906,7 @@
 	sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import
 
 fatal: Unsupported command: 
-fast-import: dumping crash report to .git/fast_import_crash_2329258
+fast-import: dumping crash report to .git/fast_import_crash_3548690
 ok 252 - W: get-mark & empty orphan commit with erroneous third newline
 
 expecting success of 9300.253 'X: handling encoding': 
@@ -551426,1393 +551940,314 @@
      objects:           351 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        169 /        169
----------------------------------------------------------------------
-
-Pi: ð
-Pi: π
-ok 253 - X: handling encoding
-
-expecting success of 9300.254 'X: replace ref that becomes useless is removed': 
-	git init -qb main testrepo &&
-	cd testrepo &&
-	(
-		test_commit test &&
-
-		test_commit msg somename content &&
-
-		git mv somename othername &&
-		NEW_TREE=$(git write-tree) &&
-		MSG="$(git log -1 --format=%B HEAD)" &&
-		NEW_COMMIT=$(git commit-tree -p HEAD^1 -m "$MSG" $NEW_TREE) &&
-		git replace main $NEW_COMMIT &&
-
-		echo more >>othername &&
-		git add othername &&
-		git commit -qm more &&
-
-		git fast-export --all >tmp &&
-		sed -e s/othername/somename/ tmp >tmp2 &&
-		git fast-import --force <tmp2 2>msgs &&
-
-		grep "Dropping.*since it would point to itself" msgs &&
-		git show-ref >refs &&
-		! grep refs/replace refs
-	)
-
-[main (root-commit) 4e52f3e] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-[main fcc7def] msg
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 somename
-warning: Dropping refs/replace/fcc7def4c7c8d77417a8e1bca848b7a8f89a9254 since it would point to itself (i.e. to fcc7def4c7c8d77417a8e1bca848b7a8f89a9254)
-ok 254 - X: replace ref that becomes useless is removed
-
-expecting success of 9300.255 'Y: setup': 
-	test_oid_cache <<-EOF
-	Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
-	Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
-	EOF
-
-ok 255 - Y: setup
-
-expecting success of 9300.256 'Y: rewrite submodules': 
-	git init main1 &&
-	(
-		cd main1 &&
-		git init sub2 &&
-		git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
-		git fast-import --rewrite-submodules-from=sub:../Y-marks \
-			--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
-		test "$(git rev-parse main)" = "$(test_oid Ymain)"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9300-fast-import/testrepo/main1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9300-fast-import/testrepo/main1/sub2/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              1
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            9 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            3 (         0 duplicates          2 deltas of          2 attempts)
-      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (        12 unique    )
-      atoms:              3
-Memory total:          2493 KiB
-       pools:          2141 KiB
-     objects:           351 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize = 1073741824
-pack_report: core.packedGitLimit      = 35184372088832
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-ok 256 - Y: rewrite submodules
-
-# passed all 256 test(s)
-1..256
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9502-gitweb-standalone-parse-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
-expecting success of 9502.1 'setup': 
-	test_commit first foo &&
-	git branch xx/test &&
-	FULL_ID=$(git rev-parse --verify HEAD) &&
-	SHORT_ID=$(git rev-parse --verify --short=7 HEAD)
-
-[main (root-commit) 1005c80] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-ok 1 - setup
-
-expecting success of 9502.2 'snapshot: full sha1': 
-	gitweb_run "p=.git;a=snapshot;h=$FULL_ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 2 - snapshot: full sha1
-
-expecting success of 9502.3 'snapshot: shortened sha1': 
-	gitweb_run "p=.git;a=snapshot;h=$SHORT_ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 3 - snapshot: shortened sha1
-
-expecting success of 9502.4 'snapshot: almost full sha1': 
-	ID=$(git rev-parse --short=30 HEAD) &&
-	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tar" &&
-	check_snapshot ".git-$SHORT_ID"
-
-basename=.git-1005c80
-ok 4 - snapshot: almost full sha1
-
-expecting success of 9502.5 'snapshot: HEAD': 
-	gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tar" &&
-	check_snapshot ".git-HEAD-$SHORT_ID"
-
-basename=.git-HEAD-1005c80
-ok 5 - snapshot: HEAD
-
-expecting success of 9502.6 'snapshot: short branch name (main)': 
-	gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 main) &&
-	check_snapshot ".git-main-$ID"
-
-basename=.git-main-1005c80
-ok 6 - snapshot: short branch name (main)
-
-expecting success of 9502.7 'snapshot: short tag name (first)': 
-	gitweb_run "p=.git;a=snapshot;h=first;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 first) &&
-	check_snapshot ".git-first-$ID"
-
-basename=.git-first-1005c80
-ok 7 - snapshot: short tag name (first)
-
-expecting success of 9502.8 'snapshot: full branch name (refs/heads/main)': 
-	gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 main) &&
-	check_snapshot ".git-main-$ID"
-
-basename=.git-main-1005c80
-ok 8 - snapshot: full branch name (refs/heads/main)
-
-expecting success of 9502.9 'snapshot: full tag name (refs/tags/first)': 
-	gitweb_run "p=.git;a=snapshot;h=refs/tags/first;sf=tar" &&
-	check_snapshot ".git-first"
-
-basename=.git-first
-ok 9 - snapshot: full tag name (refs/tags/first)
-
-expecting success of 9502.10 'snapshot: hierarchical branch name (xx/test)': 
-	gitweb_run "p=.git;a=snapshot;h=xx/test;sf=tar" &&
-	! grep "filename=.*/" gitweb.headers
-
-ok 10 - snapshot: hierarchical branch name (xx/test)
-
-expecting success of 9502.11 'forks: setup': 
-	git init --bare foo.git &&
-	echo file > file &&
-	git --git-dir=foo.git --work-tree=. add file &&
-	git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
-	echo "foo" > foo.git/description &&
-	git clone --bare foo.git foo.bar.git &&
-	echo "foo.bar" > foo.bar.git/description &&
-	git clone --bare foo.git foo_baz.git &&
-	echo "foo_baz" > foo_baz.git/description &&
-	rm -fr   foo &&
-	mkdir -p foo &&
-	(
-		cd foo &&
-		git clone --shared --bare ../foo.git foo-forked.git &&
-		echo "fork of foo" > foo-forked.git/description
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9502-gitweb-standalone-parse-output/foo.git/
-[main (root-commit) d29c088] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into bare repository 'foo.bar.git'...
-done.
-Cloning into bare repository 'foo_baz.git'...
-done.
-Cloning into bare repository 'foo-forked.git'...
-done.
-ok 11 - forks: setup
-
-expecting success of 9502.12 'forks: not skipped unless "forks" feature enabled': 
-	gitweb_run "a=project_list" &&
-	grep -q ">\\.git<"               gitweb.body &&
-	grep -q ">foo\\.git<"            gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -q ">fork of .*<"           gitweb.body
-
-ok 12 - forks: not skipped unless "forks" feature enabled
-
-expecting success of 9502.13 'enable forks feature': 
-	cat >>gitweb_config.perl <<-\EOF
-	$feature{"forks"}{"default"} = [1];
-	EOF
-
-ok 13 - enable forks feature
-
-expecting success of 9502.14 'forks: forks skipped if "forks" feature enabled': 
-	gitweb_run "a=project_list" &&
-	grep -q ">\\.git<"               gitweb.body &&
-	grep -q ">foo\\.git<"            gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
-	grep -q ">foo_baz\\.git<"        gitweb.body &&
-	grep -v ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -v ">fork of .*<"           gitweb.body
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 2.49.0.395.g12beb8f557c -->
-<head>
-<meta name="generator" content="gitweb/current git/2.49.0.395.g12beb8f557c"/>
-<meta name="robots" content="index, nofollow"/>
-<title>[localhost]</title>
-<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/gitweb.css"/>
-<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
-<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
-<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-favicon.png" type="image/png" />
-</head>
-<body>
-<div class="page_header">
-<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
-<div class="projsearch">
-<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
-<input type="text" name="s"  size="60" title="Search project by name and description" />
-<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
-<input type="submit" name="btnS" value="Search" />
-</form>
-<a href="/gitweb.cgi">List all projects</a><br />
-</div>
-<table class="project_list">
-<tr>
-<th></th>
-<th>Project</th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
-<th></th>
-</tr>
-<tr class="dark">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
-</tr>
-<tr class="light">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
-</tr>
-<tr class="dark">
-<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
-</tr>
-<tr class="light">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
-</tr>
-</table>
-<div class="page_footer">
-<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
-</div>
-<script type="text/javascript" src="static/gitweb.js"></script>
-<script type="text/javascript">
-window.onload = function () {
-	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
-	onloadTZSetup('local', tz_cookie, 'datetime');
-};
-</script>
-</body>
-</html>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-]>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
-<!-- git core binaries version 2.49.0.395.g12beb8f557c -->
-<head>
-<meta name="generator" content="gitweb/current git/2.49.0.395.g12beb8f557c"/>
-<meta name="robots" content="index, nofollow"/>
-<title>[localhost]</title>
-<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/gitweb.css"/>
-<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
-<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
-<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-favicon.png" type="image/png" />
-</head>
-<body>
-<div class="page_header">
-<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
-<div class="projsearch">
-<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
-<input type="text" name="s"  size="60" title="Search project by name and description" />
-<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
-<input type="submit" name="btnS" value="Search" />
-</form>
-<a href="/gitweb.cgi">List all projects</a><br />
-</div>
-<table class="project_list">
-<tr>
-<th></th>
-<th>Project</th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
-<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
-<th></th>
-</tr>
-<tr class="dark">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
-</tr>
-<tr class="light">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
-</tr>
-<tr class="dark">
-<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
-</tr>
-<tr class="light">
-<td></td>
-<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
-<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">21 years ago</td>
-<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
-</tr>
-</table>
-<div class="page_footer">
-<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
-</div>
-<script type="text/javascript" src="static/gitweb.js"></script>
-<script type="text/javascript">
-window.onload = function () {
-	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
-	onloadTZSetup('local', tz_cookie, 'datetime');
-};
-</script>
-</body>
-</html>
-ok 14 - forks: forks skipped if "forks" feature enabled
-
-expecting success of 9502.15 'forks: "forks" action for forked repository': 
-	gitweb_run "p=foo.git;a=forks" &&
-	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
-	grep -q ">fork of foo<"          gitweb.body
-
-ok 15 - forks: "forks" action for forked repository
-
-expecting success of 9502.16 'forks: can access forked repository': 
-	gitweb_run "p=foo/foo-forked.git;a=summary" &&
-	grep -q "200 OK"        gitweb.headers &&
-	grep -q ">fork of foo<" gitweb.body
-
-ok 16 - forks: can access forked repository
-
-expecting success of 9502.17 'forks: project_index lists all projects (incl. forks)': 
-	cat >expected <<-\EOF &&
-	.git
-	foo.bar.git
-	foo.git
-	foo/foo-forked.git
-	foo_baz.git
-	EOF
-	gitweb_run "a=project_index" &&
-	sed -e "s/ .*//" <gitweb.body | sort >actual &&
-	test_cmp expected actual
-
-ok 17 - forks: project_index lists all projects (incl. forks)
-
-expecting success of 9502.18 'xss checks': 
-	TAG="<magic-xss-tag>" &&
-	xss "a=rss&p=$TAG" &&
-	xss "a=rss&p=foo.git&f=$TAG" &&
-	xss "" "$TAG+"
-
-Checking a=rss&p=<magic-xss-tag>...
-Checking a=rss&p=foo.git&f=<magic-xss-tag>...
-Checking  <magic-xss-tag>+...
-ok 18 - xss checks
-
-expecting success of 9502.19 'no http-equiv="content-type" in XHTML': 
-	no_http_equiv_content_type &&
-	no_http_equiv_content_type "p=.git" &&
-	no_http_equiv_content_type "p=.git;a=log" &&
-	no_http_equiv_content_type "p=.git;a=tree"
-
-ok 19 - no http-equiv="content-type" in XHTML
-
-expecting success of 9502.20 'Proper DOCTYPE with entity declarations': 
-	proper_doctype &&
-	proper_doctype "p=.git" &&
-	proper_doctype "p=.git;a=log" &&
-	proper_doctype "p=.git;a=tree"
-
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-<!DOCTYPE html [
-	<!ENTITY nbsp "&#xA0;">
-	<!ENTITY sdot "&#x22C5;">
-ok 20 - Proper DOCTYPE with entity declarations
-
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9603-cvsimport-patchsets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9603-cvsimport-patchsets/.git/
-checking known breakage of 9603.1 'import with criss cross times on revisions': 
-	git cvsimport -p"-x" -C module-git module &&
-	(
-		cd module-git &&
-		git log --pretty=format:%s > ../actual-main &&
-		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
-		echo "" >> ../actual-main &&
-		echo "" >> ../actual-A
-	) &&
-	echo "Rev 4
-Rev 3
-Rev 2
-Rev 1" > expect-main &&
-	test_cmp expect-main actual-main &&
-
-	echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
-Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
-	test_cmp expect-A actual-A
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-main	2026-04-19 19:27:02.311659440 +0000
-+++ actual-main	2026-04-19 19:27:02.311659440 +0000
-@@ -1,4 +1,4 @@
- Rev 4
- Rev 3
--Rev 2
- Rev 1
-+Rev 2
-not ok 1 - import with criss cross times on revisions # TODO known breakage
-
-# still have 1 known breakage(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9800-git-p4-basic.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9700-perl-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9700-perl-git/.git/
-checking prerequisite: PERL_TEST_MORE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-	perl -MTest::More -e 0
-
-)
-prerequisite PERL_TEST_MORE ok
-expecting success of 9700.1 'set up test repository': 
-	echo "test file 1" >file1 &&
-	echo "test file 2" >file2 &&
-	mkdir directory1 &&
-	echo "in directory1" >>directory1/file &&
-	mkdir directory2 &&
-	echo "in directory2" >>directory2/file &&
-	git add . &&
-	git commit -m "first commit" &&
-
-	echo "new file in subdir 2" >directory2/file2 &&
-	git add . &&
-	git commit -m "commit in directory2" &&
-
-	echo "changed file 1" >file1 &&
-	git commit -a -m "second commit" &&
-
-	git config --add color.test.slot1 green &&
-	git config --add test.string value &&
-	git config --add test.dupstring value1 &&
-	git config --add test.dupstring value2 &&
-	git config --add test.booltrue true &&
-	git config --add test.boolfalse no &&
-	git config --add test.boolother other &&
-	git config --add test.int 2k &&
-	git config --add test.path "~/foo" &&
-	git config --add test.pathexpanded "$HOME/foo" &&
-	git config --add test.pathmulti foo &&
-	git config --add test.pathmulti bar
-
-[master (root-commit) 0e23d58] first commit
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 directory1/file
- create mode 100644 directory2/file
- create mode 100644 file1
- create mode 100644 file2
-[master ffba337] commit in directory2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 directory2/file2
-[master 5d924b7] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - set up test repository
-
-expecting success of 9700.2 'set up bare repository': 
-	git init --bare bare.git &&
-	git -C bare.git --work-tree=. commit --allow-empty -m "bare commit"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9700-perl-git/bare.git/
-[master (root-commit) 7ab07db] bare commit
- Author: A U Thor <author@example.com>
-ok 2 - set up bare repository
-
-expecting success of 9700.3 'use t9700/test.pl to test Git.pm': 
-	"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl 2>stderr &&
-	test_must_be_empty stderr
-
-ok 2 - use Git;
-ok 3 - open repository
-ok 4 - reject unsafe non-bare repository
-ok 5 - unsafe error message
-ok 6 - reject unsafe bare repository
-ok 7 - unsafe error message
-ok 8 - config scalar: string
-ok 9 - config array: string
-ok 10 - config scalar: nonexistent
-ok 11 - config array: nonexistent
-ok 12 - config_int: integer
-ok 13 - config_int: nonexistent
-ok 14 - config_bool: true
-ok 15 - config_bool: false
-ok 16 - config_path: ~/foo expansion
-ok 17 - config_path: multiple values
-ok 18 - get_color
-ok 19 - config: multivar
-ok 20 - config_bool: non-boolean values fail
-ok 21 - ident scalar: author (type)
-ok 22 - ident scalar: committer (type)
-ok 23 - ident scalar: invalid ident string (no parsing)
-ok 24 - ident array: author
-ok 25 - ident array: author
-ok 26 - ident array: ident string
-ok 27 - ident array: invalid ident string
-ok 28 - ident_person: author (type)
-ok 29 - ident_person: ident string
-ok 30 - ident_person: array
-ok 31 - (get file hash)
-ok 32 - cat_blob: size
-ok 33 - cat_blob: data
-ok 34 - hash_object: roundtrip
-ok 35 - hash_and_insert_object: returns hash
-ok 36 - cat_blob: roundtrip size
-ok 37 - cat_blob: roundtrip data
-ok 38 - repo_path
-ok 39 - wc_path
-ok 40 - wc_subdir initial
-ok 41 - wc_subdir after wc_chdir
-ok 42 - config after wc_chdir
-ok 43 - repo_path (2)
-ok 44 - wc_path (2)
-ok 45 - wc_subdir initial (2)
-ok 46 - rev-parse returned hash
-ok 47 - log . does not show last commit
-ok 48 - cat_blob(outside): size
-ok 49 - log of bare repo works
-ok 50 - unquote unquoted path
-ok 51 - unquote simple quoted path
-ok 52 - unquote escape sequences
-1..52
-ok 3 - use t9700/test.pl to test Git.pm
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9200-git-cvsexportcommit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-expecting success of 9200.1 'New file': 
-	mkdir A B C D E F &&
-	echo hello1 >A/newfile1.txt &&
-	echo hello2 >B/newfile2.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
-	git add A/newfile1.txt &&
-	git add B/newfile2.txt &&
-	git add C/newfile3.png &&
-	git add D/newfile4.png &&
-	git commit -a -m "Test: New file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.1/" &&
-	check_entries B "newfile2.txt/1.1/" &&
-	check_entries C "newfile3.png/1.1/-kb" &&
-	check_entries D "newfile4.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp B/newfile2.txt ../B/newfile2.txt &&
-	test_cmp C/newfile3.png ../C/newfile3.png &&
-	test_cmp D/newfile4.png ../D/newfile4.png
-	)
-
-[master 288d750] Test: New file
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 A/newfile1.txt
- create mode 100644 B/newfile2.txt
- create mode 100644 C/newfile3.png
- create mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A put under version control
-cvs add: scheduling file `A/newfile1.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `B/newfile2.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `C/newfile3.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `D/newfile4.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Test: New file
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 1 - New file
-
-expecting success of 9200.2 'Remove two files, add two and update two': 
-	echo Hello1 >>A/newfile1.txt &&
-	rm -f B/newfile2.txt &&
-	rm -f C/newfile3.png &&
-	echo Hello5  >E/newfile5.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
-	git add E/newfile5.txt &&
-	git add F/newfile6.png &&
-	git commit -a -m "Test: Remove, add and update" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "newfile4.png/1.2/-kb" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp D/newfile4.png ../D/newfile4.png &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-[master 69b0239] Test: Remove, add and update
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 B/newfile2.txt
- create mode 100644 E/newfile5.txt
- rename C/newfile3.png => F/newfile6.png (100%)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E put under version control
-cvs add: scheduling file `E/newfile5.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `F/newfile6.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs remove: scheduling `B/newfile2.txt' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-cvs remove: scheduling `C/newfile3.png' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): Test: Remove, add and update
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png' 'E/newfile5.txt' 'F/newfile6.png'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
-new revision: delete; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
-new revision: delete; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 2 - Remove two files, add two and update two
-
-expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generatiion 1" &&
-     cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generation 2" &&
-     id=$(git rev-list --max-count=1 HEAD) &&
-     (cd "$CVSWORK" &&
-     test_must_fail git cvsexportcommit -c $id
-     )
-[master 70e0115] generatiion 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master d73a469] generation 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Checking if patch will apply
-Applying
-error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
-error: D/newfile4.png: patch does not apply
-cannot patch at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsexportcommit line 338.
-ok 3 - Fail to change binary more than one generation old
-
-expecting success of 9200.4 'Remove only binary files': 
-	git reset --hard HEAD^^ &&
-	rm -f D/newfile4.png &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-HEAD is now at 69b0239 Test: Remove, add and update
-[master 2a45f53] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `D/newfile4.png' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'D/newfile4.png'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 4 - Remove only binary files
-
-expecting success of 9200.5 'Remove only a text file': 
-	rm -f A/newfile1.txt &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-[master fa834fd] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 A/newfile1.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `A/newfile1.txt' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 5 - Remove only a text file
-
-expecting success of 9200.6 'New file with spaces in file name': 
-	mkdir "G g" &&
-	echo ok then >"G g/with spaces.txt" &&
-	git add "G g/with spaces.txt" && \
-	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "With spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
-	)
-
-[master 7dad360] With spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 G g/with spaces.png
- create mode 100644 G g/with spaces.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g put under version control
-cvs add: scheduling file `G g/with spaces.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `G g/with spaces.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): With spaces
-Autocommit
-  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 6 - New file with spaces in file name
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        169 /        169
+---------------------------------------------------------------------
 
-expecting success of 9200.7 'Update file with spaces in file name': 
-	echo Ok then >>"G g/with spaces.txt" &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "Update with spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
-	)
+Pi: ð
+Pi: π
+ok 253 - X: handling encoding
 
-[master 200512b] Update with spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Update with spaces
-Autocommit
-  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.png,v  <--  G g/with spaces.png
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
-new revision: 1.2; previous revision: 1.1
-Committed successfully to CVS
-ok 7 - Update file with spaces in file name
+expecting success of 9300.254 'X: replace ref that becomes useless is removed': 
+	git init -qb main testrepo &&
+	cd testrepo &&
+	(
+		test_commit test &&
 
-expecting success of 9200.8 'File with non-ascii file name': 
-	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
-	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git commit -a -m "Går det så går det" && \
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -v -c $id &&
-	check_entries \
-	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
-	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
-	)
+		test_commit msg somename content &&
 
-[master 2dba919] Går det så går det
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png"
- create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt"
-Applying to CVS commit 2dba9190cda577aa84017fec4349519cd1aadafb from parent 200512bccb19b444ac4f1e098c7d7d3578864bb4
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥ put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä put under version control
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö put under version control
-cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Går det så går det
-Autocommit
-  cvs commit -F .msg 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 8 - File with non-ascii file name
+		git mv somename othername &&
+		NEW_TREE=$(git write-tree) &&
+		MSG="$(git log -1 --format=%B HEAD)" &&
+		NEW_COMMIT=$(git commit-tree -p HEAD^1 -m "$MSG" $NEW_TREE) &&
+		git replace main $NEW_COMMIT &&
 
-expecting success of 9200.9 'Mismatching patch should fail': 
-	date >>"E/newfile5.txt" &&
-	git add "E/newfile5.txt" &&
-	git commit -a -m "Update one" &&
-	date >>"E/newfile5.txt" &&
-	git add "E/newfile5.txt" &&
-	git commit -a -m "Update two" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	test_must_fail git cvsexportcommit -c $id
+		echo more >>othername &&
+		git add othername &&
+		git commit -qm more &&
+
+		git fast-export --all >tmp &&
+		sed -e s/othername/somename/ tmp >tmp2 &&
+		git fast-import --force <tmp2 2>msgs &&
+
+		grep "Dropping.*since it would point to itself" msgs &&
+		git show-ref >refs &&
+		! grep refs/replace refs
 	)
 
-[master 96af2e5] Update one
+[main (root-commit) 4e52f3e] test
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 314b5b1] Update two
+ create mode 100644 test.t
+[main fcc7def] msg
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-error: patch failed: E/newfile5.txt:1
-error: E/newfile5.txt: patch does not apply
-cannot patch at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsexportcommit line 338.
-ok 9 - Mismatching patch should fail
+ create mode 100644 somename
+warning: Dropping refs/replace/fcc7def4c7c8d77417a8e1bca848b7a8f89a9254 since it would point to itself (i.e. to fcc7def4c7c8d77417a8e1bca848b7a8f89a9254)
+ok 254 - X: replace ref that becomes useless is removed
 
-checking prerequisite: FILEMODE
+expecting success of 9300.255 'Y: setup': 
+	test_oid_cache <<-EOF
+	Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
+	Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
+	EOF
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+ok 255 - Y: setup
 
-)
-prerequisite FILEMODE ok
-expecting success of 9200.10 'Retain execute bit': 
-	mkdir G &&
-	echo executeon >G/on &&
-	chmod +x G/on &&
-	echo executeoff >G/off &&
-	git add G/on &&
-	git add G/off &&
-	git commit -a -m "Execute test" &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c HEAD &&
-	test -x G/on &&
-	! test -x G/off
+expecting success of 9300.256 'Y: rewrite submodules': 
+	git init main1 &&
+	(
+		cd main1 &&
+		git init sub2 &&
+		git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
+		git fast-import --rewrite-submodules-from=sub:../Y-marks \
+			--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
+		test "$(git rev-parse main)" = "$(test_oid Ymain)"
 	)
 
-[master 0f3bc63] Execute test
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 G/off
- create mode 100755 G/on
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G put under version control
-cvs add: scheduling file `G/off' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `G/on' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Execute test
-Autocommit
-  cvs commit -F .msg 'G/off' 'G/on'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/on,v  <--  G/on
-initial revision: 1.1
-Committed successfully to CVS
-ok 10 - Retain execute bit
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9300-fast-import/testrepo/main1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9300-fast-import/testrepo/main1/sub2/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            6 (         0 duplicates                  )
+      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              1
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
 
-expecting success of 9200.11 '-w option should work with relative GIT_DIR': 
-	mkdir W &&
-	echo foobar >W/file1.txt &&
-	echo bazzle >W/file2.txt &&
-	git add W/file1.txt &&
-	git add W/file2.txt &&
-	git commit -m "More updates" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$GIT_DIR" &&
-	GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" &&
-	test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt &&
-	test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt
-	)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            9 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            3 (         0 duplicates          2 deltas of          2 attempts)
+      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (        12 unique    )
+      atoms:              3
+Memory total:          2493 KiB
+       pools:          2141 KiB
+     objects:           351 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize = 1073741824
+pack_report: core.packedGitLimit      = 35184372088832
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 256 - Y: rewrite submodules
+
+# passed all 256 test(s)
+1..256
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9501-gitweb-standalone-http-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9501-gitweb-standalone-http-status/.git/
+expecting success of 9501.1 'setup': 
+	test_commit 'SnapshotTests' 'i can has snapshot'
 
-[master 885c648] More updates
+[main (root-commit) cea0920] SnapshotTests
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 W/file1.txt
- create mode 100644 W/file2.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W put under version control
-cvs add: scheduling file `W/file1.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `W/file2.txt' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): More updates
-Autocommit
-  cvs commit -F .msg 'W/file1.txt' 'W/file2.txt'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file2.txt,v  <--  W/file2.txt
-initial revision: 1.1
-Committed successfully to CVS
-ok 11 - -w option should work with relative GIT_DIR
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i can has snapshot
+ok 1 - setup
 
-expecting success of 9200.12 'check files before directories': 
+expecting success of 9501.2 'snapshots: tgz only default format enabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
+    grep "Status: 200 OK" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
+    grep "403 - Unsupported snapshot format" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
+    grep "403 - Snapshot format not allowed" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
+    grep "403 - Unsupported snapshot format" gitweb.output
+grep: gitweb.output: binary file matches
+403 - Unsupported snapshot format
+403 - Snapshot format not allowed
+403 - Unsupported snapshot format
+ok 2 - snapshots: tgz only default format enabled
 
-	echo Notes > release-notes &&
-	git add release-notes &&
-	git commit -m "Add release notes" release-notes &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
+expecting success of 9501.3 'snapshots: all enabled in default, use default disabled value': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
+    grep "Status: 200 OK" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tbz2" &&
+    grep "Status: 200 OK" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=txz" &&
+    grep "403 - Snapshot format not allowed" gitweb.output &&
+    gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
+    grep "Status: 200 OK" gitweb.output
+grep: gitweb.output: binary file matches
+grep: gitweb.output: binary file matches
+403 - Snapshot format not allowed
+grep: gitweb.output: binary file matches
+ok 3 - snapshots: all enabled in default, use default disabled value
 
-	echo new > DS &&
-	echo new > E/DS &&
-	echo modified > release-notes &&
-	git add DS E/DS release-notes &&
-	git commit -m "Add two files with the same basename" &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" &&
-	check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" &&
-	test_cmp "$CVSWORK/DS" DS &&
-	test_cmp "$CVSWORK/E/DS" E/DS &&
-	test_cmp "$CVSWORK/release-notes" release-notes
+expecting success of 9501.4 'snapshots: zip explicitly disabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=zip" &&
+    grep "403 - Snapshot format not allowed" gitweb.output
+403 - Snapshot format not allowed
+ok 4 - snapshots: zip explicitly disabled
 
+expecting success of 9501.5 'snapshots: tgz explicitly enabled': gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tgz" &&
+    grep "Status: 200 OK" gitweb.output
+grep: gitweb.output: binary file matches
+ok 5 - snapshots: tgz explicitly enabled
 
-[master 7c63b97] Add release notes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 release-notes
-Checking if patch will apply
-cvs status: nothing known about `release-notes'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file `release-notes' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add release notes
-Autocommit
-  cvs commit -F .msg 'release-notes'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
-initial revision: 1.1
-Committed successfully to CVS
-[master 80875bb] Add two files with the same basename
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 1 deletion(-)
- create mode 100644 DS
- create mode 100644 E/DS
-Checking if patch will apply
-cvs status: nothing known about `DS'
-cvs status: nothing known about `E/DS'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file `DS' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs add: scheduling file `E/DS' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add two files with the same basename
-Autocommit
-  cvs commit -F .msg 'DS' 'E/DS' 'release-notes'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
-initial revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
-new revision: 1.2; previous revision: 1.1
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/DS,v  <--  E/DS
-initial revision: 1.1
-Committed successfully to CVS
-ok 12 - check files before directories
+expecting success of 9501.6 'snapshots: good tree-ish id': 
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.output
 
-expecting success of 9200.13 're-commit a removed filename which remains in CVS attic': 
-	(cd "$CVSWORK" &&
-	echo >attic_gremlin &&
-	cvs -Q add attic_gremlin &&
-	cvs -Q ci -m "added attic_gremlin" &&
-	rm attic_gremlin &&
-	cvs -Q rm attic_gremlin &&
-	cvs -Q ci -m "removed attic_gremlin") &&
+grep: gitweb.output: binary file matches
+ok 6 - snapshots: good tree-ish id
 
-	echo > attic_gremlin &&
-	git add attic_gremlin &&
-	git commit -m "Added attic_gremlin" &&
-	git cvsexportcommit -w "$CVSWORK" -c HEAD &&
-	(cd "$CVSWORK" && cvs -Q update -d) &&
-	test -f "$CVSWORK/attic_gremlin"
+expecting success of 9501.7 'snapshots: bad tree-ish id': 
+	gitweb_run "p=.git;a=snapshot;h=frizzumFrazzum;sf=tgz" &&
+	grep "404 - Object does not exist" gitweb.output
+
+404 - Object does not exist
+ok 7 - snapshots: bad tree-ish id
+
+expecting success of 9501.8 'snapshots: bad tree-ish id (tagged object)': 
+	echo object > tag-object &&
+	git add tag-object &&
+	test_tick && git commit -m "Object to be tagged" &&
+	git tag tagged-object $(git hash-object tag-object) &&
+	gitweb_run "p=.git;a=snapshot;h=tagged-object;sf=tgz" &&
+	grep "400 - Object is not a tree-ish" gitweb.output
 
-[master f261fbc] Added attic_gremlin
+[main 031b7cf] Object to be tagged
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 attic_gremlin
-Checking if patch will apply
-Applying
-<stdin>:7: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: Re-adding file `attic_gremlin' after dead revision 1.2.
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Added attic_gremlin
-Autocommit
-  cvs commit -F .msg 'attic_gremlin'
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/attic_gremlin,v  <--  attic_gremlin
-new revision: 1.3; previous revision: 1.2
-Committed successfully to CVS
-ok 13 - re-commit a removed filename which remains in CVS attic
+ create mode 100644 tag-object
+400 - Object is not a tree-ish
+ok 8 - snapshots: bad tree-ish id (tagged object)
 
-expecting success of 9200.14 'commit a file with leading spaces in the name': 
+expecting success of 9501.9 'snapshots: good object id': 
+	ID=$(git rev-parse --verify HEAD) &&
+	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.output
 
-	echo space > " space" &&
-	git add " space" &&
-	git commit -m "Add a file with a leading space" &&
-	id=$(git rev-parse HEAD) &&
-	git cvsexportcommit -w "$CVSWORK" -c $id &&
-	check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
-	test_cmp "$CVSWORK/ space" " space"
+grep: gitweb.output: binary file matches
+ok 9 - snapshots: good object id
 
+expecting success of 9501.10 'snapshots: bad object id': 
+	gitweb_run "p=.git;a=snapshot;h=abcdef01234;sf=tgz" &&
+	grep "404 - Object does not exist" gitweb.output
 
-[master 6d311bf] Add a file with a leading space
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644  space
-Checking if patch will apply
-cvs status: nothing known about ` space'
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs add: scheduling file ` space' for addition
-cvs add: use `cvs commit' to add this file permanently
-Commit to CVS
-Patch title (first comment line): Add a file with a leading space
-Autocommit
-  cvs commit -F .msg  space
-/build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/ space,v  <--   space
-initial revision: 1.1
-Committed successfully to CVS
-ok 14 - commit a file with leading spaces in the name
+404 - Object does not exist
+ok 10 - snapshots: bad object id
 
-expecting success of 9200.15 'use the same checkout for Git and CVS': 
+expecting success of 9501.11 'modification: feed last-modified': 
+	gitweb_run "p=.git;a=atom;h=main" &&
+	grep "Status: 200 OK" gitweb.headers &&
+	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 
-	(mkdir shared &&
-	 cd shared &&
-	 sane_unset GIT_DIR &&
-	 cvs co . &&
-	 git init &&
-	 git add " space" &&
-	 git commit -m "fake initial commit" &&
-	 echo Hello >> " space" &&
-	 git commit -m "Another change" " space" &&
-	 git cvsexportcommit -W -p -u -c HEAD &&
-	 grep Hello " space" &&
-	 git diff-files)
+Status: 200 OK
+Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
+ok 11 - modification: feed last-modified
 
+expecting success of 9501.12 'modification: feed if-modified-since (modified)': 
+	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
+	grep "Status: 200 OK" gitweb.headers
 
-cvs checkout: Updating .
-U  space
-U DS
-U attic_gremlin
-U release-notes
-cvs checkout: Updating A
-cvs checkout: Updating B
-cvs checkout: Updating C
-cvs checkout: Updating CVSROOT
-U CVSROOT/checkoutlist
-U CVSROOT/commitinfo
-U CVSROOT/config
-U CVSROOT/cvswrappers
-U CVSROOT/loginfo
-U CVSROOT/modules
-U CVSROOT/notify
-U CVSROOT/postadmin
-U CVSROOT/postproxy
-U CVSROOT/posttag
-U CVSROOT/postwatch
-U CVSROOT/preproxy
-U CVSROOT/rcsinfo
-U CVSROOT/taginfo
-U CVSROOT/verifymsg
-cvs checkout: Updating D
-cvs checkout: Updating E
-U E/DS
-U E/newfile5.txt
-cvs checkout: Updating F
-U F/newfile6.png
-cvs checkout: Updating G
-U G/off
-U G/on
-cvs checkout: Updating G g
-U G g/with spaces.png
-U G g/with spaces.txt
-cvs checkout: Updating W
-U W/file1.txt
-U W/file2.txt
-cvs checkout: Updating Ã…
-cvs checkout: Updating Ã…/goo
-cvs checkout: Updating Ã…/goo/a
-cvs checkout: Updating Ã…/goo/a/b
-cvs checkout: Updating Ã…/goo/a/b/c
-cvs checkout: Updating Ã…/goo/a/b/c/d
-cvs checkout: Updating Ã…/goo/a/b/c/d/e
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z
-cvs checkout: Updating Ã…/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/Ã¥
-cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä
-cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö
-U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png
-U Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
-[master (root-commit) 93a1e74] fake initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644  space
-[master 6935f1b] Another change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Another change
-Autocommit
-  cvs commit -F .msg  space
-Committed successfully to CVS
-HEAD is now at 6935f1b Another change
-Hello
-ok 15 - use the same checkout for Git and CVS
+Status: 200 OK
+ok 12 - modification: feed if-modified-since (modified)
 
-# passed all 15 test(s)
-1..15
+expecting success of 9501.13 'modification: feed if-modified-since (unmodified)': 
+	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
+	grep "Status: 304 Not Modified" gitweb.headers
+
+Status: 304 Not Modified
+ok 13 - modification: feed if-modified-since (unmodified)
+
+expecting success of 9501.14 'modification: snapshot last-modified': 
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.headers &&
+	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
+
+Status: 200 OK
+Last-modified: Thu, 7 Apr 2005 22:14:13 +0000
+ok 14 - modification: snapshot last-modified
+
+expecting success of 9501.15 'modification: snapshot if-modified-since (modified)': 
+	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.headers
+
+Status: 200 OK
+ok 15 - modification: snapshot if-modified-since (modified)
+
+expecting success of 9501.16 'modification: snapshot if-modified-since (unmodified)': 
+	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
+	grep "Status: 304 Not Modified" gitweb.headers
+
+Status: 304 Not Modified
+ok 16 - modification: snapshot if-modified-since (unmodified)
+
+expecting success of 9501.17 'modification: tree snapshot': 
+	ID=$(git rev-parse --verify HEAD^{tree}) &&
+	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
+	export HTTP_IF_MODIFIED_SINCE &&
+	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
+	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tgz" &&
+	grep "Status: 200 OK" gitweb.headers &&
+	! grep -i "last-modified" gitweb.headers
+
+Status: 200 OK
+ok 17 - modification: tree snapshot
+
+expecting success of 9501.18 'load checking: load too high (default action)': 
+	gitweb_run "p=.git" &&
+	grep "Status: 503 Service Unavailable" gitweb.headers &&
+	grep "503 - The load average on the server is too high" gitweb.body
+
+Status: 503 Service Unavailable
+503 - The load average on the server is too high
+ok 18 - load checking: load too high (default action)
+
+expecting success of 9501.19 'invalid arguments: invalid regexp (in project search)': 
+	gitweb_run "a=project_list;s=*\.git;sr=1" &&
+	grep "Status: 400" gitweb.headers &&
+	grep "400 - Invalid.*regexp" gitweb.body
+
+Status: 400 Bad Request
+400 - Invalid search regexp &#39;*\.git&#39;
+ok 19 - invalid arguments: invalid regexp (in project search)
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9600-cvsimport.sh ***
@@ -552937,7 +552372,7 @@
 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
 
-Updating e66adb0..27917f2
+Updating 3b869a4..0da4375
 Fast-forward (no commit created; -m option ignored)
  o_fortuna | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
@@ -552979,7 +552414,7 @@
 	test_cmp module-cvs/tick module-git/tick
 
 
-Updating 27917f2..ccf7d93
+Updating 0da4375..2a53067
 Fast-forward (no commit created; -m option ignored)
  tick | 1 +
  1 file changed, 1 insertion(+)
@@ -553033,6 +552468,10 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9800-git-p4-basic.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9801-git-p4-branch.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553041,11 +552480,135 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9803-git-p4-shell-metachars.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
+*** t9700-perl-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9700-perl-git/.git/
+checking prerequisite: PERL_TEST_MORE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+	perl -MTest::More -e 0
+
+)
+prerequisite PERL_TEST_MORE ok
+expecting success of 9700.1 'set up test repository': 
+	echo "test file 1" >file1 &&
+	echo "test file 2" >file2 &&
+	mkdir directory1 &&
+	echo "in directory1" >>directory1/file &&
+	mkdir directory2 &&
+	echo "in directory2" >>directory2/file &&
+	git add . &&
+	git commit -m "first commit" &&
+
+	echo "new file in subdir 2" >directory2/file2 &&
+	git add . &&
+	git commit -m "commit in directory2" &&
+
+	echo "changed file 1" >file1 &&
+	git commit -a -m "second commit" &&
+
+	git config --add color.test.slot1 green &&
+	git config --add test.string value &&
+	git config --add test.dupstring value1 &&
+	git config --add test.dupstring value2 &&
+	git config --add test.booltrue true &&
+	git config --add test.boolfalse no &&
+	git config --add test.boolother other &&
+	git config --add test.int 2k &&
+	git config --add test.path "~/foo" &&
+	git config --add test.pathexpanded "$HOME/foo" &&
+	git config --add test.pathmulti foo &&
+	git config --add test.pathmulti bar
+
+[master (root-commit) 0e23d58] first commit
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 directory1/file
+ create mode 100644 directory2/file
+ create mode 100644 file1
+ create mode 100644 file2
+[master ffba337] commit in directory2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 directory2/file2
+[master 5d924b7] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up test repository
+
+expecting success of 9700.2 'set up bare repository': 
+	git init --bare bare.git &&
+	git -C bare.git --work-tree=. commit --allow-empty -m "bare commit"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9700-perl-git/bare.git/
+[master (root-commit) 7ab07db] bare commit
+ Author: A U Thor <author@example.com>
+ok 2 - set up bare repository
+
+expecting success of 9700.3 'use t9700/test.pl to test Git.pm': 
+	"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl 2>stderr &&
+	test_must_be_empty stderr
+
+ok 2 - use Git;
+ok 3 - open repository
+ok 4 - reject unsafe non-bare repository
+ok 5 - unsafe error message
+ok 6 - reject unsafe bare repository
+ok 7 - unsafe error message
+ok 8 - config scalar: string
+ok 9 - config array: string
+ok 10 - config scalar: nonexistent
+ok 11 - config array: nonexistent
+ok 12 - config_int: integer
+ok 13 - config_int: nonexistent
+ok 14 - config_bool: true
+ok 15 - config_bool: false
+ok 16 - config_path: ~/foo expansion
+ok 17 - config_path: multiple values
+ok 18 - get_color
+ok 19 - config: multivar
+ok 20 - config_bool: non-boolean values fail
+ok 21 - ident scalar: author (type)
+ok 22 - ident scalar: committer (type)
+ok 23 - ident scalar: invalid ident string (no parsing)
+ok 24 - ident array: author
+ok 25 - ident array: author
+ok 26 - ident array: ident string
+ok 27 - ident array: invalid ident string
+ok 28 - ident_person: author (type)
+ok 29 - ident_person: ident string
+ok 30 - ident_person: array
+ok 31 - (get file hash)
+ok 32 - cat_blob: size
+ok 33 - cat_blob: data
+ok 34 - hash_object: roundtrip
+ok 35 - hash_and_insert_object: returns hash
+ok 36 - cat_blob: roundtrip size
+ok 37 - cat_blob: roundtrip data
+ok 38 - repo_path
+ok 39 - wc_path
+ok 40 - wc_subdir initial
+ok 41 - wc_subdir after wc_chdir
+ok 42 - config after wc_chdir
+ok 43 - repo_path (2)
+ok 44 - wc_path (2)
+ok 45 - wc_subdir initial (2)
+ok 46 - rev-parse returned hash
+ok 47 - log . does not show last commit
+ok 48 - cat_blob(outside): size
+ok 49 - log of bare repo works
+ok 50 - unquote unquoted path
+ok 51 - unquote simple quoted path
+ok 52 - unquote escape sequences
+1..52
+ok 3 - use t9700/test.pl to test Git.pm
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9804-git-p4-label.sh ***
+*** t9803-git-p4-shell-metachars.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553092,11 +552655,11 @@
 Updating '.':
 U    auto_updated_file
 Updated to revision 3.
---- auto_updated_file	2026-04-19 19:26:25.415659440 +0000
-+++ au_file_saved	2026-04-19 19:26:25.147659440 +0000
+--- auto_updated_file	2025-03-17 13:31:22.216508400 +0000
++++ au_file_saved	2025-03-17 13:31:21.832505974 +0000
 @@ -1,2 +1 @@
  
--2304900
+-3523822
 ok 2 - check if post-commit hook creates a concurrent commit
 
 expecting success of 9164.3 'check if pre-commit hook fails': 
@@ -553142,22 +552705,22 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = 70270cfa136af15ed18c235dcb34b53e33785a74 (refs/remotes/git-svn)
+r1 = b4dbdc16a2f6869c7f2fcbff292477b9d21b0412 (refs/remotes/git-svn)
 	M	file
-r2 = 027946af6972dcb8d8c1be6427adaade82e78e18 (refs/remotes/git-svn)
+r2 = 390844b4aea64e8b12877b57d96774e627aec57d (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = 9c3647fe4e7cc7934af92ccfa3a2705c40c1442d (refs/remotes/git-svn)
+r3 = 24b1dc798c0dd3a18fdb5b66887c74c36b11722b (refs/remotes/git-svn)
 	M	file
-r4 = c42960be89dc7576761b0932893bd4be0d07f1dd (refs/remotes/git-svn)
+r4 = b5010bf376dc4c641e908d2106bdb2000d8ea4fb (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master 91b2d2c] commit change 1.1
+[master b9108fb] commit change 1.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 099b802] commit change 1.2
+[master d195834] commit change 1.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master e861db3] commit change 1.3
+[master ca9b711] commit change 1.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -553165,14 +552728,14 @@
 	M	file
 Committed r5
 	M	file
-r5 = ed4c466f2a89251b1b775463a85088849912eef3 (refs/remotes/git-svn)
+r5 = 8e08f45275580a31c989a8f53d4c84182caeabdb (refs/remotes/git-svn)
 	M	file
 
 ERROR from SVN:
 A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with no output.
-W: e861db3411188100f6731a3a55a9a1e3d8eaf9ec and refs/remotes/git-svn differ, using rebase:
+W: ca9b711d435c2bd47fc33fc5a7c432068347ad42 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
-warning: skipped previously applied commit 91b2d2c
+warning: skipped previously applied commit b9108fb
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/master.
@@ -553203,24 +552766,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = 70270cfa136af15ed18c235dcb34b53e33785a74 (refs/remotes/git-svn)
+r1 = b4dbdc16a2f6869c7f2fcbff292477b9d21b0412 (refs/remotes/git-svn)
 	M	file
-r2 = 027946af6972dcb8d8c1be6427adaade82e78e18 (refs/remotes/git-svn)
+r2 = 390844b4aea64e8b12877b57d96774e627aec57d (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = 9c3647fe4e7cc7934af92ccfa3a2705c40c1442d (refs/remotes/git-svn)
+r3 = 24b1dc798c0dd3a18fdb5b66887c74c36b11722b (refs/remotes/git-svn)
 	M	file
-r4 = c42960be89dc7576761b0932893bd4be0d07f1dd (refs/remotes/git-svn)
+r4 = b5010bf376dc4c641e908d2106bdb2000d8ea4fb (refs/remotes/git-svn)
 	M	file
-r5 = ed4c466f2a89251b1b775463a85088849912eef3 (refs/remotes/git-svn)
+r5 = 8e08f45275580a31c989a8f53d4c84182caeabdb (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master 7afc2f9] commit change 2.1
+[master ad14de0] commit change 2.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8feb7a0] commit change 2.2
+[master 67a299e] commit change 2.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master af014c9] commit change 2.3
+[master ada5f84] commit change 2.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -553228,25 +552791,25 @@
 	M	file
 Committed r6
 	M	file
-r6 = 21ef57cfda116abfa228e8b9bc3ca62cdb88d889 (refs/remotes/git-svn)
+r6 = 3aa9bda7c5d8254e3e7f82665f03d9afbd1ae1b1 (refs/remotes/git-svn)
 	M	file
 Committed r7
 	M	file
-r7 = e6b8375fca3d7b5b94da5902c8936511ed6892db (refs/remotes/git-svn)
+r7 = 971a333f98d544785a9e12fbae5dc9217b597a44 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = bd33642430700a238b05262af61d5a61d04a1a1b (refs/remotes/git-svn)
-W: 8feb7a03113296ecce8b3bf2b92ede583bc32cb1 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 a099a17128f144fb2d1823e83aefa137ece1ba04 b8ab4a1bab69476e57cee44004853e2bc31eddaa M	auto_updated_file
-warning: skipped previously applied commit 7afc2f9
-warning: skipped previously applied commit 8feb7a0
+r8 = 6fda07c6107ccb62d8fcab4e4f70c7b7059835e3 (refs/remotes/git-svn)
+W: 67a299ef5af38935a8aa8bb9f6d022be1c62e485 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 d09b9e297a384a9dfd63bf568099112afef46f1d 3a9f93f7114d7d62a5959aaa1975941ed98e480b M	auto_updated_file
+warning: skipped previously applied commit ad14de0
+warning: skipped previously applied commit 67a299e
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
 	M	file
 Committed r9
 	M	file
-r9 = 6e38a6d9e5154bebe9f35e7ee6837cfc67cfec20 (refs/remotes/git-svn)
-No changes between f74a407ac218270c77193ae4ea7b5a601bcccdf0 and refs/remotes/git-svn
+r9 = 592b734fed8a2e71ec34b90a50ec7a78ec81d1c2 (refs/remotes/git-svn)
+No changes between 9bdcf28ca8ada934248a04591cb908c03a9f5668 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    file
@@ -553278,32 +552841,32 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = 70270cfa136af15ed18c235dcb34b53e33785a74 (refs/remotes/git-svn)
+r1 = b4dbdc16a2f6869c7f2fcbff292477b9d21b0412 (refs/remotes/git-svn)
 	M	file
-r2 = 027946af6972dcb8d8c1be6427adaade82e78e18 (refs/remotes/git-svn)
+r2 = 390844b4aea64e8b12877b57d96774e627aec57d (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = 9c3647fe4e7cc7934af92ccfa3a2705c40c1442d (refs/remotes/git-svn)
+r3 = 24b1dc798c0dd3a18fdb5b66887c74c36b11722b (refs/remotes/git-svn)
 	M	file
-r4 = c42960be89dc7576761b0932893bd4be0d07f1dd (refs/remotes/git-svn)
+r4 = b5010bf376dc4c641e908d2106bdb2000d8ea4fb (refs/remotes/git-svn)
 	M	file
-r5 = ed4c466f2a89251b1b775463a85088849912eef3 (refs/remotes/git-svn)
+r5 = 8e08f45275580a31c989a8f53d4c84182caeabdb (refs/remotes/git-svn)
 	M	file
-r6 = 21ef57cfda116abfa228e8b9bc3ca62cdb88d889 (refs/remotes/git-svn)
+r6 = 3aa9bda7c5d8254e3e7f82665f03d9afbd1ae1b1 (refs/remotes/git-svn)
 	M	file
-r7 = e6b8375fca3d7b5b94da5902c8936511ed6892db (refs/remotes/git-svn)
+r7 = 971a333f98d544785a9e12fbae5dc9217b597a44 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = bd33642430700a238b05262af61d5a61d04a1a1b (refs/remotes/git-svn)
+r8 = 6fda07c6107ccb62d8fcab4e4f70c7b7059835e3 (refs/remotes/git-svn)
 	M	file
-r9 = 6e38a6d9e5154bebe9f35e7ee6837cfc67cfec20 (refs/remotes/git-svn)
+r9 = 592b734fed8a2e71ec34b90a50ec7a78ec81d1c2 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master eec72b2] commit change 3.1
+[master cfd1277] commit change 3.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 55349f8] commit change 3.2
+[master b4dd972] commit change 3.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master 8a15bbd] commit change 3.3
+[master 5b323bb] commit change 3.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -553311,25 +552874,25 @@
 	M	auto_updated_file
 Committed r10
 	M	auto_updated_file
-r10 = 26b1e6e5d8cdac2734031aa0e5521a056b3be934 (refs/remotes/git-svn)
+r10 = 248d8c6896443849ac270270191621004841d096 (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r11
 	M	auto_updated_file
-r11 = f69811a7cc233c7e1a7ee16d32c2ceec3ffce797 (refs/remotes/git-svn)
+r11 = e91b2c2bfc462ac1bb67a8df77239e52eaa166ff (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 99879b015b6b27b5edb330223b5ac5ef59a3f511 (refs/remotes/git-svn)
-W: 55349f803cdda07aead6c863575586a058b9259e and refs/remotes/git-svn differ, using rebase:
-:100644 100644 48b734a6c8b63e6970fe38c998a65662689d8c27 e2e091e19e70cb5a0788756f0fd989851be3dd10 M	auto_updated_file
-warning: skipped previously applied commit eec72b2
-warning: skipped previously applied commit 55349f8
+r12 = 697d72a080d3e1b8b1414d925d095c45ad957cff (refs/remotes/git-svn)
+W: b4dd97249a2b9c8db20d448d5904fe8a7f6790ee and refs/remotes/git-svn differ, using rebase:
+:100644 100644 af8650082ec700fca7fd6597717af8005bba98d6 40ceb8c988565fc19b993a47dc9573c315a60420 M	auto_updated_file
+warning: skipped previously applied commit cfd1277
+warning: skipped previously applied commit b4dd972
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/1)
Successfully rebased and updated refs/heads/master.
 	M	auto_updated_file
 Committed r13
 	M	auto_updated_file
-r13 = cec3e992ec27d68b6d67597c454200654c1ee0f1 (refs/remotes/git-svn)
-No changes between a0b52eebe8733bca20748d61d366b4ac61d909c7 and refs/remotes/git-svn
+r13 = dc222388f4e6e9ee119444b6b0820d98e03f0484 (refs/remotes/git-svn)
+No changes between 17a029619790a07882425c82670ec92f97829e96 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 U    auto_updated_file
@@ -553359,40 +552922,40 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = 70270cfa136af15ed18c235dcb34b53e33785a74 (refs/remotes/git-svn)
+r1 = b4dbdc16a2f6869c7f2fcbff292477b9d21b0412 (refs/remotes/git-svn)
 	M	file
-r2 = 027946af6972dcb8d8c1be6427adaade82e78e18 (refs/remotes/git-svn)
+r2 = 390844b4aea64e8b12877b57d96774e627aec57d (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = 9c3647fe4e7cc7934af92ccfa3a2705c40c1442d (refs/remotes/git-svn)
+r3 = 24b1dc798c0dd3a18fdb5b66887c74c36b11722b (refs/remotes/git-svn)
 	M	file
-r4 = c42960be89dc7576761b0932893bd4be0d07f1dd (refs/remotes/git-svn)
+r4 = b5010bf376dc4c641e908d2106bdb2000d8ea4fb (refs/remotes/git-svn)
 	M	file
-r5 = ed4c466f2a89251b1b775463a85088849912eef3 (refs/remotes/git-svn)
+r5 = 8e08f45275580a31c989a8f53d4c84182caeabdb (refs/remotes/git-svn)
 	M	file
-r6 = 21ef57cfda116abfa228e8b9bc3ca62cdb88d889 (refs/remotes/git-svn)
+r6 = 3aa9bda7c5d8254e3e7f82665f03d9afbd1ae1b1 (refs/remotes/git-svn)
 	M	file
-r7 = e6b8375fca3d7b5b94da5902c8936511ed6892db (refs/remotes/git-svn)
+r7 = 971a333f98d544785a9e12fbae5dc9217b597a44 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = bd33642430700a238b05262af61d5a61d04a1a1b (refs/remotes/git-svn)
+r8 = 6fda07c6107ccb62d8fcab4e4f70c7b7059835e3 (refs/remotes/git-svn)
 	M	file
-r9 = 6e38a6d9e5154bebe9f35e7ee6837cfc67cfec20 (refs/remotes/git-svn)
+r9 = 592b734fed8a2e71ec34b90a50ec7a78ec81d1c2 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = 26b1e6e5d8cdac2734031aa0e5521a056b3be934 (refs/remotes/git-svn)
+r10 = 248d8c6896443849ac270270191621004841d096 (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = f69811a7cc233c7e1a7ee16d32c2ceec3ffce797 (refs/remotes/git-svn)
+r11 = e91b2c2bfc462ac1bb67a8df77239e52eaa166ff (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 99879b015b6b27b5edb330223b5ac5ef59a3f511 (refs/remotes/git-svn)
+r12 = 697d72a080d3e1b8b1414d925d095c45ad957cff (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = cec3e992ec27d68b6d67597c454200654c1ee0f1 (refs/remotes/git-svn)
+r13 = dc222388f4e6e9ee119444b6b0820d98e03f0484 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master aa796b1] commit change 4.1
+[master 2865791] commit change 4.1
  Author: A U Thor <author@example.com>
  1 file changed, 7 insertions(+)
-[master 646f2fa] commit change 4.2
+[master 9d1f231] commit change 4.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
-[master 237a4f6] commit change 4.3
+[master 68dacee] commit change 4.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -553402,13 +552965,13 @@
 	M	auto_updated_file
 Committed r14
 	M	auto_updated_file
-r14 = ce846667e0e13f1d040d879c1135148d480f65a2 (refs/remotes/git-svn)
+r14 = 3e710c1426750cf617505c70531e836ea32f46e5 (refs/remotes/git-svn)
 	M	auto_updated_file
 Committed r15
 	M	auto_updated_file
-r15 = e887720ac3fc9dd0501485ac97c2702e196d4f8c (refs/remotes/git-svn)
+r15 = 5a2dcaf677285e6dbe6843bb108cd6715c46bf58 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = f13dff190bea6fec0281d34def13fb878a46ab0d (refs/remotes/git-svn)
+r16 = ab5a344b7d68d74c5d103adcd874672583f46e81 (refs/remotes/git-svn)
 
 ERROR from SVN:
 Transaction is out of date: File '/auto_updated_file' is out of date
@@ -553435,46 +552998,46 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
 	A	auto_updated_file
 	A	file
-r1 = 70270cfa136af15ed18c235dcb34b53e33785a74 (refs/remotes/git-svn)
+r1 = b4dbdc16a2f6869c7f2fcbff292477b9d21b0412 (refs/remotes/git-svn)
 	M	file
-r2 = 027946af6972dcb8d8c1be6427adaade82e78e18 (refs/remotes/git-svn)
+r2 = 390844b4aea64e8b12877b57d96774e627aec57d (refs/remotes/git-svn)
 	M	auto_updated_file
-r3 = 9c3647fe4e7cc7934af92ccfa3a2705c40c1442d (refs/remotes/git-svn)
+r3 = 24b1dc798c0dd3a18fdb5b66887c74c36b11722b (refs/remotes/git-svn)
 	M	file
-r4 = c42960be89dc7576761b0932893bd4be0d07f1dd (refs/remotes/git-svn)
+r4 = b5010bf376dc4c641e908d2106bdb2000d8ea4fb (refs/remotes/git-svn)
 	M	file
-r5 = ed4c466f2a89251b1b775463a85088849912eef3 (refs/remotes/git-svn)
+r5 = 8e08f45275580a31c989a8f53d4c84182caeabdb (refs/remotes/git-svn)
 	M	file
-r6 = 21ef57cfda116abfa228e8b9bc3ca62cdb88d889 (refs/remotes/git-svn)
+r6 = 3aa9bda7c5d8254e3e7f82665f03d9afbd1ae1b1 (refs/remotes/git-svn)
 	M	file
-r7 = e6b8375fca3d7b5b94da5902c8936511ed6892db (refs/remotes/git-svn)
+r7 = 971a333f98d544785a9e12fbae5dc9217b597a44 (refs/remotes/git-svn)
 	M	auto_updated_file
-r8 = bd33642430700a238b05262af61d5a61d04a1a1b (refs/remotes/git-svn)
+r8 = 6fda07c6107ccb62d8fcab4e4f70c7b7059835e3 (refs/remotes/git-svn)
 	M	file
-r9 = 6e38a6d9e5154bebe9f35e7ee6837cfc67cfec20 (refs/remotes/git-svn)
+r9 = 592b734fed8a2e71ec34b90a50ec7a78ec81d1c2 (refs/remotes/git-svn)
 	M	auto_updated_file
-r10 = 26b1e6e5d8cdac2734031aa0e5521a056b3be934 (refs/remotes/git-svn)
+r10 = 248d8c6896443849ac270270191621004841d096 (refs/remotes/git-svn)
 	M	auto_updated_file
-r11 = f69811a7cc233c7e1a7ee16d32c2ceec3ffce797 (refs/remotes/git-svn)
+r11 = e91b2c2bfc462ac1bb67a8df77239e52eaa166ff (refs/remotes/git-svn)
 	M	auto_updated_file
-r12 = 99879b015b6b27b5edb330223b5ac5ef59a3f511 (refs/remotes/git-svn)
+r12 = 697d72a080d3e1b8b1414d925d095c45ad957cff (refs/remotes/git-svn)
 	M	auto_updated_file
-r13 = cec3e992ec27d68b6d67597c454200654c1ee0f1 (refs/remotes/git-svn)
+r13 = dc222388f4e6e9ee119444b6b0820d98e03f0484 (refs/remotes/git-svn)
 	M	auto_updated_file
-r14 = ce846667e0e13f1d040d879c1135148d480f65a2 (refs/remotes/git-svn)
+r14 = 3e710c1426750cf617505c70531e836ea32f46e5 (refs/remotes/git-svn)
 	M	auto_updated_file
-r15 = e887720ac3fc9dd0501485ac97c2702e196d4f8c (refs/remotes/git-svn)
+r15 = 5a2dcaf677285e6dbe6843bb108cd6715c46bf58 (refs/remotes/git-svn)
 	M	auto_updated_file
-r16 = f13dff190bea6fec0281d34def13fb878a46ab0d (refs/remotes/git-svn)
+r16 = ab5a344b7d68d74c5d103adcd874672583f46e81 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master 076eb35] commit change 5.1
+[master bad7513] commit change 5.1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 2e6e208] commit change 5.2
+[master 1d802e4] commit change 5.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master d09368b] commit change 5.3
+[master 04b20be] commit change 5.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -553482,23 +553045,23 @@
 	M	file
 Committed r17
 	M	file
-r17 = 55c9f6680a5808070426dba748245b7bd58c6f0d (refs/remotes/git-svn)
+r17 = 0cd6e993188454c85d7b9f221387e6d089daacc5 (refs/remotes/git-svn)
 	M	auto_updated_file
-r18 = 6b6b99427d96926964e7a6b11ca5e1b7648f8744 (refs/remotes/git-svn)
-W: 076eb35fabcba135e82a9a1acb5f13a2400d60f3 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 d323bf88e6a24f425ddd938513b513744d951efc 750ff17a163bbe461b5fc8aebd69e4aa19a685d7 M	auto_updated_file
-warning: skipped previously applied commit 076eb35
+r18 = ed6113df58f7f8d3fa9c86891953d796a47908af (refs/remotes/git-svn)
+W: bad7513940b9c7fe0812aca611e1662b74b2495d and refs/remotes/git-svn differ, using rebase:
+:100644 100644 1e3d82e06277803cd6be44d8dc8260c12bb4ef32 bf342b825e5de9564cfe6d6223fca7a54ec2280a M	auto_updated_file
+warning: skipped previously applied commit bad7513
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config set advice.skippedCherryPicks false"
 Rebasing (1/2)
Auto-merging auto_updated_file
 CONFLICT (content): Merge conflict in auto_updated_file
-error: could not apply 2e6e208... commit change 5.2
+error: could not apply 1d802e4... commit change 5.2
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-Could not apply 2e6e208... commit change 5.2
+Could not apply 1d802e4... commit change 5.2
 rebase refs/remotes/git-svn: command returned error: 1
 
 auto_updated_file: needs merge
@@ -553508,11 +553071,15 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9806-git-p4-options.sh ***
+*** t9805-git-p4-skip-submit-edit.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9805-git-p4-skip-submit-edit.sh ***
+*** t9804-git-p4-label.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9806-git-p4-options.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553528,11 +553095,11 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9811-git-p4-label-import.sh ***
+*** t9809-git-p4-client-view.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9809-git-p4-client-view.sh ***
+*** t9814-git-p4-rename.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553540,11 +553107,388 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9813-git-p4-preserve-users.sh ***
+*** t9502-gitweb-standalone-parse-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9502-gitweb-standalone-parse-output/.git/
+expecting success of 9502.1 'setup': 
+	test_commit first foo &&
+	git branch xx/test &&
+	FULL_ID=$(git rev-parse --verify HEAD) &&
+	SHORT_ID=$(git rev-parse --verify --short=7 HEAD)
+
+[main (root-commit) 1005c80] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+ok 1 - setup
+
+expecting success of 9502.2 'snapshot: full sha1': 
+	gitweb_run "p=.git;a=snapshot;h=$FULL_ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
+
+basename=.git-1005c80
+ok 2 - snapshot: full sha1
+
+expecting success of 9502.3 'snapshot: shortened sha1': 
+	gitweb_run "p=.git;a=snapshot;h=$SHORT_ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
+
+basename=.git-1005c80
+ok 3 - snapshot: shortened sha1
+
+expecting success of 9502.4 'snapshot: almost full sha1': 
+	ID=$(git rev-parse --short=30 HEAD) &&
+	gitweb_run "p=.git;a=snapshot;h=$ID;sf=tar" &&
+	check_snapshot ".git-$SHORT_ID"
+
+basename=.git-1005c80
+ok 4 - snapshot: almost full sha1
+
+expecting success of 9502.5 'snapshot: HEAD': 
+	gitweb_run "p=.git;a=snapshot;h=HEAD;sf=tar" &&
+	check_snapshot ".git-HEAD-$SHORT_ID"
+
+basename=.git-HEAD-1005c80
+ok 5 - snapshot: HEAD
+
+expecting success of 9502.6 'snapshot: short branch name (main)': 
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
+
+basename=.git-main-1005c80
+ok 6 - snapshot: short branch name (main)
+
+expecting success of 9502.7 'snapshot: short tag name (first)': 
+	gitweb_run "p=.git;a=snapshot;h=first;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 first) &&
+	check_snapshot ".git-first-$ID"
+
+basename=.git-first-1005c80
+ok 7 - snapshot: short tag name (first)
+
+expecting success of 9502.8 'snapshot: full branch name (refs/heads/main)': 
+	gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
+
+basename=.git-main-1005c80
+ok 8 - snapshot: full branch name (refs/heads/main)
+
+expecting success of 9502.9 'snapshot: full tag name (refs/tags/first)': 
+	gitweb_run "p=.git;a=snapshot;h=refs/tags/first;sf=tar" &&
+	check_snapshot ".git-first"
+
+basename=.git-first
+ok 9 - snapshot: full tag name (refs/tags/first)
+
+expecting success of 9502.10 'snapshot: hierarchical branch name (xx/test)': 
+	gitweb_run "p=.git;a=snapshot;h=xx/test;sf=tar" &&
+	! grep "filename=.*/" gitweb.headers
+
+ok 10 - snapshot: hierarchical branch name (xx/test)
+
+expecting success of 9502.11 'forks: setup': 
+	git init --bare foo.git &&
+	echo file > file &&
+	git --git-dir=foo.git --work-tree=. add file &&
+	git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
+	echo "foo" > foo.git/description &&
+	git clone --bare foo.git foo.bar.git &&
+	echo "foo.bar" > foo.bar.git/description &&
+	git clone --bare foo.git foo_baz.git &&
+	echo "foo_baz" > foo_baz.git/description &&
+	rm -fr   foo &&
+	mkdir -p foo &&
+	(
+		cd foo &&
+		git clone --shared --bare ../foo.git foo-forked.git &&
+		echo "fork of foo" > foo-forked.git/description
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9502-gitweb-standalone-parse-output/foo.git/
+[main (root-commit) d29c088] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into bare repository 'foo.bar.git'...
+done.
+Cloning into bare repository 'foo_baz.git'...
+done.
+Cloning into bare repository 'foo-forked.git'...
+done.
+ok 11 - forks: setup
+
+expecting success of 9502.12 'forks: not skipped unless "forks" feature enabled': 
+	gitweb_run "a=project_list" &&
+	grep -q ">\\.git<"               gitweb.body &&
+	grep -q ">foo\\.git<"            gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -q ">fork of .*<"           gitweb.body
+
+ok 12 - forks: not skipped unless "forks" feature enabled
+
+expecting success of 9502.13 'enable forks feature': 
+	cat >>gitweb_config.perl <<-\EOF
+	$feature{"forks"}{"default"} = [1];
+	EOF
+
+ok 13 - enable forks feature
+
+expecting success of 9502.14 'forks: forks skipped if "forks" feature enabled': 
+	gitweb_run "a=project_list" &&
+	grep -q ">\\.git<"               gitweb.body &&
+	grep -q ">foo\\.git<"            gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -q ">foo\\.bar\\.git<"      gitweb.body &&
+	grep -q ">foo_baz\\.git<"        gitweb.body &&
+	grep -v ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -v ">fork of .*<"           gitweb.body
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version 2.49.0.395.g12beb8f557c -->
+<head>
+<meta name="generator" content="gitweb/current git/2.49.0.395.g12beb8f557c"/>
+<meta name="robots" content="index, nofollow"/>
+<title>[localhost]</title>
+<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/gitweb.css"/>
+<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
+<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
+<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-favicon.png" type="image/png" />
+</head>
+<body>
+<div class="page_header">
+<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
+<div class="projsearch">
+<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
+<input type="text" name="s"  size="60" title="Search project by name and description" />
+<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
+<input type="submit" name="btnS" value="Search" />
+</form>
+<a href="/gitweb.cgi">List all projects</a><br />
+</div>
+<table class="project_list">
+<tr>
+<th></th>
+<th>Project</th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
+<th></th>
+</tr>
+<tr class="dark">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
+</tr>
+<tr class="dark">
+<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
+</tr>
+</table>
+<div class="page_footer">
+<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
+</div>
+<script type="text/javascript" src="static/gitweb.js"></script>
+<script type="text/javascript">
+window.onload = function () {
+	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
+	onloadTZSetup('local', tz_cookie, 'datetime');
+};
+</script>
+</body>
+</html>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+]>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
+<!-- git web interface version current, (C) 2005-2006, Kay Sievers <kay.sievers@vrfy.org>, Christian Gierke -->
+<!-- git core binaries version 2.49.0.395.g12beb8f557c -->
+<head>
+<meta name="generator" content="gitweb/current git/2.49.0.395.g12beb8f557c"/>
+<meta name="robots" content="index, nofollow"/>
+<title>[localhost]</title>
+<link rel="stylesheet" type="text/css" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/gitweb.css"/>
+<link rel="alternate" title="[localhost] projects list" href="/gitweb.cgi?a=project_index" type="text/plain; charset=utf-8" />
+<link rel="alternate" title="[localhost] projects feeds" href="/gitweb.cgi?a=opml" type="text/x-opml" />
+<link rel="shortcut icon" href="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-favicon.png" type="image/png" />
+</head>
+<body>
+<div class="page_header">
+<a href="https://git-scm.com/" title="git homepage"><img alt="git" class="logo" height="27" src="file:////build/reproducible-path/git-2.49.0%2Bnext.20250314/gitweb/static/git-logo.png" width="72" /></a><a href="/gitweb.cgi">projects</a> / </div>
+<div class="projsearch">
+<form method="get" action="/gitweb.cgi" enctype="multipart/form-data"><input type="hidden" name="a" value="project_list"  />
+<input type="text" name="s"  size="60" title="Search project by name and description" />
+<span title="Extended regular expression"><label><input type="checkbox" name="sr" value="1" />re</label></span>
+<input type="submit" name="btnS" value="Search" />
+</form>
+<a href="/gitweb.cgi">List all projects</a><br />
+</div>
+<table class="project_list">
+<tr>
+<th></th>
+<th>Project</th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=descr">Description</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=owner">Owner</a></th>
+<th><a class="header" href="/gitweb.cgi?a=project_list;o=age">Last Change</a></th>
+<th></th>
+</tr>
+<tr class="dark">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
+</tr>
+<tr class="dark">
+<td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
+</tr>
+<tr class="light">
+<td></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
+<td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
+<td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
+</tr>
+</table>
+<div class="page_footer">
+<a class="rss_logo" href="/gitweb.cgi?a=opml">OPML</a> <a class="rss_logo" href="/gitweb.cgi?a=project_index">TXT</a>
+</div>
+<script type="text/javascript" src="static/gitweb.js"></script>
+<script type="text/javascript">
+window.onload = function () {
+	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
+	onloadTZSetup('local', tz_cookie, 'datetime');
+};
+</script>
+</body>
+</html>
+ok 14 - forks: forks skipped if "forks" feature enabled
+
+expecting success of 9502.15 'forks: "forks" action for forked repository': 
+	gitweb_run "p=foo.git;a=forks" &&
+	grep -q ">foo/foo-forked\\.git<" gitweb.body &&
+	grep -q ">fork of foo<"          gitweb.body
+
+ok 15 - forks: "forks" action for forked repository
+
+expecting success of 9502.16 'forks: can access forked repository': 
+	gitweb_run "p=foo/foo-forked.git;a=summary" &&
+	grep -q "200 OK"        gitweb.headers &&
+	grep -q ">fork of foo<" gitweb.body
+
+ok 16 - forks: can access forked repository
+
+expecting success of 9502.17 'forks: project_index lists all projects (incl. forks)': 
+	cat >expected <<-\EOF &&
+	.git
+	foo.bar.git
+	foo.git
+	foo/foo-forked.git
+	foo_baz.git
+	EOF
+	gitweb_run "a=project_index" &&
+	sed -e "s/ .*//" <gitweb.body | sort >actual &&
+	test_cmp expected actual
+
+ok 17 - forks: project_index lists all projects (incl. forks)
+
+expecting success of 9502.18 'xss checks': 
+	TAG="<magic-xss-tag>" &&
+	xss "a=rss&p=$TAG" &&
+	xss "a=rss&p=foo.git&f=$TAG" &&
+	xss "" "$TAG+"
+
+Checking a=rss&p=<magic-xss-tag>...
+Checking a=rss&p=foo.git&f=<magic-xss-tag>...
+Checking  <magic-xss-tag>+...
+ok 18 - xss checks
+
+expecting success of 9502.19 'no http-equiv="content-type" in XHTML': 
+	no_http_equiv_content_type &&
+	no_http_equiv_content_type "p=.git" &&
+	no_http_equiv_content_type "p=.git;a=log" &&
+	no_http_equiv_content_type "p=.git;a=tree"
+
+ok 19 - no http-equiv="content-type" in XHTML
+
+expecting success of 9502.20 'Proper DOCTYPE with entity declarations': 
+	proper_doctype &&
+	proper_doctype "p=.git" &&
+	proper_doctype "p=.git;a=log" &&
+	proper_doctype "p=.git;a=tree"
+
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+<!DOCTYPE html [
+	<!ENTITY nbsp "&#xA0;">
+	<!ENTITY sdot "&#x22C5;">
+ok 20 - Proper DOCTYPE with entity declarations
+
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9811-git-p4-label-import.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9816-git-p4-locked.sh ***
+*** t9813-git-p4-preserve-users.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553552,7 +553496,7 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9814-git-p4-rename.sh ***
+*** t9818-git-p4-block.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553560,6 +553504,294 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9816-git-p4-locked.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9820-git-p4-editor-handling.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9602-cvsimport-branches-tags.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9602-cvsimport-branches-tags/.git/
+expecting success of 9602.1 'import module': 
+
+	git cvsimport -C module-git module
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
+ok 1 - import module
+
+expecting success of 9602.2 'test branch main': 
+
+	test_cmp_branch_tree main
+
+
+cvs checkout: Updating module-cvs-main
+U module-cvs-main/default
+cvs checkout: Updating module-cvs-main/sub1
+U module-cvs-main/sub1/default
+cvs checkout: Updating module-cvs-main/sub1/subsubA
+U module-cvs-main/sub1/subsubA/default
+cvs checkout: Updating module-cvs-main/sub1/subsubB
+U module-cvs-main/sub1/subsubB/default
+cvs checkout: Updating module-cvs-main/sub2
+U module-cvs-main/sub2/default
+cvs checkout: Updating module-cvs-main/sub2/subsubA
+U module-cvs-main/sub2/subsubA/default
+cvs checkout: Updating module-cvs-main/sub3
+U module-cvs-main/sub3/default
+Already on 'main'
+ok 2 - test branch main
+
+expecting success of 9602.3 'test branch vendorbranch': 
+
+	test_cmp_branch_tree vendorbranch
+
+
+cvs checkout: Updating module-cvs-vendorbranch
+U module-cvs-vendorbranch/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1
+U module-cvs-vendorbranch/sub1/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubA
+U module-cvs-vendorbranch/sub1/subsubA/default
+cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubB
+U module-cvs-vendorbranch/sub1/subsubB/default
+cvs checkout: Updating module-cvs-vendorbranch/sub2
+U module-cvs-vendorbranch/sub2/default
+cvs checkout: Updating module-cvs-vendorbranch/sub2/subsubA
+U module-cvs-vendorbranch/sub2/subsubA/default
+cvs checkout: Updating module-cvs-vendorbranch/sub3
+U module-cvs-vendorbranch/sub3/default
+Switched to branch 'vendorbranch'
+ok 3 - test branch vendorbranch
+
+checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
+
+	test_cmp_branch_tree B_FROM_INITIALS
+
+
+cvs checkout: Updating module-cvs-B_FROM_INITIALS
+U module-cvs-B_FROM_INITIALS/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1
+U module-cvs-B_FROM_INITIALS/sub1/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubA
+U module-cvs-B_FROM_INITIALS/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubB
+U module-cvs-B_FROM_INITIALS/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2
+U module-cvs-B_FROM_INITIALS/sub2/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2/subsubA
+U module-cvs-B_FROM_INITIALS/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub3
+U module-cvs-B_FROM_INITIALS/sub3/default
+error: pathspec 'B_FROM_INITIALS' did not match any file(s) known to git
+not ok 4 - test branch B_FROM_INITIALS # TODO known breakage
+
+checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
+
+	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
+
+
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE
+U module-cvs-B_FROM_INITIALS_BUT_ONE/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubB
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub3
+U module-cvs-B_FROM_INITIALS_BUT_ONE/sub3/default
+error: pathspec 'B_FROM_INITIALS_BUT_ONE' did not match any file(s) known to git
+not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage
+
+checking known breakage of 9602.6 'test branch B_MIXED': 
+
+	test_cmp_branch_tree B_MIXED
+
+
+cvs checkout: Updating module-cvs-B_MIXED
+U module-cvs-B_MIXED/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1
+U module-cvs-B_MIXED/sub1/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubA
+U module-cvs-B_MIXED/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubB
+U module-cvs-B_MIXED/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_MIXED/sub2
+U module-cvs-B_MIXED/sub2/branch_B_MIXED_only
+U module-cvs-B_MIXED/sub2/default
+cvs checkout: Updating module-cvs-B_MIXED/sub2/subsubA
+U module-cvs-B_MIXED/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_MIXED/sub3
+U module-cvs-B_MIXED/sub3/default
+Switched to branch 'B_MIXED'
+--- module-cvs-B_MIXED/./sub3/default	2003-05-23 00:15:26.000000000 +0000
++++ module-git/./sub3/default	2025-03-17 13:32:18.040861069 +0000
+@@ -3,3 +3,5 @@
+ Every directory in the `proj' project has a file named `default'.
+ 
+ This line was added by the first commit (affecting two files).
++
++This line was added in the second commit (affecting all 7 files).
+not ok 6 - test branch B_MIXED # TODO known breakage
+
+expecting success of 9602.7 'test branch B_SPLIT': 
+
+	test_cmp_branch_tree B_SPLIT
+
+
+cvs checkout: Updating module-cvs-B_SPLIT
+U module-cvs-B_SPLIT/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1
+U module-cvs-B_SPLIT/sub1/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubA
+U module-cvs-B_SPLIT/sub1/subsubA/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubB
+U module-cvs-B_SPLIT/sub1/subsubB/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub2
+U module-cvs-B_SPLIT/sub2/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub2/subsubA
+U module-cvs-B_SPLIT/sub2/subsubA/default
+cvs checkout: Updating module-cvs-B_SPLIT/sub3
+U module-cvs-B_SPLIT/sub3/default
+Switched to branch 'B_SPLIT'
+ok 7 - test branch B_SPLIT
+
+checking known breakage of 9602.8 'test tag vendortag': 
+
+	test_cmp_branch_tree vendortag
+
+
+cvs checkout: Updating module-cvs-vendortag
+U module-cvs-vendortag/default
+cvs checkout: Updating module-cvs-vendortag/sub1
+U module-cvs-vendortag/sub1/default
+cvs checkout: Updating module-cvs-vendortag/sub1/subsubA
+U module-cvs-vendortag/sub1/subsubA/default
+cvs checkout: Updating module-cvs-vendortag/sub1/subsubB
+U module-cvs-vendortag/sub1/subsubB/default
+cvs checkout: Updating module-cvs-vendortag/sub2
+U module-cvs-vendortag/sub2/default
+cvs checkout: Updating module-cvs-vendortag/sub2/subsubA
+U module-cvs-vendortag/sub2/subsubA/default
+cvs checkout: Updating module-cvs-vendortag/sub3
+U module-cvs-vendortag/sub3/default
+error: pathspec 'vendortag' did not match any file(s) known to git
+not ok 8 - test tag vendortag # TODO known breakage
+
+expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
+
+	test_cmp_branch_tree T_ALL_INITIAL_FILES
+
+
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES
+U module-cvs-T_ALL_INITIAL_FILES/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1
+U module-cvs-T_ALL_INITIAL_FILES/sub1/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA
+U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB
+U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2
+U module-cvs-T_ALL_INITIAL_FILES/sub2/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA
+U module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub3
+U module-cvs-T_ALL_INITIAL_FILES/sub3/default
+Note: switching to 'T_ALL_INITIAL_FILES'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e9bb65d Initial import.
+ok 9 - test tag T_ALL_INITIAL_FILES
+
+checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
+
+	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
+
+
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
+U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
+error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
+not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
+
+checking known breakage of 9602.11 'test tag T_MIXED': 
+
+	test_cmp_branch_tree T_MIXED
+
+
+cvs checkout: Updating module-cvs-T_MIXED
+U module-cvs-T_MIXED/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1
+U module-cvs-T_MIXED/sub1/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubA
+U module-cvs-T_MIXED/sub1/subsubA/default
+cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubB
+U module-cvs-T_MIXED/sub1/subsubB/default
+cvs checkout: Updating module-cvs-T_MIXED/sub2
+U module-cvs-T_MIXED/sub2/default
+cvs checkout: Updating module-cvs-T_MIXED/sub2/subsubA
+U module-cvs-T_MIXED/sub2/subsubA/default
+cvs checkout: Updating module-cvs-T_MIXED/sub3
+U module-cvs-T_MIXED/sub3/default
+Previous HEAD position was e9bb65d Initial import.
+HEAD is now at d875d54 Second commit to proj, affecting all 7 files.
+--- module-cvs-T_MIXED/./sub2/subsubA/default	2003-05-22 23:20:19.000000000 +0000
++++ module-git/./sub2/subsubA/default	2025-03-17 13:32:23.032892605 +0000
+@@ -1,3 +1,5 @@
+ This is sub2/subsub2/default.
+ 
+ Every directory in the `proj' project has a file named `default'.
++
++This line was added in the second commit (affecting all 7 files).
+not ok 11 - test tag T_MIXED # TODO known breakage
+
+# still have 6 known breakage(s)
+# passed all remaining 5 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9819-git-p4-case-folding.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9822-git-p4-path-encoding.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9824-git-p4-git-lfs.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9604-cvsimport-timestamps.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9604-cvsimport-timestamps/.git/
 checking prerequisite: POSIX_TIMEZONE
@@ -553656,11 +553888,7 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9818-git-p4-block.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9819-git-p4-case-folding.sh ***
+*** t9823-git-p4-mock-lfs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553668,23 +553896,23 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9820-git-p4-editor-handling.sh ***
+*** t9825-git-p4-handle-utf16-without-bom.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9822-git-p4-path-encoding.sh ***
+*** t9831-git-p4-triggers.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9823-git-p4-mock-lfs.sh ***
+*** t9832-unshelve.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9824-git-p4-git-lfs.sh ***
+*** t9828-git-p4-map-user.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9825-git-p4-handle-utf16-without-bom.sh ***
+*** t9827-git-p4-change-filetype.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553692,11 +553920,7 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9827-git-p4-change-filetype.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9828-git-p4-map-user.sh ***
+*** t9830-git-p4-symlink-dir.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -553704,10 +553928,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9830-git-p4-symlink-dir.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9400-git-cvsserver-server.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9400-git-cvsserver-server/.git/
 expecting success of 9400.1 'setup': 
@@ -554175,17 +554395,17 @@
    9cef819..590c22f  main -> main
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1267.
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
+cvs update: Updating .
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1267.
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
 Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
-cvs update: Updating .
 cvs update: `empty.out' is no longer in the repository
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
 M merge
 cvs update: `merge.out' is no longer in the repository
 cvs update: `no-lf.out' is no longer in the repository
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.49.0+next.20250314/git-cvsserver line 1312.
 cvs update: `really-empty.out' is no longer in the repository
 U status.file
 cvs update: Updating A
@@ -554329,11 +554549,11 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9832-unshelve.sh ***
+*** t9834-git-p4-file-dir-bug.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9831-git-p4-triggers.sh ***
+*** t9836-git-p4-metadata-encoding-python3.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
@@ -554341,18 +554561,10 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9834-git-p4-file-dir-bug.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9835-git-p4-metadata-encoding-python2.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9836-git-p4-metadata-encoding-python3.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9850-shell.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9850-shell/.git/
 expecting success of 9850.1 'shell allows upload-pack': 
@@ -554400,274 +554612,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9602-cvsimport-branches-tags.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9602-cvsimport-branches-tags/.git/
-expecting success of 9602.1 'import module': 
-
-	git cvsimport -C module-git module
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
-ok 1 - import module
-
-expecting success of 9602.2 'test branch main': 
-
-	test_cmp_branch_tree main
-
-
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/default
-cvs checkout: Updating module-cvs-main/sub1
-U module-cvs-main/sub1/default
-cvs checkout: Updating module-cvs-main/sub1/subsubA
-U module-cvs-main/sub1/subsubA/default
-cvs checkout: Updating module-cvs-main/sub1/subsubB
-U module-cvs-main/sub1/subsubB/default
-cvs checkout: Updating module-cvs-main/sub2
-U module-cvs-main/sub2/default
-cvs checkout: Updating module-cvs-main/sub2/subsubA
-U module-cvs-main/sub2/subsubA/default
-cvs checkout: Updating module-cvs-main/sub3
-U module-cvs-main/sub3/default
-Already on 'main'
-ok 2 - test branch main
-
-expecting success of 9602.3 'test branch vendorbranch': 
-
-	test_cmp_branch_tree vendorbranch
-
-
-cvs checkout: Updating module-cvs-vendorbranch
-U module-cvs-vendorbranch/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1
-U module-cvs-vendorbranch/sub1/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubA
-U module-cvs-vendorbranch/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubB
-U module-cvs-vendorbranch/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2
-U module-cvs-vendorbranch/sub2/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2/subsubA
-U module-cvs-vendorbranch/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub3
-U module-cvs-vendorbranch/sub3/default
-Switched to branch 'vendorbranch'
-ok 3 - test branch vendorbranch
-
-checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
-
-	test_cmp_branch_tree B_FROM_INITIALS
-
-
-cvs checkout: Updating module-cvs-B_FROM_INITIALS
-U module-cvs-B_FROM_INITIALS/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1
-U module-cvs-B_FROM_INITIALS/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubA
-U module-cvs-B_FROM_INITIALS/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubB
-U module-cvs-B_FROM_INITIALS/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2
-U module-cvs-B_FROM_INITIALS/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2/subsubA
-U module-cvs-B_FROM_INITIALS/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub3
-U module-cvs-B_FROM_INITIALS/sub3/default
-error: pathspec 'B_FROM_INITIALS' did not match any file(s) known to git
-not ok 4 - test branch B_FROM_INITIALS # TODO known breakage
-
-checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
-
-	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
-
-
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE
-U module-cvs-B_FROM_INITIALS_BUT_ONE/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub3
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub3/default
-error: pathspec 'B_FROM_INITIALS_BUT_ONE' did not match any file(s) known to git
-not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage
-
-checking known breakage of 9602.6 'test branch B_MIXED': 
-
-	test_cmp_branch_tree B_MIXED
-
-
-cvs checkout: Updating module-cvs-B_MIXED
-U module-cvs-B_MIXED/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1
-U module-cvs-B_MIXED/sub1/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubA
-U module-cvs-B_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubB
-U module-cvs-B_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2
-U module-cvs-B_MIXED/sub2/branch_B_MIXED_only
-U module-cvs-B_MIXED/sub2/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2/subsubA
-U module-cvs-B_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub3
-U module-cvs-B_MIXED/sub3/default
-Switched to branch 'B_MIXED'
---- module-cvs-B_MIXED/./sub3/default	2003-05-23 00:15:26.000000000 +0000
-+++ module-git/./sub3/default	2026-04-19 19:27:07.039659440 +0000
-@@ -3,3 +3,5 @@
- Every directory in the `proj' project has a file named `default'.
- 
- This line was added by the first commit (affecting two files).
-+
-+This line was added in the second commit (affecting all 7 files).
-not ok 6 - test branch B_MIXED # TODO known breakage
-
-expecting success of 9602.7 'test branch B_SPLIT': 
-
-	test_cmp_branch_tree B_SPLIT
-
-
-cvs checkout: Updating module-cvs-B_SPLIT
-U module-cvs-B_SPLIT/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1
-U module-cvs-B_SPLIT/sub1/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubA
-U module-cvs-B_SPLIT/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubB
-U module-cvs-B_SPLIT/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2
-U module-cvs-B_SPLIT/sub2/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2/subsubA
-U module-cvs-B_SPLIT/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub3
-U module-cvs-B_SPLIT/sub3/default
-Switched to branch 'B_SPLIT'
-ok 7 - test branch B_SPLIT
-
-checking known breakage of 9602.8 'test tag vendortag': 
-
-	test_cmp_branch_tree vendortag
-
-
-cvs checkout: Updating module-cvs-vendortag
-U module-cvs-vendortag/default
-cvs checkout: Updating module-cvs-vendortag/sub1
-U module-cvs-vendortag/sub1/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubA
-U module-cvs-vendortag/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubB
-U module-cvs-vendortag/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendortag/sub2
-U module-cvs-vendortag/sub2/default
-cvs checkout: Updating module-cvs-vendortag/sub2/subsubA
-U module-cvs-vendortag/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub3
-U module-cvs-vendortag/sub3/default
-error: pathspec 'vendortag' did not match any file(s) known to git
-not ok 8 - test tag vendortag # TODO known breakage
-
-expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
-
-	test_cmp_branch_tree T_ALL_INITIAL_FILES
-
-
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES
-U module-cvs-T_ALL_INITIAL_FILES/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1
-U module-cvs-T_ALL_INITIAL_FILES/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2
-U module-cvs-T_ALL_INITIAL_FILES/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub3
-U module-cvs-T_ALL_INITIAL_FILES/sub3/default
-Note: switching to 'T_ALL_INITIAL_FILES'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at e9bb65d Initial import.
-ok 9 - test tag T_ALL_INITIAL_FILES
-
-checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
-
-	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
-
-
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
-error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
-not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
-
-checking known breakage of 9602.11 'test tag T_MIXED': 
-
-	test_cmp_branch_tree T_MIXED
-
-
-cvs checkout: Updating module-cvs-T_MIXED
-U module-cvs-T_MIXED/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1
-U module-cvs-T_MIXED/sub1/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubA
-U module-cvs-T_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubB
-U module-cvs-T_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2
-U module-cvs-T_MIXED/sub2/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2/subsubA
-U module-cvs-T_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub3
-U module-cvs-T_MIXED/sub3/default
-Previous HEAD position was e9bb65d Initial import.
-HEAD is now at d875d54 Second commit to proj, affecting all 7 files.
---- module-cvs-T_MIXED/./sub2/subsubA/default	2003-05-22 23:20:19.000000000 +0000
-+++ module-git/./sub2/subsubA/default	2026-04-19 19:27:12.039659440 +0000
-@@ -1,3 +1,5 @@
- This is sub2/subsub2/default.
- 
- Every directory in the `proj' project has a file named `default'.
-+
-+This line was added in the second commit (affecting all 7 files).
-not ok 11 - test tag T_MIXED # TODO known breakage
-
-# still have 6 known breakage(s)
-# passed all remaining 5 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9901-git-web--browse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9901-git-web--browse/.git/
 expecting success of 9901.1 'URL with an ampersand in it': 
@@ -556709,6 +556653,540 @@
 1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+*** t9402-git-cvsserver-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9402-git-cvsserver-refs/.git/
+expecting success of 9402.1 'setup v1, b1': 
+	echo "Simple text file" >textfile.c &&
+	echo "t2" >t2 &&
+	mkdir adir &&
+	echo "adir/afile line1" >adir/afile &&
+	echo "adir/afile line2" >>adir/afile &&
+	echo "adir/afile line3" >>adir/afile &&
+	echo "adir/afile line4" >>adir/afile &&
+	echo "adir/a2file" >>adir/a2file &&
+	mkdir adir/bdir &&
+	echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
+	echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
+	echo "adir/bdir/b2file" >adir/bdir/b2file &&
+	git add textfile.c t2 adir &&
+	git commit -q -m "First Commit (v1)" &&
+	git tag v1 &&
+	git branch b1 &&
+	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
+	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
+	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
+
+ok 1 - setup v1, b1
+
+expecting success of 9402.2 'cvs co v1': 
+	cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 2 - cvs co v1
+
+expecting success of 9402.3 'cvs co b1': 
+	cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 3 - cvs co b1
+
+expecting success of 9402.4 'cvs co b1 [cvswork3]': 
+	cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v1 &&
+	check_file cvswork3 t2 v1 &&
+	check_file cvswork3 adir/afile v1 &&
+	check_file cvswork3 adir/a2file v1 &&
+	check_file cvswork3 adir/bdir/bfile v1 &&
+	check_file cvswork3 adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork3 v1
+
+ok 4 - cvs co b1 [cvswork3]
+
+expecting success of 9402.5 'edit cvswork3 and save diff': 
+	(
+		cd cvswork3 &&
+		sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
+		mv -f adir/afileNEW adir/afile &&
+		echo "afile5" >adir/afile5 &&
+		rm t2 &&
+		cvs -f add adir/afile5 &&
+		cvs -f rm t2 &&
+		! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
+	)
+
+cvs add: scheduling file `adir/afile5' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs remove: scheduling `t2' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+ok 5 - edit cvswork3 and save diff
+
+expecting success of 9402.6 'setup v1.2 on b1': 
+	git checkout b1 &&
+	echo "new v1.2" >t3 &&
+	rm t2 &&
+	sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
+	mv -f adir/afileNEW adir/afile &&
+	rm adir/a2file &&
+	echo "a3file" >>adir/a3file &&
+	echo "bfile line 3" >>adir/bdir/bfile &&
+	rm adir/bdir/b2file &&
+	echo "b3file" >adir/bdir/b3file &&
+	mkdir cdir &&
+	echo "cdir/cfile" >cdir/cfile &&
+	git add -A cdir adir t3 t2 &&
+	git commit -q -m "v1.2" &&
+	git tag v1.2 &&
+	git push --tags gitcvs.git b1:b1
+
+Switched to branch 'b1'
+To gitcvs.git
+   a445389..5630bb8  b1 -> b1
+ * [new tag]         v1.2 -> v1.2
+ok 6 - setup v1.2 on b1
+
+expecting success of 9402.7 'cvs -f up (on b1 adir)': 
+	( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_end_tree cvswork
+
+ok 7 - cvs -f up (on b1 adir)
+
+expecting success of 9402.8 'cvs up (on b1 /)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_tree cvswork
+
+ok 8 - cvs up (on b1 /)
+
+expecting success of 9402.9 'cvs up (on b1 /) (again; check CVS/Tag files)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_tree cvswork
+
+ok 9 - cvs up (on b1 /) (again; check CVS/Tag files)
+
+expecting success of 9402.10 'cvs up -r v1': 
+	( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 10 - cvs up -r v1
+
+expecting success of 9402.11 'cvs up': 
+	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 11 - cvs up
+
+expecting success of 9402.12 'cvs up (again; check CVS/Tag files)': 
+	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 12 - cvs up (again; check CVS/Tag files)
+
+expecting success of 9402.13 'setup simple b2': 
+	git branch b2 v1 &&
+	git push --tags gitcvs.git b2:b2
+
+To gitcvs.git
+ * [new branch]      b2 -> b2
+ok 13 - setup simple b2
+
+expecting success of 9402.14 'cvs co b2 [into cvswork2]': 
+	cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_tree cvswork
+
+ok 14 - cvs co b2 [into cvswork2]
+
+expecting success of 9402.15 'root dir edit [cvswork2]': 
+	(
+		cd cvswork2 && echo "Line 2" >>textfile.c &&
+		! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
+		cvs -f commit -m "edit textfile.c" textfile.c
+	) >cvsEdit1.log 2>&1
+
+ok 15 - root dir edit [cvswork2]
+
+expecting success of 9402.16 'root dir rm file [cvswork2]': 
+	(
+		cd cvswork2 &&
+		cvs -f rm -f t2 &&
+		cvs -f diff -u >../cvsEdit2-empty.diff &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
+		cvs -f commit -m "rm t2"
+	) >cvsEdit2.log 2>&1
+
+ok 16 - root dir rm file [cvswork2]
+
+expecting success of 9402.17 'subdir edit/add/rm files [cvswork2]': 
+	(
+		cd cvswork2 &&
+		sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
+		mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
+		rm adir/bdir/b2file &&
+		cd adir &&
+		cvs -f rm bdir/b2file &&
+		echo "4th file" >bdir/b4file &&
+		cvs -f add bdir/b4file &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
+		git fetch gitcvs.git b2:b2 &&
+		(
+		  cd .. &&
+		  ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
+		  ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
+		) &&
+		cvs -f commit -m "various add/rm/edit"
+	) >cvs.log 2>&1
+
+ok 17 - subdir edit/add/rm files [cvswork2]
+
+expecting success of 9402.18 'validate result of edits [cvswork2]': 
+	git fetch gitcvs.git b2:b2 &&
+	git tag v2 b2 &&
+	git push --tags gitcvs.git b2:b2 &&
+	check_start_tree cvswork2 &&
+	check_file cvswork2 textfile.c v2 &&
+	check_file cvswork2 adir/afile v2 &&
+	check_file cvswork2 adir/a2file v2 &&
+	check_file cvswork2 adir/bdir/bfile v2 &&
+	check_file cvswork2 adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork2 v2
+
+From gitcvs
+   8bc3df8..2f22978  b2         -> b2
+To gitcvs.git
+ * [new tag]         v2 -> v2
+ok 18 - validate result of edits [cvswork2]
+
+expecting success of 9402.19 'validate basic diffs saved during above cvswork2 edits': 
+	test $(grep Index: cvsEdit1.diff | wc -l) = 1 &&
+	test_must_be_empty cvsEdit2-empty.diff &&
+	test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&
+	test $(grep Index: cvsEdit3.diff | wc -l) = 3 &&
+	rm -rf diffSandbox &&
+	git clone -q -n . diffSandbox &&
+	(
+		cd diffSandbox &&
+		git checkout v1 &&
+		git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" &&
+		git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" &&
+		git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" &&
+		git diff --exit-code v2
+	) >"check_diff_apply.out" 2>&1
+
+ok 19 - validate basic diffs saved during above cvswork2 edits
+
+expecting success of 9402.20 'validate v1.2 diff saved during last cvswork2 edit': 
+	test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&
+	check_diff cvsEdit3-v1.2.diff v1.2 v2
+
+ok 20 - validate v1.2 diff saved during last cvswork2 edit
+
+expecting success of 9402.21 'validate v1.2 v1 diff saved during last cvswork2 edit': 
+	test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&
+	check_diff cvsEdit3-v1.2-v1.diff v1.2 v1
+
+ok 21 - validate v1.2 v1 diff saved during last cvswork2 edit
+
+expecting success of 9402.22 'cvs up [cvswork2]': 
+	( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork2 &&
+	check_file cvswork2 textfile.c v2 &&
+	check_file cvswork2 adir/afile v2 &&
+	check_file cvswork2 adir/a2file v2 &&
+	check_file cvswork2 adir/bdir/bfile v2 &&
+	check_file cvswork2 adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork2 v2
+
+ok 22 - cvs up [cvswork2]
+
+expecting success of 9402.23 'cvs up -r b2 [back to cvswork]': 
+	( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v2 &&
+	check_file cvswork adir/afile v2 &&
+	check_file cvswork adir/a2file v2 &&
+	check_file cvswork adir/bdir/bfile v2 &&
+	check_file cvswork adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork v2
+
+ok 23 - cvs up -r b2 [back to cvswork]
+
+expecting success of 9402.24 'cvs up -r b1': 
+	( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_full_tree cvswork v1.2
+
+ok 24 - cvs up -r b1
+
+expecting success of 9402.25 'cvs up -A': 
+	( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 25 - cvs up -A
+
+expecting success of 9402.26 'cvs up (check CVS/Tag files)': 
+	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 26 - cvs up (check CVS/Tag files)
+
+expecting success of 9402.27 'cvs up -r heads/b1': 
+	( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1.2 &&
+	check_file cvswork t3 v1.2 &&
+	check_file cvswork adir/afile v1.2 &&
+	check_file cvswork adir/a3file v1.2 &&
+	check_file cvswork adir/bdir/bfile v1.2 &&
+	check_file cvswork adir/bdir/b3file v1.2 &&
+	check_file cvswork cdir/cfile v1.2 &&
+	check_end_full_tree cvswork v1.2
+
+ok 27 - cvs up -r heads/b1
+
+expecting success of 9402.28 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)': 
+	( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v2 &&
+	check_file cvswork adir/afile v2 &&
+	check_file cvswork adir/a2file v2 &&
+	check_file cvswork adir/bdir/bfile v2 &&
+	check_file cvswork adir/bdir/b4file v2 &&
+	check_end_full_tree cvswork v2
+
+ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism)
+
+expecting success of 9402.29 'cvs up -r $(git rev-parse v1)': 
+	test -n "$v1hash" &&
+	( cd cvswork && cvs -f up -r "$v1hash" ) >cvs.log 2>&1 &&
+	check_start_tree cvswork &&
+	check_file cvswork textfile.c v1 &&
+	check_file cvswork t2 v1 &&
+	check_file cvswork adir/afile v1 &&
+	check_file cvswork adir/a2file v1 &&
+	check_file cvswork adir/bdir/bfile v1 &&
+	check_file cvswork adir/bdir/b2file v1 &&
+	check_end_full_tree cvswork v1
+
+ok 29 - cvs up -r $(git rev-parse v1)
+
+expecting success of 9402.30 'cvs diff -r v1 -u': 
+	( cd cvswork && cvs -f diff -r v1 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvsDiff.out &&
+	test_must_be_empty cvs.log
+
+ok 30 - cvs diff -r v1 -u
+
+expecting success of 9402.31 'cvs diff -N -r v2 -u': 
+	( cd cvswork && ! cvs -f diff -N -r v2 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
+
+ok 31 - cvs diff -N -r v2 -u
+
+expecting success of 9402.32 'cvs diff -N -r v2 -r v1.2': 
+	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u >../cvsDiff.out 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
+
+ok 32 - cvs diff -N -r v2 -r v1.2
+
+expecting success of 9402.33 'apply early [cvswork3] diff to b3': 
+	git clone -q . gitwork3 &&
+	(
+		cd gitwork3 &&
+		git checkout -b b3 v1 &&
+		git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" &&
+		git commit -m "cvswork3 edits applied"
+	) &&
+	git fetch gitwork3 b3:b3 &&
+	git tag v3 b3
+
+Switched to a new branch 'b3'
+[b3 e1226ee] cvswork3 edits applied
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 adir/afile5
+ delete mode 100644 t2
+From gitwork3
+ * [new branch]      b3         -> b3
+ok 33 - apply early [cvswork3] diff to b3
+
+expecting success of 9402.34 'check [cvswork3] diff': 
+	( cd cvswork3 && ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" 2>../cvs.log ) &&
+	test_must_be_empty cvs.log &&
+	test -s cvsDiff.out &&
+	test $(grep Index: cvsDiff.out | wc -l) = 3 &&
+	test_cmp cvsDiff.out cvswork3edit.diff &&
+	check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
+
+ok 34 - check [cvswork3] diff
+
+expecting success of 9402.35 'merge early [cvswork3] b3 with b1': 
+	( cd gitwork3 && git merge -m "message" b1 ) &&
+	git fetch gitwork3 b3:b3 &&
+	git tag v3merged b3 &&
+	git push --tags gitcvs.git b3:b3
+
+Auto-merging adir/afile
+Merge made by the 'ort' strategy.
+ adir/a2file      | 1 -
+ adir/a3file      | 1 +
+ adir/afile       | 2 +-
+ adir/bdir/b2file | 1 -
+ adir/bdir/b3file | 1 +
+ adir/bdir/bfile  | 1 +
+ cdir/cfile       | 1 +
+ t3               | 1 +
+ 8 files changed, 6 insertions(+), 3 deletions(-)
+ delete mode 100644 adir/a2file
+ create mode 100644 adir/a3file
+ delete mode 100644 adir/bdir/b2file
+ create mode 100644 adir/bdir/b3file
+ create mode 100644 cdir/cfile
+ create mode 100644 t3
+From gitwork3
+   e1226ee..21f047c  b3         -> b3
+To gitcvs.git
+ * [new branch]      b3 -> b3
+ * [new tag]         v3 -> v3
+ * [new tag]         v3merged -> v3merged
+ok 35 - merge early [cvswork3] b3 with b1
+
+expecting success of 9402.36 'cvs up dirty [cvswork3]': 
+	(
+		cd cvswork3 &&
+		cvs -f up &&
+		! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out"
+	) >cvs.log 2>&1 &&
+	test -s cvsDiff.out &&
+	test $(grep Index: cvsDiff.out | wc -l) = 2 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v3merged &&
+	check_file cvswork3 t3 v3merged &&
+	check_file cvswork3 adir/afile v3merged &&
+	check_file cvswork3 adir/a3file v3merged &&
+	check_file cvswork3 adir/afile5 v3merged &&
+	check_file cvswork3 adir/bdir/bfile v3merged &&
+	check_file cvswork3 adir/bdir/b3file v3merged &&
+	check_file cvswork3 cdir/cfile v3merged &&
+	check_end_full_tree cvswork3 v3merged
+
+ok 36 - cvs up dirty [cvswork3]
+
+expecting success of 9402.37 'cvs commit [cvswork3]': 
+	(
+		cd cvswork3 &&
+		cvs -f commit -m "dirty sandbox after auto-merge"
+	) >cvs.log 2>&1 &&
+	check_start_tree cvswork3 &&
+	check_file cvswork3 textfile.c v3merged &&
+	check_file cvswork3 t3 v3merged &&
+	check_file cvswork3 adir/afile v3merged &&
+	check_file cvswork3 adir/a3file v3merged &&
+	check_file cvswork3 adir/afile5 v3merged &&
+	check_file cvswork3 adir/bdir/bfile v3merged &&
+	check_file cvswork3 adir/bdir/b3file v3merged &&
+	check_file cvswork3 cdir/cfile v3merged &&
+	check_end_full_tree cvswork3 v3merged &&
+	git fetch gitcvs.git b3:b4 &&
+	git tag v4.1 b4 &&
+	git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
+
+From gitcvs
+ * [new branch]      b3         -> b4
+ok 37 - cvs commit [cvswork3]
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9500-gitweb-standalone-no-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
 expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
@@ -557447,540 +557925,6 @@
 1..119
 make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-*** t9402-git-cvsserver-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9402-git-cvsserver-refs/.git/
-expecting success of 9402.1 'setup v1, b1': 
-	echo "Simple text file" >textfile.c &&
-	echo "t2" >t2 &&
-	mkdir adir &&
-	echo "adir/afile line1" >adir/afile &&
-	echo "adir/afile line2" >>adir/afile &&
-	echo "adir/afile line3" >>adir/afile &&
-	echo "adir/afile line4" >>adir/afile &&
-	echo "adir/a2file" >>adir/a2file &&
-	mkdir adir/bdir &&
-	echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
-	echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
-	echo "adir/bdir/b2file" >adir/bdir/b2file &&
-	git add textfile.c t2 adir &&
-	git commit -q -m "First Commit (v1)" &&
-	git tag v1 &&
-	git branch b1 &&
-	git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log"
-
-ok 1 - setup v1, b1
-
-expecting success of 9402.2 'cvs co v1': 
-	cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 2 - cvs co v1
-
-expecting success of 9402.3 'cvs co b1': 
-	cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 3 - cvs co b1
-
-expecting success of 9402.4 'cvs co b1 [cvswork3]': 
-	cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v1 &&
-	check_file cvswork3 t2 v1 &&
-	check_file cvswork3 adir/afile v1 &&
-	check_file cvswork3 adir/a2file v1 &&
-	check_file cvswork3 adir/bdir/bfile v1 &&
-	check_file cvswork3 adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork3 v1
-
-ok 4 - cvs co b1 [cvswork3]
-
-expecting success of 9402.5 'edit cvswork3 and save diff': 
-	(
-		cd cvswork3 &&
-		sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
-		mv -f adir/afileNEW adir/afile &&
-		echo "afile5" >adir/afile5 &&
-		rm t2 &&
-		cvs -f add adir/afile5 &&
-		cvs -f rm t2 &&
-		! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
-	)
-
-cvs add: scheduling file `adir/afile5' for addition
-cvs add: use `cvs commit' to add this file permanently
-cvs remove: scheduling `t2' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-ok 5 - edit cvswork3 and save diff
-
-expecting success of 9402.6 'setup v1.2 on b1': 
-	git checkout b1 &&
-	echo "new v1.2" >t3 &&
-	rm t2 &&
-	sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
-	mv -f adir/afileNEW adir/afile &&
-	rm adir/a2file &&
-	echo "a3file" >>adir/a3file &&
-	echo "bfile line 3" >>adir/bdir/bfile &&
-	rm adir/bdir/b2file &&
-	echo "b3file" >adir/bdir/b3file &&
-	mkdir cdir &&
-	echo "cdir/cfile" >cdir/cfile &&
-	git add -A cdir adir t3 t2 &&
-	git commit -q -m "v1.2" &&
-	git tag v1.2 &&
-	git push --tags gitcvs.git b1:b1
-
-Switched to branch 'b1'
-To gitcvs.git
-   a445389..5630bb8  b1 -> b1
- * [new tag]         v1.2 -> v1.2
-ok 6 - setup v1.2 on b1
-
-expecting success of 9402.7 'cvs -f up (on b1 adir)': 
-	( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_end_tree cvswork
-
-ok 7 - cvs -f up (on b1 adir)
-
-expecting success of 9402.8 'cvs up (on b1 /)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_tree cvswork
-
-ok 8 - cvs up (on b1 /)
-
-expecting success of 9402.9 'cvs up (on b1 /) (again; check CVS/Tag files)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_tree cvswork
-
-ok 9 - cvs up (on b1 /) (again; check CVS/Tag files)
-
-expecting success of 9402.10 'cvs up -r v1': 
-	( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 10 - cvs up -r v1
-
-expecting success of 9402.11 'cvs up': 
-	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 11 - cvs up
-
-expecting success of 9402.12 'cvs up (again; check CVS/Tag files)': 
-	( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 12 - cvs up (again; check CVS/Tag files)
-
-expecting success of 9402.13 'setup simple b2': 
-	git branch b2 v1 &&
-	git push --tags gitcvs.git b2:b2
-
-To gitcvs.git
- * [new branch]      b2 -> b2
-ok 13 - setup simple b2
-
-expecting success of 9402.14 'cvs co b2 [into cvswork2]': 
-	cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_tree cvswork
-
-ok 14 - cvs co b2 [into cvswork2]
-
-expecting success of 9402.15 'root dir edit [cvswork2]': 
-	(
-		cd cvswork2 && echo "Line 2" >>textfile.c &&
-		! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
-		cvs -f commit -m "edit textfile.c" textfile.c
-	) >cvsEdit1.log 2>&1
-
-ok 15 - root dir edit [cvswork2]
-
-expecting success of 9402.16 'root dir rm file [cvswork2]': 
-	(
-		cd cvswork2 &&
-		cvs -f rm -f t2 &&
-		cvs -f diff -u >../cvsEdit2-empty.diff &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
-		cvs -f commit -m "rm t2"
-	) >cvsEdit2.log 2>&1
-
-ok 16 - root dir rm file [cvswork2]
-
-expecting success of 9402.17 'subdir edit/add/rm files [cvswork2]': 
-	(
-		cd cvswork2 &&
-		sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW &&
-		mv -f adir/bdir/bfileNEW adir/bdir/bfile &&
-		rm adir/bdir/b2file &&
-		cd adir &&
-		cvs -f rm bdir/b2file &&
-		echo "4th file" >bdir/b4file &&
-		cvs -f add bdir/b4file &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
-		git fetch gitcvs.git b2:b2 &&
-		(
-		  cd .. &&
-		  ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
-		  ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
-		) &&
-		cvs -f commit -m "various add/rm/edit"
-	) >cvs.log 2>&1
-
-ok 17 - subdir edit/add/rm files [cvswork2]
-
-expecting success of 9402.18 'validate result of edits [cvswork2]': 
-	git fetch gitcvs.git b2:b2 &&
-	git tag v2 b2 &&
-	git push --tags gitcvs.git b2:b2 &&
-	check_start_tree cvswork2 &&
-	check_file cvswork2 textfile.c v2 &&
-	check_file cvswork2 adir/afile v2 &&
-	check_file cvswork2 adir/a2file v2 &&
-	check_file cvswork2 adir/bdir/bfile v2 &&
-	check_file cvswork2 adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork2 v2
-
-From gitcvs
-   8bc3df8..2f22978  b2         -> b2
-To gitcvs.git
- * [new tag]         v2 -> v2
-ok 18 - validate result of edits [cvswork2]
-
-expecting success of 9402.19 'validate basic diffs saved during above cvswork2 edits': 
-	test $(grep Index: cvsEdit1.diff | wc -l) = 1 &&
-	test_must_be_empty cvsEdit2-empty.diff &&
-	test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 &&
-	test $(grep Index: cvsEdit3.diff | wc -l) = 3 &&
-	rm -rf diffSandbox &&
-	git clone -q -n . diffSandbox &&
-	(
-		cd diffSandbox &&
-		git checkout v1 &&
-		git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" &&
-		git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" &&
-		git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" &&
-		git diff --exit-code v2
-	) >"check_diff_apply.out" 2>&1
-
-ok 19 - validate basic diffs saved during above cvswork2 edits
-
-expecting success of 9402.20 'validate v1.2 diff saved during last cvswork2 edit': 
-	test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 &&
-	check_diff cvsEdit3-v1.2.diff v1.2 v2
-
-ok 20 - validate v1.2 diff saved during last cvswork2 edit
-
-expecting success of 9402.21 'validate v1.2 v1 diff saved during last cvswork2 edit': 
-	test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 &&
-	check_diff cvsEdit3-v1.2-v1.diff v1.2 v1
-
-ok 21 - validate v1.2 v1 diff saved during last cvswork2 edit
-
-expecting success of 9402.22 'cvs up [cvswork2]': 
-	( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork2 &&
-	check_file cvswork2 textfile.c v2 &&
-	check_file cvswork2 adir/afile v2 &&
-	check_file cvswork2 adir/a2file v2 &&
-	check_file cvswork2 adir/bdir/bfile v2 &&
-	check_file cvswork2 adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork2 v2
-
-ok 22 - cvs up [cvswork2]
-
-expecting success of 9402.23 'cvs up -r b2 [back to cvswork]': 
-	( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v2 &&
-	check_file cvswork adir/afile v2 &&
-	check_file cvswork adir/a2file v2 &&
-	check_file cvswork adir/bdir/bfile v2 &&
-	check_file cvswork adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork v2
-
-ok 23 - cvs up -r b2 [back to cvswork]
-
-expecting success of 9402.24 'cvs up -r b1': 
-	( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_full_tree cvswork v1.2
-
-ok 24 - cvs up -r b1
-
-expecting success of 9402.25 'cvs up -A': 
-	( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
-
-ok 25 - cvs up -A
-
-expecting success of 9402.26 'cvs up (check CVS/Tag files)': 
-	( cd cvswork && cvs -f up ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
-
-ok 26 - cvs up (check CVS/Tag files)
-
-expecting success of 9402.27 'cvs up -r heads/b1': 
-	( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1.2 &&
-	check_file cvswork t3 v1.2 &&
-	check_file cvswork adir/afile v1.2 &&
-	check_file cvswork adir/a3file v1.2 &&
-	check_file cvswork adir/bdir/bfile v1.2 &&
-	check_file cvswork adir/bdir/b3file v1.2 &&
-	check_file cvswork cdir/cfile v1.2 &&
-	check_end_full_tree cvswork v1.2
-
-ok 27 - cvs up -r heads/b1
-
-expecting success of 9402.28 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)': 
-	( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v2 &&
-	check_file cvswork adir/afile v2 &&
-	check_file cvswork adir/a2file v2 &&
-	check_file cvswork adir/bdir/bfile v2 &&
-	check_file cvswork adir/bdir/b4file v2 &&
-	check_end_full_tree cvswork v2
-
-ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism)
-
-expecting success of 9402.29 'cvs up -r $(git rev-parse v1)': 
-	test -n "$v1hash" &&
-	( cd cvswork && cvs -f up -r "$v1hash" ) >cvs.log 2>&1 &&
-	check_start_tree cvswork &&
-	check_file cvswork textfile.c v1 &&
-	check_file cvswork t2 v1 &&
-	check_file cvswork adir/afile v1 &&
-	check_file cvswork adir/a2file v1 &&
-	check_file cvswork adir/bdir/bfile v1 &&
-	check_file cvswork adir/bdir/b2file v1 &&
-	check_end_full_tree cvswork v1
-
-ok 29 - cvs up -r $(git rev-parse v1)
-
-expecting success of 9402.30 'cvs diff -r v1 -u': 
-	( cd cvswork && cvs -f diff -r v1 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvsDiff.out &&
-	test_must_be_empty cvs.log
-
-ok 30 - cvs diff -r v1 -u
-
-expecting success of 9402.31 'cvs diff -N -r v2 -u': 
-	( cd cvswork && ! cvs -f diff -N -r v2 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
-
-ok 31 - cvs diff -N -r v2 -u
-
-expecting success of 9402.32 'cvs diff -N -r v2 -r v1.2': 
-	( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u >../cvsDiff.out 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
-
-ok 32 - cvs diff -N -r v2 -r v1.2
-
-expecting success of 9402.33 'apply early [cvswork3] diff to b3': 
-	git clone -q . gitwork3 &&
-	(
-		cd gitwork3 &&
-		git checkout -b b3 v1 &&
-		git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" &&
-		git commit -m "cvswork3 edits applied"
-	) &&
-	git fetch gitwork3 b3:b3 &&
-	git tag v3 b3
-
-Switched to a new branch 'b3'
-[b3 e1226ee] cvswork3 edits applied
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 adir/afile5
- delete mode 100644 t2
-From gitwork3
- * [new branch]      b3         -> b3
-ok 33 - apply early [cvswork3] diff to b3
-
-expecting success of 9402.34 'check [cvswork3] diff': 
-	( cd cvswork3 && ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" 2>../cvs.log ) &&
-	test_must_be_empty cvs.log &&
-	test -s cvsDiff.out &&
-	test $(grep Index: cvsDiff.out | wc -l) = 3 &&
-	test_cmp cvsDiff.out cvswork3edit.diff &&
-	check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
-
-ok 34 - check [cvswork3] diff
-
-expecting success of 9402.35 'merge early [cvswork3] b3 with b1': 
-	( cd gitwork3 && git merge -m "message" b1 ) &&
-	git fetch gitwork3 b3:b3 &&
-	git tag v3merged b3 &&
-	git push --tags gitcvs.git b3:b3
-
-Auto-merging adir/afile
-Merge made by the 'ort' strategy.
- adir/a2file      | 1 -
- adir/a3file      | 1 +
- adir/afile       | 2 +-
- adir/bdir/b2file | 1 -
- adir/bdir/b3file | 1 +
- adir/bdir/bfile  | 1 +
- cdir/cfile       | 1 +
- t3               | 1 +
- 8 files changed, 6 insertions(+), 3 deletions(-)
- delete mode 100644 adir/a2file
- create mode 100644 adir/a3file
- delete mode 100644 adir/bdir/b2file
- create mode 100644 adir/bdir/b3file
- create mode 100644 cdir/cfile
- create mode 100644 t3
-From gitwork3
-   e1226ee..21f047c  b3         -> b3
-To gitcvs.git
- * [new branch]      b3 -> b3
- * [new tag]         v3 -> v3
- * [new tag]         v3merged -> v3merged
-ok 35 - merge early [cvswork3] b3 with b1
-
-expecting success of 9402.36 'cvs up dirty [cvswork3]': 
-	(
-		cd cvswork3 &&
-		cvs -f up &&
-		! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out"
-	) >cvs.log 2>&1 &&
-	test -s cvsDiff.out &&
-	test $(grep Index: cvsDiff.out | wc -l) = 2 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v3merged &&
-	check_file cvswork3 t3 v3merged &&
-	check_file cvswork3 adir/afile v3merged &&
-	check_file cvswork3 adir/a3file v3merged &&
-	check_file cvswork3 adir/afile5 v3merged &&
-	check_file cvswork3 adir/bdir/bfile v3merged &&
-	check_file cvswork3 adir/bdir/b3file v3merged &&
-	check_file cvswork3 cdir/cfile v3merged &&
-	check_end_full_tree cvswork3 v3merged
-
-ok 36 - cvs up dirty [cvswork3]
-
-expecting success of 9402.37 'cvs commit [cvswork3]': 
-	(
-		cd cvswork3 &&
-		cvs -f commit -m "dirty sandbox after auto-merge"
-	) >cvs.log 2>&1 &&
-	check_start_tree cvswork3 &&
-	check_file cvswork3 textfile.c v3merged &&
-	check_file cvswork3 t3 v3merged &&
-	check_file cvswork3 adir/afile v3merged &&
-	check_file cvswork3 adir/a3file v3merged &&
-	check_file cvswork3 adir/afile5 v3merged &&
-	check_file cvswork3 adir/bdir/bfile v3merged &&
-	check_file cvswork3 adir/bdir/b3file v3merged &&
-	check_file cvswork3 cdir/cfile v3merged &&
-	check_end_full_tree cvswork3 v3merged &&
-	git fetch gitcvs.git b3:b4 &&
-	git tag v4.1 b4 &&
-	git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
-
-From gitcvs
- * [new branch]      b3         -> b4
-ok 37 - cvs commit [cvswork3]
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 *** t9902-completion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9902-completion/.git/
 expecting success of 9902.1 'setup for __git_find_repo_path/__gitdir tests': 
@@ -560917,8 +560861,8 @@
 	test_completion "git add ~/tmp/" "~/tmp/file"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.49.0+next.20250314/t/trash directory.t9902-completion/tmp/.git/
---- expected	2026-04-19 19:27:49.155659440 +0000
-+++ out_sorted	2026-04-19 19:27:49.243659440 +0000
+--- expected	2025-03-17 13:33:24.729282353 +0000
++++ out_sorted	2025-03-17 13:33:24.841283061 +0000
 @@ -1 +1 @@
 -~/tmp/file
 +
@@ -560962,8 +560906,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2026-04-19 19:27:49.567659440 +0000
-+++ out	2026-04-19 19:27:49.611659440 +0000
+--- expected	2025-03-17 13:33:25.309286017 +0000
++++ out	2025-03-17 13:33:25.385286497 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -560997,8 +560941,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2026-04-19 19:27:49.743659440 +0000
-+++ out	2026-04-19 19:27:49.787659440 +0000
+--- expected	2025-03-17 13:33:25.617287963 +0000
++++ out	2025-03-17 13:33:25.689288418 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -561343,10 +561287,10 @@
 /usr/bin/make aggregate-results
 make[5]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/t'
 
-missing prereq: !LONG_IS_64BIT !PCRE !PTHREADS AUTOIDENT BUILTIN_ADOC_CHECKOUT__WORKER BUILTIN_ADOC_MERGE_OURS BUILTIN_ADOC_MERGE_RECURSIVE BUILTIN_ADOC_MERGE_RECURSIVE_OURS BUILTIN_ADOC_MERGE_RECURSIVE_THEIRS BUILTIN_ADOC_MERGE_SUBTREE BUILTIN_ADOC_PICKAXE BUILTIN_ADOC_SUBMODULE__HELPER BUILTIN_ADOC_UPLOAD_ARCHIVE__WRITER CASE_INSENSITIVE_FS EXPENSIVE FSMONITOR_DAEMON GETTEXT_ISO_LOCALE GPG GPG2 GPGSM GPGSSH GPGSSH_VERIFYTIME HIGHLIGHT JGIT MINGW NATIVE_CRLF PERLJSON RFC1991 RUNTIME_PREFIX SETFACL SIGNED_CHAR_BY_DEFAULT SYMLINKS_WINDOWS TAR_NEEDS_PAX_FALLBACK USR_BIN_TIME UTF8_NFD_TO_NFC WINDOWS
+missing prereq: !AUTOIDENT !LONG_IS_64BIT !PCRE !PTHREADS BUILTIN_ADOC_CHECKOUT__WORKER BUILTIN_ADOC_MERGE_OURS BUILTIN_ADOC_MERGE_RECURSIVE BUILTIN_ADOC_MERGE_RECURSIVE_OURS BUILTIN_ADOC_MERGE_RECURSIVE_THEIRS BUILTIN_ADOC_MERGE_SUBTREE BUILTIN_ADOC_PICKAXE BUILTIN_ADOC_SUBMODULE__HELPER BUILTIN_ADOC_UPLOAD_ARCHIVE__WRITER CASE_INSENSITIVE_FS EXPENSIVE FSMONITOR_DAEMON GETTEXT_ISO_LOCALE GPG GPG2 GPGSM GPGSSH GPGSSH_VERIFYTIME HIGHLIGHT JGIT MINGW NATIVE_CRLF PERLJSON RFC1991 RUNTIME_PREFIX SETFACL SIGNED_CHAR_BY_DEFAULT SYMLINKS_WINDOWS TAR_NEEDS_PAX_FALLBACK USR_BIN_TIME UTF8_NFD_TO_NFC WINDOWS
 
 fixed   0
-success 30459
+success 30458
 failed  0
 broken  277
 total   31258
@@ -561408,9 +561352,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 53c35e4e07fb9f3f51d4996dcd70424905b58568 (refs/remotes/origin/trunk)
+r1 = db1275ced64e9006a118b82717609bfd21ee6b3a (refs/remotes/origin/trunk)
 	M	foo
-r2 = f3f56da23906de6a9903f6ba75e311d5231ceaca (refs/remotes/origin/trunk)
+r2 = b0effaec1259f46508aa449f851a106cd486d9e1 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: switching to 'remotes/origin/trunk'.
@@ -561430,7 +561374,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at f3f56da updated trunk
+HEAD is now at b0effae updated trunk
 ok 2 - import into git
 
 expecting success of 9167.3 'git svn branch tests': 
@@ -561449,40 +561393,40 @@
 Creating parent folder file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) f3f56da23906de6a9903f6ba75e311d5231ceaca
+Found branch parent: (refs/remotes/origin/a) b0effaec1259f46508aa449f851a106cd486d9e1
 Following parent with do_switch
 Successfully followed parent
-r4 = 20b1ae17afe5939a1f1b428c790e02ab86ddc0aa (refs/remotes/origin/a)
+r4 = 7d059e2013620ca568f32105c40dd348c3f86e09 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Filesystem has no item: File not found: transaction '4-5', path '/tags/tag1/project' at /build/reproducible-path/git-2.49.0+next.20250314/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) f3f56da23906de6a9903f6ba75e311d5231ceaca
+Found branch parent: (refs/remotes/origin/tags/tag1) b0effaec1259f46508aa449f851a106cd486d9e1
 Following parent with do_switch
 Successfully followed parent
-r6 = dc1ddc32f8e43590bb444cbc962a9052f968d270 (refs/remotes/origin/tags/tag1)
+r6 = 91bdf6b4a726911488636924cf547ee6c2aa7360 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Filesystem has no item: File not found: transaction '6-8', path '/tags/tag2/project' at /build/reproducible-path/git-2.49.0+next.20250314/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) f3f56da23906de6a9903f6ba75e311d5231ceaca
+Found branch parent: (refs/remotes/origin/tags/tag2) b0effaec1259f46508aa449f851a106cd486d9e1
 Following parent with do_switch
 Successfully followed parent
-r8 = 2c8a3986287a5341411e4aa2c0f6836b91e3b474 (refs/remotes/origin/tags/tag2)
+r8 = 4dbcd586c27fb11667f99333aaf9de163a702153 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Filesystem has no item: File not found: transaction '8-b', path '/tags/tag3/project' at /build/reproducible-path/git-2.49.0+next.20250314/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) f3f56da23906de6a9903f6ba75e311d5231ceaca
+Found branch parent: (refs/remotes/origin/tags/tag3) b0effaec1259f46508aa449f851a106cd486d9e1
 Following parent with do_switch
 Successfully followed parent
-r10 = 07e092062d88da07b7edf5b57ddfbf23debe7347 (refs/remotes/origin/tags/tag3)
+r10 = 46bce30c3b294ac74a9040ed0fc31868c3479975 (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -561524,9 +561468,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = adafe5e312279f8a90d8a49de60e435fadcee993 (refs/remotes/origin/trunk)
+r1 = dbf0268e70790dc9264ca71bbb8ffd87249485d8 (refs/remotes/origin/trunk)
 	M	foo
-r2 = 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9 (refs/remotes/origin/trunk)
+r2 = 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: switching to 'remotes/origin/trunk'.
@@ -561546,7 +561490,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 2a8f537 updated trunk
+HEAD is now at 8c2f39f updated trunk
 ok 2 - import into git
 
 expecting success of 9128.3 'git svn branch tests': 
@@ -561574,16 +561518,16 @@
 
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/a) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r3 = 9060b8728b61916a60cf1305a47bf9bcb984326a (refs/remotes/origin/a)
+r3 = fbb509ad5d46b5df076b6dabc524884ac2f801b1 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/b) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r4 = 3890979d33e6c1e61f7bcea8acdd60ce8e940523 (refs/remotes/origin/b)
+r4 = 9eefdef58dc70c174e49cf74aeda9ae9bf7d61ef (refs/remotes/origin/b)
 fatal: cannot rename the current branch while not on any
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/c...
 fatal: ambiguous argument 'remotes/origin/c': unknown revision or path not in the working tree.
@@ -561594,28 +561538,28 @@
 
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/tags/tag1) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r5 = 59ac451a03dc32f679d6c33ba91c436ef312dde8 (refs/remotes/origin/tags/tag1)
+r5 = 0424faf30ddbf37864536411660a9fd9aad0e3f0 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/tags/tag2) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r6 = e3fd2c1bb95f896bb333d005850fdc072e3e61f0 (refs/remotes/origin/tags/tag2)
+r6 = 09a3736e526e185fa72cbcf1a87b7c1d88566943 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/tags/tag3) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r7 = 549fb109449bf081ce2134d841f540589d701c4b (refs/remotes/origin/tags/tag3)
+r7 = f9f5838c7a16fb29167c018c63d563c0497e108b (refs/remotes/origin/tags/tag3)
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+Found branch parent: (refs/remotes/origin/tags/tag4) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r8 = 1222db04d06bd5a025f4d61aee5de0594f237aae (refs/remotes/origin/tags/tag4)
+r8 = fffdb5c5626e55227cfab83770a62c9f448d9115 (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -561673,55 +561617,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-branch_from: /branches => /branches/b
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) 3890979d33e6c1e61f7bcea8acdd60ce8e940523
-Following parent with do_switch
-Successfully followed parent
-r9 = 05387b5794e13b747b099fd7b2e74a557bdd4f25 (refs/remotes/mirror/b)
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) 2a8f537ebd34e9f8055fe53b606eff3d0cd8fdd9
+branch_from: /tags => /tags/tag3
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
+Found branch parent: (refs/remotes/mirror/tags/tag3) f9f5838c7a16fb29167c018c63d563c0497e108b
 Following parent with do_switch
 Successfully followed parent
-r9 = 4c3d506d06c6332386d97957d7331f80502f1f60 (refs/remotes/mirror/trunk)
-branch_from: /tags => /tags/tag2
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) e3fd2c1bb95f896bb333d005850fdc072e3e61f0
+r9 = 59170729e59145814b9134f4c3861bd3139e87eb (refs/remotes/mirror/tags/tag3)
+branch_from: /tags => /tags/tag1
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
+Found branch parent: (refs/remotes/mirror/tags/tag1) 0424faf30ddbf37864536411660a9fd9aad0e3f0
 Following parent with do_switch
 Successfully followed parent
-r9 = ae2107541cddc6421ac3f742d542ff8adb16eb35 (refs/remotes/mirror/tags/tag2)
+r9 = b2bed394a56f4caf97fef43c6b7fac657435a8d0 (refs/remotes/mirror/tags/tag1)
 branch_from: /branches => /branches/a
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) 9060b8728b61916a60cf1305a47bf9bcb984326a
-Following parent with do_switch
-Successfully followed parent
-r9 = e3a5b9df58518cbb6300f6df197cc440d1a39210 (refs/remotes/mirror/a)
-branch_from: /tags => /tags/tag1
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) 59ac451a03dc32f679d6c33ba91c436ef312dde8
+Found branch parent: (refs/remotes/mirror/a) fbb509ad5d46b5df076b6dabc524884ac2f801b1
 Following parent with do_switch
 Successfully followed parent
-r9 = 87f8e0e3a1f89e457fd5cfde2070d49bc87f6c60 (refs/remotes/mirror/tags/tag1)
-branch_from: /tags => /tags/tag3
-Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 549fb109449bf081ce2134d841f540589d701c4b
+r9 = e899496a50e7e0bac568281463974826bc1a8ef0 (refs/remotes/mirror/a)
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
+Found branch parent: (refs/remotes/mirror/trunk) 8c2f39fe5cc0adad04fa6da416bb8b3aa4469aa7
 Following parent with do_switch
 Successfully followed parent
-r9 = 801646d2419c229cf4135ec387b5aedb341dc83f (refs/remotes/mirror/tags/tag3)
+r9 = 63b6e4a04d63fa7ac948d50ad447d3cb4b4ec382 (refs/remotes/mirror/trunk)
 branch_from: /tags => /tags/tag4
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) 1222db04d06bd5a025f4d61aee5de0594f237aae
+Found branch parent: (refs/remotes/mirror/tags/tag4) fffdb5c5626e55227cfab83770a62c9f448d9115
+Following parent with do_switch
+Successfully followed parent
+r9 = 3d73696faf32e99413057700d3f473173599ffe1 (refs/remotes/mirror/tags/tag4)
+branch_from: /tags => /tags/tag2
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
+Found branch parent: (refs/remotes/mirror/tags/tag2) 09a3736e526e185fa72cbcf1a87b7c1d88566943
+Following parent with do_switch
+Successfully followed parent
+r9 = 69c010fce09e3598345699e0b8c6eacda26022f8 (refs/remotes/mirror/tags/tag2)
+branch_from: /branches => /branches/b
+Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
+Found branch parent: (refs/remotes/mirror/b) 9eefdef58dc70c174e49cf74aeda9ae9bf7d61ef
 Following parent with do_switch
 Successfully followed parent
-r9 = 9e7c1a1a68a1d65c438e790e5322638c5db3ef6d (refs/remotes/mirror/tags/tag4)
-Previous HEAD position was 2a8f537 updated trunk
-HEAD is now at 4c3d506 made mirror
+r9 = cc65892571a289e0a9a73e46469dd27d4d74fbe5 (refs/remotes/mirror/b)
+Previous HEAD position was 8c2f39f updated trunk
+HEAD is now at 63b6e4a made mirror
 Copying file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/reproducible-path/git-2.49.0+next.20250314/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) 4c3d506d06c6332386d97957d7331f80502f1f60
+Found branch parent: (refs/remotes/mirror/d) 63b6e4a04d63fa7ac948d50ad447d3cb4b4ec382
 Following parent with do_switch
 Successfully followed parent
-r10 = cf15d81327610ba67b35a7f451146b59cb24b1bc (refs/remotes/mirror/d)
+r10 = 8215a9f9a4e761ce0a8b5fb40a4db73d90ed7bcd (refs/remotes/mirror/d)
 fatal: ambiguous argument 'remotes/d': unknown revision or path not in the working tree.
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
@@ -565250,14 +565194,14 @@
 mv git-merge-resolve+ git-merge-resolve
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
-mv git-mergetool+ git-mergetool
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-quiltimport.sh" "git-quiltimport+" ./GIT-BUILD-OPTIONS && \
 mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-mergetool.sh" "git-mergetool+" ./GIT-BUILD-OPTIONS && \
+mv git-mergetool+ git-mergetool
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-request-pull.sh" "git-request-pull+" ./GIT-BUILD-OPTIONS && \
 mv git-request-pull+ git-request-pull
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
@@ -565294,25 +565238,25 @@
 mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-mergetool--lib.sh" "git-mergetool--lib+" ./GIT-BUILD-OPTIONS && \
 mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
+mv git-sh-setup+ git-sh-setup
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-sh-i18n.sh" "git-sh-i18n+" ./GIT-BUILD-OPTIONS && \
 mv git-sh-i18n+ git-sh-i18n
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+/bin/sh generate-python.sh ./GIT-BUILD-OPTIONS "git-p4.py" "git-p4"
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 ./generate-script.sh "git-instaweb.sh" "git-instaweb+" ./GIT-BUILD-OPTIONS && \
 chmod +x git-instaweb+ && \
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-./generate-script.sh "git-sh-setup.sh" "git-sh-setup+" ./GIT-BUILD-OPTIONS && \
-mv git-sh-setup+ git-sh-setup
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 /usr/bin/make -C gitk-git  all
 /usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
@@ -565335,10 +565279,10 @@
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/Packet.pm" "perl/build/lib/Git/Packet.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN.pm" "perl/build/lib/Git/SVN.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/LoadCPAN/Error.pm" "perl/build/lib/Git/LoadCPAN/Error.pm"
+/bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN.pm" "perl/build/lib/Git/SVN.pm"
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /bin/sh generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "perl/Git/SVN/Editor.pm" "perl/build/lib/Git/SVN/Editor.pm"
@@ -565490,14 +565434,6 @@
    debian/rules override_dh_auto_install-indep
 DESTDIR='/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp' /usr/bin/make install install-doc NO_OPENSSL=1 prefix=/usr gitexecdir=/usr/lib/git-core mandir=/usr/share/man htmldir=/usr/share/doc/git/html INSTALLDIRS=vendor SANE_TOOL_PATH= INSTALL=install TAR=tar NO_CROSS_DIRECTORY_HARDLINKS=1 NO_INSTALL_HARDLINKS=1 NO_PERL_CPAN_FALLBACKS=1 PYTHON_PATH=/usr/bin/python3 DEFAULT_PAGER=pager DEFAULT_EDITOR=editor CC='gcc' CFLAGS='-Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.49.0+next.20250314=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -mbranch-protection=standard -Wdate-time -D_FORTIFY_SOURCE=2' LDFLAGS='-Wl,-z,relro' HOST_CPU='aarch64' V=1 USE_LIBPCRE2=1
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-pod2man perl/Git.pm perl/build/man/man3/Git.3pm
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/man/man3'
-(cd perl/build/man/man3 && tar cf - .) | \
-(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/man/man3' && umask 022 && tar xof -)
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/gitweb'
 install -m 755 gitweb/gitweb.cgi '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/gitweb'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/gitweb/static'
@@ -565505,6 +565441,19 @@
 	'/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/gitweb/static'
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
+/usr/bin/make -C gitk-git  all
+/usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
+: no custom templates yet
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+pod2man perl/Git.pm perl/build/man/man3/Git.3pm
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/man/man3'
+(cd perl/build/man/man3 && tar cf - .) | \
+(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/man/man3' && umask 022 && tar xof -)
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 /usr/bin/make -C Documentation install
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 /usr/bin/perl ./build-docdep.perl "/build/reproducible-path/git-2.49.0+next.20250314/Documentation" >doc.dep 
@@ -565512,11 +565461,6 @@
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     * new asciidoc flags
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-/usr/bin/make -C gitk-git  all
-/usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
-: no custom templates yet
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 GIT_BUILT_FROM_COMMIT="" GIT_DATE="" GIT_USER_AGENT="" GIT_VERSION="" /bin/sh ""/build/reproducible-path/git-2.49.0+next.20250314/Documentation/.."/GIT-VERSION-GEN" ""/build/reproducible-path/git-2.49.0+next.20250314/Documentation/.."" "asciidoc.conf.in" "asciidoc.conf"
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -565533,29 +565477,14 @@
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
 : no custom templates yet
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-core/templates'
 (cd blt && tar cf - .) | \
 (cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-core/templates' && umask 022 && tar xof -)
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/templates'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-backfill.xml git-backfill.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archimport.xml git-archimport.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core/mergetools'
 install -m 644 mergetools/* '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core/mergetools'
@@ -565571,31 +565500,40 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-archive.xml git-archive.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-annotate.xml git-annotate.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bugreport.xml git-bugreport.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-add.xml git-add.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-apply.xml git-apply.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-backfill.xml git-backfill.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bisect.xml git-bisect.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-blame.xml git-blame.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-am.xml git-am.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-attr.xml git-check-attr.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-bundle.xml git-bundle.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/gitk-git'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/bin'
@@ -565608,22 +565546,28 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cat-file.xml git-cat-file.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clean.xml git-clean.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-citool.xml git-citool.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cherry.xml git-cherry.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-branch.xml git-branch.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-column.xml git-column.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.adoc
@@ -565638,35 +565582,44 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-count-objects.xml git-count-objects.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-clone.xml git-clone.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-store.xml git-credential-store.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-credential.xml git-credential.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diagnose.xml git-diagnose.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-daemon.xml git-daemon.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/git-gui'
 install -d -m 755 '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core' 
 install -m 755 git-gui  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core'
@@ -565679,109 +565632,103 @@
 install -m 644 po/bg.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/de.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/el.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/fr.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/hu.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/it.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ja.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/nb.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_br.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/pt_pt.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/ru.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/sv.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/vi.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' &&  install -m 644 po/zh_cn.msg  '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/git-gui/lib/msgs' && true
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-describe.xml git-describe.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-commit.xml git-commit.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-difftool.xml git-difftool.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-export.xml git-fast-export.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-pairs.xml git-diff-pairs.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-files.xml git-diff-files.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-pairs.xml git-diff-pairs.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-index.xml git-diff-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fetch.xml git-fetch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fast-import.xml git-fast-import.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hash-object.xml git-hash-object.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-fsck.xml git-fsck.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gui.xml git-gui.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-hook.xml git-hook.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-help.xml git-help.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-grep.xml git-grep.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-gc.xml git-gc.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-format-patch.xml git-format-patch.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-backend.xml git-http-backend.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-diff.xml git-diff.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-push.xml git-http-push.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init-db.xml git-init-db.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-index-pack.xml git-index-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-imap-send.xml git-imap-send.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-instaweb.xml git-instaweb.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-init.xml git-init.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.adoc
@@ -565790,19 +565737,19 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-ls-files.xml git-ls-files.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-file.xml git-merge-file.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-base.xml git-merge-base.adoc
@@ -565811,22 +565758,19 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-index.xml git-merge-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-maintenance.xml git-maintenance.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktag.xml git-mktag.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mergetool.xml git-mergetool.adoc
@@ -565835,86 +565779,40 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mv.xml git-mv.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-mktree.xml git-mktree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-name-rev.xml git-name-rev.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-merge.xml git-merge.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
-bindir=$(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/bin' && pwd) && \
-execdir=$(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core' && pwd) && \
-destdir_from_execdir_SQ=$(echo 'lib/git-core' | sed -e 's|[^/][^/]*|..|g') && \
-{ test "$bindir/" = "$execdir/" || \
-  for p in git scalar git-shell git-cvsserver; do \
-	rm -f "$execdir/$p" && \
-	test -n "" && \
-	ln -s "$destdir_from_execdir_SQ/bin/$p" "$execdir/$p" || \
-	{ test -z "11" && \
-	  ln "$bindir/$p" "$execdir/$p" 2>/dev/null || \
-	  cp "$bindir/$p" "$execdir/$p" || exit; } \
-  done; \
-} && \
-for p in git-receive-pack git-upload-archive git-upload-pack; do \
-	rm -f "$bindir/$p" && \
-	test -n "" && \
-	ln -s "git" "$bindir/$p" || \
-	{ test -z "1" && \
-	  ln "$bindir/git" "$bindir/$p" 2>/dev/null || \
-	  ln -s "git" "$bindir/$p" 2>/dev/null || \
-	  cp "$bindir/git" "$bindir/$p" || exit; }; \
-done && \
-for p in git-add git-am git-annotate git-apply git-archive git-backfill git-bisect git-blame git-branch git-bugreport git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout--worker git-checkout-index git-checkout git-clean git-clone git-column git-commit-graph git-commit-tree git-commit git-config git-count-objects git-credential-cache--daemon git-credential-cache git-credential-store git-credential git-describe git-diagnose git-diff-files git-diff-index git-diff-pairs git-diff-tree git-diff git-difftool git-fast-export git-fast-import git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-for-each-repo git-fsck git-fsmonitor--daemon git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-hook git-index-pack git-init-db git-interpret-trailers git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-merge git-mktag git-mktree git-multi-pack-index git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-pull git-push git-range-diff git-read-tree git-rebase git-receive-pack git-reflog git-refs git-remote-ext git-remote-fd git-remote git-repack git-replace git-replay git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-index git-show-ref git-sparse-checkout git-stash git-stripspace git-submodule--helper git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-upload-pack git-var git-verify-commit git-verify-pack git-verify-tag git-worktree git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-maintenance git-merge-subtree git-restore git-show git-stage git-status git-switch git-version git-whatchanged; do \
-	rm -f "$execdir/$p" && \
-	if test -z ""; \
-	then \
-		test -n "" && \
-		ln -s "$destdir_from_execdir_SQ/bin/git" "$execdir/$p" || \
-		{ test -z "1" && \
-		  ln "$execdir/git" "$execdir/$p" 2>/dev/null || \
-		  ln -s "git" "$execdir/$p" 2>/dev/null || \
-		  cp "$execdir/git" "$execdir/$p" || exit; }; \
-	fi \
-done && \
-remote_curl_aliases="git-remote-https git-remote-ftp git-remote-ftps" && \
-for p in $remote_curl_aliases; do \
-	rm -f "$execdir/$p" && \
-	test -n "" && \
-	ln -s "git-remote-http" "$execdir/$p" || \
-	{ test -z "1" && \
-	  ln "$execdir/git-remote-http" "$execdir/$p" 2>/dev/null || \
-	  ln -s "git-remote-http" "$execdir/$p" 2>/dev/null || \
-	  cp "$execdir/git-remote-http" "$execdir/$p" || exit; } \
-done
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-patch-id.xml git-patch-id.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-notes.xml git-notes.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-p4.xml git-p4.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-prune.xml git-prune.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-range-diff.xml git-range-diff.adoc
@@ -565923,58 +565821,61 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-reflog.xml git-reflog.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-refs.xml git-refs.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-read-tree.xml git-read-tree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-pull.xml git-pull.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-config.xml git-config.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replace.xml git-replace.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-remote.xml git-remote.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rerere.xml git-rerere.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-repack.xml git-repack.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-request-pull.xml git-request-pull.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-restore.xml git-restore.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-push.xml git-push.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rebase.xml git-rebase.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rm.xml git-rm.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-revert.xml git-revert.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-reset.xml git-reset.adoc
@@ -565983,73 +565884,122 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-pack.xml git-send-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-replay.xml git-replay.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shell.xml git-shell.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-log.xml git-log.adoc
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-branch.xml git-show-branch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-index.xml git-show-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stage.xml git-stage.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-send-email.xml git-send-email.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show-ref.xml git-show-ref.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-rev-list.xml git-rev-list.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stripspace.xml git-stripspace.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.adoc
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-stash.xml git-stash.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-shortlog.xml git-shortlog.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-switch.xml git-switch.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-status.xml git-status.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314'
+bindir=$(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/bin' && pwd) && \
+execdir=$(cd '/build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/lib/git-core' && pwd) && \
+destdir_from_execdir_SQ=$(echo 'lib/git-core' | sed -e 's|[^/][^/]*|..|g') && \
+{ test "$bindir/" = "$execdir/" || \
+  for p in git scalar git-shell git-cvsserver; do \
+	rm -f "$execdir/$p" && \
+	test -n "" && \
+	ln -s "$destdir_from_execdir_SQ/bin/$p" "$execdir/$p" || \
+	{ test -z "11" && \
+	  ln "$bindir/$p" "$execdir/$p" 2>/dev/null || \
+	  cp "$bindir/$p" "$execdir/$p" || exit; } \
+  done; \
+} && \
+for p in git-receive-pack git-upload-archive git-upload-pack; do \
+	rm -f "$bindir/$p" && \
+	test -n "" && \
+	ln -s "git" "$bindir/$p" || \
+	{ test -z "1" && \
+	  ln "$bindir/git" "$bindir/$p" 2>/dev/null || \
+	  ln -s "git" "$bindir/$p" 2>/dev/null || \
+	  cp "$bindir/git" "$bindir/$p" || exit; }; \
+done && \
+for p in git-add git-am git-annotate git-apply git-archive git-backfill git-bisect git-blame git-branch git-bugreport git-bundle git-cat-file git-check-attr git-check-ignore git-check-mailmap git-check-ref-format git-checkout--worker git-checkout-index git-checkout git-clean git-clone git-column git-commit-graph git-commit-tree git-commit git-config git-count-objects git-credential-cache--daemon git-credential-cache git-credential-store git-credential git-describe git-diagnose git-diff-files git-diff-index git-diff-pairs git-diff-tree git-diff git-difftool git-fast-export git-fast-import git-fetch-pack git-fetch git-fmt-merge-msg git-for-each-ref git-for-each-repo git-fsck git-fsmonitor--daemon git-gc git-get-tar-commit-id git-grep git-hash-object git-help git-hook git-index-pack git-init-db git-interpret-trailers git-log git-ls-files git-ls-remote git-ls-tree git-mailinfo git-mailsplit git-merge-base git-merge-file git-merge-index git-merge-ours git-merge-recursive git-merge-tree git-merge git-mktag git-mktree git-multi-pack-index git-mv git-name-rev git-notes git-pack-objects git-pack-redundant git-pack-refs git-patch-id git-prune-packed git-prune git-pull git-push git-range-diff git-read-tree git-rebase git-receive-pack git-reflog git-refs git-remote-ext git-remote-fd git-remote git-repack git-replace git-replay git-rerere git-reset git-rev-list git-rev-parse git-revert git-rm git-send-pack git-shortlog git-show-branch git-show-index git-show-ref git-sparse-checkout git-stash git-stripspace git-submodule--helper git-symbolic-ref git-tag git-unpack-file git-unpack-objects git-update-index git-update-ref git-update-server-info git-upload-archive git-upload-pack git-var git-verify-commit git-verify-pack git-verify-tag git-worktree git-write-tree git-cherry git-cherry-pick git-format-patch git-fsck-objects git-init git-maintenance git-merge-subtree git-restore git-show git-stage git-status git-switch git-version git-whatchanged; do \
+	rm -f "$execdir/$p" && \
+	if test -z ""; \
+	then \
+		test -n "" && \
+		ln -s "$destdir_from_execdir_SQ/bin/git" "$execdir/$p" || \
+		{ test -z "1" && \
+		  ln "$execdir/git" "$execdir/$p" 2>/dev/null || \
+		  ln -s "git" "$execdir/$p" 2>/dev/null || \
+		  cp "$execdir/git" "$execdir/$p" || exit; }; \
+	fi \
+done && \
+remote_curl_aliases="git-remote-https git-remote-ftp git-remote-ftps" && \
+for p in $remote_curl_aliases; do \
+	rm -f "$execdir/$p" && \
+	test -n "" && \
+	ln -s "git-remote-http" "$execdir/$p" || \
+	{ test -z "1" && \
+	  ln "$execdir/git-remote-http" "$execdir/$p" 2>/dev/null || \
+	  ln -s "git-remote-http" "$execdir/$p" 2>/dev/null || \
+	  cp "$execdir/git-remote-http" "$execdir/$p" || exit; } \
+done
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-submodule.xml git-submodule.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.adoc
@@ -566058,19 +566008,19 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-ref.xml git-update-ref.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-tag.xml git-tag.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-var.xml git-var.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.adoc
@@ -566079,61 +566029,61 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-version.xml git-version.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-update-index.xml git-update-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-web--browse.xml git-web--browse.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-write-tree.xml git-write-tree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-show.xml git-show.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitk.xml gitk.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-svn.xml git-svn.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o scalar.xml scalar.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git-worktree.xml git-worktree.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.xml gitweb.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-index.xml gitformat-index.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitignore.xml gitignore.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmailmap.xml gitmailmap.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitmodules.xml gitmodules.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitattributes.xml gitattributes.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.adoc
@@ -566142,76 +566092,76 @@
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git.xml git.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcli.xml gitcli.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o githooks.xml githooks.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcredentials.xml gitcredentials.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o giteveryday.xml giteveryday.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitpacking.xml gitpacking.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o git.xml git.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitfaq.xml gitfaq.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitrevisions.xml gitrevisions.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gittutorial.xml gittutorial.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.adoc
+asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitglossary.xml gitglossary.adoc
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-backfill.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-asciidoc -abuild_dir='/build/reproducible-path/git-2.49.0+next.20250314/Documentation' -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -b docbook -d manpage -o gitworkflows.xml gitworkflows.adoc
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-am.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
@@ -566220,37 +566170,28 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-add.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-backfill.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-am.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-apply.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-add.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bisect.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bundle.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-mailmap.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-attr.xml
@@ -566259,16 +566200,19 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-mailmap.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cat-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ref-format.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry.xml
@@ -566283,37 +566227,43 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-column.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clone.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-column.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache--daemon.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clone.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsimport.xml
@@ -566325,19 +566275,10 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-describe.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-daemon.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diagnose.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-difftool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-pairs.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-export.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-index.xml
@@ -566346,49 +566287,49 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-export.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-files.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-pairs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-import.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-repo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-for-each-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-filter-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-import.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-format-patch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsmonitor--daemon.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-help.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gc.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-format-patch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-get-tar-commit-id.xml
@@ -566397,7 +566338,7 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-gui.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
@@ -566406,22 +566347,22 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hook.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-config.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-help.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-imap-send.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-imap-send.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init.xml
@@ -566430,97 +566371,100 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-config.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-instaweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailsplit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-multi-pack-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-name-rev.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-name-rev.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mv.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mv.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-patch-id.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-patch-id.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-quiltimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-range-diff.xml
@@ -566529,19 +566473,16 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pull.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-fd.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reflog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-receive-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-ext.xml
@@ -566550,7 +566491,10 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote-fd.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-remote.xml
@@ -566559,67 +566503,67 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replace.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-repack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-restore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rebase.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rerere.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rerere.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-revert.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-restore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replay.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-revert.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-parse.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rm.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n--envsubst.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-i18n.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-setup.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-email.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sh-setup.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shortlog.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shell.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shell.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stage.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-shortlog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-email.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stage.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-sparse-checkout.xml
@@ -566628,166 +566572,163 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stripspace.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stash.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-submodule.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-status.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-svn.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-symbolic-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-submodule.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-objects.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-svn.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-var.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-server-info.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-var.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-whatchanged.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-version.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-tag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitk.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-version.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-web--browse.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-tag.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-write-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man scalar.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-worktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man scalar.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man githooks.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-signature.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmailmap.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-common.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-capabilities.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man githooks.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrepository-layout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcredentials.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcredentials.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitpacking.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcvs-migration.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitdiffcore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man giteveryday.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcore-tutorial.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man giteveryday.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitnamespaces.xml
@@ -566796,22 +566737,25 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitglossary.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitpacking.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrevisions.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitworkflows.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrevisions.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitworkflows.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 install -d -m 755 /build/reproducible-path/git-2.49.0+next.20250314/debian/tmp/usr/share/man/man1
@@ -566850,85 +566794,79 @@
     GEN asciidoc.conf
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-am.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-archive.html
+    ASCIIDOC git-backfill.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-archimport.html
+    ASCIIDOC git-add.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-backfill.html
+    ASCIIDOC git-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-bugreport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-bundle.html
+    ASCIIDOC git-archimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-apply.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-check-ignore.html
+    ASCIIDOC git-annotate.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-add.html
+    ASCIIDOC git-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-branch.html
+    ASCIIDOC git-am.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-bisect.html
+    ASCIIDOC git-check-mailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-blame.html
+    ASCIIDOC git-bisect.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-check-attr.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-annotate.html
+    ASCIIDOC git-check-ref-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-check-mailmap.html
+    ASCIIDOC git-check-ignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-cat-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-check-ref-format.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-checkout-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-citool.html
+    ASCIIDOC git-blame.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-cherry.html
+    ASCIIDOC git-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-column.html
+    ASCIIDOC git-cherry.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-commit-graph.html
+    ASCIIDOC git-citool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-checkout.html
+    ASCIIDOC git-clean.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-clean.html
+    ASCIIDOC git-column.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-cherry-pick.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-clone.html
+    ASCIIDOC git-count-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-credential-store.html
+    ASCIIDOC git-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-credential-cache--daemon.html
@@ -566937,157 +566875,166 @@
     ASCIIDOC git-commit-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-count-objects.html
+    ASCIIDOC git-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-cvsexportcommit.html
+    ASCIIDOC git-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-cvsserver.html
+    ASCIIDOC git-credential-store.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-credential.html
+    ASCIIDOC git-credential-cache.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-credential-cache.html
+    ASCIIDOC git-cvsimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-daemon.html
+    ASCIIDOC git-credential.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-cvsimport.html
+    ASCIIDOC git-cvsexportcommit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-commit.html
+    ASCIIDOC git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-diagnose.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-describe.html
+    ASCIIDOC git-cvsserver.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-difftool.html
+    ASCIIDOC git-commit.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-describe.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-fetch-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fmt-merge-msg.html
+    ASCIIDOC git-difftool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-fast-export.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-filter-branch.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-diff-pairs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fetch.html
+    ASCIIDOC git-diff-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-diff-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fsck-objects.html
+    ASCIIDOC git-for-each-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-filter-branch.html
+    ASCIIDOC git-for-each-repo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-diff-files.html
+    ASCIIDOC git-fmt-merge-msg.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-for-each-ref.html
+    ASCIIDOC git-fsck-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-for-each-repo.html
+    ASCIIDOC git-fsmonitor--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fsmonitor--daemon.html
+    ASCIIDOC git-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-diff.html
+    ASCIIDOC git-fsck.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-hook.html
+    ASCIIDOC git-hash-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fast-import.html
+    ASCIIDOC git-gc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-grep.html
+    ASCIIDOC git-gui.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-fsck.html
+    ASCIIDOC git-diff-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-http-backend.html
+    ASCIIDOC git-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-hash-object.html
+    ASCIIDOC git-format-patch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-gui.html
+    ASCIIDOC git-fast-import.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-http-fetch.html
+    ASCIIDOC git-grep.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-gc.html
+    ASCIIDOC git-help.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-http-push.html
+    ASCIIDOC git-imap-send.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-help.html
+    ASCIIDOC git-http-backend.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-init-db.html
+    ASCIIDOC git-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-index-pack.html
+    ASCIIDOC git-http-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-imap-send.html
+    ASCIIDOC git-init-db.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-format-patch.html
+    ASCIIDOC git-http-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-instaweb.html
+    ASCIIDOC git-index-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-diff-tree.html
+    ASCIIDOC git-init.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-interpret-trailers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-ls-remote.html
+    ASCIIDOC git-instaweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-init.html
+    ASCIIDOC git-mailinfo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-merge-base.html
+    ASCIIDOC git-ls-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-mailinfo.html
+    ASCIIDOC git-ls-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-mailsplit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-ls-tree.html
+    ASCIIDOC git-ls-files.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-merge-base.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-maintenance.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-ls-files.html
+    ASCIIDOC git-merge-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-merge-index.html
@@ -567096,16 +567043,16 @@
     ASCIIDOC git-merge-one-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-merge-file.html
+    ASCIIDOC git-mktag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-mergetool--lib.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-mktag.html
+    ASCIIDOC git-mktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-multi-pack-index.html
+    ASCIIDOC git-mergetool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-mv.html
@@ -567114,58 +567061,49 @@
     ASCIIDOC git-merge-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-mktree.html
+    ASCIIDOC git-pack-redundant.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-mergetool.html
+    ASCIIDOC git-multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-name-rev.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-prune-packed.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-pack-redundant.html
+    ASCIIDOC git-patch-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-notes.html
+    ASCIIDOC git-prune-packed.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-pack-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-prune.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-patch-id.html
+    ASCIIDOC git-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-pack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-merge.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-quiltimport.html
+    ASCIIDOC git-prune.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-p4.html
+    ASCIIDOC git-notes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-config.html
+    ASCIIDOC git-range-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-range-diff.html
+    ASCIIDOC git-quiltimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-pull.html
+    ASCIIDOC git-read-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-receive-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-refs.html
+    ASCIIDOC git-p4.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-remote-fd.html
@@ -567174,37 +567112,34 @@
     ASCIIDOC git-reflog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-log.html
+    ASCIIDOC git-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-remote-ext.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-read-tree.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-repack.html
+    ASCIIDOC git-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-remote.html
+    ASCIIDOC git-replace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-request-pull.html
+    ASCIIDOC git-log.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-replace.html
+    ASCIIDOC git-rerere.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-rerere.html
+    ASCIIDOC git-request-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-revert.html
+    ASCIIDOC git-repack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-rebase.html
+    ASCIIDOC git-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-reset.html
@@ -567213,6 +567148,15 @@
     ASCIIDOC git-restore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-revert.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-replay.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-send-pack.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-rm.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -567222,31 +567166,31 @@
     ASCIIDOC git-sh-i18n.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-send-pack.html
+    ASCIIDOC git-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-sh-setup.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-send-email.html
+    ASCIIDOC git-shell.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-shell.html
+    ASCIIDOC git-rev-parse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-show-index.html
+    ASCIIDOC git-config.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-rev-parse.html
+    ASCIIDOC git-show-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-replay.html
+    ASCIIDOC git-show-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-show-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-show-ref.html
+    ASCIIDOC git-send-email.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-stage.html
@@ -567255,31 +567199,31 @@
     ASCIIDOC git-stripspace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-stash.html
+    ASCIIDOC git-sparse-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-sparse-checkout.html
+    ASCIIDOC git-shortlog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-rev-list.html
+    ASCIIDOC git-unpack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-symbolic-ref.html
+    ASCIIDOC git-stash.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-submodule.html
+    ASCIIDOC git-status.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-shortlog.html
+    ASCIIDOC git-symbolic-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-unpack-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-unpack-objects.html
+    ASCIIDOC git-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-status.html
+    ASCIIDOC git-submodule.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-switch.html
@@ -567288,46 +567232,43 @@
     ASCIIDOC git-update-server-info.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-tag.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-update-ref.html
+    ASCIIDOC git-upload-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-upload-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-upload-archive.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-var.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-verify-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-svn.html
+    ASCIIDOC git-update-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-verify-pack.html
+    ASCIIDOC git-rev-list.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-whatchanged.html
+    ASCIIDOC git-version.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-verify-tag.html
+    ASCIIDOC git-web--browse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-version.html
+    ASCIIDOC git-update-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-web--browse.html
+    ASCIIDOC git-verify-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-update-index.html
+    ASCIIDOC git-verify-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-show.html
+    ASCIIDOC git-svn.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC git-whatchanged.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-write-tree.html
@@ -567336,52 +567277,52 @@
     ASCIIDOC gitformat-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC scalar.html
+    ASCIIDOC gitformat-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitweb.html
+    ASCIIDOC git-worktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitformat-commit-graph.html
+    ASCIIDOC gitformat-chunk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-worktree.html
+    ASCIIDOC scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitformat-chunk.html
+    ASCIIDOC gitweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitformat-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitformat-signature.html
+    ASCIIDOC gitmailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitformat-pack.html
+    ASCIIDOC git-show.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitprotocol-common.html
+    ASCIIDOC gitformat-signature.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitmailmap.html
+    ASCIIDOC gitformat-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitprotocol-capabilities.html
+    ASCIIDOC githooks.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitprotocol-http.html
+    ASCIIDOC gitprotocol-common.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitprotocol-pack.html
+    ASCIIDOC gitprotocol-capabilities.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitprotocol-v2.html
@@ -567390,216 +567331,219 @@
     ASCIIDOC gitattributes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC githooks.html
+    ASCIIDOC gitcredentials.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitcli.html
+    ASCIIDOC gitprotocol-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitrepository-layout.html
+    ASCIIDOC gitprotocol-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitnamespaces.html
+    ASCIIDOC git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git.html
+    ASCIIDOC gitrepository-layout.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC gitcli.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitcvs-migration.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitcredentials.html
+    ASCIIDOC gitweb.conf.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitdiffcore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC giteveryday.html
+    ASCIIDOC gitnamespaces.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitweb.conf.html
+    ASCIIDOC gitfaq.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC giteveryday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gitpacking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitsubmodules.html
+    ASCIIDOC gittutorial-2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto-index.html
+    ASCIIDOC gitsubmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gittutorial-2.html
+    ASCIIDOC howto-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-tools.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitrevisions.html
+    ASCIIDOC gitremote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitfaq.html
+    ASCIIDOC gitglossary.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitremote-helpers.html
+    ASCIIDOC howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitglossary.html
+    ASCIIDOC gitworkflows.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitcore-tutorial.html
+    ASCIIDOC howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC gittutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/new-command.html
+    ASCIIDOC gitcore-tutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC gitworkflows.html
+    ASCIIDOC gitrevisions.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/use-git-daemon.html
+    ASCIIDOC howto/using-signed-tag-in-pull-request.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/using-merge-subtree.html
+    ASCIIDOC howto/use-git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/update-hook-example.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/using-signed-tag-in-pull-request.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/setup-git-server-over-http.html
+    ASCIIDOC howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/revert-a-faulty-merge.html
+    ASCIIDOC git-bisect-lk2009.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/recover-corrupted-blob-object.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/keep-canonical-history-correct.html
+    ASCIIDOC howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC git-bisect-lk2009.html
+    ASCIIDOC howto/setup-git-server-over-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/coordinate-embargoed-releases.html
+    ASCIIDOC technical/api-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC technical/api-error-handling.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-merge.html
+    ASCIIDOC howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC howto/maintain-git.html
+    ASCIIDOC technical/api-simple-ipc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-parse-options.html
+    ASCIIDOC howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-path-walk.html
+    ASCIIDOC DecisionMaking.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-simple-ipc.html
+    ASCIIDOC technical/api-path-walk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC DecisionMaking.html
+    ASCIIDOC howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC ReviewingGuidelines.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-trace2.html
+    ASCIIDOC technical/api-parse-options.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC ToolsForGit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/long-running-process-protocol.html
+    ASCIIDOC technical/bitmap-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/build-systems.html
+    ASCIIDOC MyFirstObjectWalk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC MyFirstObjectWalk.html
+    ASCIIDOC technical/build-systems.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC technical/multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/bitmap-format.html
+    ASCIIDOC MyFirstContribution.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/parallel-checkout.html
+    ASCIIDOC technical/long-running-process-protocol.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC MyFirstContribution.html
+    ASCIIDOC SubmittingPatches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/pack-heuristics.html
+    ASCIIDOC technical/api-trace2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/partial-clone.html
+    ASCIIDOC technical/platform-support.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/bundle-uri.html
+    ASCIIDOC technical/scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC SubmittingPatches.html
+    ASCIIDOC technical/bundle-uri.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/platform-support.html
+    ASCIIDOC technical/racy-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/scalar.html
+    ASCIIDOC technical/hash-function-transition.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/send-pack-pipeline.html
+    ASCIIDOC technical/pack-heuristics.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/racy-git.html
+    ASCIIDOC technical/partial-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/shallow.html
+    ASCIIDOC technical/parallel-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/api-index.html
+    ASCIIDOC technical/send-pack-pipeline.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/trivial-merge.html
+    ASCIIDOC technical/shallow.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC technical/hash-function-transition.html
+    ASCIIDOC technical/api-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC user-manual.xml
+    ASCIIDOC everyday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
-    ASCIIDOC everyday.html
+    ASCIIDOC technical/trivial-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC git-remote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+    ASCIIDOC user-manual.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
     ASCIIDOC technical/unit-tests.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.49.0+next.20250314/Documentation'
@@ -567688,23 +567632,23 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/fr/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/de/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/el/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ru/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/id/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/it/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ru/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/bg/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ca/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/fr/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/it/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/pl/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/pt_PT/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/tr/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/uk/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/vi/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/zh_CN/LC_MESSAGES/git.mo
    debian/rules override_dh_compress
@@ -567722,26 +567666,26 @@
  diversion by libc6 to: /lib/ld-linux-aarch64.so.1.usr-is-merged
    dh_installdeb
    dh_gencontrol
-dpkg-gencontrol: warning: package git-email: substitution variable ${perl:Depends} unused, but is defined
-dpkg-gencontrol: warning: package git-cvs: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-svn: substitution variable ${perl:Depends} unused, but is defined
-dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
+dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
+dpkg-gencontrol: warning: package git-cvs: substitution variable ${perl:Depends} unused, but is defined
+dpkg-gencontrol: warning: package git-email: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'git' in '../git_2.49.0+next.20250314-1_arm64.deb'.
-dpkg-deb: building package 'git-email' in '../git-email_2.49.0+next.20250314-1_all.deb'.
 dpkg-deb: building package 'git-doc' in '../git-doc_2.49.0+next.20250314-1_all.deb'.
-dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.49.0+next.20250314-1_arm64.deb'.
-dpkg-deb: building package 'git-man' in '../git-man_2.49.0+next.20250314-1_all.deb'.
-dpkg-deb: building package 'git-svn' in '../git-svn_2.49.0+next.20250314-1_all.deb'.
-dpkg-deb: building package 'gitk' in '../gitk_2.49.0+next.20250314-1_all.deb'.
-dpkg-deb: building package 'git-cvs' in '../git-cvs_2.49.0+next.20250314-1_all.deb'.
 dpkg-deb: building package 'git-gui' in '../git-gui_2.49.0+next.20250314-1_all.deb'.
+dpkg-deb: building package 'git-svn' in '../git-svn_2.49.0+next.20250314-1_all.deb'.
 dpkg-deb: building package 'gitweb' in '../gitweb_2.49.0+next.20250314-1_all.deb'.
+dpkg-deb: building package 'git-email' in '../git-email_2.49.0+next.20250314-1_all.deb'.
+dpkg-deb: building package 'git-man' in '../git-man_2.49.0+next.20250314-1_all.deb'.
 dpkg-deb: building package 'git-all' in '../git-all_2.49.0+next.20250314-1_all.deb'.
+dpkg-deb: building package 'git-dbgsym' in '../git-dbgsym_2.49.0+next.20250314-1_arm64.deb'.
+dpkg-deb: building package 'gitk' in '../gitk_2.49.0+next.20250314-1_all.deb'.
 dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.49.0+next.20250314-1_all.deb'.
+dpkg-deb: building package 'git' in '../git_2.49.0+next.20250314-1_arm64.deb'.
+dpkg-deb: building package 'git-cvs' in '../git-cvs_2.49.0+next.20250314-1_all.deb'.
  dpkg-genbuildinfo --build=binary -O../git_2.49.0+next.20250314-1_arm64.buildinfo
  dpkg-genchanges --build=binary -O../git_2.49.0+next.20250314-1_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -567749,12 +567693,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/2877395/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/1671536 and its subdirectories
-I: Current time: Sun Apr 19 07:36:43 -12 2026
-I: pbuilder-time-stamp: 1776627403
+I: removing directory /srv/workspace/pbuilder/2877395 and its subdirectories
+I: Current time: Tue Mar 18 03:41:01 +14 2025
+I: pbuilder-time-stamp: 1742218861